Commit Graph

2385 Commits

Author SHA1 Message Date
Simone Bordet 9e01565344 Code cleanups. 2016-09-15 12:11:11 +02:00
Simone Bordet 5ec60a30ed Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2016-09-14 16:44:39 +02:00
Simone Bordet 571b0c74c5 Implemented PromiseWrapper's succeeded() and failed() methods. 2016-09-14 14:01:30 +02:00
Greg Wilkins 3cd52fda04 Issue #572 Javadoc 2016-09-09 14:11:16 +10:00
Joakim Erdfelt fb7da26ad2 Updating to version 9.2.20-SNAPSHOT 2016-09-08 13:04:11 -07:00
Joakim Erdfelt 7b94bc32f4 Updating to version 9.2.19.v20160908 2016-09-08 12:11:44 -07:00
Greg Wilkins f703d2ad38 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-09-08 10:39:27 +10:00
Greg Wilkins 3a42455411 Merge remote-tracking branch 'origin/jetty-9.2.x' into jetty-9.3.x 2016-09-08 10:38:54 +10:00
Greg Wilkins ada58ea65a javadoc 2016-09-08 10:35:57 +10:00
Greg Wilkins 28ca70378e Issue #844 Thread Limit Handler (#857)
* Issue #844 DoS Handler

First cut at implementation of Thread limiting handler for #844

* Added modules, simplified API, added IP exemptions

* fixed xml

* fixed preallocation

* simplified code
2016-09-08 08:49:03 +10:00
Simone Bordet e21ad09e3a Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2016-09-05 23:09:12 +02:00
Simone Bordet 89b20b4692 Merged branch 'jetty-9.3.x-845'. 2016-09-05 21:36:04 +02:00
Simone Bordet 705a68dfc4 Issue #845 - Improve blocking IO for data rate limiting.
Moved tests to run HTTP and HTTP/2 tests, and added more test cases.
2016-09-05 19:13:05 +02:00
Jan Bartel 0d6667dc9f Issue #894 2016-09-02 13:50:25 +10:00
Greg Wilkins 095a71f11d Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-09-01 17:39:08 +10:00
Greg Wilkins aeeab8d5bb Merge remote-tracking branch 'origin/jetty-9.2.x' into jetty-9.3.x 2016-09-01 17:38:40 +10:00
Greg Wilkins d43b9af428 fix javadoc 2016-09-01 17:38:09 +10:00
Greg Wilkins 718c8e2444 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-09-01 16:44:03 +10:00
Greg Wilkins a799b21eb3 fixed merge 2016-09-01 16:41:49 +10:00
Greg Wilkins c2621bcad6 Merge remote-tracking branch 'origin/jetty-9.2.x' into jetty-9.3.x 2016-09-01 16:29:00 +10:00
Greg Wilkins f7c32c5fc7 Issue #882 IPv6 map
The new IPv6 capable InetAddressSet has been added as an alternative for IPAddressMap
The IncludeExclude class has been generalized to IncludeExcludeSet that can have a different
Predicate type to the set type and this works well with InetAddressSet.

However for #881 and #883, this may not be enough and Map semantics may need to be added.

The IPAccessHandler also has path mappings supported, which could need the map semantics, so for now a new InetAccessHandler has been
added that just uses an IncludeExcludeSet<InetAddressSet>, but this has yet to be tested.

