12575 Commits

Author SHA1 Message Date
Simone Bordet
91eb6a2405 Removed usage of special empty buffers, not needed. 2016-12-16 11:19:18 +01:00
Simone Bordet
8864361c1a Fixes #1181 - Review buffer underflow cases in SslConnection. 2016-12-16 10:40:06 +01:00
Joakim Erdfelt
4c93385611 Merge branch 'issue-1114' into jetty-9.3.x 2016-12-15 10:45:11 -07:00
Joakim Erdfelt
c698c95e9b Issue #1114 - removing redundant exportConfiguration 2016-12-15 10:44:34 -07:00
Jesse McConnell
cdfbf966ff Update CONTRIBUTING.md 2016-12-15 07:59:08 -07:00
Jesse McConnell
04909b4e98 Update CONTRIBUTING.md
updated
2016-12-15 07:57:45 -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
Joakim Erdfelt
c70fa88be0 Issue #1175 - Correcting test DispatchType 2016-12-14 12:16:53 -07:00
Joakim Erdfelt
f91d1e01fe Issue #1175 - More realistic test of commons-fileupload behavior 2016-12-14 11:53:10 -07:00
Joakim Erdfelt
f846b37cbb Issue #1175 - Adding testcase to Jetty 9.3.x 2016-12-14 10:58:36 -07:00
Simone Bordet
07c9bc5a51 Fixes #1169 - HTTP/2 reset on a stalled write does not unblock writer thread.
The fix notifies the transport when a reset frame is received,
allowing the transport to fail the write callback which then notifies
the application, either by throwing (in case of blocking writes) or
by calling error listeners.

Also added a guard, in HttpChannel.handle() for the ERROR_DISPATCH case,
that checks if the response is already committed, and if so, abort
the transport - similar to what's already there for 9.4.
2016-12-14 11:07:00 +01:00
Joakim Erdfelt
9b609e0f6d Issue #1161 - Leaving CookieStore alone HttpClient and WebSocketClient are stopped
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2016-12-14 09:00:12 +01:00
Simone Bordet
bc3c3ff9c8 Improved logging. 2016-12-12 16:00:12 +01:00
Ben Duffield
c7e139a8a6 fix typo in PathParamServerEndpointConfig javadoc (#1145)
Signed-off-by: Ben Duffield <bduffield@palantir.com>
2016-12-08 18:08:06 +11:00
Jan Bartel
fe493c2c06 Issue #1124
Fix classloading of WebSocketServerFactory for osgi.
2016-12-08 17:25:18 +11:00
Greg Wilkins
af5d27c2f7 Issue #1146 DecryptedEndPoint deadlock 2016-12-07 22:50:27 +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
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
63d93160f1 Issue #1124 - post review cleanup of changes with @sbordet 2016-11-30 10:16:25 -07: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
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
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
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
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
Joakim Erdfelt
526ea55e9b Merge pull request #1121 from eclipse/issue-1108
Issue #1108 - adding SslContextFactory.dump() selection details
2016-11-23 08:48:00 -07:00
Joakim Erdfelt
3e963df353 Adding missing license header
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2016-11-23 06:07:13 -07: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
d57cfe8ce1 Issue #1108 - adding comment about the purpose of the pristine SSLEngine
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2016-11-22 12:00:10 -07:00
Joakim Erdfelt
b308574dd5 Issue #1108 - Use pristine SSLEngine for detecting JreDisabled
+ The use of the SSLEngine from SslContextFactory will include
  the as-configured the SSLEngine exclusions from the configuration.
  The dump routines now use a fresh SSLEngine to detect the JVM
  level disabled features.

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2016-11-22 11:46:43 -07:00
Joakim Erdfelt
1672904d84 Issue #1108 - adding SslContextFactory.dump() selection details
+ Protocol selection details
+ Cipher Suites selection details

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2016-11-22 11:30:13 -07:00
Joakim Erdfelt
d361786e43 Issue #1118 - Eliminating .destroy() conflict
+ extending from AbstractLifeCycle instead of ContainerLifeCycle
2016-11-22 09:48:01 -07:00
Jan Bartel
12c0663e6c Issue #1092 2016-11-18 14:17:43 +11:00
Jan Bartel
2da10944f4 Issue #1092 2016-11-18 13:50:30 +11:00
Joakim Erdfelt
fd20d46659 Issue #1062 - adding https/ssl/tls test varient to ThreadStarvationTest 2016-11-17 16:42:37 -07:00
Joakim Erdfelt
9f317dee94 Issue #1051 - Using java.time.ZonedDateTime instead of java.util.Calendar for Java 1.8+ 2016-11-17 14:44:58 -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
0607c0e66e Updating gpg/pgp KEYS.txt
+ Adding email addresses to existing keys
+ Fixing missing last byte on some fingerprints
+ Adding joakim.erdfelt@gmail.com key, as this matches the git
  user.email configuration for commits as well
2016-11-16 07:58:39 -07:00
Greg Wilkins
de49dcb214 Pull request #1107
Use HttpSession
2016-11-16 14:48:18 +11:00