Commit Graph

718 Commits

Author SHA1 Message Date
Jan Bartel aa3b829fb1 Revert "395794 slightly modified fix for empty file extenstion to mime type mapping. Added a default, so it will also work with unknown file extensions"
This reverts commit 72cdab4934.
2012-12-24 14:11:15 +11:00
Jan Bartel 37ac5e7b16 Merge remote-tracking branch 'origin/jetty-8'
Conflicts:
	jetty-http/src/main/java/org/eclipse/jetty/http/HttpURI.java
	jetty-servlets/src/test/java/org/eclipse/jetty/servlets/MultipartFilterTest.java
	jetty-util/src/main/java/org/eclipse/jetty/util/MultiPartInputStream.java
	jetty-util/src/test/java/org/eclipse/jetty/util/MultiPartInputStreamTest.java
	jetty-util/src/test/java/org/eclipse/jetty/util/URLEncodedTest.java
2012-12-22 16:42:33 +11:00
Greg Wilkins d4c4637f4d Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2012-12-22 12:30:20 +11:00
Greg Wilkins 810ff3802f 397110 Accept %uXXXX encodings in URIs 2012-12-22 12:00:54 +11:00
Greg Wilkins 3216a284b3 jetty-9 per parser fields cache 2012-12-20 13:50:48 +11:00
Greg Wilkins f7c2e85040 jetty-9 per parser fields cache 2012-12-20 13:13:46 +11:00
Thomas Becker 72cdab4934 395794 slightly modified fix for empty file extenstion to mime type mapping. Added a default, so it will also work with unknown file extensions 2012-12-18 13:09:21 +01:00
Greg Wilkins 4d34e83c1c jetty-9 replaced Trie with indexed implementation 2012-12-17 19:21:28 +11:00
Jan Bartel 2966192aa4 395794 NullPointerException in when requesting a file without extension 2012-12-17 13:58:39 +11:00
Greg Wilkins ecf7563a79 jetty-9 use direct buffers for generated headers 2012-12-14 14:07:42 +11:00
Greg Wilkins 6f098dd69c jetty-9 use DateCache timer to set Date header once per second 2012-12-10 12:58:14 +11:00
Greg Wilkins aeade16b99 jetty-9 optimise generation of common fields 2012-12-09 09:46:50 +11:00
Greg Wilkins f01da31a0a jetty-9 some optimizations 2012-12-08 01:41:01 +11:00
Greg Wilkins 620d051087 jetty-9 recycle content-type 2012-12-08 01:41:01 +11:00
Greg Wilkins 3e151901bf jetty-9 Use public HttpField 2012-12-08 01:41:01 +11:00
Greg Wilkins a20d984d30 jetty-9 Added Trie for cached string lookup. HttpFields does not use StringMap 2012-12-08 01:41:00 +11:00
Greg Wilkins f89909e301 jetty-9 cleaning up dependencies 2012-11-23 16:25:57 +11:00
Greg Wilkins 8ff291d223 Merge remote-tracking branch 'origin/jetty-8'
Conflicts:
	jetty-http/src/main/java/org/eclipse/jetty/http/HttpContent.java
	jetty-overlay-deployer/src/main/java/org/eclipse/jetty/overlays/OverlayedAppProvider.java
	jetty-overlay-deployer/src/main/java/org/eclipse/jetty/overlays/TemplateContext.java
	jetty-server/src/main/java/org/eclipse/jetty/server/AbstractHttpConnection.java
	jetty-server/src/main/java/org/eclipse/jetty/server/ResourceCache.java
	jetty-server/src/main/java/org/eclipse/jetty/server/handler/ResourceHandler.java
	jetty-server/src/test/java/org/eclipse/jetty/server/ResourceCacheTest.java
	jetty-servlet/src/main/java/org/eclipse/jetty/servlet/DefaultServlet.java
	jetty-servlet/src/test/java/org/eclipse/jetty/servlet/DefaultServletTest.java
	jetty-servlets/src/main/java/org/eclipse/jetty/servlets/GzipFilter.java
	jetty-servlets/src/main/java/org/eclipse/jetty/servlets/gzip/AbstractCompressedStream.java
	jetty-servlets/src/main/java/org/eclipse/jetty/servlets/gzip/CompressedResponseWrapper.java
2012-11-12 12:30:26 +11:00
Greg Wilkins 3d3b035b22 Merge remote-tracking branch 'origin/jetty-7' into jetty-8
Conflicts:
	jetty-servlet/src/test/java/org/eclipse/jetty/servlet/DefaultServletTest.java
2012-11-12 09:08:53 +11:00
Greg Wilkins 75aedbbf45 393947 implement ETags and update gzip filter to handle them 2012-11-11 09:52:26 +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 52464a5ba6 Merge remote-tracking branch 'origin/jetty-8'
Conflicts:
	jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationParser.java
	jetty-annotations/src/main/java/org/eclipse/jetty/annotations/ResourceAnnotationHandler.java
	jetty-client/src/test/java/org/eclipse/jetty/client/SslHttpExchangeTest.java
	jetty-client/src/test/java/org/eclipse/jetty/client/SslSecurityListenerTest.java
	jetty-deploy/src/main/java/org/eclipse/jetty/deploy/WebAppDeployer.java
	jetty-deploy/src/main/java/org/eclipse/jetty/deploy/providers/ContextProvider.java
	jetty-http/src/main/resources/org/eclipse/jetty/http/mime.properties
	jetty-http/src/test/java/org/eclipse/jetty/http/HttpFieldsTest.java
	jetty-io/src/main/java/org/eclipse/jetty/io/nio/SelectChannelEndPoint.java
	jetty-jmx/src/main/java/org/eclipse/jetty/jmx/MBeanContainer.java
	jetty-jmx/src/main/java/org/eclipse/jetty/jmx/ObjectMBean.java
	jetty-overlay-deployer/src/main/java/org/eclipse/jetty/overlays/OverlayedAppProvider.java
	jetty-plus/src/main/java/org/eclipse/jetty/plus/annotation/Injection.java
	jetty-plus/src/main/java/org/eclipse/jetty/plus/security/DataSourceLoginService.java
	jetty-proxy/src/main/java/org/eclipse/jetty/proxy/ProxyServlet.java
	jetty-rewrite/src/main/java/org/eclipse/jetty/rewrite/handler/ProxyRule.java
	jetty-security/src/main/java/org/eclipse/jetty/security/authentication/FormAuthenticator.java
	jetty-server/src/main/java/org/eclipse/jetty/server/session/JDBCSessionIdManager.java
	jetty-spdy/spdy-http-server/src/main/java/org/eclipse/jetty/spdy/server/proxy/ProxyHTTPSPDYConnection.java
	jetty-spdy/spdy-jetty-http/src/main/java/org/eclipse/jetty/spdy/http/ServerHTTPSPDYAsyncConnection.java
	jetty-start/src/main/java/org/eclipse/jetty/start/Main.java
	jetty-util/src/main/java/org/eclipse/jetty/util/Fields.java
	jetty-websocket/src/main/java/org/eclipse/jetty/websocket/WebSocketClientFactory.java
	jetty-websocket/src/main/java/org/eclipse/jetty/websocket/WebSocketConnectionRFC6455.java
	jetty-websocket/src/test/java/org/eclipse/jetty/websocket/WebSocketClientTest.java
	jetty-websocket/src/test/java/org/eclipse/jetty/websocket/WebSocketMessageRFC6455Test.java
	test-jetty-nested/src/main/java/org/eclipse/jetty/nested/Dump.java
	test-jetty-webapp/src/main/java/com/acme/Dump.java
2012-11-02 14:08:05 +11:00
Greg Wilkins 8723408731 Merge remote-tracking branch 'origin/jetty-7' into jetty-8
Conflicts:
	jetty-servlets/src/main/java/org/eclipse/jetty/servlets/MultiPartFilter.java
