Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
19,716 Commits 70 Branches 462 Tags 370 MiB
Commit Graph

64 Commits

Author SHA1 Message Date
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
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
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 Roberts bab274be85 fix to PartialListenerTest from merge 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-08-02 15:15:57 +10:00
olivier lamy 6df9ef3a15 Updating to version 10.0.0-SNAPSHOT 2019-07-12 06:54:56 +10:00
olivier lamy 8cbfd51e80 Updating to version 10.0.0-alpha0 2019-07-12 06:54:56 +10:00
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
Lachlan Roberts 6eee5ad415 Merge remote-tracking branch 'eclipse/jetty-9.4.x' into jetty-10.0.x 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-07-04 14:30:45 +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
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 fe051bf392 Removing deprecated methods in Jetty 10 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-06-20 11:41:42 -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 0d9de28226
Issue #3661 - move WebSocketSessionListener to WebSocket-API 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-06-11 21:08:52 +10: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 85aa3424b6 Issue #3712 - rename maxIdleTime usage to idleTimeout for WebSockets 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-06-05 14:18:47 +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 491ff5eb93 rename WebSocketChannel to WebSocketCoreSession 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-05-22 08:29:05 +02:00
Lachlan Roberts c40a303e2c allow live configuration of maxMessageSizes on JettyWebSocketSession 
and set the configuration on supplied CoreClient to the Javax client container

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-05-16 15:50:20 +10:00
Lachlan Roberts 455cc3d2e2 improvements to the jetty-websocket configuration testing 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-05-16 15:43:22 +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
lachan-roberts b6d6c83bf1 Issue #3382 - changes from review 
Signed-off-by: lachan-roberts <lachlan@webtide.com>
 2019-05-07 09:26:36 +02:00
lachan-roberts ec88316116 Issue #3382 - improve testing for WS suspend and fix demand on resume 
Signed-off-by: lachan-roberts <lachlan@webtide.com>
 2019-05-07 09:26:36 +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
Lachlan Roberts 15d4659cc0 demand before succeeding callback in JettyWebSocketFrameHandler 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-04-25 17:03:23 +04:00
lachan-roberts e09df1fe6d Issue #3479 - code cleanups 
Signed-off-by: lachan-roberts <lachlan@webtide.com>
 2019-04-18 07:02:01 +10:00
lachan-roberts 0bd1f3918d Issue #3479 - allow async sending of partial data frames and ping/pong 
Signed-off-by: lachan-roberts <lachlan@webtide.com>
 2019-04-18 07:02:01 +10:00
lachan-roberts 04f0872913 Issue #3479 - implement getInetSocketAddress() and flush() 
deprecate old getInetSocketAddress() and add getRemoteAddress()

Signed-off-by: lachan-roberts <lachlan@webtide.com>
 2019-04-18 07:02:01 +10:00
Lachlan Roberts 9e3eb3df35 Issue #3479 - Wire up batchMode annotation for jetty-websockets 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-04-18 07:02:01 +10: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
lachan-roberts 3f0ed2cc1a Issue #3382 - changes from review 
Signed-off-by: lachan-roberts <lachlan@webtide.com>
 2019-04-05 13:14:17 +11:00
Lachlan Roberts 5eed464730 Issue #3382 - delay any frames received while suspended until resumed 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-04-03 17:24:40 +11:00
lachan-roberts 8f29ea04cd Issue #3382 - implement Session.suspend() for jetty 10 websocket-api 
Signed-off-by: lachan-roberts <lachlan@webtide.com>
 2019-03-29 20:16:20 +11:00
Lachlan Roberts 62406cdfa2 Issue #3458 - missing licence headers and changes from review 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-03-18 15:24:23 +11:00
Lachlan Roberts 86675422a6 Issue #3458 - ExtensionConfig now delegates to core implementation 
ExtensionConfig is now interface in jetty-websocket-api and
implemented in jetty-websocket-common, for its static methods it now
uses a ExtensionConfig.Parser found by the ServiceLoader

