Commit graph

1330 commits

Author SHA1 Message Date
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
Ashod Nakashian
04d263cba0 loleaflet: .gitignore load_test dirs
Change-Id: I03bee4676f50e1e88ffd29c84962d7e5f0977381
Reviewed-on: https://gerrit.libreoffice.org/21155
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2016-01-06 14:21:01 +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
Ozcan Esen
56ac4eac74 loleaflet: load tiles of the first slide before loading slide thumbnails
and show 180x135 white placeholder image in the thumbnail while waiting
for the actual thumbnail

Change-Id: I768815b5d54e02000718d5a443f820ac665dac60
Reviewed-on: https://gerrit.libreoffice.org/21049
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2016-01-04 21:51:04 +00:00
Ozcan Esen
13eacefe60 loleaflet: make presentation controls more portable
Change-Id: I3834f115a3bde8720149fdefdf132684e9a546da
Reviewed-on: https://gerrit.libreoffice.org/21000
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2016-01-04 21:50:51 +00:00
Andras Timar
9ff69b3a6a bccu#1395 ignore Cmd (Meta) keyboard modifier 2016-01-04 22:22:18 +01:00
farukuzun
8dd56fafe7 loleaflet: Fix Ctrl+Alt+C (insert comment) on Firefox
On Firefox, pressing Ctrl+Alt+c (uppercase "C" is working fine)
to insert a comment causes a "c" letter in comment box,
because KeyboardEvent.char[0] deprecated. It is working
quite well in other browsers. A workaround is needed for Firefox.

[0]: https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent/char

Change-Id: Iaf89c8b3b758e99189dd982e2d36aef559a32f1a
Reviewed-on: https://gerrit.libreoffice.org/21086
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Tested-by: Andras Timar <andras.timar@collabora.com>
2016-01-04 20:26:06 +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