2012-11-02 13:17:53 +11:00
Greg Wilkins 65202e9abe 393363 Use Locale.ENGLISH for all toUpperCase and toLowerCase calls 2012-11-02 11:55:00 +11:00
Jesse McConnell e93a254306 [Bug 393218] add xsd=application/xml mime mapping to defaults 2012-11-01 10:57:17 -05:00
Simone Bordet 6ef412b776 Fixed case of writing a zero-length buffer that is not the last content:
we should return FLUSH instead of DONE, waiting for the last content flag.
2012-10-26 17:39:57 +02:00
Thomas Becker 8c3642754e 392470: Fix problem in suspend, expire cycle when HttpChannel.run() is called multiple times (happens for SPDY). Add test cases. Remove unused argument from HttpHandler.messageComplete() interface and it's implementations. 2012-10-19 18:17:29 +02:00
Greg Wilkins 2b13648b0e 392237 fixed many TODOs and many minor code cleanups 2012-10-19 16:17:30 +11:00
Greg Wilkins f420f5016d 392237 Implemented HttpOutput.sendContent for large content 2012-10-19 10:16:30 +11:00
Greg Wilkins fac580c374 Merge remote-tracking branch 'origin/jetty-8' into jetty-9
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-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/src/main/java/org/eclipse/jetty/ajp/Ajp13Generator.java
	jetty-annotations/pom.xml
	jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AbstractDiscoverableAnnotationHandler.java
	jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationConfiguration.java
	jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationParser.java
	jetty-annotations/src/main/java/org/eclipse/jetty/annotations/ServletContainerInitializerListener.java
	jetty-annotations/src/main/java/org/eclipse/jetty/annotations/ServletSecurityAnnotationHandler.java
	jetty-annotations/src/main/java/org/eclipse/jetty/annotations/WebServletAnnotation.java
	jetty-annotations/src/main/java/org/eclipse/jetty/annotations/WebServletAnnotationHandler.java
	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-http/src/main/java/org/eclipse/jetty/http/Generator.java
	jetty-http/src/main/java/org/eclipse/jetty/http/HttpFields.java
	jetty-http/src/main/java/org/eclipse/jetty/http/HttpGenerator.java
	jetty-http/src/main/java/org/eclipse/jetty/http/HttpURI.java
	jetty-http/src/main/java/org/eclipse/jetty/http/MimeTypes.java
	jetty-http/src/test/java/org/eclipse/jetty/http/HttpFieldsTest.java
	jetty-io/pom.xml
	jetty-io/src/main/java/org/eclipse/jetty/io/AbstractBuffer.java
	jetty-io/src/main/java/org/eclipse/jetty/io/Buffer.java
	jetty-io/src/main/java/org/eclipse/jetty/io/BufferUtil.java
	jetty-jaspi/pom.xml
	jetty-jmx/pom.xml
	jetty-jndi/pom.xml
	jetty-jndi/src/main/java/org/eclipse/jetty/jndi/ContextFactory.java
	jetty-jndi/src/test/java/org/eclipse/jetty/jndi/java/TestJNDI.java
	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-boot/src/main/java/org/eclipse/jetty/osgi/boot/OSGiDeployer.java
	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-runner/pom.xml
	jetty-security/pom.xml
	jetty-security/src/main/java/org/eclipse/jetty/security/ConstraintSecurityHandler.java
	jetty-security/src/main/java/org/eclipse/jetty/security/authentication/FormAuthenticator.java
	jetty-security/src/main/java/org/eclipse/jetty/security/authentication/LoginAuthenticator.java
	jetty-security/src/test/java/org/eclipse/jetty/security/ConstraintTest.java
	jetty-server/pom.xml
	jetty-server/src/main/java/org/eclipse/jetty/server/AbstractHttpConnection.java
	jetty-server/src/main/java/org/eclipse/jetty/server/AsyncHttpConnection.java
	jetty-server/src/main/java/org/eclipse/jetty/server/HttpInput.java
	jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java
	jetty-server/src/main/java/org/eclipse/jetty/server/Request.java
	jetty-server/src/main/java/org/eclipse/jetty/server/Response.java
	jetty-server/src/main/java/org/eclipse/jetty/server/bio/SocketConnector.java
	jetty-server/src/main/java/org/eclipse/jetty/server/session/SessionHandler.java
	jetty-server/src/test/java/org/eclipse/jetty/server/HttpServerTestBase.java
	jetty-server/src/test/java/org/eclipse/jetty/server/HttpURITest.java
	jetty-server/src/test/java/org/eclipse/jetty/server/ResponseTest.java
	jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SelectChannelServerSslTest.java
	jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SslSocketServerTest.java
	jetty-server/src/test/resources/jetty-logging.properties
	jetty-servlet/pom.xml
	jetty-servlet/src/main/java/org/eclipse/jetty/servlet/DefaultServlet.java
	jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletContextHandler.java
	jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHolder.java
	jetty-servlet/src/test/java/org/eclipse/jetty/servlet/DispatcherTest.java
	jetty-servlets/pom.xml
	jetty-servlets/src/main/java/org/eclipse/jetty/servlets/GzipFilter.java
	jetty-servlets/src/main/java/org/eclipse/jetty/servlets/MultiPartFilter.java
	jetty-servlets/src/test/java/org/eclipse/jetty/servlets/MultipartFilterTest.java
	jetty-servlets/src/test/java/org/eclipse/jetty/servlets/gzip/GzipTester.java
	jetty-spdy/pom.xml
	jetty-spdy/spdy-client/pom.xml
	jetty-spdy/spdy-core/pom.xml
	jetty-spdy/spdy-example-webapp/pom.xml
	jetty-spdy/spdy-http-server/pom.xml
	jetty-spdy/spdy-jetty-http/src/main/java/org/eclipse/jetty/spdy/http/ServerHTTPSPDYAsyncConnection.java
	jetty-start/pom.xml
	jetty-start/src/test/java/org/eclipse/jetty/start/CommandLineBuilderTest.java
	jetty-start/src/test/java/org/eclipse/jetty/start/MainTest.java
	jetty-util-ajax/pom.xml
	jetty-util/pom.xml
	jetty-util/src/main/java/org/eclipse/jetty/util/MultiPartInputStream.java
	jetty-util/src/main/java/org/eclipse/jetty/util/log/StdErrLog.java
	jetty-util/src/test/java/org/eclipse/jetty/util/MultiPartInputStreamTest.java
	jetty-webapp/pom.xml
	jetty-webapp/src/main/java/org/eclipse/jetty/webapp/StandardDescriptorProcessor.java
	jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebAppContext.java
	jetty-websocket/pom.xml
	jetty-websocket/src/test/java/org/eclipse/jetty/websocket/WebSocketServletRFCTest.java
	jetty-websocket/src/test/java/org/eclipse/jetty/websocket/helper/MessageSender.java
	jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/UnitGenerator.java
	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
	test-jetty-webapp/src/main/webapp/WEB-INF/web.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-10-12 21:19:21 +11:00
Simone Bordet 402afc6092 jetty-9: HTTP client: implemented support for 100-Continue. 2012-10-11 10:57:40 +02:00
Jan Bartel 7625f0b8b3 Merge remote-tracking branch 'origin/master' into jetty-8 2012-10-11 16:34:16 +11:00
Jan Bartel 5277122dd8 391622 Be lenient on RFC6265 restriction on duplicate cookie names in same response 2012-10-11 16:09:35 +11:00
Greg Wilkins 96dc4fe150 jetty-9 improved exception logging 2012-09-24 13:10:36 +10:00
Greg Wilkins 879cdf4b82 jetty-9 further lifecycle improvements 2012-09-21 16:17:00 +10:00
Simone Bordet 40382bad3a jetty-9 - Removed references to JUnit 3.x. 2012-09-20 18:23:02 +02:00
Simone Bordet 5590f21296 jetty-9 - Made HttpParser.shutdownInput() return a boolean to signal whether the message was completed. 2012-09-17 11:46:26 +02:00
Simone Bordet 5315a6dcff jetty-9 - HTTP client: implemented abort of request and responses. 2012-09-13 16:02:57 +02:00
Greg Wilkins c7c9c35fee jetty-9 remove leftover debug 2012-09-13 20:12:57 +10:00
Jan Bartel e1e321a243 Merge remote-tracking branch 'origin/master' into jetty-8 2012-09-13 14:10:01 +10:00
Jan Bartel 0035343af3 388675 Non utf8 encoded query strings not decoded to parameter map using queryEncoding 2012-09-13 13:35:27 +10:00
Greg Wilkins 73ebe89019 jetty-9 refactored configuration 2012-09-10 20:26:14 +10:00
Simone Bordet 8b7e1463a1 jetty-9 - HTTP client: implemented cookie functionalities. 2012-09-07 00:05:12 +02:00
Simone Bordet d8ed9116f1 jetty-9 - Moved SPDY's Headers class to jetty-util module as Fields. 2012-09-06 13:22:04 +02:00
Simone Bordet 7231c82b69 Merged branch 'jetty-9' into jetty-9-client. 2012-09-06 08:41:48 +02:00
Greg Wilkins 0b3865d749 jetty-9 removed unused schedulers 2012-09-06 09:12:31 +10:00
Simone Bordet 4ec7ef2800 Jetty9 - Sixth take at HTTP client implementation: all tests are passing. 2012-09-05 19:43:42 +02:00
Simone Bordet b18ab0e76a Jetty9 - First take at HTTP client implementation. 2012-09-04 19:20:29 +02:00
Jesse McConnell 6d2c793edc Merge branch 'master' into jetty-8 2012-09-03 12:48:21 -05:00
Greg Wilkins fd01a1b496 JETTY-1541 fixed different behaviour for single byte writes 2012-09-03 17:57:37 +10:00
Greg Wilkins 83dbca6553 jetty-9 reworked the schedulers 2012-08-31 13:22:58 +10:00
Simone Bordet 0acf2f9650 Jetty9 - Generified HttpChannel and HttpParser listeners to follow the generification of HttpInput. 2012-08-28 09:29:08 +02:00
Simone Bordet 06b2de17d5 Merge branch 'jetty-9-aggregation' into jetty-9-spdy-http 2012-08-24 11:52:29 +02:00
Greg Wilkins fac03a306b jetty-9 more server test fixes 2012-08-24 16:53:36 +10:00
Greg Wilkins 42f998fa1a jetty-9 fixed RFC2616 tests 2012-08-24 10:13:53 +10:00
Jesse McConnell fd1ab0ed55 merge from master 2012-08-23 16:44:30 -05:00
Simone Bordet a3993f793d Jetty9 - Returning 413 and not 414 when the request headers are too large. 2012-08-23 20:36:08 +02:00
Greg Wilkins aaa7bf08b6 jetty-9 handle generator IOErrors 2012-08-23 18:32:34 +10:00
Greg Wilkins d59a47d376 jetty-9 simplified error handling 2012-08-23 17:32:10 +10:00
Greg Wilkins cd719bf979 jetty-9 cleanups and fixes after refactor 2012-08-23 14:07:10 +10:00
Greg Wilkins 74e632cd34 jetty-9 fixed some test fails after refactor 2012-08-23 08:39:05 +10:00
Simone Bordet f5986a12da Jetty9 - Fixed test: when passing a large, empty header buffer the generator should not return NEED_CHUNK, so the test code was removed. 2012-08-22 10:05:24 +02:00
Simone Bordet 71e7f519c7 Jetty9 - Refactored error handling logic. 2012-08-21 23:40:08 +02:00
Simone Bordet 21494f97bb Jetty9 - Refactored commit logic into HttpChannel. 2012-08-20 18:32:41 +02:00
Greg Wilkins 325bfc290d jetty-9 work in progress on moving aggregation out of HttpChannel 2012-08-20 20:43:10 +10:00
Jan Bartel bc4f45bbfe JETTY-1532 HTTP headers decoded with platform's default encoding 2012-08-20 08:40:04 +10:00
Jesse McConnell 6ffaa478c4 standardize license headers 2012-08-17 16:09:49 -05:00
Joakim Erdfelt 3d1d76d214 Merge from jetty-8 to jetty-9 (license header standarization) 2012-08-17 13:44:22 -07:00
Jesse McConnell 5de0cee1eb merge from master + license block standardization 2012-08-17 14:50:43 -05:00
Greg Wilkins 086e74bed8 jetty-9 merged jetty-8
Merge remote-tracking branch 'origin/jetty-8' into jetty-9

Conflicts:
	jetty-security/src/main/java/org/eclipse/jetty/security/authentication/FormAuthenticator.java
	jetty-server/src/main/java/org/eclipse/jetty/server/AbstractHttpConnection.java
	jetty-server/src/test/java/org/eclipse/jetty/server/HttpConnectionTest.java
	jetty-util/src/main/java/org/eclipse/jetty/util/log/StdErrLog.java
	jetty-util/src/main/java/org/eclipse/jetty/util/resource/JarFileResource.java
	jetty-util/src/test/java/org/eclipse/jetty/util/log/StdErrLogTest.java
2012-08-17 23:35:42 +10:00
Greg Wilkins 7c94fd5f3c jetty-9 removed HttpParser.isPersistent 2012-08-17 22:06:55 +10:00
Jesse McConnell 00ed549898 standardize license header blocks 2012-08-16 19:11:27 -05:00
Thomas Becker f8950b64bd merge with jetty-9 2012-08-16 09:56:51 +02:00
Greg Wilkins 6d2da78aac jetty-9 more commit fixes 2012-08-16 15:25:08 +10:00
Simone Bordet 360bdfa051 Jetty9 - Code cleanups: using generics, diamond operator, removed warnings, etc. 2012-08-13 11:46:09 +02:00
Thomas Becker 731eb31c7e interims changes 2012-08-09 18:54:41 +02:00
Simone Bordet c2a62962fc Jetty9 - Cleaned up warnings and dead code. 2012-08-08 13:39:57 +02:00
Jan Bartel c0dd05683b Merge remote-tracking branch 'origin/master' into jetty-8 2012-08-03 17:25:24 +10:00
Jan Bartel 3f07564274 379423 Jetty URL Decoding fails for certain international characters 2012-08-03 17:20:58 +10:00
Greg Wilkins ab298e511e jetty-9 unit test cleanups 2012-07-23 17:11:59 +10:00
Greg Wilkins 8101b67ce8 jetty-9 lots of code cleanups from findbugs, warnings and TODOs 2012-07-23 14:08:35 +10:00
Greg Wilkins 154a926b1b jetty-9 merge from jetty-8. Mostly compiling but some tests still failing.
Merge remote-tracking branch 'origin/jetty-8' into jetty-9

