1
0
mirror of https://github.com/jetty/jetty.project.git synced 2025-03-04 21:09:13 +00:00

13998 Commits

Author SHA1 Message Date
Simone Bordet
23753759bb Merged branch 'jetty-9.4.x' into 'master'. 2016-11-23 12:19:31 +01: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 - 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
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
d28802ad62 Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-11-23 14:56:55 +11:00
Jan Bartel
b839f40721 Add more session doc 2016-11-23 14:56:30 +11:00
Jan Bartel
3d94396d0d Merge pull request from WalkerWatch/updates/runner
Issue  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
d361786e43 Issue - Eliminating .destroy() conflict
+ extending from AbstractLifeCycle instead of ContainerLifeCycle
2016-11-22 09:48:01 -07:00
WalkerWatch
51ac6dd469 Issue Documentation updates.
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-11-18 14:14:54 -05:00
Jan Bartel
df1207bfaf Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-11-18 14:18:25 +11: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 2016-11-18 14:17:43 +11:00
Jan Bartel
bf6f82da60 Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-11-18 13:51:39 +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 2016-11-18 13:50:30 +11:00
Greg Wilkins
bf3ea9ae44 Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-11-18 11:19:40 +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 - 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 - 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 - 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
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 original URI trimmed 2016-11-16 23:31:03 +11:00
Greg Wilkins
e1916ab83d Pull request
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
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
Greg Wilkins
417fb1d7f8 Pull request
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
Greg Wilkins
9d178bae90 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-11-16 14:06:04 +11:00
Luis Daniel Alducin
2c88bf0f83 Added an example of embeded Jetty using hashed session and servlets. ()
Signed-off-by: Luis Daniel <lalducin@nearsoft.com>
2016-11-16 14:04:38 +11:00
Jan Bartel
7d327ffeb7 Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-11-16 10:57:25 +11:00
Jan Bartel
0ff1cf885e Merge pull request from WalkerWatch/upgrading/sessions
Updates for sessions upgrade, misc doc cleanup.
2016-11-16 10:56:41 +11:00
Jan Bartel
7ee15129ac Merge pull request from WalkerWatch/updates/gcloud
Updates for GCloud sessions.
2016-11-16 10:55:43 +11:00
Jan Bartel
b827de4576 Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-11-16 10:55:15 +11:00
Jan Bartel
fbcfbfce2f Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-11-16 10:54:56 +11:00
Jan Bartel
05f2e56aa1 Merge pull request from nevafuse/patch-3
Keep restored file if saving periodically
2016-11-16 10:53:59 +11:00
Jan Bartel
26d1bf633f Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-11-16 10:29:44 +11:00
Jan Bartel
1ca497012d Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-11-16 10:29:14 +11:00
Jan Bartel
20ea8f9f00 Merge pull request from nevafuse/patch-4
Only periodically save recently accessed sessions
2016-11-16 10:27:15 +11:00
Joakim Erdfelt
be3c821c9e Merge branch 'jetty-9.4.x' 2016-11-15 14:34:02 -07:00
Joakim Erdfelt
48f5c45c58 Merge branch 'master' of github.com:eclipse/jetty.project 2016-11-15 14:33:57 -07:00
Joakim Erdfelt
859b46f1e8 Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-11-15 14:33:32 -07:00
Joakim Erdfelt
2b47ee1453 Fixing duplicated entries in older versions 2016-11-15 14:32:23 -07:00