Commit graph

853 commits

Author SHA1 Message Date
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
Ashod Nakashian
f9cfdd9021 loolwsd: reuse QueueHandler
Change-Id: I90dd0cc1457604d85ec82c98af9a457f44968b0d
Reviewed-on: https://gerrit.libreoffice.org/21161
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2016-01-06 14:24:58 +00:00
Ashod Nakashian
6327f806de loolwsd: support relative lokit path to configure
Change-Id: I19f76cbd39fd268145fa6cf6462f3fc940e06ff5
Reviewed-on: https://gerrit.libreoffice.org/21160
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2016-01-06 14:24:18 +00:00
Ashod Nakashian
c3826587e1 loolwsd: moved QueueHandler into own file
Change-Id: I281a9bd12731340673cb66f1f2ac6a133cbe71d0
Reviewed-on: https://gerrit.libreoffice.org/21159
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2016-01-06 14:23:39 +00:00
Ashod Nakashian
ea1415de75 loolwsd: improved HTTP Request Handler
Change-Id: I1ad4359732c7b5ee9fc8743ebc60e1c94c304dcc
Reviewed-on: https://gerrit.libreoffice.org/21158
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2016-01-06 14:22:59 +00:00
Ashod Nakashian
a5cca41b35 loolwsd: logging improvements in LOOLSession.
Change-Id: Ia5029bc55be0bf0f1a3282db103515ae22fd90bd
Reviewed-on: https://gerrit.libreoffice.org/21157
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2016-01-06 14:22:13 +00:00
Ashod Nakashian
c2c41ceb63 loolwsd: refactored HttpRequestHandler
Change-Id: Ie785d814aff1d28634c8933511c4a5a4a4f5cebc
Reviewed-on: https://gerrit.libreoffice.org/21156
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2016-01-06 14:21:53 +00:00
Andras Timar
ab07fa2948 loolwsd: find system Poco libs (for real now) 2016-01-06 12:59:25 +01:00
Andras Timar
faa1fa47c7 loowsd: typo: falied -> failed 2016-01-06 11:11:23 +01:00
Andras Timar
e41e25a18c loolwsd: bccu#1397 fix dlopening LO in loolbroker in mergedlibs case 2016-01-06 10:38:09 +01:00
Miklos Vajna
4a5e4ac147 loolwsd: avoid copying non-Poco libs when looking for system Poco libs
10:05 < tml> vmiklos: doesn't your latest commit to online massively increase the number of .so files handled?

Indeed, the systemplate size was about 1.2GB, now it's back to around
500MB for my setup.
2016-01-06 10:18:50 +01:00
Miklos Vajna
d1ff4721cf loolwsd: fix make check 2016-01-06 09:56:51 +01:00
Miklos Vajna
3377e0e077 loolwsd: find libcap in /lib64
Running ./loolwsd <args> resulted in

/usr/bin/loolkit: error while loading shared libraries: libcap.so.2: cannot open shared object file: No such file or directory
2016-01-06 08:56:14 +01:00
Henry Castro
cfb748edf7 loolwsd: ensure POCO library is installed into systemplate.
In order to avoid "/usr/bin/loolkit: error while loading shared libraries: libPocoNetd.so.30"
2016-01-05 19:11:31 -04:00
Henry Castro
ecd360f365 loolwsd: add missing libraries
libcap and libattr is located in lib/x84_64-linux-gnu
Debian GNU/Linux Jessie distribution
2016-01-05 18:06:26 -04:00
Miklos Vajna
e3e4c4d6f3 loolwsd: fix tests to build again 2016-01-05 21:33:13 +01:00
Ashod Nakashian
82c455ef94 loolwsd: dropCapability now works with --enable-debug
Change-Id: I1a852b0cb4fe0b08fcc00f2f7ab15eea3d36801b
Reviewed-on: https://gerrit.libreoffice.org/21133
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2016-01-05 19:30:02 +00:00
Ashod Nakashian
1bbc42351b loolwsd: handle browser ping frames
Change-Id: I6f0074a3f8945b0ffe7a435d40f72f0ef4eae4b8
Reviewed-on: https://gerrit.libreoffice.org/21132
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2016-01-05 17:31:53 +00:00
Henry Castro
32745e181b loolwsd: remove g++ from loolwsd-sytemplate-setup 2016-01-05 11:36:18 -04:00
Andras Timar
0902a21a5e loolwsd: setcap loolbroker 2016-01-05 14:33:11 +01:00
Henry Castro
fe3b4fc9a4 loolwsd: when no available child sessions, pre spawns more children 2016-01-05 08:51:05 -04:00
Andras Timar
eb957fe7ef loolwsd: report problems to upstream dev list, not to Collabora management 2016-01-05 11:57:46 +01:00
Miklos Vajna
024d498c10 loolwsd: fix missing loolbroker dependency
Change-Id: Ia47eb8c055cbab68f42e847d4ab9cd86f1fa3691
2016-01-05 09:10:28 +01:00
Ashod Nakashian
99500542b9 loolwsd: new kit processes created and improved search
Change-Id: Ife2075f6e06febc8bd95eb5d9c0774fd48fbdc8c
Reviewed-on: https://gerrit.libreoffice.org/21099
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2016-01-05 01:14:59 +00:00
Ashod Nakashian
fa2eccacfa loolwsd: fix page sharing between broker and lokit (aka forking)
Change-Id: I870d0291925e718e038f42b21d00ea744133db01
Reviewed-on: https://gerrit.libreoffice.org/21098
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2016-01-05 01:14:28 +00:00
Ashod Nakashian
80941b0b41 loolwsd: bccu#1394 childRoot dir should not be removed, only jails
Change-Id: Id2982728dd36a6a551707334293ecd600852f46f
Reviewed-on: https://gerrit.libreoffice.org/21097
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2016-01-05 01:13:46 +00:00
Ashod Nakashian
2104712b72 loolwsd: exception handling in wsd queue handler
Change-Id: I66f1990a20151c67346922273a98ecc5a91dc58f
Reviewed-on: https://gerrit.libreoffice.org/21096
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2016-01-05 01:13:11 +00:00
Ashod Nakashian
75c65af930 loolwsd: childId is now string
Change-Id: I7037c03d2b40ff88deed0619e8a34ce5434913a3
Reviewed-on: https://gerrit.libreoffice.org/21095
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2016-01-05 01:12:42 +00:00
Ashod Nakashian
53bff1f1ca loolwsd: fused setting the url and loading a document
Change-Id: Ia85fa5e5550c7cc8479e4a368cadc77198a30191
Reviewed-on: https://gerrit.libreoffice.org/21094
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2016-01-05 01:04:08 +00:00
Ashod Nakashian
c818ece721 loolwsd: document loading/unloading notifications
Change-Id: I435a4e7f89834bea854a492e487af2a686a6f650
Reviewed-on: https://gerrit.libreoffice.org/21093
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2016-01-05 01:03:02 +00:00
Ashod Nakashian
790fecacbb loolwsd: viewId now private
Change-Id: I307ff20cdaf517e96692d1b244f5bd1dd63015f3
Reviewed-on: https://gerrit.libreoffice.org/21092
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2016-01-05 01:01:57 +00:00
Miklos Vajna
0920fb6f1a configure: set POCO_DEBUG_SUFFIX only for self-built poco again
This partially reverts ad8844e7aa
(loolwsd: fix systemplate when --enable-debug poco library, 2015-12-28).
Otherwise the linker will try to use the "d" suffix for the system poco
libraries as well, and will fail.

