Commit Graph

633 Commits

Author SHA1 Message Date
Greg Wilkins 42179e193d client tests passing 2011-11-07 10:23:08 +11:00
Greg Wilkins 3e104548d5 fixed blocking client connection 2011-11-07 09:31:57 +11:00
Simone Bordet 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
Simone Bordet 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
Thomas Becker 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
Greg Wilkins 9b60678fbf blocking client connection passing more tests 2011-11-04 16:04:48 +11:00
Greg Wilkins c19e1de62f initial blocking client impl 2011-10-28 22:57:19 +11:00
Greg Wilkins a89dc67ba2 improved close incomplete handling 2011-10-28 13:26:14 +11:00
Greg Wilkins 5aac176fbd some Async client tests passing 2011-10-28 11:38:41 +11:00
Greg Wilkins 738cbfdccc refactored client to use upgradeable endpoint. Instert SslConnection when needed 2011-10-27 16:37:07 +11:00
Greg Wilkins 4258b6f385 SslConnection server side mostly working 2011-10-26 22:55:02 +11:00
Greg Wilkins 61664d3c0f Added concept of SslConnection 2011-10-26 01:15:59 +11: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
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
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 50af4d4b62 361456 - release timer task on connection failed 2011-10-21 09:20:30 +11: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 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 d63577b4e9 361325 359292 Allow KeyStore to be set 2011-10-19 15:20:01 +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
Jesse McConnell a38f2a9e68 [maven-release-plugin] prepare for next development iteration 2011-10-11 10:16:54 -05:00
Jesse McConnell 55a1be5435 [maven-release-plugin] prepare release jetty-8.0.3.v20111011 2011-10-11 10:16:47 -05:00
Jesse McConnell 925335dab2 merge from master 2011-10-11 09:43:27 -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 2011-10-11 08:47:00 -05:00
Jan Bartel ea56eaff00 Cient socket fd leak when access an URL with bad domain 2011-10-10 13:09:58 +11:00
Jesse McConnell b55ec9bac1 [maven-release-plugin] prepare for next development iteration 2011-10-06 17:59:52 -05:00
Jesse McConnell e32e8b1377 [maven-release-plugin] prepare release jetty-8.0.2.v20111006 2011-10-06 17:59:46 -05:00
Jesse McConnell 3c11c94f8b resolve merge error 2011-10-06 17:30:15 -05:00
Simone Bordet 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
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 2011-10-06 17:25:32 -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 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
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
Jan Bartel 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
Greg Wilkins 76cdf9badb 357240 more half close refinements 2011-10-06 11:24:06 +11:00
Simone Bordet 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
Greg Wilkins 6abf426627 357240 half closed client test 2011-10-05 22:14:48 +11:00
Greg Wilkins 57d81603c4 cleanup debug output 2011-10-05 22:01:49 +11:00
Jan Bartel 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
Greg Wilkins d0a2557527 357240 fixed client connection recycle 2011-09-29 15:50:09 +10:00
Greg Wilkins f14bbbfc0a fixed bad merge 2011-09-29 08:17:23 +10:00
Greg Wilkins 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
Greg Wilkins f45a720045 357240 debug client tests 2011-09-29 08:06:51 +10:00
Thomas Becker 1e5b85a2cb 359255: Allow HttpExchange state change from START to EXPIRED 2011-09-28 10:56:46 -05:00
Thomas Becker cceef37f17 359255: Code format 2011-09-28 10:44:03 -05:00
Jesse McConnell 74d5e800f6 fix some formatting issues with code conventions 2011-09-28 10:34:08 -05:00
David Kellum 40b25e6f5a JETTY-1421 Implement RedirectListener.onException,onConnectionFailed 2011-09-28 10:30:29 -05:00
David Kellum d37f2ca10c JETTY-1420 Set Host header for new request in RedirectListener 2011-09-28 10:21:29 -05:00
Greg Wilkins 603ee3dae1 357240 fixed client tests 2011-09-29 00:23:31 +10:00
Greg Wilkins a531fbc5a2 357240 fixed client tests 2011-09-29 00:09:13 +10:00
Greg Wilkins f73a6422f0 357240 fixed client test 2011-09-29 00:02:06 +10:00
Greg Wilkins fbf0fad076 357240 improved ishut/oshut handling 2011-09-28 22:50:38 +10:00
Greg Wilkins d0ffa5cb1a Merge branch 'master' into sslClose 2011-09-28 16:24:01 +10:00
Greg Wilkins 6eaa1364e3 357240 work in progress 2011-09-28 16:21:57 +10:00
Jan Bartel 65e7d65442 358959 File descriptor leak with UnresolvedAddressException 2011-09-28 14:59:34 +10:00
Greg Wilkins 27753fa747 removed debug 2011-09-26 23:00:57 +10:00
Greg Wilkins 75645cef0e 358674 Added include/exclude protocols to SslContextFactory 2011-09-23 08:02:42 +10:00
Greg Wilkins 633f3b1588 JETTY-1423 force connection to be closed returned 2011-09-22 09:22:27 +10:00
Jesse McConnell 21ddd768f0 [Bug 358147] Add catch for UnknownHostException to fix leaky file descriptor in client 2011-09-20 14:26:17 -05:00
Thomas Becker 4b7f8d79dd 358147: SelectConnector catch UnresolvedAddressException to avoid socket leak 2011-09-20 14:21:26 -05:00
Thomas Becker f0fe55165b SelectConnector.java code format 2011-09-20 14:21:18 -05:00
Greg Wilkins 26c8cc8514 346419 testing HttpClient FDs 2011-09-20 18:00:24 +10:00
Joakim Erdfelt a3b2a71aea Setting back to debug level 2011-09-15 11:28:56 -07:00
Joakim Erdfelt 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
Thomas Becker 5530594128 353509: Fixed merging issues 2011-09-14 08:41:33 -07:00
Joakim Erdfelt fce4192fd9 353509 - jetty-client unit tests are running too long 2011-09-12 15:04:59 -07:00
Jesse McConnell d5304b2cbc [maven-release-plugin] prepare for next development iteration 2011-09-08 12:20:15 -05:00
Jesse McConnell c33548d38a [maven-release-plugin] prepare release jetty-8.0.1.v20110908 2011-09-08 12:19:24 -05:00
Jesse McConnell ebdb89dc23 [maven-release-plugin] prepare for next development iteration 2011-09-08 12:00:16 -05:00
Jesse McConnell 932245a114 [maven-release-plugin] prepare release jetty-7.5.1.v20110908 2011-09-08 12:00:10 -05:00
Jesse McConnell 721c8ab682 updating version.txt and resetting pom version to 8.0.1-SNAPSHOT 2011-09-08 11:54:53 -05:00
Jesse McConnell 37d0f53b0a updating version.txt and resetting pom versions to 7.5.1-SNAPSHOT 2011-09-08 11:40:37 -05:00
Jesse McConnell 4e47d6a7fa [maven-release-plugin] prepare for next development iteration 2011-09-07 18:16:58 -05:00
Jesse McConnell d77a12962b [maven-release-plugin] prepare release jetty-8.0.1.v20110907 2011-09-07 18:16:50 -05:00
Jesse McConnell 6b614a54f0 [maven-release-plugin] prepare for next development iteration 2011-09-07 18:12:16 -05:00
Jesse McConnell ce55c8c601 [maven-release-plugin] prepare release jetty-7.5.1.v20110907 2011-09-07 18:12:09 -05:00
Jesse McConnell 1744b5bce1 reset from release 2011-09-07 11:09:46 -05:00
Jesse McConnell ae86ad6d4e [maven-release-plugin] prepare for next development iteration 2011-09-07 10:03:16 -05:00
Jesse McConnell 86383afbd2 [maven-release-plugin] prepare release jetty-7.5.1.v20110907 2011-09-07 10:03:10 -05:00
Jesse McConnell 40dcb10ed8 [maven-release-plugin] prepare for next development iteration 2011-09-01 12:24:32 -05:00
Jesse McConnell db14b194fa [maven-release-plugin] prepare release jetty-8.0.0.v20110901 2011-09-01 12:24:24 -05:00
Jesse McConnell a728021edf [maven-release-plugin] prepare for next development iteration 2011-09-01 11:17:05 -05:00
Jesse McConnell 882308f781 [maven-release-plugin] prepare release jetty-7.5.0.c20110901 2011-09-01 11:16:58 -05:00
Jan Bartel 1e079f06c9 Merge remote-tracking branch 'origin/master' into jetty-8 2011-09-01 14:11:53 +10:00
Jesse McConnell 57e9045635 [maven-release-plugin] prepare for next development iteration 2011-08-31 14:17:32 -05:00
Jesse McConnell 317491a4d7 [maven-release-plugin] prepare release jetty-7.5.0.v20110901 2011-08-31 14:17:25 -05:00
Michael Gorovoy 9c862f2699 HttpExchangeTest#testOptionsWithExchange no longer fails on Mac OS X 2011-08-30 16:47:19 -04:00
Joakim Erdfelt 7663a83616 [maven-release-plugin] rollback the release of jetty-7.5.0.RC2 2011-08-30 12:52:45 -07:00
Joakim Erdfelt 3280e9401a Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project 2011-08-30 12:52:15 -07:00
Joakim Erdfelt 4c5c954d23 [maven-release-plugin] prepare release jetty-7.5.0.RC2 2011-08-30 12:47:42 -07:00
Michael Gorovoy aefd353752 Adjusted TimeoutExchangeTest timeouts 2011-08-30 15:35:13 -04:00
Greg Wilkins 45148353ec 293739 Hide stacks in named log testing. Various other minor log cleanups in output. 2011-08-30 16:05:21 +10:00
Greg Wilkins 33fa7afb47 356144 added SelectorManager.setSelectorPriorityDelta(int) 2011-08-30 14:24:28 +10:00
Michael Gorovoy 0763e040e5 353014 TimeoutExchangeTest run time reduced
Patch provided by Thomas Becker <tbecker@intalio.com>
2011-08-29 16:18:45 -04:00
Joakim Erdfelt 79db394552 Merge from trunk 2011-08-26 10:12:45 -07:00
Michael Gorovoy 103d7a87c2 353623 Added new methods to HttpExchange 2011-08-26 03:49:58 -04:00
Joakim Erdfelt 4ace183764 Merging from master 2011-08-25 12:09:36 -07:00
Joakim Erdfelt 3399242d83 293739 - Deprecate static Jetty Log usage in favor of named logs
+ Finished conversion of jetty-ajp, jetty-client, jetty-deploy,
jetty-jaspi, jetty-jndi, jetty-plus, jetty-webapp
2011-08-24 13:01:00 -07:00
Michael Gorovoy 5aced83287 Added tests for missing CONTINUE 100, error response, and timeout 2011-08-23 16:56:05 -04:00
Greg Wilkins da517c815a JETTY-1410 handle 1xx in similar fashion to 401s and 302s 2011-08-23 17:07:31 +10:00
Michael Gorovoy 07b8f08a37 JETTY-1410 HTTP client handles CONTINUE 100 response correctly 2011-08-23 16:20:37 +10:00
Michael Gorovoy d8d5414f64 Added unit test for unexpected data being received by the client 2011-08-19 13:11:57 -04:00
Greg Wilkins e5a3cb9cef [maven-release-plugin] prepare for next development iteration 2011-08-19 22:17:46 +10:00
Greg Wilkins f0b4ffffda [maven-release-plugin] prepare release jetty-7.5.0.RC1 2011-08-19 22:17:33 +10:00
Jesse McConnell 4700979200 [maven-release-plugin] prepare for next development iteration 2011-08-16 09:26:56 -05:00
Jesse McConnell 3ae78dfbb2 [maven-release-plugin] prepare release jetty-8.0.0.RC0 2011-08-16 09:26:48 -05:00
Jesse McConnell 4d7ba354e1 [maven-release-plugin] prepare for next development iteration 2011-08-15 14:18:53 -05:00
Jesse McConnell 2175bae0a0 [maven-release-plugin] prepare release jetty-7.5.0.RC0 2011-08-15 14:18:42 -05:00
Jan Bartel 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
Greg Wilkins 6b9ecd0806 353073 Improved client API to use futures 2011-08-11 11:50:23 +10:00
Thomas Becker 0a6c7ad846 353563: HttpDestinationQueueTest too slow
Signed-off-by: Jesse McConnell <jesse.mcconnell@gmail.com>
2011-08-02 08:39:38 -05:00
Jesse McConnell cd0dd3e8ff [Bug 352999] test performance patch applied to jetty-client, thanks Thomas 2011-08-02 08:04:18 -05:00
Jan Bartel 02a66a00fb Merge remote-tracking branch 'origin/master' into jetty-8
Conflicts:
	VERSION.txt
	jetty-osgi/jetty-osgi-boot-logback/META-INF/MANIFEST.MF
	jetty-osgi/jetty-osgi-equinoxtools/src/main/java/org/eclipse/jetty/osgi/equinoxtools/WebEquinoxToolsActivator.java
	pom.xml
