Commit graph

1967 commits

Author SHA1 Message Date
Andras Timar
5f77a1f611 new default: Collabora Office 5.1 2016-07-18 17:04:25 +02:00
Miklos Vajna
24624762df DocumentBroker: use std::move() instead of manual reset()/release() 2016-07-18 10:33:04 +02:00
Pranav Kant
da6af8b4ec loolwsd: Don't upload to storage if document is unmodified
If core says that document save operation failed because document
was in unmodified state, don't upload to storage (hence no
revision)

Change-Id: I47fbc8a7bc632bb7977d263d697d665161f3b076
2016-07-18 12:12:12 +05:30
Pranav Kant
e6e9236a6a unit-admin: Enable a test
testRmDocNotify was disabled earlier as it seemed to fail
intermittently. Hopefully, refactoring in
78876b011d2c3da972ef456a6da2cac08cb0d7d6 and
4360d31c9e8a3a099d869a9dfd0e2db8a0c03a52 should fix this one too.

Change-Id: I542ca27fab7eb4dfa8ed4a55a7f2eada63e7b96c
2016-07-18 12:03:27 +05:30
Ashod Nakashian
6536ba2fe2 loolwsd: correct multiview creation
Change-Id: Id6675f6410793b743aec53182a4b5756b7cffa23
Reviewed-on: https://gerrit.libreoffice.org/27272
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2016-07-18 02:49:45 +00:00
Miklos Vajna
8054df543a ClientSession: use std::move() where it avoids copying 2016-07-15 14:47:08 +02:00
Pranav Kant
732c54313d loolwsd: Get rid of superfluous long list of fonts in test output
They make it difficult and annoying to analyze the test logs.

Change-Id: If970ab8296206e7462fe205a9b40cdf26a1eb37f
2016-07-14 10:59:36 +05:30
Ashod Nakashian
f52fa89036 Build-time configurable WSD limits
The server can now be configured at build time
to limit the total number of connections and/or
the number of open documents, at a given time.

./configure --with-max-documents=10 --with-max-connections=20
will limit the number of documents to 10 and total
number of connections (on one or all documents) to 20.

Change-Id: I0c73a7e906c4f567cb3da480e885524815c9cc89
Reviewed-on: https://gerrit.libreoffice.org/27203
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2016-07-14 02:18:58 +00:00
Pranav Kant
0f506fcbb0 Some more admin test cleaning
Change-Id: I3cea5b6fefcb7b4e6209c63e6b3e232b9db50a7b
2016-07-14 01:08:46 +05:30
Pranav Kant
4530bfdb0a loolwsd: Fix Admin unit test
Admin notify messages are emitted when websocket connection is
established, not when 'load' message is sent.

And, some minor cleaning.

Change-Id: If52a77c10c3af64dcca8d6c10868b3d46f48c774
2016-07-14 01:08:39 +05:30
Miklos Vajna
9d337fa1e0 ChildSession: no need to copy these function objects 2016-07-13 09:23:22 +02:00
Miklos Vajna
ec0c49447f Admin: avoid unsigned long -> unsigned int coversion 2016-07-12 15:56:19 +02:00
Pranav Kant
fc5047e827 Use -isystem and remove conditional -Wshadow
Change-Id: Icee68e557a3a0634c2da7385e29d658ec4f6e905
2016-07-11 13:29:24 +05:30
Miklos Vajna
5523c48f3f ClientSession: fix -Werror=shadow 2016-07-11 09:45:10 +02:00
Miklos Vajna
07b6f0ce64 Update bundled headers 2016-07-11 09:22:47 +02:00
Miklos Vajna
990108d243 test: make check insist on a log file for skipped tests 2016-07-11 09:22:47 +02:00
Miklos Vajna
9304c4152d HTTPWSTest: disable failing test on LO >= 5.2 for now 2016-07-11 09:22:47 +02:00
Pranav Kant
4ecfb0da21 loolwsd: -Werror=shadow
Change-Id: Ic0bfead873ab7f0b9c177183c0f6d3179d097d96
2016-07-11 11:57:58 +05:30
Pranav Kant
a6187e6172 loolwsd: Reset document destroying states
These values are recalculated anyways now, when destroying the
document (See startDestroy())

Change-Id: Idfe4c48983556bb2b31ca0d6bf2ffcde84281a2d
2016-07-11 11:25:25 +05:30
Pranav Kant
06dc3fd1bc loolwsd: Give editlock correctly when adding a new session
This should be given to first editable(non-readonly) session.

Change-Id: I3b6e53df4b2450cc799c4b4e6a800f662d90a2c1
2016-07-11 11:25:20 +05:30
Pranav Kant
d18379adce loolwsd: Show only abbreviated message when reading from cache
Change-Id: I6d5c8984010e2917b9069df6ee3b0a28c678b297
2016-07-11 11:24:19 +05:30
Pranav Kant
62814d29cf loolwsd: Introduce a readonly mode
Specified when websocket is initialized. Documents once
opened in readonly mode cannot edit throughout the life of the session.
This is very much like present view mode except the ability to
change to edit mode.

Change-Id: I176e3bbf210c3383268d1a5b50dc17f0cbfb26b8
2016-07-11 11:24:16 +05:30
Pranav Kant
162619be72 loolwsd: Avoid such abbreviations
Change-Id: Id63c960e198b9c5d45026833a24d6330ca137d35
2016-07-11 10:23:29 +05:30
Pranav Kant
37b9226030 loolwsd: unused variable
Change-Id: I60d10e4390b7c114273f517fb66786861f37db60
2016-07-11 10:23:29 +05:30
Pranav Kant
3d306a0d7b loolwsd: Don't check canDestroy again
We do not need to check canDestroy again after removing the
session if sessionCount > 1, otherwise we end up with
force-saving also for the second last session.

