Commit Graph

5705 Commits

Author SHA1 Message Date
Greg Wilkins a1d0efc2bb 393832 start connectors last 2012-11-08 19:30:58 +11:00
Greg Wilkins f336511f87 Merge remote-tracking branch 'origin/jetty-8'
Conflicts:
	VERSION.txt
	jetty-http/src/main/java/org/eclipse/jetty/http/HttpParser.java
	jetty-server/src/main/java/org/eclipse/jetty/server/AbstractHttpConnection.java
2012-11-08 14:58:10 +11:00
Greg Wilkins 319ce3c508 393075 1xx, 204, 304 responses ignore headers that suggest content 2012-11-08 14:44:39 +11:00
Greg Wilkins b3274a6baa Merge remote-tracking branch 'origin/jetty-7' into jetty-8
Conflicts:
	VERSION.txt
2012-11-08 14:41:01 +11:00
Greg Wilkins eaf65a2902 393075 1xx 204 and 304 ignore all headers suggesting content 2012-11-08 14:37:07 +11:00
Greg Wilkins e615504889 392492 expect headers only examined for requests>=HTTP/1.1 2012-11-08 14:37:07 +11:00
Jan Bartel 8e47864bcf 392850 ContextLoaderListener not called in 9.0.0.M1 and M2 2012-11-08 14:02:35 +11:00
Jan Bartel 13e0b40c8b Update context path from /test-annotations to /test-spec for test-spec-webapp 2012-11-08 13:54:04 +11:00
Greg Wilkins 7ae264e30c jetty-9 corrections for documentation 2012-11-08 07:34:40 +11:00
Jesse McConnell 5130847432 Merge branch 'release-8' into jetty-8 2012-11-06 12:01:56 -06:00
Jesse McConnell d0819605af set for dev 2012-11-06 12:01:06 -06:00
Jesse McConnell de08c15f77 Merge branch 'release-7' into jetty-7 2012-11-06 09:01:09 -06:00
Jesse McConnell edf898bdd1 set for dev 2012-11-06 09:00:48 -06:00
Jesse McConnell a08536c8bc set for dev 2012-11-06 08:18:06 -06:00
Jesse McConnell 32d0f950a9 set for dev 2012-11-06 08:15:05 -06:00
Jesse McConnell f25aa2dca6 [maven-release-plugin] prepare for next development iteration 2012-11-06 08:11:59 -06:00
Jesse McConnell bbdf7c8ab0 [maven-release-plugin] prepare release jetty-7.6.8.v20121106 2012-11-06 08:11:51 -06:00
Jesse McConnell a20cbd5075 [maven-release-plugin] prepare for next development iteration 2012-11-06 08:11:45 -06:00
Jesse McConnell 3a99c0cea0 [maven-release-plugin] prepare release jetty-8.1.8.v20121106 2012-11-06 08:11:38 -06:00
Jesse McConnell 6fc39fc781 set for release 2012-11-06 07:45:17 -06:00
Jesse McConnell dfa14dbc2e Merge branch 'jetty-8' into release-8 2012-11-06 07:44:34 -06:00
Jesse McConnell ec2fb110f1 reset 2012-11-06 07:44:12 -06:00
Jesse McConnell 7fadb8548b set for release 2012-11-06 07:41:59 -06:00
Jesse McConnell 7172e4e959 Merge branch 'jetty-7' into release-7 2012-11-06 07:37:47 -06:00
Jesse McConnell 581779a9df reset 2012-11-06 07:37:07 -06:00
Jan Bartel 6b04056371 Merge remote-tracking branch 'origin/jetty-8'
Conflicts:
	VERSION.txt
	example-async-rest/async-rest-jar/pom.xml
	example-async-rest/async-rest-webapp/pom.xml
	example-async-rest/pom.xml
	example-jetty-embedded/pom.xml
	jetty-aggregate/jetty-all-server/pom.xml
	jetty-aggregate/jetty-all/pom.xml
	jetty-aggregate/jetty-client/pom.xml
	jetty-aggregate/jetty-plus/pom.xml
	jetty-aggregate/jetty-server/pom.xml
	jetty-aggregate/jetty-servlet/pom.xml
	jetty-aggregate/jetty-webapp/pom.xml
	jetty-aggregate/jetty-websocket/pom.xml
	jetty-aggregate/pom.xml
	jetty-ajp/pom.xml
	jetty-annotations/pom.xml
	jetty-client/pom.xml
	jetty-continuation/pom.xml
	jetty-deploy/pom.xml
	jetty-distribution/pom.xml
	jetty-http-spi/pom.xml
	jetty-http/pom.xml
	jetty-io/pom.xml
	jetty-jaspi/pom.xml
	jetty-jmx/pom.xml
	jetty-jndi/pom.xml
	jetty-jsp/pom.xml
	jetty-monitor/pom.xml
	jetty-nested/pom.xml
	jetty-nosql/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-overlay-deployer/pom.xml
	jetty-plus/pom.xml
	jetty-policy/pom.xml
	jetty-rewrite/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-core/pom.xml
	jetty-spdy/spdy-jetty-http-webapp/pom.xml
	jetty-spdy/spdy-jetty-http/pom.xml
	jetty-spdy/spdy-jetty/pom.xml
	jetty-start/pom.xml
	jetty-util/pom.xml
	jetty-util/src/main/java/org/eclipse/jetty/util/MultiPartInputStream.java
	jetty-webapp/pom.xml
	jetty-websocket/pom.xml
	jetty-xml/pom.xml
	pom.xml
	test-continuation/pom.xml
	test-jetty-nested/pom.xml
	test-jetty-servlet/pom.xml
	test-jetty-webapp/pom.xml
	tests/pom.xml
	tests/test-integration/pom.xml
	tests/test-loginservice/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-webapp-rfc2616/pom.xml
