e0c83757aa
Fixes #889 - ConstantThrowable.name can be removed.
2016-08-31 12:25:19 +02:00
f856107301
Merge remote-tracking branch 'origin/jetty-9.2.x' into jetty-9.3.x
2016-08-31 19:05:57 +10:00
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
34d465555b
Merge remote-tracking branch 'origin/jetty-9.2.x' into jetty-9.3.x
2016-08-31 16:23:06 +10:00
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
b316148625
Fixed test failure.
2016-08-19 01:44:14 +02:00
24b4aeb147
Fixes #854 - other testcase triggers ISE on .destroy() -> .start() as well
2016-08-18 14:30:11 -07:00
10f994a0a2
Fixes #854 - If container.destroy() is called, calling container.start() again should throw an IllegalStateException.
2016-08-18 15:47:06 +02:00
7a7d5e2f1e
Code cleanup.
2016-08-18 15:47:06 +02:00
00a065b064
Fixes #855 - JMXify MBeanContainer.
2016-08-17 21:28:19 +02:00
5cb50e5f5d
ignore PathResource test
2016-08-04 14:02:16 +10:00
a1885afff8
fix #804 by removing old javadoc reference to org.eclipse.jetty.util.URI.charset
2016-08-03 09:17:15 +10:00
2830e51e04
Merge branch 'jetty-9.3.x' into release-9.3.11
2016-07-28 12:20:36 -07:00
35c21d7ced
Utility improvements
...
Add Arrays
XML config get class
2016-07-28 16:50:12 +10:00
6e1b1cdb36
Updating to version 9.3.12-SNAPSHOT
2016-07-21 19:07:19 -07:00
9fd6d4354e
Updating to version 9.3.11.v20160721
2016-07-21 18:37:09 -07:00
0b18340179
Updating to version 9.2.19-SNAPSHOT
2016-07-21 13:10:23 -07:00
d3ff3423f0
Updating to version 9.2.18.v20160721
2016-07-21 12:35:26 -07:00
21a618e6a8
SLOTH protection #631
...
Exclude all MD5 and SHA1 ciperhs, not just RSA based ones.
2016-07-21 12:39:07 +10:00
f6071ca7fc
Fix #708 SslContextFactory: newSslServerSocket/newSslSocket are not customized
2016-07-14 18:26:51 +10:00
35a64828fb
Fix #708 SslContextFactory: newSslServerSocket/newSslSocket are not customized
2016-07-14 15:17:50 +10:00
112244d6ef
Fix #708 SslContextFactory: newSslServerSocket/newSslSocket are not customized
2016-07-14 13:44:49 +10:00
45bbde408f
Fix #708 SslContextFactory: newSslServerSocket/newSslSocket/doStart are not customized
2016-07-14 12:17:52 +10:00
37cda79f7b
Issue #720
2016-07-13 15:28:33 +10:00
322fe73869
Suppress stacks during sweeper test
2016-07-07 08:32:36 +10:00
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
5b50e41e7e
Issue #687
...
Alias should be absolute not relative
2016-07-06 16:46:22 +10:00
d13d3cc3f5
Fixes #675 - Slf4jLog.ignore() now logs at DEBUG level
2016-06-29 15:11:46 -07:00
2dfb5f463a
Fixes #677 - Logging of ignore() events now show as "Ignored Exception"
2016-06-29 15:11:37 -07:00
a5dc01bbb1
Fixes #676 - JavaUtilLog.ignore() logs at FINEST level now
2016-06-29 15:11:28 -07:00
b20e2ddf18
Fixes #672 - Allow logging configuration announcement to be programmatically disabled
2016-06-28 13:01:16 -07:00
0e0fc77771
skip symlink test on windows
2016-06-24 14:33:18 +10: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
2b947e8f72
Merge branch 'jetty-9.3.x' into release-9.3.10
2016-06-22 13:22:27 -05: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
030ec61837
[maven-release-plugin] prepare for next development iteration
2016-06-22 09:14:25 -05:00
9a4cb41122
[maven-release-plugin] prepare release jetty-9.3.11.M0
2016-06-22 09:14:21 -05:00
e7034117ea
[maven-release-plugin] prepare for next development iteration
2016-06-21 08:50:13 -05:00
16c435c69d
[maven-release-plugin] prepare release jetty-9.3.10.v20160621
2016-06-21 08:50:09 -05:00
a8e315a3f5
Fix #663 NPE during context stop
...
Avoid adding null beans
protect against null beans.
2016-06-15 18:04:33 +10:00
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
dc4574f380
[maven-release-plugin] prepare for next development iteration
2016-05-17 17:30:17 -05:00
0bbebec1e0
[maven-release-plugin] prepare release jetty-9.3.9.v20160517
2016-05-17 17:30:13 -05:00
d5c6793e6a
[maven-release-plugin] prepare for next development iteration
2016-05-17 15:33:46 -05:00
0bab7e6616
[maven-release-plugin] prepare release jetty-9.2.17.v20160517
2016-05-17 15:33:42 -05:00
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
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
51dd5c902c
Fixed Javadoc.
2016-05-12 19:07:06 +02:00
242b6b5f66
Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'.
2016-05-12 18:59:40 +02:00
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
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
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
f47b6811b4
Improved javadocs and JMX descriptions.
2016-05-11 13:05:16 +02:00
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
fe8102a430
Cosmetics.
2016-05-11 13:05:16 +02:00
30fd8323f4
Added jobs to detailed dump.
2016-05-11 13:05:16 +02:00
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
903a6cb49c
Expanded static imports.
2016-05-06 17:10:46 +02:00
c77df55bb6
Issue #547 EWYK leaves low resource mode
...
Merged code cleanups
2016-05-05 11:35:32 +10:00
6591137ba0
Issue #547 EWYK leaves low resource mode
...
Directly implement PEC in EPC low resource mode
2016-05-05 11:22:37 +10:00
e6e63d5549
Code cleanups.
2016-05-04 11:46:59 +02:00
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
90110659e2
fixed javadoc
2016-05-04 10:49:22 +10:00
2dbecb0843
Fixing broken javadoc
2016-05-03 11:23:10 -07:00
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
c74dd571fa
Issue #519 Disable SSL session caching
...
Set -1 defaults for session caching
2016-04-29 08:10:18 +10:00
88c1339784
Issue #519 Disable SSL session caching
...
Improve the configuration of the SSL session cache
2016-04-29 08:02:41 +10:00
5f7a32e30e
warning if not stable release
2016-04-28 08:15:06 +10:00
65d949a386
Issue #518 jarfile fix for springboot
2016-04-25 18:15:38 +10:00
bf5b6f8939
Issue #533 Do not hide file resource exception
...
ignore exception
2016-04-23 09:36:19 +10:00
ec8e1055e3
Issue #533 Do not hide file resource exception
...
Add exception as suppressed
2016-04-23 09:36:19 +10:00
132cd097ce
Issue #519 Disable SSL session caching
...
Improved javadoc
wired up session cache size correctly
2016-04-23 09:36:19 +10:00
939505c342
Updating to version 9.2.17-SNAPSHOT
2016-04-14 14:03:21 -07:00
778fac638d
Updating to version 9.2.16.v20160414
2016-04-14 13:21:34 -07:00
47bbd9364d
Revert "Updating to version 9.2.16.v20160414"
...
This reverts commit 29ae63855b
2016-04-14 13:19:59 -07:00
29ae63855b
Updating to version 9.2.16.v20160414
2016-04-14 13:17:21 -07:00
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
6fb338e50d
Updating to version 9.3.9-SNAPSHOT
2016-04-11 16:20:50 -07:00
bb4f3c4882
Updating to version 9.3.9.M1
2016-04-11 15:35:22 -07:00
557ca69f59
Merge branch 'jetty-9.3.x' into issue-472
2016-04-05 10:00:09 +10:00
424f0c1e04
Merge remote-tracking branch 'origin/jetty-9.2.x' into jetty-9.3.x
2016-04-05 09:57:28 +10:00
ce04cadb79
Fixes #233 - Add message to idle TimeoutException.
2016-04-01 14:44:26 +02:00
91bef55924
Issue #472 Use LongAdder for statistics
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2016-04-01 17:22:45 +11:00
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
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
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
13fde643ed
Merge branch 'release-9.3.8' into jetty-9.3.x
2016-03-16 10:03:29 -07:00
1c5a1fc6a2
Issue #431
...
Suppress stack traces from unit tests
2016-03-16 18:19:40 +11:00
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
c68d3b1d8d
Updating to version 9.3.9-SNAPSHOT
2016-03-14 09:07:52 -07:00
1f3b3f31f4
Updating to version 9.3.8.v20160314
2016-03-14 08:30:20 -07:00
fa8b1c9220
Revert "Issue #414 ContainerLifeCycle should not stop failed component on remove"
...
This reverts commit 34c8ded756
2016-03-10 12:42:50 +11:00
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
d48cfcdb62
Issue #397 Multipart EOF handling
...
read to EOF when reading multipart.
2016-03-05 17:50:56 +01:00
cec3694355
Consistently using BufferUtil, especially clearToFill() and
...
flipToFlush().
2016-02-29 16:31:38 +01:00
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
f98dde5e5b
Updating to version 9.2.16-SNAPSHOT
2016-02-10 15:36:41 -07:00
9b6890d3c1
Updating to version 9.2.15.v20160210
2016-02-10 14:49:12 -07:00
6306f06e2f
Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'.
2016-02-09 18:12:04 +01:00
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
1b7045babd
486394 Make old behaviour of MultiPartInputStreamParser configurable
2016-02-03 14:15:15 +01:00
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
7ec6e2e899
486930 - Selector does not correctly handle rejected execution exception
...
Improved comments and unit test
2016-02-01 17:18:42 +01:00
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
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
e0ce545ad7
Updating to version 9.3.8-SNAPSHOT
2016-01-15 17:15:14 -07:00
c0b191119b
Updating to version 9.3.7.v20160115
2016-01-15 16:40:15 -07:00
0a1b0b2bc6
485714 - Update SSL configuration to mitigate SLOTH vulnerability
2016-01-13 15:00:16 -07:00
41329dccc4
Revert "485714 - Update SSL configuration to mitigate SLOTH vulnerability"
...
This reverts commit 46ed803023
2016-01-13 15:38:27 +11:00
46ed803023
485714 - Update SSL configuration to mitigate SLOTH vulnerability
2016-01-13 15:18:13 +11:00
e2a0794d91
485712 - Quickstart web.xml is absolute
2016-01-13 12:47:25 +11:00
75b84374e0
485031 two PathWatcher threads running after automatically restarting webapp
2016-01-09 10:27:33 +11:00
f519aa28fb
Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'.
2016-01-05 11:40:57 +01:00
50100ca86d
Fixed copyright blurbs.
2016-01-05 11:30:38 +01:00
cd39fd84fe
Happy New Year 2016
2016-01-04 14:31:22 -07:00
b5db18378d
Happy New Year 2016
2016-01-04 14:21:26 -07:00
71150a939c
javadoc fixes
2015-12-18 14:21:10 -07:00
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
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
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
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
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
5e3fbbccd0
Backporting GzipHandler's IncludeExclude configs
2015-12-08 15:51:25 -07:00
7cdc58e6b9
Merge branch 'jetty-9.2.x' into feature/gziphandler-config
2015-12-08 14:56:26 -07:00
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
8d6206b8c7
Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'.
2015-12-08 22:20:05 +01:00
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
6d3d912b0b
483413 - Warn on @Deprecated servlet/filter use
2015-12-01 16:18:00 -07:00
481102db30
483413 - Warn on @Deprecated servlet/filter use
2015-12-01 15:53:46 -07:00
edf686fe0a
Updating to version 9.3.7-SNAPSHOT
2015-11-06 12:13:00 -07:00
d737e1c638
Updating to version 9.3.6.v20151106
2015-11-06 11:09:32 -07:00
ec8f8d3e4f
Updating to version 9.2.15-SNAPSHOT
2015-11-06 11:06:48 -07:00
ecba378f5c
Updating to version 9.2.14.v20151106
2015-11-06 10:32:14 -07:00
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
570c751ec8
479179 Fixed NPE from debug
2015-10-17 09:37:43 +11:00
dde32787c4
Updating to version 9.3.6-SNAPSHOT
2015-10-12 15:47:37 -07:00
29722bd880
Updating to version 9.3.5.v20151012
2015-10-12 15:10:39 -07:00
2cce7510e1
Updating to 9.3.5-SNAPSHOT
2015-10-08 17:49:09 -07:00
37296bec3c
Updating to version 9.3.4.v20151007
2015-10-07 14:58:38 -07:00
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
697b0cccf2
477895 Prevent leak of handles to deleted files after redeploy
2015-09-30 13:39:31 +10:00
3dcdb9f802
Merged branch '477878' into 'master'.
2015-09-25 19:34:45 +02:00
6544af8ce7
Improved IllegalStateException message.
2015-09-25 19:24:32 +02:00
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
dcb4c0d0a8
478372 - JavaUtilLog setSourceClass and setSourceMethod
2015-09-25 12:45:46 +10:00
46a611caac
476720 getTrustStoreResource fixed
2015-09-24 17:26:01 +10:00
131a471c8f
478008 Do not reset current value of CounterStatistics
2015-09-24 17:19:48 +10:00
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
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
Simone Bordet
Greg Wilkins
Jan Bartel
Grzegorz Grzybek
Joakim Erdfelt
Joakim Erdfelt
Jesse McConnell