Commit graph

1371 commits

Author SHA1 Message Date
Ashod Nakashian
cb772746d8 loolwsd: multiple documents load correctly now
Change-Id: I86adda24d5ea576aa17829f27b78cb02d0350a4b
Reviewed-on: https://gerrit.libreoffice.org/21323
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2016-01-11 04:05:36 +00:00
Ashod Nakashian
f613a5181e loolwsd: better handling of commandvalues
Change-Id: Ida459b42d9398baac85d1ecc19c19fb7f7ca90f0
Reviewed-on: https://gerrit.libreoffice.org/21322
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2016-01-11 04:04:54 +00:00
Ashod Nakashian
9523769e94 loolwsd: better callback handling and shutdown
Change-Id: Id9cc9f748d2dac3afb7d7d002062f8c423bce775
Reviewed-on: https://gerrit.libreoffice.org/21321
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2016-01-11 04:04:27 +00:00
Ashod Nakashian
b2b983476c loolwsd: more informative warnings
Change-Id: I8dba6d003bd5c0b3c16b3cd57c3737638ce56bd1
Reviewed-on: https://gerrit.libreoffice.org/21320
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2016-01-11 04:04:02 +00:00
Ashod Nakashian
b3d06869f5 loolwsd: centralized document loading in Document
Change-Id: I1ff7e0a53cc415958e46aea74c775d7f265b8b8e
Reviewed-on: https://gerrit.libreoffice.org/21319
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2016-01-11 04:03:38 +00:00
Ashod Nakashian
2e34e2c8cf loolwsd: public -> private
Change-Id: Ibd662a17389d4a77bc31b84a50bc7a2e3b48bde0
Reviewed-on: https://gerrit.libreoffice.org/21318
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2016-01-11 04:02:55 +00:00
Ashod Nakashian
efb1fecbf1 loolwsd: control multiview api via env
Change-Id: Ic385188a4d57e10a260827709d4666857fd8aae5
Reviewed-on: https://gerrit.libreoffice.org/21317
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2016-01-11 04:02:05 +00:00
Ashod Nakashian
a66a12004d loolwsd: better handling of multiple connections
Change-Id: I3acd9810b63426ea4b811bf2f4f4341ba70e4ba0
Reviewed-on: https://gerrit.libreoffice.org/21316
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2016-01-11 03:57:58 +00:00
Ashod Nakashian
4b028e1506 loolwsd: localized lokit lock and other cleanups
Change-Id: I16453924d90ab22e57f8b6a3bbb937fef853ea2c
Reviewed-on: https://gerrit.libreoffice.org/21315
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2016-01-11 03:57:18 +00:00
Jan Holesovsky
f646733006 loleaflet: Improve page up / page down handling when viewing only.
Without this, the first PgDown is ignored.

