Commit Graph

3270 Commits

Author SHA1 Message Date
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
Jesse McConnell d5fca6ee22 resolve broken javadoc 2016-05-27 16:25:50 -05:00
Jan Bartel 7dc283cc0c Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-05-27 16:45:04 +10:00
Jan Bartel d6689ce803 Add memcached option for session data caching 2016-05-27 16:43:46 +10:00
Simone Bordet 0272001f7a Merged branch 'jetty-9.4.x' into 'master'. 2016-05-25 00:57:56 +02:00
Simone Bordet ba48aa27b0 Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2016-05-25 00:57:43 +02:00
Simone Bordet 031bc0fed9 Issue #85 - Expose TLS protocol used for connection in SecureRequestCustomizer.
Exposed the SSLSession as attribute only if the attribute key is valid.
2016-05-25 00:50:01 +02:00
Simone Bordet c6aafecceb Code cleanups. 2016-05-25 00:47:58 +02:00
Simone Bordet 2b276e0162 Merged branch 'jetty-9.4.x' into 'master'. 2016-05-24 16:10:31 +02:00
Simone Bordet 016a7b72a1 Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2016-05-24 16:10:00 +02:00
Simone Bordet ddddc3a675 Fixes #574 - Introduce a TLS handshake completed listener.
Introduced class SslHandshakeListener that can be registered as a
bean in both the ServerConnector and in clients such as HttpClient
and HTTP2Client.

When creating SslConnection instances, the factory will query the
connector (client or server) for SslHandshakeListener beans and, if
present, will be added to the SslConnection.
2016-05-24 16:09:19 +02:00
Simone Bordet ba8e0bb828 Merged branch 'jetty-9.4.x' into 'master'. 2016-05-24 12:42:41 +02:00
Simone Bordet 5fe1ff697e Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2016-05-24 12:42:12 +02:00
Simone Bordet d73c60db14 Issue #464 - Improve reporting of SSLHandshakeException. 2016-05-24 11:15:18 +02:00
Simone Bordet f95daca8b4 Code cleanups. 2016-05-24 11:15:18 +02:00
Greg Wilkins 314065ccfe Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-05-20 15:54:58 +10:00
Greg Wilkins 8684524dc8 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-05-20 15:54:06 +10:00
Greg Wilkins d73bf08515 cleaned up constructors 2016-05-20 15:53:46 +10:00
Jan Bartel 8dfcfd021c Refactor session tests to common base; add option to save session when created. 2016-05-20 15:47:28 +10:00
Simone Bordet c5b834f003 Merged branch 'jetty-9.4.x' into 'master'. 2016-05-20 01:13:25 +02:00
Simone Bordet fab61b9157 Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2016-05-20 01:12:51 +02:00
Simone Bordet faec7259b2 Fixed dispatch to application in case of empty chunked body. 2016-05-20 01:12:24 +02:00
Simone Bordet aed6bb6d6a Code cleanups. 2016-05-20 01:12:24 +02:00
Jesse McConnell 4bf91b5ab3 Merge remote-tracking branch 'origin/release-9.3.9' into jetty-9.3.x 2016-05-19 09:55:58 -05:00
Simone Bordet 59ba37ad95 Merged branch 'jetty-9.4.x' into 'master'. 2016-05-19 11:51:15 +02:00
Simone Bordet 46bc204e1c Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2016-05-19 11:50:35 +02:00
Simone Bordet ff1bfa599f Issue #354 (Spin loop in case of exception thrown during accept()).
Improved the solution by sleeping only if we are still accepting.
This avoids the sleep when the connector is stopping, speeding up tests.
2016-05-19 11:48:51 +02:00
Greg Wilkins 79e5c31029 improved unit test, fixed deferred on chunking 2016-05-19 17:46:50 +10:00
Jan Bartel feb30c3a2b Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-05-19 16:44:20 +10:00
Jan Bartel e1489340fe Flow refactor of session classnames into module and etc files 2016-05-19 16:43:30 +10:00
Jan Bartel 6551d2c9a9 Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-05-19 16:32:11 +10:00
Jan Bartel a28a59be89 Sessions expire if now is >= calculated expiry 2016-05-19 16:30:39 +10:00
Jan Bartel 49ce555add Ensure SessionCache and SessionDataStore are managed as beans 2016-05-19 13:01:38 +10:00
Jan Bartel 7fd93f1929 Make NEVER_EVICT default session eviction policy; add more debug logging 2016-05-19 12:49:20 +10:00
Greg Wilkins f826d1365b Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-05-19 11:27:59 +10:00
Greg Wilkins cdd73eb4da improved javadoc 2016-05-19 11:27:09 +10:00
Jan Bartel 2e2b8e1a13 Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-05-18 18:33:06 +10:00
Jan Bartel 387f433711 Refactor names of session impl classes; fix bugs; add some tests 2016-05-18 17:05:01 +10:00
Greg Wilkins 49ec41f600 Issue #525 fix blockForContent spin
Improved test
2016-05-18 12:54:27 +10:00
Jesse McConnell dc4574f380 [maven-release-plugin] prepare for next development iteration 2016-05-17 17:30:17 -05:00
Jesse McConnell 0bbebec1e0 [maven-release-plugin] prepare release jetty-9.3.9.v20160517 2016-05-17 17:30:13 -05:00
Simone Bordet c7fd29c0b3 Merged branch 'jetty-9.4.x' into 'master'. 2016-05-16 15:41:29 +02:00
Simone Bordet f519bfaf71 Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2016-05-16 15:41:02 +02:00
Simone Bordet 55e5f74889 Fixes #558 - HTTP/2 server hangs when thread pool is low on threads.
Fixed test that was broken after changes for #557.
2016-05-16 15:40:35 +02:00
Joakim Erdfelt 6c47951fae Merge branch 'jetty-9.4.x' 2016-05-13 11:59:17 -07:00
Joakim Erdfelt 8305125df0 Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-05-13 11:59:02 -07:00
Joakim Erdfelt 97af3d663f Fixes #556 - Improve Resource.getAlias() checks on Windows
+ Reworks PathResource and FileResource alias checking to
  use originally passed paths, before Windows JVM has a
  chance to normalize and "correct" the bad paths.
