Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
18,098 Commits 65 Branches 460 Tags 355 MiB
Commit Graph

18098 Commits

Author SHA1 Message Date
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
Jan Bartel 0e97d9b68d Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2019-01-15 14:57:21 +11:00
Jan Bartel 9f3f3b78ae
Issue #3250 Ease osgi debugging (#3251) 
Signed-off-by: Jan Bartel <janb@webtide.com>
 2019-01-15 14:38:16 +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 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
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 c320e020d2.
 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 e9143725b0 Issue #3242 - Post-review cleanup of ProxyEndPoint 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-01-11 10:23:51 -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
Simone Bordet 64edaff68a Fixes #2095 - Remove FastCGI multiplexing. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2019-01-11 11:56:42 +01: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
Olivier Lamy 69dc0059d1
use jackson-databind 2.9.8 (#3252) 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2019-01-10 22:12:12 +13:00
Greg Wilkins 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
Lachlan Roberts 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
Greg Wilkins ce771070f6 removed extension queue #2175 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-01-10 16:31:50 +11:00
Greg Wilkins 9bd9133399 externalized flusher iteration #2175 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-01-10 16:05:29 +11:00
Greg Wilkins 4165c4507b Refactor websocket close for #2175 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-01-10 14:50:53 +11:00
Greg Wilkins ce3defa2f5 fixed debug 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-01-10 09:07:02 +11:00
Greg Wilkins 6ec615dc32 happy new year 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-01-10 08:47:31 +11:00
Greg Wilkins 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
Lachlan Roberts 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
Lachlan Roberts 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
Lachlan Roberts 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 020a980394
Merge pull request #3155 from eclipse/jetty-9.4.x-issue-3139-npe-websocket-sci 
Fixes #3139 - NPE in WebSocketContainerInitializer
 2019-01-08 15:57:35 -06:00
Joakim Erdfelt bedb8e2a75
Merge pull request #3237 from lachlan-roberts/jetty-10.0.x-3236-CustomRequestLogTest_Failure 
Issue #3236 - custom request log test failure
 2019-01-08 15:51:48 -06:00
Joakim Erdfelt aad5e97336 Issue #3242 - Relying on EndPoint.toString() for ProxyEndPoint.toString() 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-01-08 15:48:22 -06:00
Joakim Erdfelt 689fab4979 Issue #3242 - Cleaning up WebSocket dump 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-01-08 15:47:49 -06:00
Joakim Erdfelt 87c82ae644 Issue #3242 - Allow Dumpable to control how self is represented 
+ Do not rely on Object.toString() for representing self (aka:this)
  in the dump output.  Using Object.toString() can result in lots
  of duplicated information in the dump (and super long lines)

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-01-08 15:47:17 -06:00
Joakim Erdfelt 0078d8aed6 Issue #3242 - Updating BrowserDebugTool to help troubleshoot issue 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-01-08 15:45:54 -06:00
Simone Bordet da3d69261c Fixes #3240 - ALPN support for Java 13. 2019-01-04 21:27:39 +01:00
Lachlan Roberts 07035b7376 Issue #3236 - fixed CustomRequestLogTest failure when JAVA_HOME not set 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-01-04 09:36:53 +11:00