Joakim Erdfelt
544ad0a28a
Fixes #4248 - WebSocketClient UpgradeResponse.isSuccess never set true
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-11-12 10:14:51 -06:00
Joakim Erdfelt
5de1289ac0
Merge branch 'release-9.3.28' into jetty-9.3.x
2019-11-07 12:10:00 -06:00
Joakim Erdfelt
0df21b6e86
Merge branch 'jetty-9.2.x' into jetty-9.3.x
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
# Conflicts:
# VERSION.txt
# aggregates/jetty-all/pom.xml
# apache-jsp/pom.xml
# apache-jstl/pom.xml
# examples/async-rest/async-rest-jar/pom.xml
# examples/async-rest/async-rest-webapp/pom.xml
# examples/async-rest/pom.xml
# examples/embedded/pom.xml
# examples/pom.xml
# jetty-alpn/jetty-alpn-client/pom.xml
# jetty-alpn/jetty-alpn-server/pom.xml
# jetty-alpn/pom.xml
# jetty-annotations/pom.xml
# jetty-ant/pom.xml
# jetty-cdi/pom.xml
# jetty-client/pom.xml
# jetty-client/src/test/java/org/eclipse/jetty/client/HttpClientTLSTest.java
# jetty-continuation/pom.xml
# jetty-deploy/pom.xml
# jetty-distribution/pom.xml
# jetty-fcgi/fcgi-client/pom.xml
# jetty-fcgi/fcgi-server/pom.xml
# jetty-fcgi/pom.xml
# jetty-http-spi/pom.xml
# jetty-http/pom.xml
# jetty-http2/http2-alpn-tests/pom.xml
# jetty-io/pom.xml
# jetty-io/src/main/java/org/eclipse/jetty/io/ssl/SslConnection.java
# jetty-jaas/pom.xml
# jetty-jaspi/pom.xml
# jetty-jmx/pom.xml
# jetty-jndi/pom.xml
# jetty-jsp/pom.xml
# jetty-jspc-maven-plugin/pom.xml
# jetty-maven-plugin/pom.xml
# jetty-monitor/pom.xml
# jetty-nosql/pom.xml
# jetty-osgi/jetty-osgi-alpn/pom.xml
# jetty-osgi/jetty-osgi-boot-jsp/pom.xml
# jetty-osgi/jetty-osgi-boot-warurl/pom.xml
# jetty-osgi/jetty-osgi-boot/pom.xml
# jetty-osgi/jetty-osgi-httpservice/pom.xml
# jetty-osgi/pom.xml
# jetty-osgi/test-jetty-osgi-context/pom.xml
# jetty-osgi/test-jetty-osgi-webapp/pom.xml
# jetty-osgi/test-jetty-osgi/pom.xml
# jetty-plus/pom.xml
# jetty-proxy/pom.xml
# jetty-quickstart/pom.xml
# jetty-rewrite/pom.xml
# jetty-runner/pom.xml
# jetty-security/pom.xml
# jetty-server/pom.xml
# jetty-servlet/pom.xml
# jetty-servlets/pom.xml
# jetty-spdy/pom.xml
# jetty-spdy/spdy-client/pom.xml
# jetty-spdy/spdy-core/pom.xml
# jetty-spdy/spdy-example-webapp/pom.xml
# jetty-spdy/spdy-http-client-transport/pom.xml
# jetty-spdy/spdy-http-common/pom.xml
# jetty-spdy/spdy-http-server/pom.xml
# jetty-spdy/spdy-server/pom.xml
# jetty-spring/pom.xml
# jetty-start/pom.xml
# jetty-util-ajax/pom.xml
# jetty-util/pom.xml
# jetty-webapp/pom.xml
# jetty-websocket/javax-websocket-client-impl/pom.xml
# jetty-websocket/javax-websocket-server-impl/pom.xml
# jetty-websocket/pom.xml
# jetty-websocket/websocket-api/pom.xml
# jetty-websocket/websocket-client/pom.xml
# jetty-websocket/websocket-common/pom.xml
# jetty-websocket/websocket-server/pom.xml
# jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/browser/BrowserDebugTool.java
# jetty-websocket/websocket-servlet/pom.xml
# jetty-xml/pom.xml
# pom.xml
# tests/pom.xml
# tests/test-continuation/pom.xml
# tests/test-integration/pom.xml
# tests/test-jmx/jmx-webapp-it/pom.xml
# tests/test-jmx/jmx-webapp/pom.xml
# tests/test-jmx/pom.xml
# tests/test-loginservice/pom.xml
# tests/test-quickstart/pom.xml
# tests/test-sessions/pom.xml
# tests/test-sessions/test-hash-sessions/pom.xml
# tests/test-sessions/test-jdbc-sessions/pom.xml
# tests/test-sessions/test-mongodb-sessions/pom.xml
# tests/test-sessions/test-sessions-common/pom.xml
# tests/test-webapps/pom.xml
# tests/test-webapps/test-jaas-webapp/pom.xml
# tests/test-webapps/test-jetty-webapp/pom.xml
# tests/test-webapps/test-jndi-webapp/pom.xml
# tests/test-webapps/test-mock-resources/pom.xml
# tests/test-webapps/test-proxy-webapp/pom.xml
# tests/test-webapps/test-servlet-spec/pom.xml
# tests/test-webapps/test-servlet-spec/test-container-initializer/pom.xml
# tests/test-webapps/test-servlet-spec/test-spec-webapp/pom.xml
# tests/test-webapps/test-servlet-spec/test-web-fragment/pom.xml
# tests/test-webapps/test-webapp-rfc2616/pom.xml
2019-11-07 12:09:39 -06:00
Lachlan
d0f74c5532
Issue #4124 - autobahn tests for jetty, javax websocket APIs ( #4147 )
...
- do not select duplicate extensions in javax default Configurator
- correctly copy payload for ping frames in jetty & javax frame handlers
- add ByteBuffer to javadoc for onMessage in jetty api
- cleaned up some test logging for EventSocket
- add autoFragment and maxFrameSize settings to WebSocketPolicy
- fix early validation for multiple extensions in setExtensions
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-11-07 11:06:14 +11:00
Lachlan
2310196532
Issue #1777 - configuration for jetty-10 WebSocketClient to be stopped at shutdown
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-11-07 11:02:25 +11:00
Joakim Erdfelt
43d95cd984
Updating to version 9.3.29-SNAPSHOT
2019-11-05 13:02:10 -06:00
Joakim Erdfelt
d7dd68d6e9
Updating to version 9.3.28.v20191105
2019-11-05 11:46:40 -06:00
Joakim Erdfelt
b17439c731
Updating to version 9.2.30-SNAPSHOT
2019-11-05 11:23:21 -06:00
Joakim Erdfelt
36c95fdd43
Updating to version 9.2.29.v20191105
2019-11-05 10:43:15 -06:00
Joakim Erdfelt
c980e3dd34
Fixing compilation issue
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-10-30 17:18:03 -05:00
Joakim Erdfelt
1ed13b6b30
Updating to version 9.4.23-SNAPSHOT
2019-10-22 09:19:41 -05:00
Joakim Erdfelt
b1e6b55512
Updating to version 9.4.22.v20191022
2019-10-22 08:20:50 -05:00
Lachlan
f6f423f558
Issue #4152 - make WS Parser autoFragment data frames to maxFrameSize ( #4219 )
...
* Issue #4152 - make WS Parser autoFragment data frames to maxFrameSize
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
* Issue #4152 - fix broken tests
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
* Issue #4152 - fix broken tests
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
* changes from review
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-10-22 16:17:50 +11:00
Lachlan
02276113f6
Issue #4214 - fix WS flaky test ClientConnectTest ( #4215 )
...
* Issue #4214 - fix flaky ClientConnectTest and change WS connectTimeout
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
* Issue #4214 - changes from review
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-10-18 10:11:57 +11:00
Greg Wilkins
2eb251a4b8
fix logging defaults to INFO
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-10-16 13:53:57 +11:00
Lachlan
00baa7147e
Merge pull request #4153 from eclipse/jetty-9.4.x-3558-websocket_onErrorAfterClose
...
Issue #3558 - only notify WS onError if onClose has not been called
2019-10-10 15:27:11 +11:00
Lachlan
d47264960e
Issue #3734 - throw ISE for WebSocket suspend after close ( #4095 )
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-10-08 09:47:48 +11:00
Lachlan Roberts
d95c825c5c
Issue #3558 - only notify WS onError if onClose has not been called
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-10-04 11:13:38 +10:00
Joakim Erdfelt
d7a189fa18
Updating to version 10.0.0-SNAPSHOT
2019-10-03 12:05:26 -05:00
Joakim Erdfelt
fd6a2cb9f6
Updating to version 10.0.0.alpha1
2019-10-03 11:25:06 -05:00
Joakim Erdfelt
6fc42d8ba2
Merge branch 'release-9.4.21' into jetty-9.4.x
2019-10-01 13:35:43 -05:00
Lachlan Roberts
b83dd8472d
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-10-01 16:06:58 +10:00
Lachlan
fef5975b86
Merge pull request #4108 from eclipse/jetty-9.4.x-4104-WSSession_SendAfterClose
...
Issue #4104 - WebSocketSession will reject outgoing frames if closed
2019-10-01 15:46:16 +10:00
Lachlan Roberts
aa417f939e
Fix WebSocket CompressExtension releaseDeflater() bug.
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-09-27 10:18:35 +10:00
Joakim Erdfelt
7807eafad9
Updating to version 9.4.22-SNAPSHOT
2019-09-26 10:46:28 -05:00
Joakim Erdfelt
72970db61a
Updating to version 9.4.21.v20190926
2019-09-26 09:59:15 -05:00
Lachlan Roberts
af081459ee
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-09-25 15:06:17 +10:00
Lachlan
3edc6c9102
Issue #3734 - throw ISE for WebSocket suspend after close (jetty-9.4) ( #4098 )
...
* Issue #3734 - throw ISE for WebSocket suspend after close
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
* Issue #3734 - suspend is error if onClose() has been called
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-09-25 14:55:13 +10:00
Simone Bordet
f10325ea50
Merge pull request #3959 from eclipse/jetty-10.0.x-3952-server_direct_heap_bytebuffers
...
Fixes #3952 - Server configuration for direct/heap ByteBuffers.
2019-09-23 15:24:47 +02:00
Lachlan Roberts
5a52235464
Issue #4104 - WebSocketSession will reject outgoing frames if closed
...
Outgoing frames will now go RemoteEndpoint->Session->ExtensionStack
instead of just RemoteEndpoint->ExtensionStack.
This will allow the Session to check whether it has been closed before
allowing the frame through the ExtensionStack.
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-09-20 10:30:31 +10:00
Lachlan
f10ff81d1c
Fix Secure javax.websocket Client examples ( #4035 )
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-09-18 10:42:32 +10:00
Simone Bordet
0eec727a09
After review, renamed *directBuffers to *directByteBuffers.
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-09-17 12:16:10 +02:00
Simone Bordet
1ef4a416b5
Merged branch 'jetty-10.0.x' into 'jetty-10.0.x-3952-server_direct_heap_bytebuffers'.
2019-09-16 12:26:26 +02:00
Lachlan
b027aa5afa
Fixes #3705 - revert ClientUpgradeRequest error handling logic ( #4090 )
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-09-16 17:21:33 +10:00
Lachlan Roberts
22fba9aa91
Issue #3106 - deprecate old WebSocket stats mechanism
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-09-13 11:28:05 +10:00
Lachlan Roberts
63c7a44969
Issue #3982 - fix to WebSocket bytesIn for flaky WebSocketStatsTest
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-09-13 11:18:57 +10:00
Lachlan Roberts
c2eff992b7
Issue #3982 - fix to WebSocket bytesIn for flaky WebSocketStatsTest
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-09-13 11:15:13 +10:00
Lachlan Roberts
5a08e48fe7
don't duplicate checks in handshake selector
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-09-12 16:46:47 +10:00
Lachlan Roberts
17b17cb2b9
clean up websocket handshakers
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-09-12 15:22:56 +10:00
Lachlan Roberts
3068b4c8ae
fix build issues
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-09-12 11:04:05 +10:00
Simone Bordet
d69a1f0f58
Merged branch 'jetty-10.0.x' into 'jetty-10.0.x-3537-bootstrap_websocket_http2'.
2019-09-12 00:11:01 +02:00
Lachlan Roberts
72ce7456eb
optimize HandShakeSelector
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-09-12 08:07:31 +10:00
Lachlan Roberts
387faa7e33
clean up websocket jetty-logging.properties files
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-09-11 18:02:18 +10:00
Lachlan
74e560fb7a
Issue #4031 - stop unopened WebSocketSessions gracefully ( #4046 )
...
* Issue #4031 - stop unopened WebSocketSessions gracefully
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
* Issue #4031 - notify onError if shutdown before open
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-09-06 13:50:33 +10:00
康智冬
49ba6d1acb
fix typo and grammar ( #4045 )
...
Signed-off-by: KangZhiDong <worldkzd@gmail.com>
2019-09-02 14:29:50 -04:00
Joakim Erdfelt
4e80748b3b
Merge branch jetty-9.4.x
into jetty-10.0.x
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
# Conflicts:
# jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/ClientContainer.java
2019-08-28 15:01:41 -05:00
Joakim Erdfelt
2b72f08f1b
Merge pull request #4019 from eclipse/jetty-9.4.x-155-jsr-websocket-client-ssl-init
...
Issue #155 - Adding public ClientContainer(HttpClient) constructor
2019-08-28 14:31:51 -05:00
Joakim Erdfelt
4829498eab
Merge branch jetty-9.4.x
into jetty-10.0.x
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
# Conflicts:
# jetty-websocket/websocket-api/src/main/java/org/eclipse/jetty/websocket/api/extensions/ExtensionFactory.java
# jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/WebSocketExtensionRegistry.java
# jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/WebSocketServerFactory.java
# jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/browser/BrowserDebugTool.java
# jetty-websocket/websocket-servlet/src/main/java/org/eclipse/jetty/websocket/servlet/WebSocketServletFactory.java
2019-08-28 12:43:11 -05:00
Joakim Erdfelt
37e7884382
Issue #4020 - Applying change requested from PR review
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-08-28 12:36:07 -05:00
Joakim Erdfelt
e56d91196d
Issue #4020 - Adding JMX to BrowserDebugTool to test dump
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-08-28 12:31:33 -05:00