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
21,417 Commits 55 Branches 466 Tags
Commit Graph

3517 Commits

Author SHA1 Message Date
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
Joakim Erdfelt
afcf563148 Updating to version 9.4.19.v20190610 2019-06-10 11:17:56 -05:00
Joakim Erdfelt
5dbc0bdaa5
Merge pull request #3745 from eclipse/jetty-9.4.x-3743-xmlconfig-locations 
Issue #3743 - Using Location based XmlConfiguration where possible
 2019-06-10 11:08:51 -05:00
Joakim Erdfelt
1683df2da6 Putting new JMH test in correct place (fix from last merge) 2019-06-10 10:04:30 -05:00
Simone Bordet
826d68e80a Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 2019-06-10 11:41:47 +02:00
Simone Bordet
5346980dbb Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 2019-06-10 11:29:25 +02:00
Joakim Erdfelt
550fb99e86 Issue #3698 - fixing javadoc 2019-06-07 07:01:06 -05:00
Simone Bordet
dd79b516f3 Fixes #3750 - NPE in WebSocketClient.toString(). 
Initializing field `sessionTracker` early to avoid NPE.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2019-06-07 11:36:42 +02:00
Joakim Erdfelt
986dd77e60 Issue #3698 - Applying changes from PR feedback. 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-06-06 16:44:35 -05:00
Joakim Erdfelt
6686083462 Issue #3743 - Using only Location based XmlConfiguration in Jetty itself 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-06-06 11:55:01 -05:00
Joakim Erdfelt
631f0cd9f6 Issue #3648 - SSL based on WebSocket behavior (CLIENT vs SERVER) 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-06-06 11:39: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
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
90e849af76 disable failing testSuspendAfterClose for further review 
the WebSocket suspend after close different behaviour from 9 to 10
in jetty-10 an ISE is thrown
in jetty-9 it is a no-op

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-06-05 13:30:21 +10:00
Lachlan Roberts
edcaa4eda7 rename writeIdleTimeout to writeTimeout for javax websockets 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-06-05 01:48:26 +10:00
Lachlan Roberts
bb65167549 Merge remote-tracking branch 'eclipse/jetty-9.4.x' into jetty-10.0.x 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-06-05 01:34:53 +10:00
Lachlan
f282ba4758
Merge pull request #3686 from lachlan-roberts/jetty-10.0.x-3666-errorClose 
Issue #3666 - error CloseFrames skip frames in the FrameFlusher queue
 2019-06-04 13:43:54 +10:00
Lachlan
ac8303c45e
Merge pull request #3637 from lachlan-roberts/jetty-9.4.x-3498-websocket-suspend 
Issue #3498 - jetty 9.4 websocket suspend for incoming frames
 2019-06-04 13:42:24 +10:00
Joakim Erdfelt
a6b2bd86ef Issue #3698 - Changes based on review from @sbordet 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-06-03 15:52:41 -05:00
Joakim Erdfelt
54888d2541 Issue #3698 - Reworking WebSocket SCI's to be more flexible in embedded 
+ Added new SCIOnStartupListener that allows for manual wiring up
  of ServletContainerInitializers (with no bytecode scanning)
  in embedded jetty usages
+ Introduced .initialized(context) and .configure(context) to both of
  the websocket SCIs
+ Moved ClientConnectTest to jetty-websocket-tests
+ Moved WebSocketClientTest to jetty-websocket-tests
+ Made moved tests not use BlockheadServer
+ Made moved tests use new .configure(context, lambda) methods
+ Also allowing javax.websocket.server SCI implementation to
  add ContextDestroyListener during the execution of another
  ServletContextListener.

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-06-03 13:31:06 -05: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
Simone Bordet
567c5a4f55 Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 2019-05-30 12:49:47 +02:00
Simone Bordet
0cf91c91e1 Issue #3696 - Unwrap JavaxWebSocketClientContainer.connectToServer() exceptions. 
Improved exception unwrapping.
Code cleanups.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2019-05-29 19:21:00 +02:00
Simone Bordet
3d20d9c51a Merge branch 'jetty-10.0.x-3696-connectToServer-ExecutionException' of https://github.com/lachlan-roberts/jetty.project into lachlan-roberts-jetty-10.0.x-3696-connectToServer-ExecutionException 2019-05-29 19:02:59 +02:00
Michael Hausegger
fdcbb214f8 Added tests for decoders 
Signed-off-by: Michael Hausegger <hausegger.michael@googlemail.com>
 2019-05-29 17:43:19 +02:00
Michael Hausegger
564ac4a2d3 Added Unit Tests for ReflectUtil. 
Signed-off-by: Michael Hausegger <hausegger.michael@googlemail.com>
 2019-05-29 17:09:45 +02:00
Greg Wilkins
3e0e6a73c7
Some fixes for running cometd6 on jetty-10 (#3702) 
* Some fixes from testing cometd-6

Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-05-28 17:08:38 +02:00
Lachlan Roberts
77d95d039c Issue #3696 - unwrap ExecutionException in javax WS connectToServer 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-05-28 11:55:31 +10:00
Lachlan
49356bb5c5
Merge pull request #3660 from lachlan-roberts/jetty-10.0.x-configuration-refactor 
jetty-10 WebSocket configuration refactor
 2019-05-24 10:40:30 +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
olivier lamy
68fa24e463 fix bad merge 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2019-05-23 16:31:02 +10:00
Lachlan
19e80ff788
Merge pull request #3685 from lachlan-roberts/jetty-10.0.x-83-sessiontrackingtest-failures 
Issue #83 - reworked SessionTrackingTest to fix intermittent failures
 2019-05-23 16:10:30 +10:00
olivier lamy
d377db5d26 Merge branch 'jetty-9.4.x' into jetty-10.0.x 2019-05-23 14:18:39 +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
52cc4f6c22 Issue #83 - reworked SessionTrackingTest to fix intermittent failures 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-05-22 17:16:52 +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
Simone Bordet
3af45f4c89
Merge pull request #3665 from eclipse/jetty-9.4.x-3663-remove-deps-in-wsclient-with-httpclient 
Issue #3663 - Remove @Deprecation's from WebSocketClient
 2019-05-20 10:55:43 +02:00
Michael Hausegger
5760795f96 Corrected license header information 
Signed-off-by: Michael Hausegger <hausegger.michael@googlemail.com>
 2019-05-17 14:26:58 +02:00
Michael Hausegger
d4ffef3de7 Added tests for UpgradeResponseAdapter 
Signed-off-by: Michael Hausegger <hausegger.michael@googlemail.com>
 2019-05-17 14:26:58 +02: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
Joakim Erdfelt
0eb90e41d1 Issue #3663 - Remove @Deprecation's from WebSocketClient 
+ Those methods and constructors that had @Deprecation assigned
  that urged the use of HttpClient directly are no longer
  annotated as deprecated because of legitimate possibility of
  a valid LinkageError

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-05-16 09:48:28 -05:00
Michael Hausegger
4f90eb6533 Added Unit Tests to increase code coverage. 
Signed-off-by: Michael Hausegger <hausegger.michael@googlemail.com>
 2019-05-16 08:25:34 +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
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
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