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
olivier lamy
a0e562075e
Merge branch 'jetty-9.4.x' into jetty-10.0.x
2019-01-01 15:51:38 +10:00
olivier lamy
dc19445605
saving some io during the build
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-01-01 12:37:24 +10:00
olivier lamy
a90fda5488
Merge branch 'jetty-9.4.x' into jetty-10.0.x
2019-01-01 12:18:15 +10:00
olivier lamy
63f2023e05
happy new year!!
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-01-01 12:17:53 +10:00
olivier lamy
b0f13d80c3
fix bundle Copyright
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-01-01 12:14:48 +10:00
olivier lamy
cb37069fb9
Merge branch 'jetty-9.4.x' into jetty-10.0.x
2019-01-01 12:00:55 +10:00
olivier lamy
f49c2fb23c
update Copyright year on NOTICE file
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-01-01 11:55:24 +10:00
Olivier Lamy
9b7afd8a03
Happy new year!! ( #3232 )
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-01-01 11:52:16 +10:00
olivier lamy
b9d9bd2654
activate maven publishers for Jenkins: mavenLinkerPublisher pipelineGraphPublisher
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-12-31 11:41:37 +10:00
Jan Bartel
b46c3b0f1c
Issue #3213 Ensure MetaInfConfigurationTest is not disabled ( #3215 )
...
Signed-off-by: Jan Bartel <janb@webtide.com>
2018-12-27 16:44:53 +11:00
olivier lamy
f406358cf6
fix maven invoker reporter path
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-12-27 09:32:24 +10:00
olivier lamy
46d8668f67
disable autobahn profile
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-12-23 21:17:49 +10:00
olivier lamy
42c09b5fef
parse autobahn junit results
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-12-23 18:35:12 +10:00
olivier lamy
8c12dd2d30
autobahn profile(running test suite) part of default build on Jenkins
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-12-23 17:27:51 +10:00
Greg Wilkins
729bf8299c
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>
2018-12-23 13:51:01 +11:00
Greg Wilkins
9216d5ab63
Merge pull request #3224 from lachlan-roberts/jetty-10.0.x-3216-AutobahnWebSocketServerFailures
...
Issue #3216 - Autobahn WebSocketServer failures in jetty 10
2018-12-23 13:49:35 +11:00
olivier lamy
6ff23e296d
Merge branch 'jetty-9.4.x' into jetty-10.0.x
2018-12-22 22:00:07 +10:00
Olivier Lamy
72ebcc51af
interpolate version from main pom for maven plugin it test ( #3223 )
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-12-22 21:55:31 +10:00
Olivier Lamy
f5eb4864cc
Issue #3166 Jetty 10.0.x autobahn test ci ( #3221 )
...
* issue #3166 add autobahn test
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-12-22 21:16:23 +10:00
Greg Wilkins
ad8d3ea54d
Merge pull request #3208 from eclipse/jetty-9.4.x-3207-async-servlet-print
...
Issue #3207 async compliant print methods
2018-12-22 14:16:08 +11:00
Olivier Lamy
ab2a8b0fe3
upgrade logback and log4j-slf4j (new artifact log4j-slf4j18-impl) to support slf4j api 1.8 ( #3209 )
...
* upgrade logback and version of log4j-slf4j support slf4j 1.8 (new artifact log4j-slf4j18-impl)
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-12-22 10:01:48 +10:00