Change-Id: I8f963077650f22a3811119b038349bb1e5da9489
Reviewed-on: https://gerrit.libreoffice.org/21072
Reviewed-by: Henry Castro <hcastro@collabora.com>
Tested-by: Henry Castro <hcastro@collabora.com>
2016-01-04 18:26:19 +00:00
Ashod Nakashian
eeb91f6335 loolwsd: send eof to disconnect
Change-Id: I02ec901fd75671a3f4bf6be54f08dfdf6d157837
Reviewed-on: https://gerrit.libreoffice.org/21063
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2016-01-03 15:23:03 +00:00
Ashod Nakashian
1746094fcd loolwsd: log the thread name where available
Change-Id: If40b2d3a72f3e00e8c3bf27fe60c6d63a71df267
Reviewed-on: https://gerrit.libreoffice.org/21062
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2016-01-03 15:19:12 +00:00
Ashod Nakashian
17333608bc loolwsd: new Document class to manage the lifecycle of a document
Change-Id: I7390c05ce42668694efbf1d8cdce499a9aca579c
Reviewed-on: https://gerrit.libreoffice.org/21061
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2016-01-03 15:18:24 +00:00
Ashod Nakashian
f48d61d25d loolwsd: dropCapability moved to Capabilities.hpp
Change-Id: Id84d485b446040df1d5398341af2b0e8f300ed63
Reviewed-on: https://gerrit.libreoffice.org/21060
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2016-01-03 15:17:05 +00:00
Ashod Nakashian
0869cace37 loolwsd: consolidated TerminationFlag
Change-Id: Ic06b940f3b48888e4f398816e5ee45c0f49046e3
Reviewed-on: https://gerrit.libreoffice.org/21059
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2016-01-03 15:15:46 +00:00
Henry Castro
cc1861a6a8 loolwsd: define a constant pipe buffer size 2015-12-30 21:01:07 -04:00
Henry Castro
c38d1644ff loolwsd: simplify handle signals 2015-12-30 20:48:03 -04:00
Henry Castro
33a7f6adbb loolwsd: close pipes 2015-12-29 20:59:17 -04:00
Henry Castro
5986ce25ee loolwsd: log::debug destroy view
after debugging with multiple views, it is trhown uncaught exception
while destroying lokit document.

"terminate called after throwing an instance of 'com::sun::lang::DisposedException'"
2015-12-29 17:30:11 -04:00
Henry Castro
24c8386c42 loolwsd: wait to finish callback worker thread 2015-12-29 10:48:29 -04:00
Henry Castro
f947b64483 loolwsd: renamed prefix "lool" process
We use prefix loolwsd, loolbroker and loolkit to easy grep process search.
Also, run_lok_main is not a thread, it is main loop process.
2015-12-29 00:39:25 -04:00
Henry Castro
0c1e284c92 loolwsd: release lokit after destroy it
In order to avoid:

Error: "double free or corruption (fasttop)"

lokit cannot be deleted, instead it is used loKit->pClass->destroy
2015-12-29 00:23:18 -04:00
Henry Castro
db1d1ff935 loolwsd: loolkit handle signals 2015-12-28 23:18:49 -04:00
Ashod Nakashian
9e9e2f60ef loolwsd: broker handles sigint and wsd removes childroot
Change-Id: Ie408bff7944ff0b9abfa8433b1e8ea6f62a9ab2c
Reviewed-on: https://gerrit.libreoffice.org/20999
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2015-12-28 23:39:13 +00:00
Ashod Nakashian
cf972fbed2 loolwsd: use full path when spawning loolkit
Change-Id: I9875fb7fbbc67915ed62785a3f3d1298a355f0a5
Reviewed-on: https://gerrit.libreoffice.org/20998
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2015-12-28 23:38:25 +00:00
Ashod Nakashian
88b76fe9d4 loolwsd: removed dead code
Variables and options lingering from previous iterations removed.
Standardizing static member names.
Header inclusion cleanups.

