559 Commits

Author SHA1 Message Date
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
5140a95144 refactored HttpConnection name 2011-10-20 15:12:19 +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
Jesse McConnell
a38f2a9e68 [maven-release-plugin] prepare for next development iteration 2011-10-11 10:16:54 -05:00
Jesse McConnell
55a1be5435 [maven-release-plugin] prepare release jetty-8.0.3.v20111011 2011-10-11 10:16:47 -05:00
Jesse McConnell
7d10182034 [maven-release-plugin] prepare for next development iteration 2011-10-11 08:47:07 -05:00
Jesse McConnell
b6ac542604 [maven-release-plugin] prepare release jetty-7.5.3.v20111011 2011-10-11 08:47:00 -05:00
Jesse McConnell
b55ec9bac1 [maven-release-plugin] prepare for next development iteration 2011-10-06 17:59:52 -05:00
Jesse McConnell
e32e8b1377 [maven-release-plugin] prepare release jetty-8.0.2.v20111006 2011-10-06 17:59:46 -05:00
Jesse McConnell
0c55c774d4 [maven-release-plugin] prepare for next development iteration 2011-10-06 17:25:38 -05:00
Jesse McConnell
4d822759de [maven-release-plugin] prepare release jetty-7.5.2.v20111006 2011-10-06 17:25:32 -05:00
Jesse McConnell
b58006b4a4 [maven-release-plugin] prepare for next development iteration 2011-10-06 09:43:37 -05:00
Jesse McConnell
7eca345e8d [maven-release-plugin] prepare release jetty-7.5.2.v20111006 2011-10-06 09:43:31 -05: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
d5304b2cbc [maven-release-plugin] prepare for next development iteration 2011-09-08 12:20:15 -05:00
Jesse McConnell
c33548d38a [maven-release-plugin] prepare release jetty-8.0.1.v20110908 2011-09-08 12:19:24 -05:00
Jesse McConnell
ebdb89dc23 [maven-release-plugin] prepare for next development iteration 2011-09-08 12:00:16 -05:00
Jesse McConnell
932245a114 [maven-release-plugin] prepare release jetty-7.5.1.v20110908 2011-09-08 12:00:10 -05:00
Jesse McConnell
721c8ab682 updating version.txt and resetting pom version to 8.0.1-SNAPSHOT 2011-09-08 11:54:53 -05:00
Jesse McConnell
37d0f53b0a updating version.txt and resetting pom versions to 7.5.1-SNAPSHOT 2011-09-08 11:40:37 -05:00
Jesse McConnell
4e47d6a7fa [maven-release-plugin] prepare for next development iteration 2011-09-07 18:16:58 -05:00
Jesse McConnell
d77a12962b [maven-release-plugin] prepare release jetty-8.0.1.v20110907 2011-09-07 18:16:50 -05:00
Jesse McConnell
6b614a54f0 [maven-release-plugin] prepare for next development iteration 2011-09-07 18:12:16 -05:00
Jesse McConnell
ce55c8c601 [maven-release-plugin] prepare release jetty-7.5.1.v20110907 2011-09-07 18:12:09 -05:00
Jesse McConnell
7c7fc30b90 Merge over from jetty 7 master 2011-09-07 16:08:35 -05:00
Jesse McConnell
1744b5bce1 reset from release 2011-09-07 11:09:46 -05:00
Jesse McConnell
ae86ad6d4e [maven-release-plugin] prepare for next development iteration 2011-09-07 10:03:16 -05:00
Jesse McConnell
86383afbd2 [maven-release-plugin] prepare release jetty-7.5.1.v20110907 2011-09-07 10:03:10 -05:00
Greg Wilkins
65a1e84886 misc findbugs cleanups 2011-09-07 15:57:18 +10:00
Jesse McConnell
40dcb10ed8 [maven-release-plugin] prepare for next development iteration 2011-09-01 12:24:32 -05:00
Jesse McConnell
db14b194fa [maven-release-plugin] prepare release jetty-8.0.0.v20110901 2011-09-01 12:24:24 -05:00