a5d18d48ad
Attempting to get a non-ssl version of the timeout bug into a unit test
2011-12-16 14:16:32 -07:00
d52ed502b0
Sketch of test for idle expiration on SSL.
2011-12-16 21:26:37 +01:00
a88e2c5ebb
Updated toString() implementations.
2011-12-16 20:53:15 +01:00
bc48eb1f5b
366730 pass the time idle to onIdleExpire
2011-12-14 11:41:32 -08:00
468e6c284d
365267 NullPointerException in bad Address
2011-12-02 10:04:03 +11:00
de005c68fd
Revert "Merge branch 'release-8'"
...
This reverts commit 9e72457941df12605f0e
2011-11-30 16:27:30 +11:00
631b0ba1b6
[maven-release-plugin] prepare for next development iteration
2011-11-30 13:16:54 +11:00
9d3745f999
[maven-release-plugin] prepare release jetty-8.1.0.RC0
2011-11-30 13:16:41 +11:00
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
b969de1788
organized imports
2011-11-28 15:32:14 +11:00
ddce35a2e6
364638 SCEP does idle timestamp checking. New setCheckForIdle method controls onIdleExpired callback.
...
364921 a second onIdleExpired callback will result in close rather than a shutdown output.
2011-11-28 11:51:01 +11:00
cfef7c631b
Made SslBytesClientTest more robust by avoiding a race in establishing connection with the proxy.
2011-11-24 23:08:57 +01:00
ccfbb3e623
Bumped number of parses to avoid test failures.
2011-11-24 22:34:30 +01:00
b3ae06888e
First pass at implementing SSL bytes tests for the client.
2011-11-24 21:15:11 +01:00
8e913fe7c0
Fixed bug in AsyncEndPoint.hasProgressed() handling: the progressing status
...
must be remembered until a call to hasProgressed() is made.
Additional code cleanups.
2011-11-24 20:58:59 +01:00
c6103f2d53
Removed usages of ThreadDeath.
2011-11-24 20:39:04 +01:00
59c111bde1
Rewritten toString() methods using String.format().
2011-11-24 15:20:06 +01:00
0b85184722
Added dump() code in case the test hangs, to understand why (still not clear).
2011-11-24 10:19:23 +01:00
8f1fff78c0
Improved dumping capabilities of HttpClient, and rewritten toString() methods using String.format().
2011-11-24 10:16:19 +01:00
eaa83f29d1
added trap for rare error
2011-11-23 09:39:31 +11:00
bff3a5e72e
Disabled log debugging in SslBytesServerTest enabled in previous commit, and added check to not fail the tests if the JDK does not support TLS renegotiations.
2011-11-22 18:09:37 +01:00
a1eabe2b32
Enabled log debugging in SslBytesServerTest to see why it fails on CI.
2011-11-22 10:00:54 +01:00
aa0b71f928
Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project
2011-11-22 13:16:40 +11:00
6cb2d13abd
Client idle connection uses onIdleExpired rather than close
2011-11-22 12:57:32 +11:00
111000befa
Slightly increased handles count to cover edge cases without failures.
2011-11-21 21:35:18 +01:00
0e9449ac85
Merge remote-tracking branch 'origin/master' into jetty-8
2011-11-21 18:18:09 +11:00
5b67abdf02
Made SslBytesServerTest more robust in case of automatic proxy flow.
2011-11-18 21:39:18 +01:00
a313d2f542
Added more SSL tests renegotiation in the middle of content with split boundary.
2011-11-18 12:20:34 +01:00
9c804921de
Added more SSL tests for split boundary handshake and renegotiation in the middle of content.
2011-11-18 11:54:31 +01:00
324f2049f3
Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project
2011-11-17 12:40:56 +01:00
d1592cf5b5
Added more SSL tests to detect spinning conditions.
2011-11-17 12:40:32 +01:00
584bbd4bce
improved siege
2011-11-17 16:31:22 +11:00
89d0cb765f
improved siege like load tester
2011-11-17 14:45:41 +11:00
97c711613f
added siege like load tester
2011-11-17 14:08:46 +11:00
b8b5df27d6
Merge remote-tracking branch 'origin/master' into jetty-8
2011-11-17 11:03:07 +11:00
127a5af8d7
Merge remote-tracking branch 'origin/master' into jetty-8
2011-11-17 10:59:54 +11:00
e322a28753
made test timing less sensitive to Virtual machine quantums
2011-11-16 17:54:35 +11:00
400bdd1e9a
349110 fixed bypass chunk handling
2011-11-16 08:36:42 +11:00
ca8873593a
Cleaned up and made test more robust.
2011-11-11 15:02:45 +01:00
a62061944e
removed EndPoint.isBufferingInput
2011-11-11 11:41:29 +11:00
09999a629d
Removed EndPoint.isBufferingOutput().
2011-11-10 21:52:33 +01:00
629b6360de
removed EndPoint.isBuffered
2011-11-10 13:15:41 +11:00
144195d435
removed redundant setConnection
2011-11-10 12:47:50 +11:00
e3cf7a8898
improved ThreadDeath handling
2011-11-10 12:40:29 +11:00
7a9b8f1e9d
reverted last changes due to instability
2011-11-10 12:11:58 +11:00
d61258ec4e
clean ups from review from sbordet.
...
Removed isBufferred
fixed instanceof ThreadDeath
avoid race with onInputShutdown
2011-11-10 10:12:37 +11:00
70cd06f461
only handle early EOF if exchange is not done
2011-11-09 09:18:59 +11:00
8cfa671253
only handle early EOF if exchange is not done
2011-11-09 09:16:04 +11:00
2a6b8696d7
Merge branch 'master' into jetty-8
2011-11-08 15:59:55 -06:00
4e79ea0dca
Highlight test failure with DEBUG
2011-11-08 14:51:00 -07:00
4808239cbd
copyright and comments
2011-11-09 08:17:56 +11:00
5bf6f60396
copyright and comments
2011-11-09 08:13:29 +11:00
5f2323418b
cleanups after the merge
2011-11-08 12:47:28 +11:00
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
42179e193d
client tests passing
2011-11-07 10:23:08 +11:00
3e104548d5
fixed blocking client connection
2011-11-07 09:31:57 +11:00
0a40c3d750
Cleaned up test case and implementation for #360665 (Proxying HTTPS request to HTTP port causes exception loop).
...
Class SelectConnector.ProxySelectChannelEndPoint did not follow the latest changes to interface EndPoint, and was
returning wrong values for isInputShutdown() and other few methods.
Also suppressed expected exceptions in the test case.
2011-11-04 15:31:00 +01:00
9aee1affe5
Merged the handling of the case where there will not be more input, but the parser is in a middle state.
...
This case may happen when the client sends content and signal the end of the content by closing the connection.
The parser will be in a middle state, waiting for more content, and needs to read the connection close, otherwise
it may erroneously think that the exchange has failed.
2011-11-04 15:27:39 +01:00
f01877e738
360665: Fixed an endless loop on https proxy requests + added tests
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2011-11-04 10:20:52 +01:00
9b60678fbf
blocking client connection passing more tests
2011-11-04 16:04:48 +11:00
c19e1de62f
initial blocking client impl
2011-10-28 22:57:19 +11:00
a89dc67ba2
improved close incomplete handling
2011-10-28 13:26:14 +11:00
5aac176fbd
some Async client tests passing
2011-10-28 11:38:41 +11:00
738cbfdccc
refactored client to use upgradeable endpoint. Instert SslConnection when needed
2011-10-27 16:37:07 +11:00
4258b6f385
SslConnection server side mostly working
2011-10-26 22:55:02 +11:00
61664d3c0f
Added concept of SslConnection
2011-10-26 01:15:59 +11:00
d5320d95ba
[maven-release-plugin] prepare for next development iteration
2011-10-24 15:02:30 -05:00
d02f74a50c
[maven-release-plugin] prepare release jetty-8.0.4.v20111024
2011-10-24 15:02:23 -05:00
1d86da8f68
[maven-release-plugin] prepare for next development iteration
2011-10-24 14:52:54 -05:00
5f349ecc92
[maven-release-plugin] prepare release jetty-7.5.4.v20111024
2011-10-24 14:52:48 -05:00
6a17c69bfb
Non SSL client working
2011-10-24 17:14:56 +11:00
fc497fe1e8
Merge remote-tracking branch 'origin/master' into jetty-8
2011-10-24 16:30:10 +11:00
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
5ee01184ac
reworked async client connection
2011-10-24 11:23:29 +11:00
cd0628ab66
Added isDebugEnabled guards to debugging that generates garbage
2011-10-22 09:39:54 +11:00
0ba6fc7408
Merge remote-tracking branch 'origin/master' into jetty-8
2011-10-21 14:55:39 +11:00
44ea5c4d85
Merge remote-tracking branch 'origin/master' into jetty-7.6
2011-10-21 10:21:54 +11:00
50af4d4b62
361456 - release timer task on connection failed
2011-10-21 09:20:30 +11:00
5140a95144
refactored HttpConnection name
2011-10-20 15:12:19 +11:00
0e284f78f5
Protected HttpParser from multiple entry.
2011-10-20 12:18:10 +11:00
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
d63577b4e9
361325 359292 Allow KeyStore to be set
2011-10-19 15:20:01 +11:00
49f8b0de1a
Websocket partially refactored and passing tests
2011-10-18 21:59:49 +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
a38f2a9e68
[maven-release-plugin] prepare for next development iteration
2011-10-11 10:16:54 -05:00
55a1be5435
[maven-release-plugin] prepare release jetty-8.0.3.v20111011
2011-10-11 10:16:47 -05:00
925335dab2
merge from master
2011-10-11 09:43:27 -05:00
7d10182034
[maven-release-plugin] prepare for next development iteration
2011-10-11 08:47:07 -05:00
b6ac542604
[maven-release-plugin] prepare release jetty-7.5.3.v20111011
2011-10-11 08:47:00 -05:00
ea56eaff00
Cient socket fd leak when access an URL with bad domain
2011-10-10 13:09:58 +11:00
b55ec9bac1
[maven-release-plugin] prepare for next development iteration
2011-10-06 17:59:52 -05:00
e32e8b1377
[maven-release-plugin] prepare release jetty-8.0.2.v20111006
2011-10-06 17:59:46 -05:00
3c11c94f8b
resolve merge error
2011-10-06 17:30:15 -05:00
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
0c55c774d4
[maven-release-plugin] prepare for next development iteration
2011-10-06 17:25:38 -05:00
4d822759de
[maven-release-plugin] prepare release jetty-7.5.2.v20111006
2011-10-06 17:25:32 -05:00
6dc33497d9
Merge branch 'master' into release
2011-10-06 17:00:34 -05:00
074722f8c7
360051 SocketConnectionTest.testServerClosedConnection is excluded.
...
Strengthened condition under which the handling is aborted due to a remote close: now checking also if the endpoint has been closed locally.
2011-10-06 22:05:23 +02:00
b58006b4a4
[maven-release-plugin] prepare for next development iteration
2011-10-06 09:43:37 -05:00
Joakim Erdfelt
Simone Bordet
Greg Wilkins
Jan Bartel
Jesse McConnell
Thomas Becker