Change-Id: I65182ad4d100e0077f1b450be50cf95d7b8f0fc7
Reviewed-on: https://gerrit.libreoffice.org/20997
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2015-12-28 23:36:55 +00:00
Henry Castro
ceac0a24da loolwsd: avoid double child socket shutdown 2015-12-28 18:37:31 -04:00
Henry Castro
d185f738ee loolwsd: revert, remove unnecessary local buffer 2015-12-28 18:24:59 -04:00
Henry Castro
12771ec02d loolwsd: remove unnecessary local buffer 2015-12-28 17:51:38 -04:00
Henry Castro
7fc04b6e71 loolwsd: stop dispatch child when closed websocket prison 2015-12-28 17:05:01 -04:00
Henry Castro
8410ceca2f loolwsd: thread renamed to wsd_queue_handler 2015-12-28 16:51:39 -04:00
Henry Castro
fdef57cba0 loolwsd: close client websocket when abnormal close prison websocket 2015-12-28 16:40:32 -04:00
Henry Castro
ad8844e7aa loolwsd: fix systemplate when --enable-debug poco library 2015-12-28 14:04:07 -04:00
Henry Castro
0d1be4fe82 loolwsd: cleanup unnecessary LOOLWSD code 2015-12-28 12:29:54 -04:00
Ashod Nakashian
6b997c2abf loolwsd: threadId -> sessionId in logs and identifiers
Change-Id: Ifbaea2fdded54da0d3528ae449efdbd7fe6d19c0
Reviewed-on: https://gerrit.libreoffice.org/20982
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2015-12-28 04:15:02 +00:00
Ashod Nakashian
3811abb40a loolwsd: replaced threadId with globally unique sessionId
Change-Id: I55b16d4baa1753bc67dcd72de13e7a516da27abe
Reviewed-on: https://gerrit.libreoffice.org/20981
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2015-12-28 04:14:15 +00:00
Ashod Nakashian
5780e311b7 loolwsd: childId type int -> string
Change-Id: I2aad12da4bb8e7d87866d251258fb44e2aad9a2b
Reviewed-on: https://gerrit.libreoffice.org/20980
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2015-12-28 04:12:57 +00:00
Ashod Nakashian
b2d124af93 loolwsd: proper handling of non-default client port number
Change-Id: I388f0ce0252c5f7889e77c4d85b4cf21d4a222b6
Reviewed-on: https://gerrit.libreoffice.org/20979
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2015-12-28 04:12:15 +00:00
Ashod Nakashian
d273057488 loolwsd: moved config values into common header
Change-Id: Ib88379e453f207a6a5e6223045a393c769082be4
Reviewed-on: https://gerrit.libreoffice.org/20978
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2015-12-28 04:09:50 +00:00
Ashod Nakashian
1e24456121 loolwsd: logPrefix cleanup
Change-Id: I41465a06b17876c5d5fb7a6f9d8569d80571fcca
Reviewed-on: https://gerrit.libreoffice.org/20977
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2015-12-28 04:08:34 +00:00
Ashod Nakashian
538478826d loolwsd: workaround for older gcc that require explicit move ctor
Change-Id: I2a4c232ad89c32ea8739809a13e17522dee7e7c1
Reviewed-on: https://gerrit.libreoffice.org/20976
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2015-12-28 04:07:57 +00:00
Ashod Nakashian
fe0c11333f loolwsd: thread lifecycle markers
Change-Id: I704e37e797224c9dbd024fcab3d8e917584be152
Reviewed-on: https://gerrit.libreoffice.org/20975
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2015-12-28 04:07:37 +00:00
Ashod Nakashian
72a1f18ebc loolwsd: fix detection of unreachable child
Change-Id: I619613067586ec824d17cacd6059168e9329ec4c
Reviewed-on: https://gerrit.libreoffice.org/20974
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2015-12-28 04:07:06 +00:00
Ashod Nakashian
e8e8e6c844 loolwsd: detect broken pipe
Change-Id: If1f40833e26c9ff281f33cc5d7c798fc0f9f3239
Reviewed-on: https://gerrit.libreoffice.org/20973
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2015-12-28 04:06:34 +00:00
Ashod Nakashian
2c5b02dec0 loolwsd: correct lokit document lifecycle
Change-Id: Id7fa6259022694efd519d08c05879d734b1b6717
Reviewed-on: https://gerrit.libreoffice.org/20972
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2015-12-28 04:06:04 +00:00
Ashod Nakashian
ab8c6e6661 loolwsd: use make_shared and emplace
Change-Id: I9110a03b69442f0f8a674eda6ab4cf20462557c1
Reviewed-on: https://gerrit.libreoffice.org/20951
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2015-12-26 03:59:50 +00:00
Ashod Nakashian
03fa56f9de loolwsd: load document immediately upon handshake
Change-Id: If750ae0a94258048c99f6dd47f7abb3a59660c6f
Reviewed-on: https://gerrit.libreoffice.org/20950
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2015-12-26 03:59:35 +00:00
Ashod Nakashian
d26944b715 loolwsd: safely remove files and directories
Change-Id: Ie017a9da720a470a6b8ed340bd4ea5ffc279cf4b
Reviewed-on: https://gerrit.libreoffice.org/20949
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2015-12-26 03:59:20 +00:00
Ashod Nakashian
8fc1e3c65b loolwsd: better error handling and resilience
Change-Id: Ic0208ccb72cb35cb8f8b3c1f36b636dd3a467dc1
Reviewed-on: https://gerrit.libreoffice.org/20948
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2015-12-26 03:59:05 +00:00
Ashod Nakashian
42d07b2aea loolwsd: refactored LOOLSession::handleInput to handle errors
Change-Id: I3be929242317f4fafcb62c55d3532b2fbfd6591b
Reviewed-on: https://gerrit.libreoffice.org/20947
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2015-12-26 03:58:51 +00:00
Ashod Nakashian
3bd8361c89 loolwsd: more cleanups and logging
Change-Id: I23859849af2d7a3411bd4df57916b4166a17c3b5
Reviewed-on: https://gerrit.libreoffice.org/20946
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2015-12-26 03:57:47 +00:00
Ashod Nakashian
7053091c0e loolwsd: support for views
Change-Id: I9447d97612589efd0e85e30977b80ab720b81702
Reviewed-on: https://gerrit.libreoffice.org/20945
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2015-12-26 03:57:21 +00:00
Ashod Nakashian
da23160ed1 loolwsd: misc cleanups
Change-Id: I85cdd017ef5b483d34a2aa7e7a2b0c112cbf6e00
Reviewed-on: https://gerrit.libreoffice.org/20933
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2015-12-25 03:33:03 +00:00
Ashod Nakashian
c52a19c9bf loolwsd: Prevent CPU hogging when pipe breaks
Change-Id: Iec42dbb64354630911a2c555ad55fd6a905db9b8
Reviewed-on: https://gerrit.libreoffice.org/20932
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2015-12-25 03:32:48 +00:00
Ashod Nakashian
8464651655 loolwsd: Better logging
Color logging in console, tracing and streaming,
and converted cout to proper logging.

