1
0
mirror of https://github.com/jetty/jetty.project.git synced 2025-02-19 13:06:06 +00:00

922 Commits

Author SHA1 Message Date
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 - 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 - 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 53b31b03ddda3776f3db71e28e55312b1c982092, reversing
changes made to 4565c186d7491a97d72217a96e86b15ced506de6.
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 from violetagg/ws-suspend-resume
Issue  - When resuming a suspended connection do not register a …
2017-01-10 17:24:12 -04:00
Joakim Erdfelt
487748cd8f Issue - Making EventDriver use WebSocketContainerScope instead 2017-01-10 16:27:49 +01:00
Joakim Erdfelt
25a1864de7 Issue - Adding testcase for WAR (expanded) with WEB-INF/lib/jetty-http.jar 2017-01-10 11:12:14 -04:00
Violeta Georgieva
eaa51be083 Issue - 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 to prevent duplicate SCI initialization of WSUF 2017-01-04 11:30:19 -04:00
Joakim Erdfelt
9324971d20 Issue improving init/destroy in WSUF 2017-01-04 10:42:51 -04:00
Joakim Erdfelt
ecc3c57dd1 Issue - 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 - removing redundant exportConfiguration 2016-12-15 10:44:34 -07:00
Joakim Erdfelt
bd104d59f9 Issue - 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 - 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
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 - 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 - post review cleanup of changes with @sbordet 2016-11-30 10:16:25 -07:00
Joakim Erdfelt
70247d74d9 Issue - 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 - Carrying over the work from features/wsclient-httpclient 2016-11-28 15:45:38 -07:00
Joakim Erdfelt
c509a83d3b Issue - 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