Commit Graph

1672 Commits

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