Greg Wilkins
81f78bf16f
Merge remote-tracking branch 'origin/jetty-9.4.x'
2016-06-24 18:40:32 +10:00
Greg Wilkins
d0d11244b3
Issue #644 Modules for logging
...
Added module for logback-access
2016-06-24 18:40:00 +10:00
Jan Bartel
ef65639674
Merge remote-tracking branch 'origin/jetty-9.4.x'
2016-06-24 16:22:23 +10:00
Greg Wilkins
26276575e7
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2016-06-24 15:40:21 +10:00
Greg Wilkins
cfe5abf8e6
Issue #660 NPE in Request
...
Made request more robust for calls after reset.
2016-06-24 14:33:18 +10:00
Greg Wilkins
84b3e2e616
Merge remote-tracking branch 'origin/jetty-9.4.x'
2016-06-23 14:11:53 +10:00
Greg Wilkins
e3936d2046
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2016-06-23 14:11:29 +10:00
Greg Wilkins
c3173932f0
Revert "Issue #660 - simplifying parameter extraction to prevent NPE"
...
This reverts commit ecea486d07
.
2016-06-23 12:43:29 +10:00
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
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
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
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
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
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
Jan Bartel
003e9cd302
Merge remote-tracking branch 'origin/jetty-9.4.x'
2016-06-17 15:54:02 +10:00
Greg Wilkins
d79b0a7acd
Issue #644 Modules for enabling logging
...
Separated modules for jetty logging
Added JCL
2016-06-17 14:57:25 +10:00
Jan Bartel
1e7b866d6f
Merge remote-tracking branch 'origin/jetty-9.4.x'
2016-06-17 13:36:56 +10:00
Jan Bartel
1b508e3714
Add test for memcached session data.
2016-06-17 13:18:52 +10:00
Greg Wilkins
2fbf466393
Issue #644 Modules for enabling logging
2016-06-17 07:39:11 +10:00
Jan Bartel
552fea5f99
Merge remote-tracking branch 'origin/jetty-9.4.x'
2016-06-16 15:28:57 +10:00
Jan Bartel
bb73aea67b
Fix memcache session data cache module
2016-06-16 15:27:23 +10:00
Jan Bartel
80cae83bde
Merge remote-tracking branch 'origin/jetty-9.4.x'
2016-06-16 12:17:18 +10:00
Jan Bartel
fd0c2c968c
Reinstate xmemcached module
2016-06-16 10:31:36 +10:00
Greg Wilkins
8dd61c6d1c
Merge remote-tracking branch 'origin/jetty-9.4.x'
2016-06-15 18:07:01 +10:00
Greg Wilkins
e607acfa4e
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2016-06-15 18:06:32 +10:00
Greg Wilkins
a8e315a3f5
Fix #663 NPE during context stop
...
Avoid adding null beans
protect against null beans.
2016-06-15 18:04:33 +10:00
Greg Wilkins
51e8ba387d
Merge remote-tracking branch 'origin/jetty-9.4.x'
2016-06-15 10:41:40 +10:00
Greg Wilkins
4ba0fa9544
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2016-06-15 10:41:10 +10:00
Greg Wilkins
f724d36646
Cleanup #624
...
removed excess test code
2016-06-15 10:38:40 +10:00
Greg Wilkins
bc87cf0ab4
Revert "Debug #624"
...
This reverts commit b40c2ae66f
.
2016-06-15 10:32:10 +10:00
Simone Bordet
7008a96225
Merged branch 'jetty-9.4.x' into 'master'.
2016-06-13 12:17:31 +02:00
Simone Bordet
3d8242ef82
Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'.
2016-06-13 12:16:33 +02:00
Simone Bordet
e803bf6c81
Test code cleanup.
...
Converted static fields to non-static, and removed unused code.
2016-06-13 12:15:45 +02:00
Greg Wilkins
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