Not sure what the previous code was supposed to handle, but dealing with that
in the LO core seems to me as a better plan, so let's fix it there if
something special is still needed for the use case introduced in
97ac6736f8.
2016-01-09 23:52:40 +01:00
Henry Castro
f3c8ace597 loolwsd: request abnormal termination 2016-01-09 12:26:04 -04:00
Henry Castro
d20e9399fc loolwsd: revert, refactor lokit Document
I did not consider shared document case.
2016-01-09 07:27:57 -04:00
Henry Castro
f3735f145f loolwsd: force kills a child with abnormal state. 2016-01-08 23:34:34 -04:00
Henry Castro
584e68e6d1 loolwsd: remove expired session URL cached 2016-01-08 19:05:58 -04:00
Andras Timar
dc23d5f91e loolwsd: deb rules: fix build of tests, and do not run tests 2016-01-08 22:42:56 +01:00
Henry Castro
82b3b25d0a loolwsd: refactor lokit Document
+ Every lokit process acquire an unique URL document to open it
+ Every lokit process acquired with an URL document could open multiple view of the same URL document
+ Every lokit process acquire a new unique URL document if and only if no exists opened documents.
+ if a lokit process dies is an abnormal state, and it should take actions to recovery session document.
+ An initial lokit process with no acquire URL document is in waiting state.
2016-01-08 10:37:48 -04:00
Jan Holesovsky
8043952c84 loleaflet: Strip trailing '/'s from options.webserver. 2016-01-08 12:05:20 +01:00
Miklos Vajna
20488cce86 loleaflet: document border shadow config option 2016-01-08 11:52:33 +01:00
Jan Holesovsky
f74db161dd loolwsd: Change the group too. 2016-01-08 09:25:21 +01:00
Jan Holesovsky
5aded99950 loolwsd: Cleanup child-roots in postinst (as we do in .rpm's too). 2016-01-08 09:25:21 +01:00
Jan Holesovsky
475436e66b loolwsd: Remove the cache content after installation.
The new versions may change the behaviour substantially, let's be on the safe
side.
2016-01-08 09:25:21 +01:00
Miklos Vajna
8e5841cc58 loolwsd: -Werror,-Wpointer-bool-conversion
error: address of array 'dir_proc->d_name' will always evaluate to 'true'

Henry says this is the correct fix.
2016-01-08 09:08:25 +01:00
Henry Castro
ab1a3a147e loolwsd: not necessary to find session
Every lokit instances has a unique URL, that could contain
multiple views.
2016-01-07 23:43:09 -04:00
Henry Castro
2c7b4490ec loolwsd: ensure to remove the connection of unloaded document 2016-01-07 23:24:40 -04:00
Jan Holesovsky
4c3896c32e loleaflet: No need to use the last zoom in fitWithZoom().
This makes it a stable algorithm.

This reverts commit 749d707c2f2be64424c0f3f9e105f90e22592a41.
2016-01-07 22:56:12 +01:00
Ozcan Esen
f3778421b1 loleaflet: fix fitWidthZoom inconsistency
Change-Id: I511112d05de2b2734d7d2b2f905a3ba797dcca5f
2016-01-07 22:56:12 +01:00
Jan Holesovsky
07a3b6994e loleaflet: Add a button for testing fitWidthZoom(). 2016-01-07 22:56:12 +01:00
Jan Holesovsky
1d99285294 loleaflet: One more place that needs options.webserver. 2016-01-07 22:56:12 +01:00
Henry Castro
b213464b3d loolwsd: ensure unique URL per lokit process 2016-01-07 14:55:11 -04:00
Henry Castro
49fbf1126b loolwsd: fix search document. 2016-01-07 12:14:52 -04:00
Miklos Vajna
e1a3a86ff3 loolwsd: default initialization of an object of const type 'const struct ...
... _end_marker' without a user-provided default constructor

Add one to make clang happy.
2016-01-07 15:10:34 +01:00
Miklos Vajna
f0090d107c loolwsd: -Werror,-Wshadow 2016-01-07 15:09:43 +01:00
Miklos Vajna
feb8648f05 loolwsd: adding 'int' to a string does not append to the string 2016-01-07 15:06:16 +01:00
Jan Holesovsky
558e08af58 loleaflet: Introduce a 'webserver' option for the http access to loolwsd.
When proxying, the websocket may be hidden behind another URL, so this allows
an explicit setting.
2016-01-07 12:36:16 +01:00
Miklos Vajna
956f470e5f loolwsd: fix -Werror,-Winconsistent-missing-override 2016-01-07 08:35:45 +01:00
Ashod Nakashian
4a4583e711 loolwsd: documentation updated with architecture, filesystem, and workflow
Change-Id: If5268cd87794493d63d8175b9da10e6242d6e3f0
Reviewed-on: https://gerrit.libreoffice.org/21186
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2016-01-07 05:59:06 +00:00
Ashod Nakashian
06c20923c5 loolwsd: Kit is given the jailed path
Change-Id: I5b475798c7f654aaa3e0032332d5aa97a103a4c8
Reviewed-on: https://gerrit.libreoffice.org/21185
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2016-01-07 05:58:08 +00:00
Ashod Nakashian
a7556a7c1e loolwsd: new Document class to manage the lifetime of a document
Change-Id: I8596d0f2514106e384bc6519ce05028753026678
Reviewed-on: https://gerrit.libreoffice.org/21184
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2016-01-07 05:57:25 +00:00
Ashod Nakashian
7f9485e318 loolwsd: jailId now static member
Change-Id: I7142038d421d642a3e9dfd3e1069c7401ec7db5c
Reviewed-on: https://gerrit.libreoffice.org/21183
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2016-01-07 05:56:25 +00:00
Ashod Nakashian
0b5bc5f244 loolwsd: random jailId dir created by WSD and renamed childId -> jailId
Change-Id: Ib5ce65c578c0c7fd3dbf81628906cd17728fb3ff
Reviewed-on: https://gerrit.libreoffice.org/21182
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2016-01-07 05:56:01 +00:00
Ashod Nakashian
b0cd3e5a46 loolwsd: spawn one broker and one only
Change-Id: I9ec23e7e9e9672e5e4e6d55b7a79e6db1f617e45
Reviewed-on: https://gerrit.libreoffice.org/21181
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2016-01-07 05:54:44 +00:00
Ashod Nakashian
0cdb8c931f loolwsd: logs
Change-Id: Ib964578ce84eb3dd4b96d483b0e8b53c6cfac853
Reviewed-on: https://gerrit.libreoffice.org/21180
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2016-01-07 05:53:56 +00:00
Ashod Nakashian
900c344a7e loolwsd: refactored JailedDocumentRoot path
Change-Id: Ibee16e6ebde0ae1945be53903a0b0bad4f3300ed
Reviewed-on: https://gerrit.libreoffice.org/21179
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2016-01-07 05:53:39 +00:00
Ashod Nakashian
cf65588031 loolwsd: more local ClientPortNumber
Change-Id: I2ce649a8f880bd0ec3bded715b1d8864e176b935
Reviewed-on: https://gerrit.libreoffice.org/21178
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2016-01-07 05:52:24 +00:00
Ashod Nakashian
2d385d697e Protocol versioning added and documented
Change-Id: I6e1df89c7330052bd2d442a42c0b24c8ae4facf6
Reviewed-on: https://gerrit.libreoffice.org/21168
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2016-01-06 17:06:47 +00:00
Ashod Nakashian
9285f50c6b loolwsd: kit instance forkCounter now atomic
Change-Id: I04470220b83940319ff1a0fee865201433f44016
Reviewed-on: https://gerrit.libreoffice.org/21167
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2016-01-06 17:04:42 +00:00
Jan Holesovsky
28646c1a53 loolwsd: Answer the PING's with proper PONG's. 2016-01-06 17:19:21 +01:00
Ashod Nakashian
5b3c9bff2e loolwsd: tabs -> spaces
Change-Id: I93619e2d5f93d104d34af9bda60f87e300e39963
Reviewed-on: https://gerrit.libreoffice.org/21164
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2016-01-06 14:31:02 +00:00
Ashod Nakashian
7bf3fe843a loolwsd: more exception handling
Change-Id: I7ac694395e2c231565bd84a7cd7813498dba387f
Reviewed-on: https://gerrit.libreoffice.org/21163
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2016-01-06 14:30:46 +00:00
Ashod Nakashian
87d45ff333 loolwsd: don't timeout client socket
Change-Id: I22ca1834e22efbe01cc3e8cb78be5d0b2fbfcf4c
Reviewed-on: https://gerrit.libreoffice.org/21162
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2016-01-06 14:25:25 +00:00