Conflicts:
	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-http/src/main/java/org/eclipse/jetty/http/HttpContent.java
	jetty-http/src/main/java/org/eclipse/jetty/http/HttpFields.java
	jetty-http/src/main/java/org/eclipse/jetty/http/HttpGenerator.java
	jetty-http/src/main/java/org/eclipse/jetty/http/HttpParser.java
	jetty-http/src/main/java/org/eclipse/jetty/http/gzip/CompressedResponseWrapper.java
	jetty-http/src/main/java/org/eclipse/jetty/http/gzip/GzipStream.java
	jetty-http/src/test/java/org/eclipse/jetty/http/HttpFieldsTest.java
	jetty-http/src/test/java/org/eclipse/jetty/http/HttpGeneratorClientTest.java
	jetty-io/pom.xml
	jetty-io/src/main/java/org/eclipse/jetty/io/AbstractBuffers.java
	jetty-io/src/main/java/org/eclipse/jetty/io/AbstractConnection.java
	jetty-io/src/main/java/org/eclipse/jetty/io/AsyncEndPoint.java
	jetty-io/src/main/java/org/eclipse/jetty/io/Buffer.java
	jetty-io/src/main/java/org/eclipse/jetty/io/BuffersFactory.java
	jetty-io/src/main/java/org/eclipse/jetty/io/ByteArrayBuffer.java
	jetty-io/src/main/java/org/eclipse/jetty/io/ByteArrayEndPoint.java
	jetty-io/src/main/java/org/eclipse/jetty/io/ConnectedEndPoint.java
	jetty-io/src/main/java/org/eclipse/jetty/io/Connection.java
	jetty-io/src/main/java/org/eclipse/jetty/io/PooledBuffers.java
	jetty-io/src/main/java/org/eclipse/jetty/io/bio/StreamEndPoint.java
	jetty-io/src/main/java/org/eclipse/jetty/io/bio/StringEndPoint.java
	jetty-io/src/main/java/org/eclipse/jetty/io/nio/ChannelEndPoint.java
	jetty-io/src/main/java/org/eclipse/jetty/io/nio/SelectChannelEndPoint.java
	jetty-io/src/main/java/org/eclipse/jetty/io/nio/SelectorManager.java
	jetty-io/src/main/java/org/eclipse/jetty/io/nio/SslConnection.java
	jetty-io/src/test/java/org/eclipse/jetty/io/ChannelEndPointTest.java
	jetty-io/src/test/java/org/eclipse/jetty/io/bio/SocketEndPointTest.java
	jetty-io/src/test/java/org/eclipse/jetty/io/nio/SelectChannelEndPointSslTest.java
	jetty-io/src/test/java/org/eclipse/jetty/io/nio/SelectChannelEndPointTest.java
	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/pom.xml
	jetty-overlay-deployer/pom.xml
	jetty-plus/pom.xml
	jetty-policy/pom.xml
	jetty-proxy/src/test/java/org/eclipse/jetty/proxy/ProxyServletTest.java
	jetty-rewrite/pom.xml
	jetty-security/pom.xml
	jetty-server/pom.xml
	jetty-server/src/main/java/org/eclipse/jetty/server/AbstractConnector.java
	jetty-server/src/main/java/org/eclipse/jetty/server/AbstractHttpConnection.java
	jetty-server/src/main/java/org/eclipse/jetty/server/AsyncHttpConnection.java
	jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannelState.java
	jetty-server/src/main/java/org/eclipse/jetty/server/Request.java
	jetty-server/src/main/java/org/eclipse/jetty/server/Response.java
	jetty-server/src/main/java/org/eclipse/jetty/server/Server.java
	jetty-server/src/main/java/org/eclipse/jetty/server/handler/ConnectHandler.java
	jetty-server/src/main/java/org/eclipse/jetty/server/handler/GzipHandler.java
	jetty-server/src/main/java/org/eclipse/jetty/server/nio/SelectChannelConnector.java
	jetty-server/src/test/java/org/eclipse/jetty/server/HttpServerTestBase.java
	jetty-server/src/test/java/org/eclipse/jetty/server/LocalAsyncContextTest.java
	jetty-server/src/test/java/org/eclipse/jetty/server/RequestTest.java
	jetty-server/src/test/java/org/eclipse/jetty/server/ResponseTest.java
	jetty-server/src/test/java/org/eclipse/jetty/server/SuspendHandler.java
	jetty-server/src/test/java/org/eclipse/jetty/server/handler/ConnectHandlerTest.java
	jetty-server/src/test/java/org/eclipse/jetty/server/session/SessionHandlerTest.java
	jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SSLCloseTest.java
	jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SSLEngineTest.java
	jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SslSocketServerTest.java
	jetty-servlet/pom.xml
	jetty-servlet/src/main/java/org/eclipse/jetty/servlet/DefaultServlet.java
	jetty-servlets/pom.xml
	jetty-servlets/src/main/java/org/eclipse/jetty/servlets/GzipFilter.java
	jetty-servlets/src/test/java/org/eclipse/jetty/servlets/IncludableGzipFilterTest.java
	jetty-servlets/src/test/java/org/eclipse/jetty/servlets/MultipartFilterTest.java
	jetty-spdy/pom.xml
	jetty-spdy/spdy-core/pom.xml
	jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/CompressionDictionary.java
	jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/CompressionFactory.java
	jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/Controller.java
	jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/ISession.java
	jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/IStream.java
	jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/IdleListener.java
	jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/Promise.java
	jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/PushSynInfo.java
	jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/SessionException.java
	jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/StandardCompressionFactory.java
	jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/StandardSession.java
	jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/StandardStream.java
	jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/StreamException.java
	jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/api/ByteBufferDataInfo.java
	jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/api/BytesDataInfo.java
	jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/api/DataInfo.java
	jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/api/GoAwayInfo.java
	jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/api/Headers.java
	jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/api/HeadersInfo.java
	jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/api/PingInfo.java
	jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/api/ReplyInfo.java
	jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/api/RstInfo.java
	jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/api/SPDY.java
	jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/api/SPDYException.java
	jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/api/Session.java
	jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/api/SessionFrameListener.java
	jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/api/SessionStatus.java
	jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/api/Settings.java
	jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/api/SettingsInfo.java
	jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/api/Stream.java
	jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/api/StreamFrameListener.java
	jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/api/StreamStatus.java
	jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/api/StringDataInfo.java
	jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/api/SynInfo.java
	jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/api/server/ServerSessionFrameListener.java
	jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/frames/ControlFrame.java
	jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/frames/ControlFrameType.java
	jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/frames/DataFrame.java
	jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/frames/GoAwayFrame.java
	jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/frames/HeadersFrame.java
	jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/frames/NoOpFrame.java
	jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/frames/PingFrame.java
	jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/frames/RstStreamFrame.java
	jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/frames/SettingsFrame.java
	jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/frames/SynReplyFrame.java
	jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/frames/SynStreamFrame.java
	jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/frames/WindowUpdateFrame.java
	jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/generator/ControlFrameGenerator.java
	jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/generator/DataFrameGenerator.java
	jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/generator/Generator.java
	jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/generator/GoAwayGenerator.java
	jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/generator/HeadersBlockGenerator.java
	jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/generator/HeadersGenerator.java
	jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/generator/NoOpGenerator.java
	jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/generator/PingGenerator.java
	jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/generator/RstStreamGenerator.java
	jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/generator/SettingsGenerator.java
	jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/generator/SynReplyGenerator.java
	jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/generator/SynStreamGenerator.java
	jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/generator/WindowUpdateGenerator.java
	jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/ControlFrameBodyParser.java
	jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/ControlFrameParser.java
	jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/DataFrameParser.java
	jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/GoAwayBodyParser.java
	jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/HeadersBlockParser.java
	jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/HeadersBodyParser.java
	jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/NoOpBodyParser.java
	jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/Parser.java
	jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/PingBodyParser.java
	jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/RstStreamBodyParser.java
	jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/SettingsBodyParser.java
	jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/SynReplyBodyParser.java
	jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/SynStreamBodyParser.java
	jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/UnknownControlFrameBodyParser.java
	jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/WindowUpdateBodyParser.java
	jetty-spdy/spdy-core/src/test/java/org/eclipse/jetty/spdy/AsyncTimeoutTest.java
	jetty-spdy/spdy-core/src/test/java/org/eclipse/jetty/spdy/StandardSessionTest.java
	jetty-spdy/spdy-core/src/test/java/org/eclipse/jetty/spdy/StandardStreamTest.java
	jetty-spdy/spdy-core/src/test/java/org/eclipse/jetty/spdy/api/ClientUsageTest.java
	jetty-spdy/spdy-core/src/test/java/org/eclipse/jetty/spdy/api/ServerUsageTest.java
	jetty-spdy/spdy-core/src/test/java/org/eclipse/jetty/spdy/frames/DataGenerateParseTest.java
	jetty-spdy/spdy-core/src/test/java/org/eclipse/jetty/spdy/frames/GoAwayGenerateParseTest.java
	jetty-spdy/spdy-core/src/test/java/org/eclipse/jetty/spdy/frames/HeadersGenerateParseTest.java
	jetty-spdy/spdy-core/src/test/java/org/eclipse/jetty/spdy/frames/NoOpGenerateParseTest.java
	jetty-spdy/spdy-core/src/test/java/org/eclipse/jetty/spdy/frames/PingGenerateParseTest.java
	jetty-spdy/spdy-core/src/test/java/org/eclipse/jetty/spdy/frames/RstStreamGenerateParseTest.java
	jetty-spdy/spdy-core/src/test/java/org/eclipse/jetty/spdy/frames/SettingsGenerateParseTest.java
	jetty-spdy/spdy-core/src/test/java/org/eclipse/jetty/spdy/frames/SynReplyGenerateParseTest.java
	jetty-spdy/spdy-core/src/test/java/org/eclipse/jetty/spdy/frames/SynStreamGenerateParseTest.java
	jetty-spdy/spdy-core/src/test/java/org/eclipse/jetty/spdy/frames/TestSPDYParserListener.java
	jetty-spdy/spdy-core/src/test/java/org/eclipse/jetty/spdy/frames/WindowUpdateGenerateParseTest.java
	jetty-spdy/spdy-core/src/test/java/org/eclipse/jetty/spdy/parser/LiveChromiumRequestParserTest.java
	jetty-spdy/spdy-core/src/test/java/org/eclipse/jetty/spdy/parser/ParseVersusCacheBenchmarkTest.java
	jetty-spdy/spdy-core/src/test/java/org/eclipse/jetty/spdy/parser/UnknownControlFrameTest.java
	jetty-spdy/spdy-jetty-http-webapp/pom.xml
	jetty-spdy/spdy-jetty-http-webapp/src/main/config/etc/jetty-spdy.xml
	jetty-spdy/spdy-jetty-http/pom.xml
	jetty-spdy/spdy-jetty-http/src/main/java/org/eclipse/jetty/spdy/http/HTTPSPDYServerConnector.java
	jetty-spdy/spdy-jetty-http/src/main/java/org/eclipse/jetty/spdy/http/PushStrategy.java
	jetty-spdy/spdy-jetty-http/src/main/java/org/eclipse/jetty/spdy/http/ReferrerPushStrategy.java
	jetty-spdy/spdy-jetty-http/src/main/java/org/eclipse/jetty/spdy/http/ServerHTTPAsyncConnectionFactory.java
	jetty-spdy/spdy-jetty-http/src/main/java/org/eclipse/jetty/spdy/http/ServerHTTPSPDYAsyncConnection.java
	jetty-spdy/spdy-jetty-http/src/main/java/org/eclipse/jetty/spdy/http/ServerHTTPSPDYAsyncConnectionFactory.java
	jetty-spdy/spdy-jetty-http/src/test/java/org/eclipse/jetty/spdy/http/AbstractHTTPSPDYTest.java
	jetty-spdy/spdy-jetty-http/src/test/java/org/eclipse/jetty/spdy/http/ConcurrentStreamsTest.java
	jetty-spdy/spdy-jetty-http/src/test/java/org/eclipse/jetty/spdy/http/ProtocolNegotiationTest.java
	jetty-spdy/spdy-jetty/pom.xml
	jetty-spdy/spdy-jetty/src/main/java/org/eclipse/jetty/spdy/AsyncConnectionFactory.java
	jetty-spdy/spdy-jetty/src/main/java/org/eclipse/jetty/spdy/EmptyAsyncConnection.java
	jetty-spdy/spdy-jetty/src/main/java/org/eclipse/jetty/spdy/EmptyAsyncEndPoint.java
	jetty-spdy/spdy-jetty/src/main/java/org/eclipse/jetty/spdy/SPDYAsyncConnection.java
	jetty-spdy/spdy-jetty/src/main/java/org/eclipse/jetty/spdy/SPDYClient.java
	jetty-spdy/spdy-jetty/src/main/java/org/eclipse/jetty/spdy/SPDYServerConnector.java
	jetty-spdy/spdy-jetty/src/main/java/org/eclipse/jetty/spdy/ServerSPDYAsyncConnectionFactory.java
	jetty-spdy/spdy-jetty/src/test/java/org/eclipse/jetty/spdy/AbstractTest.java
	jetty-spdy/spdy-jetty/src/test/java/org/eclipse/jetty/spdy/ClosedStreamTest.java
	jetty-spdy/spdy-jetty/src/test/java/org/eclipse/jetty/spdy/FlowControlTest.java
	jetty-spdy/spdy-jetty/src/test/java/org/eclipse/jetty/spdy/GoAwayTest.java
	jetty-spdy/spdy-jetty/src/test/java/org/eclipse/jetty/spdy/HeadersTest.java
	jetty-spdy/spdy-jetty/src/test/java/org/eclipse/jetty/spdy/IdleTimeoutTest.java
	jetty-spdy/spdy-jetty/src/test/java/org/eclipse/jetty/spdy/PingTest.java
	jetty-spdy/spdy-jetty/src/test/java/org/eclipse/jetty/spdy/ProtocolViolationsTest.java
	jetty-spdy/spdy-jetty/src/test/java/org/eclipse/jetty/spdy/PushStreamTest.java
	jetty-spdy/spdy-jetty/src/test/java/org/eclipse/jetty/spdy/ResetStreamTest.java
	jetty-spdy/spdy-jetty/src/test/java/org/eclipse/jetty/spdy/SPDYClientFactoryTest.java
	jetty-spdy/spdy-jetty/src/test/java/org/eclipse/jetty/spdy/SPDYServerConnectorTest.java
	jetty-spdy/spdy-jetty/src/test/java/org/eclipse/jetty/spdy/SSLEngineLeakTest.java
	jetty-spdy/spdy-jetty/src/test/java/org/eclipse/jetty/spdy/SSLSynReplyTest.java
	jetty-spdy/spdy-jetty/src/test/java/org/eclipse/jetty/spdy/SettingsTest.java
	jetty-spdy/spdy-jetty/src/test/java/org/eclipse/jetty/spdy/SynDataReplyDataLoadTest.java
	jetty-spdy/spdy-jetty/src/test/java/org/eclipse/jetty/spdy/SynReplyTest.java
	jetty-spdy/spdy-jetty/src/test/java/org/eclipse/jetty/spdy/UnsupportedVersionTest.java
	jetty-start/pom.xml
	jetty-util/pom.xml
	jetty-util/src/main/java/org/eclipse/jetty/util/URIUtil.java
	jetty-webapp/pom.xml
	jetty-websocket/pom.xml
	jetty-websocket/src/main/java/org/eclipse/jetty/websocket/DeflateFrameExtension.java
	jetty-websocket/src/main/java/org/eclipse/jetty/websocket/WebSocketConnectionD00.java
	jetty-websocket/src/main/java/org/eclipse/jetty/websocket/WebSocketHandler.java
	jetty-websocket/src/test/java/org/eclipse/jetty/websocket/SafariWebsocketDraft0Test.java
	jetty-websocket/src/test/java/org/eclipse/jetty/websocket/WebSocketServletRFCTest.java
	jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/helper/SafariD00.java
	jetty-xml/pom.xml
	jetty-xml/src/main/java/org/eclipse/jetty/xml/XmlConfiguration.java
	jetty-xml/src/test/java/org/eclipse/jetty/xml/XmlConfigurationTest.java
	pom.xml
	test-continuation/pom.xml
	test-jetty-nested/pom.xml
	test-jetty-servlet/pom.xml
	test-jetty-servlet/src/main/java/Jetty400Repro.java
	test-jetty-servlet/src/main/java/org/eclipse/jetty/testing/HttpTester.java
	test-jetty-servlet/src/test/java/org/eclipse/jetty/testing/HttpTesterTest.java
	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