2016-05-13 11:57:23 -07:00
Greg Wilkins 76405555a6 Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-05-12 14:01:05 +10:00
Greg Wilkins 0341d09e38 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-05-12 14:00:44 +10:00
Greg Wilkins 298a340851 Issue #558
The testEPCExitsLowThreadsMode has been broken, so ignored for now
2016-05-12 13:26:14 +10:00
Simone Bordet 2c787bbc05 Merged branch 'jetty-9.4.x' into 'master'. 2016-05-11 13:57:32 +02:00
Simone Bordet d8961139f3 Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2016-05-11 13:57:08 +02:00
Simone Bordet 9b6d42317b Improved logging. 2016-05-11 13:05:16 +02:00
Greg Wilkins 252e9b626a Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-05-11 16:24:48 +10:00
Greg Wilkins 6fb095f02c Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-05-11 16:23:06 +10:00
Greg Wilkins bdafea3e96 Issue #561 Fixed test timer 2016-05-11 09:24:02 +10:00
Simone Bordet 5af72ed1fc Merged branch 'jetty-9.4.x' into 'master'. 2016-05-06 17:44:16 +02:00
Simone Bordet 9a5d8f3943 Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2016-05-06 17:43:49 +02:00
Simone Bordet caa45283c7 Fixes #547 (ExecuteProduceConsume (EWYK) does not exit low threads mode)
Exposed getters/setters for ExecutionStrategy.Factory in
ServerConnector and SelectorManager, to allow explicit configuration
and testing.

Added test to verify that EPC exits low threads mode.
2016-05-06 17:10:46 +02:00
Simone Bordet 8bb6d4d7dc Code cleanups. 2016-05-06 17:10:46 +02:00
Greg Wilkins 2a5b120fc3 Issue #525 fix blockForContent spin
abort request in bad request handling
2016-05-06 20:31:55 +10:00
Greg Wilkins 13d9263d78 Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-05-05 11:37:29 +10:00
Greg Wilkins 15480a7c94 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-05-05 11:37:00 +10:00
Greg Wilkins 6591137ba0 Issue #547 EWYK leaves low resource mode
Directly implement PEC in EPC low resource mode
2016-05-05 11:22:37 +10:00
Joakim Erdfelt 00543724ec Merge branch 'jetty-9.4.x' 2016-05-04 09:16:38 -07:00