Eclipse/jetty.project
1
0
Fork 0
mirror of https://github.com/jetty/jetty.project.git synced 2025-02-24 16:35:03 +00:00
Code Issues Packages Projects Releases Wiki Activity
20,155 Commits 55 Branches 466 Tags
Commit Graph

568 Commits

Author SHA1 Message Date
olivier lamy
a34e641a27 Updating to version 10.0.0-SNAPSHOT 2019-07-11 17:20:27 +10:00
olivier lamy
2e58f2f515 Updating to version 10.0.0-alpha0 2019-07-11 14:19:45 +10:00
olivier lamy
352d1e7c3b fix checkstyle 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2019-07-09 18:27:14 +10:00
Lachlan Roberts
9449008581 Issue #3849 - only notify onError for local errors 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-07-05 16:06:56 +10:00
Lachlan Roberts
bb1a260fa5 Merge remote-tracking branch jetty-10.0.x into jetty-10.0.x-300-CompressionPool 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-07-04 10:22:10 +10:00
Greg Wilkins
d744d097de
Checkstyle cleanup (#3847) 
* Checkstyle cleanup
* fixed bug from reformat
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-07-03 17:24:08 +02:00
Greg Wilkins
9fe27eb8e3 Updated all arrays after merge of #3846 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-07-03 17:23:02 +02:00
Lachlan Roberts
705e1cafe0 Issue #300 - use inflater/deflater pools in CompressExtension 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-07-02 16:42:50 +10:00
Lachlan Roberts
64eb3217cd Issue #300 - refactor usages of WebSocketComponents 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-07-02 15:28:58 +10:00
Lachlan
cbc4768cae
Issue #3159 - do not copy RSV bits to auto-fragmented frames (#3816) 
* Issue #3159 - do not copy RSV bits to auto-fragmented frames

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>

* Issue #3159 - warn if DeflateFrameExtension detects autoFragment on

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>

* Issue #3159 - automatically set auto-fragment false in DeflateFrameExt

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>

* Issue #3159 - automatically set auto-fragment false in DeflateFrameExt

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>

* Issue #3159 - add todo

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-07-01 17:06:32 +10:00
Lachlan
ac8910e044
Issue #3809 - ensure abnormal close frame will hard close ws connection (#3819) 
* Issue #3809 - ensure abnormal close frame will hard close ws connection

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>

* Issue #3159 - signal onError on abnormal status code close

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-07-01 16:50:56 +10:00
Lachlan
fa4abfa6bb
Merge pull request #3365 from lachlan-roberts/jetty-10.0.x-3170-websocket-proxy 
Issue #3170 - WebSocket Proxy
 2019-07-01 11:53:48 +10:00
Lachlan
cc4304a0f6
WebSocket core autobahn and MessageHandler refactor (#3802) 
* reworked WebSocket autobahn test code and the core MessageHandler

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>

* PR #3802 - changes from review

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-06-26 13:47:46 +10:00
Greg Wilkins
b7a7a53a18
Jetty 10.0.x reformat (#3812) 
* Removing Legacy Method Separators
* Restyling branch `jetty-9.4.x`
* Applying changes highlighted by checkstyle
* Removing Legacy Method Separators
* Restyling branch `jetty-10.0.x`
* Applying checkstyle changes
* Applying checkstyle changes
* Applying XML restyling
* Restyling XML in branch `jetty-10.0.x`
* Fixing XML codestyle for IntelliJ
* Fixing XML style mistakes
* Fixing XML restyling in branch `jetty-10.0.x`
* Revert "Applying XML restyling"
* Updating checkstyle for XML codestyle
* Revert "Restyling XML in branch `jetty-10.0.x`"

# Conflicts:
#	jetty-xml/src/test/resources/org/eclipse/jetty/xml/configureWithAttr.xml
#	jetty-xml/src/test/resources/org/eclipse/jetty/xml/configureWithElements.xml

* Adding back build-resources
* Reformatting pom.xml files
* Disabling Checkstyle job
* fixed empty string on line wrap
* reformatted with latest intellij style
* misc checkstyle fixes

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-06-24 17:42:39 +02:00
Joakim Erdfelt
479eb77f6a
Merge pull request #3797 from eclipse/jetty-10.0.x-remove-deprecated 
Remove deprecated in Jetty 10.0.x
 2019-06-21 14:27:34 -05:00
Lachlan
3ae6d41a18
WebSocket core cleanup (#3783) 
* cleanups of WebSocket core

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>

* WebSocket ConfigurationCustomizer now extends ConfigurationHolder

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>

* adding isDebugEnabled checks

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-06-21 10:14:27 +10:00
Joakim Erdfelt
ef36cde4ed Issue #2909 - Remove B64Code 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-06-20 11:15:04 -05:00
Lachlan Roberts
e305736b02 add request and response to JettyWSFrameHandler on server side 
wrap exceptions delivered to jetty connect CompletableFuture

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-06-20 16:47:11 +10:00
Lachlan
6fcc3d1a77
Issue #3762 - use the default port of 0 for WebSocket tests (#3770) 
* Issue #3762 - use the default port of 0 for WebSocket tests

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>

* Issue #3762 - use system property to set custom port in xml

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-06-13 15:43:19 +10:00
Lachlan Roberts
e007634e53 Issue #3170 - cleanups of WebSocketProxy and WebSocketProxyTest 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-06-11 17:12:02 +10:00
Lachlan Roberts
327783e1ce Merge remote-tracking branch 'eclipse/jetty-10.0.x' into jetty-10.0.x-3170-websocket-proxy 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-06-11 15:17:54 +10:00
Joakim Erdfelt
68a9498092 Merge branch jetty-9.4.x into jetty-10.0.x 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-06-10 11:51:55 -05:00
Lachlan
62eedebd17
Issue #3705 - WebSocket upgrade failure and CompletableFuture refactor 
* Issue #3705 - notify WebSocket framehandler on client upgrade failure

getFrameHandler on the ClientUpgradeRequest no longer takes
the upgrade response, the response must be set later if it is
required by the framehandler implementation

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>

* Issue #3705 - changes from review

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>

* Issue #3705 - throw if FrameHandler could not be created

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>

* wip

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>

* Issue #3705 - count down the onOpen latch in NetworkFuzzer

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>

* Issue #3705 - WebSocket Session CompletableFuture refactor

- sessionFutures for jetty and javax are now implemented using the
futureCoreSession which will occur after onOpen

- the request and response are set on the FrameHandler before the
upgrade

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-06-06 08:13:33 +10:00
Lachlan Roberts
6681da7e74 Issue #3666 - changes from review 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-06-03 11:18:41 +10:00
Lachlan Roberts
e5a6910be4 Issue #3666 - changes from review 
- code cleanups
- made SHUTDOWN 1001 status an abnormal close status

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-05-24 05:58:02 +10:00
Lachlan Roberts
9e09f76fda Issue #3666 - error CloseFrames skip frames in the FrameFlusher queue 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-05-24 05:54:49 +10:00
Lachlan Roberts
d6c68c4911 Merge remote-tracking branch 'eclipse/jetty-10.0.x' into jetty-10.0.x-configuration-refactor 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-05-23 09:03:27 +10:00
Lachlan Roberts
f4990dd0f5 prefer the field and variable name of coreSession instead of session 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-05-22 08:29:05 +02:00
Lachlan Roberts
491ff5eb93 rename WebSocketChannel to WebSocketCoreSession 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-05-22 08:29:05 +02:00
Lachlan Roberts
5f62e0f2db store shared websocket components as attributes and not beans 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-05-21 18:56:53 +10:00
Lachlan Roberts
e31009cb06 WebSocketCoreClient no longer stores configuration and can be shared 
configuration moved to ClientUpgradeRequest

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-05-21 11:33:06 +10:00
Lachlan Roberts
0b41386c0d don't allow custom CoreClients to be supplied to JavaxClientContainer 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-05-17 16:54:09 +10:00
Lachlan Roberts
a115e92029 move maxMessageSize configuration from javax framehandler to session 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-05-16 15:43:38 +10:00
Lachlan Roberts
c68a1b6066 fix the websocket configuration problems shown by ClientConfigTest 
correctly detect when a message has exceeded the max size in the sink

forward changes to the input buffer size to the connection in WSChannel

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-05-16 15:38:33 +10:00
Lachlan Roberts
7019c18117 refactor of javax WebSocketContainer configuration 
the client and server subclasses of JavaxWebSocketContainer now
share a common configuration instance which is used as the default
configuration for both server and client endpoints

to do this a setter was added for the configuration on the CoreClient

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-05-16 15:38:12 +10:00
Lachlan Roberts
7e5dcda708 force websocket idle timeout default to be set on endpoint 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-05-15 12:39:04 +02:00
Lachlan Roberts
2782344d4c revert ConfigurationCustomizer change from #3374 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-05-15 12:39:04 +02:00
lachan-roberts
5f4c6c3b94 Issue #3374 - comments, name changes and fixes to timeout algorithm 
Signed-off-by: lachan-roberts <lachlan@webtide.com>
 2019-05-09 00:05:57 +02:00
Lachlan Roberts
1ef191ffcd Issue #3374 - websocket write timeout improvements 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-05-09 00:05:57 +02:00
Lachlan Roberts
92e38fcb42 Issue #3374 - implementation of write timeouts for websockets 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-05-09 00:05:57 +02:00
Lachlan Roberts
6887f9d6dd Issue #3608 - fix merge of tests jetty-10 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-05-04 14:50:20 +02:00
Joakim Erdfelt
52bb963186 Merge branch jetty-9.4.x into jetty-10.0.x 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

# Conflicts:
#	aggregates/jetty-all-compact3/pom.xml
#	jetty-client/src/test/java/org/eclipse/jetty/client/HttpClientTest.java
#	jetty-deploy/src/test/java/org/eclipse/jetty/deploy/bindings/GlobalWebappConfigBindingTest.java
#	jetty-fcgi/fcgi-server/src/test/java/org/eclipse/jetty/fcgi/server/HttpClientTest.java
#	jetty-http/src/test/java/org/eclipse/jetty/http/HttpParserTest.java
#	jetty-http2/http2-alpn-tests/pom.xml
#	jetty-http2/http2-http-client-transport/pom.xml
#	jetty-infinispan/infinispan-remote-query/src/test/java/org/eclipse/jetty/server/session/infinispan/RemoteQueryManagerTest.java
#	jetty-proxy/src/test/java/org/eclipse/jetty/proxy/ConnectHandlerTest.java
#	jetty-server/src/test/java/org/eclipse/jetty/server/HttpConnectionTest.java
#	jetty-server/src/test/java/org/eclipse/jetty/server/ProxyConnectionTest.java
#	jetty-servlet/src/test/java/org/eclipse/jetty/servlet/AsyncContextTest.java
#	jetty-servlet/src/test/java/org/eclipse/jetty/servlet/ErrorPageTest.java
#	jetty-servlets/src/test/java/org/eclipse/jetty/servlets/CrossOriginFilterTest.java
#	jetty-servlets/src/test/java/org/eclipse/jetty/servlets/GzipDefaultTest.java
#	jetty-servlets/src/test/java/org/eclipse/jetty/servlets/GzipTester.java
#	jetty-servlets/src/test/java/org/eclipse/jetty/servlets/HeaderFilterTest.java
#	jetty-servlets/src/test/java/org/eclipse/jetty/servlets/PutFilterTest.java
#	jetty-util/src/test/java/org/eclipse/jetty/util/BufferUtilTest.java
#	jetty-util/src/test/java/org/eclipse/jetty/util/resource/ResourceCollectionTest.java
#	jetty-websocket/javax-websocket-client-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/DecoderReaderManySmallTest.java
#	jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/DelayedStartClientOnServerTest.java
#	jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/DelayedStartClientTest.java
#	jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/AltFilterTest.java
#	jetty-websocket/jetty-websocket-client/src/test/java/org/eclipse/jetty/websocket/client/HttpClientInitTest.java
#	jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/client/ClientCloseTest.java
#	jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/io/AbstractWebSocketConnection.java
#	jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/extensions/compress/ByteAccumulatorTest.java
#	jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/WSServer.java
#	jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/WebSocketServerFactoryTest.java
#	jetty-xml/src/test/java/org/eclipse/jetty/xml/XmlConfigurationTest.java
#	pom.xml
#	tests/jetty-http-tools/src/main/java/org/eclipse/jetty/http/tools/matchers/HttpFieldsMatchers.java
#	tests/test-http-client-transport/pom.xml
#	tests/test-http-client-transport/src/test/java/org/eclipse/jetty/http/client/ServerTimeoutsTest.java
#	tests/test-integration/src/test/java/org/eclipse/jetty/test/support/rawhttp/HttpResponseTesterTest.java
 2019-05-01 15:02:31 -05:00
lachan-roberts
c5cb2170aa documentation link fixes and use of static loggers 
Signed-off-by: lachan-roberts <lachlan@webtide.com>
 2019-04-29 13:51:18 +04:00
lachan-roberts
002ecf526d Merge remote-tracking branch 'eclipse/jetty-10.0.x' into jetty-10.0.x-3494-clientclosetest 
Signed-off-by: lachan-roberts <lachlan@webtide.com>
 2019-04-09 18:21:40 +10:00
Lachlan Roberts
6cd5fb42e9 Issue #3494 - adjustments to WebSocketChannel processConnectionError 
WebSocketChannel.processConnectionError now defaults to NO_CLOSE
status if no protocol reasons can be found

added some debug logging

improvements to tests

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-04-05 12:18:09 +11:00
Simone Bordet
9c13cf3a52 Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2019-04-02 17:37:56 +02:00
lachan-roberts
50c193c23b Issue #3494 - fix ClientCloseTest.testWriteException() 
Nulling out values in WebSocketAdapter causes race conditions when
trying to access session and endpoint externally

Race condition in WebSocketChannel.Flusher.onCompleteFailure(),
processConnectionError should be called first to ensure that the
correct close reason is processed, super.onCompleteFailure() was closing
the connection causing a read failure.

race condition between the server detecting a read failure and sending
a response and the client detecting the write failure, now blocking
on the server so it is not reading and will not detect the failure

Signed-off-by: lachan-roberts <lachlan@webtide.com>
 2019-04-01 11:19:23 +11:00
Lachlan Roberts
46ef94c1b9 Issue #3465 - client/server error handling behavior for ExtensionStack 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-03-26 16:29:45 +11:00
lachan-roberts
0d570dd6b6 Issue #3478 - changes from review 
ExtensionStack.negotiate now differentiates between incorrect
extension config offered or incorrect config from negotiation

adding more BadMessageException cases

Signed-off-by: lachan-roberts <lachlan@webtide.com>
 2019-03-22 15:42:39 +11:00
Lachlan Roberts
eb4f7c000f Issue #3465 - internal WebSocket extensions 
do not allow internal extensions to be offered by the client
do not validate internal extensions

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-03-21 12:33:53 +11:00