Change-Id: I515b8f8a40f8fa6763536b85c7632e3bb36673ee
Reviewed-on: https://gerrit.libreoffice.org/20931
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2015-12-25 03:32:33 +00:00
Ashod Nakashian
f8f7eb9ccc loolwsd: misc cleanups
Change-Id: I0e2f497c7527e18ec4524e0f52b920f1e30853fa
Reviewed-on: https://gerrit.libreoffice.org/20930
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2015-12-25 03:30:41 +00:00
Ashod Nakashian
f58ac9b33c loolwsd: logging cleanup and improvements
Change-Id: I7afa49ac7573efe768ceaad416da908134497107
Reviewed-on: https://gerrit.libreoffice.org/20929
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2015-12-25 03:30:20 +00:00
Ashod Nakashian
a06247fa5d loolwsd: Log level and warnings
Log level can be set from LOOL_LOGLEVEL
environment variable (values are those
supported by Poco::Logger::setLevel).

Added warning logging via warn function.

Change-Id: I450511d5132893b93391b287fa5b3d6f522f4744
Reviewed-on: https://gerrit.libreoffice.org/20928
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2015-12-25 03:30:03 +00:00
Ashod Nakashian
37c7f2f325 loolwsd: fixes to loolmap
Change-Id: I58ce3dbbd6bbd1e3eb860ba6c3044ba4a61e281d
Reviewed-on: https://gerrit.libreoffice.org/20909
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2015-12-23 17:23:48 +00:00
Henry Castro
9d7fbec138 loolwsd: Merged improved lifecycle prototype
Enabled the broker and kit processes.

Change-Id: I9afedbccac35732ffe846494cae8135d306e6311
Reviewed-on: https://gerrit.libreoffice.org/20907
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2015-12-23 17:23:40 +00:00
Ashod Nakashian
ea0ddcf738 loolwsd: Nominal logger and fixes
Nominal logging interface and a fix to using Poco
Application from LOOLKit, which is not a Poco App,
which caused core dump.

Logs now include process name.
Added logs to strategic places and some cleanups.

Change-Id: Ib7dcc4f1033dddf7c87cd2e786a91f5b482fb312
Reviewed-on: https://gerrit.libreoffice.org/20906
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2015-12-23 17:23:10 +00:00
Henry Castro
ef9313e3a9 loolwsd: deligating to loolbroker and loolkit
Change-Id: I8499540630373a1bee12a5f58fca3ed701ff6404
Reviewed-on: https://gerrit.libreoffice.org/20904
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2015-12-23 17:22:22 +00:00
Ashod Nakashian
ab5253ba1e loolwsd: Refactored the PRNG
Moved the PRNG into utility namespace and interface
that internally manages seeding (once per process)
and thread-safety.

Change-Id: I78f0ef2c3a01aa6c6aefc8e4b07f3802f2421c68
Reviewed-on: https://gerrit.libreoffice.org/20901
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2015-12-23 17:18:16 +00:00
Henry Castro
1bd85bc641 loolwsd: merged loolmap
Change-Id: I43845ce5f45c01a67db32ab136ad96b70bc31217
Reviewed-on: https://gerrit.libreoffice.org/20908
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2015-12-23 17:11:44 +00:00
Henry Castro
2c1e44d218 loolwsd: LOOLBroker process added
Change-Id: Ia7332761766026599b8ef415652874371938d311
Reviewed-on: https://gerrit.libreoffice.org/20903
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2015-12-23 17:11:23 +00:00
Henry Castro
4af013e87e loolwsd: LOOLKit process added
Change-Id: I91e8a131b4959a78e43b29faede477d39150c97c
Reviewed-on: https://gerrit.libreoffice.org/20902
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2015-12-23 17:10:50 +00:00
Henry Castro
03f33c71d9 loolwsd: Multiple views in ChildProcessSession
Change-Id: I07359c97acc1e5e48dbbd35dc21ed08471c0697e
Reviewed-on: https://gerrit.libreoffice.org/20899
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2015-12-23 17:10:13 +00:00
Henry Castro
e0241b1825 loolwsd: Added remove_if to MessageQueue
Change-Id: If4e72796eb39ee66e7604cf67688329fc94d9539
Reviewed-on: https://gerrit.libreoffice.org/20900
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2015-12-23 17:09:48 +00:00
Henry Castro
4a5277cb95 loolwsd: merged systemplate-setup
Change-Id: Id066b02e405246d6a0a268aa1b29e09cd7730642
Reviewed-on: https://gerrit.libreoffice.org/20905
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2015-12-23 17:09:24 +00:00
Henry Castro
961f853d6d loolwsd: Added FIFO utils.
Change-Id: Ifc4e3dafce669c615d5f0d156227f31fcf959936
Reviewed-on: https://gerrit.libreoffice.org/20896
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Henry Castro <hcastro@collabora.com>
2015-12-23 17:06:57 +00:00
Ashod Nakashian
30e1bbba14 loolwsd: const and cleanups
Change-Id: I2fff14407c35a3c6119f44fbee1b4c458b7eac16
Reviewed-on: https://gerrit.libreoffice.org/20897
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2015-12-23 17:06:26 +00:00
Henry Castro
2d375f3eba loolwsd: FIFO
Change-Id: I4694e45ab8006e8287011000bc5e2797bc9ecd48
Reviewed-on: https://gerrit.libreoffice.org/20898
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2015-12-23 17:05:37 +00:00
Henry Castro
1f43e99ac7 loolwsd: Refactored ChildProcessSession
ChildProcessSession class now moved to own files.

