Commit Graph

2929 Commits

Author SHA1 Message Date
Greg Wilkins 61664d3c0f Added concept of SslConnection 2011-10-26 01:15:59 +11:00
Jesse McConnell 91b7fa881d Merge branch 'release-8' into jetty-8 2011-10-24 17:36:20 -05:00
Jesse McConnell 1631824d59 Merge branch 'release' 2011-10-24 17:35:56 -05:00
Jesse McConnell 97d0d9d812 Updating VERSION.txt top section 2011-10-24 16:36:35 -05:00
Jesse McConnell 88bc111ac3 Updating VERSION.txt top section 2011-10-24 15:49:46 -05:00
Jesse McConnell d5320d95ba [maven-release-plugin] prepare for next development iteration 2011-10-24 15:02:30 -05:00
Jesse McConnell d02f74a50c [maven-release-plugin] prepare release jetty-8.0.4.v20111024 2011-10-24 15:02:23 -05:00
Jesse McConnell 1d86da8f68 [maven-release-plugin] prepare for next development iteration 2011-10-24 14:52:54 -05:00
Jesse McConnell 5f349ecc92 [maven-release-plugin] prepare release jetty-7.5.4.v20111024 2011-10-24 14:52:48 -05:00
Jesse McConnell 79c674a4ce Updating VERSION.txt top section 2011-10-24 14:40:03 -05:00
Jesse McConnell b074bbdeba Merge branch 'jetty-8' into release-8 2011-10-24 14:39:27 -05:00
Jesse McConnell e9ef517b38 pull latest merge from master 2011-10-24 14:38:54 -05:00
Jesse McConnell 0405be3bed Updating VERSION.txt top section 2011-10-24 14:31:16 -05:00
Jesse McConnell ff2c34df6e Merge branch 'master' into release 2011-10-24 14:30:23 -05:00
Jesse McConnell 261bb4a71f update jetty version maven plugin version 2011-10-24 13:55:02 -05:00
Joakim Erdfelt b87cbd1181 Adding test on StdErrLog.isDebugEnabled() 2011-10-24 10:35:06 -07:00
Jesse McConnell ae16ccd918 add merge tool bit to gitignore 2011-10-24 10:56:43 -05:00
Greg Wilkins 6a17c69bfb Non SSL client working 2011-10-24 17:14:56 +11:00
Jan Bartel fc497fe1e8 Merge remote-tracking branch 'origin/master' into jetty-8 2011-10-24 16:30:10 +11:00
Greg Wilkins 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
Greg Wilkins 5ee01184ac reworked async client connection 2011-10-24 11:23:29 +11:00
Greg Wilkins cd0628ab66 Added isDebugEnabled guards to debugging that generates garbage 2011-10-22 09:39:54 +11:00
Simone Bordet 810223e259 361655 ExecutorThreadPool.isLowOnThreads() returns wrong value.
Optimized by calling getActiveCount() last, since it locks the thread pool.
2011-10-21 22:53:20 +02:00
Simone Bordet d4603e1fdd Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project 2011-10-21 16:26:18 +02:00
Simone Bordet 309e347d18 361655 ExecutorThreadPool.isLowOnThreads() returns wrong value.
Method isLowOnThreads() now return a value similar to what QueuedThreadPool does.
Also taken the chance to refactor constructors, and clarify that if an unbounded queue
like LinkedBlockingQueue is used, then the corePoolSize must be equal to the maxPoolSize.
2011-10-21 16:25:37 +02:00
Jan Bartel a6b41a7deb Merge from master, fix addFilter method signature for servlet 3.0. 2011-10-21 15:51:24 +11:00
Jan Bartel 0ba6fc7408 Merge remote-tracking branch 'origin/master' into jetty-8 2011-10-21 14:55:39 +11:00
Greg Wilkins 44ea5c4d85 Merge remote-tracking branch 'origin/master' into jetty-7.6 2011-10-21 10:21:54 +11:00
Greg Wilkins 05fcd01d02 Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project 2011-10-21 09:33:14 +11:00
Greg Wilkins 50af4d4b62 361456 - release timer task on connection failed 2011-10-21 09:20:30 +11:00
Joakim Erdfelt 385bc15726 358649 - Replace existing StdErrLog system properties for DEBUG/IGNORED with LEVEL instead.
Adding special case for "log.LEVEL" to set the root logging level.
2011-10-20 14:47:26 -07:00
Greg Wilkins 5140a95144 refactored HttpConnection name 2011-10-20 15:12:19 +11:00
Greg Wilkins 0e284f78f5 Protected HttpParser from multiple entry. 2011-10-20 12:18:10 +11:00
Greg Wilkins 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
Greg Wilkins b0a9ec30f9 Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project 2011-10-19 23:34:47 +11:00
Greg Wilkins 1d00f786a5 reduce verbosity of closes 2011-10-19 23:34:21 +11:00
Simone Bordet d5a2ec877c 360912 CrossOriginFilter does not send Access-Control-Allow-Origin on responses.
355103 Make allowCredentials default to true in CrossOriginFilter.

The actual response now contains the Access-Control-Allow-Origin header, and fixed also 355103 that was not really fixed.
Added test suite.
2011-10-19 13:50:53 +02:00
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 0fd0f5a7a1 361135 secure cookies for sessions 2011-10-19 12:21:26 +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