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
Greg Wilkins
c1bcec61d5
jetty-9 jetty-io mostly working with all NIO buffers. Occassional failure in SSL stress test
2012-02-07 11:32:00 +11:00
Jesse McConnell
6b079ae3d8
merge from master
2012-02-01 17:25:08 -06:00
Joakim Erdfelt
fdaad62b63
Migrating old javax.* deps to new org.eclipse.jetty.orbit deps
...
+ Removed old deps in javax.*, geronimo, and asm in favor of
new org.eclipse.jetty.orbit deps
+ Added enforcer rule to prevent reintroducing the old deps.
2012-01-31 15:21:58 -07:00
Jesse McConnell
6e44f4db5f
[maven-release-plugin] prepare for next development iteration
2012-01-27 08:15:45 -06:00
Jesse McConnell
9d1ca3593e
[maven-release-plugin] prepare release jetty-8.1.0.v20120127
2012-01-27 08:15:38 -06:00
Jesse McConnell
ad6126553b
[maven-release-plugin] prepare for next development iteration
2012-01-27 08:13:06 -06:00
Jesse McConnell
4e25f7bb05
[maven-release-plugin] prepare release jetty-7.6.0.v20120127
2012-01-27 08:13:00 -06:00
Jesse McConnell
f2d0fd3cc8
revert back to 8.1.0-SNAPSHOT
2012-01-26 10:45:06 -06:00
Jesse McConnell
7ac9eb585f
revert back to 7.6.0-SNAPSHOT
2012-01-26 10:42:11 -06:00
Jesse McConnell
e98ae91ca6
[maven-release-plugin] prepare for next development iteration
2012-01-25 11:16:11 -06:00
Jesse McConnell
fb30166a7f
[maven-release-plugin] prepare release jetty-8.1.0.v20120125
2012-01-25 11:16:05 -06:00
Jesse McConnell
0c96fc40ea
[maven-release-plugin] prepare for next development iteration
2012-01-25 09:31:06 -06:00
Jesse McConnell
b455b7d94e
[maven-release-plugin] prepare release jetty-7.6.0.v20120125
2012-01-25 09:30:55 -06:00
Jesse McConnell
ec731e691d
[maven-release-plugin] prepare for next development iteration
2012-01-20 12:28:31 -06:00
Jesse McConnell
6004fd4553
[maven-release-plugin] prepare release jetty-8.1.0.RC5
2012-01-20 12:28:24 -06:00
Jesse McConnell
16833ca8c9
[maven-release-plugin] prepare for next development iteration
2012-01-20 10:50:24 -06:00
Jesse McConnell
dd80d7e868
[maven-release-plugin] prepare release jetty-7.6.0.RC5
2012-01-20 10:50:14 -06:00
Jan Bartel
98684397fd
Merge remote-tracking branch 'origin/master' into jetty-8
2012-01-18 14:17:41 +11:00
Greg Wilkins
9ff8633554
368821 SslConnection.handle always calls wrapped Connection.handle, so state can be processed
2012-01-18 13:39:24 +11:00
Jesse McConnell
90184ab3c3
Latest merge from master
2012-01-17 13:36:44 -06:00
Greg Wilkins
50fe23882a
368787 always set token view to new header buffers in httpparser
2012-01-17 15:24:52 +11:00
Jan Bartel
47b7b6db70
368113 Support servlet mapping to ""
2012-01-12 10:33:25 +11:00
Jan Bartel
691efcc7ca
Merge remote-tracking branch 'origin/master' into jetty-8
2012-01-11 16:35:57 +11:00
Greg Wilkins
968a2ac95b
368240: Added concept of join to AggregateLifeCycle. Used by HttpClient and AbstractConnector
2012-01-11 00:09:34 +11:00
Jan Bartel
1fbec51c8a
Merge remote-tracking branch 'origin/master' into jetty-8
2012-01-10 16:08:59 +11:00
Jesse McConnell
0fa4fa9b23
clean up some warnings from maven
2012-01-09 14:57:21 -06: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
f7103d88f9
364638 reverted write after shutdown handling
2011-12-19 21:56:42 +11:00
Greg Wilkins
b027779830
364638 check for idle after shutdown output
2011-12-19 16:53:14 +11:00
hmalphettes
89afbdf31d
360245 OSGi: javax.servlet packages version refactored 3.0 -> 2.6
2011-12-02 17:27:26 +08: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
Greg Wilkins
631b0ba1b6
[maven-release-plugin] prepare for next development iteration
2011-11-30 13:16:54 +11:00
Greg Wilkins
9d3745f999
[maven-release-plugin] prepare release jetty-8.1.0.RC0
2011-11-30 13:16:41 +11:00
Greg Wilkins
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
Simone Bordet
8f1fff78c0
Improved dumping capabilities of HttpClient, and rewritten toString() methods using String.format().
2011-11-24 10:16:19 +01:00
Jan Bartel
644ea655d5
363993 EOFException parsing HEAD response in HttpTester
2011-11-22 18:15:18 +11:00
Greg Wilkins
024cf605e5
sensible sized default buffers
2011-11-22 16:48:39 +11:00
Jan Bartel
127a5af8d7
Merge remote-tracking branch 'origin/master' into jetty-8
2011-11-17 10:59:54 +11:00
Greg Wilkins
400bdd1e9a
349110 fixed bypass chunk handling
2011-11-16 08:36:42 +11:00
Greg Wilkins
edbea0c613
363757 partial fix
2011-11-15 23:19:46 +11:00
Greg Wilkins
722f390800
numerous findbugs inspired cleanups
2011-11-15 11:22:35 +11:00
Jan Bartel
0e541c4c24
363408 GzipFilter should not attempt to compress HTTP status 204
2011-11-14 17:29:32 +11:00
Greg Wilkins
26bf17f9c1
removed lock from HttpParser. Altered way that returnBuffers called to avoid nulling buffer for other thread
2011-11-14 12:08:21 +11:00
Greg Wilkins
af70c3f609
Merge remote-tracking branch 'origin/master' into jetty-7.6
2011-11-11 13:13:55 +11:00
Greg Wilkins
a62061944e
removed EndPoint.isBufferingInput
2011-11-11 11:41:29 +11:00
Simone Bordet
09999a629d
Removed EndPoint.isBufferingOutput().
2011-11-10 21:52:33 +01:00
Jan Bartel
3dace7fc86
Merge remote-tracking branch 'origin/master' into jetty-8
2011-11-10 21:46:10 +11:00
Jan Bartel
ac7caeadf9
362468 NPE at line org.eclipse.jetty.io.BufferUtil.putHexInt
2011-11-10 21:45:07 +11:00
Greg Wilkins
7a9b8f1e9d
reverted last changes due to instability
2011-11-10 12:11:58 +11:00
Greg Wilkins
d61258ec4e
clean ups from review from sbordet.
...
Removed isBufferred
fixed instanceof ThreadDeath
avoid race with onInputShutdown
2011-11-10 10:12:37 +11:00
Greg Wilkins
c272c13cbf
revert no content state
2011-11-09 20:28:59 +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
Greg Wilkins
202475aad9
clean build
2011-11-07 15:34:33 +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
Greg Wilkins
5aac176fbd
some Async client tests passing
2011-10-28 11:38:41 +11:00
Greg Wilkins
3dfd8b7698
jetty-server passing tests
2011-10-27 00:38:05 +11:00
Greg Wilkins
4258b6f385
SslConnection server side mostly working
2011-10-26 22:55:02 +11:00
Greg Wilkins
61664d3c0f
Added concept of SslConnection
2011-10-26 01:15:59 +11:00
Jesse McConnell
d5320d95ba
[maven-release-plugin] prepare for next development iteration
2011-10-24 15:02:30 -05:00
Jesse McConnell
d02f74a50c
[maven-release-plugin] prepare release jetty-8.0.4.v20111024
2011-10-24 15:02:23 -05:00
Jesse McConnell
1d86da8f68
[maven-release-plugin] prepare for next development iteration
2011-10-24 14:52:54 -05:00
Jesse McConnell
5f349ecc92
[maven-release-plugin] prepare release jetty-7.5.4.v20111024
2011-10-24 14:52:48 -05:00
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