d824cb3057
Fix up merge
2011-11-17 13:22:47 +11:00
127a5af8d7
Merge remote-tracking branch 'origin/master' into jetty-8
2011-11-17 10:59:54 +11:00
5ee01184ac
reworked async client connection
2011-10-24 11:23:29 +11:00
5140a95144
refactored HttpConnection name
2011-10-20 15:12:19 +11:00
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
eadc1d418a
Removed dead code.
2011-10-06 17:28:17 -05:00
8d61ce374b
Removed dead code.
2011-10-06 16:07:19 +02:00
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
45f5fd39fe
357188 Send content buffer directly
2011-09-09 17:07:24 +10:00
1e079f06c9
Merge remote-tracking branch 'origin/master' into jetty-8
2011-09-01 14:11:53 +10:00
f6d45d5650
293739 - Deprecate static Jetty Log usage in favor of named logs
...
+ Finished conversion of the rest of jetty 7.x
2011-08-24 13:14:28 -07:00
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
17e907c2fb
git diff 54e885d967 remotes/origin/jetty-8-historical | patch -p1 ; git add -A
2011-07-07 18:18:24 +10:00
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
6a2ecc493e
345704 jetty-nested works with forwarded SSL in cloudfoundry
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3140 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-13 09:21:47 +00:00
54dcc72422
343083 better handling of isSecure
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3091 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-09 00:15:57 +00:00
e38ed57324
343083 make socket params available
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3027 7e9141cc-0065-0410-87d8-b60c137991c4
2011-04-21 00:51:00 +00:00
aa398ad41c
343083 Set nested dispatch type
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3020 7e9141cc-0065-0410-87d8-b60c137991c4
2011-04-18 05:37:50 +00:00
9fe29756a7
copyrights
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2982 7e9141cc-0065-0410-87d8-b60c137991c4
2011-04-06 09:27:24 +00:00
2ca6b4521b
341736 Split jetty-nested out of war module
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2959 7e9141cc-0065-0410-87d8-b60c137991c4
2011-04-04 05:19:17 +00:00
f7a0d7d134
JETTY-1354 Added jetty-nested
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2941 7e9141cc-0065-0410-87d8-b60c137991c4
2011-03-31 07:30:08 +00:00
Jan Bartel
Greg Wilkins
Simone Bordet
Joakim Erdfelt
Greg Wilkins