The AbstractProxyServlet uses a host:port combinations, so IncludeExcludeSet<InetAddressSet> is not directly applicable.
2016-09-01 16:12:35 +10:00
Greg Wilkins 5ab9846ac5 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-08-31 20:32:54 +10:00
Simone Bordet e0c83757aa Fixes #889 - ConstantThrowable.name can be removed. 2016-08-31 12:25:19 +02:00
Greg Wilkins f856107301 Merge remote-tracking branch 'origin/jetty-9.2.x' into jetty-9.3.x 2016-08-31 19:05:57 +10:00
Greg Wilkins 0155ae761c Issue #880 Improve IPv6 support
For #880 added the HostPort class, which was used to fix #878, #879, #884 and #886
2016-08-31 16:46:11 +10:00
Jan Bartel 088f19704a Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-08-31 16:30:00 +10:00
Jan Bartel 34d465555b Merge remote-tracking branch 'origin/jetty-9.2.x' into jetty-9.3.x 2016-08-31 16:23:06 +10:00
Grzegorz Grzybek b70f0fdf15 Issue #868 - Use static Throwables without backtrace/stackTrace
Signed-off-by: Grzegorz Grzybek <gr.grzybek@gmail.com>
2016-08-26 10:44:23 +02:00
Simone Bordet 8de4751c6f Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2016-08-19 01:47:41 +02:00
Simone Bordet b316148625 Fixed test failure. 2016-08-19 01:44:14 +02:00
Joakim Erdfelt 196f5eeb96 Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-08-18 14:30:48 -07:00
Joakim Erdfelt 24b4aeb147 Fixes #854 - other testcase triggers ISE on .destroy() -> .start() as well 2016-08-18 14:30:11 -07:00
Simone Bordet 66c3603050 Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2016-08-18 15:47:41 +02:00
Simone Bordet 10f994a0a2 Fixes #854 - If container.destroy() is called, calling container.start() again should throw an IllegalStateException. 2016-08-18 15:47:06 +02:00
Simone Bordet 7a7d5e2f1e Code cleanup. 2016-08-18 15:47:06 +02:00
Simone Bordet deef53467d Fixes #855 - JMXify MBeanContainer. 2016-08-17 21:44:35 +02:00
Simone Bordet 00a065b064 Fixes #855 - JMXify MBeanContainer. 2016-08-17 21:28:19 +02:00
Simone Bordet 1a88dfa8c0 Code cleanups. 2016-08-08 23:22:51 +02:00
Greg Wilkins 5cb50e5f5d ignore PathResource test 2016-08-04 14:02:16 +10:00
Greg Wilkins d0101dc81a Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-08-03 18:01:42 +10:00
Greg Wilkins a1885afff8 fix #804 by removing old javadoc reference to org.eclipse.jetty.util.URI.charset 2016-08-03 09:17:15 +10:00
Joakim Erdfelt 2830e51e04 Merge branch 'jetty-9.3.x' into release-9.3.11 2016-07-28 12:20:36 -07:00
Greg Wilkins 1f949d509b Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-07-28 18:18:11 +10:00
Greg Wilkins 35c21d7ced Utility improvements
Add Arrays
XML config get class
2016-07-28 16:50:12 +10:00
Joakim Erdfelt 6e1b1cdb36 Updating to version 9.3.12-SNAPSHOT 2016-07-21 19:07:19 -07:00
Joakim Erdfelt 9fd6d4354e Updating to version 9.3.11.v20160721 2016-07-21 18:37:09 -07:00
Joakim Erdfelt 0b18340179 Updating to version 9.2.19-SNAPSHOT 2016-07-21 13:10:23 -07:00
Joakim Erdfelt d3ff3423f0 Updating to version 9.2.18.v20160721 2016-07-21 12:35:26 -07:00
Simone Bordet 823ba4add6 Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2016-07-21 18:15:38 +02:00
Greg Wilkins f902181a83 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-07-21 13:02:57 +10:00
Greg Wilkins 21a618e6a8 SLOTH protection #631
Exclude all MD5 and SHA1 ciperhs, not just RSA based ones.
2016-07-21 12:39:07 +10:00
Simone Bordet d976b4d36a Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2016-07-14 12:44:15 +02:00
Greg Wilkins f6071ca7fc Fix #708 SslContextFactory: newSslServerSocket/newSslSocket are not customized 2016-07-14 18:26:51 +10:00
Greg Wilkins 35a64828fb Fix #708 SslContextFactory: newSslServerSocket/newSslSocket are not customized 2016-07-14 15:17:50 +10:00
Greg Wilkins f5d59cacca Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-07-14 14:04:21 +10:00
Greg Wilkins 112244d6ef Fix #708 SslContextFactory: newSslServerSocket/newSslSocket are not customized 2016-07-14 13:44:49 +10:00
Greg Wilkins 45bbde408f Fix #708 SslContextFactory: newSslServerSocket/newSslSocket/doStart are not customized 2016-07-14 12:17:52 +10:00
Jan Bartel 6628a42d5d Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-07-13 15:32:03 +10:00
Jan Bartel 37cda79f7b Issue #720 2016-07-13 15:28:33 +10:00
Greg Wilkins 8675c17d92 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-07-07 11:46:38 +10:00
Greg Wilkins 322fe73869 Suppress stacks during sweeper test 2016-07-07 08:32:36 +10:00
Greg Wilkins c9e6141844 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-07-06 16:47:58 +10:00
Greg Wilkins fc36e45795 Support UNC paths in PathResource #669
Also-by: Marco Signorini <m.signorini@iontrading.com>
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2016-07-06 16:46:22 +10:00
Greg Wilkins 5b50e41e7e Issue #687
Alias should be absolute not relative
2016-07-06 16:46:22 +10:00
Greg Wilkins f058054cbe Issue #644 Modules for logging
Added slf4j-jul
2016-07-06 12:14:22 +10:00
Joakim Erdfelt c4f6d3503e Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-06-29 15:11:55 -07:00
Joakim Erdfelt d13d3cc3f5 Fixes #675 - Slf4jLog.ignore() now logs at DEBUG level 2016-06-29 15:11:46 -07:00
Joakim Erdfelt 2dfb5f463a Fixes #677 - Logging of ignore() events now show as "Ignored Exception" 2016-06-29 15:11:37 -07:00
Joakim Erdfelt a5dc01bbb1 Fixes #676 - JavaUtilLog.ignore() logs at FINEST level now 2016-06-29 15:11:28 -07:00
Joakim Erdfelt ac90d2b562 Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-06-28 13:47:54 -07:00
Joakim Erdfelt b20e2ddf18 Fixes #672 - Allow logging configuration announcement to be programmatically disabled 2016-06-28 13:01:16 -07: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 7df3b83a8e Issue #644 Modules for logging
Added logback classic modules
2016-06-24 14:42:34 +10:00
Greg Wilkins 0e0fc77771 skip symlink test on windows 2016-06-24 14:33:18 +10:00
Greg Wilkins 0239d6390f Issue #644 Modules for logging
module for direct slf4j to log4j2 bridge
2016-06-23 15:32:18 +10:00
Greg Wilkins 501b8e9dca Issue #644 Modules for logging
Added log4j2.xml configuration
Added jetty-log4j2 mapping module
2016-06-23 15:21:34 +10:00
Greg Wilkins e4eafd0fee Issue #644 Modules for logging
parameterized logging versions
2016-06-23 09:54:28 +10:00
Greg Wilkins 80903c5ab1 Issue #644 Modules for logging
Added a jetty-log4j module that depends internally on slf4j
2016-06-23 08:38:29 +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 8157a4533c Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-06-22 10:43:43 -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 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
Greg Wilkins d05c282baa Issue #644 Modules for enabling logging
Improved descriptions
2016-06-17 23:33:26 +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
Greg Wilkins 07b0127587 Issue #644 rename module 2016-06-17 07:42:57 +10:00
Greg Wilkins 2fbf466393 Issue #644 Modules for enabling logging 2016-06-17 07:39:11 +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
Jesse McConnell 16f3ea82c1 fix javadoc 2016-06-03 09:45:10 -05: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
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
Jesse McConnell d5c6793e6a [maven-release-plugin] prepare for next development iteration 2016-05-17 15:33:46 -05:00
Jesse McConnell 0bab7e6616 [maven-release-plugin] prepare release jetty-9.2.17.v20160517 2016-05-17 15:33:42 -05: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 d2b0daefb4 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-05-13 11:21:50 +10:00
Greg Wilkins 0a1f4ac98c Issue #570
Encoding mechanism was based on if the first encodable character found was unicode or not.  Changed to not be
order dependent!
2016-05-13 10:52:49 +10:00
Simone Bordet 922319c3a3 Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2016-05-12 19:30:50 +02:00
Simone Bordet 51dd5c902c Fixed Javadoc. 2016-05-12 19:07:06 +02:00
Simone Bordet 242b6b5f66 Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'. 2016-05-12 18:59:40 +02:00
Simone Bordet 2a4cbdd111 Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2016-05-12 00:22:31 +02:00
Simone Bordet 016fc6569f Fixes #558 - HTTP/2 server hangs when thread pool is low on threads.
Modified ExecuteProduceConsume to test for Rejectable tasks when
trying to execute a task in low threads mode, and if so, reject them
immediately.
2016-05-12 00:13:35 +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 1fc40864e1 Issue #558 (HTTP/2 server hangs when thread pool is low on threads).
Verify that rejecting tasks avoids hanging the server when in low
threads mode.
2016-05-11 13:05:16 +02:00
Simone Bordet 509e1f0f93 Fixes #557 (Review ThreadPool.isLowOnThreads()).
Updated the isLowOnThreads() formula with a more conservative one,
introducing lowThreadsThreshold parameter to tune it.
2016-05-11 13:05:16 +02:00
Simone Bordet f47b6811b4 Improved javadocs and JMX descriptions. 2016-05-11 13:05:16 +02:00
Simone Bordet d9c9e4a399 Issue #557 (Review ThreadPool.isLowOnThreads())
Updated isLowOnThreads() to take into account also the number of idle
threads, so that it now returns true if the number of idle threads <= 1.
2016-05-11 13:05:16 +02:00
Simone Bordet fe8102a430 Cosmetics. 2016-05-11 13:05:16 +02:00
Simone Bordet 30fd8323f4 Added jobs to detailed dump. 2016-05-11 13:05: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 903a6cb49c Expanded static imports. 2016-05-06 17:10:46 +02: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 c77df55bb6 Issue #547 EWYK leaves low resource mode
Merged code cleanups
2016-05-05 11:35:32 +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
Simone Bordet 4d4ecfd5cf Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2016-05-04 11:47:54 +02:00
Simone Bordet e6e63d5549 Code cleanups. 2016-05-04 11:46:59 +02:00
Simone Bordet a0bd9d3887 Fixes #546 (Guard concurrent calls to ExecutionStrategy.execute())
Guarded invocations to execute() with a state change.
2016-05-04 11:43:50 +02:00
Greg Wilkins a5d3f29f11 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-05-04 11:10:03 +10:00
Greg Wilkins 90110659e2 fixed javadoc 2016-05-04 10:49:22 +10:00
Greg Wilkins 3066880cd2 fixed bad merge 2016-05-04 09:53:00 +10:00
Joakim Erdfelt 86bf31aad7 Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-05-03 11:36:25 -07:00
Joakim Erdfelt 2dbecb0843 Fixing broken javadoc 2016-05-03 11:23:10 -07:00
Joakim Erdfelt 932e0125d2 Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-05-02 09:51:24 -07:00
Joakim Erdfelt ff1ca8d993 Limiting versions that trigger !STABLE warning
+ Only RC# and M# trigger warning now.
+ Warning includes URL for where to download stable version.
2016-05-02 09:50:05 -07:00
Greg Wilkins 3e8187dcd5 Merge remote-tracking branch 'origin/jetty-9.3.x' 2016-04-29 16:58:00 +10:00
Greg Wilkins c74dd571fa Issue #519 Disable SSL session caching
Set -1 defaults for session caching
2016-04-29 08:10:18 +10:00
Greg Wilkins 88c1339784 Issue #519 Disable SSL session caching
Improve the configuration of the SSL session cache
2016-04-29 08:02:41 +10:00
Greg Wilkins 092ed57a17 Merge remote-tracking branch 'origin/jetty-9.3.x' 2016-04-28 08:17:45 +10:00
Greg Wilkins 5f7a32e30e warning if not stable release 2016-04-28 08:15:06 +10:00
Joakim Erdfelt 301fc12d98 Merge branch 'jetty-9.3.x' 2016-04-25 12:11:38 -07:00
Greg Wilkins 65d949a386 Issue #518 jarfile fix for springboot 2016-04-25 18:15:38 +10:00
Greg Wilkins f3b3741a58 Issue #533 Do not hide file resource exception
Throw IOException rather than MUE for file exception
2016-04-23 09:43:21 +10:00
Greg Wilkins 2c197878bd Merge remote-tracking branch 'origin/jetty-9.3.x' 2016-04-23 09:38:30 +10:00
Greg Wilkins bf5b6f8939 Issue #533 Do not hide file resource exception
ignore exception
2016-04-23 09:36:19 +10:00
Greg Wilkins ec8e1055e3 Issue #533 Do not hide file resource exception
Add exception as suppressed
2016-04-23 09:36:19 +10:00
Greg Wilkins 132cd097ce Issue #519 Disable SSL session caching
Improved javadoc
wired up session cache size correctly
2016-04-23 09:36:19 +10:00
Simone Bordet b3fa4abaa0 Merged branch 'jetty-9.3.x' into 'master'. 2016-04-14 23:45:48 +02:00
Joakim Erdfelt 939505c342 Updating to version 9.2.17-SNAPSHOT 2016-04-14 14:03:21 -07:00
Joakim Erdfelt 778fac638d Updating to version 9.2.16.v20160414 2016-04-14 13:21:34 -07:00
Joakim Erdfelt 47bbd9364d Revert "Updating to version 9.2.16.v20160414"
This reverts commit 29ae63855b.
2016-04-14 13:19:59 -07:00
Joakim Erdfelt 29ae63855b Updating to version 9.2.16.v20160414 2016-04-14 13:17:21 -07:00
Simone Bordet a37fdcd0e2 Fixes #514 - Allow ExecutionStrategy to be configurable.
Introduced setters and constructor parameters to components that use
ExecutionStrategy.
2016-04-14 12:28:52 +02:00
Simone Bordet 6827c5b045 Fixes #514 - Allow ExecutionStrategy to be configurable.
Introduced setters and constructor parameters to components that use
ExecutionStrategy.
2016-04-14 12:20:31 +02:00
Joakim Erdfelt 6fb338e50d Updating to version 9.3.9-SNAPSHOT 2016-04-11 16:20:50 -07:00
Joakim Erdfelt bb4f3c4882 Updating to version 9.3.9.M1 2016-04-11 15:35:22 -07:00
Greg Wilkins eeb42338fc Merge pull request #468 from thesnowgoose/master
Improve canonicalPath method in URIUtil.java contemplating new test added on issue #466
2016-04-05 15:12:06 +10:00
Greg Wilkins 92904d2b7d Merge remote-tracking branch 'origin/jetty-9.3.x' 2016-04-05 13:30:01 +10:00
Greg Wilkins 8f74ff3585 Merge remote-tracking branch 'origin/jetty-9.3.x' 2016-04-05 10:01:22 +10:00
Greg Wilkins 557ca69f59 Merge branch 'jetty-9.3.x' into issue-472 2016-04-05 10:00:09 +10:00
Greg Wilkins 424f0c1e04 Merge remote-tracking branch 'origin/jetty-9.2.x' into jetty-9.3.x 2016-04-05 09:57:28 +10:00
thesnowgoose 0c735881c2 Replaced LinkedList for ArrayList 2016-04-02 10:31:54 -07:00
Simone Bordet cdcde53c6b Merged branch 'jetty-9.3.x' into 'master'. 2016-04-01 14:44:50 +02:00
Simone Bordet ce04cadb79 Fixes #233 - Add message to idle TimeoutException. 2016-04-01 14:44:26 +02:00
Greg Wilkins 91bef55924 Issue #472 Use LongAdder for statistics
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2016-04-01 17:22:45 +11:00
thesnowgoose 82559c8dde Fix broken test
Signed-off-by: thesnowgoose <lcarrasco@nearsoft.com>
2016-03-30 11:23:44 -07:00
Greg Wilkins 3590abc534 Merge remote-tracking branch 'origin/jetty-9.3.x' 2016-03-30 20:05:59 +11:00
Greg Wilkins c768828703 Issue #458 Improve Quality list handling
Added QuotedCSV and QuotedQualityCSV that are up to date with RFC7230
2016-03-30 19:07:11 +11:00
Greg Wilkins 9becd5e0dd added unit test to check #460 2016-03-30 18:56:55 +11:00
Greg Wilkins 330d21d27f Revert "Merge pull request #460 from thesnowgoose/master"
This reverts commit f5ba7ae197, reversing
changes made to 0fe1bbcd91.

