Commit Graph

12705 Commits

Author SHA1 Message Date
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 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
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
Greg Wilkins 417fb1d7f8 Pull request #1107
Slight improvements and simplification.
 - Use the SessionHandler created by the ServletContext
 - Use a single servlet to set and get the greeting
 - Added more information about the session
 - Added convenience links for the demo
2016-11-16 14:31:31 +11:00
Luis Daniel Alducin 2c88bf0f83 Added an example of embeded Jetty using hashed session and servlets. (#1107)
Signed-off-by: Luis Daniel <lalducin@nearsoft.com>
2016-11-16 14:04:38 +11:00
Jan Bartel 05f2e56aa1 Merge pull request #1093 from nevafuse/patch-3
Keep restored file if saving periodically
2016-11-16 10:53:59 +11:00
Jan Bartel 20ea8f9f00 Merge pull request #1094 from nevafuse/patch-4
Only periodically save recently accessed sessions
2016-11-16 10:27:15 +11:00
Joakim Erdfelt 2b47ee1453 Fixing duplicated entries in older versions 2016-11-15 14:32:23 -07:00
Joakim Erdfelt 866e6667f9 Merge branch 'jetty-9.3.x' of github.com:eclipse/jetty.project into jetty-9.3.x 2016-11-14 15:00:42 -07:00
Joakim Erdfelt 5833f7e135 Issue #1098 - Correcting Content-Type parsing mistake with multiple ';' characters 2016-11-14 14:59:59 -07:00
Simone Bordet 5e5d6913e6 Fixes #1099 - PushCacheFilter pushes POST requests. 2016-11-14 22:28:27 +01:00
Joakim Erdfelt 708104ccaf Issue #1098 adding unit tests for bug report. 2016-11-14 14:08:11 -07:00
nevafuse 236571eaee only periodically save recently accessed sessions
Signed-off-by: nevafuse <nevafuse@gmail.com>
2016-11-12 22:12:56 -05:00
nevafuse e05faf77c8 keep restored file if saving periodically
Signed-off-by: nevafuse <nevafuse@gmail.com>
2016-11-12 22:11:17 -05:00
Joakim Erdfelt 2295bd59e3 Issue #1090 - Use WebSocketUpgradeFilter from WEB-INF/web.xml if present 2016-11-10 14:26:04 -07:00
Greg Wilkins 3b36b13d31 Issue #1062 Ssl Nonblocking read callback 2016-11-10 09:57:15 +11:00
Jan Bartel c499ec68f7 Issue #1020
Add test for immortal session for mongo
2016-11-09 10:42:44 +11:00
Jan Bartel 74d1818cb3 Merge pull request #1080 from telomir/fix-for-mongodb-scavenging-immortal-sessions
Fix for MongoSessionIdManager's scavenging of immortal sessions
2016-11-09 10:29:56 +11:00
Simone Bordet f82aa03300 Fixes #1078 - DigestAuthentication should use realm from server, even if unknown in advance. 2016-11-07 19:25:06 +01:00
Simone Bordet 42e865227d Fixes #1081 - DigestAuthenticator does not check the realm sent by the client. 2016-11-07 19:25:06 +01:00
Simone Bordet 6ae72e6f7d Code cleanups. 2016-11-07 19:25:06 +01:00
Joakim Erdfelt 40cf6b0c80 Updating KEYS.txt with email address 2016-11-07 11:19:05 -07:00
Joakim Erdfelt de18e4540b Issue #1051 - RolloverFileOutputStream doesn't handle DST properly 2016-11-07 09:55:09 -07:00