2012-07-20 11:07:57 +10:00
Greg Wilkins bc02ce4de7 jetty-9 progress on jetty-servlets test harnesses 2012-07-16 16:01:44 +10:00
Greg Wilkins e70df19248 jetty-9 progress on more unit tests 2012-07-13 22:55:40 +10:00
Jesse McConnell 81d72052c8 merged master to jetty-8 2012-07-11 14:04:49 -05:00
Jesse McConnell aa941f5711 quick pass through to clean up missing or incorrect license blocks 2012-07-11 12:29:46 -05:00
Greg Wilkins f8187106fc jetty-9 do not 200 until handled 2012-07-03 19:22:51 +02:00
Joakim Erdfelt d0daf16d17 Fixing missing '\r\n' on Connection: Upgrade 2012-06-25 15:55:01 -07:00
Jan Bartel a7b1dd5e93 Merge remote-tracking branch 'origin/master' into jetty-8 2012-06-07 00:59:37 +02:00
Greg Wilkins 98a7f19ff9 jetty-9 some test clean ups 2012-06-06 13:27:56 +02:00
Greg Wilkins e093732d40 381521 set Vary:Accept-Encoding header for content that might be compressed 2012-06-05 17:31:24 +02:00
Greg Wilkins 5415517cc0 jetty-9 organize imports 2012-06-05 14:06:18 +02:00
Greg Wilkins c318cb8167 jetty-9 jetty-security passing tests 2012-06-05 14:02:44 +02:00
Greg Wilkins 96cbd53c47 jetty-9 jetty-server passing tests 2012-06-04 17:27:46 +02:00
Jan Bartel 9149a69446 Merge remote-tracking branch 'origin/master' into jetty-8 2012-06-04 13:49:25 +02:00
Greg Wilkins 66d171f7d0 381521 set Vary:Accept-Encoding header for compressed content 2012-06-04 11:08:02 +02:00
Greg Wilkins b2a55556b0 jetty-9 sbordet more tests 2012-06-01 00:32:09 +02:00
Greg Wilkins c274cb6413 jetty-9 removed horrid hack to make onClose events work 2012-05-25 09:41:23 +02:00
Greg Wilkins 0789690cea jetty-9 horrid hack to make onClose events work 2012-05-24 22:00:45 +02:00
Greg Wilkins 4fa4daf369 jetty-9 ResponseTests passing 2012-05-24 15:21:14 +02:00
Greg Wilkins 1e662c6311 jetty-9 RequestTests passing 2012-05-23 22:52:27 +02:00
Greg Wilkins 4473572b6d jetty-9 more progress with RFC2616 tests 2012-05-23 18:04:50 +02:00
Greg Wilkins 8b98e3918c jetty-9 more progress with server tests 2012-05-23 11:49:21 +02:00
Greg Wilkins 294150f485 jetty-9 passing timeout tests 2012-05-23 10:19:23 +02:00
Greg Wilkins b8517abb14 jetty-9 improved contract between HttpConnection and HttpChannel 2012-05-22 22:28:26 +02:00
Jan Bartel 34954bc617 Merge remote-tracking branch 'origin/master' into jetty-8 2012-05-22 17:28:40 +02:00
Greg Wilkins d436400db1 Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project 2012-05-22 14:44:17 +02:00
Greg Wilkins 077b220cf8 380212 Clear buffer if parsing fails due to full buffer 2012-05-22 14:23:40 +02:00
Greg Wilkins 40ed3a013a jetty-9 some progress on HTTP error handling but more work needed. See SelectChannelServerTest 2012-05-18 13:12:38 +02:00
Greg Wilkins 74e0063f3c jetty-9 fixed error handling state 2012-05-18 09:27:26 +02:00
Greg Wilkins b9a2661a4e jetty-9 removed HttpException 2012-05-17 15:12:45 +02:00
Greg Wilkins 6502370426 jetty-9 continue clean up of HttpConnector. Removed idle check 2012-05-17 14:14:56 +02:00
Greg Wilkins 1c319703b9 jetty-9 converted parser to consume all 2012-05-15 16:03:07 +02:00
Greg Wilkins 68f8e073db jetty-9 progress on unit tests and LocalConnector 2012-05-14 19:58:09 +02:00
Greg Wilkins 835961dca8 jetty-9 updated http tests for NEED_COMMIT changes 2012-05-11 18:18:34 +02:00
Greg Wilkins cc0266f733 jetty-9 more HttpChannel refactoring 2012-05-11 16:51:24 +02:00
Greg Wilkins d7729422f6 jetty-9 first HTTP requests handled and served 2012-05-11 10:38:57 +02:00
Greg Wilkins e348f2d4f5 jetty-9 progress on jetty-server 2012-05-10 12:19:16 +02:00
Simone Bordet 2b0cbac192 Added HttpScheme.asString(). 2012-05-09 17:09:25 +02:00
Greg Wilkins 0c81b36e04 jetty-9 work in progress on jetty-server 2012-05-09 08:30:09 +02:00
Greg Wilkins af2fe73f33 jetty-9 fixed test for compressed content 2012-05-08 17:39:27 +02:00
Greg Wilkins 6d64bcd38a jetty-9 more removal of AsyncConnection 2012-05-08 15:30:32 +02:00
Jan Bartel 2131a40559 Merge remote-tracking branch 'origin/master' into jetty-8 2012-05-07 13:54:30 +02:00
Greg Wilkins ad108c42c9 jetty-9 refactored common IOFuture pattern 2012-05-04 08:52:27 +02:00
Greg Wilkins a1d8c640ce jetty-9 removed onInputShutdown 2012-05-03 22:11:58 +02:00
Greg Wilkins c61497327a jetty-9 new jetty-io NIO.2 inspired design, mostly working but more work needed on SSL 2012-05-02 17:22:55 +02:00
Greg Wilkins c7f25b0928 jetty-9 work in progress 2012-04-26 10:03:21 +10:00
Thomas Becker 8e4f2bb412 New test for GzipFilter that tests writing a text message to the outputstream and setting the status code afterwards
Change-Id: I867b05f2e5d60cebe8a66ed373c28aaf80f5765f
2012-04-25 13:08:47 +02:00
Greg Wilkins 5e83df20c8 various sonar/findbug code cleanups 2012-04-25 00:00:54 +10:00
Greg Wilkins adb1d86ab8 jetty-9 work in progress 2012-04-13 12:08:46 +10:00
Greg Wilkins f144b6562e Merge remote-tracking branch 'origin/master' into jetty-8
Conflicts:
	jetty-servlets/src/test/java/org/eclipse/jetty/servlets/gzip/GzipTester.java
