Joakim Erdfelt
7ec1f26d1a
Merge branch 'jetty-9.4.x'
2016-07-11 10:32:44 -07:00
Joakim Erdfelt
bc9007a9ed
Merge branch 'jetty-9.3.x' into jetty-9.4.x
2016-07-11 10:32:33 -07:00
Joakim Erdfelt
596e372c7a
Fixes #687 - Normalizing resolved symlinks
2016-07-11 10:31:07 -07:00
Joakim Erdfelt
2cfc5b1665
Merge branch 'jetty-9.4.x'
2016-07-08 08:40:28 -07:00
Joakim Erdfelt
369a105524
Issue #695 - Flagging with method level @Deprecated for improved IDE experience
2016-07-08 08:38:43 -07:00
Greg Wilkins
16c43727bf
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2016-07-08 21:19:53 +10:00
Greg Wilkins
adf3281ba8
Issue #696 Improve testing of LocalConnector
...
Fixed some races in the implementation
2016-07-08 21:15:36 +10:00
Greg Wilkins
0d74658ab6
fixed bad tests
2016-07-08 13:37:41 +10:00
Joakim Erdfelt
294362954d
Merge branch 'jetty-9.4.x'
2016-07-07 13:43:16 -07:00
Joakim Erdfelt
5c6e271b2c
Merge branch 'jetty-9.3.x' into jetty-9.4.x
2016-07-07 13:43:01 -07:00
Joakim Erdfelt
602222182c
Merge branch 'jetty-9.3.x' of github.com:eclipse/jetty.project into jetty-9.3.x
2016-07-07 09:12:09 -07:00
Joakim Erdfelt
a6276c3017
Issue #687 - Adding AllowSymLinkAliasCheckerTest
...
+ Replicated, in test case form, the example present in the
filed issue. All tests pass.
2016-07-07 09:11:19 -07:00
Greg Wilkins
5d77bb4d8f
fixed bad unit test
2016-07-08 00:30:53 +10:00
Greg Wilkins
e38ec83de9
Issue #695 use the getResponse methods
2016-07-07 18:13:44 +10:00
Greg Wilkins
a40002bd74
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2016-07-07 16:37:45 +10:00
Greg Wilkins
183e3acabb
Issue #695 improve getResponse methods
2016-07-07 16:36:46 +10:00
Jan Bartel
c3da8b27eb
Merge remote-tracking branch 'origin/jetty-9.4.x'
2016-07-06 13:43:52 +10:00
Greg Wilkins
0c0ed00747
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2016-07-06 12:16:01 +10:00
Greg Wilkins
5af61cfc38
fix #685 SecureRequestCustomizer SslSession attribute
2016-07-06 11:55:41 +10:00
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
Greg Wilkins
5a91c4574a
Merge remote-tracking branch 'origin/jetty-9.4.x'
2016-06-08 16:49:21 +10:00
Greg Wilkins
3fafd6ee8f
Merge remote-tracking branch 'origin/jetty-9.4.x'
2016-06-08 16:25:29 +10:00
Jan Bartel
7314a9b86a
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2016-06-08 16:25:23 +10:00
Greg Wilkins
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
Greg Wilkins
3a9dfd913a
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2016-06-08 16:24:09 +10:00
Greg Wilkins
2609c89d22
Issue #624 Fix onCompleted race
2016-06-08 16:22:53 +10:00
Jan Bartel
0c1c188cb7
Merge remote-tracking branch 'origin/jetty-9.4.x'
2016-06-08 15:01:38 +10:00
Jan Bartel
d52a1701ad
Add module for session data cache
2016-06-08 15:00:32 +10:00
Greg Wilkins
f4c13e5f54
Issue #623 Add gzip suffix to etags in 304 response
2016-06-08 14:33:49 +10:00
Jan Bartel
fb35230d77
Merge remote-tracking branch 'origin/jetty-9.4.x'
2016-06-08 10:28:22 +10:00
Jan Bartel
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
Jan Bartel
191bb2d307
Renaming CachingSessionDataStoreFactory
2016-06-08 09:35:48 +10:00
Jesse McConnell
e79c4d582b
Merge branch 'jetty-9.4.x'
2016-06-07 11:57:39 -05:00
Jesse McConnell
20c1301203
Merge branch 'jetty-9.3.x' into jetty-9.4.x
2016-06-07 11:56:27 -05:00
Greg Wilkins
40af755251
restructure failing test to better analyse failure
2016-06-07 10:44:33 +10:00
Greg Wilkins
502f27f43e
Merge remote-tracking branch 'origin/jetty-9.4.x'
2016-06-03 16:22:17 +10:00
Greg Wilkins
723563aa84
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2016-06-03 16:21:48 +10:00
Greg Wilkins
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
Greg Wilkins
98c328fb23
Jetty 9.4.x 572 ( #614 )
...
* Issue #572 Scheduling Strategy Deadlocks
Implemented dual strategy idea from #572 discussion
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* fixed http2 strategy choice
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* code cleanups
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* clean up seelctor actions/products
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* cleanups
2016-06-03 09:07:00 +10:00
Jan Bartel
3ae4ffc90d
Merge remote-tracking branch 'origin/jetty-9.4.x'
2016-06-02 16:44:08 +10:00
Jan Bartel
0578d15813
Fix indexes for gcloudatastore; make initial retry backoff 1s as per SLA
2016-06-02 16:42:02 +10:00
Greg Wilkins
89032b7eac
improved test isolation
2016-06-02 14:24:18 +10:00
Joakim Erdfelt
bac64066e4
Merge branch 'jetty-9.4.x'
2016-06-01 12:01:35 -07:00
Joakim Erdfelt
3b1f8df49e
Removing bad org.omg.CORBA.Environment import
2016-06-01 11:58:50 -07:00
Jan Bartel
6f25ce42b2
Merge remote-tracking branch 'origin/jetty-9.4.x'
2016-06-01 20:14:08 +10:00
Jan Bartel
3c3ea0c6f2
Add option to SessionCache to delete unreadable sessions from SessionDataStore; fix jdbc module xml file.
2016-06-01 20:13:32 +10:00
Greg Wilkins
8138c861c7
Merge remote-tracking branch 'origin/jetty-9.4.x'
2016-06-01 15:31:24 +10:00
Greg Wilkins
5c33a119da
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2016-06-01 15:30:13 +10:00
Greg Wilkins
c2831bf09c
Issue #608 reset encoding set from content type
...
Use an enum to track where a content encoding came from and selectively clear/reset
2016-06-01 15:29:05 +10:00
Jan Bartel
833f291975
Ensure sessions that fail to save on evict are not evicted.
2016-06-01 12:41:39 +10:00
Jesse McConnell
808d0ae3de
Merge branch 'jetty-9.4.x'
2016-05-27 16:26:36 -05:00