2777 Commits

Author SHA1 Message Date
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
4c89a79449 JETTY-1444 start threadpool before selector manager 2011-10-19 17:23:03 +11:00
Greg Wilkins
22f1d83f10 360836 Accept parameters with bad UTF-8. Use replacement character 2011-10-19 16:32:05 +11:00
Greg Wilkins
c93e1c297f 360836 Accept parameters with bad UTF-8. Use replacement character 2011-10-19 16:23:56 +11:00
Greg Wilkins
acc1b19228 Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project 2011-10-19 15:21:57 +11:00
Greg Wilkins
d63577b4e9 361325 359292 Allow KeyStore to be set 2011-10-19 15:20:01 +11:00
Jan Bartel
d71fd55665 361319 Log initialization does not catch correct exceptions on all jvms 2011-10-19 12:28:23 +11:00
Greg Wilkins
49f8b0de1a Websocket partially refactored and passing tests 2011-10-18 21:59:49 +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
Joakim Erdfelt
e9c398e86b Let StdErrLog *.LEVEL come from configured properties instead 2011-10-14 08:27:08 -07:00
Simone Bordet
f2bf8c277b 360938 Connections closed after a while.
Resetting _total_no_progress when progress is made, to avoid that the endpoint is closed after a while of normal activity.
2011-10-14 12:45:41 +02:00
Greg Wilkins
72310d0c03 Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project 2011-10-13 15:19:34 +11:00
Greg Wilkins
54d0944019 no ForwardServer 2011-10-13 15:18:55 +11:00
Jan Bartel
160385606c 358263 - JDBCSessionIdManager add setDatasource(DataSource) method 2011-10-13 13:58:25 +11:00
Jesse McConnell
eeb617f4d8 Adding an example of a forwarding rewrite embedded server 2011-10-12 21:00:42 -05:00
Jesse McConnell
adc04c9132 Merge branch 'release' 2011-10-11 09:50:37 -05:00
Jesse McConnell
3e62343aae Updating VERSION.txt top section 2011-10-11 09:48:57 -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 jetty-7.5.3.v20111011 2011-10-11 08:47:00 -05:00
Jesse McConnell
55842580aa Updating VERSION.txt top section 2011-10-11 08:25:05 -05:00
Jesse McConnell
0f77ee6b34 Merge branch 'master' into release 2011-10-11 08:23:49 -05:00
Greg Wilkins
06f4ada935 gentler SSL close 2011-10-11 16:05:17 +11:00
Greg Wilkins
4149ff4d21 Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project 2011-10-11 08:29:40 +11:00
Simone Bordet
3476887f8a Forcing call to super.close() even if _closing is already set. 2011-10-10 19:09:03 +02:00
Greg Wilkins
7e3dc94edc Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project 2011-10-11 01:38:39 +11:00
Greg Wilkins
3b80b206f3 reduce verbosity of no progress checks 2011-10-11 01:37:15 +11:00
Jan Bartel
ea56eaff00 Cient socket fd leak when access an URL with bad domain 2011-10-10 13:09:58 +11:00
Joakim Erdfelt
64ce44c3dc 358649 - StdErrLog system properties for package/class logging LEVEL.
+ Fixing LogTest for deprecations in StdErrLog.setDebugEnabled()
2011-10-07 10:39:50 -07:00
Joakim Erdfelt
f81c1b68e2 358649 - StdErrLog system properties for package/class logging LEVEL.
* Remerging back into master now that 7.5.2 release is done.
2011-10-07 10:28:31 -07:00
Jesse McConnell
3ff03b0731 [Bug 348978] migrate jetty-http-spi 2011-10-07 11:37:33 -05:00
Jesse McConnell
4ca2828ace Added javadoc with shutdown example 2011-10-07 10:20:33 -05:00
Jesse McConnell
15ae01d4b6 Merge branch 'release' 2011-10-06 19:38:32 -05:00
Jesse McConnell
93c0cb62ca Updating VERSION.txt top section 2011-10-06 19:38:14 -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 jetty-7.5.2.v20111006 2011-10-06 17:25:32 -05:00
Jesse McConnell
97e286a1ab update VERSION 2011-10-06 17:03:58 -05:00
Jesse McConnell
6dc33497d9 Merge branch 'master' into release 2011-10-06 17:00:34 -05:00
Simone Bordet
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
Jesse McConnell
9ac4e35b96 wqRevert "358649 - StdErrLog system properties for package/class logging LEVEL."
This reverts commit 12dbcadedec19092f39a820ccb37fa7c347ddbc6.
2011-10-06 14:16:03 -05:00
Joakim Erdfelt
12dbcadede 358649 - StdErrLog system properties for package/class logging LEVEL. 2011-10-06 12:04:44 -07: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
Jesse McConnell
7958b033b0 Updating VERSION.txt top section 2011-10-06 09:22:28 -05:00
Jesse McConnell
4cdb50bd50 Merge branch 'master' into release 2011-10-06 09:21:15 -05:00
Jesse McConnell
decb4c7e8c update update-version profile 2011-10-06 09:20:57 -05:00
Jesse McConnell
dd830aae17 Merge branch 'master' into release 2011-10-06 09:16:58 -05:00
Simone Bordet
ab1d0c203e Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project 2011-10-06 16:09:03 +02:00
Simone Bordet
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
Simone Bordet
8d61ce374b Removed dead code. 2011-10-06 16:07:19 +02:00