Commit Graph

21 Commits

Author SHA1 Message Date
Greg Wilkins 55d5020980 Merge remote-tracking branch 'origin/master' into jetty-8
Conflicts:
	VERSION.txt
	jetty-server/src/main/java/org/eclipse/jetty/server/AbstractHttpConnection.java
	jetty-server/src/main/java/org/eclipse/jetty/server/Response.java
	jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java
2011-11-29 09:06:25 +11:00
Jan Bartel 644ea655d5 363993 EOFException parsing HEAD response in HttpTester 2011-11-22 18:15:18 +11:00
Jan Bartel 127a5af8d7 Merge remote-tracking branch 'origin/master' into jetty-8 2011-11-17 10:59:54 +11:00
Greg Wilkins 6edb7c1930 organised imports 2011-10-18 15:05:22 +11:00
Jan Bartel 050cb83b35 Merge remote-tracking branch 'origin/master' into jetty-8
Conflicts:
	jetty-osgi/jetty-osgi-equinoxtools/src/main/java/org/eclipse/jetty/osgi/equinoxtools/console/EquinoxConsoleWebSocketServlet.java
	jetty-servlets/src/test/java/org/eclipse/jetty/servlets/GzipFilterTest.java
	jetty-websocket/pom.xml
2011-08-12 18:43:15 +10:00
Joakim Erdfelt da8f5052a3 Beefing up GzipFilter tests 2011-08-11 13:20:31 -07:00
Jan Bartel 86f7e76c4d Merge of jetty-7 into jetty-8
Conflicts:
	VERSION.txt
	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/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/pom.xml
	jetty-io/pom.xml
	jetty-jaspi/pom.xml
	jetty-jmx/pom.xml
	jetty-jndi/pom.xml
	jetty-jsp-2.1/pom.xml
	jetty-nested/pom.xml
	jetty-osgi/jetty-osgi-boot-jsp/pom.xml
	jetty-osgi/jetty-osgi-boot-logback/pom.xml
	jetty-osgi/jetty-osgi-boot-warurl/pom.xml
	jetty-osgi/jetty-osgi-boot/META-INF/MANIFEST.MF
	jetty-osgi/jetty-osgi-boot/pom.xml
	jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/OSGiAppProvider.java
	jetty-osgi/jetty-osgi-equinoxtools/META-INF/MANIFEST.MF
	jetty-osgi/jetty-osgi-equinoxtools/pom.xml
	jetty-osgi/jetty-osgi-equinoxtools/src/main/java/org/eclipse/jetty/osgi/equinoxtools/console/EquinoxConsoleContinuationServlet.java
	jetty-osgi/jetty-osgi-httpservice/pom.xml
	jetty-osgi/jetty-osgi-servletbridge/pom.xml
	jetty-osgi/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-servlets/src/main/java/org/eclipse/jetty/servlets/ProxyServlet.java
	jetty-start/pom.xml
	jetty-util/pom.xml
	jetty-webapp/pom.xml
	jetty-websocket/pom.xml
	jetty-xml/pom.xml
	pom.xml
	test-continuation-jetty6/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-sessions-common/pom.xml
	tests/test-webapps/pom.xml
	tests/test-webapps/test-webapp-rfc2616/pom.xml
2011-07-11 12:05:58 +10:00
Greg Wilkins 17e907c2fb git diff 54e885d967 remotes/origin/jetty-8-historical | patch -p1 ; git add -A 2011-07-07 18:18:24 +10:00
Michael Gorovoy bb6038b716 302566 GZIP filter unit test
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3400 7e9141cc-0065-0410-87d8-b60c137991c4
2011-06-20 15:33:51 +00:00
Greg Wilkins f16dcd8cad reduced verbosity of tests reporting errors
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2064 7e9141cc-0065-0410-87d8-b60c137991c4
2010-07-02 15:53:01 +00:00
Joakim Erdfelt c50d038822 309185 - Fix the over 300 Javadoc warnings
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1639 7e9141cc-0065-0410-87d8-b60c137991c4
2010-04-30 20:33:36 +00:00
Greg Wilkins 937d475839 310431 Default ErrorHandler as server Bean
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1566 7e9141cc-0065-0410-87d8-b60c137991c4
2010-04-26 20:15:12 +00:00
Greg Wilkins 889e7eb728 298236 Additional unit tests for jetty-client
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1412 7e9141cc-0065-0410-87d8-b60c137991c4
2010-03-26 17:04:26 +00:00
Greg Wilkins 227fb5abec numerous code cleanups
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1014 7e9141cc-0065-0410-87d8-b60c137991c4
2009-10-26 07:48:39 +00:00
Greg Wilkins ac6c1b98e1 JETTY-1086 Use UncheckedPrintWriter & cleaned up HttpStatus.Code usage
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@931 7e9141cc-0065-0410-87d8-b60c137991c4
2009-09-18 02:12:11 +00:00
Simone Bordet ca5c996d70 Fix for bug #288466: LocalConnector is not thread safe.
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@811 7e9141cc-0065-0410-87d8-b60c137991c4
2009-09-03 16:44:11 +00:00
Greg Wilkins 69dcb996ae minor cleanups and temp fixes
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@480 7e9141cc-0065-0410-87d8-b60c137991c4
2009-07-06 02:43:26 +00:00
Greg Wilkins 0a8e71e89e reworked the buffers mechanism to be less conditional
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@396 7e9141cc-0065-0410-87d8-b60c137991c4
2009-06-15 07:11:04 +00:00
Athena Yao fb7e4aeb29 [277798] fix build failure; this was modified in the wrong file
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@301 7e9141cc-0065-0410-87d8-b60c137991c4
2009-05-27 02:59:20 +00:00
Greg Wilkins ce4682e151 moved distribution and start back to jetty-*
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@296 7e9141cc-0065-0410-87d8-b60c137991c4
2009-05-27 00:34:33 +00:00
Greg Wilkins 020f12e948 renamed non runtime modules
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@283 7e9141cc-0065-0410-87d8-b60c137991c4
2009-05-26 01:16:27 +00:00