Commit Graph

1918 Commits

Author SHA1 Message Date
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 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
Joakim Erdfelt 37738d15e5 Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project
Conflicts:
	jetty-util/src/test/java/org/eclipse/jetty/util/PathWatcherTest.java
2015-04-29 18:12:04 -07:00
joakim cbc263da92 465854 - Provide java.nio.file.WatchService alternative for Scanner
+ Fix "glob:" PathMatcher behavior to work consistently
  even on Windows.
2015-04-29 18:08:30 -07:00
Jan Bartel e30c05cc2b Merge remote-tracking branch 'origin/jetty-9.2.x'
Conflicts:
	tests/test-integration/src/test/java/org/eclipse/jetty/test/support/TestableJettyServer.java
	tests/test-integration/src/test/resources/BIOHttp.xml
	tests/test-integration/src/test/resources/BIOHttps.xml
	tests/test-integration/src/test/resources/NIOHttp.xml
	tests/test-integration/src/test/resources/NIOHttps.xml
2015-04-30 10:44:44 +10:00
Joakim Erdfelt 4b28a5f7fb Disabling PathWatcherTest temporarily 2015-04-29 14:10:57 -07:00
Joakim Erdfelt fee2255a5f 465854 - Provide java.nio.file.WatchService alternative for jetty-util Scanner
+ Adding Proof of Concept for replacment, along with demo main, and test
  cases to show how it works.
2015-04-29 12:33:10 -07:00
Greg Wilkins 23216076a9 renamed EatWhatYouKill to ExecuteProduceConsume 2015-04-29 08:44:21 +10:00
Joakim Erdfelt c17f1982be Making updates to FileResource and PathResource for Windows 8.1 2015-04-28 08:28:09 -07:00
Simone Bordet 71efdf0f89 465606 - IteratingCallback.close() does not fail pending callback.
Fixed by failing the IteratingCallback when in state PROCESSING.
2015-04-27 17:23:04 +02:00
Joakim Erdfelt cf9bd7e663 Removing OSX specific assume 2015-04-24 15:11:33 -07:00
Joakim Erdfelt c4eb2da79c Fixing FileSystem reference techniques for OSX testing on Java 8 2015-04-24 14:44:31 -07:00
Jan Bartel 6ebfd88323 465360 URLResource.addPath should use _useCaches setting to create new Resource 2015-04-24 14:51:29 +10:00
Jan Bartel ff8eeae982 465359 Resource.newResource(String res, boolean useCache) does not use useCache argument 2015-04-24 14:29:56 +10:00
Greg Wilkins e633189b48 457788 Powered By in o.e.j.util.Jetty 2015-04-23 11:07:30 +10:00
Greg Wilkins 6ec2a50cae 430951 Support SNI with ExtendedSslContextFactory
relax cert constraints
2015-04-23 07:24:23 +10:00
Greg Wilkins baede130c0 430951 Support SNI with ExtendedSslContextFactory
exclude certificates with usages
2015-04-22 17:16:41 +10:00
Greg Wilkins c3577bbbb0 430951 Support SNI with ExtendedSslContextFactory
refactored common code in SniX509ExtendedKeyManager
added sniHostCheck code to ensure request host is the same as SNI host
2015-04-22 15:05:56 +10:00
Joakim Erdfelt 293da2da2a 464727 - Update Javadoc for Java 8 DocLint
+ Removing @throws ServletException (no longer throws)
2015-04-21 13:59:06 -07:00
Greg Wilkins 21e31d784f 430951 Support SNI with ExtendedSslContextFactory
Use RFC2253 name
2015-04-21 18:50:02 +10:00
Greg Wilkins 2d283edf26 430951 Support SNI with ExtendedSslContextFactory
map lookup of wildcards
use LdapName to parse DN
2015-04-21 18:04:29 +10:00
Greg Wilkins a293967287 464528 NPE protection in getIncludedCipher suites 2015-04-21 17:49:20 +10:00
Greg Wilkins 1a2e625ae8 464724 MultiPartInputStreamParser.parse ServletException never thrown 2015-04-21 15:31:20 +10:00
Greg Wilkins cfb9b3f19b 464744 - PathMap.match() never throws IllegalArgumentException 2015-04-21 15:18:47 +10:00
Greg Wilkins 53fdbd2ec0 430951 Support SNI with ExtendedSslContextFactory
Added support for SAN names
optimised lookup
2015-04-21 14:14:45 +10:00
Joakim Erdfelt 78bf5978de 464869 - org.eclipse.jetty.util.resource.PathResource do not work
+ Adding os neutral testcase for adding a root directory reference
  that way the test will execute on Linux, OSX, and Windows