Change-Id: Iea4736569d07d9b23f78b0f6407f78eca6090d67
2016-07-11 10:23:08 +05:30
Henry Castro
adf4369237 loolwsd: test: state changed UNO commands 2016-07-10 14:28:28 -04:00
Miklos Vajna
3df68f3869 loolwsd: support CPPUNIT_TEST_NAME, similarly to core.git 2016-07-08 09:04:28 +02:00
Ashod Nakashian
64741ebb87 loolwsd: dump calc tile for debugging purposes
Change-Id: Ie2d92026fb77a4f94d6434ec25fc10695118971e
Reviewed-on: https://gerrit.libreoffice.org/27022
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2016-07-07 20:27:34 +00:00
Ashod Nakashian
2c4efeb5f3 loolwsd: fix PreFork test
We could have up to 3 pipes and we should tollerate them
when testing for leaking FDs and pipes.

The 3rd is probably a file redirection.

Change-Id: I913072307646e62e1802587c9142b2eb8c9dd7bb
Reviewed-on: https://gerrit.libreoffice.org/27021
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2016-07-07 20:27:18 +00:00
Miklos Vajna
2419df6e60 Update bundled headers 2016-07-07 19:21:57 +02:00
Ashod Nakashian
0d6cb541a3 loolwsd: better handling of bad requests
Change-Id: Ib1c4dee227275efc9b481f76b9d9892f98be61e7
Reviewed-on: https://gerrit.libreoffice.org/27017
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2016-07-07 16:50:51 +00:00
Ashod Nakashian
ac9c109581 loolwsd: logging
Change-Id: I458743348e2e163f917f0fe43cc340d72556021c
Reviewed-on: https://gerrit.libreoffice.org/26994
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2016-07-07 03:51:12 +00:00
Ashod Nakashian
bb9168096d loolwsd: test fixes
Change-Id: I927bab6c88c72247a7bf6fb73ae56e1ebc51cdbd
Reviewed-on: https://gerrit.libreoffice.org/26993
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2016-07-07 03:50:16 +00:00
Ashod Nakashian
42f857efe0 loolwsd: cleanup of testTileInvalidateCalc
Change-Id: Ic15d12f0b203244b3de1b80e97866f134efd82f7
Reviewed-on: https://gerrit.libreoffice.org/26992
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2016-07-07 03:49:31 +00:00
Ashod Nakashian
0eba4a17f8 loolwsd: remove unnecessary wait for invalidatetiles in tests
Change-Id: Ica79b995ef14fbf7d57e9ef435c87a84d854d5b8
Reviewed-on: https://gerrit.libreoffice.org/26991
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2016-07-07 03:49:07 +00:00
Ashod Nakashian
370c21f4b5 loolwsd: fix testTileInvalidateWriter
Change-Id: I701c348cbfe55f850bb2180b400020d1b1b01f31
Reviewed-on: https://gerrit.libreoffice.org/26989
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2016-07-07 03:35:43 +00:00
Henry Castro
c7a655b54d loolwsd: doc: running unit tests 2016-07-04 15:38:21 -04:00
Andras Timar
801c8f4676 loolwsd: command line config override should work in non-debug builds as well ;) 2016-07-03 16:43:47 +02:00
Pranav Kant
0b8e9dedaf loolwsd: Print abbreviated message while saving to TileCache
Change-Id: I1f77062466e3672ce742b6a46e3c39b35ce70f31
2016-07-01 20:29:19 +05:30
Pranav Kant
d60da277e8 loolwsd: Follow symlinks while copying fonts into systemplate
Change-Id: Iee7f5b1dd3cb1884ac51f58c1b6c1ba2b73a7c30
2016-06-29 19:44:34 +05:30
Andras Timar
cdf14cea3e loolwsd: remove libmysqlclient18 from deb package dependencies 2016-06-28 10:10:37 +02:00
Pranav Kant
0f23d617ca loolwsd: Fix incorrect WOPI PutFile path in logs
Change-Id: I90f0cd249b1b32593e16801a3c78daa128aa6d71
2016-06-28 12:11:25 +05:30
Ashod Nakashian
b7e0766fea loolwsd: removed lo_jail_subpath
Really unused setting that caused deployment complications.

Change-Id: If837fca4c904e82b23babd4a1f0f3f15b5ef57f4
Reviewed-on: https://gerrit.libreoffice.org/26705
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2016-06-27 12:29:55 +00:00
Andras Timar
6620502229 loolwsd: fix run_valgrind target with new command line options 2016-06-27 09:45:29 +02:00
Andras Timar
f540fb087c loolwsd: document new command line options in READMEs 2016-06-27 09:41:41 +02:00
Andras Timar
93e1104505 loolwsd: use the new command line options in spec file for default admin 2016-06-27 09:27:25 +02:00
Andras Timar
c3db6d719e reserve version 2.0.0 for actual release... 2016-06-27 09:20:09 +02:00
Andras Timar
e85179e0f8 loolwsd: let loolwsd.service use the new command line options 2016-06-27 09:15:40 +02:00
Andras Timar
8b07403629 loolwsd: use LOOLWSD_CONFIGDIR and LOOLWSD_CACHEDIR in default config 2016-06-27 07:37:04 +02:00
Ashod Nakashian
e8cd9e35d3 bccu#1909 - loolwsd command line options vs. config file and package upgrades
Unit tests updated with new command-line arguments.

Change-Id: I1a391255c44d4d22b8304129634ef7d16b606bce
Reviewed-on: https://gerrit.libreoffice.org/26683
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2016-06-26 20:45:12 +00:00