Joakim Erdfelt
523fab30bd
Updating to version 9.4.3-SNAPSHOT
2017-02-20 08:13:31 -07:00
Joakim Erdfelt
4a674b9cc9
Updating to version 9.4.2.v20170220
2017-02-20 06:22:45 -07:00
Joakim Erdfelt
7f3ddf4edb
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2017-02-02 16:26:43 -07:00
Joakim Erdfelt
35b94fffd3
Improving touchy timeouts on slow machines
2017-02-02 16:25:42 -07:00
Joakim Erdfelt
5e57b9562f
Merge branch 'jetty-9.3.x' into jetty-9.4.x
2017-02-02 16:14:10 -07:00
Joakim Erdfelt
9a8f22d5dd
Testing Updates
...
+ Upgrading to jetty-test-helper 4.0
+ Removing use of org.eclipse.jetty.toolchain.test.SimpleRequest
+ Removing use of org.eclipse.jetty.toolchain.test.http.SimpleHttpParser
+ Removing use of org.eclipse.jetty.toolchain.test.http.SimpleHttpResponse
+ Updating long since deprecated (and now removed) known quirky methods
in jetty-test-helper and the test classes.
2017-02-02 15:51:38 -07:00
Jesse McConnell
e695fc80d6
Updating to version 9.2.22-SNAPSHOT
2017-01-20 12:32:51 -06:00
Jesse McConnell
513b5e5f90
Updating to version 9.2.21.v20170120
2017-01-20 12:32:00 -06:00
Jesse McConnell
d0c33ebe8b
Updating to version 9.4.2-SNAPSHOT
2017-01-20 10:49:06 -06:00
Jesse McConnell
556ecbcdcf
Updating to version 9.4.1.v20170120
2017-01-20 09:47:53 -06:00
Jesse McConnell
66b43ecda8
Updating to version 9.3.17-SNAPSHOT
2017-01-20 09:33:43 -06:00
Jesse McConnell
df03355d00
Updating to version 9.3.16.v20170120
2017-01-20 09:06:48 -06:00
Simone Bordet
ee17396cee
Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'.
2017-01-20 12:27:29 +01:00
Simone Bordet
9ae93c19ca
Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'.
2017-01-20 12:20:21 +01:00
Simone Bordet
51f68dc57e
Issue #1229 - ClassLoader constraint issue when using NativeWebSocketConfiguration with WEB-INF/lib/jetty-http.jar present.
...
Introduced String-based APIs to specify mappings, to avoid the
classloader issue.
2017-01-20 11:34:29 +01:00
Simone Bordet
a205fb3aae
Fixes #1276 - Remove org.eclipse.jetty.websocket.server.WebSocketServerFactory from SPI.
2017-01-20 09:55:01 +01:00
Simone Bordet
0c8273f2ca
Happy New Year 2017.
2017-01-19 19:26:41 +01:00
Simone Bordet
07838b057f
Happy New Year 2017.
2017-01-19 18:54:03 +01:00
Simone Bordet
347c48d657
Revert "resolve merge and update license headers"
...
This reverts commit 53b31b03dd
, reversing
changes made to 4565c186d7
.
2017-01-19 18:26:43 +01:00
Jesse McConnell
53b31b03dd
resolve merge and update license headers
2017-01-19 09:33:16 -06:00
Jesse McConnell
ce3e6dafec
update license headers to 2017
2017-01-19 09:30:00 -06:00
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
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
6b3b59df43
Updating to version 9.2.21-SNAPSHOT
2016-12-16 16:23:06 -07:00
Joakim Erdfelt
bcbcee7f23
Updating to version 9.2.20.v20161216
2016-12-16 15:47:41 -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
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
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
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
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
Joakim Erdfelt
d361786e43
Issue #1118 - Eliminating .destroy() conflict
...
+ extending from AbstractLifeCycle instead of ContainerLifeCycle
2016-11-22 09:48:01 -07:00
Joakim Erdfelt
1003969468
Merge branch 'jetty-9.3.x' into jetty-9.4.x
2016-11-17 11:04:40 -07:00
Joakim Erdfelt
7930a3dac8
Fixing merge 9.2.x -> 9.3.x
2016-11-16 18:31:33 -07:00
Joakim Erdfelt
bfadca49b5
Merge branch 'jetty-9.2.x' into jetty-9.3.x
2016-11-16 13:56:31 -07:00
Joakim Erdfelt
e6b3216708
Issue #1090 - Delaying role of WebSocketUpgradeFilter till .init()
...
+ WebSocketServerContainerInitializer now initializes the
MappedWebSocketCreator, WebSocketServerFactory, and
ServerContainer directly, but puts the components needed
by WebSocketUpgradeFilter into ServletContext attributes
that it can obtain in its own init()
+ Added optional org.eclipse.jetty.websocket.jsr356.addDynamicFilter
init-param/attribute key to disable/enable the automatic addition
of the WebSocketUpgradeFilter during JSR356 init (to allow
WEB-INF/web.xml specified filter to operate instead)
+ Added WebSocketServerContainerINitializer.isEnabledViaContext()
to make testing the init-param and attributes more generic
2016-11-16 13:43:06 -07:00
Joakim Erdfelt
2295bd59e3
Issue #1090 - Use WebSocketUpgradeFilter from WEB-INF/web.xml if present
2016-11-10 14:26:04 -07:00
Jesse McConnell
9a6f68be78
Merge branch 'release-9.3.14' into jetty-9.3.x
2016-11-07 10:45:04 -06:00
Joakim Erdfelt
996253c971
Merge branch 'jetty-9.3.x' into jetty-9.4.x
2016-11-02 11:33:57 -07:00
Joakim Erdfelt
3a8cdc93d8
Merge branch 'jetty-9.2.x' into jetty-9.3.x
2016-11-02 11:33:43 -07:00
Joakim Erdfelt
c665106fc5
Issue #1057 - Improve WebSocketUpgradeFilter performance
...
+ Tests for WebSocket upgrade now evaluates the request
from least common feature to most common feature, so as
minimize the testing of the request object on every request
2016-11-02 11:28:56 -07:00
Joakim Erdfelt
2c38511828
Updating to version 9.3.15-SNAPSHOT
2016-10-28 13:01:34 -07:00
Joakim Erdfelt
14611d2f76
Updating to version 9.3.14.v20161028
2016-10-28 12:21:02 -07:00
Joakim Erdfelt
ade14ba34b
Updating to version 9.3.14-SNAPSHOT
2016-10-14 11:33:51 -07:00
Joakim Erdfelt
c3a78e70a8
Updating to version 9.3.13.v20161014
2016-10-14 10:39:37 -07:00
Jesse McConnell
863913b64e
set for dev
2016-09-30 19:05:47 +00:00
Jesse McConnell
b91cc8a4ea
set for release
2016-09-30 18:01:20 +00:00
Joakim Erdfelt
6cf10172ca
Updating to version 9.3.13-SNAPSHOT
2016-09-15 07:34:52 -07:00
Joakim Erdfelt
8b35fdc5a5
Updating to version 9.3.12.v20160915
2016-09-15 06:48:16 -07:00
Joakim Erdfelt
fb7da26ad2
Updating to version 9.2.20-SNAPSHOT
2016-09-08 13:04:11 -07:00
Joakim Erdfelt
7b94bc32f4
Updating to version 9.2.19.v20160908
2016-09-08 12:11:44 -07:00
Joakim Erdfelt
2830e51e04
Merge branch 'jetty-9.3.x' into release-9.3.11
2016-07-28 12:20:36 -07:00
Jan Bartel
e45e649761
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2016-07-28 15:06:12 +10:00
Joakim Erdfelt
b3d25183b5
Fixes #780 - The moved websocket PathSpec is incompatible with cometd 3.0.x
2016-07-27 09:31:11 -07:00
Joakim Erdfelt
6e1b1cdb36
Updating to version 9.3.12-SNAPSHOT
2016-07-21 19:07:19 -07:00
Joakim Erdfelt
9fd6d4354e
Updating to version 9.3.11.v20160721
2016-07-21 18:37:09 -07:00
Joakim Erdfelt
0b18340179
Updating to version 9.2.19-SNAPSHOT
2016-07-21 13:10:23 -07:00
Joakim Erdfelt
d3ff3423f0
Updating to version 9.2.18.v20160721
2016-07-21 12:35:26 -07:00
Jesse McConnell
ae931538ab
[maven-release-plugin] prepare for next development iteration
2016-06-22 13:59:10 -05:00
Jesse McConnell
df1ed4fb03
[maven-release-plugin] prepare release jetty-9.3.11.M0
2016-06-22 13:59:06 -05:00
Jesse McConnell
030ec61837
[maven-release-plugin] prepare for next development iteration
2016-06-22 09:14:25 -05:00
Jesse McConnell
9a4cb41122
[maven-release-plugin] prepare release jetty-9.3.11.M0
2016-06-22 09:14:21 -05:00
Jesse McConnell
e7034117ea
[maven-release-plugin] prepare for next development iteration
2016-06-21 08:50:13 -05:00
Jesse McConnell
16c435c69d
[maven-release-plugin] prepare release jetty-9.3.10.v20160621
2016-06-21 08:50:09 -05:00
Greg Wilkins
e607acfa4e
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2016-06-15 18:06:32 +10:00
Greg Wilkins
0e5de87d49
Issue #663 Cleanup
...
Increased websocket tests timeouts
2016-06-15 18:04:33 +10:00
Simone Bordet
876f20006d
Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'.
2016-06-14 11:04:54 +02:00
Simone Bordet
dc7bd636d0
Increased timeouts to avoid failures on slower machines.
2016-06-14 11:04:18 +02:00
Simone Bordet
fb76491ea0
Code cleanups.
2016-06-14 11:04:01 +02:00
Simone Bordet
3dca610f7b
Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'.
2016-06-13 23:39:23 +02:00
Simone Bordet
ebee9f12f9
Fixed SessionTrackingTest.
...
Introduced WebSocketSession.Listener that can be used to be notified
of session opening and close, so that tests can be written more reliably.
2016-06-13 23:23:15 +02:00
Simone Bordet
e578c79b41
Code cleanups.
2016-06-13 23:23:14 +02:00
Jesse McConnell
20c1301203
Merge branch 'jetty-9.3.x' into jetty-9.4.x
2016-06-07 11:56:27 -05:00
Joakim Erdfelt
dd8afc34b9
Merge branch 'jetty-9.3.x' into bugs/388
2016-06-06 08:37:36 -07:00