Commit Graph

13628 Commits

Author SHA1 Message Date
Jesse McConnell 15866e6187 Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-09-22 11:36:31 -05:00
Jesse McConnell 2dc45f3780 Update what-version.adoc 2016-09-22 11:36:03 -05:00
Jesse McConnell 83d39e4141 Merge branch 'jetty-9.4.x' 2016-09-22 11:08:02 -05:00
Jesse McConnell 48a455c6aa Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-09-22 11:07:42 -05:00
Shauway 94324c82f0 Two way authentication configuration (#925)
Signed-off-by: Shauway <ha.shauway@gmail.com>
2016-09-22 11:05:02 -05:00
Jesse McConnell 9d23147d19 Merge pull request #916 from WalkerWatch/docupdates/Sessions
Further updates to Sessions documentation
2016-09-22 11:02:03 -05:00
WalkerWatch cdb86f810d Further updates to Sessions documentation
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-09-22 11:55:53 -04:00
Jan Bartel 91bb1a52d0 Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-09-22 18:19:45 +10:00
Jan Bartel 4c131561de Issue #944 2016-09-22 18:18:40 +10:00
Jan Bartel 638c9c1193 Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-09-22 18:06:37 +10:00
Jan Bartel 3359bc8548 Issue #945 2016-09-22 18:05:49 +10:00
Jan Bartel 49a4bdf242 Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-09-22 17:50:31 +10:00
Jan Bartel 969f1daeb5 Issue #946 2016-09-22 17:49:45 +10:00
Jan Bartel 076918ffab Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-09-22 17:17:52 +10:00
Jan Bartel 892da7b2da Issue #927
Remove debug println.
2016-09-22 17:16:40 +10:00
Jan Bartel e9c59a956a Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-09-22 17:10:48 +10:00
Jan Bartel bc4e65ebf2 Issue #941
Return scavenge to on-by-default; make value for scavenge property in session.mod same as default in id-manager.xml.
2016-09-22 17:10:30 +10:00
Jan Bartel 133d584b94 Issue #941
Make scavenger thread able to be disabled.
2016-09-22 17:10:30 +10:00
Greg Wilkins 1e6c5fac6b improved deprecated warning 2016-09-22 13:22:14 +10:00
Jan Bartel 0ab80e4d98 Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-09-21 15:25:47 +10:00
Jan Bartel a21434f289 Issue #914
Expose SessionHandler in SessionContext.
2016-09-21 15:25:01 +10:00
Greg Wilkins 94a9cfc09d Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-09-21 14:02:09 +10:00
Greg Wilkins b164298b99 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-09-21 14:01:27 +10:00
Greg Wilkins 4fca2bf8af Merge remote-tracking branch 'origin/jetty-9.2.x' into jetty-9.3.x 2016-09-21 14:00:49 +10:00
Jan Bartel b7b1b87cc3 Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-09-21 13:55:51 +10:00
Jan Bartel d8d9a5c5b7 Issue #941
Make fields protected not private.
2016-09-21 12:54:03 +10:00
Greg Wilkins 534fb8c427 Reset Response buffer size #940 2016-09-21 12:37:58 +10:00
Jan Bartel 60aeca1632 Issue #941 2016-09-21 12:32:20 +10:00
Joakim Erdfelt 43b134a6ec Merge pull request #939 from WalkerWatch/doc/versionfix
Removing documentation issues from Version.
2016-09-20 15:06:44 -07:00
Joakim Erdfelt 56634b26b1 Merge branch 'jetty-9.4.x' 2016-09-20 15:04:12 -07:00
Joakim Erdfelt caa06d54e8 Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-09-20 15:03:49 -07:00
WalkerWatch bf03f86e9e Removing documentation issues from Version.
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-09-20 17:50:34 -04:00
Joakim Erdfelt b0880f617a Merge branch 'release-9.3.12' into jetty-9.3.x 2016-09-20 14:39:08 -07:00
Joakim Erdfelt 8d75570b1a Merge branch 'release-9.4.0.RC0' into jetty-9.4.x 2016-09-20 14:38:34 -07:00
Joakim Erdfelt 15cb25bb7d Merge branch 'jetty-9.4.x' 2016-09-20 13:01:50 -07:00
Joakim Erdfelt 8432e4e2c7 Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-09-20 13:01:32 -07:00
Joakim Erdfelt 5f41e972aa Merge branch 'jetty-9.2.x' into jetty-9.3.x 2016-09-20 13:01:14 -07:00
Joakim Erdfelt e0c433c831 Adding timeout for compile and javadoc 2016-09-20 13:00:57 -07:00
Simone Bordet a13a35cf25 Merged branch 'jetty-9.4.x' into 'master'. 2016-09-16 11:35:51 +02:00
Simone Bordet ef9b887ab5 Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2016-09-16 11:35:33 +02:00
Simone Bordet 9848b33ec9 Fixes #915 - The jetty-maven-plugin:stop goal doesn't stop everything completely.
Closing the serverSocket when exiting ShutdownMonitorRunnable.
2016-09-16 11:33:21 +02:00
Simone Bordet 4f533f39be Merged branch 'jetty-9.4.x' into 'master'. 2016-09-16 10:38:25 +02:00
Simone Bordet 82aec3986e Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2016-09-16 10:37:45 +02:00
Olivier Lamy 1bf87b317b Add support of a query param to reset stats of StatisticsHandler tru StatisticsServlet (#919)
StatisticsServlet: support a new parameter to be able to reset stats

Signed-off-by: olivier lamy <olamy@webtide.com>
2016-09-16 10:36:33 +02:00
Simone Bordet f7816a6ea4 Improved logging. 2016-09-16 10:31:01 +02:00
Greg Wilkins f2737b1737 Issue #788 unit test 2016-09-16 17:18:32 +10:00
Greg Wilkins 98da23c374 Merge branch 'jetty-9.4.x' of github.com:eclipse/jetty.project into jetty-9.4.x 2016-09-16 17:17:02 +10:00
Greg Wilkins 70705a5ac1 Issue #788 Already enabled info 2016-09-16 12:25:24 +10:00
Jan Bartel b44b9d2540 Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-09-16 11:38:01 +10:00
Jan Bartel 126f767981 Merge branch 'jetty-9.4.x' of github.com:eclipse/jetty.project into jetty-9.4.x 2016-09-16 11:37:11 +10:00