2012-04-12 22:20:01 +10:00
Greg Wilkins f9a75984f0 374504: updated cookies for rfc6265 2012-04-12 20:24:50 +10:00
Greg Wilkins ee2d289f63 Merge remote-tracking branch 'origin/master' into jetty-8
Conflicts:
	jetty-npn/pom.xml
	jetty-osgi/jetty-osgi-boot-jsp/META-INF/MANIFEST.MF
	jetty-osgi/jetty-osgi-boot-jsp/src/main/java/org/eclipse/jetty/osgi/boot/jasper/WebappRegistrationCustomizerImpl.java
	jetty-osgi/jetty-osgi-boot-jsp/src/main/java/org/eclipse/jetty/osgi/boot/jsp/FragmentActivator.java
	jetty-osgi/jetty-osgi-boot-logback/META-INF/MANIFEST.MF
	jetty-osgi/jetty-osgi-boot-warurl/META-INF/MANIFEST.MF
	jetty-osgi/jetty-osgi-boot/META-INF/MANIFEST.MF
	jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/internal/webapp/WebBundleDeployerHelper.java
	jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/internal/webapp/WebBundleTrackerCustomizer.java
	jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/utils/internal/DefaultFileLocatorHelper.java
	jetty-osgi/jetty-osgi-equinoxtools/META-INF/MANIFEST.MF
	jetty-osgi/jetty-osgi-httpservice/META-INF/MANIFEST.MF
	jetty-spdy/spdy-jetty-http-webapp/pom.xml
	jetty-spdy/spdy-jetty-http/pom.xml
	jetty-spdy/spdy-jetty/pom.xml
2012-04-12 16:02:34 +10:00
Greg Wilkins 20a3d3c12e 376424: do not recycle buffers before content consumed asynchronously 2012-04-11 18:21:39 +10:00
Thomas Becker 2b83d9d954 375692: cosmetic changes to get rid of warnings, etc.
Change-Id: Id4d76a7f6e5bd989505e5233af73d5526b8e7c1f
2012-04-02 13:41:36 +02:00
Jan Bartel 45050ebac9 Merge remote-tracking branch 'origin/master' into jetty-8 2012-04-02 17:49:33 +10:00
Greg Wilkins 9244292fca 375692: simplified gzipfilter 2012-04-02 12:09:03 +10:00
Thomas Becker 2278d27235 375692: GzipFilter support for deflate
Change-Id: I4a42d750cfbbb61078adafa1e2bcbc1973198dca
2012-03-30 11:02:44 +02:00
Greg Wilkins feca0aa672 jetty-9 rename to controller and processor 2012-03-30 02:04:12 +11:00
Greg Wilkins b267511f8f jetty-9 sketched out httpchannel blocking read 2012-03-28 23:31:39 +11:00
Greg Wilkins 2bcf611e5e jetty-9 work in progress. Further simplification of jetty-io 2012-03-27 00:19:43 +11:00
Greg Wilkins e77f4344ac jetty-9 work in progress on HttpConnection to HttpChannel split 2012-03-23 16:29:38 +11:00
Greg Wilkins dc29d73d0b jetty-9 work in progress. developing ServerConnection abstraction 2012-03-21 14:42:33 +11:00
Greg Wilkins c04a195256 jetty-9 work in progress on remaking connection contracts 2012-03-16 10:06:23 +11:00
Simone Bordet fef74963af Forgotten modifications from Jetty7 2012-03-14 19:39:21 +01:00
Greg Wilkins 10cc4ca498 jetty-9 refactored jetty-http to support injected state 2012-03-13 13:35:48 +11:00
Greg Wilkins e757e5e54d jetty-9 work in progress jetty-server 2012-03-08 21:37:03 +11:00
Greg Wilkins 40c9dd77bf jetty-9 javadoc and code cleanups 2012-03-08 15:23:45 +11:00
Greg Wilkins 03525bfe46 jetty-9 javadoc and code cleanups 2012-03-08 15:18:17 +11:00
Greg Wilkins 8c25941e04 jetty-9 jetty-http passing unit tests 2012-03-08 14:13:40 +11:00
Jesse McConnell 381615f52d merge from master 2012-03-07 16:44:31 -06:00
Greg Wilkins 3d12ef7075 jetty-9 work in progress 2012-03-07 17:26:33 +11:00
Jan Bartel 0c4450dc5d JETTY-1409 GzipFilter will double-compress application/x-gzip content 2012-03-05 14:10:47 +11:00
Jesse McConnell 72330dc5f3 Merge branch 'master' into jetty-8 2012-03-02 08:08:29 -06:00
Greg Wilkins 3892549202 370285: chunk content if merged with new content 2012-03-02 16:48:48 +11:00
Greg Wilkins a4bee5b12d jetty-9 work in progress on new HttpGenerator 2012-03-02 11:39:42 +11:00
Jesse McConnell 0731cbe64d Merge branch 'master' into jetty-8 2012-02-22 14:42:39 -06:00
Thomas Becker 19fae56d6d 372190: HttpContent.getIndirectBuffer() close InputStream null check 2012-02-22 09:26:17 -06:00
Thomas Becker 94c979f2b2 372190: HttpContent.getIndirectBuffer() close InputStream 2012-02-22 07:55:19 -06:00
Jesse McConnell 098428dd37 Merge branch 'master' into jetty-8 2012-02-15 13:49:23 -06:00
Simone Bordet adeb18093b Made _bypass field protected.
This is needed because the _content field is also protected, and subclasses
may need to know if the generator is in bypass mode (and therefore access
the _content buffer directly).
2012-02-14 23:05:41 +01:00
Greg Wilkins 1fa6c998db jetty-9 committed to taking the IO out of the generator as well now. This is currently a total work in progress... with a lot of work to do 2012-02-10 17:15:04 +11:00
Greg Wilkins 5c725d4e42 jetty-9 committed to taking the IO out of the generator as well now. This is currently a total work in progress... with a lot of work to do 2012-02-10 16:37:46 +11:00
Greg Wilkins 824509b0fb jetty-9 removed plurals from enum type names 2012-02-10 00:42:44 +11:00
Greg Wilkins efb6f84503 jetty-9 more compile fixes 2012-02-09 23:55:22 +11:00
Greg Wilkins 2659d87868 jetty-9 HttpParser tests passing 2012-02-09 23:27:49 +11:00
Greg Wilkins 1137eea51d jetty-9 more parser tests working 2012-02-09 10:55:36 +11:00
Greg Wilkins 60bb4a415e jetty-9 used enums instead of cached strings. Refactor of parser in progress to IO independent style. passes 1 test 2012-02-09 01:37:03 +11:00
Jan Bartel 98684397fd Merge remote-tracking branch 'origin/master' into jetty-8 2012-01-18 14:17:41 +11:00
Greg Wilkins 9ff8633554 368821 SslConnection.handle always calls wrapped Connection.handle, so state can be processed 2012-01-18 13:39:24 +11:00
Jesse McConnell 90184ab3c3 Latest merge from master 2012-01-17 13:36:44 -06:00
Greg Wilkins 50fe23882a 368787 always set token view to new header buffers in httpparser 2012-01-17 15:24:52 +11:00
Jan Bartel 47b7b6db70 368113 Support servlet mapping to "" 2012-01-12 10:33:25 +11:00
Jan Bartel 691efcc7ca Merge remote-tracking branch 'origin/master' into jetty-8 2012-01-11 16:35:57 +11:00
Greg Wilkins 968a2ac95b 368240: Added concept of join to AggregateLifeCycle. Used by HttpClient and AbstractConnector 2012-01-11 00:09:34 +11:00
Jan Bartel c3643d9937 Merge remote-tracking branch 'origin/master' into jetty-8 2011-12-21 12:37:23 +11:00
Greg Wilkins b7d8bd4f28 364638 HttpParser closes if data received while seeking EOF. Tests fixed to cope 2011-12-20 10:55:56 +11:00
Greg Wilkins f7103d88f9 364638 reverted write after shutdown handling 2011-12-19 21:56:42 +11:00
Greg Wilkins b027779830 364638 check for idle after shutdown output 2011-12-19 16:53:14 +11:00
Greg Wilkins de005c68fd Revert "Merge branch 'release-8'"
This reverts commit 9e72457941, reversing
changes made to df12605f0e.
2011-11-30 16:27:30 +11:00
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
Simone Bordet 8f1fff78c0 Improved dumping capabilities of HttpClient, and rewritten toString() methods using String.format(). 2011-11-24 10:16:19 +01:00
Jan Bartel 644ea655d5 363993 EOFException parsing HEAD response in HttpTester 2011-11-22 18:15:18 +11:00
Greg Wilkins 024cf605e5 sensible sized default buffers 2011-11-22 16:48:39 +11:00
Jan Bartel 127a5af8d7 Merge remote-tracking branch 'origin/master' into jetty-8 2011-11-17 10:59:54 +11:00
Greg Wilkins 400bdd1e9a 349110 fixed bypass chunk handling 2011-11-16 08:36:42 +11:00
Greg Wilkins edbea0c613 363757 partial fix 2011-11-15 23:19:46 +11:00
Greg Wilkins 722f390800 numerous findbugs inspired cleanups 2011-11-15 11:22:35 +11:00
Jan Bartel 0e541c4c24 363408 GzipFilter should not attempt to compress HTTP status 204 2011-11-14 17:29:32 +11:00
Greg Wilkins 26bf17f9c1 removed lock from HttpParser. Altered way that returnBuffers called to avoid nulling buffer for other thread 2011-11-14 12:08:21 +11:00
Greg Wilkins af70c3f609 Merge remote-tracking branch 'origin/master' into jetty-7.6 2011-11-11 13:13:55 +11:00
Greg Wilkins a62061944e removed EndPoint.isBufferingInput 2011-11-11 11:41:29 +11:00
Simone Bordet 09999a629d Removed EndPoint.isBufferingOutput(). 2011-11-10 21:52:33 +01:00
Jan Bartel 3dace7fc86 Merge remote-tracking branch 'origin/master' into jetty-8 2011-11-10 21:46:10 +11:00
Jan Bartel ac7caeadf9 362468 NPE at line org.eclipse.jetty.io.BufferUtil.putHexInt 2011-11-10 21:45:07 +11:00
Greg Wilkins 7a9b8f1e9d reverted last changes due to instability 2011-11-10 12:11:58 +11:00
Greg Wilkins d61258ec4e clean ups from review from sbordet.
Removed isBufferred
fixed instanceof ThreadDeath
avoid race with onInputShutdown
2011-11-10 10:12:37 +11:00
Greg Wilkins c272c13cbf revert no content state 2011-11-09 20:28:59 +11:00
Greg Wilkins a36342438c cleaned up some unit tests 2011-11-09 17:03:11 +11:00
Greg Wilkins 7a082280f1 Merge remote-tracking branch 'origin/master' into jetty-7.6
Conflicts:
	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-client/src/main/java/org/eclipse/jetty/client/HttpConnection.java
	jetty-client/src/main/java/org/eclipse/jetty/client/SelectConnector.java
	jetty-continuation/pom.xml
	jetty-deploy/pom.xml
	jetty-distribution/pom.xml
	jetty-http-spi/pom.xml
	jetty-http/pom.xml
	jetty-http/src/main/java/org/eclipse/jetty/http/ssl/SslContextFactory.java
	jetty-io/pom.xml
	jetty-io/src/main/java/org/eclipse/jetty/io/nio/ChannelEndPoint.java
	jetty-io/src/main/java/org/eclipse/jetty/io/nio/SelectChannelEndPoint.java
	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-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/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-start/pom.xml
	jetty-util/pom.xml
	jetty-util/src/test/java/org/eclipse/jetty/util/log/LogTest.java
	jetty-util/src/test/java/org/eclipse/jetty/util/log/NamedLogTest.java
	jetty-webapp/pom.xml
	jetty-websocket/pom.xml
	jetty-websocket/src/main/java/org/eclipse/jetty/websocket/WebSocketConnectionD13.java
	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-11-07 18:09:31 +11:00
