Commit Graph

13648 Commits

Author SHA1 Message Date
Jan Bartel 8e0725db1c Issue #123
Make sync on id generation more tightly scoped.
2016-12-08 11:29:13 +11:00
Jesse McConnell be3085d5f7 Merge branch 'jetty-9.4.x' of github.com:eclipse/jetty.project into jetty-9.4.x 2016-12-07 09:42:00 -06:00
Jesse McConnell 6892f4724a Merge branch 'release-9.4.0.RC3' into jetty-9.4.x 2016-12-07 09:39:49 -06:00
Greg Wilkins 52f3f70f36 Issue #1139
Added --update-ini option to set properties in existing ini files.
2016-12-07 20:54:12 +11:00
Jesse McConnell eafea8592e Updating to version 9.4.0-SNAPSHOT 2016-12-05 09:39:45 -06:00
Jesse McConnell 63a014dc6a Updating to version 9.4.0.RC3 2016-12-05 08:47:28 -06:00
Jesse McConnell c26170a3c1 set for release 2016-12-05 08:45:44 -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
Jesse McConnell df6a46e380 Merge pull request #1126 from WalkerWatch/docupdates/moresessions
Misc doc updates/fixes.
2016-12-02 15:50:21 -06:00
Jesse McConnell 96e788348d Merge pull request #1140 from WalkerWatch/issues/1138
Issue #1138 - Doc updates and cleanup.
2016-12-02 15:50:07 -06: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
Greg Wilkins 73ee8f29bd Issue #1139 fixed javadoc 2016-12-02 14:12:15 +11:00
Greg Wilkins 8dcdea45a1 Issue #1139 fixed empty directory commit 2016-12-02 14:05:54 +11:00
Greg Wilkins 02a7d9c3a3 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-12-02 13:42:22 +11:00
Greg Wilkins ec0b1ea847 Issue #1134 HPACK
Improved exceptions when receiving unknown index or a field that cannot be indexed.
2016-12-02 13:40:58 +11:00
Greg Wilkins daffbfc528 Issue #1134 HPACK
Improved exceptions when receiving unknown index or a field that cannot be indexed.
2016-12-02 13:35:53 +11:00
Greg Wilkins 3ea2d1cf95 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-12-02 13:01:26 +11:00
Greg Wilkins b6b33bd679 Issue #1134 HPACK
Added test that demonstrates large headers are incorrectly indexed
Do not index fields if too large to fit
2016-12-02 10:27:14 +11:00
Joakim Erdfelt 691121365a Merge branch 'jetty-9.4.x' of github.com:eclipse/jetty.project into jetty-9.4.x 2016-12-01 15:01:55 -07:00
Joakim Erdfelt b70101b93f Fixes #117 - working build of WebSocketClient with HttpClient
+ Proxy support exists now
2016-12-01 15:00:41 -07:00
Jesse McConnell d4190e28a6 update VERSION.txt 2016-12-01 15:36:31 -06:00
Jesse McConnell 1f5e7988de Merge branch 'release-9.4.0.RC2' into jetty-9.4.x 2016-12-01 15:35:47 -06:00
Joakim Erdfelt 646a411746 Fixing onUpgradeFrom buffer flip issue 2016-12-01 13:07:28 -07:00
Joakim Erdfelt 281b18c0fc Adding test of onUpgradeFrom buffer split 2016-12-01 13:07:08 -07:00
Joakim Erdfelt e5fb1558a8 toConnectionString() can handle null connection 2016-12-01 13:06:50 -07:00
Joakim Erdfelt 709938e02b Merge branch 'issue-117' into jetty-9.4.x 2016-12-01 13:06:08 -07:00
Simone Bordet a5861954b0 Fixed NPE happening with DEBUG logging. 2016-12-01 18:19:05 +01:00
Jan Bartel f2d8157b1e Issue #1143 2016-12-01 17:07:07 +11:00
Jan Bartel 4caaad7166 Issue #1142 2016-12-01 12:09:49 +11:00
Jan Bartel ce6054391c Issue #877 2016-12-01 11:57:54 +11:00
Joakim Erdfelt 47fd7e1bd2 Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-11-30 14:41:43 -07:00
WalkerWatch 3e43ffe641 Issue #1138 - Doc updates and cleanup.
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-11-30 13:38:17 -05: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
Greg Wilkins 7a741f93ee Issue #1139 read command line from file 2016-11-30 21:20:50 +11:00
Greg Wilkins 95eef4e98c Issue #1139 set properties during --add-to-start 2016-11-30 20:33:34 +11:00
Jan Bartel f64cdd46b8 Issue #1138 2016-11-30 15:55:40 +11:00
Joakim Erdfelt 6c48d62da6 Merge branch 'jetty-9.3.x' of github.com:eclipse/jetty.project into jetty-9.3.x 2016-11-29 15:49:21 -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
Greg Wilkins 32eff3ffd3 apply #1135 to XmlConfiguration 2016-11-30 09:40:09 +11:00
Jan Bartel 640801987c Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-11-30 09:37:21 +11:00
dreis2211 9b0f6b1fd5 Issue #1135 - Avoid allocations from Method.getParameterTypes() if possible
Signed-off-by: dreis2211 <christoph.dreis@freenet.de>
(cherry picked from commit 16334c1893)
2016-11-30 09:36:30 +11: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
Simone Bordet c0b94a9d41 Merged branch 'issue-1124-9.2.x' into 'jetty-9.2.x'. 2016-11-25 15:46:14 +01:00
Simone Bordet 1a77cb95ba Resetting the field that marks the filter exported as a context attribute. 2016-11-25 15:39:02 +01:00
Joakim Erdfelt a73e466e4d Issue #1124 - WebSocketUpgradeFilter + ServletContextListener
+ Now Spring and its initialization of WebSocketUpgradeFilter
  can work.
+ Improves life for cometd 3.1.0 as well
2016-11-25 15:39:02 +01:00
Joakim Erdfelt c509a83d3b Issue #1124 - adding more web.xml test cases 2016-11-25 07:38:20 -07:00