Commit Graph

2757 Commits

Author SHA1 Message Date
Greg Wilkins 07aa997568 357240 test that triggers no progress handling 2011-10-05 10:01:34 +11:00
Jan Bartel 32dbb1bddb Merge remote-tracking branch 'origin/master' 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-deploy/src/main/config/etc/jetty-deploy.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-monitor/pom.xml
	jetty-nested/pom.xml
	jetty-nosql/pom.xml
	jetty-osgi/jetty-osgi-boot-jsp/pom.xml
	jetty-osgi/jetty-osgi-boot-jsp/src/main/java/org/eclipse/jetty/osgi/boot/jsp/FragmentActivator.java
	jetty-osgi/jetty-osgi-boot-logback/pom.xml
	jetty-osgi/jetty-osgi-boot-warurl/pom.xml
	jetty-osgi/jetty-osgi-boot/pom.xml
	jetty-osgi/jetty-osgi-equinoxtools/pom.xml
	jetty-osgi/jetty-osgi-httpservice/pom.xml
	jetty-osgi/jetty-osgi-servletbridge/pom.xml
	jetty-osgi/jetty-osgi-servletbridge/src/main/java/org/eclipse/jetty/osgi/servletbridge/FrameworkLauncherExtended.java
	jetty-osgi/jetty-osgi-servletbridge/src/main/webapp/WEB-INF/web.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-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java
	jetty-servlet/pom.xml
	jetty-servlets/pom.xml
	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-10-04 17:45:15 +11:00
Jesse McConnell b67d307ff3 [Bug 359675] Principal != String, fix for issue in property file login
manager
2011-10-03 17:50:35 -05:00
Greg Wilkins c438d7c043 improved websocket testserver example to include ping/pong 2011-10-03 18:03:57 +11:00
Greg Wilkins fbb4893352 improved websocket testserver example to include ping/pong 2011-10-03 18:03:42 +11:00
Greg Wilkins 7bf5f7792b 359673 updated websocket version handling 2011-10-03 16:04:37 +11:00
Greg Wilkins 18aa8fed9b 359673 updated websocket version handling 2011-10-03 16:04:13 +11:00
Greg Wilkins c668f8b82d Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project 2011-10-03 15:08:02 +11:00
hmalphettes ab6ff817a3 JETTY-1378 new sys property for the latest jsp-impl to force the use of the JDTCompiler when running in OSGi. 2011-10-03 09:37:53 +08:00
Greg Wilkins b30ac39868 Merge branch 'master' into sslClose 2011-10-03 10:50:11 +11:00
Simone Bordet ae62618a00 Reworked logging, and catching IOException during the processing of a close. 2011-10-01 17:56:48 +02:00
Jesse McConnell b179883dfe blank commit testing serverside repack for webmaster 2011-09-30 15:41:03 -05:00
Jesse McConnell 8c1307e1c3 blank change 2011-09-30 09:56:13 -05:00
Jesse McConnell 211e196dc6 add license block 2011-09-30 08:09:42 -05:00
Jesse McConnell 727d293264 minor formatting tweaks and one scope change 2011-09-30 07:58:39 -05:00
Thomas Becker 3e73e79c1e code convention fixes, javadoc update 2011-09-30 07:58:39 -05:00
Thomas Becker 37845a1a4f 357687: Add ShutdownHandler + UnitTest 2011-09-30 07:58:39 -05:00
Jesse McConnell 53b9f1cc7e [Bug 336443] add missing comma in DigestAuthenticator string 2011-09-29 16:57:30 -05:00
Simone Bordet a134664b4c Method close() should really close the underlying channel, not only send the SSL close message. 2011-09-29 23:01:43 +02:00
Jesse McConnell 9b9bc9e79c Add an additional test using forwarding via filter 2011-09-29 15:14:26 -05:00
Greg Wilkins 79e431f330 cleanup 2011-09-29 17:36:23 +10:00
Greg Wilkins 7cb3246624 Merge branch 'master' into sslClose 2011-09-29 15:50:42 +10:00
Greg Wilkins d0a2557527 357240 fixed client connection recycle 2011-09-29 15:50:09 +10:00
Jesse McConnell 3dc0120d57 [Bug 359309] adjust previous test for servletPath to include pathInfo 2011-09-28 18:43:43 -05:00
Jesse McConnell 7ecea5afd0 [Bug 359309] resolve include and forward issues related to resource handler 2011-09-28 18:30:20 -05:00
Jesse McConnell 45e6cfa790 [Bug 359309] fix unit test to use HttpServlet*Wrappers and reformat the resourcehandler a bit to debug last two issues 2011-09-28 18:02:27 -05:00
Greg Wilkins f14bbbfc0a fixed bad merge 2011-09-29 08:17:23 +10:00
Greg Wilkins 21a111db27 Merge branch 'master' into sslClose
Conflicts:
	jetty-client/src/main/java/org/eclipse/jetty/client/HttpExchange.java
