Commit Graph

12748 Commits

Author SHA1 Message Date
Jan Bartel 2793812fcb Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-06-23 12:26:16 +10:00
Jan Bartel a0e7b21180 Make SessionDataMap a LifeCycle 2016-06-23 12:25:33 +10:00
Jan Bartel f1d9cf89a4 Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-06-23 12:04:59 +10:00
Jan Bartel 3c6dab9790 Merge branch 'jetty-9.4.x' of github.com:eclipse/jetty.project into jetty-9.4.x 2016-06-23 12:04:15 +10:00
Jan Bartel 26310f1167 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-06-23 12:03:08 +10:00
Greg Wilkins 5c7b0247e7 Issue #627 Use start.d or start.ini not both
Added --create-startd option
Improved tests
2016-06-23 12:01:07 +10:00
Jan Bartel 67f8a96eee Issue #658
Add unit tests for memcached with gcloud.
2016-06-23 11:23:44 +10:00
Greg Wilkins e4eafd0fee Issue #644 Modules for logging
parameterized logging versions
2016-06-23 09:54:28 +10:00
Greg Wilkins 80903c5ab1 Issue #644 Modules for logging
Added a jetty-log4j module that depends internally on slf4j
2016-06-23 08:38:29 +10:00
Jan Bartel 0ca191edff Issue #658 2016-06-23 07:49:11 +10:00
Jesse McConnell 2dd4843e44 merge from 9.4.x 2016-06-22 15:28:17 -05:00
Jesse McConnell 399c5beb04 merge from 9.3.x 2016-06-22 15:23:51 -05:00
Jesse McConnell 0c66b9d25b Merge branch 'release-9.3.10' into jetty-9.3.x 2016-06-22 15:04:12 -05:00
Jesse McConnell ae931538ab [maven-release-plugin] prepare for next development iteration 2016-06-22 13:59:10 -05:00
Jesse McConnell df1ed4fb03 [maven-release-plugin] prepare release jetty-9.3.11.M0 2016-06-22 13:59:06 -05:00
Jesse McConnell 94fdff47a0 set for release 2016-06-22 13:27:41 -05:00
Jesse McConnell 2b947e8f72 Merge branch 'jetty-9.3.x' into release-9.3.10 2016-06-22 13:22:27 -05:00
Joakim Erdfelt 0a196e2123 Merge branch 'jetty-9.4.x' 2016-06-22 10:43:58 -07:00
Joakim Erdfelt 8157a4533c Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-06-22 10:43:43 -07:00
Joakim Erdfelt b3635df543 Merge branch 'jetty-9.2.x' into jetty-9.3.x 2016-06-22 10:43:27 -07:00
Joakim Erdfelt b2d6d06b48 Fixes #661 -JsrExtension is missing hashCode() and equals() 2016-06-22 10:42:31 -07:00
Joakim Erdfelt ecea486d07 Issue #660 - simplifying parameter extraction to prevent NPE
+ The checks in Request.restoreParameters() seem superfluous
  as MultiMap.addAllValues() is null and empty set safe
2016-06-22 09:53:24 -07:00
Joakim Erdfelt cce7837e64 Fixes #654 - ServletContext.getResourceAsStream("/") should return null
+ Jetty 9.2 (and earlier) used a Resource.getInputStream() implementation
   that would trigger an IOException on-construction (vs on-first-access)
   due its use of java.io.FileInputStream(File) which had a isDirectory
   check in its constructor.
 + Jetty 9.3 and onward uses java.nio.file.Files.newInputStream() which
   has the bad on-first-access behavior.
 + Changing the behavior of PathResource.getInputStream() to behave the
   same way as the prior FileResource.getInputStream(), as well as adding
   the Resource.isDirectory() check back into ContextHandler.getResourceAsStream(String)
   to prevent creation of the InputStream in the first place.
2016-06-22 09:09:05 -07:00
Joakim Erdfelt cb03ffd9a2 Merge branch 'jetty-9.2.x' into jetty-9.3.x 2016-06-22 08:51:24 -07:00
Joakim Erdfelt 2731ac1752 Issue #654: Confirming ServletContext.getResourceAsStream() behavior in Jetty 9.2.x 2016-06-22 08:50:25 -07:00
Jesse McConnell c82b0b4c1a set for release 2016-06-22 09:30:58 -05:00
Jesse McConnell 030ec61837 [maven-release-plugin] prepare for next development iteration 2016-06-22 09:14:25 -05:00
Jesse McConnell 9a4cb41122 [maven-release-plugin] prepare release jetty-9.3.11.M0 2016-06-22 09:14:21 -05:00
Jesse McConnell f2264c96a6 Merge branch 'jetty-9.3.x' into release-9.3.10 2016-06-22 08:40:46 -05:00
Simone Bordet b9b3300e1d Merged branch 'jetty-9.4.x' into 'master'. 2016-06-22 11:28:50 +02:00
Simone Bordet 0d5fb1812e Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2016-06-22 11:27:56 +02:00
Simone Bordet 72393bc666 Fixes #659 - CONNECT request fails spuriously.
Fixed by properly returning true from messageComplete() in case of
a 101 response or a 200 CONNECT response.
2016-06-22 11:27:28 +02:00
Simone Bordet a07461f4bd Code cleanups. 2016-06-22 11:27:28 +02:00
Greg Wilkins d4c1bec340 Fixes #624 cleanup 2016-06-22 18:58:31 +10:00
Greg Wilkins 78f66fdcf8 Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-06-22 17:37:46 +10:00
Greg Wilkins 7bc427ce79 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-06-22 17:37:16 +10:00
Greg Wilkins 126e58c7cc Fixes #624 cleanup 2016-06-22 16:47:00 +10:00
Greg Wilkins 59540f552c Fixes #624 2016-06-22 16:31:25 +10:00
WalkerWatch baae86fcef Correcting path for #645 (#646)
* Correcting path for #645

Signed-off-by: WalkerWatch <ctwalker@gmail.com>

* Fixing path variables.

Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-06-22 09:44:59 +10:00
Jesse McConnell e7034117ea [maven-release-plugin] prepare for next development iteration 2016-06-21 08:50:13 -05:00
Jesse McConnell 16c435c69d [maven-release-plugin] prepare release jetty-9.3.10.v20160621 2016-06-21 08:50:09 -05:00
Jesse McConnell 5e64528403 set for release 2016-06-21 08:18:30 -05:00
Jesse McConnell 34e92ec59e update jetty version plugin 2016-06-21 08:18:05 -05:00
Jesse McConnell ac815876db set for release 2016-06-21 08:17:51 -05:00
Joakim Erdfelt 45a0c0f38d Merge branch 'jetty-9.4.x' 2016-06-20 17:56:30 -07:00
Joakim Erdfelt 1418892d4f Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-06-20 17:56:17 -07:00
Joakim Erdfelt 78c9010400 Merge branch 'jetty-9.2.x' into jetty-9.3.x 2016-06-20 17:55:49 -07:00
Joakim Erdfelt bcc57d161a Fixes #425 - Removing duplicate Decoder affecting lifecycle
+ Duplicate Decoder was created and used in OnMessageCallable.
  Now using DecoderFactory to obtain already instantiated
  Decoder instead.
2016-06-20 17:47:29 -07:00
Joakim Erdfelt 02144e0a97 Making test keystores compatible with Java 8 restrictions 2016-06-20 17:46:21 -07:00
Jesse McConnell d9ceeb4ecd updating for version 2016-06-20 16:47:46 -05:00