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
75c4ec733d
Merge remote-tracking branch 'origin/master' into jetty-7.6
...
Conflicts:
jetty-io/src/main/java/org/eclipse/jetty/io/nio/ChannelEndPoint.java
2011-10-20 10:01:36 +11:00
Greg Wilkins
1d00f786a5
reduce verbosity of closes
2011-10-19 23:34:21 +11:00
Greg Wilkins
d63577b4e9
361325 359292 Allow KeyStore to be set
2011-10-19 15:20:01 +11:00
Greg Wilkins
49f8b0de1a
Websocket partially refactored and passing tests
2011-10-18 21:59:49 +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
Jesse McConnell
925335dab2
merge from master
2011-10-11 09:43:27 -05:00
Greg Wilkins
06f4ada935
gentler SSL close
2011-10-11 16:05:17 +11:00
Simone Bordet
3476887f8a
Forcing call to super.close() even if _closing is already set.
2011-10-10 19:09:03 +02:00
Simone Bordet
e3949694d0
360051 SocketConnectionTest.testServerClosedConnection is excluded.
...
Reworked StreamEndPoint methods isInputShutdown(), isOutputShutdown(), shutdownInput(), shutdownOutput(), and updated subclasses to call super where appropriate.
The test had to be modified to work properly with SocketConnector, because behavior is different from SelectConnector, but the CPU spinning is fixed.
2011-10-06 17:28:17 -05:00
Simone Bordet
e741b98510
360051 SocketConnectionTest.testServerClosedConnection is excluded.
...
Reworked StreamEndPoint methods isInputShutdown(), isOutputShutdown(), shutdownInput(), shutdownOutput(), and updated subclasses to call super where appropriate.
The test had to be modified to work properly with SocketConnector, because behavior is different from SelectConnector, but the CPU spinning is fixed.
2011-10-06 16:08:12 +02: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
Greg Wilkins
ed9d9a0a33
javadoc
2011-10-06 16:39:14 +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
Simone Bordet
ae62618a00
Reworked logging, and catching IOException during the processing of a close.
2011-10-01 17:56:48 +02:00
Simone Bordet
a134664b4c
Method close() should really close the underlying channel, not only send the SSL close message.
2011-09-29 23:01:43 +02: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
603ee3dae1
357240 fixed client tests
2011-09-29 00:23:31 +10:00
Greg Wilkins
1420253643
357240 improved ishut/oshut handling
2011-09-28 22:58:14 +10:00
Greg Wilkins
fbf0fad076
357240 improved ishut/oshut handling
2011-09-28 22:50:38 +10:00
Greg Wilkins
dbf636df4d
357240 work in progress
2011-09-28 20:33:03 +10:00
Greg Wilkins
6eaa1364e3
357240 work in progress
2011-09-28 16:21:57 +10:00
Greg Wilkins
c20ce1fc4e
357240 remove buffer counts
2011-09-28 10:44:43 +10:00
Greg Wilkins
ac7fcd9ab7
357240 work in progress
2011-09-28 00:29:17 +10:00
Greg Wilkins
16d54532d6
357240 work in progress
2011-09-28 00:08:40 +10:00
Greg Wilkins
61dd1493b1
357240 work in progress
2011-09-28 00:02:59 +10:00
Greg Wilkins
9f885dcc6e
357240 removed gather write
2011-09-27 23:41:49 +10:00
Simone Bordet
ded5143700
Split "if" statement in case of flushing while closing, so if the input is shutdown we do not call closeOutbound().
2011-09-27 15:00:20 +02:00
Greg Wilkins
44923230e3
357240 safer SSL close
2011-09-27 16:57:17 +10:00
Greg Wilkins
b28a53ad52
357240 safer SSL close
2011-09-27 11:13:20 +10:00
Greg Wilkins
8195103f01
358035 idle time only active if > 0
2011-09-23 14:12:40 +10:00
Greg Wilkins
6bebdceb3a
JETTY-1377 extra logging for busy selector
2011-09-21 16:45:32 +10:00
Greg Wilkins
e15e9ddc99
JETTY-1377 extra logging for busy selector
2011-09-21 16:17:35 +10:00
Greg Wilkins
ff29a1cc51
JETTY-1322 idle sweeper checks for closed endp
2011-09-21 13:46:48 +10:00
Greg Wilkins
a6988108c3
minor cleanups and extra debug
2011-09-16 15:29:28 +10:00
Simone Bordet
9c43e04bb4
Guarding against NPE in case of concurrent stop().
2011-09-12 21:01:08 +02:00
Jesse McConnell
97dee04a68
merge over from jetty7
2011-09-08 11:51:48 -05:00
Greg Wilkins
b8556bec76
fixes from running autobahn test suite
2011-09-08 11:35:39 +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
0d17559f7d
handle -1 maxIdleTime as disabled timeout
2011-08-30 23:37:41 +10:00
Greg Wilkins
45148353ec
293739 Hide stacks in named log testing. Various other minor log cleanups in output.
2011-08-30 16:05:21 +10:00
