3e937c4891
Merge remote-tracking branch 'origin/jetty-9.4.x'
2016-06-24 19:11:21 +10:00
00f9b99d02
Issue #663
...
Fix accidental removal of arg to InfinispanTestServer.
2016-06-24 19:10:57 +10:00
81f78bf16f
Merge remote-tracking branch 'origin/jetty-9.4.x'
2016-06-24 18:40:32 +10:00
d0d11244b3
Issue #644 Modules for logging
...
Added module for logback-access
2016-06-24 18:40:00 +10:00
ef65639674
Merge remote-tracking branch 'origin/jetty-9.4.x'
2016-06-24 16:22:23 +10:00
0889a66f9c
Issue #663
2016-06-24 16:21:25 +10:00
b1c62f81d9
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2016-06-24 16:11:01 +10:00
26276575e7
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2016-06-24 15:40:21 +10:00
225c6a8086
Issue #663
...
Also fix javadoc; fix memcached module
2016-06-24 15:38:25 +10:00
7df3b83a8e
Issue #644 Modules for logging
...
Added logback classic modules
2016-06-24 14:42:34 +10:00
cfe5abf8e6
Issue #660 NPE in Request
...
Made request more robust for calls after reset.
2016-06-24 14:33:18 +10:00
0e0fc77771
skip symlink test on windows
2016-06-24 14:33:18 +10:00
237502932a
Merged branch 'jetty-9.4.x' into 'master'.
2016-06-23 13:04:06 +02:00
ab45979a13
Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'.
2016-06-23 13:02:53 +02:00
9d9df416af
Fixes #643 - NPE in passing websocket client test.
2016-06-23 13:00:04 +02:00
0239d6390f
Issue #644 Modules for logging
...
module for direct slf4j to log4j2 bridge
2016-06-23 15:32:18 +10:00
501b8e9dca
Issue #644 Modules for logging
...
Added log4j2.xml configuration
Added jetty-log4j2 mapping module
2016-06-23 15:21:34 +10:00
9d71faad07
Merge remote-tracking branch 'origin/jetty-9.4.x'
2016-06-23 14:50:32 +10:00
4e364a5642
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2016-06-23 14:50:07 +10:00
0879b44d37
Issue #658
...
Add backoff retries for gcloud session save.
2016-06-23 14:48:47 +10:00
34aa4d078c
Merge remote-tracking branch 'origin/jetty-9.4.x'
2016-06-23 14:19:24 +10:00
3f10652361
Allow a list of memcached servers to be configured for session caching.
2016-06-23 14:18:48 +10:00
84b3e2e616
Merge remote-tracking branch 'origin/jetty-9.4.x'
2016-06-23 14:11:53 +10:00
e3936d2046
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2016-06-23 14:11:29 +10:00
c3173932f0
Revert "Issue #660 - simplifying parameter extraction to prevent NPE"
...
This reverts commit ecea486d07
2016-06-23 12:43:29 +10:00
2793812fcb
Merge remote-tracking branch 'origin/jetty-9.4.x'
2016-06-23 12:26:16 +10:00
a0e7b21180
Make SessionDataMap a LifeCycle
2016-06-23 12:25:33 +10:00
f1d9cf89a4
Merge remote-tracking branch 'origin/jetty-9.4.x'
2016-06-23 12:04:59 +10:00
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
26310f1167
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2016-06-23 12:03:08 +10:00
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
67f8a96eee
Issue #658
...
Add unit tests for memcached with gcloud.
2016-06-23 11:23:44 +10:00
e4eafd0fee
Issue #644 Modules for logging
...
parameterized logging versions
2016-06-23 09:54:28 +10:00
80903c5ab1
Issue #644 Modules for logging
...
Added a jetty-log4j module that depends internally on slf4j
2016-06-23 08:38:29 +10:00
0ca191edff
Issue #658
2016-06-23 07:49:11 +10:00
2dd4843e44
merge from 9.4.x
2016-06-22 15:28:17 -05:00
399c5beb04
merge from 9.3.x
2016-06-22 15:23:51 -05:00
0c66b9d25b
Merge branch 'release-9.3.10' into jetty-9.3.x
2016-06-22 15:04:12 -05:00
ae931538ab
[maven-release-plugin] prepare for next development iteration
2016-06-22 13:59:10 -05:00
df1ed4fb03
[maven-release-plugin] prepare release jetty-9.3.11.M0
2016-06-22 13:59:06 -05:00
94fdff47a0
set for release
2016-06-22 13:27:41 -05:00
2b947e8f72
Merge branch 'jetty-9.3.x' into release-9.3.10
2016-06-22 13:22:27 -05:00
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
b3635df543
Merge branch 'jetty-9.2.x' into jetty-9.3.x
2016-06-22 10:43:27 -07:00
b2d6d06b48
Fixes #661 -JsrExtension is missing hashCode() and equals()
2016-06-22 10:42:31 -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
cb03ffd9a2
Merge branch 'jetty-9.2.x' into jetty-9.3.x
2016-06-22 08:51:24 -07:00
2731ac1752
Issue #654 : Confirming ServletContext.getResourceAsStream() behavior in Jetty 9.2.x
2016-06-22 08:50:25 -07:00
Jan Bartel
Greg Wilkins
Simone Bordet
Jesse McConnell
Joakim Erdfelt