Commit Graph

11106 Commits

Author SHA1 Message Date
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 cd420d7db5 465118 Fixed GzipHandler handling of multiple closes 2015-06-11 12:39:03 +10:00
Greg Wilkins 9e2c578a85 469863 fixed setNeedClientAuth/setWantClientAuth 2015-06-11 10:58:24 +10:00
Joakim Erdfelt 5d01c7f2f2 Using correct section 2015-06-10 16:20:07 -07:00
Greg Wilkins 165cbc2943 Revert "Revert "469341 jetty-startw template properties during --module enabling""
This reverts commit 73147d2c8e.
2015-06-11 07:35:15 +10:00
Joakim Erdfelt ac7e4e925c 469799 - Transitive module dependencies without ini templates are still added to ini
+ Fixing --add-to-start(d)=<>
2015-06-10 14:05:05 -07:00
Joakim Erdfelt d439113712 Making jetty.version discoverable via properties file on classpath too (for test cases) 2015-06-10 13:35:39 -07: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
Joakim Erdfelt 8bbbb2ff54 469860 - Add module metadata versioning to support backwards compat
+ Added [version] section support to start.jar
+ Updated start testing to use as-is distro configuration for test cases
2015-06-10 10:42:40 -07:00
Jan Bartel 2ff20414fa 469241 Use null WatchService as loop terminator for PathWatcher. 2015-06-10 14:52:12 +10:00
Greg Wilkins 8c89f141ab Revert "469341 - Not possible to use old/deprecated start properties"
This reverts commit fcd0a3b270.

Port 80 is the HTTP default
2015-06-10 13:42:43 +10:00
Greg Wilkins 5e8652536c 469341 Not possible to use old/deprecated start properties
Improved warnings so that if both and and new properties are set a warning is still generated that says the new property was used.