2015-04-20 11:24:52 -07:00
Greg Wilkins 6b359b942a 464869 PathResource.addPath allows absolute resolution.
More efficient addPath
2015-04-20 11:50:19 +10:00
Greg Wilkins aa3c881eec 464869 PathResource.addPath allows absolute resolution.
Added test harness to demonstrate
Applied suggested fix - which fixes the test.

Need to analyse why this every worked, why it was not detected and what are the ramifications in 9.2.x and 9.3.x releases
2015-04-20 11:34:36 +10:00
Greg Wilkins 12a9c0578e 430951 Support SNI with ExtendedSslContextFactory
case insensitive CN
2015-04-20 10:14:40 +10:00
Greg Wilkins ae31162669 430951 Support SNI with ExtendedSslContextFactory
Improved debugging
Regex selection of cn
2015-04-20 10:02:37 +10:00
Joakim Erdfelt 45b82c32a1 464727 - Update Javadoc for Java 8 DocLint
+ Fixed jetty-util's javadoc
2015-04-15 14:38:35 -07:00
Simone Bordet fd158a231b 460671 - Rationalize property names.
Fixed typos.
2015-04-14 22:11:59 +02:00
Simone Bordet 599ab9bb1b 460671 - Rationalize property names.
Property format is now "jetty.<module|component>.<propertyName>".

Updated all references with new properties.
2015-04-13 16:21:48 +02:00
Joakim Erdfelt dc2221a152 Build under Java 1.8
+ Enforcer setup to JDK 1.8+
+ Java7 profiles removed (for now)
+ Main compile phase source/test is 1.7
+ Test compile phase source/test is 1.8
2015-04-10 13:21:12 -07:00
Joakim Erdfelt 645ee9223c Temp revert to make CI happy (but everything else sad) 2015-04-10 06:47:28 -07:00
Joakim Erdfelt d89aa3a866 Fixing compiler source for modules that now require Java 8 2015-04-09 13:32:30 -07:00
Joakim Erdfelt 60d790cbf8 Marking java8 specifics excluded when compiling with java7 2015-04-08 15:10:53 -07:00
Greg Wilkins 5ed2f84d06 430951 Support SNI with ExtendedSslContextFactory 2015-04-02 19:12:44 +11:00
Simone Bordet 0636013d65 Using test-and-test-and-set.
See http://en.wikipedia.org/wiki/Spinlock, the section about
optimizations.
See also http://en.wikipedia.org/wiki/Test_and_Test-and-set.
2015-03-30 18:47:07 +02:00
Greg Wilkins bf7df1fa55 463036 - system properties to set ssl password and keypasword
Changes so that system properties only provide default
2015-03-27 10:47:05 +11:00
Greg Wilkins fd12bb8c5c fixed java 1.7 import 2015-03-26 13:53:03 +11:00
Greg Wilkins 1cb0449be3 Organised imports 2015-03-26 12:32:15 +11:00
Greg Wilkins 7da5db8dc9 458478 - JarFileResource improve performance of exist method
Use JarFile.getJarEntry() rather than interation

