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
9fb6e9b43a
363943 ignore null attribute values
2011-11-28 14:08:09 +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
0e284f78f5
Protected HttpParser from multiple entry.
2011-10-20 12:18:10 +11:00
6edb7c1930
organised imports
2011-10-18 15:05:22 +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
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
af7252b719
353839: Ajp13Generator fix for file upload
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2011-09-22 12:08:43 +02:00
e2bdcbe38c
Ajp13Generator: code format
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2011-09-22 12:08:34 +02:00
1e079f06c9
Merge remote-tracking branch 'origin/master' into jetty-8
2011-09-01 14:11:53 +10:00
3399242d83
293739 - Deprecate static Jetty Log usage in favor of named logs
...
+ Finished conversion of jetty-ajp, jetty-client, jetty-deploy,
jetty-jaspi, jetty-jndi, jetty-plus, jetty-webapp
2011-08-24 13:01:00 -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
a8a1020917
341694 Disable AJP buffer resizing
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2985 7e9141cc-0065-0410-87d8-b60c137991c4
2011-04-06 22:24:58 +00:00
7ebc5c380b
337685 use abstract connector. more debugging output
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2927 7e9141cc-0065-0410-87d8-b60c137991c4
2011-03-30 03:43:33 +00:00
6388c6b89d
Bug 341255 resolve naming issue between AJParser and HashSessionIdManager org.eclipse.http -> org.eclipse.ajp
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2923 7e9141cc-0065-0410-87d8-b60c137991c4
2011-03-29 16:23:30 +00:00
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
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
9755ee711e
338961 AJP packet size
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2861 7e9141cc-0065-0410-87d8-b60c137991c4
2011-03-07 04:34:49 +00:00
ba0e1d3935
327109 (re)fixed AJP handling of empty packets
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2589 7e9141cc-0065-0410-87d8-b60c137991c4
2010-12-05 15:19:06 +00:00
4d6df56c12
330732 removed excess debugging
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2545 7e9141cc-0065-0410-87d8-b60c137991c4
2010-11-20 22:46:23 +00:00
e574ba8b13
327109 Fixed AJP handling of empty packets
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2328 7e9141cc-0065-0410-87d8-b60c137991c4
2010-10-07 00:21:56 +00:00
143229f544
327109 Fixed AJP handling of empty packets
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2327 7e9141cc-0065-0410-87d8-b60c137991c4
2010-10-07 00:21:41 +00:00
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
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
9245ebff82
Fixes #308848 (Update test suite to JUnit4 - Module jetty-ajp).
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1594 7e9141cc-0065-0410-87d8-b60c137991c4
2010-04-27 14:35:42 +00:00
6862891e7a
Fixes 310467 (Allow SocketConnector to create generic Connection objects).
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1562 7e9141cc-0065-0410-87d8-b60c137991c4
2010-04-26 15:23:34 +00:00
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
c23e75bc3e
JETTY-1163 AJP13 forces 8859-1 encoding
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1386 7e9141cc-0065-0410-87d8-b60c137991c4
2010-03-16 22:07:28 +00:00
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
3cf8b20f0a
clean up import
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@533 7e9141cc-0065-0410-87d8-b60c137991c4
2009-07-09 23:25:54 +00:00
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
5255060588
275396 Added ScopedHandler to set servlet scope before security handler
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@209 7e9141cc-0065-0410-87d8-b60c137991c4
2009-05-12 14:09:54 +00:00
5e11796031
configure.dtd
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@150 7e9141cc-0065-0410-87d8-b60c137991c4
2009-04-15 01:52:39 +00:00
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
Greg Wilkins
Jan Bartel
Thomas Becker
Joakim Erdfelt
Greg Wilkins
Jesse McConnell
Simone Bordet