0a196e2123
Merge branch 'jetty-9.4.x'
2016-06-22 10:43:58 -07:00
8157a4533c
Merge branch 'jetty-9.3.x' into jetty-9.4.x
2016-06-22 10:43:43 -07:00
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
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
b9b3300e1d
Merged branch 'jetty-9.4.x' into 'master'.
2016-06-22 11:28:50 +02:00
0d5fb1812e
Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'.
2016-06-22 11:27:56 +02:00
d4c1bec340
Fixes #624 cleanup
2016-06-22 18:58:31 +10:00
78f66fdcf8
Merge remote-tracking branch 'origin/jetty-9.4.x'
2016-06-22 17:37:46 +10:00
7bc427ce79
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2016-06-22 17:37:16 +10:00
126e58c7cc
Fixes #624 cleanup
2016-06-22 16:47:00 +10:00
59540f552c
Fixes #624
2016-06-22 16:31:25 +10:00
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
003e9cd302
Merge remote-tracking branch 'origin/jetty-9.4.x'
2016-06-17 15:54:02 +10:00
d79b0a7acd
Issue #644 Modules for enabling logging
...
Separated modules for jetty logging
Added JCL
2016-06-17 14:57:25 +10:00
1e7b866d6f
Merge remote-tracking branch 'origin/jetty-9.4.x'
2016-06-17 13:36:56 +10:00
1b508e3714
Add test for memcached session data.
2016-06-17 13:18:52 +10:00
2fbf466393
Issue #644 Modules for enabling logging
2016-06-17 07:39:11 +10:00
552fea5f99
Merge remote-tracking branch 'origin/jetty-9.4.x'
2016-06-16 15:28:57 +10:00
bb73aea67b
Fix memcache session data cache module
2016-06-16 15:27:23 +10:00
80cae83bde
Merge remote-tracking branch 'origin/jetty-9.4.x'
2016-06-16 12:17:18 +10:00
fd0c2c968c
Reinstate xmemcached module
2016-06-16 10:31:36 +10:00
8dd61c6d1c
Merge remote-tracking branch 'origin/jetty-9.4.x'
2016-06-15 18:07:01 +10:00
e607acfa4e
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2016-06-15 18:06:32 +10:00
a8e315a3f5
Fix #663 NPE during context stop
...
Avoid adding null beans
protect against null beans.
2016-06-15 18:04:33 +10:00
51e8ba387d
Merge remote-tracking branch 'origin/jetty-9.4.x'
2016-06-15 10:41:40 +10:00
4ba0fa9544
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2016-06-15 10:41:10 +10:00
f724d36646
Cleanup #624
...
removed excess test code
2016-06-15 10:38:40 +10:00
bc87cf0ab4
Revert "Debug #624"
...
This reverts commit b40c2ae66f
2016-06-15 10:32:10 +10:00
7008a96225
Merged branch 'jetty-9.4.x' into 'master'.
2016-06-13 12:17:31 +02:00
3d8242ef82
Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'.
2016-06-13 12:16:33 +02:00
e803bf6c81
Test code cleanup.
...
Converted static fields to non-static, and removed unused code.
2016-06-13 12:15:45 +02:00
b40c2ae66f
Debug #624
...
This commit is instrumentation to be executed in the CI system to debug #624
This commit should be reverted once the test has failed again!
2016-06-11 10:33:48 +10:00
5a91c4574a
Merge remote-tracking branch 'origin/jetty-9.4.x'
2016-06-08 16:49:21 +10:00
3fafd6ee8f
Merge remote-tracking branch 'origin/jetty-9.4.x'
2016-06-08 16:25:29 +10:00
7314a9b86a
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2016-06-08 16:25:23 +10:00
f59e680a94
Merge branch 'jetty-9.4.x' of github.com:eclipse/jetty.project into jetty-9.4.x
2016-06-08 16:24:32 +10:00
3a9dfd913a
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2016-06-08 16:24:09 +10:00
2609c89d22
Issue #624 Fix onCompleted race
2016-06-08 16:22:53 +10:00
0c1c188cb7
Merge remote-tracking branch 'origin/jetty-9.4.x'
2016-06-08 15:01:38 +10:00
d52a1701ad
Add module for session data cache
2016-06-08 15:00:32 +10:00
f4c13e5f54
Issue #623 Add gzip suffix to etags in 304 response
2016-06-08 14:33:49 +10:00
fb35230d77
Merge remote-tracking branch 'origin/jetty-9.4.x'
2016-06-08 10:28:22 +10:00
beb9c90892
Merge branch 'jetty-9.4.x' of github.com:eclipse/jetty.project into jetty-9.4.x
2016-06-08 09:36:11 +10:00
191bb2d307
Renaming CachingSessionDataStoreFactory
2016-06-08 09:35:48 +10:00
e79c4d582b
Merge branch 'jetty-9.4.x'
2016-06-07 11:57:39 -05:00
20c1301203
Merge branch 'jetty-9.3.x' into jetty-9.4.x
2016-06-07 11:56:27 -05:00
40af755251
restructure failing test to better analyse failure
2016-06-07 10:44:33 +10:00
502f27f43e
Merge remote-tracking branch 'origin/jetty-9.4.x'
2016-06-03 16:22:17 +10:00
723563aa84
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2016-06-03 16:21:48 +10:00
a2309057dc
Test Harness for #596
...
Test harness to try to repeat problem with #596 of content-length added to a HEAD response.
In the process added a much better getResponse mechanism to the local connector that avoids
using the idle time.
2016-06-03 14:15:25 +10:00
Joakim Erdfelt
Simone Bordet
Greg Wilkins
WalkerWatch
Jan Bartel
Jesse McConnell