Greg Wilkins
4046ef26d3
Merge remote-tracking branch 'origin/jetty-9.4.x'
2016-12-02 13:35:16 +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
693c4e6e1a
Merge remote-tracking branch 'origin/jetty-9.4.x'
2016-12-01 17:07:54 +11:00
Jan Bartel
f2d8157b1e
Issue #1143
2016-12-01 17:07:07 +11:00
Jan Bartel
3ac3b3cbfc
Merge remote-tracking branch 'origin/jetty-9.4.x'
2016-12-01 12:10:21 +11:00
Jan Bartel
4caaad7166
Issue #1142
2016-12-01 12:09:49 +11:00
Jan Bartel
4d7a629e1b
Merge remote-tracking branch 'origin/jetty-9.4.x'
2016-12-01 12:07:07 +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
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
bc96a8e0e6
Merge remote-tracking branch 'origin/jetty-9.4.x'
2016-11-30 15:56:04 +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
4e78a2b123
Merge remote-tracking branch 'origin/jetty-9.4.x'
2016-11-30 09:38:00 +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 16334c1893cc45a6a811cc7c6f2552a861643dac)
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
Jan Bartel
dc20387212
Merge pull request #1136 from dreis2211/method-parameter-count
...
Issue #1135 - Avoid allocations from Method.getParameterTypes() if possible
2016-11-29 16:44:39 +11:00
Joakim Erdfelt
e329e386f0
Issue #117 - Carrying over the work from features/wsclient-httpclient
2016-11-28 15:45:38 -07:00
dreis2211
16334c1893
Issue #1135 - Avoid allocations from Method.getParameterTypes() if possible
...
Signed-off-by: dreis2211 <christoph.dreis@freenet.de>
2016-11-28 21:17:04 +01: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
Simone Bordet
919f164bb3
Merged branch 'jetty-9.2.x' into 'issue-1124-9.2.x'.
2016-11-25 15:11:40 +01:00
Simone Bordet
fb509eefe4
Resetting the field that marks the filter exported as a context attribute.
2016-11-25 15:10:32 +01:00
Simone Bordet
df91fc1092
Merged branch 'jetty-9.4.x' into 'master'.
2016-11-25 09:05:51 +01:00
Simone Bordet
f70c6f790c
Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'.
2016-11-25 09:05:07 +01:00
Simone Bordet
dd76ed2449
Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'.
2016-11-25 09:04:16 +01:00
Simone Bordet
f254dbc0b6
Fixes #1130 - PROXY protocol support reports incorrect remote address.
2016-11-25 08:56:56 +01:00
Simone Bordet
59786f1f65
Code cleanup.
2016-11-25 08:56:56 +01:00
Jan Bartel
76b7686bc7
Issue #1117
2016-11-25 14:48:55 +11:00
Greg Wilkins
dd2f9d73b6
tests cleanup
2016-11-25 14:37:19 +11:00
Greg Wilkins
aff57fb524
Merge remote-tracking branch 'origin/jetty-9.4.x'
2016-11-24 15:52:49 +11:00
Jan Bartel
f3ef2cb014
Merge branch 'master' of github.com:eclipse/jetty.project
2016-11-24 15:51:25 +11:00