The change fails for /foo/../../bar paths, as it returns bar rather than null
2016-03-30 18:55:09 +11:00
thesnowgoose f1cd6f6e4d Improve canonicalPath method in URIUtil.java
Signed-off-by: thesnowgoose <lcarrasco@nearsoft.com>
2016-03-29 18:01:55 -07:00
thesnowgoose 7f0fbff17e Improve canonicalPath method in URIUtil.java
Signed-off-by: thesnowgoose <lcarrasco@nearsoft.com>
2016-03-29 12:49:56 -07:00
Joakim Erdfelt 4822bea0b1 Issue #438 - File and Path Resources with control characters should be rejected
+ Removing regex
+ Adding StringUtil.indexOfControlChars()

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2016-03-18 11:51:32 -07:00
Joakim Erdfelt 05691e1646 Issue #438 - File and Path Resources with control characters should be rejected
+ Adding testcases
+ Cleaning up unit tests, adding more
+ Fixing one testcase related to FileResource.addPath()
+ Adding validation of filesystem paths

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2016-03-17 16:13:07 -07:00
Joakim Erdfelt 3624339ec6 Merge branch 'jetty-9.3.x' 2016-03-16 10:29:29 -07:00
Joakim Erdfelt 13fde643ed Merge branch 'release-9.3.8' into jetty-9.3.x 2016-03-16 10:03:29 -07:00
Greg Wilkins 1c5a1fc6a2 Issue #431
Suppress stack traces from unit tests
2016-03-16 18:19:40 +11:00
Joakim Erdfelt 1b1c331763 Fixing merge detritus 2016-03-15 09:28:47 -07:00
Joakim Erdfelt dcfa0b8910 Merge branch 'jetty-9.3.x' 2016-03-15 07:49:28 -07:00
Simone Bordet 26f8deddf7 Introduced Callback.Nested.
Refactored code that was using nested callbacks and removed
unnecessary overrides now that we have default methods.
2016-03-15 15:24:44 +01:00
Joakim Erdfelt c68d3b1d8d Updating to version 9.3.9-SNAPSHOT 2016-03-14 09:07:52 -07:00
Joakim Erdfelt 1f3b3f31f4 Updating to version 9.3.8.v20160314 2016-03-14 08:30:20 -07:00
Greg Wilkins 0c14432db3 Merge remote-tracking branch 'origin/jetty-9.3.x' 2016-03-10 12:44:41 +11:00
Greg Wilkins fa8b1c9220 Revert "Issue #414 ContainerLifeCycle should not stop failed component on remove"
This reverts commit 34c8ded756.
The test is a race and failed components should be stopped when removed so listeners can be called.
2016-03-10 12:42:50 +11:00
Greg Wilkins eac3a4a439 Merge branch 'jetty-9.3.x' 2016-03-10 12:35:44 +11:00
Greg Wilkins 34c8ded756 Issue #414 ContainerLifeCycle should not stop failed component on remove
Only stop isRunning components when removed
2016-03-10 12:29:02 +11:00
Simone Bordet 13f267bf8a Merged branch 'jetty-9.3.x' into 'master'. 2016-03-07 16:11:41 +01:00
Greg Wilkins d48cfcdb62 Issue #397 Multipart EOF handling
read to EOF when reading multipart.
2016-03-05 17:50:56 +01:00
Simone Bordet 2c11372bc4 Merged branch 'jetty-9.3.x' into 'master'. 2016-02-29 17:17:09 +01:00
Simone Bordet cec3694355 Consistently using BufferUtil, especially clearToFill() and
flipToFlush().
2016-02-29 16:31:38 +01:00
Osman Üngür 966cffccb8 Fix typo in annotation
Signed-off-by: Osman Ungur <osmanungur@gmail.com>
2016-02-26 19:37:27 +02:00
Greg Wilkins 92c339e669 Merge remote-tracking branch 'origin/jetty-9.3.x' 2016-02-17 12:09:00 +01:00
Jan Bartel 11d3448e28 Issue #81 Exception not always thrown in Jetty to application when upload part is too big
Issue #82 Request.getPart() that results in Exception still allows other parts to be fetched
2016-02-16 17:43:56 +01:00
Greg Wilkins 26217a73c1 Merge pull request #72 from gouessej/master
Bug 485625 - Allow overriding the conversion of a String into a Crede…
2016-02-15 12:56:15 +01:00
Joakim Erdfelt f98dde5e5b Updating to version 9.2.16-SNAPSHOT 2016-02-10 15:36:41 -07:00
Joakim Erdfelt 9b6890d3c1 Updating to version 9.2.15.v20160210 2016-02-10 14:49:12 -07:00
Simone Bordet 2ac465a343 Merged branch 'jetty-9.3.x' into 'master'. 2016-02-09 18:14:07 +01:00
Simone Bordet 6306f06e2f Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'. 2016-02-09 18:12:04 +01:00
Simone Bordet 145e4bee71 487511 - Jetty HTTP won't work on turkish systems.
Fixed usages of toLowerCase() and toUpperCase() to use Locale.ENGLISH.
2016-02-09 17:50:26 +01:00
Greg Wilkins df79ad689a Merge remote-tracking branch 'origin/jetty-9.3.x' 2016-02-04 07:00:13 +01:00
Jan Bartel 1b7045babd 486394 Make old behaviour of MultiPartInputStreamParser configurable 2016-02-03 14:15:15 +01:00
Jan Bartel d151143556 Revert "486394 - MultipartConfig.fileSizeThreshold default of 0 should always create a file"
This reverts commit 734d18fb93.
2016-02-03 14:15:15 +01:00
Greg Wilkins 7ec6e2e899 486930 - Selector does not correctly handle rejected execution exception
Improved comments and unit test
2016-02-01 17:18:42 +01:00
Greg Wilkins c81dcfc790 486930 - Selector does not correctly handle rejected execution exception
This fix work in two ways:

