0f2f1c1e92
new websocket-tests module
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-01-18 16:39:26 +11:00
51feef6dcf
javax websocket bug fixes, for duplicate mappings, and null messageSinks
...
dont allow duplicate mappings to be added to websocket mapping for javax
succeed the callback in JavaxWebSocketFrameHandler with null messageSink
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-01-18 15:19:54 +11:00
6c4ee083be
Issue #132 - ClientConnector abstraction.
...
Introduced ClientConnector and refactored HttpClient transports,
removing duplicated code that was connect() to a remote host.
Refactored also HTTP2Client to reference ClientConnector.
Refactored tests accordingly to the changes introduced in the
implementations.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-01-17 10:43:03 +01:00
2f6d0b3fb7
Merge branch 'jetty-9.4.x' into jetty-10.0.x
2019-01-17 15:35:27 +10:00
766e088109
Issue #3241 Jetty runner add missing Main-Class in MANIFEST ( #3260 )
...
* Issue #3241 no Main Class attribute in MANIFEST for jetty-runner
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-01-17 15:24:07 +10:00
bc951030ba
cleanup the isEnabledViaContext check in JavaxWebSocket SCI
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-01-17 12:27:42 +11:00
2ddd00ec37
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-01-16 17:33:13 +01:00
2a8b4c4c47
Updated ALPN to JDK 8u201 and 8u202.
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-01-16 17:25:39 +01:00
0e17b56aaf
Updated ALPN to JDK 8u201 and 8u202.
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-01-16 17:12:25 +01:00
cdd553332c
Updated ALPN version for JDK 8u201 and 8u202.
2019-01-16 17:03:51 +01:00
14aa789738
Merge branch 'jetty-9.4.x' into jetty-10.0.x
2019-01-16 21:48:57 +10: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
c89de87f38
Merge branch 'jetty-10.0.x' into jetty-10.0.x-3167-2175-websocket-close
2019-01-16 09:14:49 +11:00
4f65799a7b
Merge pull request #3222 from eclipse/jetty-10.0.x-3167-websocket-mapping
...
Jetty 10.0.x #3167 refactor websocket mapping
2019-01-16 09:13:42 +11:00
2fc6185c29
Issue #3236 - fixed CustomRequestLogTest failure when JAVA_HOME not set
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-01-15 13:11:06 -06:00
027a91d224
maven assembly plugin 3.1.1
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-01-15 21:20:46 +10:00
1eb6339a6d
Merge pull request #3255 from eclipse/jetty-10.0.x-2095-remove_fcgi_multiplex
...
Fixes #2095 - Remove FastCGI multiplexing.
2019-01-15 11:02:00 +01: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
dde42fc22e
Issue #3246 - fix possible illegal javadoc symbol
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-01-15 17:54:53 +11:00
b7219d9d9b
Issue #3246 - remove debugging code from cherry-picked commit
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-01-15 17:49:20 +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
0e97d9b68d
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2019-01-15 14:57:21 +11:00
9f3f3b78ae
Issue #3250 Ease osgi debugging ( #3251 )
...
Signed-off-by: Jan Bartel <janb@webtide.com>
2019-01-15 14:38:16 +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
a2d3a81cef
Merge pull request #3253 from lachlan-roberts/jetty-10.0.x-3167-2175-websocket-close
...
Issue #3167 - Refactor of WebSocketChannelState
2019-01-15 13:37:17 +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
Lachlan Roberts
Simone Bordet
olivier lamy
Olivier Lamy
Greg Wilkins
Jan Bartel
Joakim Erdfelt