5095c8a7b2
Issue #3288 - Correcting Jetty WebSocket API artifactIds
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-01-23 15:58:11 -06:00
d520ae5a11
Issue #2175 cleanups after review
...
Re implemented a queue and flusher above extension stack to serialize
frame handling without holding a lock when calling callbacks
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-01-23 09:06:27 +11:00
3d7ee93112
Issue #2175 cleanups after review
...
Re implemented a queue and flusher above extension stack to serialize
frame handling without holding a lock when calling callbacks
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-01-23 08:49:55 +11:00
d598e0dc6f
Issue #2175 cleanups after review
...
Improve ws error handling by splitting processError into handling for
errors from the network and errors from the application.
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-01-22 21:20:01 +11:00
7fec51ad40
Issue #2175 cleanups after review
...
Improve ws error handling by splitting processError into handling for
errors from the network and errors from the application.
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-01-22 15:41:46 +11:00
1189ceed4c
Issue #2175 cleanups after review
...
Improve ws error handling by splitting processError into handling for
errors from the network and errors from the application.
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-01-22 13:36:09 +11:00
05dfbd18cd
Issue #2175 cleanups after review
...
Improve ws error handling by splitting processError into handling for
errors from the network and errors from the application.
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-01-22 13:25:29 +11:00
f9b9cc1313
Issue #2175 cleanups after review
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-01-22 09:11:05 +11:00
f16789b101
Issue #3167 cleanups after merge (in #2175 )
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-01-16 15:19:36 +11:00
be69351f0e
Merge branch 'jetty-10.0.x-3167-websocket-mapping' into jetty-10.0.x-3167-2175-websocket-close
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-01-15 18:02:41 +11:00
4a70d1534e
Merge branch 'jetty-10.0.x' into jetty-10.0.x-3167-websocket-mapping
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-01-15 17:59:09 +11:00
5307f49bbc
Merge pull request #3259 from lachlan-roberts/jetty-10.0.x-websocket-tests
...
Issue #3246 - javax-websocket-tests exception stacktraces
2019-01-15 17:56:08 +11:00
c84f97e983
Issue #3246 Avoid concurrent raw write on fuzzer client
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-01-15 16:58:30 +11:00
391f2b1a27
Merge branch 'jetty-10.0.x-3167-websocket-mapping' into jetty-10.0.x-3167-2175-websocket-close
2019-01-15 16:28:39 +11:00
4f570b62e3
BrowserTool enhancements
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-01-15 16:28:01 +11:00
12655a0944
Working BrowserDebugTool for jetty websocket API
...
Plus fixes for 10.0.x
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-01-15 15:54:09 +11:00
aedf17b020
Merge branch 'jetty-10.0.x-3167-websocket-mapping' into jetty-10.0.x-3167-2175-websocket-close
2019-01-15 14:13:55 +11:00
30db9addbb
fixed javadoc
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-01-15 14:13:13 +11:00
be3b155e32
fixed merge
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-01-15 14:01:25 +11:00
878e51032d
Merge branch 'jetty-10.0.x-3167-websocket-mapping' into jetty-10.0.x-3167-2175-websocket-close
2019-01-15 13:38:19 +11:00
e1daad1599
Merge branch 'jetty-10.0.x' into jetty-10.0.x-3167-websocket-mapping
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-01-15 13:31:11 +11:00
3246d07ca9
Revert "Working BrowserDebugTool for jetty websocket API"
...
This reverts commit c320e020d2
2019-01-15 13:14:53 +11:00
5d31612ec2
Merge remote-tracking branch 'eclipse/jetty-10.0.x-3167-2175-websocket-close' into jetty-10.0.x-3167-2175-websocket-close
2019-01-15 13:05:23 +11:00
63a1db39a0
Issue #3167 - simplification of WebSocketChannelState from review
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-01-15 11:58:39 +11:00
664ddef6fd
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-3167-websocket-mapping
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-01-15 09:44:53 +11:00
39e6bff114
Issue #3167 cleanups from review
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-01-15 09:22:15 +11:00
8802aebc1b
Issue #3167 cleanups from review
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-01-15 09:19:55 +11:00
cd6964220f
Issue #3167 cleanups from review
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-01-15 09:11:43 +11:00
4bacaf21e4
Issue #3167 cleanups from review
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-01-15 09:04:20 +11:00
c320e020d2
Working BrowserDebugTool for jetty websocket API
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-01-14 10:13:59 -06:00
149c28f463
Merge branch 'jetty-10.0.x-3167-websocket-mapping' into jetty-10.0.x-3167-2175-websocket-close
2019-01-12 14:39:01 +11:00
5036893426
Issue #3167 cleanups from review
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-01-12 10:30:47 +11:00
392412b2d0
Issue #3167 cleanups from review
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-01-12 10:26:09 +11:00
d89e797a1b
Issue #3167 cleanups from review
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-01-12 10:06:59 +11:00
a7e2ead7bc
Issue #3167 cleanups from review
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-01-12 09:12:02 +11:00
74df6bf1a9
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
# Conflicts:
# jetty-maven-plugin/src/it/it-parent-pom/pom.xml
# jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/ConfiguratorTest.java
# jetty-websocket/javax-websocket-server/src/main/java/org/eclipse/jetty/websocket/javax/server/JavaxWebSocketServerContainerInitializer.java
# jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/WebSocketSession.java
# jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/io/AbstractWebSocketConnection.java
# jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/AbstractExtension.java
# jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/internal/ExtensionStack.java
# jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/internal/FrameFlusher.java
# jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/browser/BrowserDebugTool.java
# jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/browser/BrowserSocket.java
# jetty-websocket/websocket-server/src/test/resources/browser-debug-tool/index.html
# jetty-websocket/websocket-server/src/test/resources/browser-debug-tool/websocket.js
2019-01-11 12:11:38 -06:00
aa7f3bd071
Merge pull request #3245 from eclipse/jetty-9.4.x-issue-3242-websocket-dump-cleanup
...
Issue #3242 - WebSocket dump cleanup
2019-01-11 11:59:06 -06:00
1b7ae00be3
Issue #3242 - Post-review cleanup of AbstractWebSocketConnection dump of EndPoint
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-01-11 11:27:10 -06:00
478e5ac593
Issue #3242 - Post-review cleanup of WebSocket dump
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-01-11 10:16:46 -06:00
1e4ac07511
Merge remote-tracking branch 'eclipse/jetty-10.0.x-3167-2175-websocket-close' into jetty-10.0.x-3167-2175-websocket-close
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-01-10 21:25:15 +11:00
027e7ac959
Issue #3246 Avoid concurrent raw write on fuzzer client
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-01-10 18:57:38 +11:00
9a7e7bc999
Issue #3167 - Refactor of WebSocketChannelState
...
WebSocketChannelState now performs frame sequence checks and is called
on every outgoing and incoming frame, these checks return true to
indicate that the WebSocketChannel is fully closed
unrelated changes in
ExtensionStack:
succeeded() needed to be called instead of failed as explained
in the comment above the change
WebSocketClient:
removed duplication of the connect code by calling connect again
with a null UpgradeRequest
FrameFlusher:
improved the logging
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-01-10 18:53:52 +11:00
ce771070f6
removed extension queue #2175
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-01-10 16:31:50 +11:00
9bd9133399
externalized flusher iteration #2175
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-01-10 16:05:29 +11:00
4165c4507b
Refactor websocket close for #2175
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-01-10 14:50:53 +11:00
6ec615dc32
happy new year
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-01-10 08:47:31 +11:00
9b0c8336ba
Merge branch 'jetty-10.0.x' into jetty-10.0.x-3167-websocket-mapping
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-01-10 08:34:33 +11:00
40f1d5866f
call succeeded() to drain the queue instead of calling failed() in the
...
ExtensionStack Flusher
documentation fix in WriteFlusher
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-01-09 16:19:55 +11:00
c36d9bc3fc
Issue #3246 - suppressed logging for stacktrace in IdleTimeoutTest
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-01-09 14:37:51 +11:00
19e2ab8a70
Issue #3246 - fix to DecoderReaderManySmallTest stacktrace being logged
...
succeed the callback in EventIdFrameHandler after sending responses in
DecoderReaderManySmallTest
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-01-09 14:32:37 +11:00
Joakim Erdfelt
Greg Wilkins
Lachlan Roberts