Commit Graph
14 Commits
Author SHA1 Message Date
Xisco Fauli 4527af4388 Java-WebSocket: Upgrade to 1.5.6
Downloaded from https://github.com/TooTallNate/Java-WebSocket/archive/refs/tags/v1.5.6.tar.gz

Change-Id: Ie6c86b3f7e41147133919daca699a6c96372e44f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167665
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2024-05-15 18:17:25 +02:00
Christian Lohmaier 3c54cb2a9d add MSYS_NO_PATHCONV=1 to prevent MSYS auto-magic
git-bash/MSYS tries to resolve anything that looks like a path (i.e.
anything starting with a /) - if the "target" doesn't exists, it just
prepends the MSYS installation dir and breaks all kind of stuff.
You could escape those with double-slash at the beginning, but that
would mean lots of noise/unnecessary changes in pretty much every
makefile, so just getting rid of that behavior is much better.

ant and some externals however rely on MSYS path-conversion, so unset
MSYS_NO_PATHCONV for those. Ant does its own checks whether it
runs under cygwin or msys, and easier to please externals using the
autoconversion than to add patches to force them into compliance…

Change-Id: Ie80964e40c53ace80adb4707aae0db63ebc4ee4c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166330
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2024-04-26 14:00:35 +02:00
Caolán McNamara 20eed0f37d cid#1545413 drop PerMessageDeflateExtension
Change-Id: Iac5133ebddf026037af22e0f22fead658348b108
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157696
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
2023-10-09 13:27:25 +02:00
Caolán McNamara dd1e392dfd cid#1546344 Dm: Dubious method used
Change-Id: If9aaf45784d766651a74de16804c727ac9d066ad
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157572
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
2023-10-05 11:37:53 +02:00
Caolán McNamara f2019dd0e5 cid#1545249 Bad bit shift operation
Change-Id: I90a6e1751891e57543a2b2f4312b424df6080f95
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157571
Tested-by: Jenkins
Tested-by: Caolán McNamara <caolan.mcnamara@collabora.com>
Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
2023-10-05 11:37:33 +02:00
Caolán McNamara e555ea5937 cid#1546341 Resource leak on an exceptional path
Change-Id: Ia4d91ecb2bbd1d325a801b0b40ab478dc5dd3102
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157560
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Caolán McNamara <caolan.mcnamara@collabora.com>
Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
2023-10-05 09:36:55 +02:00
Caolán McNamara 9e6454142c cid#1545284 fix UR: Uninitialized read of field in constructor
Change-Id: I6d2449f86c4d5745c6068b5df4bf362198cabd18
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157479
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
2023-10-02 17:30:17 +02:00
Caolán McNamara 5046b36374 cid#1546494 Dm: Dubious method used
Change-Id: I19a4a9321d544eb6d9d37ffb82bbbbfc4f08661c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157473
Tested-by: Caolán McNamara <caolan.mcnamara@collabora.com>
Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
2023-10-02 09:34:02 +02:00
Caolán McNamara d4f7f7b22b cid#1545515 Dm: Dubious method used
Change-Id: Ife18effd9e477e977e555aea03a78b312e99c6c5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157472
Tested-by: Caolán McNamara <caolan.mcnamara@collabora.com>
Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
2023-10-02 09:33:48 +02:00
Caolán McNamara d96f8e8761 cid#1546292 DLS: Dead local store
Change-Id: Id3afb3c3541f55da5e1bff6f139c7320d6760b0f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157471
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
2023-10-02 09:33:27 +02:00
Caolán McNamara 060f6be53c cid#1545284 UR: Uninitialized read of field in constructor
and

cid#1545614 UR: Uninitialized read of field in constructor

Change-Id: I7d801651951fa7243cdd106f54f6a15bdfb0e423
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157470
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
2023-10-01 21:49:02 +02:00
Caolán McNamara 506fb76688 cid#1546192 SIC: Inner class could be made static
Change-Id: Ib8a298d86a7f04a2ca63751e3e39960e276b6514
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157439
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
2023-09-30 22:20:52 +02:00
Caolán McNamara d8dbf35c48 set java_websocket source as UTF-8
to avoid

    [javac] core/workdir/UnpackedTarball/java_websocket/src/main/java/org/java_websocket/util/Charsetfunctions.java:88: error: unmappable character (0xC3) for encoding US-ASCII
    [javac]    * Implementation of the "Flexible and Economical UTF-8 Decoder" algorithm by Bj??rn H??hrmann

with LANG=C

Change-Id: Idc7296101f18ef4d0cbedb232834b1cc674444c9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156552
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
2023-09-05 13:35:46 +02:00
Skyler Grey 8e246331f6 Add a FunctionBasedURPConnection and a websocket URP connector
- FunctionBasedURPConnection is used to enable a client to open a URP
  connection to a fresh Kit instance in COOL.
- This URP connector can be used with that and
  https://github.com/CollaboraOnline/online/pull/6992 to use a Java Uno
  Remote Protocol client over websockets
- For interoperability with existing Collabora Online websockets a
  prefix (urp ) is added to each message sent and a similar prefix
  (urp: ) is expected on each message recieved. This allows sending over
  the same websocket as other data is being transmitted through. If you
  are writing a bridge to work with this, you will need to add/strip the
  prefixes accordingly
- This commit uses Java WebSocket
  (https://github.com/TooTallNate/Java-WebSocket) to send data over
  websockets.

Change-Id: I2bda3d0b988bef7883f9b6829eeb5b7ae8075f27
Signed-off-by: Skyler Grey <skyler.grey@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151171
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
2023-09-01 16:55:37 +02:00