Greg Wilkins
611e79945c
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2017-01-11 18:10:50 +11:00
Joakim Erdfelt
7e3d3604ac
Merge pull request #1219 from violetagg/ws-suspend-resume
...
Issue #1218 - When resuming a suspended connection do not register a …
2017-01-10 17:24:12 -04:00
Joakim Erdfelt
487748cd8f
Issue #1207 - Making EventDriver use WebSocketContainerScope instead
2017-01-10 16:27:49 +01:00
Joakim Erdfelt
25a1864de7
Issue #1229 - Adding testcase for WAR (expanded) with WEB-INF/lib/jetty-http.jar
2017-01-10 11:12:14 -04:00
Violeta Georgieva
eaa51be083
Issue #1218 - When resuming a suspended connection do not register a read interest if currently in filling mode.
...
Signed-off-by: Violeta Georgieva <vgeorgieva@pivotal.io>
2017-01-05 14:58:06 +02:00
Joakim Erdfelt
0fc897233a
Fixes #1216 to prevent duplicate SCI initialization of WSUF
2017-01-04 11:30:19 -04:00
Joakim Erdfelt
9324971d20
Issue #1216 improving init/destroy in WSUF
2017-01-04 10:42:51 -04:00
Joakim Erdfelt
ecc3c57dd1
Issue #1214 - Ensure all response headers are present
2017-01-04 10:10:23 -04:00
Joakim Erdfelt
cb7ef89619
Merge branch 'jetty-9.3.x' into jetty-9.4.x
2016-12-27 14:07:29 -07:00
Joakim Erdfelt
bf80d822c0
Issue #1202 - Adding testcase and fix for NPE in Sec-WebSocket-Extensions use
2016-12-27 14:06:33 -07:00
Joakim Erdfelt
f3c4424722
Fixes #1197 - Copying headers into upgrade facade more consistently
2016-12-27 13:41:45 -07:00
Joakim Erdfelt
bfc21f23e0
Merge branch 'jetty-9.3.x' into jetty-9.4.x
2016-12-27 13:33:41 -07:00
Joakim Erdfelt
03a283235c
Issue #1197 - adding testcase for Authorization use in WSClient
2016-12-27 13:32:21 -07:00
Joakim Erdfelt
77c63a1648
Merge branch 'release-9.3.15' into jetty-9.3.x
2016-12-21 14:56:08 -07:00
Joakim Erdfelt
64f714689e
Merge branch 'jetty-9.3.x' into jetty-9.4.x
2016-12-20 15:38:36 -07:00
Joakim Erdfelt
b9fd70f5ad
Bumping up test timeouts
2016-12-20 14:31:56 -07:00
Joakim Erdfelt
7494914ff6
Updating to version 9.3.16-SNAPSHOT
2016-12-20 13:09:32 -07:00
Joakim Erdfelt
680ecd646b
Updating to version 9.3.15.v20161220
2016-12-20 12:31:58 -07:00
Joakim Erdfelt
1441a1495b
Fixes #1138 - Adding jetty-client dependency to websocket.mod
2016-12-16 09:27:56 -07:00
Joakim Erdfelt
44596a7714
Merge branch 'jetty-9.3.x' into jetty-9.4.x
2016-12-16 08:38:01 -07:00
Joakim Erdfelt
c698c95e9b
Issue #1114 - removing redundant exportConfiguration
2016-12-15 10:44:34 -07:00
Joakim Erdfelt
bd104d59f9
Issue #1114 - persisting NativeWebSocketConfiguration mappings
...
+ Mappings are persisted if added to the NativeWebSocketConfiguration
before that configuration is started. Otherwise they are cleared
out on configuration.stop() lifecycle (like before)
2016-12-14 15:31:23 -07:00
Joakim Erdfelt
05f397caa4
Issue #1114 - Adding initial stop/start test logic
2016-12-14 13:20:28 -07:00
Simone Bordet
dd3a73e57a
Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'.
2016-12-14 11:19:49 +01:00
Joakim Erdfelt
9b609e0f6d
Issue #1161 - Leaving CookieStore alone HttpClient and WebSocketClient are stopped
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2016-12-14 09:00:12 +01:00
Jesse McConnell
6a7e5dd4f5
Updating to version 9.4.1-SNAPSHOT
2016-12-08 09:41:50 -06:00
Jesse McConnell
c54efb5929
Updating to version 9.4.0.v20161208
2016-12-08 08:56:45 -06:00
Jesse McConnell
19333b8b3b
Merge branch 'jetty-9.4.x' into release-9.4.0
2016-12-08 08:50:15 -06:00
Greg Wilkins
5186c1e6d0
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2016-12-08 18:35:40 +11:00
Ben Duffield
c7e139a8a6
fix typo in PathParamServerEndpointConfig javadoc ( #1145 )
...
Signed-off-by: Ben Duffield <bduffield@palantir.com>
2016-12-08 18:08:06 +11:00
Jan Bartel
fe493c2c06
Issue #1124
...
Fix classloading of WebSocketServerFactory for osgi.
2016-12-08 17:25:18 +11:00
Jesse McConnell
f8338b3f59
Updating to version 9.4.1-SNAPSHOT
2016-12-07 10:32:41 -06:00
Jesse McConnell
dac1d17a2d
Updating to version 9.4.0.v20161207
2016-12-07 09:47:30 -06:00
Greg Wilkins
a4884f0c2d
Issue #117
...
Fixed Upgrade Response to make a distinction between when headers are available from a response and when they are copied to and copied from the real response.
This exposed the fact that the extension header was being set twice. Fixed that and now test webapp works again.
2016-12-05 17:43:47 +11:00
Jan Bartel
936fd09a18
Issue #1124
...
Fix classloading of WebSocketServerFactory for osgi.
2016-12-05 09:42:44 +11:00
Greg Wilkins
d7aa079365
Issue #117 fixed javadoc errors
2016-12-02 15:33:30 +11:00
Greg Wilkins
4b82f54ad3
Issue #117 fixed javadoc errors
2016-12-02 14:34:37 +11:00
Joakim Erdfelt
b70101b93f
Fixes #117 - working build of WebSocketClient with HttpClient
...
+ Proxy support exists now
2016-12-01 15:00:41 -07:00
Joakim Erdfelt
709938e02b
Merge branch 'issue-117' into jetty-9.4.x
2016-12-01 13:06:08 -07:00
Joakim Erdfelt
47fd7e1bd2
Merge branch 'jetty-9.3.x' into jetty-9.4.x
2016-11-30 14:41:43 -07:00
Joakim Erdfelt
4b5e5566e8
Issue #117 - minor code review changes
2016-11-30 10:50:05 -07:00
Joakim Erdfelt
63d93160f1
Issue #1124 - post review cleanup of changes with @sbordet
2016-11-30 10:16:25 -07:00
Joakim Erdfelt
70247d74d9
Issue #1124 - Fixing up merge issues
...
+ Making WebSocketServletFactory always load a new
WebSocketServerFactory
+ Making WebSocketServerFactory need a ServletContext
to construct it, if appropriate (the WebSocketHandler
approach doesn't use a ServletContext)
+ NativeWebSocketConfiguration is now a bean of
ServerContainer
+ Removed WebSocketServletFactory.init(ServletContext) method
+ Renamed WebSocketServletFactory.init() to .start()
+ Renamed WebSocketServletFactory.cleanup() to .stop()
+ CDI & Websocket now works
+ Using a ServletContextListener now works
+ DecoderFactory and EncoderFactory now work
2016-11-29 15:46:03 -07:00
Joakim Erdfelt
f54938178e
Merge branch 'jetty-9.2.x' into 'jetty-9.3.x'
2016-11-29 14:29:33 -07:00
Joakim Erdfelt
e329e386f0
Issue #117 - Carrying over the work from features/wsclient-httpclient
2016-11-28 15:45:38 -07:00
Joakim Erdfelt
c509a83d3b
Issue #1124 - adding more web.xml test cases
2016-11-25 07:38:20 -07:00
Simone Bordet
fb509eefe4
Resetting the field that marks the filter exported as a context attribute.
2016-11-25 15:10:32 +01:00
Joakim Erdfelt
a3f32911fa
Issue #1124 - WebSocketUpgradeFilter + ServletContextListener
...
+ Now Spring and its initialization of WebSocketUpgradeFilter
can work.
+ Improves life for cometd 3.1.0 as well
2016-11-23 19:55:36 -07:00
Simone Bordet
c5c0cc71d0
Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'.
2016-11-23 12:18:29 +01:00
Simone Bordet
a9817d7ac2
Fixes #1123 - Broken lifecycle for WebSocket's mappings.
...
Now resetting the mappings in the lifecycle callbacks of the
enclosing classes.
2016-11-23 12:14:01 +01:00