Commit Graph

221 Commits

Author SHA1 Message Date
Greg Wilkins 835961dca8 jetty-9 updated http tests for NEED_COMMIT changes 2012-05-11 18:18:34 +02:00
Greg Wilkins e348f2d4f5 jetty-9 progress on jetty-server 2012-05-10 12:19:16 +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
Greg Wilkins c7f25b0928 jetty-9 work in progress 2012-04-26 10:03:21 +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 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 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 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
Greg Wilkins 3d12ef7075 jetty-9 work in progress 2012-03-07 17:26:33 +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
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 824509b0fb jetty-9 removed plurals from enum type names 2012-02-10 00:42:44 +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 47b7b6db70 368113 Support servlet mapping to "" 2012-01-12 10:33:25 +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 de005c68fd Revert "Merge branch 'release-8'"
This reverts commit 9e72457941, reversing
changes made to df12605f0e.
2011-11-30 16:27:30 +11:00
Jan Bartel 127a5af8d7 Merge remote-tracking branch 'origin/master' into jetty-8 2011-11-17 10:59:54 +11:00
Greg Wilkins 722f390800 numerous findbugs inspired cleanups 2011-11-15 11:22:35 +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
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
Jan Bartel 0ba6fc7408 Merge remote-tracking branch 'origin/master' into jetty-8 2011-10-21 14:55:39 +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 1e079f06c9 Merge remote-tracking branch 'origin/master' into jetty-8 2011-09-01 14:11:53 +10:00
Michael Gorovoy 19a8916982 353624 HttpURI accepts java.net.URI object in constructor 2011-08-25 18:51:29 -04: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 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 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
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 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
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 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
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 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 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 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
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
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 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
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 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 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
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
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
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 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 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
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