Commit Graph

109 Commits

Author SHA1 Message Date
Jesse McConnell 2a6b8696d7 Merge branch 'master' into jetty-8 2011-11-08 15:59:55 -06:00
Thomas Becker acaa24595b 359031: Javadoc
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2011-11-04 20:23:56 +01:00
Thomas Becker 3d0300e60d 359031: CGI servlet changed to allow relative paths to webapp
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2011-11-04 15:56:18 +01:00
Thomas Becker b9f45e9426 CGI.java code format
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2011-11-04 15:56:18 +01:00
Jan Bartel fc497fe1e8 Merge remote-tracking branch 'origin/master' into jetty-8 2011-10-24 16:30:10 +11:00
Greg Wilkins cd0628ab66 Added isDebugEnabled guards to debugging that generates garbage 2011-10-22 09:39:54 +11:00
Jan Bartel a6b41a7deb Merge from master, fix addFilter method signature for servlet 3.0. 2011-10-21 15:51:24 +11:00
Jan Bartel 0ba6fc7408 Merge remote-tracking branch 'origin/master' into jetty-8 2011-10-21 14:55:39 +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
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
Simone Bordet fc55901661 Merge remote-tracking branch 'origin/master'
Conflicts:
	VERSION.txt
2011-08-18 17:42:32 +02:00
Simone Bordet 2d6491b78f Fixes #355103 (Make allowCredentials default to true in CrossOriginFilter). 2011-08-18 17:41:21 +02: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 93cc111a02 Merge remote-tracking branch 'origin/master' into jetty-8
Conflicts:
	VERSION.txt
	jetty-io/src/main/java/org/eclipse/jetty/io/nio/IndirectNIOBuffer.java
2011-07-25 17:42:30 +10:00
Michael Gorovoy 2790badf6d 352786 GzipFilter fails to pass parameters to GzipResponseWrapper 2011-07-21 13:11:36 -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
Simone Bordet 77394d0c4b Fixes #350533 (Add "Origin" to the list of allowed headers in CrossOriginFilter).
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3431 7e9141cc-0065-0410-87d8-b60c137991c4
2011-06-28 09:28:18 +00:00
Jesse McConnell 6f0e0f8077 proxy server timeout on continuation checks for 0 client and exchange timeout and set continuation as 'infinite'
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3410 7e9141cc-0065-0410-87d8-b60c137991c4
2011-06-21 20:46:02 +00: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
Jesse McConnell 418ebe8268 proxy server timeout on continuation checks for 0 client and exchange timeout and set continuation as 'infinite'
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3405 7e9141cc-0065-0410-87d8-b60c137991c4
2011-06-20 22:40:56 +00:00
Jesse McConnell ce943340dd change the proxy continuation timeout check from connectTimeout to timeout as that is what is set in the servlet init params
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3404 7e9141cc-0065-0410-87d8-b60c137991c4
2011-06-20 21:51:58 +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
Jesse McConnell 2f7eb54e0f [Bug 349870] proxy servlet protect continuation against fast failing exchanges
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3401 7e9141cc-0065-0410-87d8-b60c137991c4
2011-06-20 20:36:20 +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
Jesse McConnell 9cfb694fa5 [Bug 349738] provide way to set buffer sizes to http client in proxy servlet
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3398 7e9141cc-0065-0410-87d8-b60c137991c4
2011-06-20 15:27:17 +00:00
Jesse McConnell ffcd780457 [Bug 295832] update javadoc
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3397 7e9141cc-0065-0410-87d8-b60c137991c4
2011-06-17 14:43:12 +00:00
Jesse McConnell 82902b49eb Add timeout and idleTimeout servlet init parameters to the creation of the http client
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3391 7e9141cc-0065-0410-87d8-b60c137991c4
2011-06-16 21:28:24 +00:00
Jesse McConnell 30c3934931 [Bug 295832] shifted customize exchange and continuation to the the last possible moment for extenders can have full state before each are used. added continuation setTimeout based on httpclient connect timeout and exchange timeouts so that the contination doesn't interrupt normal usage (streaming of data resetting exchange timeout but not continuation)
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3389 7e9141cc-0065-0410-87d8-b60c137991c4
2011-06-15 15:39:33 +00:00
Jesse McConnell d29a7dad41 [Bug 295832] making proxy servlet more extensible, removed customizeClient in favor of protected createHttpClient(servletconfig) and createLogger(servletconfig) methods, default behavior should remain the same
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3387 7e9141cc-0065-0410-87d8-b60c137991c4
2011-06-14 18:50:32 +00:00
Jesse McConnell 1e347be15e [Bug 295832] making proxy servlet more extensible, added customizeExchange() to the patch provided as well
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3385 7e9141cc-0065-0410-87d8-b60c137991c4
2011-06-14 15:44:16 +00:00
Michael Gorovoy 548f6bac5a 341561 Exception when adding o.e.j.s.DoSFilter as managed attribute
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2947 7e9141cc-0065-0410-87d8-b60c137991c4
2011-04-01 00:36:57 +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
Simone Bordet 8020110283 Fixes #338092 (ProxyServlet leaks memory).
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2830 7e9141cc-0065-0410-87d8-b60c137991c4
2011-02-24 15:03:08 +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
Joakim Erdfelt f3a2a575aa Fixing broken javadoc and imports
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2673 7e9141cc-0065-0410-87d8-b60c137991c4
2011-01-21 20:49:28 +00:00
Greg Wilkins 881e599860 333679 Refactored jetty-jmx. Moved mbeans to modules.
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2629 7e9141cc-0065-0410-87d8-b60c137991c4
2011-01-06 18:04:58 +00:00