1788 Commits

Author SHA1 Message Date
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 e4bf5d888c941d79ed20253789de71f34a956fbb.
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