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
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
06f4ada935
gentler SSL close
2011-10-11 16:05:17 +11:00
3476887f8a
Forcing call to super.close() even if _closing is already set.
2011-10-10 19:09:03 +02: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
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
b58006b4a4
[maven-release-plugin] prepare for next development iteration
2011-10-06 09:43:37 -05:00
7eca345e8d
[maven-release-plugin] prepare release jetty-7.5.2.v20111006
2011-10-06 09:43:31 -05: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
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
ed9d9a0a33
javadoc
2011-10-06 16:39:14 +11:00
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
ae62618a00
Reworked logging, and catching IOException during the processing of a close.
2011-10-01 17:56:48 +02:00
a134664b4c
Method close() should really close the underlying channel, not only send the SSL close message.
2011-09-29 23:01:43 +02:00
79e431f330
cleanup
2011-09-29 17:36:23 +10:00
d0a2557527
357240 fixed client connection recycle
2011-09-29 15:50:09 +10:00
603ee3dae1
357240 fixed client tests
2011-09-29 00:23:31 +10:00
1420253643
357240 improved ishut/oshut handling
2011-09-28 22:58:14 +10:00
fbf0fad076
357240 improved ishut/oshut handling
2011-09-28 22:50:38 +10:00
dbf636df4d
357240 work in progress
2011-09-28 20:33:03 +10:00
6eaa1364e3
357240 work in progress
2011-09-28 16:21:57 +10:00
c20ce1fc4e
357240 remove buffer counts
2011-09-28 10:44:43 +10:00
ac7fcd9ab7
357240 work in progress
2011-09-28 00:29:17 +10:00
16d54532d6
357240 work in progress
2011-09-28 00:08:40 +10:00
61dd1493b1
357240 work in progress
2011-09-28 00:02:59 +10:00
9f885dcc6e
357240 removed gather write
2011-09-27 23:41:49 +10:00
ded5143700
Split "if" statement in case of flushing while closing, so if the input is shutdown we do not call closeOutbound().
2011-09-27 15:00:20 +02:00
44923230e3
357240 safer SSL close
2011-09-27 16:57:17 +10:00
b28a53ad52
357240 safer SSL close
2011-09-27 11:13:20 +10:00
8195103f01
358035 idle time only active if > 0
2011-09-23 14:12:40 +10:00
6bebdceb3a
JETTY-1377 extra logging for busy selector
2011-09-21 16:45:32 +10:00
e15e9ddc99
JETTY-1377 extra logging for busy selector
2011-09-21 16:17:35 +10:00
ff29a1cc51
JETTY-1322 idle sweeper checks for closed endp
2011-09-21 13:46:48 +10:00
a6988108c3
minor cleanups and extra debug
2011-09-16 15:29:28 +10:00
9c43e04bb4
Guarding against NPE in case of concurrent stop().
2011-09-12 21:01:08 +02:00
d5304b2cbc
[maven-release-plugin] prepare for next development iteration
2011-09-08 12:20:15 -05:00
c33548d38a
[maven-release-plugin] prepare release jetty-8.0.1.v20110908
2011-09-08 12:19:24 -05:00
ebdb89dc23
[maven-release-plugin] prepare for next development iteration
2011-09-08 12:00:16 -05:00
932245a114
[maven-release-plugin] prepare release jetty-7.5.1.v20110908
2011-09-08 12:00:10 -05:00
721c8ab682
updating version.txt and resetting pom version to 8.0.1-SNAPSHOT
2011-09-08 11:54:53 -05:00
f8c1858efb
Merge branch 'jetty-8' into release-8
2011-09-08 11:52:23 -05:00
97dee04a68
merge over from jetty7
2011-09-08 11:51:48 -05:00
37d0f53b0a
updating version.txt and resetting pom versions to 7.5.1-SNAPSHOT
2011-09-08 11:40:37 -05:00
4a575d4958
Merge branch 'master' into release
2011-09-08 11:36:48 -05:00
b8556bec76
fixes from running autobahn test suite
2011-09-08 11:35:39 +10:00
4e47d6a7fa
[maven-release-plugin] prepare for next development iteration
2011-09-07 18:16:58 -05:00
d77a12962b
[maven-release-plugin] prepare release jetty-8.0.1.v20110907
2011-09-07 18:16:50 -05:00
6b614a54f0
[maven-release-plugin] prepare for next development iteration
2011-09-07 18:12:16 -05:00
ce55c8c601
[maven-release-plugin] prepare release jetty-7.5.1.v20110907
2011-09-07 18:12:09 -05:00
7c7fc30b90
Merge over from jetty 7 master
2011-09-07 16:08:35 -05:00
1744b5bce1
reset from release
2011-09-07 11:09:46 -05:00
ae86ad6d4e
[maven-release-plugin] prepare for next development iteration
2011-09-07 10:03:16 -05:00
86383afbd2
[maven-release-plugin] prepare release jetty-7.5.1.v20110907
2011-09-07 10:03:10 -05:00
65a1e84886
misc findbugs cleanups
2011-09-07 15:57:18 +10:00
40dcb10ed8
[maven-release-plugin] prepare for next development iteration
2011-09-01 12:24:32 -05:00
db14b194fa
[maven-release-plugin] prepare release jetty-8.0.0.v20110901
2011-09-01 12:24:24 -05:00
a728021edf
[maven-release-plugin] prepare for next development iteration
2011-09-01 11:17:05 -05:00
882308f781
[maven-release-plugin] prepare release jetty-7.5.0.c20110901
2011-09-01 11:16:58 -05:00
1e079f06c9
Merge remote-tracking branch 'origin/master' into jetty-8
2011-09-01 14:11:53 +10:00
57e9045635
[maven-release-plugin] prepare for next development iteration
2011-08-31 14:17:32 -05:00
317491a4d7
[maven-release-plugin] prepare release jetty-7.5.0.v20110901
2011-08-31 14:17:25 -05:00
e60df19490
[maven-release-plugin] prepare for next development iteration
2011-08-30 13:13:46 -07:00
460c754e4e
[maven-release-plugin] prepare release jetty-7.5.0.RC2
2011-08-30 13:13:39 -07:00
7663a83616
[maven-release-plugin] rollback the release of jetty-7.5.0.RC2
2011-08-30 12:52:45 -07:00
4c5c954d23
[maven-release-plugin] prepare release jetty-7.5.0.RC2
2011-08-30 12:47:42 -07:00
0d17559f7d
handle -1 maxIdleTime as disabled timeout
2011-08-30 23:37:41 +10: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
f15617fbb2
293739 - Deprecate static Jetty Log usage in favor of named logs
...
+ Finished conversion of jetty-continuation, jetty-http, jetty-io
2011-08-24 12:51:39 -07:00
e5a3cb9cef
[maven-release-plugin] prepare for next development iteration
2011-08-19 22:17:46 +10:00
f0b4ffffda
[maven-release-plugin] prepare release jetty-7.5.0.RC1
2011-08-19 22:17:33 +10:00
4700979200
[maven-release-plugin] prepare for next development iteration
2011-08-16 09:26:56 -05:00
3ae78dfbb2
[maven-release-plugin] prepare release jetty-8.0.0.RC0
2011-08-16 09:26:48 -05:00
6e8afd6795
Merge remote-tracking branch 'origin/master' into jetty-8
...
Conflicts:
VERSION.txt
2011-08-16 11:35:46 +10:00
4d7ba354e1
[maven-release-plugin] prepare for next development iteration
2011-08-15 14:18:53 -05:00
2175bae0a0
[maven-release-plugin] prepare release jetty-7.5.0.RC0
2011-08-15 14:18:42 -05:00
2cb0cd377e
353073 better close messages
2011-08-15 15:19:14 +10:00
050cb83b35
Merge remote-tracking branch 'origin/master' into jetty-8
...
Conflicts:
jetty-osgi/jetty-osgi-equinoxtools/src/main/java/org/eclipse/jetty/osgi/equinoxtools/console/EquinoxConsoleWebSocketServlet.java
jetty-servlets/src/test/java/org/eclipse/jetty/servlets/GzipFilterTest.java
jetty-websocket/pom.xml
2011-08-12 18:43:15 +10:00
6b9ecd0806
353073 Improved client API to use futures
2011-08-11 11:50:23 +10:00
93cc111a02
Merge remote-tracking branch 'origin/master' into jetty-8
...
Conflicts:
VERSION.txt
jetty-io/src/main/java/org/eclipse/jetty/io/nio/IndirectNIOBuffer.java
2011-07-25 17:42:30 +10:00
2be177484e
Miscellaneous changes resulting from the optimization for 7.5.x
...
Mostly refining debug and toString()
Use shutdown for idle expiry
2011-07-22 18:12:56 +10:00
d091003cfc
return EOF rather than throw EoFException
2011-07-18 14:30:04 +10:00
70d7d3c9a5
reverted version
2011-07-18 09:15:31 +10:00
a26ddd5933
created performance version
2011-07-14 15:38:25 +10:00
86f7e76c4d
Merge of jetty-7 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-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-nested/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/META-INF/MANIFEST.MF
jetty-osgi/jetty-osgi-boot/pom.xml
jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/OSGiAppProvider.java
jetty-osgi/jetty-osgi-equinoxtools/META-INF/MANIFEST.MF
jetty-osgi/jetty-osgi-equinoxtools/pom.xml
jetty-osgi/jetty-osgi-equinoxtools/src/main/java/org/eclipse/jetty/osgi/equinoxtools/console/EquinoxConsoleContinuationServlet.java
jetty-osgi/jetty-osgi-httpservice/pom.xml
jetty-osgi/jetty-osgi-servletbridge/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-servlets/src/main/java/org/eclipse/jetty/servlets/ProxyServlet.java
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-07-11 12:05:58 +10:00
1093a95566
Merge branch 'master' into performance
2011-07-08 11:59:24 +10:00
39674f8a8e
[maven-release-plugin] prepare for next development iteration
2011-07-07 18:43:56 -05:00
5aa94f502e
[maven-release-plugin] prepare release jetty-7.4.4.v20110707
2011-07-07 18:43:50 -05:00
17e907c2fb
git diff 54e885d967 remotes/origin/jetty-8-historical | patch -p1 ; git add -A
2011-07-07 18:18:24 +10:00
b890ff8fb2
applied jetty-7p 7f68abf..b2e4270, 7f68abf..a900c5e, 9a93c9e..9f94539. decomposed async and blocking handling. Simplified HttpFields and Buffer handling from the HttpParser.
2011-07-07 12:16:58 +10:00
6190961f31
[maven-release-plugin] prepare for next development iteration
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3454 7e9141cc-0065-0410-87d8-b60c137991c4
2011-07-01 11:12:45 +00:00
db9f79eaff
[maven-release-plugin] prepare release jetty-7.4.3.v20110701
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3452 7e9141cc-0065-0410-87d8-b60c137991c4
2011-07-01 11:12:33 +00:00
baabacfe95
reverted to 7.4.4-SNAPSHOT
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3448 7e9141cc-0065-0410-87d8-b60c137991c4
2011-07-01 02:22:56 +00:00
b9fffcb9a0
[maven-release-plugin] prepare for next development iteration
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3447 7e9141cc-0065-0410-87d8-b60c137991c4
2011-07-01 00:54:20 +00:00
ea23a83bb3
[maven-release-plugin] prepare release jetty-7.4.3.v20110630
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3445 7e9141cc-0065-0410-87d8-b60c137991c4
2011-07-01 00:54:07 +00:00
b1ca45e709
[maven-release-plugin] prepare for next development iteration
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3441 7e9141cc-0065-0410-87d8-b60c137991c4
2011-06-30 19:49:20 +00:00
5f5cb8ea53
[maven-release-plugin] prepare release jetty-7.4.3.v20110630
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3439 7e9141cc-0065-0410-87d8-b60c137991c4
2011-06-30 19:39:23 +00:00
5c9fe5b13e
350642 Dont close SCEP during NIOBuffer manipulation
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3437 7e9141cc-0065-0410-87d8-b60c137991c4
2011-06-29 04:38:47 +00:00
c2a6df4c47
350642 Do not close SCEP during NIOBuffer manipulation
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3436 7e9141cc-0065-0410-87d8-b60c137991c4
2011-06-29 02:51:09 +00:00
aa990479f6
349896 SCEP supports zero maxIdleTime
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3408 7e9141cc-0065-0410-87d8-b60c137991c4
2011-06-21 04:09:30 +00:00
e55c21ca5c
347898 Close channel on JVM exceptions
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3374 7e9141cc-0065-0410-87d8-b60c137991c4
2011-06-01 11:32:13 +00:00
af2050147c
JETTY-1342 recreate selector in change task
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3365 7e9141cc-0065-0410-87d8-b60c137991c4
2011-06-01 01:18:58 +00:00
54e885d967
[maven-release-plugin] prepare for next development iteration
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3289 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-26 12:20:58 +00:00
e35f16bae5
[maven-release-plugin] prepare release jetty-7.4.2.v20110526
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3287 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-26 12:14:37 +00:00
64cbf74b09
reset poms for release
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3286 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-26 11:59:36 +00:00
92c1a7bc5d
[maven-release-plugin] prepare release jetty-7.4.2.v20110526
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3277 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-26 08:51:01 +00:00
d77ac8acb4
Using new jetty-test-helper 1.5-SNAPSHOT
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3265 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-25 23:05:29 +00:00
1bb56442a7
Improved SslSelectChannelEndPoint to free buffers when not needed, and added more truncation attack tests.
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3253 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-25 09:56:04 +00:00
eca44d8983
Rolled back temporary log statements.
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3240 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-23 18:04:44 +00:00
f166c40a6d
Temporary logging for SSL truncation attacks.
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3239 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-23 16:02:56 +00:00
b2f5416fcd
made HttpClient dumpable
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3236 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-23 01:21:52 +00:00
fc6ea06106
Fixes #346614 (HttpConnection.handle() spins in case of SSL truncation attacks).
...
SslSelectChannelEndPoint has been modified to not override shutdownInput() (so behavior is that of the base class, like it should), and when it detects a remote close, it calls SSLEngine.closeInbound(), which throws in case of a truncation attack. The exception is handled and the endpoint closed.
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3224 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-20 12:52:13 +00:00
4ba3046a8b
Sending SSL close alert from both shutdownOutput() and close().
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3217 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-19 21:28:41 +00:00
c6665c228a
Removed output shutdown from close().
...
Since we now support correctly output shutdown, this is not needed anymore.
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3216 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-19 21:27:57 +00:00
eb17ca8cbf
JETTY-1342 Recreate selector if wakeup throws JVM bug
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3212 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-18 21:59:02 +00:00
51f6df9871
[maven-release-plugin] prepare for next development iteration
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3184 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-17 19:57:00 +00:00
28e63af76b
[maven-release-plugin] prepare release jetty-project-7.4.2.vTEST
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3182 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-17 19:56:45 +00:00
0793141d2c
[maven-release-plugin] rollback the release of jetty-project-7.4.2.vTEST
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3181 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-17 19:39:59 +00:00
be9da35ef4
set for test
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3180 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-17 19:39:17 +00:00
40141c5e84
fix javadoc error
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3169 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-17 16:08:39 +00:00
898470696c
updating to parent-17-snapshot and various changes to work with updated maven plugins
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3164 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-17 13:41:15 +00:00
ee7333baf7
strangely after the release?
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3138 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-13 07:28:38 +00:00
f8dc394adb
[maven-release-plugin] prepare for next development iteration
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3137 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-13 04:48:47 +00:00
6e0649ab3f
[maven-release-plugin] prepare release jetty-7.4.1.v20110513
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3135 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-13 04:48:21 +00:00
314a59192d
[maven-release-plugin] prepare for next development iteration
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3131 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-12 19:57:07 +00:00
fadbd0bdc5
[maven-release-plugin] prepare release jetty-7.4.1.v20110512
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3129 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-12 19:56:53 +00:00
5d0f1b88f4
[maven-release-plugin] prepare for next development iteration
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3128 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-12 09:02:46 +00:00
83b6c19cca
[maven-release-plugin] prepare release jetty-7.4.1
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3126 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-12 09:02:19 +00:00
5223f6f77c
345543 Always close endpoint on SSLException
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3125 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-12 08:00:29 +00:00
54dcc72422
343083 better handling of isSecure
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3091 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-09 00:15:57 +00:00
bda6438013
343923 check for half closed
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3079 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-06 06:05:13 +00:00
7227f8c6bb
343923 flush timeouts applied to outer loop
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3034 7e9141cc-0065-0410-87d8-b60c137991c4
2011-04-27 23:17:17 +00:00
aa398ad41c
343083 Set nested dispatch type
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3020 7e9141cc-0065-0410-87d8-b60c137991c4
2011-04-18 05:37:50 +00:00
936b80dd46
[maven-release-plugin] prepare for next development iteration
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3018 7e9141cc-0065-0410-87d8-b60c137991c4
2011-04-14 02:22:30 +00:00
Greg Wilkins
Simone Bordet
Jesse McConnell
Joakim Erdfelt
Jan Bartel
Greg Wilkins
Joakim Erdfelt