strepsirrhini/libreoffice-online
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1
5395 commits 1 branch 0 tags 244 MiB
Commit graph

5395 commits

This branch
This branch
All branches
Author SHA1 Message Date
Henry Castro
91649dc4b6 loleaflet: remove line arrow to replace the text selection 
Change-Id: I20a85c65463930c3f60c47fc770b68d191887fda
 2017-03-17 19:07:27 -04:00
Michael Meeks
a6a4094e52 Send ping message, handle pong & store ping-time on the Websocket. 2017-03-17 22:59:03 +00:00
Michael Meeks
9381d4134f Unify and simplify timeout and poll events setup. 
Both happen at the same time, and need support from the
SocketHandlerInterface.

Rename hasQueuedWrites to getPollEvents and merge updateTimeout.
 2017-03-17 22:00:28 +00:00
Henry Castro
3190483d7c loleaflet: convert anchorPos to L.Bounds 
Change-Id: I8fb648ec52e21a93a1f76fe44224e5481a697453
 2017-03-17 17:35:05 -04:00
Michael Meeks
3a5ca4b03f Switch to std::chrono from Poco::Time and simplify lots. 2017-03-17 21:13:11 +00:00
Michael Meeks
e9dbab6900 Always call handlePoll so we can handle timeouts. 2017-03-17 21:13:11 +00:00
Miklos Vajna
c646be30b6 UnitPrefork: fix -Werror,-Winconsistent-missing-override 
Change-Id: Iba10362ead68427ea5ca6a9988708e3cd6710f17
 2017-03-17 12:25:38 +01:00
Pranav Kant
f57e412403 loleaflet: Tell WOPI host if document was ever modified by user 
Change-Id: Ic99136168716d7a01d1388c4f5e1107ef9e64616
 2017-03-17 15:42:10 +05:30
dewana-dewan
a3c1a685cd implemented zooming with Ctrl-<mousewheel> 
Change-Id: I27e53715719fd84b3e22940cc5688e87ae1f0805
Reviewed-on: https://gerrit.libreoffice.org/35288
Reviewed-by: pranavk <pranavk@collabora.co.uk>
Tested-by: pranavk <pranavk@collabora.co.uk>
 2017-03-17 08:32:02 +00:00
Dewan
92ad94f259 display lokit and loolwsd version in admin panel 
Change-Id: Ia5b89373bfd7e921597b73d5a84963268244b748
Reviewed-on: https://gerrit.libreoffice.org/35199
Reviewed-by: pranavk <pranavk@collabora.co.uk>
Tested-by: pranavk <pranavk@collabora.co.uk>
 2017-03-17 07:53:06 +00:00
Pranav Kant
5a12b68b01 Fix unit test timeout interfering with normal run 
Otherwise, loolwsd exits immediately upon start

Change-Id: I3bdf438797be162b8a44bb47ee1ddde7626dcc64
 2017-03-17 12:44:23 +05:30
Ashod Nakashian
5aedff2422 wsd: convert-to functional again 
Change-Id: Ibfdec5e898ccb7f851a09fb3fb5eae85ca20f482
Reviewed-on: https://gerrit.libreoffice.org/35307
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
 2017-03-17 04:05:19 +00:00
Ashod Nakashian
f9664bb369 wsd: send recylcing message to clients on shutdown 
Change-Id: Ibeb37b801e388fa33671a3c7df564c8ed86d9b71
Reviewed-on: https://gerrit.libreoffice.org/35306
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
 2017-03-17 04:04:46 +00:00
Michael Meeks
bb3fa00631 UnitPrefork - restore most of the functionality. 
No need for the memory reporting bits now that Admin gets this right.
 2017-03-16 19:13:14 +00:00
Michael Meeks
ab67d605e6 Unit tests: use WSD's main socket-poll for test timeouts. 2017-03-16 18:52:49 +00:00
Michael Meeks
2c14723e58 UnitFonts - disable. 
Now we use the forkit, font lists are always the same in kit & forkit.
 2017-03-16 18:33:03 +00:00
Michael Meeks
8749f4f2e3 Cleanup unit test hooks. 2017-03-16 18:32:12 +00:00
Michael Meeks
e7ebe0fdaa remove obsolete Poco headers, and Poco SSL pieces. 2017-03-16 18:03:23 +00:00
Michael Meeks
a6de441ed0 rename AdminRequestHandler to AdminSocketHandler. 2017-03-16 17:32:38 +00:00
Michael Meeks
4bc71cc86d Admin: remove debug. 2017-03-16 17:29:18 +00:00
Michael Meeks
69feb165dd Remove websocket assert on performWrites. 
Since commit 862d7a0734
      wsd: write as many messages to socket as possible:

This can be called even if hasQueuedWrites returns false.
 2017-03-16 17:23:42 +00:00
Michael Meeks
97cb6597c8 Admin: don't set 'secure' on auth cookie for http. 
Also tweak paths to accomodate bundlification, apparently un-necessary
in secure cookie mode, interestingly.
 2017-03-16 16:44:27 +00:00
Jan Holesovsky
b384867b3f Fix limiting of the connections. 
Change-Id: I9ff0aec168fd971599248fee177bf51b134e3e58
 2017-03-16 11:33:35 +01:00
Henry Castro
63c7662508 loleaflet: fix annotations of each sheet 
Change-Id: Ie3169a051523ea99a9d1108b5d921fd6c045ed3d
 2017-03-15 23:26:07 -04:00
Jan Holesovsky
191d22992d This must have been pushed by mistake. 
Change-Id: I62c516fec4485b176c9d50425030998e296ea369
 2017-03-15 21:00:24 +01:00
