Commit Graph

888 Commits

Author SHA1 Message Date
Lachlan 5611c2daa2
Merge pull request #5790 from eclipse/jetty-9.4.x-5785-WebSocketWarning
remove warning log message on CompressExtension failure
2020-12-18 18:11:47 +11:00
Lachlan Roberts 9d2e350b04 Issue #5785 - remove warning on CompressExtension failure
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-12-10 23:22:03 +11:00
Lachlan Roberts 6dce1cbffd Make ByteBufferAccumulator direct configurable
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-12-01 10:07:18 +11:00
Lachlan Roberts a51b5db209 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-9.4.x-ByteAccumulator 2020-12-01 09:45:45 +11:00
Joakim Erdfelt e8683cba9f Updating to version 9.4.36-SNAPSHOT 2020-11-20 16:05:27 -06:00
Joakim Erdfelt bdc54f03a5 Updating to version 9.4.35.v20201120 2020-11-20 15:05:50 -06:00
Lachlan Roberts 2629845f17 update ByteAccumulator length on copies
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-11-17 22:16:35 +11:00
Lachlan Roberts f63a741b0f use local length field for ByteAccumulator.getLength()
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-11-17 21:16:38 +11:00
Lachlan Roberts 7c46d96fce Issue #5499 - add tests for ByteBufferAccumulator
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-11-17 17:11:47 +11:00
Lachlan Roberts 5788fe609d Fix ByteBufferAccumulator minSize
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-11-16 18:43:22 +11:00
Lachlan Roberts a1aa5dcd14 Issue #5499 - use ByteBufferAccumulator for websocket compression
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-11-16 18:33:38 +11:00
Lachlan Roberts 595d4bfcc4 changes from review
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-11-11 22:18:26 +11:00
Lachlan Roberts 3c44df0724 changes from review
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-11-06 14:09:13 +11:00
Lachlan Roberts 6e9572215b ByteAccumulator transferTo expects buffer in fill mode.
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-11-05 19:11:34 +11:00
Lachlan Roberts 7bcae9968b allow writing directly into the ByteAccumulator
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-11-05 17:19:05 +11:00
Lachlan Roberts a3c3e24cab Use the ByteBufferPool in the ByteAccumulator
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-11-05 14:38:19 +11:00
Lachlan Roberts 145bcff649 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-9.4.x-ByteAccumulator 2020-11-05 13:43:00 +11:00
Lachlan Roberts 05dafb89ab Move work on ByteAccumulator to jetty-util
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-11-05 13:42:47 +11:00
Joakim Erdfelt edaadff55b Updating to version 9.4.35-SNAPSHOT 2020-11-02 09:04:51 -06:00
Joakim Erdfelt e46af88704 Updating to version 9.4.34.v20201102 2020-11-02 08:03:51 -06:00
Baoyi Chen 1f5b446462 Fix issue #5499
this PR let the ByteAccumulator recyclable. after invoke ByteAccumulator.transferTo method
we can invoke ByteAccumulator.recycle method to reuse byte[] via ByteAccumulator.newByteBuffer method