Greg Wilkins 202475aad9 clean build 2011-11-07 15:34:33 +11:00
Jesse McConnell 2b6fec713c Merge branch 'master' into jetty-8 2011-11-02 16:47:04 -05:00
David Rosell c83b02c4a7 [Bug 362407] setTrustStore(Resource) -> setTrustStoreResource(R) 2011-11-02 14:37:02 -05:00
Greg Wilkins 5aac176fbd some Async client tests passing 2011-10-28 11:38:41 +11:00
Greg Wilkins 3dfd8b7698 jetty-server passing tests 2011-10-27 00:38:05 +11:00
Greg Wilkins 4258b6f385 SslConnection server side mostly working 2011-10-26 22:55:02 +11:00
Greg Wilkins 61664d3c0f Added concept of SslConnection 2011-10-26 01:15:59 +11:00
Greg Wilkins 6a17c69bfb Non SSL client working 2011-10-24 17:14:56 +11:00
Jan Bartel fc497fe1e8 Merge remote-tracking branch 'origin/master' into jetty-8 2011-10-24 16:30:10 +11:00
Greg Wilkins a642f7b55c Merge remote-tracking branch 'origin/master' into jetty-7.6
Conflicts:
	jetty-http/src/main/java/org/eclipse/jetty/http/HttpGenerator.java
	jetty-io/src/main/java/org/eclipse/jetty/io/nio/SslSelectChannelEndPoint.java
2011-10-24 11:27:42 +11:00
Greg Wilkins 5ee01184ac reworked async client connection 2011-10-24 11:23:29 +11:00
Greg Wilkins cd0628ab66 Added isDebugEnabled guards to debugging that generates garbage 2011-10-22 09:39:54 +11:00
Jan Bartel 0ba6fc7408 Merge remote-tracking branch 'origin/master' into jetty-8 2011-10-21 14:55:39 +11:00
Greg Wilkins 0e284f78f5 Protected HttpParser from multiple entry. 2011-10-20 12:18:10 +11:00
Greg Wilkins 74fd2e8965 Merge branch 'master' into jetty-7.6
Conflicts:
	jetty-client/src/main/java/org/eclipse/jetty/client/HttpConnection.java
	jetty-io/src/main/java/org/eclipse/jetty/io/nio/SslSelectChannelEndPoint.java