Bug: 469341
2015-06-10 13:06:03 +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
Joakim Erdfelt fcd0a3b270 469341 - Not possible to use old/deprecated start properties
+ Using xml for defaults, not the modules/ini section
2015-06-09 16:35:02 -07:00
Joakim Erdfelt 73147d2c8e Revert "469341 jetty-startw template properties during --module enabling"
This reverts commit 6c2780b9cf.
2015-06-09 16:14:32 -07:00
Greg Wilkins 5ae9614d11 [469688] Added configuration for keystore type and provider 2015-06-10 08:46:57 +10: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
Simone Bordet 87b1ae44f8 Merged branch 'jetty-9.2.x' into 'master'. 2015-06-05 12:34:47 +02:00
Simone Bordet 9306477f5b 469414 - Proxied redirects expose upstream server name.
Introduced "preserveHost" init-parameter similar to what Apache and
Nginx have.
2015-06-05 12:01:23 +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
Greg Wilkins 6c2780b9cf 469341 jetty-startw template properties during --module enabling 2015-06-04 13:43:14 +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
Jesse McConnell f42ea615b6 set for release 2015-05-29 08:38:59 -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
Greg Wilkins d4e8f0ff9a Merge remote-tracking branch 'origin/jetty-9.2.x'
Conflicts:
	VERSION.txt
	aggregates/jetty-all/pom.xml
	apache-jsp/pom.xml
	apache-jstl/pom.xml
	examples/async-rest/async-rest-jar/pom.xml
	examples/async-rest/async-rest-webapp/pom.xml
	examples/async-rest/pom.xml
	examples/embedded/pom.xml
	examples/pom.xml
	jetty-alpn/jetty-alpn-client/pom.xml
	jetty-alpn/jetty-alpn-server/pom.xml
	jetty-alpn/pom.xml
	jetty-annotations/pom.xml
	jetty-ant/pom.xml
	jetty-cdi/pom.xml
	jetty-client/pom.xml
	jetty-continuation/pom.xml
	jetty-deploy/pom.xml
	jetty-distribution/pom.xml
	jetty-fcgi/fcgi-client/pom.xml
	jetty-fcgi/fcgi-server/pom.xml
	jetty-fcgi/pom.xml
	jetty-http-spi/pom.xml
	jetty-http/pom.xml
	jetty-http2/http2-alpn-tests/pom.xml
	jetty-io/pom.xml
	jetty-io/src/main/java/org/eclipse/jetty/io/SelectorManager.java
	jetty-jaas/pom.xml
	jetty-jaspi/pom.xml
	jetty-jmx/pom.xml
	jetty-jndi/pom.xml
	jetty-jsp/pom.xml
	jetty-jspc-maven-plugin/pom.xml
	jetty-maven-plugin/pom.xml
	jetty-monitor/pom.xml
	jetty-nosql/pom.xml
	jetty-osgi/jetty-osgi-alpn/pom.xml
	jetty-osgi/jetty-osgi-boot-jsp/pom.xml
	jetty-osgi/jetty-osgi-boot-warurl/pom.xml
	jetty-osgi/jetty-osgi-boot/pom.xml
	jetty-osgi/jetty-osgi-httpservice/pom.xml
	jetty-osgi/pom.xml
	jetty-osgi/test-jetty-osgi-context/pom.xml
	jetty-osgi/test-jetty-osgi-webapp/pom.xml
	jetty-osgi/test-jetty-osgi/pom.xml
	jetty-plus/pom.xml
	jetty-proxy/pom.xml
	jetty-quickstart/pom.xml
	jetty-rewrite/pom.xml
	jetty-runner/pom.xml
	jetty-security/pom.xml
	jetty-server/pom.xml
	jetty-servlet/pom.xml
	jetty-servlets/pom.xml
	jetty-spdy/pom.xml
	jetty-spdy/spdy-client/pom.xml
	jetty-spdy/spdy-core/pom.xml
	jetty-spdy/spdy-example-webapp/pom.xml
	jetty-spdy/spdy-http-client-transport/pom.xml
	jetty-spdy/spdy-http-common/pom.xml
	jetty-spdy/spdy-http-server/pom.xml
	jetty-spdy/spdy-server/pom.xml
	jetty-spring/pom.xml
	jetty-start/pom.xml
	jetty-util-ajax/pom.xml
	jetty-util/pom.xml
	jetty-webapp/pom.xml
	jetty-websocket/javax-websocket-client-impl/pom.xml
	jetty-websocket/javax-websocket-server-impl/pom.xml
	jetty-websocket/pom.xml
	jetty-websocket/websocket-api/pom.xml
	jetty-websocket/websocket-client/pom.xml
	jetty-websocket/websocket-common/pom.xml
	jetty-websocket/websocket-server/pom.xml
	jetty-websocket/websocket-servlet/pom.xml
	jetty-xml/pom.xml
	pom.xml
	tests/pom.xml
	tests/test-continuation/pom.xml
	tests/test-integration/pom.xml
	tests/test-jmx/jmx-webapp-it/pom.xml
	tests/test-jmx/jmx-webapp/pom.xml
	tests/test-jmx/pom.xml
	tests/test-loginservice/pom.xml
	tests/test-quickstart/pom.xml
	tests/test-sessions/pom.xml
	tests/test-sessions/test-hash-sessions/pom.xml
	tests/test-sessions/test-jdbc-sessions/pom.xml
	tests/test-sessions/test-mongodb-sessions/pom.xml
	tests/test-sessions/test-sessions-common/pom.xml
	tests/test-webapps/pom.xml
	tests/test-webapps/test-jaas-webapp/pom.xml
	tests/test-webapps/test-jetty-webapp/pom.xml
	tests/test-webapps/test-jndi-webapp/pom.xml
	tests/test-webapps/test-mock-resources/pom.xml
	tests/test-webapps/test-proxy-webapp/pom.xml
	tests/test-webapps/test-servlet-spec/pom.xml
	tests/test-webapps/test-servlet-spec/test-container-initializer/pom.xml
	tests/test-webapps/test-servlet-spec/test-spec-webapp/pom.xml
	tests/test-webapps/test-servlet-spec/test-web-fragment/pom.xml
	tests/test-webapps/test-webapp-rfc2616/pom.xml
2015-05-29 15:39:50 +10:00
Greg Wilkins 0db541889b 468714 SelectorManager updateKey race without submit 2015-05-29 12:27:12 +10:00
Jesse McConnell 57d0594e73 set for development 2015-05-28 10:56:18 -05: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
Jesse McConnell cfbb26beda set for release 2015-05-28 09:09:07 -05:00
Simone Bordet 061a8e253e Merged remote branch 'jetty-9.2.x' into 'master'. 2015-05-28 15:39:42 +02:00
Simone Bordet 0ad471449b 468421 - HttpClient#send fails with IllegalArgumentException on non-lowercase schemes.
RFC 7230 specifies that both scheme and host must be case insensitive.
2015-05-28 15:38:28 +02:00
Simone Bordet 6cabf8452e 468347 - Fix modules/debuglog.mod. 2015-05-26 18:22:22 +02:00
Simone Bordet 3323a4e88d Updated property names: sslConfig -> sslContext. 2015-05-26 18:03:55 +02:00
Simone Bordet a6ff4da9b1 Made the cipher comparator a constant field. 2015-05-26 18:03:55 +02:00
Simone Bordet 1a6db17799 Added test for push with query parameters. 2015-05-26 18:03:55 +02:00
Simone Bordet 3288eb392f 468313 - PushCacheFilter wrongly associates primary resources to themselves.
Fixed by not associating secondary resources that are the same as the
primary resource.
2015-05-26 18:03:55 +02:00
Simone Bordet 72222ba8a3 Small optimization: call readyOps() outside spin lock. 2015-05-26 18:03:55 +02:00
Joakim Erdfelt c25772e147 Fixing javadoc errors preventing release 2015-05-22 16:36:31 -07: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