Also-by: alienisty@gmail.com
Signed-off-by: gregw@intalio.com
2015-03-26 12:18:06 +11:00
Greg Wilkins eca04f401a TreeTrie getBest String implementation 2015-03-26 12:18:06 +11:00
Greg Wilkins 5d14d0ca7a removed extra HttpInput synchronization 2015-03-26 12:18:06 +11:00
Jesse McConnell da4f95f3d3 [maven-release-plugin] prepare for next development iteration 2015-03-25 09:08:27 -05:00
Jesse McConnell e92fd438fd [maven-release-plugin] prepare release jetty-9.2.11.M0 2015-03-25 09:08:21 -05:00
Simone Bordet 161317a5ef Merged branch 'jetty-9.2.x' into 'master'. 2015-03-23 22:32:40 +01:00
Simone Bordet 79e74c64e1 Introduced a generic Sweeper.
The Sweeper class periodically sweeps resources added to it.
Currently used to check whether the HttpClient code does not leak
connections.
2015-03-20 00:42:24 +01:00
John Myers a9be633816 [Bug 462098] Support setting ThreadGroup in ScheduledExecutorScheduler
Signed-off-by: John Gardiner Myers <jgmyers@proofpoint.com>
2015-03-18 18:14:53 -04:00
John Myers c8b84e0291 [Bug 462098] Support setting ThreadGroup in QueuedThreadPool
Signed-off-by: John Gardiner Myers <jgmyers@proofpoint.com>
2015-03-18 18:10:56 -04:00
Simone Bordet feed8ea158 Small refactoring of HTTP/2 upgrade code. 2015-03-12 19:08:26 +01:00
Joakim Erdfelt e92bcccc84 Using new Decorator 2015-03-12 10:09:53 -07:00
Joakim Erdfelt 87246263b8 453834 - CDI Support for WebSocket
+ Verifying ServletContextHandler behavior of Decorators
+ Marking old ServletContextHandler methods as deprecated
+ Updates to DecoratedObjectFactory
+ Removing customized weld scopes/context (for now)
+ Deferring JSR356 ServerContainer endpoint init
  till Container.doStart() to allow weld to init properly first
+ Removing JSR356 BasicServerEndpointConfigurator in favor
  of ContainerDefaultEndpointConfigurator
+ Only decorating server endpoints if they were created by
  ContainerDefaultEndpointConfigurator, all others are trusted
  to be complete and injected already.
2015-03-12 10:09:52 -07:00
Joakim Erdfelt e213c4488e 453834 - CDI Support for WebSocket
+ Updating javadoc
2015-03-12 10:09:30 -07:00
Joakim Erdfelt 8b6a2629f8 453834 - CDI Support for WebSocket 2015-03-12 10:09:30 -07:00
Joakim Erdfelt 5b5c2369d5 Stragglers to the new year. tsk. tsk. 2015-03-12 10:09:30 -07:00
Joakim Erdfelt 0c930c8640 Rename EnhancedInstantiator to DecoratedObjectFactory 2015-03-12 10:06:03 -07:00
Joakim Erdfelt d6911b431f 453834 - CDI Support for WebSocket
+ Attempting to get new socket @Inject working
2015-03-12 10:04:50 -07:00
Joakim Erdfelt 5c3e30d136 453834 - CDI Support for WebSocket
+ Changing util.Decorators to util.EnhancedInstantiator to reflect true
  usage
+ Adding EnhancedInstantiator to JSR-356
2015-03-12 10:04:50 -07:00
Joakim Erdfelt fb88bc4c19 Making ServletContextHandler use util.Decorators
+ Deprecating methods that are just awkward now.
   ServletContextHandler.getDecorators() - as it expects the
     ServletContextHandler.Decorator version
2015-03-12 10:04:13 -07:00
Joakim Erdfelt 2b7b5ef495 Rethinking Decorators 2015-03-12 10:04:13 -07:00
Greg Wilkins b7d719be5f 459845 - Support upgrade from http1 to http2
Parse setting frame.
2015-03-13 00:54:33 +11:00
Greg Wilkins 870e0ab0b3 Converted IteratingCallback to use SpinLock 2015-03-11 15:37:25 +11:00
Greg Wilkins c5541cb3bd 459081 - http2 push failures.
Reverted sense of runnable in ExecuteProduceRun so that test harness passes.
Added RunExecute Runnable for the new dispatch semantic
2015-03-11 11:02:11 +11:00
Simone Bordet 48887377c9 459081 - http2 push failures.
Introduced ExecutionStrategy.dispatch() to handle the case where
resources that are being pushed block.
2015-03-11 00:12:57 +01:00
Jesse McConnell e3fd0056cf [maven-release-plugin] prepare for next development iteration 2015-03-10 08:00:22 -05:00
Jesse McConnell 9d648f4000 [maven-release-plugin] prepare release jetty-9.2.10.v20150310 2015-03-10 08:00:14 -05:00
Simone Bordet b7715fb3eb Merged branch 'jetty-9.2.x' into 'master'. 2015-03-07 23:26:59 +01:00