Change-Id: Ic67c8563ada51f23c83e06631ad913af610d395c
Reviewed-on: https://gerrit.libreoffice.org/20895
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Henry Castro <hcastro@collabora.com>
2015-12-23 17:03:43 +00:00
Henry Castro
894ab66d8c loolwsd: Refactored MasterProcessSession
MasterProcessSession class now moved to own files.

Change-Id: Ic1a980295b9bb4b28ec9e205de1544fb98ad98f8
Reviewed-on: https://gerrit.libreoffice.org/20893
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Henry Castro <hcastro@collabora.com>
2015-12-23 17:02:57 +00:00
Ashod Nakashian
e6c916fe6d .gitignore: ignore dot files, /systemplate, and cscope
Change-Id: Ibdecd9e58160829208a0ba51f050b6010ad9b3f9
Reviewed-on: https://gerrit.libreoffice.org/20894
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
2015-12-23 16:13:43 +00:00
Henry Castro
d70280fff8 loolwsd: when no available child sessions, pre spawns more children 2015-12-18 16:51:08 -04:00
Henry Castro
8c4421d681 loolwsd: clean up unnecessary code 2015-12-18 16:45:30 -04:00
Mihai Varga
fe7ae3cc2a fire the commandresult when the saveAs command has finished 2015-12-18 15:40:03 +02:00
Jan Holesovsky
1fb94f0abb loolwsd: We want to build and link with -pthread. 2015-12-17 18:50:00 +01:00
Jan Holesovsky
dacd176c84 loolwsd: We wanted to call the _impl() version.
This was in preparation for a more complex Queue; maybe we should just remove
the non-needed _impl() versions again (?)
2015-12-17 18:50:00 +01:00
Mihai Varga
0d655ca7ac Bump the minor version number 2015-12-16 20:55:30 +02:00
Mihai Varga
fbbf364aa9 loolwsd: initialize the tile to transparent 2015-12-14 15:55:34 +02:00
Mihai Varga
803c89a43f loolwsd: only cache font/style command values
This fixes a bug where row/column headers were cached too
2015-12-14 14:38:05 +02:00
Mihai Varga
30f1f85e08 loolwsd: bump version after tarball 2015-12-11 15:04:15 +02:00
Mihai Varga
d2f593c9b3 loolwsd: bump version before tarball 2015-12-11 15:04:00 +02:00
Andras Timar
95897f161a loolwsd: bump version after tarball 2015-12-11 10:31:36 +01:00
Andras Timar
3f799479d7 loolwsd: bump version before tarball 2015-12-11 10:29:58 +01:00
Henry Castro
a01de99962 loolwsd: handle pong frame
pong frame is received from IE11, with payload data length = 0
2015-12-10 18:20:52 -04:00
Ashod Nakashian
50e6272440 Fixes to get a consistently working state
Fixed a javascript error and a more serious referencing
of the memory of a temp string, which resulted in
random behavior.

