fa0e06d186
Removed guard whether the channel is closed in checkIdleTimestamp().
...
This follows commit ff29a1cc51
2011-12-13 11:14:25 +01:00
416b6a8a15
Added guard against multiple closes: if the endPoint is already closed, skip updating the SSLEngine and/or the endPoint.
2011-12-12 16:57:14 +01: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
dcf7ef2335
fixes after merge
2011-11-29 10:15:20 +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
4ce72ee549
improved test timing
2011-11-29 08:36:56 +11:00
b969de1788
organized imports
2011-11-28 15:32:14 +11:00
06b66f31f5
test NIO assumptions
2011-11-28 11:54:08 +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
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
8f1fff78c0
Improved dumping capabilities of HttpClient, and rewritten toString() methods using String.format().
2011-11-24 10:16:19 +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
e1d05939b8
Merge remote-tracking branch 'origin/master'
2011-11-21 23:47:03 +01:00
83f2c1b55c
Integrated behavior of is[In|Out]putShutdown() with volatile flag and previous implementation.
2011-11-21 23:31:09 +01:00
e27c5a9306
Normalized behavior of shutdown[In|Out]put() methods and is[In|Out]putShutdown(), relying on a volatile flag.
2011-11-21 21:39:47 +01:00
d55477388b
more debug in tests
2011-11-22 00:12:56 +11:00
0e9449ac85
Merge remote-tracking branch 'origin/master' into jetty-8
2011-11-21 18:18:09 +11:00
a00f790bc5
fixed close on early shutdown
2011-11-21 10:25:26 +11:00
dbd97a52ae
flush ssl shutdownoutput
2011-11-19 09:48:47 +11:00
712d250d3e
Merge remote-tracking branch 'origin/master'
2011-11-18 12:45:05 +01:00
defc729d69
close idle SSL with shutdown
2011-11-18 15:33:05 +11:00
f70ed3ac21
prevent spin by write blocked from non dispatched thread
2011-11-18 09:19:52 +11: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
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
e48570bd5e
SSL progress measured by process not inbound
2011-11-17 07:14:40 +11:00
e322a28753
made test timing less sensitive to Virtual machine quantums
2011-11-16 17:54:35 +11:00
ff656d4a17
less stressful test
2011-11-16 17:08:38 +11:00
de42eafdcd
cleanup
2011-11-16 14:01:50 +11:00
a9d33bb561
maintain own ishut status
2011-11-16 13:15:36 +11:00
9ac9a1d687
maintain own ishut status
2011-11-16 13:12:19 +11:00
a8173e3d12
test clean ups
2011-11-16 12:54:14 +11:00
0fdc5c5d2e
test clean ups
2011-11-16 12:26:28 +11:00
e3bdf43112
clean ups
2011-11-16 10:46:06 +11:00
52275e27b4
reverted possible fix for OS that does not handle half close well
2011-11-16 10:22:49 +11:00
533210298d
possible fix for OS that does not handle half close well
2011-11-16 09:58:45 +11:00
400bdd1e9a
349110 fixed bypass chunk handling
2011-11-16 08:36:42 +11:00
edbea0c613
363757 partial fix
2011-11-15 23:19:46 +11:00
c9e08217d8
fixed read while suspended issue with double dispatch
2011-11-15 17:09:10 +11:00
722f390800
numerous findbugs inspired cleanups
2011-11-15 11:22:35 +11:00
62e669ffa9
moved hasProgressed handling to only be in SslConnection
2011-11-11 12:34:46 +11: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
34fbbd5e28
Made the test case more robust.
...
The call to EndPoint.blockReadable() must be enclosed in a while loop, since the EndPoint
may be woken up spuriously or by write readyness, and no further bytes may be read.
2011-11-10 15:31:56 +01:00
921b285235
Avoid flush if no content to flush
2011-11-10 14:45:28 +11:00
f37b617481
improved test failure message
2011-11-10 13:26:30 +11: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
7504d24e9e
Fixed SslConnection upgrade handling
2011-11-10 12:44:32 +11:00
6e14902659
AsyncEndPoint is-a ConnectedEndPoint
2011-11-10 12:44:03 +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
7e37d1a428
pool and compress the unwrap buffer
2011-11-10 00:19:54 +11:00
32f7822c1a
Reverted the unwrapBuf to not be pooled.
2011-11-09 23:38:09 +11:00
a95d2c11e2
removed debug
2011-11-09 17:41:10 +11:00
af4c40d793
fixed SSL buffer pool
2011-11-09 17:39:59 +11:00
a36342438c
cleaned up some unit tests
2011-11-09 17:03:11 +11:00
470e63b77b
added SCEP stress test
2011-11-09 16:07:36 +11:00
71734400e9
improved handling of RST
2011-11-09 15:07:47 +11:00
2a6b8696d7
Merge branch 'master' into jetty-8
2011-11-08 15:59:55 -06:00
4e89277210
Adjusting failing testcase to be more clear about failures
2011-11-08 14:26:34 -07:00
3302d3fc60
Adjusting failing testcase to be more clear about failures
2011-11-08 14:25:10 -07:00
5bf6f60396
copyright and comments
2011-11-09 08:13:29 +11:00
66ea1e819a
fixed test to use localhost
2011-11-09 08:13:00 +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
202475aad9
clean build
2011-11-07 15:34:33 +11:00
f1251412e4
Modified behavior of shutdownInput() and shutdownOutput() to always shutdown either input or output.
...
Calling socket.close() does not imply that socket.isInputShutdown() returns true, so there was a
possibility that code was calling ChannelEndPoint.shutdownInput(), but the input was not really
shutdown, and a subsequent call to ChannelEndPoint.isInputShutdown() returned false.
2011-11-04 15:22:43 +01:00
5f653aa87a
Minor tweak to SCEP.toString() to make it a bit more readable
2011-11-02 16:47:40 -07:00
2b6fec713c
Merge branch 'master' into jetty-8
2011-11-02 16:47:04 -05:00
afc358972a
360546 handle set count exceeding max integer
2011-10-28 15:04:49 +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
3dfd8b7698
jetty-server passing tests
2011-10-27 00:38:05 +11:00
4258b6f385
SslConnection server side mostly working
2011-10-26 22:55:02 +11:00
19ba79f4f1
work in progress
2011-10-26 10:47:00 +11:00
010328fe2b
work in progress
2011-10-26 10:14:03 +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
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
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
1d00f786a5
reduce verbosity of closes
2011-10-19 23:34:21 +11:00
d63577b4e9
361325 359292 Allow KeyStore to be set
2011-10-19 15:20:01 +11:00
Simone Bordet
Greg Wilkins
Jan Bartel
Jesse McConnell
Joakim Erdfelt