1902 Commits

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