When the memory was null, it failed to load any
documents in the browser. Otherwise, accidentally,
when it wasn't, it would load the document (rarely).
2015-12-10 21:32:16 +01:00
Henry Castro
6c209cefb1 loolwsd: wait to finish lo_startmain thread 2015-12-08 21:30:39 -04:00
Andras Timar
f36dda8528 loolwsd: bump version after tarball 2015-12-06 14:14:19 +01:00
Andras Timar
89017cd51c loolwsd: bump version before tarball 2015-12-06 14:14:06 +01:00
Henry Castro
666e4a080f loolwsd: update drop capabilities 2015-12-04 18:06:52 -04:00
Henry Castro
f5292a367e loolwsd: rework, remove a jail root child 2015-12-04 17:09:28 -04:00
Henry Castro
7ea89ef99b loolwsd: restore jail root child creation 2015-12-04 15:19:31 -04:00
Henry Castro
9933ef8675 loolwsd: destroy lokit document when a child dies 2015-12-03 17:41:12 -04:00
Henry Castro
c71ce222a5 loolwsd: remove child workspace when a child dies 2015-12-03 15:43:54 -04:00
Henry Castro
4617a93e5c loolwsd: create a child workspace based on process id 2015-12-03 10:50:03 -04:00
Henry Castro
f5b6aa6515 loolwsd: shut down web sockets that are not yet assigned a document to work on 2015-12-02 20:20:05 -04:00
Andras Timar
84de61f3b4 Revert "loolwsd: update bundled headers"
This reverts commit 9bcde92f50.
2015-12-02 16:46:30 +01:00
Andras Timar
4f2d9b02e5 Revert "loolwsd: add support for postMouseEvent's targetwindow"
This reverts commit d1b39e39e8.
2015-12-02 16:46:25 +01:00
Andrzej Hunt
d1b39e39e8 loolwsd: add support for postMouseEvent's targetwindow
(cherry picked from commit b45e3fa5becf8fcbf106cb6b944c8f4709563d43)
2015-12-02 16:22:55 +01:00
Andrzej Hunt
9bcde92f50 loolwsd: update bundled headers
(cherry picked from commit 49cddd1efb93d8f03a1696f64cf79f96839e1d6b)
2015-12-02 16:22:28 +01:00
Henry Castro
bde7cd9e67 loolwsd: add the option subdir-objects 2015-12-01 23:16:09 -04:00
Mihai Varga
5b1471aaf0 loolwsd: update the bundled headers 2015-11-30 12:59:37 +02:00
Mihai Varga
e1b0e3dce9 loolwsd: update renderFont png encoding 2015-11-30 12:58:41 +02:00
Mihai Varga
862cfe29a0 loolwsd: renderfont command handler
Renders the requested font and sends it back to the client as a png
image
2015-11-30 11:16:53 +02:00
Mihai Varga
aa405d3836 loolwsd: cache rendered fonts 2015-11-30 11:16:53 +02:00
Andras Timar
449e772b29 loolwsd: bump version after tarball 2015-11-30 10:07:12 +01:00
Andras Timar
7418c981c6 loolwsd: bump version before tarball 2015-11-30 10:07:01 +01:00
Andras Timar
5fdef755db loolwsd: add Png.hpp to tarball 2015-11-30 10:06:40 +01:00
Henry Castro
c0fbf5ebf9 loolwsd: remove child root folder when it is a gracefull shut down 2015-11-25 23:17:08 -04:00
Henry Castro
c5037c5d30 loolwsd: stop http server and shut down remaining web sockets 2015-11-25 22:59:24 -04:00
Henry Castro
964d95f04b loolwsd: handle a graceful shutdown 2015-11-25 22:49:34 -04:00
Henry Castro
0417b90eeb loolwsd: add signal handler 2015-11-25 22:37:08 -04:00
Henry Castro
e2e0e3a962 loolwsd: call poll, to check the status of the websocket 2015-11-25 22:23:08 -04:00
Henry Castro
d09951091a loolwsd: avoid double child socket shutdown
It was causing "broke pipe" exception.
2015-11-25 22:09:06 -04:00
Andras Timar
2c184ee1c1 bccu#1371 add libsm6 as dependency to loolwsd 2015-11-25 15:56:46 +01:00
Miklos Vajna
2bb596a256 loolwsd: coding style
If README says "spaces, not tabs" and "braces go on separate lines",
then be consistent about it before it gets normal to not respect those
rules.
2015-11-24 09:43:17 +01:00
Miklos Vajna
195aa3a953 loolwsd: use png_set_write_user_transform_fn() only for BGRA pixel format 2015-11-24 09:19:17 +01:00
Caolán McNamara
9803e2e448 adapt to cairo data format
Change-Id: I9b12ee4ab2ff8cd056ffbc907fb78c0bf3928e4c
2015-11-24 09:07:00 +01:00
Miklos Vajna
7c88097163 loolwsd: update bundled headers 2015-11-23 12:12:10 +01:00
Caolán McNamara
dfa6fd134f info_ptr leak I bet
Change-Id: Ica1a162a9ff1e1648c1ee5ef9edf4177b756ea51
Reviewed-on: https://gerrit.libreoffice.org/20091
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2015-11-20 16:12:38 +00:00
Andras Timar
0407e8d505 loolwsd: bump version after tarball 2015-11-20 11:14:43 +01:00
Andras Timar
01f258921c loolwsd: bump version before tarball 2015-11-20 11:14:43 +01:00
Henry Castro
41d94bc9da loolwsd: clear queue before socket shutdown
This cause broke pipe exception
2015-11-19 07:32:48 -04:00
Henry Castro
238e674ba9 loolwsd: avoid double socket shutdown
This cause abnormal socket close
2015-11-19 07:22:59 -04:00
Miklos Vajna
bc38b2c265 loolwsd: -Werror,-Wshadow
With this, loolwsd builds with clang.
2015-11-19 11:23:45 +01:00
Miklos Vajna
0723a96df7 HTTPWSTest: share socket init code between tests 2015-11-19 11:11:47 +01:00
Miklos Vajna
7be61ec464 HTTPWSTest: add document rendering options testcase
Fails without commit 57199a36cd (loolwsd:
route rendering options to initializeForRendering(), 2015-11-19).
2015-11-19 11:03:32 +01:00
Miklos Vajna
b066c91c8f loolwsd: factor out LOOLSession::parseDocOptions() from *ProcessSession 2015-11-19 10:30:45 +01:00
Miklos Vajna
57199a36cd loolwsd: route rendering options to initializeForRendering() 2015-11-19 10:10:18 +01:00
Miklos Vajna
93c0d29c5c loolwsd: accept load options in ChildProcessSession::loadDocument() 2015-11-19 10:10:17 +01:00
Miklos Vajna
e644fd2e1c loolwsd: -Werror,-Wunused-value
Found by clang.
2015-11-19 08:32:14 +01:00
Jan Holesovsky
7e4f1d3b61 loolwsd: KillMode=control-group for the debian systemd config too. 2015-11-18 18:53:32 +01:00
Miklos Vajna
e6f0abf763 loolwsd: support getting load options
This is a single json that contains both load and rendering options.
Currently only the rendering ones are added to it by the client.

Also, just accept the options string for now, a later commit will have
to actually pass the rendering part to
lok::Document::initializeForRendering().
2015-11-18 18:12:27 +01:00
Miklos Vajna
cb189234b0 loolwsd: describe so far undocumented part= parameter of the load command 2015-11-18 17:53:03 +01:00
Miklos Vajna
fe1aacd6d0 loolwsd: update the bundled headers 2015-11-18 17:00:34 +01:00
Mihai Varga
d18667d000 ccu#1273 support utf8 characters in the message passing server <-> client 2015-11-17 20:07:48 +02:00
Mihai Varga
9fd963398e loolwsd: bump version after tarball 2015-11-17 19:25:59 +02:00
Mihai Varga
cba634a6f1 loolwsd: bump version before tarball 2015-11-17 19:24:52 +02:00
Andras Timar
330643098a loolwsd: bump version after tarball 2015-11-17 14:47:24 +01:00
Andras Timar
78a84c3567 loolwsd: bump version before tarball 2015-11-17 14:45:40 +01:00
Jan Holesovsky
9e9974e186 loolwsd: Update LOK headers to get setClientZoom and LOK_CALLBACK_CELL_FORMULA. 2015-11-16 20:29:21 +01:00
Andrzej Hunt
0ab5560758 loolwsd: re-add erronously remove break
Seems to have been removed accidentally in:
c1efc7c012
2015-11-13 11:24:44 +01:00
Mihai Varga
c1efc7c012 Formula bar for calc 2015-11-12 16:55:56 +02:00
Mihai Varga
242870cb9f use setClientZoom() before postMouse/Key event 2015-11-12 16:54:45 +02:00
Andrzej Hunt
74edae8703 loolwsd: support LOK_CALLBACK_MOUSE_POINTER 2015-11-10 13:46:41 +01:00
Andrzej Hunt
69325ce576 loolwsd: update bundled headers to contain LOK_CALLBACK_MOUSE_POINTER 2015-11-10 13:46:41 +01:00
Andras Timar
0ffa93de8a loolwsd: bump version after tarball 2015-11-10 09:09:15 +01:00
Andras Timar
efae9b496e loolwsd: bump version before tarball 2015-11-10 09:08:31 +01:00
Jan Holesovsky
0f03c3b925 loolwsd: Don't assert on 'canceltiles'.
Fixes a regression from 6a1477d8a9 where now the
'canceltiles' command reaches the ChildProcessSession::handleInput().