2011-10-19 17:43:55 +11:00
Greg Wilkins d63577b4e9 361325 359292 Allow KeyStore to be set 2011-10-19 15:20:01 +11:00
Greg Wilkins 6edb7c1930 organised imports 2011-10-18 15:05:22 +11:00
Greg Wilkins e43b718fb1 Refactored NIO to better handle half closes. Applied the following policy:
Call shutdownOutput to signal the other end that you have written all the data that your are going to write (eg and the end of a non persistent HTTP response).   This can be done either by generator (when it is complete) or coordinator or handle - but we need to decide which and have only 1 doing it.
    Call shutdownInput to signal your own end that you have read -1 and to allow other local code to check that with an isInputShutdown. Ideally we could get by without any calls at all to shutdownInput, so long as we well handle reading -1 (Currently we don't).  This should be done by whatever does the IO read.
    Calling close should always be a real TCP close, even with SSL. SSL shutdown
    The default handling of an idle callback should be close.  But some connections (NOT endpoints) may implement idle as initiating a shutdown exchange (eg websocket close).   If they do, this is state that should be held in the connection or parser - ie do-this-exhange-and-then-shutdown
    Call close when you want to shutdown Output and you have already read -1, so input is already shutdown.   We need to double verify that this is correct and that if a FIN has been received from the other end, that a close will not result in a reset.  I'll do that today.
    Call close when you want to shutdown Input and output has already been shutdown.  This means you have read -1 after having sent a FIN.
    Call close on any errors.

The current state is that server HttpConnection appears to be working well.  Other connection types have not been updated and/or tested
2011-10-18 14:38:02 +11:00
Jan Bartel d862348b4c Merge remote-tracking branch 'origin/master' into jetty-8
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/HttpConnection.java
2011-10-06 18:31:57 +11:00
Simone Bordet 12469af499 Fixed case where the http parser has received some but not all data, and suddenly reads -1. 2011-10-05 16:36:33 +02:00
Greg Wilkins f778867f32 357240 ensure half closed is not schedule with no progress 2011-10-05 14:48:47 +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
Greg Wilkins 79e431f330 cleanup 2011-09-29 17:36:23 +10:00
Greg Wilkins d0a2557527 357240 fixed client connection recycle 2011-09-29 15:50:09 +10:00
Greg Wilkins 6eaa1364e3 357240 work in progress 2011-09-28 16:21:57 +10:00
Thomas Becker 0d8bd99d6a Basic functionality for ProxyRule implemented 2011-09-26 17:50:27 -05:00
Greg Wilkins df0371796e fixed bad import 2011-09-26 15:03:12 +10:00
Greg Wilkins 0d09b6e310 358674 Still allows sslv3 for now 2011-09-23 14:11:04 +10:00
Greg Wilkins 75645cef0e 358674 Added include/exclude protocols to SslContextFactory 2011-09-23 08:02:42 +10:00
Jesse McConnell 7c7fc30b90 Merge over from jetty 7 master 2011-09-07 16:08:35 -05:00
Greg Wilkins 65a1e84886 misc findbugs cleanups 2011-09-07 15:57:18 +10:00
Jan Bartel 1e079f06c9 Merge remote-tracking branch 'origin/master' into jetty-8 2011-09-01 14:11:53 +10:00
Greg Wilkins 2a5a3a4d01 free generator buffers 2011-08-29 12:26:48 +10:00
Joakim Erdfelt 79db394552 Merge from trunk 2011-08-26 10:12:45 -07:00
Michael Gorovoy 19a8916982 353624 HttpURI accepts java.net.URI object in constructor 2011-08-25 18:51:29 -04:00
Joakim Erdfelt f15617fbb2 293739 - Deprecate static Jetty Log usage in favor of named logs
+ Finished conversion of jetty-continuation, jetty-http, jetty-io
2011-08-24 12:51:39 -07: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 06e7813539 Testing some perceived odd behavior with MimeTypes object. 2011-08-12 14:04:33 -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
Jan Bartel 548696ef60 354204 - Charset encodings property file not used 2011-08-09 13:51:14 +10:00
Michael Gorovoy d496a4f80a 354014 Content-Length is passed to wrapped response in GZipFilter 2011-08-08 18:03:36 -04:00
Jan Bartel 02a66a00fb Merge remote-tracking branch 'origin/master' into jetty-8
Conflicts:
	VERSION.txt
	jetty-osgi/jetty-osgi-boot-logback/META-INF/MANIFEST.MF
	jetty-osgi/jetty-osgi-equinoxtools/src/main/java/org/eclipse/jetty/osgi/equinoxtools/WebEquinoxToolsActivator.java
	pom.xml
2011-08-01 14:39:39 +10:00
Greg Wilkins 5859a85919 353073 WebSocketClient 2011-07-26 17:31:55 +10: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
Greg Wilkins 2be177484e Miscellaneous changes resulting from the optimization for 7.5.x
Mostly refining debug and toString()
Use shutdown for idle expiry
2011-07-22 18:12:56 +10:00
Greg Wilkins f496c26c71 352421 HttpURI paths beginning with . 2011-07-22 11:03:48 +10:00
Greg Wilkins f52995b4ba Merge branch 'master' into performance 2011-07-14 10:37:41 +10:00
Jesse McConnell 0816c3cdab noticed this class is a hold over from 1.2 support so switched its
single usage over to Collections.singletonList()
2011-07-13 13:16:59 -05:00
Greg Wilkins 287d98d322 release header buffer early 2011-07-12 20:54:00 +10: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 b6116064cd return buffer while request is handled 2011-07-08 11:36:07 +10:00
Greg Wilkins aa25e3efe9 get a body buffer if needed 2011-07-07 19:50:28 +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
Greg Wilkins b890ff8fb2 applied jetty-7p 7f68abf..b2e4270, 7f68abf..a900c5e, 9a93c9e..9f94539. decomposed async and blocking handling. Simplified HttpFields and Buffer handling from the HttpParser. 2011-07-07 12:16:58 +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
Simone Bordet e438787325 Reviewed and cleaned up code for #345615 (Enable SSL Session caching).
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3223 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-20 12:46:57 +00:00
Greg Wilkins fb7b0a3298 javadoc
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3213 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-18 22:18:17 +00:00
Jesse McConnell 49bc4b51a0 fix javadoc errors
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3170 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-17 16:18:28 +00:00
Greg Wilkins c53749c232 338364 Fixed expires header for set cookies
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3162 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-17 06:55:40 +00:00
Greg Wilkins c004175909 346014 Fixed full HttpGenerator
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3158 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-16 23:42:26 +00:00
Michael Gorovoy e5f549664e 345615 SSL Session caching improvements and test
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3157 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-16 22:54:53 +00:00
Michael Gorovoy ab85bcda4f 345615 Enable SSL Session caching
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3145 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-14 01:30:26 +00:00
Michael Gorovoy dbcdcc6ce6 345656 Disambiguate SslContextFactory#validateCerts property
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3141 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-13 17:52:09 +00:00
Michael Gorovoy 559b7c4358 345679 Allow setting an initialized KeyStore as keystore/truststore of SslContextFactory
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3132 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-13 02:58:30 +00:00
Greg Wilkins bda6438013 343923 check for half closed
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3079 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-06 06:05:13 +00:00
Greg Wilkins 7227f8c6bb 343923 flush timeouts applied to outer loop
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3034 7e9141cc-0065-0410-87d8-b60c137991c4
2011-04-27 23:17:17 +00:00
Greg Wilkins 35558971d9 338807 Ignore content length in 1xx, 204, 304 responses
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2953 7e9141cc-0065-0410-87d8-b60c137991c4
2011-04-01 04:03:30 +00:00
Greg Wilkins fdf199e254 organized imports
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2912 7e9141cc-0065-0410-87d8-b60c137991c4
2011-03-25 05:59:18 +00:00
Michael Gorovoy be843880b7 340878 Integrations should be able to load their own keystores
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2910 7e9141cc-0065-0410-87d8-b60c137991c4
2011-03-24 17:22:40 +00:00
Greg Wilkins a6483bfa6f 340265 Improve handling of io shutdown in SSL
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2906 7e9141cc-0065-0410-87d8-b60c137991c4
2011-03-23 03:36:06 +00:00
Greg Wilkins dd5fc77cd1 better doco
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2895 7e9141cc-0065-0410-87d8-b60c137991c4
2011-03-16 00:28:12 +00:00
Greg Wilkins 3a267d9dd8 JETTY-1245 Pooled Buffers implementation
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2885 7e9141cc-0065-0410-87d8-b60c137991c4
2011-03-14 03:09:56 +00:00
Michael Gorovoy 626ef8271b 339150 Validate client certificate when it is used for authentication
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2882 7e9141cc-0065-0410-87d8-b60c137991c4
2011-03-12 02:01:01 +00:00
Greg Wilkins 1a6cdeb12f 338880 Fixed failing buffer range checks
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2858 7e9141cc-0065-0410-87d8-b60c137991c4
2011-03-07 02:51:05 +00:00
Joakim Erdfelt 736131230f Fixing other javadoc violations/errors
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2839 7e9141cc-0065-0410-87d8-b60c137991c4
2011-03-01 17:16:47 +00:00
Michael Gorovoy 603942da1f 316382: support a more strict SSL option with certificates
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2801 7e9141cc-0065-0410-87d8-b60c137991c4
2011-02-18 19:31:00 +00:00
Michael Gorovoy b34dbd246f 316382: support a more strict SSL option with certificates
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2799 7e9141cc-0065-0410-87d8-b60c137991c4
2011-02-16 23:41:14 +00:00
Greg Wilkins cc3d015e60 337271 Flush SSL endpoint when dispatch thread held forever
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2797 7e9141cc-0065-0410-87d8-b60c137991c4
2011-02-16 21:19:43 +00:00
Michael Gorovoy 01955d7295 316382: support a more strict SSL option with certificates
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2795 7e9141cc-0065-0410-87d8-b60c137991c4
2011-02-16 01:00:03 +00:00
Greg Wilkins 7ce3d368cf 333415 improved available handling for sockets
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2639 7e9141cc-0065-0410-87d8-b60c137991c4
2011-01-10 15:12:40 +00:00
Jesse McConnell 20c82c7a7e Bug 320457 add spnego support
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2613 7e9141cc-0065-0410-87d8-b60c137991c4
2010-12-17 22:44:17 +00:00
Greg Wilkins 176876039c 332179 Fixed formatting of negative dates
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2606 7e9141cc-0065-0410-87d8-b60c137991c4
2010-12-13 11:03:30 +00:00
Greg Wilkins d93c37b610 convenience method
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2559 7e9141cc-0065-0410-87d8-b60c137991c4
2010-11-25 05:11:18 +00:00
Greg Wilkins 6c01234e7c Several minor fixes:
Limit size of indirect buffer for direct serving of content.
default servlet redirects directories without trailing / better

git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2557 7e9141cc-0065-0410-87d8-b60c137991c4
2010-11-25 02:45:00 +00:00
Greg Wilkins 57a8287da7 330210 Improve performance of writing large bytes arrays
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2507 7e9141cc-0065-0410-87d8-b60c137991c4
2010-11-15 11:57:53 +00:00
Greg Wilkins 834e0ef1d8 324679 Fixed dedection of write before static content
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2484 7e9141cc-0065-0410-87d8-b60c137991c4
2010-11-08 06:35:19 +00:00
Greg Wilkins c76886e2aa moved B64Code to util
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2399 7e9141cc-0065-0410-87d8-b60c137991c4
2010-10-25 03:33:16 +00:00
Greg Wilkins 72e6f5ee40 328199 ensure SSL closes connections when shutdownoutput is attempted
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2388 7e9141cc-0065-0410-87d8-b60c137991c4
2010-10-22 23:12:22 +00:00
Greg Wilkins 996ff90660 328306 Serialization of FormAuthentication
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2380 7e9141cc-0065-0410-87d8-b60c137991c4
2010-10-21 09:58:13 +00:00
Greg Wilkins 75648cc095 327725 cleanup
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2368 7e9141cc-0065-0410-87d8-b60c137991c4
2010-10-19 23:10:36 +00:00
Greg Wilkins e3fe523cc7 327725 Nested ResourceCaches
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2345 7e9141cc-0065-0410-87d8-b60c137991c4
2010-10-14 01:51:42 +00:00
Greg Wilkins a47bc35e2d JETTY-1265 Reason field option in client response
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2289 7e9141cc-0065-0410-87d8-b60c137991c4
2010-09-21 07:20:07 +00:00
Greg Wilkins a456b2b600 321735 HttpClient onException called for buffer overflow.
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2213 7e9141cc-0065-0410-87d8-b60c137991c4
2010-08-16 05:46:17 +00:00
Jesse McConnell 9d7dc984b0 320457 __SPNEGO_AUTH is SPNEGO not SPNEGO-AUTH
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2184 7e9141cc-0065-0410-87d8-b60c137991c4
2010-07-27 21:59:17 +00:00
Greg Wilkins 526cef3ab3 320457 Added rfc2045 support to B64Code
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2164 7e9141cc-0065-0410-87d8-b60c137991c4
2010-07-21 04:09:12 +00:00
Greg Wilkins 599294e8f3 320264 Removed duplicate mime.property entries
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2157 7e9141cc-0065-0410-87d8-b60c137991c4
2010-07-20 00:47:10 +00:00
Jesse McConnell d36051f5de 320264 remove a duplicate mime entry
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2153 7e9141cc-0065-0410-87d8-b60c137991c4
2010-07-19 15:46:07 +00:00
Greg Wilkins 50ad34c6ca 319655 Reset HEAD status - removed debug
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2116 7e9141cc-0065-0410-87d8-b60c137991c4
2010-07-14 03:49:21 +00:00
Greg Wilkins 124663aaf1 319655 Reset HEAD status
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2115 7e9141cc-0065-0410-87d8-b60c137991c4
2010-07-14 02:45:55 +00:00
Greg Wilkins 9f0a75da75 319334 improved resource cache
Made the cache use concurrent data structures
Removed the dual NIO/BIO caches
Use the cache for streaming data
made DefaultServlet check for shared cache
some javadoc cleanups

git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2085 7e9141cc-0065-0410-87d8-b60c137991c4
2010-07-09 04:45:52 +00:00
Simone Bordet 78cafd343a Fixes #318470 (NPE caused by unboxing of field _persistent in HttpGenerator).
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2059 7e9141cc-0065-0410-87d8-b60c137991c4
2010-06-30 13:49:47 +00:00
Greg Wilkins 21f0c161d2 JETTY-547 delay close after shutdown
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1948 7e9141cc-0065-0410-87d8-b60c137991c4
2010-06-09 06:11:12 +00:00
Greg Wilkins a74286d92c 315715 Improved Cookie version handling. Server.setMaxCookieVersion
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1917 7e9141cc-0065-0410-87d8-b60c137991c4
2010-06-04 06:34:53 +00:00
Michael Gorovoy f68610a2b9 309185 even more javadoc fixes
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1901 7e9141cc-0065-0410-87d8-b60c137991c4
2010-05-27 03:55:16 +00:00
Greg Wilkins edd416d583 312948 Recycle SSL crypto buffers
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1827 7e9141cc-0065-0410-87d8-b60c137991c4
2010-05-20 10:15:15 +00:00
Greg Wilkins 91bfa30e6c 312243 Optimized timeout handling
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1764 7e9141cc-0065-0410-87d8-b60c137991c4
2010-05-12 12:20:49 +00:00
Simone Bordet 15dc2319d1 Fix for #308854 (Update test suite to JUnit4 - Module jetty-http).
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1752 7e9141cc-0065-0410-87d8-b60c137991c4
2010-05-11 15:16:01 +00:00
Simone Bordet c3d31d68b0 Fix for #304803 (Remove TypeUtil Integer and Long caches).
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1744 7e9141cc-0065-0410-87d8-b60c137991c4
2010-05-10 15:12:34 +00:00
Greg Wilkins 2f2c9cbe14 JETTY-1142 Replace Set-Cookies with same name
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1683 7e9141cc-0065-0410-87d8-b60c137991c4
2010-05-03 23:28:25 +00:00
Greg Wilkins f841262232 #309686 Fixed response buffers usage
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1650 7e9141cc-0065-0410-87d8-b60c137991c4
2010-05-03 14:18:24 +00:00
Joakim Erdfelt 6bc437c298 309185 - Fix the over 300 Javadoc warnings
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1626 7e9141cc-0065-0410-87d8-b60c137991c4
2010-04-29 23:03:04 +00:00
Joakim Erdfelt b6aba1ceae 309185 - Fix the over 300 Javadoc warnings
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1623 7e9141cc-0065-0410-87d8-b60c137991c4
2010-04-29 20:04:02 +00:00
Greg Wilkins 4966521a72 297104 fixed reset
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1558 7e9141cc-0065-0410-87d8-b60c137991c4
2010-04-23 19:36:14 +00:00
Greg Wilkins ae344afe78 297104 suppot HTTP/1.0 CONNECT
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1554 7e9141cc-0065-0410-87d8-b60c137991c4
2010-04-23 14:24:02 +00:00
Greg Wilkins a32d7cd517 JETTY-1200 SSL NIO Endpoint wraps non NIO buffers
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1535 7e9141cc-0065-0410-87d8-b60c137991c4
2010-04-21 10:25:46 +00:00
Simone Bordet 9cb41db6df Imports cleanup.
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1495 7e9141cc-0065-0410-87d8-b60c137991c4
2010-04-12 16:24:48 +00:00
Greg Wilkins b82adb9e79 297104 Improve handling of CONNECT method
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1489 7e9141cc-0065-0410-87d8-b60c137991c4
2010-04-08 12:19:03 +00:00
Greg Wilkins f3e2b0248d 306840 suppress content-length in requests without content
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1404 7e9141cc-0065-0410-87d8-b60c137991c4
2010-03-23 20:24:11 +00:00
Greg Wilkins 66533d0af9 304781 Reset HttpExchange timeout on slow request content. 304801 SSL connections FULL fix
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1342 7e9141cc-0065-0410-87d8-b60c137991c4
2010-03-05 12:04:05 +00:00
Jan Bartel e2e5f03cc2 304658
304698


git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1340 7e9141cc-0065-0410-87d8-b60c137991c4
2010-03-05 09:26:01 +00:00
Greg Wilkins 77f019b9f9 roll back attempt to handle ssl engine buffer overflow in IBM JVM
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1233 7e9141cc-0065-0410-87d8-b60c137991c4
2010-02-02 22:52:51 +00:00
Greg Wilkins 8f14f20185 attempt to handle ssl engine buffer overflow in IBM JVM
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1232 7e9141cc-0065-0410-87d8-b60c137991c4
2010-02-02 22:00:13 +00:00
Greg Wilkins d9204dcd46 send JSP text as html
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1206 7e9141cc-0065-0410-87d8-b60c137991c4
2010-01-18 22:32:31 +00:00
Greg Wilkins 4912c23732 297783 Handle HEAD reponses in HttpClient
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1157 7e9141cc-0065-0410-87d8-b60c137991c4
2009-12-17 03:31:26 +00:00
Greg Wilkins 845443322b JETTY-1156 SSL blocking close with JVM Bug busy key fix
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1146 7e9141cc-0065-0410-87d8-b60c137991c4
2009-12-11 04:51:39 +00:00
Greg Wilkins 61e8a2bf2a fixed Date handling for 1xx responses
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1094 7e9141cc-0065-0410-87d8-b60c137991c4
2009-11-25 01:49:42 +00:00
Greg Wilkins d2898371e3 clean up tests
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1089 7e9141cc-0065-0410-87d8-b60c137991c4
2009-11-24 00:00:17 +00:00
Greg Wilkins f9455c7712 demo websocket implementation
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1087 7e9141cc-0065-0410-87d8-b60c137991c4
2009-11-23 08:44:37 +00:00
Greg Wilkins b90ad09443 CVE-2009-3555 prevent renegotiation
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1047 7e9141cc-0065-0410-87d8-b60c137991c4
2009-11-15 23:41:46 +00:00
Greg Wilkins 2a3750fe1e 294563 Initial websocket implementation working
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1043 7e9141cc-0065-0410-87d8-b60c137991c4
2009-11-12 03:27:35 +00:00
Simone Bordet 3562c5e457 Fix for #293557: Add "jad" mime mapping.
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1015 7e9141cc-0065-0410-87d8-b60c137991c4
2009-10-28 11:18:58 +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 b5d16898e5 JETTY-1129 Filter control characters out of StdErrLog
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@991 7e9141cc-0065-0410-87d8-b60c137991c4
2009-10-15 19:04:48 +00:00
Greg Wilkins 0f01841df1 JETTY-1122 handle multi-byte utf8 buffer overflow better
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@979 7e9141cc-0065-0410-87d8-b60c137991c4
2009-10-07 22:52:06 +00:00
Greg Wilkins bb13f52da8 290081 Eager consume LF after CR
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@947 7e9141cc-0065-0410-87d8-b60c137991c4
2009-09-22 03:36:25 +00:00
Greg Wilkins df989b3141 JETTY-1108 SSL EOF detection
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@889 7e9141cc-0065-0410-87d8-b60c137991c4
2009-09-14 04:52:16 +00:00
Greg Wilkins edc88820ac 282543 HttpClient SSL buffer type fix
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@878 7e9141cc-0065-0410-87d8-b60c137991c4
2009-09-11 12:48:28 +00:00
Jan Bartel 01cb70fc54 JETTY-1093
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@794 7e9141cc-0065-0410-87d8-b60c137991c4
2009-09-01 01:58:05 +00:00
Greg Wilkins bebaf5bbe2 JETTY-1087
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@754 7e9141cc-0065-0410-87d8-b60c137991c4
2009-08-24 06:53:24 +00:00
Athena Yao 7e6b89f986 BUG 286911
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@746 7e9141cc-0065-0410-87d8-b60c137991c4
2009-08-20 12:25:48 +00:00
Greg Wilkins ea6f3e0d14 testing
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@662 7e9141cc-0065-0410-87d8-b60c137991c4
2009-08-07 06:12:02 +00:00
Greg Wilkins d782da2de0 283513 Check endp.isOpen when blocking read
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@646 7e9141cc-0065-0410-87d8-b60c137991c4
2009-08-05 23:57:05 +00:00
Greg Wilkins b034d1ed4c 283513 Check endp.isOpen when blocking read
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@643 7e9141cc-0065-0410-87d8-b60c137991c4
2009-08-05 23:54:22 +00:00
Joakim Erdfelt 6deb6a6446 [277403] remove system properties
* Removing many of the jetty specific System.getProperty() usages to
  make embedding more useful, replacing with fields in objects that can
  be set using standard Java mechanisms.

git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@625 7e9141cc-0065-0410-87d8-b60c137991c4
2009-08-03 20:58:25 +00:00
Greg Wilkins c6a5ddd20e JETTY-1068 better warning for buffer overflow
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@568 7e9141cc-0065-0410-87d8-b60c137991c4
2009-07-21 01:26:02 +00:00
Greg Wilkins 60cc0db395 JETTY-1068 Avoid busy flush of async SSL
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@565 7e9141cc-0065-0410-87d8-b60c137991c4
2009-07-20 08:28:52 +00:00
Greg Wilkins c2196f51d6 JETTY-1066 283357 Send 400 error for request URI parse exceptions
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@555 7e9141cc-0065-0410-87d8-b60c137991c4
2009-07-14 23:13:26 +00:00
Greg Wilkins 6096568c7f 282807 283049 282543 Improved handling of timeouts and complete. More debug
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@538 7e9141cc-0065-0410-87d8-b60c137991c4
2009-07-10 08:20:24 +00:00
Greg Wilkins 1a47662030 282807 Better handling of 100 continues if response committed
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@535 7e9141cc-0065-0410-87d8-b60c137991c4
2009-07-09 23:27:40 +00:00
Joakim Erdfelt 6aa938d5f3 Correcting JUnit usage
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@528 7e9141cc-0065-0410-87d8-b60c137991c4
2009-07-09 17:45:24 +00:00
Greg Wilkins c116cd7e63 281287 Handle date headers before 1 Jan 1970
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@524 7e9141cc-0065-0410-87d8-b60c137991c4
2009-07-09 03:48:38 +00:00
Greg Wilkins f13ac17713 280843 buffer pool mixing types
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@492 7e9141cc-0065-0410-87d8-b60c137991c4
2009-07-08 07:39:23 +00:00
Greg Wilkins a8574969b9 comment
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@454 7e9141cc-0065-0410-87d8-b60c137991c4
2009-07-01 00:47:45 +00:00
Greg Wilkins 3e18764e06 JETTY-1031
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@452 7e9141cc-0065-0410-87d8-b60c137991c4
2009-06-30 23:25:40 +00:00
Athena Yao be85a6a16d [281470] handle the case where request path == "/*" and servlet mapping uses a wildcard
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@433 7e9141cc-0065-0410-87d8-b60c137991c4
2009-06-25 09:45:47 +00:00
Greg Wilkins a8fa5dceef static code analysis cleanups
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@411 7e9141cc-0065-0410-87d8-b60c137991c4
2009-06-17 03:56:36 +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
Greg Wilkins 3cf3616308 removed reset synchs
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@393 7e9141cc-0065-0410-87d8-b60c137991c4
2009-06-13 01:12:50 +00:00
Greg Wilkins ad4ed67de2 276545 Quoted cookie paths
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@357 7e9141cc-0065-0410-87d8-b60c137991c4
2009-06-10 04:44:24 +00:00
Athena Yao 64eb0863b1 Bug 274251 Dispatch to welcome files which are servlets with no matching static resource
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@240 7e9141cc-0065-0410-87d8-b60c137991c4
2009-05-20 06:57:28 +00:00
David Jencks 33b4c7b79c Bug 276444 when formatting old-style cookie maxAge timeouts, don't wipe out the start of the cookie text
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@217 7e9141cc-0065-0410-87d8-b60c137991c4
2009-05-15 16:46:28 +00:00
Greg Wilkins ab24a94666 JETTY-1015 work in progress
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@207 7e9141cc-0065-0410-87d8-b60c137991c4
2009-05-07 06:46:40 +00:00
Greg Wilkins 5ff3346774 better char[] credential support
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@152 7e9141cc-0065-0410-87d8-b60c137991c4
2009-04-15 12:49:39 +00:00
Greg Wilkins 3a129bb90f reworked the Authentication to better support lazyness and to move towards servlet 3.0 login and logout
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@151 7e9141cc-0065-0410-87d8-b60c137991c4
2009-04-15 12:39:05 +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