Michael Meeks
f392d9e6f0 Move http serving into socket impl. 
Avoid caching headers with parameter, and add Date: parameter.
 2017-03-15 18:21:59 +00:00
Michael Meeks
d19b6eb351 Move memstats & cpustats into the main polling thread. 
We can calculate the timeout ourselves easily and add it to the
polling loop simplifying life.

Also ensure we never send messages to a non-authenticated thread.
 2017-03-15 17:24:44 +00:00
Michael Meeks
0089723f69 Admin: review error handling on auth. failure. 2017-03-15 16:25:29 +00:00
Michael Meeks
909b5f8ac3 Admin: should be its own socket-poll goodness. 2017-03-15 16:13:13 +00:00
Michael Meeks
e1f576bdb3 Switch to using websocket here. 2017-03-15 15:12:52 +00:00
Michael Meeks
d9980e3392 Adjust initial AdminRequestHandler entry point. 2017-03-15 14:40:24 +00:00
Michael Meeks
6d6dc45850 Remove un-necesssary and inefficient wakeupWorld. 
While message emplacement happens in the DocumentBroker poll, we
can be sure that the next iteration of the poll will call
hasQueuedWrites before polling.
 2017-03-15 12:07:34 +00:00
Michael Meeks
44ec90343e SenderQueue - remove condition, and waiting. 2017-03-15 10:20:43 +00:00
Aron Budea
4a99210f97 loleaflet: Don't clear ids in unoCmdToToolbarId(...) 
Since 4030795584 spreadsheets
start with Undo/Redo/Doc. Repair buttons enabled, because
of this.

Change-Id: I20a22f483324289435825c3514894389176f57f3
Reviewed-on: https://gerrit.libreoffice.org/35056
Reviewed-by: pranavk <pranavk@collabora.co.uk>
Tested-by: pranavk <pranavk@collabora.co.uk>
 2017-03-15 05:18:23 +00:00
Ashod Nakashian
969fcbefb3 wsd: move convert-to handling into ConvertToHandler 
ClientSession still isn't getting the notification,
so document is not uploaded to the client just yet.

Change-Id: Ifda8ed394f6df1ec1a5bc1975d296dea496c0aed
 2017-03-15 00:04:55 -04:00
Ashod Nakashian
1288837401 wsd: createNewClientSession takes optional WS to notify client of progress 
Change-Id: Ief64685dd8cc363cfd21cedda38f907b6787b609
 2017-03-15 00:04:55 -04:00
Ashod Nakashian
6c8f3633de wsd: ClientSession becomes SocketHandler for WS sockets 
Change-Id: I02706ccac186e4934b8ccdab5cdebdba7170fd46
 2017-03-15 00:04:55 -04:00
Ashod Nakashian
fa1dc4e051 wsd: wrap polling thread and manage state correctly 
Change-Id: Iaa4eff1fac1cd7147603ba0c9d51fd8b6b0e96d2
 2017-03-15 00:04:55 -04:00
Ashod Nakashian
c8bece208d wsd: socket logs include socket FD for better traceability 
Change-Id: I994c7c5ab73b97be312a9d6abf3258dc5f4c08c1
 2017-03-15 00:04:55 -04:00
Ashod Nakashian
aa19964b03 wsd: SSL logging improvement 
Change-Id: I99d08a764fd43ab0c7eb50a1f017202e6bbc3477
 2017-03-15 00:04:55 -04:00
Ashod Nakashian
45e1c7763c wsd: Socket stores SocketHandler shared_ptr 
Change-Id: I5b460069eb4d91cee2d58833791f961fd6f42b39
 2017-03-15 00:04:55 -04:00
Henry Castro
00fb1aeddd loleaflet: fix annotations of each slide 
Change-Id: I85a27aadad9b03c8a190d3a4b2af7bcb86550a01
 2017-03-14 20:41:40 -04:00
Jan Holesovsky
d71ff2240a We don't expect the DocumentBroker isAlive() yet here. 
Change-Id: Ib0349d3764ca2f8a71f6ac355b0ebc8799ee3d43
 2017-03-14 17:43:21 +01:00
Andras Timar
8541cd1e46 add loolkitconfig.xcu to dist tarball 
Change-Id: Icca000db16fca09ba2769dee8cb18e847496d48c
 2017-03-14 16:04:10 +01:00
Andras Timar
15009c2a10 add ServerSocket.hpp to dist tarball 
Change-Id: I7f6241094580dae2212dfdf01999abaeeb49cf1f
 2017-03-14 15:40:16 +01:00
Andras Timar
5c94fa35c4 add LOOLWebSocket.hpp to dist tarball 
Change-Id: I997290c8af437c06bcacca49dc167533ab7917cf
 2017-03-14 15:16:54 +01:00
Pranav Kant
60e86cfba8 clearer log message, insert space here 
Change-Id: I883867e66060838d8f6c879b9bba44f93fb7bd51
 2017-03-14 19:19:27 +05:30
Pranav Kant
9efb0e8701 loolwsd: Fix dump states output 
Change-Id: Idf578e1833b0013bb694e8cd5a8630bf48938c56
 2017-03-14 18:04:50 +05:30
Ashod Nakashian
b258355039 wsd: StreamSocket supports changing its SocketHandler 
Change-Id: I2ffc33daad4da5b98183af39e3c2a64e7e10b3e8
Reviewed-on: https://gerrit.libreoffice.org/35158
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
 2017-03-14 04:31:22 +00:00
Ashod Nakashian
8b9623010a wsd: sendHttpResponse -> send 
Change-Id: I7c94f6d4cd1054ea86585bfcd4079140471f3518
Reviewed-on: https://gerrit.libreoffice.org/35157
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
 2017-03-14 04:30:55 +00:00