This is good in general - in case'd need to add some special handling even to
the handler; but so far all we need happens on the message queue level.
2015-11-09 22:20:26 +01:00
Jan Holesovsky
2dcfb61a69 loolwsd: Don't crash due to an uncaught std::out_of_range exception.
Let's invalidate everything in such a case.
2015-11-09 20:21:13 +01:00
Andras Timar
9f84cc2e25 loolwsd: loolwsd.service KillMode should be control-group 2015-11-09 13:01:24 +01:00
Jan Holesovsky
6a1477d8a9 loolwsd: Specialize the MessageQueue a bit.
Introduce a bit of hierarchy there, at some stage we'll want to re-order the
tile requests a bit so that it works better for collaborative editing; for the
moment, removing the duplicate entries is enough.
2015-11-09 11:54:09 +01:00
Jan Holesovsky
dfcaaf91aa loolwsd: Remove the tiles also from the child's queue.
The commands leave the parent's queue very quickly, the child's queue is the
critical one, so remove them also from there.  This speeds up the typing
experience very considerably.
2015-11-06 18:27:32 +01:00
Jan Holesovsky
c44e0a6266 loolwsd: Log the tile rendering times. 2015-11-06 18:27:32 +01:00
Jan Holesovsky
37cb3c247a loolwsd: We have only ms resolution anyway, clean this up. 2015-11-06 18:27:32 +01:00
Jan Holesovsky
fbb184d256 loolwsd: More readable timestamps, 100ns resolution.
Actually POCO doc claims 100ns resolution, but unfortunately it seems it is ms
only; will improve later in case it is necessary.
2015-11-06 12:07:29 +01:00
Andrzej Hunt
ab5b41b740 loolwsd: use length here too 2015-11-05 12:52:06 +01:00
Andrzej Hunt
09e823e750 loolwsd: tdf#94605 handle LOK_CALLBACK_CELL_CURSOR 2015-11-05 12:52:05 +01:00
Andrzej Hunt
b46bc1bcf6 loolwsd: update the bundled headers 2015-11-05 12:52:05 +01:00
Jan Holesovsky
c6743b4d64 loolwsd: Remove the potential leftover document before attempting to link.
Otherwise we create a copy, and at the moment, the copy is not copied back out
of the chroot jail; we should bind that to the .uno:Save callback...
2015-11-05 12:17:21 +01:00
Jan Holesovsky
7a88c9b959 loolwsd: Document unocommandresult in the protocol. 2015-11-04 13:33:11 +01:00
Jan Holesovsky
db38aaff1c loolwsd: Handle LOK_CALLBACK_UNO_COMMAND_RESULT.
Also update according to the API change, and trigger the notification when
calling .uno:Save.
2015-11-03 19:29:50 +01:00
Jan Holesovsky
9f75fbd2fc loolwsd: Update the bundled LOK to contain LOK_CALLBACK_UNO_COMMAND_RESULT. 2015-11-03 19:29:50 +01:00
Andras Timar
510db7bbdc loolwsd: bump version after tarball 2015-10-30 13:19:45 +01:00
Andras Timar
16f8e75d1d loolwsd: bump version before tarball 2015-10-30 13:19:45 +01:00
Andras Timar
87554d1be9 Collabora Office as requirement 2015-10-30 13:19:45 +01:00
Jan Holesovsky
2691d88909 Revert "loolwsd: Update systemplate with every startup of the service."
This is not a good idea, it takes too long for systemd, and times out.

This reverts commit b42409c388.
2015-10-30 11:34:41 +01:00
Jan Holesovsky
b42409c388 loolwsd: Update systemplate with every startup of the service. 2015-10-30 10:40:22 +01:00
Andras Timar
2d37bbcc20 skip make check for rpmbuild 2015-10-29 16:32:03 +01:00
Andras Timar
3310c03a1a loolwsd: bump version after tarball 2015-10-29 15:53:41 +01:00
Andras Timar
dd1c12fcd6 loolwsd: bump version before tarball 2015-10-29 15:50:46 +01:00
Miklos Vajna
1409ef11ec loolwsd: allow duplicate messages for all message types expect tile
To be on the safe side, I only allowed "uno" previously, but Mihai
confirmed that the intention was to filter out "tile" duplicates, so
filter out only that.
2015-10-28 17:29:51 +01:00
Miklos Vajna
31982808f4 loolwsd: disable -Wshadow with self-built poco
poco itself isn't warning-free wrt. -Wshadow, so we can only use it if
it's at a location where the system suppresses such warnings.
2015-10-28 16:38:57 +01:00
Miklos Vajna
0fe05e6d91 loolwsd: -Werror=shadow 2015-10-28 10:55:27 +01:00
Miklos Vajna
3d613a443f loolwsd: add paste testcase
Fails with commit cc24463f08 (loolwsd:
wrap lok::Document::paste(), 2015-10-27) reverted.
2015-10-28 10:42:29 +01:00
Miklos Vajna
b5ed22c4d9 loolwsd: avoid filtering out "duplicated" uno commands
Problem since commit 8f48dabf28 (loolwsd:
discard requests that are in the queue already, 2015-07-21), e.g.
"select-all, paste, select-all" doesn't have the same meaning as
"select-all, paste".

