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
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
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
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
6a17c69bfb
Non SSL client working
2011-10-24 17:14:56 +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
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
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
ea56eaff00
Cient socket fd leak when access an URL with bad domain
2011-10-10 13:09:58 +11: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
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
76cdf9badb
357240 more half close refinements
2011-10-06 11:24:06 +11:00
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
6abf426627
357240 half closed client test
2011-10-05 22:14:48 +11:00
57d81603c4
cleanup debug output
2011-10-05 22:01:49 +11:00
d0a2557527
357240 fixed client connection recycle
2011-09-29 15:50:09 +10:00
f14bbbfc0a
fixed bad merge
2011-09-29 08:17:23 +10:00
21a111db27
Merge branch 'master' into sslClose
...
Conflicts:
jetty-client/src/main/java/org/eclipse/jetty/client/HttpExchange.java
2011-09-29 08:10:39 +10:00
f45a720045
357240 debug client tests
2011-09-29 08:06:51 +10:00
1e5b85a2cb
359255: Allow HttpExchange state change from START to EXPIRED
2011-09-28 10:56:46 -05:00
cceef37f17
359255: Code format
2011-09-28 10:44:03 -05:00
74d5e800f6
fix some formatting issues with code conventions
2011-09-28 10:34:08 -05:00
40b25e6f5a
JETTY-1421 Implement RedirectListener.onException,onConnectionFailed
2011-09-28 10:30:29 -05:00
d37f2ca10c
JETTY-1420 Set Host header for new request in RedirectListener
2011-09-28 10:21:29 -05:00
603ee3dae1
357240 fixed client tests
2011-09-29 00:23:31 +10:00
a531fbc5a2
357240 fixed client tests
2011-09-29 00:09:13 +10:00
f73a6422f0
357240 fixed client test
2011-09-29 00:02:06 +10:00
fbf0fad076
357240 improved ishut/oshut handling
2011-09-28 22:50:38 +10:00
d0ffa5cb1a
Merge branch 'master' into sslClose
2011-09-28 16:24:01 +10:00
6eaa1364e3
357240 work in progress
2011-09-28 16:21:57 +10:00
65e7d65442
358959 File descriptor leak with UnresolvedAddressException
2011-09-28 14:59:34 +10:00
27753fa747
removed debug
2011-09-26 23:00:57 +10:00
75645cef0e
358674 Added include/exclude protocols to SslContextFactory
2011-09-23 08:02:42 +10:00
633f3b1588
JETTY-1423 force connection to be closed returned
2011-09-22 09:22:27 +10:00
21ddd768f0
[Bug 358147] Add catch for UnknownHostException to fix leaky file descriptor in client
2011-09-20 14:26:17 -05:00
4b7f8d79dd
358147: SelectConnector catch UnresolvedAddressException to avoid socket leak
2011-09-20 14:21:26 -05:00
f0fe55165b
SelectConnector.java code format
2011-09-20 14:21:18 -05:00
26c8cc8514
346419 testing HttpClient FDs
2011-09-20 18:00:24 +10:00
a3b2a71aea
Setting back to debug level
2011-09-15 11:28:56 -07:00
18c5483cc4
353509 - jetty-client unit tests are running too long
...
+ Fixing last remaining test failure with some careful
GenericServerHandler refactoring.
2011-09-14 11:23:11 -07:00
5530594128
353509: Fixed merging issues
2011-09-14 08:41:33 -07:00
fce4192fd9
353509 - jetty-client unit tests are running too long
2011-09-12 15:04:59 -07:00
9c862f2699
HttpExchangeTest#testOptionsWithExchange no longer fails on Mac OS X
2011-08-30 16:47:19 -04:00
aefd353752
Adjusted TimeoutExchangeTest timeouts
2011-08-30 15:35:13 -04:00
45148353ec
293739 Hide stacks in named log testing. Various other minor log cleanups in output.
2011-08-30 16:05:21 +10:00
33fa7afb47
356144 added SelectorManager.setSelectorPriorityDelta(int)
2011-08-30 14:24:28 +10:00
0763e040e5
353014 TimeoutExchangeTest run time reduced
...
Patch provided by Thomas Becker <tbecker@intalio.com>
2011-08-29 16:18:45 -04:00
79db394552
Merge from trunk
2011-08-26 10:12:45 -07:00
103d7a87c2
353623 Added new methods to HttpExchange
2011-08-26 03:49:58 -04:00
4ace183764
Merging from master
2011-08-25 12:09:36 -07:00
Simone Bordet
Greg Wilkins
Joakim Erdfelt
Thomas Becker
Jan Bartel
Jesse McConnell
David Kellum
Michael Gorovoy