Eclipse/jetty.project
1
0
Fork 0
mirror of https://github.com/jetty/jetty.project.git synced 2025-02-25 00:45:18 +00:00
Code Issues Packages Projects Releases Wiki Activity
18,502 Commits 55 Branches 466 Tags
Commit Graph

2896 Commits

Author SHA1 Message Date
Greg Wilkins
d84a4efde5 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-04-30 13:46:59 +02:00
Lachlan Roberts
8ddcf3685b Issue #3608 - give 400 error response for missing Sec-WebSocket-Key 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-04-30 15:11:51 +04: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
8360aad619 remove exception stack traces and prints from websocket tests 
Signed-off-by: lachan-roberts <lachlan@webtide.com>
 2019-04-29 13:51:18 +04:00
Joakim Erdfelt
29b960551f Merge branch release-9.4.17 into jetty-9.4.x 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

# Conflicts:
#	jetty-bom/pom.xml
 2019-04-25 09:15:42 -05:00
Joakim Erdfelt
13992d96e4
Merge pull request #3557 from lachlan-roberts/jetty-9.4.x-3476-websocket-concurrent-connect 
Issue #3476 - previous WebSocketSessions being added to new connections
 2019-04-25 06:55:00 -07: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
Joakim Erdfelt
05bb111580 Updating to version 9.4.18-SNAPSHOT 2019-04-18 15:59:49 -05:00
Joakim Erdfelt
aa1c656c31 Updating to version 9.4.17.v20190418 2019-04-18 14:44:28 -05:00
Lachlan Roberts
41df3d6fc3 Issue #3479 - deprecate send by Future methods in RemoteEndpoint 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-04-18 07:02:01 +10: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
f42ef1356e Issue #3479 - removing unused classes in jetty-websocket-api 
Signed-off-by: Lachlan 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
Lachlan Roberts
aeb9d2c5dc Issue #3476 - previous WebSocketSessions being added to new connections 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-04-16 13:41:38 +10:00
Joakim Erdfelt
79537a5f51 Updating to version 9.4.17-SNAPSHOT 2019-04-11 11:00:24 -05:00
Joakim Erdfelt
e0aa4ae4c0 Updating to version 9.4.16.v20190411 2019-04-11 10:01:26 -05: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
Joakim Erdfelt
dd5c2e315f Issue #3530 - Warning on attempt to use WebSocket Bootstrap on HTTP/2 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-04-08 12:05:39 -05:00
Simone Bordet
40c2e76786 Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 2019-04-06 13:45:54 +02:00
Greg Wilkins
d0eef53cf6
Merge pull request #3504 from lachlan-roberts/jetty-10.0.x-3382-session-suspend 
Issue #3382 - implement Session.suspend() for jetty-10 jetty-websocket-api
 2019-04-06 09:17:33 +11:00
Simone Bordet
1b384329ae Fixes #3526 - Request locale not retained in WebsocketUpgrade request. 
Trivial fix, the locale was not copied from the HTTP requets to the
WebSocket upgrade request.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2019-04-05 17:50:41 +02:00
Lachlan Roberts
54690185ef Issue #3382 - update to javadoc from review 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-04-05 17:03:20 +11: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
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
ec273b7cf0 Fixes after merge. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2019-04-03 19:13:19 +02: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
Lachlan Roberts
7df8140137 Issue #3494 - failures in testRemoteDisconnect because of timeout 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-04-03 14:50:37 +11:00
Lachlan Roberts
607a870d8e Issue #3494 - fixes to testStopLifecycle 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-04-03 10:34:53 +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
Simone Bordet
c4b2621f56
Merge pull request #3480 from eclipse/jetty-9.4.x-3464-split_sslcontextfactory 
Issue #3464 - Split SslContextFactory into Client and Server
 2019-04-02 12:39:37 +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
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
717d7300ac adding missing file headers for JettyWebSocketServlets 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-03-28 16:22:10 +11:00
Lachlan Roberts
81960e3da8 Issue #3484 - make WebSocketServlet generic 
WebSocketServlet could only be used with the jetty-websocket-api
make this generic and add implementation in websocket-server

this prevents jetty-websocket-server from needing to use core classes
can cause class cast exceptions from a webapp due conflicts between the
clients version of core classes and those provided by the container

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-03-28 16:22:10 +11:00
Lachlan Roberts
3c61a92ac8 only protectAndExpose api and server for jetty-websockets 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-03-28 16:22:10 +11:00
Lachlan Roberts
97ff7ed9c0 Issue #3106 - changes from review, adding javadoc 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-03-28 14:30:11 +11:00
Lachlan Roberts
45b2c548b0 Issue #3106 - backport WebSocket connection stats from jetty-10 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-03-28 14:30:11 +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
Joakim Erdfelt
65528f76c5
Merge pull request #3467 from eclipse/jetty-9.4.x-3422-wss-close-wait 
Issue #3422 - WebSocket wss CLOSE_WAIT on aborted client connection
 2019-03-22 11:36:40 -05: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
Joakim Erdfelt
4eb8cb1686 Issue #3422 - Using new Connection.Listener support in websocket server 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-03-21 14:40:49 -05:00
Joakim Erdfelt
e56ef9d8f8 Backporting Connection.Listener support on WebSocket server connections from jetty-10.0.x 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-03-21 14:37:41 -05:00
Simone Bordet
6fb243ff6c Issue #3464 - Split SslContextFactory into Client and Server 
Introduced SslContextFactory subclasses Client and Server.
Replaced all usages of SslContextFactory with either Client or Server
as required.

Refactored configuration checking so that warnings are not emitted
when non necessary.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2019-03-21 14:42:42 +01: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
Lachlan Roberts
26e7881dbd Issue #3465 - Negotiation of WebSocket extensions 
default behaviour of Negotiation no longer includes all of the
offered extensions as the negotiated extensions but it now takes
only the first extension if there are multiple of the same name,
this is now done when the negotiation is created and can be overwritten
by the negotiator

Throw exception on websocket errors so the proper status code can
be reported back to the client

fix to checking for multiple negotiated extensions of the same name

added tests for core and jetty websockets for the negotiation

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-03-21 11:41:01 +11:00
Lachlan Roberts
7e9700fb9a Issue #3462 - changes from review 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-03-19 14:38:17 +11:00
Lachlan Roberts
403bdb70ea Merge remote-tracking branch 'eclipse/jetty-10.0.x' into jetty-10.0.x-3462-websocketclient-validation 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-03-19 11:54:19 +11:00
Lachlan Roberts
cdd3ed943c Issue #3462 - parse extensions and subprotocols from headers every time 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-03-19 11:20:49 +11:00