2011-08-01 14:39:39 +10:00
Greg Wilkins 2806869cfd 353073 test harness for websocket client and improved ietf draft 10 compliance 2011-08-01 12:35:01 +10:00
Jan Bartel 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
Greg Wilkins 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
Greg Wilkins f4255bdeef Merge branch 'master' into performance 2011-07-18 09:16:51 +10:00
Greg Wilkins 70d7d3c9a5 reverted version 2011-07-18 09:15:31 +10:00
Michael Gorovoy dc3445cea2 298502 CONNECT uses same HTTP version as original request 2011-07-15 09:32:55 -04:00
Greg Wilkins 61b2a5c751 298502 Handle 200 Connect responses with no content-length 2011-07-15 15:50:41 +10:00
Greg Wilkins b62c5cdde6 298502 added ProxyFakeTunnelTest.java to demonstrate the issue 2011-07-15 15:06:26 +10:00
Greg Wilkins a26ddd5933 created performance version 2011-07-14 15:38:25 +10:00
Greg Wilkins d8cb8556aa return client buffers 2011-07-14 11:58:14 +10:00
Jan Bartel 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
Greg Wilkins 1093a95566 Merge branch 'master' into performance 2011-07-08 11:59:24 +10:00
Jesse McConnell 39674f8a8e [maven-release-plugin] prepare for next development iteration 2011-07-07 18:43:56 -05:00
Jesse McConnell 5aa94f502e [maven-release-plugin] prepare release jetty-7.4.4.v20110707 2011-07-07 18:43:50 -05:00
Greg Wilkins 17e907c2fb git diff 54e885d967 remotes/origin/jetty-8-historical | patch -p1 ; git add -A 2011-07-07 18:18:24 +10:00
Greg Wilkins 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
Michael Gorovoy b5a2e7e426 308851 Converted all jetty-client module tests to JUnit 4
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3459 7e9141cc-0065-0410-87d8-b60c137991c4
2011-07-02 00:57:56 +00:00
Michael Gorovoy c8375b286a 308851 Converted all jetty-client tests to JUnit 4
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3457 7e9141cc-0065-0410-87d8-b60c137991c4
2011-07-01 21:06:31 +00:00
Jesse McConnell 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
Jesse McConnell 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
Greg Wilkins 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
Jesse McConnell 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
Jesse McConnell 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
Jesse McConnell 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
Jesse McConnell 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
Michael Gorovoy c17b91fa86 JETTY-1385 NPE in jetty client's HTttpExchange.setRequestContentSource(InputStream)
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3438 7e9141cc-0065-0410-87d8-b60c137991c4
2011-06-29 19:01:17 +00:00
Michael Gorovoy 0b9f348132 308851 Convert HttpExchangeTest and related tests to JUnit 4
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3433 7e9141cc-0065-0410-87d8-b60c137991c4
2011-06-29 00:17:13 +00:00
Michael Gorovoy b290f203da Added TODO comments for disabled tests
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3429 7e9141cc-0065-0410-87d8-b60c137991c4
2011-06-27 15:13:22 +00:00
Michael Gorovoy 77b02e0ee0 350283 Excluded AsyncSslHttpExchangeTest.testPerf() from test runs on MacOS X unless stress is enabled
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3423 7e9141cc-0065-0410-87d8-b60c137991c4
2011-06-24 15:46:30 +00:00
Jesse McConnell 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
Jesse McConnell 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
Jesse McConnell 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
Greg Wilkins 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
Joakim Erdfelt 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
Simone Bordet 922fb70344 Fixes #347137 (Allow SSL renegotiations by default in HttpClient).
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3255 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-25 11:47:26 +00:00
Greg Wilkins 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
Simone Bordet e438787325 Reviewed and cleaned up code for #345615 (Enable SSL Session caching).
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3223 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-20 12:46:57 +00:00
Jesse McConnell 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
Jesse McConnell 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
Jesse McConnell 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
Jesse McConnell 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
Jesse McConnell 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
Michael Gorovoy e5f549664e 345615 SSL Session caching improvements and test
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3157 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-16 22:54:53 +00:00
Michael Gorovoy ab85bcda4f 345615 Enable SSL Session caching
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3145 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-14 01:30:26 +00:00
Greg Wilkins 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
Greg Wilkins 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
Jesse McConnell 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
Jesse McConnell 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
Greg Wilkins 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
Greg Wilkins 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
Simone Bordet 3d192f98ab Fixes #340040 (Support for a total timeout).
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3069 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-03 08:57:26 +00:00
Simone Bordet f8cb795a4f Setting non-blocking mode after connecting in blocking mode.
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3049 7e9141cc-0065-0410-87d8-b60c137991c4
2011-04-30 15:00:00 +00:00
Simone Bordet 26751210e4 Changes in preparation for #340040 (Support for a total timeout).
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3044 7e9141cc-0065-0410-87d8-b60c137991c4
2011-04-29 13:47:09 +00:00
Simone Bordet 057eb0a102 Fixes #343567 (HttpClient does not limit the destination's exchange queue).
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3028 7e9141cc-0065-0410-87d8-b60c137991c4
2011-04-21 15:29:20 +00:00
Greg Wilkins 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 a01a1edd70 [maven-release-plugin] prepare release jetty-7.4.0.v20110414
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3016 7e9141cc-0065-0410-87d8-b60c137991c4
2011-04-14 02:22:04 +00:00
Greg Wilkins 58652d8f09 342700 refine websocket API for anticipated changes
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3013 7e9141cc-0065-0410-87d8-b60c137991c4
2011-04-13 11:05:35 +00:00
Greg Wilkins b43b2607ad [maven-release-plugin] prepare for next development iteration
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2992 7e9141cc-0065-0410-87d8-b60c137991c4
2011-04-07 01:24:34 +00:00
Greg Wilkins b6d04cc349 [maven-release-plugin] prepare release jetty-7.4.0.RC0
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2990 7e9141cc-0065-0410-87d8-b60c137991c4
2011-04-07 01:24:08 +00:00
Greg Wilkins dad96688b3 less verbose logging
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2989 7e9141cc-0065-0410-87d8-b60c137991c4
2011-04-07 00:50:13 +00:00
Michael Gorovoy fa6ef11ad6 Set the version of jetty-test-policy artifact to 1.2
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2968 7e9141cc-0065-0410-87d8-b60c137991c4
2011-04-04 20:37:19 +00:00
Simone Bordet 8df474ea97 Fixes #341171 (Locking in HttpDestination blocks all requests to the same address).
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2963 7e9141cc-0065-0410-87d8-b60c137991c4
2011-04-04 14:30:11 +00:00
Greg Wilkins 50541649ca Get ready for 7.4 release
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2952 7e9141cc-0065-0410-87d8-b60c137991c4
2011-04-01 03:42:09 +00:00
Greg Wilkins 1bd0adabfb 340949 Scanner delays file notifications until files are stable
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2948 7e9141cc-0065-0410-87d8-b60c137991c4
2011-04-01 02:18:18 +00:00
Simone Bordet f3a66396b1 Made the test more reliable under Windows.
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2943 7e9141cc-0065-0410-87d8-b60c137991c4
2011-03-31 14:40:50 +00:00
Greg Wilkins 8d5b3c5261 341439 Blocking HttpClient does not use soTimeout for timeouts
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2940 7e9141cc-0065-0410-87d8-b60c137991c4
2011-03-31 00:30:22 +00:00
Simone Bordet cf09f69e53 Fixed #341386 (Remote close not detected by HttpClient).
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2938 7e9141cc-0065-0410-87d8-b60c137991c4
2011-03-30 15:50:13 +00:00
Jesse McConnell 6d4ec6a4bc initialize booleans in test exchange
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2937 7e9141cc-0065-0410-87d8-b60c137991c4
2011-03-30 15:36:25 +00:00
Greg Wilkins f814c815d2 improved tests
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2930 7e9141cc-0065-0410-87d8-b60c137991c4
2011-03-30 06:06:23 +00:00
Simone Bordet 05c3f0338d Improved handling of connection close, in case a request gets no response because the connection has been closed.
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2921 7e9141cc-0065-0410-87d8-b60c137991c4
2011-03-29 15:15:00 +00:00
Greg Wilkins fdf199e254 organized imports
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2912 7e9141cc-0065-0410-87d8-b60c137991c4
2011-03-25 05:59:18 +00:00
Michael Gorovoy be843880b7 340878 Integrations should be able to load their own keystores
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2910 7e9141cc-0065-0410-87d8-b60c137991c4
2011-03-24 17:22:40 +00:00