2011-09-29 08:10:39 +10:00
Greg Wilkins f45a720045 357240 debug client tests 2011-09-29 08:06:51 +10:00
Jesse McConnell e7af27ad34 [Bug 359309] add unit tests showing the problem, 1/4 pass right now, the 3 failing are marked @Ignore for now. 2011-09-28 16:16:09 -05:00
Jesse McConnell af698b0023 Add a ResourceHandler test, we seem to be missing even a basic one 2011-09-28 14:38:14 -05:00
Thomas Becker 1e5b85a2cb 359255: Allow HttpExchange state change from START to EXPIRED 2011-09-28 10:56:46 -05:00
Thomas Becker cceef37f17 359255: Code format 2011-09-28 10:44:03 -05:00
Jesse McConnell 74d5e800f6 fix some formatting issues with code conventions 2011-09-28 10:34:08 -05:00
David Kellum 40b25e6f5a JETTY-1421 Implement RedirectListener.onException,onConnectionFailed 2011-09-28 10:30:29 -05:00
David Kellum d37f2ca10c JETTY-1420 Set Host header for new request in RedirectListener 2011-09-28 10:21:29 -05:00
Greg Wilkins 603ee3dae1 357240 fixed client tests 2011-09-29 00:23:31 +10:00
Greg Wilkins a531fbc5a2 357240 fixed client tests 2011-09-29 00:09:13 +10:00
Greg Wilkins f73a6422f0 357240 fixed client test 2011-09-29 00:02:06 +10:00
Greg Wilkins 1420253643 357240 improved ishut/oshut handling 2011-09-28 22:58:14 +10:00
Greg Wilkins fbf0fad076 357240 improved ishut/oshut handling 2011-09-28 22:50:38 +10:00
Greg Wilkins 444c09fce7 357240 switch fix 2011-09-28 20:37:31 +10:00
Greg Wilkins dbf636df4d 357240 work in progress 2011-09-28 20:33:03 +10:00
Greg Wilkins d0ffa5cb1a Merge branch 'master' into sslClose 2011-09-28 16:24:01 +10:00
Greg Wilkins 6eaa1364e3 357240 work in progress 2011-09-28 16:21:57 +10:00
Jan Bartel 65e7d65442 358959 File descriptor leak with UnresolvedAddressException 2011-09-28 14:59:34 +10:00
Jan Bartel 76c0479ed3 JETTY-1439 space in directory installation path causes classloader problem 2011-09-28 11:26:24 +10:00
Greg Wilkins c20ce1fc4e 357240 remove buffer counts 2011-09-28 10:44:43 +10:00
Greg Wilkins ac7fcd9ab7 357240 work in progress 2011-09-28 00:29:17 +10:00
Greg Wilkins 16d54532d6 357240 work in progress 2011-09-28 00:08:40 +10:00