Quite possibly the condition should be inverted, and filtering out
should be done only for a few commands, like "tile"; but at least
filtering out "uno" is definitely problematic.
2015-10-28 10:28:27 +01:00
Miklos Vajna
cc24463f08 loolwsd: wrap lok::Document::paste() 2015-10-27 11:53:32 +01:00
Miklos Vajna
c2a681ff4d loolwsd: update the bundled headers 2015-10-26 17:21:15 +01:00
Mihai Varga
58d7c99f19 loolwsd: added getChildId and insertFile methods
getChildId is used to get the chroot's name and insertFile inserts a the
/user/thedocument/insertfile/file_name file in the document
2015-10-22 18:32:19 +03:00
Mihai Varga
28f3555180 loolwsd: insert file HTTP request handler
The client send a file through an http post request, the handler saves
the file in a temporary directory then moves it in the specified chroot
2015-10-22 18:27:29 +03:00
Miklos Vajna
9917dd733f HTTPPostTest::testConvertTo: fix accidentel copy&paste 2015-10-21 13:58:50 +02:00
Miklos Vajna
3ed78cce6f loolwsd: add HTTP POST convert-to testcase
Fails with 8f90c38844 (loolwsd convert-to:
implement actual conversion, 2015-10-20) reverted.
2015-10-21 13:51:30 +02:00
Miklos Vajna
443486117a loolwsd: cppunit skeleton 2015-10-21 12:06:02 +02:00
Miklos Vajna
71ce604adb loolwsd: add initial reference.txt to document HTTP POST API 2015-10-20 18:10:40 +02:00
Miklos Vajna
8f90c38844 loolwsd convert-to: implement actual conversion 2015-10-20 15:41:42 +02:00
Miklos Vajna
355362f519 loolwsd convert-to: clean up temp directory in case format would be empty 2015-10-20 15:35:43 +02:00
Miklos Vajna
cdc0783c27 LOOLWSD: put file we get from convert-to to a temp. dir
Having a URL like file:///tmp/tmp13630baaaaa/test.txt allows retaining
the filename given by the user and still work with a URL.

We could try carrying around a memory buffer, but we would still have to
send it over the WS, so it's easier if we always work with URLs instead.
2015-10-20 15:00:20 +02:00
Miklos Vajna
847c65cb1c LOOLSession: handle file:// in the ToPrisoner saveas input handler 2015-10-20 14:45:00 +02:00
Miklos Vajna
dc56637e11 loolwsd: don't try to exclude jails from tags
Don't pretend that we know where jails will be, the may be elsewhere. If
indexing jails/systemplate is problem, configure them outside the build
tree instead.
2015-10-20 14:18:02 +02:00
Miklos Vajna
4feb29d1df LOOLSession: inform to-client session about completed save-as 2015-10-20 14:03:39 +02:00
Miklos Vajna
cc18cc702f loolwsd: extraft filename from convert-to parameters 2015-10-19 16:03:55 +02:00
Miklos Vajna
f0ba09f3dd LOOLSession: check for 0 _ws 2015-10-19 16:03:55 +02:00
Mihai Varga
0ea00afb99 loolwsd: allow the specification of the mime type 2015-10-16 19:45:57 +03:00
Mihai Varga
d7ceedac54 drop 'part' from downloadas protocol as it is no longer needed 2015-10-16 19:35:31 +03:00
Miklos Vajna
fed0cbc77c loolwsd: -Werror=unused-parameter 2015-10-16 17:45:03 +02:00
Miklos Vajna
9212c1c321 loolwsd: convert-to handler skeleton 2015-10-16 17:38:24 +02:00
Miklos Vajna
63bf9a1329 loolwsd: invert this condition, so it's possible to add other cases 2015-10-16 15:47:39 +02:00
Miklos Vajna
700b7d08b7 loolwsd: allow frame size of 200K
I got:

WebSocketException: Insufficient buffer for payload size 113579

So double the allocated size: that seems to help.
2015-10-16 15:24:19 +02:00
Mihai Varga
84b7b128a0 loleaflet: fullscreen slideshow
We request svg exports for each slide which we then display in fulscreen
2015-10-16 14:07:45 +03:00
Tor Lillqvist
c639e76ac2 bugs.ccu#1248: Copy also locale data into systemplate
Let's hope the files I list is enough to cover both openSUSE 13.2 and
Debian 8.
2015-10-16 12:55:47 +03:00
Miklos Vajna
2cf417f863 loolwsd: update the bundled headers 2015-10-14 16:13:30 +02:00
Mihai Varga
0708e4440f added a part parameter to the 'downloadas' command
We need it to export a specific slide to svg
2015-10-13 20:58:45 +03:00
Tor Lillqvist
7e78f3f0c6 bugs.ccu#1248: If locale is C, set it to en_US.utf8 2015-10-13 20:05:42 +03:00
Miklos Vajna
677de915ff loolwsd: remove redundant LOK_CALLBACK_SEARCH_RESULT_COUNT handling 2015-10-13 14:54:59 +02:00
Miklos Vajna
d19f483085 loolwsd: update the bundled headers 2015-10-13 14:53:30 +02:00
Mihai Varga
c4825f5492 loolwsd: allow cross origin requests 2015-10-12 20:33:29 +03:00
Mihai Varga
51505e1934 add an ID parameter to the downloadas command
We need it to know wheter the user wants to download the file or just
print it, etc
2015-10-09 17:20:18 +03:00
Mihai Varga
676c6d60d1 tdf#94607 downloadAs command that generates an URL for the doc
When requested, the document is exported under
/jail_path/CHILD_ID/user/thedocument/RANDOMDIR/filename
and CHILD_ID, RANDOMDIR and the filename are communicated to the client.

When the client requests
http://server:port/CHILD_ID/RANDOMDIR/filename, the exported document
is served and then RANDOMDIR is removed
2015-10-09 16:11:38 +03:00
Mihai Varga
a4003470e3 loolwsd: update the bundled headers 2015-10-08 16:49:46 +03:00
Mihai Varga
d8fa9d708b handle LOK_CALLBACK_SEARCH_RESULT_SELECTION callback 2015-10-06 18:05:44 +03:00
Mihai Varga
886cdc80df search result count callback handler 2015-10-05 16:44:40 +03:00
Mihai Varga
14dca89150 We now send the mouse button that has been pressed and also they key
modifiers for actions such as ctrl+click or shift+click
2015-10-05 15:04:19 +03:00