the api tests were moved to jetty-websocket-tests

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-03-18 15:24:23 +11:00
Greg Wilkins 8b2b626f3c
Merge pull request #3455 from eclipse/jetty-10.0.x-3453-remove-deprecated-websocket-extension-api 
Issue #3453 - Removing deprecated Extension classes in jetty-websocket-api
 2019-03-13 11:05:47 +11:00
Joakim Erdfelt 8a0fff9153 Issue #3453 - Removing deprecated Extension classes in jetty-websocket-api 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-03-12 10:23:51 -05:00
lachan-roberts e355ec31b8 Issue #3446 - renaming, code cleanup and fixes 
rename WebSocketSessionImpl to WebSocketSession

remove SessionListener which is unused and replaced by
WebSocketSessionListener

Signed-off-by: lachan-roberts <lachlan@webtide.com>
 2019-03-11 18:07:52 +11:00
lachan-roberts 265e0be6f7 Issue #3446 - jetty-websocket tests for WebSocketUpgradeFilter 
Signed-off-by: lachan-roberts <lachlan@webtide.com>
 2019-03-11 18:05:44 +11:00
lachan-roberts 01bc9d3835 Issue #3406 - fix SessionTracker and JettyWebSocketFrameHandlerTest 
Signed-off-by: lachan-roberts <lachlan@webtide.com>
 2019-03-07 14:19:35 +11:00
lachan-roberts 155974bc07 Issue #3406 - jetty and javax WebSocket FrameHandler fixes 
invoke the close handle in onClosed instead of onCloseFrame in
JettyWebSocketFrameHandler

in both frame handlers replace usage of getClass().getName()
with getClass().getSimpleName() to increase the amount of characters
from the original exception which can fit in the close frame message

Signed-off-by: lachan-roberts <lachlan@webtide.com>
 2019-03-07 10:27:50 +11:00
Joakim Erdfelt d8a9f2619b Issue #3379 - Add tracking of WebSocket Sessions to various WebSocket Container APIs 
+ Jetty WebSocket API now tracks Sessions and will close them on
  lifecycle stop
+ Javax WebSocket API now tracks Sessions and will close them on
  lifecycle stop
+ Adding Jetty WebSocket tests for proper close / session tracking
+ Disabling tests that need triage

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-02-27 16:26:43 -05:00
Simone Bordet b9f89af847 Fixes #3320 - Review Jetty 10 module-info.java. 
Reviewed module-info.java files.
For those that have a "requires static" added a comment about
why the dependency is optional.
Rearranged directives in alphabetical order.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2019-02-08 17:30:27 +01:00
Simone Bordet cd488c2d7d Merged branch 'jetty-10.0.x' into 'jetty-10.0.x-3162_jetty_servlet_api'. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2019-02-04 23:11:32 +01:00
Simone Bordet 33f314e9f5 Issue #3162 - Use Jetty specific Servlet API jar. 
Updated to jetty-servlet-api:4.0.1, based on javax.servlet 4.0.1.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2019-02-04 18:51:51 +01:00
Lachlan Roberts 6a98cc0bd2 Issue #3298 - bug fixes for jetty websockets 
succeed callback when you do not have a message sink

OnWebSocketFrame annotation should take an API frame not a core frame

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-01-31 22:24:09 +11:00
Lachlan Roberts bd4f9b30fc Issue #3298 - cleanup of CompletableFutures for WebSocket upgrades 
Jetty and Javax ClientUpgradeRequests no longer use the combination of
the the onOpenFuture and the futureCoreSession and instead use only
the CompletableFuture future given to the FrameHandler onOpen

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-01-31 11:13:05 +11:00
Greg Wilkins 84d74ba1de Issue #3290 async onOpen, onClose and onError 
Changes after review:
 + removed Adaptor from FrameHandler, so all non test usages of
   FrameHandler now use async API.
 + Fixed sequencing of multiple async operation so callback is notified
   after completion (created more Callback.from utilities for this)
 + fixed import order

Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-01-29 10:33:37 +11:00