1) Both the PEC and EPC strategies when confronted with a
RejectedExecutionException will continue to Produce rather than consume.

2) If a produced Runnable cannot be consumed and it supports the new Rejectable interface,
then it's reject() method is called by the producer thread.    Typically this is implemented
to close the connection - with the risk being that the close might block, but that is
probably better than leaking the connection?
2016-02-01 17:10:24 +01:00
Jan Bartel 599696bfc5 Merge branch 'master' into session-refactor 2016-02-01 16:57:35 +01:00
Jan Bartel a8c29334ca Merge branch 'master' into session-refactor
Conflicts:
	jetty-nosql/src/main/java/org/eclipse/jetty/nosql/NoSqlSession.java
	jetty-nosql/src/main/java/org/eclipse/jetty/nosql/NoSqlSessionManager.java
	jetty-server/src/main/java/org/eclipse/jetty/server/session/AbstractSession.java
	jetty-server/src/main/java/org/eclipse/jetty/server/session/HashSessionManager.java
	jetty-server/src/main/java/org/eclipse/jetty/server/session/HashedSession.java
	jetty-server/src/main/java/org/eclipse/jetty/server/session/MemSession.java
	jetty-server/src/test/java/org/eclipse/jetty/server/session/FileSessionManagerTest.java
	tests/test-sessions/test-mongodb-sessions/src/test/java/org/eclipse/jetty/nosql/mongodb/StopSessionManagerDeleteSessionTest.java
	tests/test-sessions/test-mongodb-sessions/src/test/java/org/eclipse/jetty/nosql/mongodb/StopSessionManagerPreserveSessionTest.java
2016-02-01 13:59:12 +01:00
Joakim Erdfelt 734d18fb93 486394 - MultipartConfig.fileSizeThreshold default of 0 should always create a file
+ Refactored fileSizeThreshold logic so that a configuration value of
   0 is always create file
   (negative) is never create file
   positive is tested against filesize