Signed-off-by: Baoyi Chen <chen.bao.yi@qq.com>
2020-10-31 00:08:30 +08:00
Lachlan Roberts 3c3fcc311e Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-9.4.x-5320-WebSocketHttpClient
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-10-30 12:43:31 +11:00
Joakim Erdfelt e726eefb0b Updating to version 9.4.34-SNAPSHOT 2020-10-20 18:55:39 -05:00
Joakim Erdfelt 1be6875565 Updating to version 9.4.33.v20201020 2020-10-20 18:28:51 -05:00
Lachlan f99b4ca80c
Merge pull request #5377 from eclipse/jetty-9.4.x-5368-WebSocketInputStream
Issue #5368 - ensure onMessage exits before next frame is read
2020-10-16 15:51:54 +11:00
Lachlan Roberts 4cb475c97d Issue #5320 - also test WebSocketClient on server from WEB-INF/lib
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-10-15 16:15:57 +11:00
Lachlan Roberts be041d3044 Issue #5368 - add tests for not reading to end of InputStream
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-10-15 12:10:33 +11:00
Lachlan Roberts 680020dcb2 Issue #5368 - changes from review
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-10-15 12:08:57 +11:00
Lachlan Roberts 419eefc2ef move logic from messageComplete into appendFrame with fin==true
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-10-14 10:26:08 +11:00
Lachlan Roberts 09947681fe allow MessageInputStream to read multiple bytes at a time
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-10-07 19:48:13 +11:00
Lachlan Roberts aa1299912d Issue #5368 - when resuming always call onFillable from newThread.
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-10-07 16:32:06 +11:00
Lachlan Roberts 7df0dfa7c2 warn if did not read until EOF once per MessageInputStream 2020-10-07 15:41:51 +11:00
Lachlan Roberts 6c94ef5848 Issue #5368 - warn if MessageInputStream closed without fully consuming
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-10-06 17:43:58 +11:00
Lachlan Roberts 941ffcead7 Issue #5368 - ensure onMessage exits before next frame is read
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-10-01 15:42:50 +10:00
Joakim Erdfelt 85e257fc98 Updating to version 9.4.33-SNAPSHOT 2020-09-30 11:53:09 -05:00
Joakim Erdfelt de97d26f7b Updating to version 9.4.32.v20200930 2020-09-30 11:03:24 -05:00
Lachlan Roberts b44b62038c reorder methods for maxOutgoingFrames, fix javadoc
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-09-10 09:50:52 +10:00
Lachlan Roberts 4fd7920143 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-9.4.x-4824-WSmaxOutgoingFrames 2020-09-10 09:46:12 +10:00
Lachlan Roberts f788260abd Issue #4824 - use WritePendingException instead of IOException
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-09-03 14:58:09 +10:00
Lachlan Roberts 576b1e2323 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-9.4.x-4824-WSmaxOutgoingFrames 2020-09-02 10:07:19 +10:00
Lachlan Roberts cd1edb33f4 Merge remote-tracking branch 'origin/jetty-9.4.x-5193-better-websocket-event-logging' into jetty-9.4.x-5193-NullMessage
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-08-31 10:53:26 +10:00
Joakim Erdfelt 46402bc382
Issue #5193 - Updating logging per review
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-08-28 05:46:07 -05:00
Lachlan Roberts 478bcdc868 Issue #5193 - fix lost message bug when using single onMessage annotation
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-08-27 17:18:48 +10:00
Joakim Erdfelt 1690e9d30d
Issue #5193 - Adding more EventDriver logging
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-08-26 06:56:17 -05:00
Lachlan cfd31b2cf5
Merge pull request #5125 from eclipse/jetty-9.4.x-5122-WebSocketStats
Issue #5122 - Improve connection statistics for WebSocket
2020-08-19 08:04:47 +10:00
Lachlan Roberts 1663a6d7af Issue #5125 - Generalise WebSocketConnectionStatistics into IncludeExcludeConnectionStatistics
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-08-14 15:19:06 +10:00
Lachlan cbd4c38f3d
Issue #5121 - always use isDebugEnabled() check before debug logging in WebSocket (#5123)
* Issue #5121 - always use isDebugEnabled() check before logging in CompressExtension

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>

* Issue #5121 - always use isDebugEnabled() check before debug logging

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>

* Issue #5121 - always use isDebugEnabled() check before debug logging in WebSocket

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-08-11 11:51:39 +02:00
Lachlan Roberts 8a3ff775d5 Issue #5122 - make number of active WS Sessions a managed attribute on SessionTracker
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-08-06 20:45:06 +10:00
Lachlan Roberts be429f0910 Issue #5122 - add specialized Connection.Listener for WebSocket ConnectionStatistics
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-08-06 20:38:02 +10:00
Lachlan Roberts 85c4fc5335 Issue #5108 - use set based on ConcurrentHashMap and remove synchronized blocks
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-08-03 18:26:14 +10:00