12738 Commits

Author SHA1 Message Date
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 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 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
Simone Bordet
b9f25d78ce Merged branch 'jetty-9.4.x' into 'master'. 2016-06-20 23:11:52 +02:00
Simone Bordet
b3fda0b733 Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2016-06-20 23:11:16 +02:00
Simone Bordet
d073780dde Refactored tests. 2016-06-20 23:10:44 +02:00
Simone Bordet
7ef22c8ebd Fixes #648 - Problem using InputStreamResponseListener to handle HTTP/2 responses.
The fix for https://bugs.eclipse.org/bugs/show_bug.cgi?id=484446
reimplemented InputStreamResponseListener using callbacks rather than
blocking waits.

However, HTTP/2 behaves a little differently than HTTP/1.
Where in HTTP/1 until the callback was completed no further calls to
onContent() were made, with HTTP/2 additional calls are made until
the flow control window is exhausted.

For this reason InputStreamResponseListener must queue content chunks
rather than dealing only with one chunk at a time.
2016-06-20 23:10:44 +02:00
Simone Bordet
442a7ce8cc Improved logging. 2016-06-20 23:10:44 +02:00
Joakim Erdfelt
4993c69489 Merge branch 'jetty-9.4.x' 2016-06-20 09:57:17 -07:00
Joakim Erdfelt
49c28e958e Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-06-20 09:56:39 -07:00
Joakim Erdfelt
62effb73d3 Removing duplicate entries in VERSION.txt 2016-06-20 09:56:21 -07:00
Joakim Erdfelt
abdbd177c1 Wrong version plugin (oops) 2016-06-20 09:12:05 -07:00
Joakim Erdfelt
7b1d807e49 Updating version plugin 2016-06-20 09:10:27 -07:00