Eclipse/jetty.project
1
0
Fork 0
mirror of https://github.com/jetty/jetty.project.git synced 2025-02-22 23:25:50 +00:00
Code Issues Packages Projects Releases Wiki Activity
17,877 Commits 55 Branches 466 Tags
Commit Graph

2722 Commits

Author SHA1 Message Date
Lachlan Roberts
d37dfd4357 Merge remote-tracking branch 'eclipse/jetty-10.0.x' into jetty-10.0.x-websocketmapping-refactor 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-01-23 18:45:59 +11:00
Lachlan Roberts
90003dee13 Issue #3182 - restored old websocket example files 
added new test for these example files

added register and setCreator methods in WebSocketServlet to
give more compatibility with old api

implemented isUserInRole in UpgradeHttpServletRequest to get
example working

made the JettyWebSocketTest more clear

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-01-23 18:43:54 +11:00
Lachlan Roberts
b06601e5f1 disable checks for duplicate websocket mappings 
throwing on adding of a duplicate websocket mapping causes problems
in EndpointViaConfigTest where we can add mappings even if they have
already been discovered by annotation

added a todo to review why we can't implement this check

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-01-23 10:18:42 +11:00
Greg Wilkins
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
Greg Wilkins
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
Greg Wilkins
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
Lachlan Roberts
74a5cfa190 remove the word default from all WebSocketServletFactory methods 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-01-22 18:32:14 +11:00
Lachlan Roberts
15c6f5250d do not set WebSocketMapping in WSUpgradeFilter if already set 
the WSUpgradeFilter now has to be registered at "/" or "/*"

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-01-22 18:17:33 +11:00
Lachlan Roberts
3c2f728574 move check for duplicate mappings to WebSocketMapping class 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-01-22 18:08:31 +11:00
Greg Wilkins
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
Greg Wilkins
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
Greg Wilkins
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
Lachlan Roberts
4008005a0e Jetty WebSockets no longer use shared mapping 
mapping is now created for each WebSocketServlet

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-01-22 11:55:18 +11:00
Lachlan Roberts
e1674cf4b6 separate out resources from the WebSocketMapping 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-01-22 11:39:53 +11:00
Greg Wilkins
f9b9cc1313 Issue #2175 cleanups after review 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-01-22 09:11:05 +11:00
Lachlan Roberts
0f2f1c1e92 new websocket-tests module 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-01-18 16:39:26 +11:00
Lachlan Roberts
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
Lachlan Roberts
bc951030ba cleanup the isEnabledViaContext check in JavaxWebSocket SCI 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-01-17 12:27:42 +11:00
Greg Wilkins
f16789b101 Issue #3167 cleanups after merge (in #2175) 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-01-16 15:19:36 +11:00
Greg Wilkins
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
Greg Wilkins
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
Greg Wilkins
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
Greg Wilkins
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
Greg Wilkins
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
Greg Wilkins
4f570b62e3 BrowserTool enhancements 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-01-15 16:28:01 +11:00
Greg Wilkins
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
Greg Wilkins
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
Greg Wilkins
30db9addbb fixed javadoc 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-01-15 14:13:13 +11:00
Greg Wilkins
be3b155e32 fixed merge 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-01-15 14:01:25 +11:00
Greg Wilkins
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
Greg Wilkins
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
Greg Wilkins
3246d07ca9 Revert "Working BrowserDebugTool for jetty websocket API" 
This reverts commit c320e020d2fbdb458b692b38843d705de1f6aaea.
 2019-01-15 13:14:53 +11:00
Lachlan Roberts
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
Lachlan Roberts
63a1db39a0 Issue #3167 - simplification of WebSocketChannelState from review 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-01-15 11:58:39 +11:00
Greg Wilkins
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
Greg Wilkins
39e6bff114 Issue #3167 cleanups from review 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-01-15 09:22:15 +11:00
Greg Wilkins
8802aebc1b Issue #3167 cleanups from review 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-01-15 09:19:55 +11:00
Greg Wilkins
cd6964220f Issue #3167 cleanups from review 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-01-15 09:11:43 +11:00
Greg Wilkins
4bacaf21e4 Issue #3167 cleanups from review 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-01-15 09:04:20 +11:00
Joakim Erdfelt
c320e020d2 Working BrowserDebugTool for jetty websocket API 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-01-14 10:13:59 -06:00
Greg Wilkins
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
Greg Wilkins
5036893426 Issue #3167 cleanups from review 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-01-12 10:30:47 +11:00
Greg Wilkins
392412b2d0 Issue #3167 cleanups from review 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-01-12 10:26:09 +11:00
Greg Wilkins
d89e797a1b Issue #3167 cleanups from review 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-01-12 10:06:59 +11:00
Greg Wilkins
a7e2ead7bc Issue #3167 cleanups from review 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-01-12 09:12:02 +11:00
Joakim Erdfelt
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
Joakim Erdfelt
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
Joakim Erdfelt
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
Joakim Erdfelt
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
Lachlan Roberts
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