Commit Graph

440 Commits

Author SHA1 Message Date
Greg Wilkins 75c4ec733d Merge remote-tracking branch 'origin/master' into jetty-7.6
Conflicts:
	jetty-io/src/main/java/org/eclipse/jetty/io/nio/ChannelEndPoint.java
2011-10-20 10:01:36 +11:00
Simone Bordet d5a2ec877c 360912 CrossOriginFilter does not send Access-Control-Allow-Origin on responses.
355103 Make allowCredentials default to true in CrossOriginFilter.

The actual response now contains the Access-Control-Allow-Origin header, and fixed also 355103 that was not really fixed.
Added test suite.
2011-10-19 13:50:53 +02:00
Greg Wilkins 6edb7c1930 organised imports 2011-10-18 15:05:22 +11:00
Jan Bartel 1e079f06c9 Merge remote-tracking branch 'origin/master' into jetty-8 2011-09-01 14:11:53 +10:00
Joakim Erdfelt f7f7e0af75 293739 - Deprecate static Jetty Log usage in favor of named logs
+ Finished conversion of jetty-security, jetty-server, jetty-servlet,
  jetty-servlets, jetty-websocket
2011-08-24 12:53:27 -07:00
Jesse McConnell 53f2a4f62b tweak so handy proxy server works 2011-08-17 10:20:01 -05:00
Jan Bartel 6e8afd6795 Merge remote-tracking branch 'origin/master' into jetty-8
Conflicts:
	VERSION.txt
2011-08-16 11:35:46 +10:00
Joakim Erdfelt 1f1bf28cd6 Adding some code to test for gzip no-recompress logic 2011-08-12 16:04:46 -07:00
Joakim Erdfelt c75b76b9a1 fixing javadoc errors 2011-08-12 10:49:38 -07:00
Michael Gorovoy 8b4a99758c Fixed more cut/paste errors, added test for file size under minGzipSize, added tests for not gzipped files of all sizes 2011-08-12 13:44:15 -04:00
Joakim Erdfelt 391014691e Fixing copy/paste error 2011-08-12 10:06:02 -07:00
Michael Gorovoy 1ac9463414 Removed misleading comments 2011-08-12 12:59:18 -04:00
Joakim Erdfelt 72f28e0b35 Rounding out the Content-Length test scenarios 2011-08-12 09:35:39 -07: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
Michael Gorovoy d496a4f80a 354014 Content-Length is passed to wrapped response in GZipFilter 2011-08-08 18:03:36 -04:00
Michael Gorovoy 095cf33010 354014 Improved GzipFilterTest to verify that Content-Length header is passed when mime type is not configured. 2011-08-05 12:21:32 -04: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 8c63ca989b 302566 GZIP handler for embedded Jetty servers
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3406 7e9141cc-0065-0410-87d8-b60c137991c4
2011-06-21 02:26:18 +00:00
Michael Gorovoy f95e1bddbe 302566 GZIP handler implementation and unit test
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3403 7e9141cc-0065-0410-87d8-b60c137991c4
2011-06-20 20:55:58 +00: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
Simone Bordet eb942962f6 Made the test pass under Windows.
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2945 7e9141cc-0065-0410-87d8-b60c137991c4
2011-03-31 16:06:23 +00:00
Greg Wilkins 7b0a8e561c JETTY-1304 Allow quoted boundaries in Multipart filter
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2847 7e9141cc-0065-0410-87d8-b60c137991c4
2011-03-03 06:30:46 +00:00
Greg Wilkins b91027275f made test more robust
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2807 7e9141cc-0065-0410-87d8-b60c137991c4
2011-02-21 06:34:02 +00:00
Greg Wilkins 2b43ae931c improved debugging of JNDI. own logger
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2608 7e9141cc-0065-0410-87d8-b60c137991c4
2010-12-15 08:57:14 +00:00
Greg Wilkins 26cc7563f5 328789 Clean up tmp files from test harnesses
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2565 7e9141cc-0065-0410-87d8-b60c137991c4
2010-12-01 13:57:06 +00:00
Greg Wilkins d955fa0c3a 330417 Atomic PUT in PutFilter
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2526 7e9141cc-0065-0410-87d8-b60c137991c4
2010-11-17 01:52:33 +00:00
Greg Wilkins a6df844fa7 327601 Multipart Filter handles quoted tokens
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2344 7e9141cc-0065-0410-87d8-b60c137991c4
2010-10-13 01:53:32 +00:00
Greg Wilkins bb91faac89 JETTY-1252 Handle more multipart transfer encodings
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2280 7e9141cc-0065-0410-87d8-b60c137991c4
2010-09-15 23:01:56 +00:00
Greg Wilkins 3af3ddd0ff JETTY-1252 Handle more multipart transfer encodings
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2278 7e9141cc-0065-0410-87d8-b60c137991c4
2010-09-15 09:39:35 +00:00
Greg Wilkins 47bd78a37f JETTY-1248 fix parsing of bad multiparts - fixed import
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2122 7e9141cc-0065-0410-87d8-b60c137991c4
2010-07-14 23:59:18 +00:00
Greg Wilkins 7b5f155802 JETTY-1248 fix parsing of bad multiparts
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2121 7e9141cc-0065-0410-87d8-b60c137991c4
2010-07-14 15:09:37 +00:00
Joakim Erdfelt a7fb0f4729 Adding some meaning to the assertion failures while diagnosing a test failure
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1858 7e9141cc-0065-0410-87d8-b60c137991c4
2010-05-24 22:15:47 +00:00
Simone Bordet 6ff56da2fb Fixes #308864 (Update test suite to JUnit4 - Module jetty-servlets).
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1651 7e9141cc-0065-0410-87d8-b60c137991c4
2010-05-03 16:26:55 +00:00
Greg Wilkins 51541f7109 minor cleanups
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1421 7e9141cc-0065-0410-87d8-b60c137991c4
2010-03-30 13:21:50 +00:00
Greg Wilkins c8f300bc52 continuations only support response wrapping
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@335 7e9141cc-0065-0410-87d8-b60c137991c4
2009-06-08 01:09:17 +00:00
Jan Bartel 66e52af837 Moved to src/test/java as it is a test class.
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@292 7e9141cc-0065-0410-87d8-b60c137991c4
2009-05-26 23:55:46 +00:00
Athena Yao 60f784d2ac [277798] Denial of Service Filter
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@291 7e9141cc-0065-0410-87d8-b60c137991c4
2009-05-26 06:48:45 +00:00
Greg Wilkins da627b843f jetty @ eclipse initial commit
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@8 7e9141cc-0065-0410-87d8-b60c137991c4
2009-03-24 21:07:27 +00:00