2012-11-06 16:12:00 +11:00
Jan Bartel d4c4a7aee0 Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2012-11-06 15:31:47 +11:00
Jan Bartel fe09ca0e66 391623 Add option to --stop to wait for target jetty to stop 2012-11-06 14:35:37 +11:00
Jesse McConnell e1aa48267b Merge branch 'release-8' into jetty-8 2012-11-05 14:40:14 -06:00
Jesse McConnell 9bf7d89190 set for dev 2012-11-05 14:39:50 -06:00
Jesse McConnell 0411045449 [maven-release-plugin] prepare for next development iteration 2012-11-05 13:54:10 -06:00
Jesse McConnell 87b67d477b [maven-release-plugin] prepare release jetty-9.0.0.M2 2012-11-05 13:53:54 -06:00
Jesse McConnell 26b4f69a02 Merge branch 'release-7' into jetty-7 2012-11-05 13:25:12 -06:00
Jesse McConnell c74a56582a set for dev 2012-11-05 13:24:43 -06:00
Jesse McConnell bb27f561c1 [maven-release-plugin] prepare for next development iteration 2012-11-05 12:24:06 -06:00
Jesse McConnell 1d767e99a3 [maven-release-plugin] prepare release jetty-8.1.8.v20121105 2012-11-05 12:23:59 -06:00
Jesse McConnell 70d591c430 [maven-release-plugin] prepare for next development iteration 2012-11-05 12:16:03 -06:00
Jesse McConnell 017826b4eb [maven-release-plugin] prepare release jetty-7.6.8.v20121105 2012-11-05 12:15:57 -06:00
Jesse McConnell 063efdc484 Updating VERSION.txt top section 2012-11-05 11:57:40 -06:00
Jesse McConnell 0d78b07595 Merge branch 'master' into release-9 2012-11-05 11:56:52 -06:00
Jesse McConnell d3565e8610 Updating VERSION.txt top section 2012-11-05 11:55:10 -06:00
Jesse McConnell e97838e9d4 Merge branch 'jetty-8' into release-8 2012-11-05 11:52:44 -06:00
Jesse McConnell eac9414f01 Merge branch 'jetty-7' into jetty-8 2012-11-05 11:52:18 -06:00
Jesse McConnell a83f7794e1 Merge branch 'jetty-7' into release-7 2012-11-05 11:46:51 -06:00
Jesse McConnell 92e2ad44fc Updating VERSION.txt top section 2012-11-05 11:45:59 -06:00
Jesse McConnell 073ab7af20 Merge branch 'jetty-7' into release-7 2012-11-05 11:43:27 -06:00
Joakim Erdfelt 53f1892f7b Fixing license header 2012-11-05 10:40:20 -07:00
Joakim Erdfelt 7b3a15a403 Fixing license-check plugin scope 2012-11-05 10:39:52 -07:00
Joakim Erdfelt c1f06f9329 Moving license check to default build for top-level only 2012-11-05 10:37:00 -07:00
Jesse McConnell 55de6fc6e4 add import for Locale 2012-11-05 11:31:11 -06:00