Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
16,077 Commits 69 Branches 465 Tags 360 MiB
Commit Graph

295 Commits

Author SHA1 Message Date
Joakim Erdfelt 5d7e97993c Merge remote-tracking branch 'origin/master' into issue-207-master 2017-06-05 10:05:05 -07:00
Joakim Erdfelt 3e83908c58 Merge remote-tracking branch 'origin/jetty-9.4.x' into issue-207 2017-06-05 10:02:01 -07:00
Greg Wilkins ab4d300ae7 Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-05-30 17:43:19 +02:00
Greg Wilkins 78280d0595 Issue #1568 handle query strings with encoded characters 2017-05-24 09:22:16 +02:00
Joakim Erdfelt 4731470188 Issue #1568 - fixing accidental NPE with no query 2017-05-23 11:59:39 -07:00
Joakim Erdfelt 296050dfc4 Issue #1568 - Fixing improper query encoding in WebSocket ServletUpgradeRequest 2017-05-23 10:32:22 -07:00
Joakim Erdfelt 04b6afe879 Merge remote-tracking branch 'origin/jetty-9.4.x' into issue-207 2017-05-15 09:48:41 -07:00
Joakim Erdfelt 782f36f157 Updating to version 9.4.6-SNAPSHOT 2017-05-02 14:29:09 -07:00
Joakim Erdfelt 9d8ad7489c Updating to version 9.4.5.v20170502 2017-05-02 13:22:18 -07:00
Joakim Erdfelt 849ad7c917 Merge remote-tracking branch 'origin/jetty-9.4.x' into issue-207 2017-04-21 09:00:54 -07:00
Joakim Erdfelt 92ea5bda21 Updating to version 9.4.5-SNAPSHOT 2017-04-14 14:43:36 -07:00
Joakim Erdfelt 3dc8f557c6 Updating to version 9.4.4.v20170414 2017-04-14 13:20:17 -07:00
Joakim Erdfelt 1360b863dc Updating to version 9.4.4-SNAPSHOT 2017-03-17 10:53:54 -07:00
Joakim Erdfelt 95e94b49d8 Updating to version 9.4.3.v20170317 2017-03-17 09:54:58 -07:00
Joakim Erdfelt 9273d99a99 Merge remote-tracking branch 'origin/jetty-9.4.x' into issue-207 2017-03-15 15:07:17 -07:00
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
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
Simone Bordet 84b57c5f07 Merged branch 'jetty-9.4.x' into 'master'. 2017-01-20 12:32:18 +01: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 a205fb3aae Fixes #1276 - Remove org.eclipse.jetty.websocket.server.WebSocketServerFactory from SPI. 2017-01-20 09:55:01 +01:00
Simone Bordet cef2ff9522 Happy New Year 2017. 2017-01-19 19:31:53 +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
Simone Bordet a51f800054 Merged branch 'jetty-9.4.x' into 'master'. 2017-01-10 15:07:26 +01:00
Joakim Erdfelt ecc3c57dd1 Issue #1214 - Ensure all response headers are present 2017-01-04 10:10:23 -04: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
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
Jan Bartel fe493c2c06 Issue #1124 
Fix classloading of WebSocketServerFactory for osgi.
 2016-12-08 17:25:18 +11:00
Jan Bartel c02dec5654 Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-12-08 11:31:00 +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 4046ef26d3 Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-12-02 13:35:16 +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
Jan Bartel 4d7a629e1b Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-12-01 12:07:07 +11: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 e329e386f0 Issue #117 - Carrying over the work from features/wsclient-httpclient 2016-11-28 15:45:38 -07:00