Commit Graph

13898 Commits

Author SHA1 Message Date
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 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 0b54fa0bc7 Issue #1128 2016-11-24 15:47:11 +11:00
Jan Bartel 40d9e56d92 Issue #1117 2016-11-24 14:04:37 +11: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
Greg Wilkins deac849325 Fixes #1127
Fixes #1127 by updating #1074 solution.  Spurious calls to HttpInput.run can be ignored.
Hide some more test stacks
2016-11-24 10:18:06 +11:00
WalkerWatch 3fe173232f Misc doc updates/fixes.
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-11-23 15:43:11 -05: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
Joakim Erdfelt 5b5a2e845b Removing commented out debug code 2016-11-23 06:05:35 -07:00
Simone Bordet c5c0cc71d0 Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2016-11-23 12:18:29 +01: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
Greg Wilkins 2ef23a6725 Issue #572
Improved to the toString and dump output of connections, endpoints and channel to assist with debugging
made the SSL callbacks and runnables Invocable to avoid thread starvation.
2016-11-23 16:58:35 +11:00
Jan Bartel b839f40721 Add more session doc 2016-11-23 14:56:30 +11:00
Jan Bartel 3d94396d0d Merge pull request #1115 from WalkerWatch/updates/runner
Issue #1092 Documentation updates.
2016-11-23 14:53:11 +11:00
Joakim Erdfelt efc227e0e4 Updates for better ThreadStarvationTests 2016-11-22 17:37:40 -07:00
Joakim Erdfelt bb428fb402 Using non-deprecated SocketChannelEndpoint 2016-11-22 16:35:56 -07:00
Joakim Erdfelt 7c90d19983 Minor updates to ThreadStarvationTest to diagnose read starvation under SSL issue 2016-11-22 15:00:13 -07: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
WalkerWatch 51ac6dd469 Issue #1092 Documentation updates.
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-11-18 14:14:54 -05:00
Jan Bartel d57c281d14 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-11-18 14:18:02 +11:00
Jan Bartel 12c0663e6c Issue #1092 2016-11-18 14:17:43 +11:00
Jan Bartel 98ad4e1610 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-11-18 13:51:16 +11:00
Jan Bartel 2da10944f4 Issue #1092 2016-11-18 13:50:30 +11:00
Joakim Erdfelt b5cd3cfca1 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-11-17 17:00:58 -07:00
Joakim Erdfelt fd20d46659 Issue #1062 - adding https/ssl/tls test varient to ThreadStarvationTest 2016-11-17 16:42:37 -07:00
Joakim Erdfelt 08012355de Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-11-17 14:45:55 -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 1003969468 Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-11-17 11:04:40 -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 37b1f17b26 Updating to version 9.4.0-SNAPSHOT 2016-11-16 10:27:36 -07:00
Joakim Erdfelt 4aaa576b2f Updating to version 9.4.0.RC2 2016-11-16 08:55:51 -07:00
Joakim Erdfelt 7c5901464f Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-11-16 08:00:38 -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 ed14d739f3 Issue #1103 original URI trimmed 2016-11-16 23:31:03 +11:00
Greg Wilkins e1916ab83d Pull request #1107
Updated to 9.4 session API
2016-11-16 14:50:37 +11:00
Greg Wilkins 2201f172f3 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-11-16 14:49:03 +11:00
Greg Wilkins de49dcb214 Pull request #1107
Use HttpSession
2016-11-16 14:48:18 +11:00
Greg Wilkins 65b26336bd Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-11-16 14:34:56 +11:00