2016-01-22 14:07:51 -07:00
Julien Gouesse ac1afed323 Merge branch 'master' of https://github.com/eclipse/jetty.project 2016-01-19 20:17:23 +01:00
Joakim Erdfelt e0ce545ad7 Updating to version 9.3.8-SNAPSHOT 2016-01-15 17:15:14 -07:00
Joakim Erdfelt c0b191119b Updating to version 9.3.7.v20160115 2016-01-15 16:40:15 -07:00
Julien Gouesse 7ab6127e33 Bug 485625 - Allow overriding the conversion of a String into a Credential
Signed-off-by: Julien Gouesse <gouessej@orange.fr>
2016-01-15 18:51:37 +01:00
Greg Wilkins c5cbc64e77 Merge remote-tracking branch 'origin/jetty-9.3.x' 2016-01-14 11:00:06 +11:00
Joakim Erdfelt 0a1b0b2bc6 485714 - Update SSL configuration to mitigate SLOTH vulnerability 2016-01-13 15:00:16 -07:00
Greg Wilkins 41329dccc4 Revert "485714 - Update SSL configuration to mitigate SLOTH vulnerability"
This reverts commit 46ed803023.
The fix broke several unit tests.
2016-01-13 15:38:27 +11:00
Greg Wilkins 46ed803023 485714 - Update SSL configuration to mitigate SLOTH vulnerability 2016-01-13 15:18:13 +11:00
Greg Wilkins e2a0794d91 485712 - Quickstart web.xml is absolute 2016-01-13 12:47:25 +11:00
Jan Bartel 9146d11746 485031 two PathWatcher threads running after automatically restarting webapp 2016-01-09 10:32:15 +11:00
Jan Bartel 75b84374e0 485031 two PathWatcher threads running after automatically restarting webapp 2016-01-09 10:27:33 +11:00
Simone Bordet f519aa28fb Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'. 2016-01-05 11:40:57 +01:00
Simone Bordet 50100ca86d Fixed copyright blurbs. 2016-01-05 11:30:38 +01:00
Joakim Erdfelt 4032b8579a Happy New Year 2016 (take #2) 2016-01-04 15:14:27 -07:00
Joakim Erdfelt ac24196b0d Happy New Year 2016 2016-01-04 14:34:20 -07:00
Joakim Erdfelt cd39fd84fe Happy New Year 2016 2016-01-04 14:31:22 -07:00
Joakim Erdfelt b5db18378d Happy New Year 2016 2016-01-04 14:21:26 -07:00
Simone Bordet 3fb354f884 Merged branch 'jetty-9.3.x' into 'master'. 2015-12-21 13:02:04 +01:00
Joakim Erdfelt 71150a939c javadoc fixes 2015-12-18 14:21:10 -07:00
Joakim Erdfelt 4a07503a09 Javadoc updates
Conflicts:
	jetty-util/src/main/java/org/eclipse/jetty/util/Loader.java
	jetty-util/src/main/java/org/eclipse/jetty/util/Promise.java
2015-12-18 11:06:15 -07:00
Joakim Erdfelt 24b9d39c0f Javadoc updates 2015-12-18 11:02:32 -07:00
Joakim Erdfelt 47eb7f02a9 437786 - SslContextFactory: Allow Password.getPassword to be overridden
+ Allowing password management in SslContextFactory to be overridden
  with new methods .newPassword(String pw) and .getPassword(String realm)
2015-12-18 10:44:49 -07:00
Jan Bartel c122569d75 Invalidate session if load finds it is expired; ensure locks reentrant 2015-12-18 17:45:10 +11:00
Greg Wilkins 133e9e054d Merge remote-tracking branch 'origin/jetty-9.3.x'
Conflicts:
	jetty-security/src/main/java/org/eclipse/jetty/security/HashLoginService.java
2015-12-18 12:50:19 +11:00
Greg Wilkins 5cd676581c 484622 - Improve handling of Direct and Mapped buffers for static content
ResourceHttpContent now applies a maxBufferSize that is passed through the call to getContent
ResourceCache now accounts for the exact memory usage of content, which may have an indirect
buffer plus either a direct or mapped buffer.  Thus content size may be 0, 1 or 2 times the
file size.

Some more limited unit tests
2015-12-18 12:36:27 +11:00
Joakim Erdfelt 31cd3fee84 Merge branch 'jetty-9.3.x'
Conflicts:
	jetty-http/src/main/java/org/eclipse/jetty/http/PathMap.java
	jetty-http/src/main/java/org/eclipse/jetty/http/pathmap/PathSpecSet.java
	jetty-server/src/main/java/org/eclipse/jetty/server/handler/gzip/GzipHandler.java
	jetty-util/src/main/java/org/eclipse/jetty/util/IncludeExclude.java
	jetty-util/src/main/java/org/eclipse/jetty/util/RegexSet.java
2015-12-17 12:51:57 -07:00
Joakim Erdfelt 7c5bec1b48 Using Java 8 Predicate Function
+ Removing jetty-util (java 7) holdover Predicate.java
+ Converting use to (java 8) java.util.function.Predicate
2015-12-17 10:15:57 -07:00
Joakim Erdfelt 343aa066ae Merge branch 'jetty-9.2.x' into jetty-9.3.x
Conflicts:
	jetty-http/src/main/java/org/eclipse/jetty/http/HttpGenerator.java
	jetty-http/src/main/java/org/eclipse/jetty/http/PathMap.java
	jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/AbstractJettyMojo.java
	jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/WarPluginInfo.java
	jetty-rhttp/jetty-rhttp-gateway/src/main/java/org/eclipse/jetty/rhttp/gateway/Main.java
	jetty-security/src/main/java/org/eclipse/jetty/security/PropertyUserStore.java
	jetty-servlets/src/main/java/org/eclipse/jetty/servlets/CrossOriginFilter.java
	jetty-servlets/src/main/java/org/eclipse/jetty/servlets/GzipFilter.java
	jetty-servlets/src/main/java/org/eclipse/jetty/servlets/gzip/CompressedResponseWrapper.java
	jetty-servlets/src/main/java/org/eclipse/jetty/servlets/gzip/GzipHandler.java
	jetty-util/src/main/java/org/eclipse/jetty/util/IncludeExclude.java
	jetty-util/src/main/java/org/eclipse/jetty/util/RegexSet.java
	jetty-util/src/test/java/org/eclipse/jetty/util/IncludeExcludeTest.java
	jetty-util/src/test/java/org/eclipse/jetty/util/ssl/SslContextFactoryTest.java
2015-12-16 12:56:13 -07:00
Joakim Erdfelt 6e0ad429d9 484350 - Allow GzipHandler path include/exclude to use regex
+ Overhauled IncludeExclude to use java 8 predicate
+ Introduced PathSpecSet to standardize path IncludeExclude
+ GzipHandler now uses PathSpecSet for paths

Conflicts:
	jetty-http/src/main/java/org/eclipse/jetty/http/PathMap.java
	jetty-servlets/src/main/java/org/eclipse/jetty/servlets/gzip/GzipHandler.java
	jetty-util/src/main/java/org/eclipse/jetty/util/IncludeExclude.java
	jetty-util/src/main/java/org/eclipse/jetty/util/RegexSet.java
2015-12-15 15:23:29 -07:00
Joakim Erdfelt b6df9508c6 484350 - Allow GzipHandler path include/exclude to use regex
+ Overhauled IncludeExclude to use java 8 predicate
+ Introduced PathSpecSet to standardize path IncludeExclude
+ GzipHandler now uses PathSpecSet for paths
2015-12-14 14:58:12 -07:00
Joakim Erdfelt 5e3fbbccd0 Backporting GzipHandler's IncludeExclude configs 2015-12-08 15:51:25 -07:00
Joakim Erdfelt 7cdc58e6b9 Merge branch 'jetty-9.2.x' into feature/gziphandler-config 2015-12-08 14:56:26 -07:00
Greg Wilkins 3527c6a71b StringUtil.csvSplit(String)
Conflicts:
	jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/AbstractJettyMojo.java
	jetty-security/src/main/java/org/eclipse/jetty/security/PropertyUserStore.java
	jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java
	jetty-servlets/src/main/java/org/eclipse/jetty/servlets/PushCacheFilter.java
	jetty-util/src/main/java/org/eclipse/jetty/util/StringUtil.java
	jetty-xml/src/main/java/org/eclipse/jetty/xml/XmlConfiguration.java
2015-12-08 14:54:33 -07:00
Simone Bordet 4ea1bb0233 Merged branch 'jetty-9.3.x' into 'master'. 2015-12-08 22:20:28 +01:00
Simone Bordet 8d6206b8c7 Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'. 2015-12-08 22:20:05 +01:00
Simone Bordet 1693dd135d 483857 - jetty-client onComplete isn't called in case of exception in GZIPContentDecoder.
Fixed by catching the exceptions and failing the callbacks.

Also using return values from HttpReceiver to compute what to
return to the parser.
2015-12-08 22:10:27 +01:00
Joakim Erdfelt 1e6b940942 Merge branch 'jetty-9.3.x'
Conflicts:
	jetty-server/src/test/java/org/eclipse/jetty/server/AbstractHttpTest.java
2015-12-02 11:39:52 -07:00
Joakim Erdfelt 6d3d912b0b 483413 - Warn on @Deprecated servlet/filter use 2015-12-01 16:18:00 -07:00
Joakim Erdfelt 481102db30 483413 - Warn on @Deprecated servlet/filter use 2015-12-01 15:53:46 -07:00
Greg Wilkins cea05f17d9 483119 - CachingWebAppClassLoader breaks JSP
Cleaned up debugging and impl.  No fix for JSP problem
2015-11-27 10:39:52 +11:00
Jan Bartel 81b2a6a4de 483059 Remove cache of authenticated users 2015-11-26 15:31:19 +11:00
Joakim Erdfelt 12e1974fd9 482172 - Report form key size count in UrlEncoded exceptions
+ Fixing ISE message format/syntax
2015-11-24 08:51:22 -07:00
Joakim Erdfelt f2bd05747e 482058 - MultiPartInputStream test initial part boundary incorrectly allows empty string 2015-11-24 08:51:22 -07:00
Joakim Erdfelt 21388d4765 482057 - MultiPartInputStream temp file permissions should be limited to user 2015-11-24 08:51:22 -07:00
Greg Wilkins a311c8bde1 480904 - jetty-util Loader simplification
The Loader has been simplified to now just be a switch between loading from the context loader,
the same loader as another class or the system loader.    Multiple loaders will never be tried.

A new runWithServerClassAccess(PriviledgedAction) method has been added to WebAppClassLoader, that
is now used during configuration for actions that need access to both the WEB-INF/lib classes and
the server classes (eg jetty-web.xml and env.xml).

The JMX MBean mechanism has also been modified to look for an MBean class in the same loader that
object came from before attempting the context loader (only if different).
2015-11-19 12:14:05 +11:00
Greg Wilkins ff0d1b4c14 481903 Module Descriptions 2015-11-12 10:48:04 +11:00
Simone Bordet b800ffc983 481717 - Make Callback and Promise CompletableFuture-friendly.
Introduced methods from(CompletableFuture) and subclass Completable.
2015-11-09 17:38:35 +01:00
Simone Bordet 8ed67c009f Removed usages of deprecated Callback.Adapter class. 2015-11-09 12:35:58 +01:00
Joakim Erdfelt edf686fe0a Updating to version 9.3.7-SNAPSHOT 2015-11-06 12:13:00 -07:00
Joakim Erdfelt d737e1c638 Updating to version 9.3.6.v20151106 2015-11-06 11:09:32 -07:00
Joakim Erdfelt ec8f8d3e4f Updating to version 9.2.15-SNAPSHOT 2015-11-06 11:06:48 -07:00
Joakim Erdfelt ecba378f5c Updating to version 9.2.14.v20151106 2015-11-06 10:32:14 -07:00
Simone Bordet 3789c73ba3 Merged branch 'jetty-9.3.x' into 'master'. 2015-10-27 15:33:21 +01:00
Simone Bordet 487d0f2d5c 480764 - Error parsing empty multipart.
Fixed by checking the presence of the last boundary as the first line.
2015-10-27 15:29:56 +01:00
Greg Wilkins 1ebb470a38 479179 Fixed NPE from debug 2015-10-17 09:39:19 +11:00
Greg Wilkins 570c751ec8 479179 Fixed NPE from debug 2015-10-17 09:37:43 +11:00
Greg Wilkins d5dab98546 start.jar uses shaded jetty-util classes 2015-10-15 15:42:28 +11:00
Greg Wilkins 58e282fa6c Added file headers to TopologicalSort 2015-10-15 15:40:35 +11:00
Greg Wilkins 20cb70935c Improved TopologicalSort javadoc 2015-10-15 15:40:35 +11:00
Greg Wilkins 32c71261e1 Topological sort utility 2015-10-15 15:40:35 +11:00
Joakim Erdfelt dde32787c4 Updating to version 9.3.6-SNAPSHOT 2015-10-12 15:47:37 -07:00
Joakim Erdfelt 29722bd880 Updating to version 9.3.5.v20151012 2015-10-12 15:10:39 -07:00
Joakim Erdfelt 2cce7510e1 Updating to 9.3.5-SNAPSHOT 2015-10-08 17:49:09 -07:00
Joakim Erdfelt 9cf0e34a1d Updating to version 9.4.0-SNAPSHOT 2015-10-07 15:41:32 -07:00
Joakim Erdfelt 37296bec3c Updating to version 9.3.4.v20151007 2015-10-07 14:58:38 -07:00
Greg Wilkins 540b33e64c 478372 - JavaUtilLog setSourceClass and setSourceMethod
Log ignored only if log level is all
turn off java util logging in embedded examples
2015-09-30 16:24:11 +10:00
Jan Bartel 697b0cccf2 477895 Prevent leak of handles to deleted files after redeploy 2015-09-30 13:39:31 +10:00
Simone Bordet 3dcdb9f802 Merged branch '477878' into 'master'. 2015-09-25 19:34:45 +02:00
Simone Bordet 6544af8ce7 Improved IllegalStateException message. 2015-09-25 19:24:32 +02:00
Greg Wilkins 007ac4a9dd 478372 - JavaUtilLog setSourceClass and setSourceMethod
Added some additional features to configure the java.util.logging mechansim
2015-09-25 14:08:31 +10:00
Greg Wilkins dcb4c0d0a8 478372 - JavaUtilLog setSourceClass and setSourceMethod 2015-09-25 12:45:46 +10:00
Greg Wilkins 46a611caac 476720 getTrustStoreResource fixed 2015-09-24 17:26:01 +10:00
Greg Wilkins 131a471c8f 478008 Do not reset current value of CounterStatistics 2015-09-24 17:19:48 +10:00
Greg Wilkins f708f79b13 477817 Fixed memory leak in QueuedThreadPool
Conflicts:
	jetty-util/src/main/java/org/eclipse/jetty/util/thread/QueuedThreadPool.java
2015-09-21 11:42:08 +10:00
Greg Wilkins 3c4eb5c4f6 477817 Fixed memory leak in QueuedThreadPool
Conflicts:
	jetty-util/src/main/java/org/eclipse/jetty/util/thread/QueuedThreadPool.java
2015-09-21 11:39:29 +10:00
Joakim Erdfelt d39677a635 477757 - Null args in TypeUtil .call & .construct result in confusing exceptions
+ Not allowing null class references
+ Allowing null argument lists
2015-09-17 17:05:27 -07:00
Greg Wilkins 2d88fdf386 477278 Refactored DefaultServlet for cached Gzip & Etags
Refactored the DefaultServlet to better handle static gzipped files with etags in the cache.
Required a simplification of always having a HttpContent rather than the prior situation of
having either a Resource or a HttpContent.  So introduced a HttpContent.Factory, of which
the ResourceCache is the normal implementation, but there is also now a ResourceContentFactory
that creates content when there is no cache.

The Gzip resource is now associated with the normal resource, so less lookups are needed.
This also give scope for caching dynamic gzipping in the future.

The GzipHttpContent class has been introduced to send content with the headers of the
uncompress, but content of the compressed resource.
2015-09-17 18:19:58 +10:00
Jan Bartel 03a601f2b2 477385 Make jetty osgi manifests only resolve jetty packages against a single distro version 2015-09-16 19:13:47 +10:00
Simone Bordet b36b2a9458 477385 - Problem in MANIFEST.MF with version 9.2.10 / 9.2.13.
Reintroduced class SpinLock, for compatibility sake when working with
mixed versions of Jetty.
2015-09-15 10:08:05 +02:00
Jesse McConnell 6409366499 [maven-release-plugin] prepare for next development iteration 2015-08-27 10:11:29 -05:00
Jesse McConnell 3086adc965 [maven-release-plugin] prepare release jetty-9.3.3.v20150827 2015-08-27 10:11:21 -05:00
Jesse McConnell f5d1fb1058 Merge branch 'master' into release-9.3.3 2015-08-27 08:31:22 -05:00
Simone Bordet bee5437bad 475927 - SecureRequestCustomizer fails to match host.
Cosmetic changes during review.
2015-08-27 11:14:33 +02:00
Greg Wilkins 8070ce61f3 475927 - SecureRequestCustomizer fails to match host.
Moved host and wildcard to new X509 class
2015-08-27 12:25:52 +10:00
Simone Bordet 7057dae67b 475927 - SecureRequestCustomizer fails to match host.
Fixed by storing in the SSLSession the SNI names correspondent to the
alias that was selected when the TLS connection was initiated.
2015-08-26 20:36:43 +02:00
Jesse McConnell f8734f23ce [maven-release-plugin] prepare for next development iteration 2015-08-25 14:10:01 -05:00
Jesse McConnell e9edf4c24b [maven-release-plugin] prepare release jetty-9.3.3.v20150825 2015-08-25 14:09:54 -05:00
Simone Bordet 545fa0f72b 475605 - Add support for multi-homed destinations.
If DNS lookup returns multiple IP addresses, HttpClient tries to
connect to the first; failing that, to the second, and so on.
2015-08-24 12:31:08 +02:00
Greg Wilkins 22babda3f9 472411 PathResource.checkAliasPath() typo 2015-08-19 09:54:04 +10:00
Simone Bordet 805ec9554c 475195 - SNI matching fails when keystore does not contain wild certificates.
Fixed condition in SslContextFactory.getKeyManagers() that installs
the SniX509ExtendedKeyManager.

Miscellaneous code cleanups.
2015-08-17 20:55:20 +02:00
Simone Bordet 69b90ef59b 474888 - HttpClient JMX support. 2015-08-13 15:16:14 +02:00
Joakim Erdfelt 791896339d Fixing javadoc 2015-08-12 14:22:53 -07:00
Simone Bordet 542ef22ba8 Merged branch 'jetty-9.2.x' into 'master'. 2015-08-05 17:50:25 +02:00
Simone Bordet e0039a95e8 474321 - Allow synchronous address resolution.
Refactored SocketAddressResolver into interface and one sync and one
async implementations. Added getter/setter methods to HttpClient.
2015-08-05 16:51:16 +02:00
Greg Wilkins 1cf0e0e500 removed duplicate 2015-08-05 15:26:08 +10:00
Greg Wilkins 4939854893 473321 - Overriding SSL context KeyStoreType requires explicit override of TrustStoreType 2015-08-05 14:58:08 +10:00
Greg Wilkins a0a2c64f6a 474025 - SslContextFactory does not work with JCEKS Keystore 2015-08-05 12:03:38 +10:00
Joakim Erdfelt a3684f7fb8 [maven-release-plugin] prepare for next development iteration 2015-07-30 09:47:57 -07:00
Joakim Erdfelt 798fc8118b [maven-release-plugin] prepare release jetty-9.2.13.v20150730 2015-07-30 09:47:48 -07:00
Joakim Erdfelt 4b3879845d [maven-release-plugin] prepare for next development iteration 2015-07-30 07:02:10 -07:00
Joakim Erdfelt 6b7e9ac4b0 [maven-release-plugin] prepare release jetty-9.3.2.v20150730 2015-07-30 07:02:02 -07:00
Joakim Erdfelt 3f85fbbbd2 Unit testing upgrades
+ Using jetty-test-helper 3.0
+ Adding jetty-perf-helper (replacement for BenchmarkHelper)
+ Adding JmxServiceConnection to jetty-deploy (formerly part of
  jetty-test-helper)
2015-07-23 12:44:43 -07:00
Joakim Erdfelt b954a2dad5 Unit testing upgrades
+ Using jetty-test-helper 3.0
+ Adding jetty-perf-helper (replacement for BenchmarkHelper)
+ Adding JmxServiceConnection to jetty-deploy (formerly part of
  jetty-test-helper)
2015-07-23 12:16:50 -07:00
Joakim Erdfelt 0b7246a0f0 Fixing javadoc 2015-07-23 09:21:15 -07:00
Greg Wilkins 32e63eb0fd Merge remote-tracking branch 'origin/jetty-9.2.x' 2015-07-23 22:51:57 +10:00
Greg Wilkins c9c2ebc532 473266 - Better handling of MultiException
Add extra exceptions as suppressed exceptions
2015-07-23 22:50:20 +10:00
Greg Wilkins df6b935b94 470351 Fixed SNI matching of wildcard certificates 2015-07-23 19:49:06 +10:00
Greg Wilkins 6123605694 fixed merge 2015-07-23 12:00:11 +10:00
Greg Wilkins e1faa5c1e9 Merge remote-tracking branch 'origin/jetty-9.2.x'
Conflicts:
	jetty-util/src/main/java/org/eclipse/jetty/util/IO.java
	jetty-util/src/test/java/org/eclipse/jetty/util/resource/ResourceTest.java
2015-07-23 11:34:59 +10:00
Greg Wilkins ac8316756c 473322 - GatherWrite limit handling 2015-07-23 11:32:28 +10:00
Greg Wilkins 7686a19db9 473321 - Overriding SSL context KeyStoreType requires explicit override of TrustStoreType 2015-07-23 11:21:22 +10:00
Greg Wilkins 085ec933c5 473294 - Fixed include cipher suites support for wildcards 2015-07-23 09:36:19 +10:00
Greg Wilkins 3244088565 473266 - init MultiException cause 2015-07-23 09:04:10 +10:00
Greg Wilkins 30a99ddcf4 473266 - init MultiException cause 2015-07-23 09:02:52 +10:00
Joakim Erdfelt fa92938243 Fixing javadoc errors 2015-07-22 10:22:39 -07:00
Greg Wilkins 607239028c 470727 - Thread Starvation of selector wakeups.
Changed the CallBack.NonBlocking to a default Callback.isNonBlocking, so that wrapping callbacks can determine if they are NonBlocking or not.
2015-07-22 17:31:54 +10:00
Greg Wilkins 4bd82d74df 473006 - Encode addPath in URLResource
Conflicts:
	jetty-util/src/test/java/org/eclipse/jetty/util/resource/ResourceTest.java
2015-07-22 13:05:49 +10:00
Greg Wilkins 232b4a4680 473006 - Encode addPath in URLResource 2015-07-22 13:01:21 +10:00
Greg Wilkins d8c94ea27b Revert "473243 Delay resource close for async default content"
This reverts commit e4bf5d888c.
Wrong commit message
2015-07-22 13:00:05 +10:00
Greg Wilkins e4bf5d888c 473243 Delay resource close for async default content 2015-07-22 12:34:56 +10:00
Jesse McConnell 4b8a6e584f Merge branch 'release-9.3.1' 2015-07-17 12:10:49 -05:00
Greg Wilkins edc8bae556 472781 - GzipHandler isMimeTypeGzipable() bad logic
Added utility classes:

  IncludeExclude  - handles standard include exclude set
  RegexSet        - A set of regular expressions that have a combined compiled pattern
  PathMap.PathSet - A set of standard path mappings
2015-07-17 16:28:48 +10:00
Greg Wilkins 9ee4b64e89 472781, 472782 Improve GzipHandler Include/Exclude handling
Fixed javadoc
2015-07-17 11:54:18 +10:00
Greg Wilkins a4a12e0e19 Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project 2015-07-17 11:49:37 +10:00
Greg Wilkins de39bf5227 472781, 472782 Improve GzipHandler Include/Exclude handling
Made a common utility class for include/exclude handling
Use path exclusion rather than mime exclusion for svg
2015-07-17 08:11:11 +10:00
John Myers 01497cc530 Bug 472601: fix typo
Signed-off-by: John Myers <jgmyers@proofpoint.com>
2015-07-15 20:55:20 -07:00
Greg Wilkins 15c83cf7ce Bug: 472601 org.eclipse.jetty.util.log.Log.setLog(Logger) fixed 2015-07-16 09:28:42 +10:00
Greg Wilkins c5b36c6353 Bug 472601: org.eclipse.jetty.util.log.Log.setLog(Logger) fixed 2015-07-16 09:10:08 +10:00
Greg Wilkins deba2f0d6a 472621 - Unjustified timeout when serving static content
Created HttpConfiguration.setBlockingTimeout as a new timeout to apply to the total read/write operation.
Default is -1, which is no overall timeout and only the idle timeout will apply.
2015-07-15 17:09:18 +10:00
Jesse McConnell 9b790c38ce [maven-release-plugin] prepare for next development iteration 2015-07-14 11:42:34 -05:00
Jesse McConnell b35d32f2b8 [maven-release-plugin] prepare release jetty-9.3.1.v20150714 2015-07-14 11:42:28 -05:00
Greg Wilkins c2615d5fbd 472411 - PathResource.checkAliasPath typo 2015-07-12 21:33:15 +10:00
Greg Wilkins 04f4448281 472310 Improved logging when no supported included ciphers 2015-07-10 09:46:32 +10:00
Jesse McConnell 7204707902 [maven-release-plugin] prepare for next development iteration 2015-07-09 12:14:38 -05:00
Jesse McConnell 3b1533673e [maven-release-plugin] prepare release jetty-9.2.12.v20150709 2015-07-09 12:14:30 -05:00
Greg Wilkins 7340a4d9b2 464294 AsyncNCSARequestLog blocks JVM exit after failure
Made async writer thread a daemon
AbstractContainerLifeCycle stops failed beans
2015-07-08 17:43:55 +10:00
Greg Wilkins 7fbf512b17 471985 NPE in HttpFields.putField
The problem had several aspects:
 * HttpField.add should not let a null entry be added to the fields
 * The putHeaders methods should have checked for a null field before trying to add it
 * But the fundamental problem was the JarFileResource.close was leaving exist==true, so a new entry was never created.
2015-07-08 16:07:37 +10:00
Greg Wilkins 83fcdda906 470727 - Thread Starvation with EWYK
Added constructor to allow low resources strategy to be pluggable within EWYK
2015-07-03 22:54:59 +10:00
Greg Wilkins 8d869bf88b 470727 - Thread Starvation with EWYK
Implemented NonBlockingCallbacks and fallback to PEC scheduling
2015-07-01 17:21:53 +10:00
Greg Wilkins 07c81d6ec7 Bug: 470790 Fixed alias checking of symlinked directories 2015-06-24 12:28:50 +10:00
Greg Wilkins 814000531f Bug: 447781 Allow additional methods to be x-www-form-encoded
Added configuration to the HttpConfiguration class to allow additional methods to be set as
acceptable for x-www-form-encoding.
2015-06-24 11:45:44 +10:00
Greg Wilkins 3e401a62e9 StringUtil.csvSplit(String) 2015-06-19 16:48:53 +10:00
Greg Wilkins 1a572c3236 improved Dump 2015-06-18 17:24:06 +10:00
Jesse McConnell 60e45a940e [maven-release-plugin] prepare for next development iteration 2015-06-15 15:34:11 -05:00
Jesse McConnell d3dec8d513 [maven-release-plugin] prepare release jetty-9.2.12.M0 2015-06-15 15:34:03 -05:00
Joakim Erdfelt cf6c4a914e Updating version to 9.3.1-SNAPSHOT 2015-06-15 10:25:49 -07:00
Joakim Erdfelt 1a9da9f9e4 Updating versions to 9.3.0.v20150612 2015-06-12 09:34:24 -07:00
Joakim Erdfelt c6ac82f50b Merge branch 'master' into release-9.3 2015-06-12 09:30:46 -07:00
Joakim Erdfelt 7c737a587b Removing [version] sections in modules 2015-06-12 09:14:34 -07:00
Joakim Erdfelt 496b4dfc83 [maven-release-plugin] prepare for next development iteration 2015-06-11 15:08:36 -07:00
Joakim Erdfelt f53c5d8fac [maven-release-plugin] prepare release jetty-9.3.0.v20150611 2015-06-11 15:08:29 -07:00
Joakim Erdfelt b670b9e47d Merge branch 'master' into bugs/469860
Conflicts:
	jetty-start/src/main/java/org/eclipse/jetty/start/StartArgs.java
	jetty-start/src/test/resources/assert-home-with-http2.txt
2015-06-11 06:57:16 -07:00
Simone Bordet 2c26e82fea 469936 - Remove usages of SpinLock.
Causes high CPU usage when contended, and the JVM can do better with
its own spin lock and biased locking.
2015-06-11 15:36:20 +02:00
Greg Wilkins 9e2c578a85 469863 fixed setNeedClientAuth/setWantClientAuth 2015-06-11 10:58:24 +10:00
Joakim Erdfelt 916efd6aa7 469860 - Add module metadata versioning to support backwards compat
+ Adding [version] section to all existing jetty 9.3 distro modules
+ Updating testcases in jetty-start with new [version] sections too
+ Adding extra testcases for versioned modules
2015-06-10 10:59:18 -07:00
Jan Bartel 2ff20414fa 469241 Use null WatchService as loop terminator for PathWatcher. 2015-06-10 14:52:12 +10:00
Jan Bartel 74d246c1a9 469241 Ensure multiple file watches don't overwrite each other 2015-06-10 12:45:25 +10:00
Joakim Erdfelt f55d5633c7 Fixing broken javadoc preventing build 2015-06-09 16:46:46 -07:00
Greg Wilkins f38be3900e allow Locker configuration 2015-06-10 08:26:50 +10:00
Simone Bordet b18adb525f 469633 - Make SpinLock behavior pluggable.
Renamed SpinLock to Locker, uses ReentrantLock by default, but can be
turned into a spin lock by setting the system property
org.eclipse.jetty.util.thread.Locker.spin=true.
2015-06-08 17:15:54 +02:00
Jan Bartel a10142fdf5 Ignore PathWatcherTest due to operating system differences 2015-06-04 21:46:16 +10:00
Jan Bartel 30e14fd256 469241 Make PathWatcher stoppable and restartable 2015-06-04 17:10:48 +10:00
Jan Bartel e0161ab234 469241 Add ability to recurse watch to any tree depth 2015-06-04 09:40:35 +10:00
Jan Bartel 5fda111bcc 469241 Remove commented out code 2015-06-04 09:00:00 +10:00
Jan Bartel 7c375c2bce 469241 Support more of existing Scanner behaviour for PathWatcher 2015-06-03 19:00:24 +10:00
Jesse McConnell bfe6c2638e [maven-release-plugin] prepare for next development iteration 2015-05-29 09:06:42 -05:00
Jesse McConnell 71e0f4d8ce [maven-release-plugin] prepare release jetty-9.2.11.v20150529 2015-05-29 09:06:36 -05:00
Greg Wilkins 69bf5ab46c Merge remote-tracking branch 'origin/jetty-9.2.x'
Conflicts:
	jetty-http-spi/src/main/java/org/eclipse/jetty/http/spi/HttpSpiContextHandler.java
	jetty-server/src/main/java/org/eclipse/jetty/server/handler/ErrorHandler.java
	jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/WebSocketServerFactory.java
2015-05-29 21:05:26 +10:00
Greg Wilkins 4472b614b9 468747 - XSS vulnerability in HttpSpiContextHandler 2015-05-29 20:12:57 +10:00
Jesse McConnell a7087cbfbf [maven-release-plugin] prepare for next development iteration 2015-05-28 10:06:51 -05:00
Jesse McConnell 913c63e597 [maven-release-plugin] prepare release jetty-9.2.11.v20150528 2015-05-28 10:03:44 -05:00
Joakim Erdfelt 1925867757 Merge branch 'jetty-9.2.x' 2015-05-22 15:57:02 -07:00
Greg Wilkins c9be4d10fc 468008 Scanner ignores directory length 2015-05-23 08:41:56 +10:00
Greg Wilkins b2e8d2cd04 minor optimisations 2015-05-22 22:53:01 +10:00
Greg Wilkins 61e2177d9e 467730 - HTTP2 requires enabled ciphers to be sorted by blacklist
Fixed removal of COW lists
2015-05-21 02:15:34 +10:00
Greg Wilkins aa8ad7d4f4 Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project
Conflicts:
	jetty-util/src/main/java/org/eclipse/jetty/util/ssl/SslContextFactory.java
2015-05-21 01:54:07 +10:00
Greg Wilkins bd27e7d2d4 467730 - HTTP2 requires enabled ciphers to be sorted by blacklist 2015-05-21 01:41:12 +10:00
Simone Bordet 1a666e1bd2 Code cleanups. 2015-05-20 16:55:22 +02:00
Greg Wilkins 3f0fd550dc 467702 - SslContextFactory not backward compatible 2015-05-20 22:20:33 +10:00
Joakim Erdfelt eb638777d0 Adding IO.close(Closeable) and using it. 2015-05-14 07:45:25 -07:00
Greg Wilkins f3601267c4 467281 Remove Java 1.7 support from Jetty 9.3 2015-05-14 11:13:04 +10:00
Greg Wilkins c5e4abd792 467281 Remove Java 1.7 support from Jetty 9.3 2015-05-14 09:31:50 +10:00
Greg Wilkins 054d6b9176 Merge remote-tracking branch 'origin/jetty-9.2.x'
Conflicts:
	jetty-util/src/main/java/org/eclipse/jetty/util/ssl/SslContextFactory.java
2015-05-14 08:55:15 +10:00
Greg Wilkins e5fac304b4 467276 NPE protection in SslContextFactory
Also-by: P.Ottlinger<phil@edojo.org>
2015-05-14 08:32:12 +10:00
Greg Wilkins 3e0b95be4f 430951 Support SNI with ExtendedSslContextFactory
made ExtendedSslContextFactory work with non SNI keystore
2015-05-08 12:06:20 +10:00
Greg Wilkins 6428718962 457788 Powered By in o.e.j.util.Jetty conditional on sendServerVersion
moved conditional to HttpConfiguration
2015-05-08 09:44:19 +10:00
Greg Wilkins 5d041ad54f 466645 Allow XmlConfiguration Properties to use Elements or Attributes 2015-05-07 16:24:11 +10:00
Joakim Erdfelt 96d1e1df6e Fixing javadoc 2015-05-01 15:30:26 -07:00
joakim b87db668c7 Fixing PathWatcher root path handling on Windows 2015-05-01 14:49:45 -07:00
Jan Bartel 9c410f8ad9 466005 Use Files.move(src,trgt) instead of File.rename for Part.write(filename) 2015-05-01 17:43:45 +10:00
Greg Wilkins 4560c5d9e6 Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project 2015-05-01 16:47:10 +10:00
Greg Wilkins 7afede170e less info logging 2015-05-01 16:46:52 +10:00
Jan Bartel aaf7a56a27 466005 Throw exception if rename during Part.write(filename) fails 2015-05-01 16:39:22 +10:00
Joakim Erdfelt 0a16705947 Ignoring testcase that behaves differently enough on OSX and Windows that its hard to have a standard set of tests 2015-04-30 15:54:35 -07:00
Joakim Erdfelt a6b3302876 Fixing PathWatcher and Test
Using a trigger file (and event type) in test cases to know
when the watching & capture is truely finished (instead of
using sleep waits)
2015-04-30 11:01:22 -07:00