Commit Graph

812 Commits

Author SHA1 Message Date
Jesse McConnell b99623a21d [maven-release-plugin] prepare release jetty-9.1.1.v20140108 2014-01-08 16:47:01 -06:00
Joakim Erdfelt 0d3b840951 Setting problematic SPDY test to @Ignore till such time as it can be properly addressed 2014-01-08 11:35:06 -07:00
Simone Bordet 152dfaa293 Restoring code removed by mistake. 2014-01-08 16:49:04 +01:00
Simone Bordet dbee351543 425043 - Track whether pools are used correctly.
Added leak detection to SPDY load test.
2014-01-08 16:17:32 +01:00
Joakim Erdfelt 7af87b4a04 424598 - Module [npn] downloads wrong npn jar
+ Separating Module logical name from file system reference name
+ [depend] references in *.mod files are tried as file system reference
  names, then logical names.
+ --module=<name> are tried only as logical names.
+ All of the npn/npn-${jvm.version}.mod files are defined as logical
  name of npn-boot
2014-01-06 11:16:03 -07:00
Joakim Erdfelt 658c2ce762 424598 - Module [npn] downloads wrong npn jar
+ Adding testcase to validate all of the npn-boot sub-modules for sanity
2014-01-06 11:16:03 -07:00
Simone Bordet e94ff7db9c 424743 - Verify abort behavior in case the total timeout expires
before the connect timeout.

The changes to fix this issue uncovered problems in the HttpSender
state machine.
In particular, the SenderState is now defining more states that
depend on deferred content, and on handling of 100 Continue responses.

The refactoring also highlighted the fact that there was no need to
keep HttpConversation objects in a Map in HttpClient: they are now
only referenced by the HttpRequest.
With this change, Request.getConversationID() has been deprecated.

Also fixed a number of tests to make them more reliable.
2014-01-05 15:29:43 +01:00
Joakim Erdfelt a12fd9ea03 Happy New Year - 2014! 2014-01-02 14:50:14 -07:00
Joakim Erdfelt bd86928f1c Changing repo1.maven.org to central.maven.org 2013-12-26 15:45:48 -07:00
Joakim Erdfelt 1de4502ad5 424598 - Module [npn] downloads wrong npn jar
+ Implemented property expansion of [depend] module names
+ Added npn/npn-${java.version}.mod files
2013-12-26 15:41:40 -07:00
Simone Bordet 3d438c2028 424651 - org.eclipse.jetty.spdy.Flusher use of non-growable
ArrayQueue yield java.lang.IllegalStateException: Full.

Made the ArrayQueue growable.
2013-12-26 12:52:20 +01:00
Greg Wilkins 858b737be1 424598 switch on JRE version in module download 2013-12-23 15:53:12 +11:00
Greg Wilkins e5b85055bd 423739 Start checks module files.
renamed option to --create-files
cleaned up logging and messages
removed switch statement.
2013-12-23 15:46:52 +11:00
Simone Bordet 7a51f602dd Fixed SPDY Flusher.
Write were performed from within synchronized blocks, which was wrong.
Refactored the code to make these calls outside of synchronized blocks.
2013-12-20 19:13:09 +01:00
Simone Bordet 8d621a9331 424043 - IteratingCallback Idle race.
A few renamings and fixes to avoid IllegalStateExceptions.
2013-12-15 23:51:04 +01:00
Simone Bordet 41fc2b8f87 424043 - IteratingCallback Idle race.
Renamed Next enum to Action, and renamed some constant of the State
enum to avoid confusion with the Action enum.

Simplified succeeded() and failed(Throwable) code,
covering also cases not covered before.

Fixed case SCHEDULED in succeeded() that was returning in case the
compareAndSet failed.

Fixed race in perform(), where 2 threads may execute concurrently
after having returned from process().

Vastly improved javadocs and comments.
2013-12-15 00:47:55 +01:00
Greg Wilkins 7141483356 424043 - IteratingCallback Idle race 2013-12-14 09:14:12 +11:00
Simone Bordet ce4e07f6a4 Added comments about optimizations that may be included as part of
fixing 423974 - Optimize flow control.
2013-12-13 13:39:46 +01:00
Simone Bordet 6f316f9887 423930 - SPDY streams are leaked.
With this fix, when streams are closed or failed, the stream is closed
and its idle timeout is canceled, avoiding the leaking.
2013-12-13 13:39:46 +01:00
Simone Bordet f4a5f68bdd Using org.junit.Assert rather than junit.framework.Assert. 2013-12-13 13:39:46 +01:00
Simone Bordet 510afdef2a Removed unused field. 2013-12-13 13:39:46 +01:00
Greg Wilkins a12ad15a2c 423739 Start checks module files.
At runtime, required modules files are checked.  Either a warning is generated
or they are downloaded/create if --download or --create is specified.
2013-12-12 17:01:51 +11:00
Greg Wilkins cd05751ff7 423392 - GzipFilter without wrapping or blocking
I Added AsyncGzipFilter, which uses a modified HttpOutput instance to provide gzip compression without wrapping or blocking.
Does not currently handle deflate.
2013-12-06 22:53:41 +11:00
Greg Wilkins 23091e2272 421697 - IteratingCallback improvements
made gather size configurable
2013-11-21 16:00:50 +11:00
Greg Wilkins 0a52c64d16 421697 - IteratingCallback improvements
Use the iteratingcallback for websocket
use gather writes for websocket
always write entire websocket payload
2013-11-21 15:11:56 +11:00
Greg Wilkins 1eb2997efd 421697 - IteratingCallback improvements
avoid wrapping writeCallback
Idle state added to IteratingCallback for SPDY
2013-11-21 14:52:39 +11:00
Joakim Erdfelt 9172d6115b [maven-release-plugin] prepare for next development iteration 2013-11-15 16:58:44 -07:00
Joakim Erdfelt 6feeab6ec3 [maven-release-plugin] prepare release jetty-9.1.0.v20131115 2013-11-15 16:58:36 -07:00
Joakim Erdfelt 7bbc0ff4df [maven-release-plugin] rollback the release of jetty-9.1.0.v20131115 2013-11-15 16:33:52 -07:00
Joakim Erdfelt 1126e68971 [maven-release-plugin] prepare for next development iteration 2013-11-15 16:03:28 -07:00
Joakim Erdfelt d6418c73d4 [maven-release-plugin] prepare release jetty-9.1.0.v20131115 2013-11-15 16:03:20 -07:00
Joakim Erdfelt 6c372b9440 Reverting <version> to 9.1.0-SNAPSHOT 2013-11-15 15:36:26 -07:00
Jesse McConnell b5345caed1 [maven-release-plugin] prepare for next development iteration 2013-11-14 15:27:52 -06:00
Jesse McConnell 1582aa196d [maven-release-plugin] prepare release jetty-9.1.0.v20131114 2013-11-14 15:27:37 -06:00
Simone Bordet 310c7a543e Updated tests to run over SSL too. 2013-11-09 19:11:43 +01:00
Simone Bordet d9f818bee9 Restored default values in XML as failsafe values for idle timeouts,
since "0" means the connection will never timeout.
2013-11-07 16:21:59 +01:00
Greg Wilkins f567bddad9 global clean up imports 2013-11-04 13:48:03 +11:00
Joakim Erdfelt 2c2bc46211 Fixing compilation errors 2013-11-03 11:38:38 -07:00
Greg Wilkins eb3bb660b5 Merge remote-tracking branch 'origin/master' into jetty-9.1
Conflicts:
	jetty-client/src/main/java/org/eclipse/jetty/client/util/DigestAuthentication.java
	jetty-client/src/test/java/org/eclipse/jetty/client/HttpReceiverTest.java
	jetty-client/src/test/java/org/eclipse/jetty/client/HttpSenderTest.java
	jetty-http/src/main/java/org/eclipse/jetty/http/HttpField.java
	jetty-server/src/test/java/org/eclipse/jetty/server/AbstractHttpTest.java
	jetty-servlets/src/test/java/org/eclipse/jetty/servlets/AbstractDoSFilterTest.java
	jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/generator/HeadersBlockGenerator.java
	jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/HeadersBlockParser.java
	jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/ClientUpgradeRequest.java
	jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/WebSocketFrame.java
	jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/WebSocketSession.java
	jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/extensions/compress/DeflateCompressionMethodTest.java
	jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/extensions/compress/PerMessageDeflateExtensionTest.java
2013-11-03 18:22:09 +11:00
Mikhail Mazursky 6b0269a16d [Bug 420930] Use Charset to specify character encoding
Signed-off-by: Mikhail Mazursky <mikhail.mazursky@gmail.com>
2013-11-02 14:44:36 +06:00
Joakim Erdfelt 5965e695fa Cleaning up modules 2013-10-24 14:06:50 -07:00
Simone Bordet 0c80567c12 Using StandardCharset fields instead of Charset.forName(). 2013-10-21 16:14:18 +02:00
Simone Bordet 2d6190da59 Refactored class Fields to a better API. 2013-10-18 13:55:49 +02:00
Simone Bordet 16b317ea60 418212 - org.eclipse.jetty.spdy.server.http.SSLExternalServerTest
hangs.
2013-10-17 10:44:39 +02:00
Simone Bordet e85f34612c 419344 - NPNServerConnection does not close the EndPoint if it reads
-1.

Fixed by correctly handling the -1 read, closing the connection.
Also covered additional error cases, making sure the connection is
closed.
2013-10-14 13:29:47 +02:00
Simone Bordet 8fec401b06 419344 - NPNServerConnection does not close the EndPoint if it reads
-1.

Fixed by correctly handling the -1 read, closing the connection.
Also covered additional error cases, making sure the connection is
closed.
2013-10-14 13:26:00 +02:00
Greg Wilkins 33b10efcaa Merge remote-tracking branch 'origin/release-9' 2013-10-14 11:12:31 +11:00
Thomas Becker 081e7d3bbd 415609 spdy replace SessionInvoker with IteratingCallback. Introduce Flusher class to separate queuing/flushing logic from StandardSession 2013-10-11 10:51:05 +02:00
Simone Bordet 3886cc2dc5 Merged branch 'jetty-9.1' into 'http_client_connection_factories'. 2013-10-08 15:08:07 +02:00
Simone Bordet 25d9b8704f 417356 - Add SOCKS support to jetty client.
Big refactoring to allow for additional proxy schemes that work at a
lower level than HTTP.

Introduced client-side ConnectionFactory, and binding that to a
HttpDestination, so that connections to that destination will use the
same ConnectionFactory.

The destination's ConnectionFactory is now initialized from the proxy
configuration and the transport, which is now itself a
ConnectionFactory.

The proxy configuration has also changed becoming polymorphic by
introducing a new ProxyConfiguration.Proxy abstract class,
which is implemented as HTTPProxy and can be implemented in future as
SOCKS4Proxy (and possibly others).
2013-10-08 15:06:39 +02:00
Joakim Erdfelt 9daf520994 Adding @Test(timeout=60000) to prevent build hang 2013-10-04 15:27:10 -07:00
Simone Bordet 8eaedc4a5e Code cleanups.
Removed unused parameters, and renamed property "executeOnFillable"
to "dispatchIO", for similarity with HttpClient and for better
description (it names the concept, not the implementation detail).
2013-10-04 16:40:27 +02:00
Joakim Erdfelt 499d811ba7 Merge branch 'master' into jetty-9.1 2013-09-30 20:00:26 -07:00
Joakim Erdfelt 1315096192 Disabling broken external server test 2013-09-30 20:00:02 -07:00
Greg Wilkins 2d7f1a2272 ignore test dependent on external server 2013-10-01 11:18:09 +10:00
Jesse McConnell 856a24b65a [maven-release-plugin] prepare for next development iteration 2013-09-30 14:46:09 -05:00
Jesse McConnell f466f03c6a [maven-release-plugin] prepare release jetty-9.0.6.v20130930 2013-09-30 14:46:00 -05:00
Jesse McConnell 0b3f431d27 set version back to 9.0.6-SNAPSHOT 2013-09-30 12:33:06 -05:00
Jesse McConnell af2e6ff911 Merge branch 'master' into release-9 2013-09-30 12:28:04 -05:00
Joakim Erdfelt 8d312b9e5d 418212 - org.eclipse.jetty.spdy.server.http.SSLExternalServerTest hangs
+ Adding timeout on test
2013-09-27 11:40:35 -07:00
Joakim Erdfelt 273f61210e 418212 - org.eclipse.jetty.spdy.server.http.SSLExternalServerTest hangs
+ Adding timeout on test
2013-09-27 11:39:52 -07:00
Thomas Becker 2ef4a4fb1c fix SimpleHTTPBenchmarkTest 2013-09-23 15:07:47 +02:00
Thomas Becker bfb90523d6 SPDY remove unnecessary flush calls 2013-09-23 14:39:49 +02:00
Greg Wilkins f2f8ec54c6 Merge remote-tracking branch 'origin/master' into jetty-9.1
Conflicts:
	aggregates/jetty-all/pom.xml
	examples/embedded/src/main/java/org/eclipse/jetty/embedded/MinimalServlets.java
	examples/embedded/src/main/java/org/eclipse/jetty/embedded/SecuredHelloHandler.java
2013-09-23 13:38:43 +10:00
Jesse McConnell 0525498ad3 [maven-release-plugin] prepare for next development iteration 2013-09-19 15:06:31 -05:00
Jesse McConnell c05a725db6 [maven-release-plugin] prepare release jetty-9.0.6.v20130919 2013-09-19 15:06:17 -05:00
Thomas Becker 5346e06d4a 417289 SPDY replace use of direct buffers with indirect buffers or make it configurable 2013-09-19 15:43:07 +02:00
Greg Wilkins 156c936754 comments explaining other NPN boot versions 2013-09-12 18:35:16 +10:00
Jan Bartel 710806b4fd Update npn mod for different version of npn boot jar 2013-09-12 13:01:56 +10:00
Jan Bartel b24928db81 Move npn profiles to parent pom so that npn.version is available to other modules (eg osgi) 2013-09-12 11:55:21 +10:00
Jan Bartel be2ecca599 Move npn profiles to parent pom so that npn.version is available to other modules (eg osgi) 2013-09-12 10:06:01 +10:00
Simone Bordet c49ba7bdcc Merged branch 'master' into 'jetty-9.1'. 2013-09-11 09:16:39 +02:00
Simone Bordet 9910db17cb Added profile for JDK 1.7.0_40. 2013-09-11 09:15:39 +02:00
Greg Wilkins 070ce9dd22 Merge remote-tracking branch 'origin/master' into jetty-9.1
Conflicts:
	jetty-start/src/main/java/org/eclipse/jetty/start/Main.java
	jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebAppContext.java
2013-09-09 15:41:17 +10:00
Mikhail Mazursky 767faece5c [Bug 415999] Fix some of FindBugs warnings
Mostly not closed streams/DB resources are fixed. But also less
important things.

Signed-off-by: Mikhail Mazursky <mikhail.mazursky@gmail.com>
2013-09-09 00:24:31 -04:00
Simone Bordet 3cdf4dece1 Refactored some behaviour to base classes to ease the FCGI
implementation, and taken the chance to remove redundant code.
2013-09-07 00:36:31 +02:00
Simone Bordet e09415145f Removed unchecked warning. 2013-09-06 23:38:46 +02:00
Greg Wilkins ace43502ad refined start.jar mechanism to align with updated documentation 2013-09-06 16:10:03 +10:00
Greg Wilkins 5c3f498624 create directories on module ini 2013-09-06 13:06:15 +10:00
Simone Bordet 4663fa4992 Renamed "Empty" inner classes to "Adapter" to comply with the rest of
the codebase.
2013-09-04 13:15:23 +02:00
Greg Wilkins 2e444d2f17 Merge remote-tracking branch 'origin/master' into jetty-9.1
Conflicts:
	jetty-io/src/main/java/org/eclipse/jetty/io/AbstractConnection.java
	jetty-server/src/test/java/org/eclipse/jetty/server/HttpServerTestBase.java
	jetty-spdy/spdy-http-server/src/main/java/org/eclipse/jetty/spdy/server/proxy/ProxyHTTPSPDYConnection.java
2013-09-02 17:00:07 +10:00
Thomas Becker d22fa0dae1 416251 ProxyHTTPToSPDYConnection now sends a 502 to the client if it receives a rst frame from the upstream spdy server 2013-08-30 17:22:11 +02:00
Thomas Becker 85c0f47337 416251 ProxyHTTPToSPDYConnection now sends a 502 to the client if it receives a rst frame from the upstream spdy server 2013-08-30 17:22:05 +02:00
Thomas Becker 669ee75720 415548 migrate ProxyHTTPToSPDYTest to use HttpClient to avoid intermittent NPE part 2 2013-08-30 17:21:59 +02:00
Thomas Becker 8ba45188db merge ProxyHTTPSPDYConnection change with 9.1 2013-08-30 17:19:47 +02:00
Thomas Becker 8e4bae0ccf 415548 migrate ProxyHTTPToSPDYTest to use HttpClient to avoid intermittent NPE part 2 2013-08-30 17:16:22 +02:00
Thomas Becker b370da6783 415548 migrate ProxyHTTPToSPDYTest to use HttpClient to avoid intermittent NPE 2013-08-30 17:16:14 +02:00
Thomas Becker b54538793b 416251 ProxyHTTPToSPDYConnection now sends a 502 to the client if it receives a rst frame from the upstream spdy server 2013-08-30 17:15:15 +02:00
Thomas Becker 1ad4f89638 416251 ProxyHTTPToSPDYConnection now sends a 502 to the client if it receives a rst frame from the upstream spdy server 2013-08-30 17:15:15 +02:00
Thomas Becker f12afb2888 415548 migrate ProxyHTTPToSPDYTest to use HttpClient to avoid intermittent NPE part 2 2013-08-30 17:15:14 +02:00
Thomas Becker fcdea1d4b4 416242 respect persistence headers in ProxyHTTPSPDYConnection 2013-08-30 17:15:14 +02:00
Thomas Becker 9565d2647e 415548 migrate ProxyHTTPToSPDYTest to use HttpClient to avoid intermittent NPE part 2 2013-08-30 17:15:14 +02:00
Thomas Becker 936343a3e5 415548 migrate ProxyHTTPToSPDYTest to use HttpClient to avoid intermittent NPE 2013-08-30 17:15:13 +02:00
Jesse McConnell ac30f5c9bd update other jetty mods to new format 2013-08-29 16:39:28 -05:00
Greg Wilkins b884fabba6 Merge branch 'jetty-9.1' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9.1 2013-08-29 12:38:53 +10:00
Thomas Becker ac156b9111 415780 fix StreamAlreadyCommittedException in spdy build 2013-08-28 17:15:48 +02:00
Greg Wilkins c84063a5f8 415826 start.jar replace --enable with --initialize
refactored impl to be clearer when creating ini
2013-08-28 23:53:32 +10:00
Thomas Becker af1abb7af6 416026 improve error handlig in SPDY parsers 2013-08-28 14:45:39 +02:00
Greg Wilkins c1bd267c17 415826 start.jar replace --enable with --initialize 2013-08-28 15:41:27 +10:00
Joakim Erdfelt 29670845e7 jetty-start / fleshing out with spdy test case 2013-08-26 16:08:08 -07:00
Joakim Erdfelt 25ef708b48 Module fixes 2013-08-26 16:04:41 -07:00
Joakim Erdfelt a6527a2ae0 Javadoc fixes 2013-08-26 16:04:28 -07:00
Jesse McConnell 2ac2a1a974 add npn.mod 2013-08-26 17:22:40 -05:00
Jesse McConnell ef166c23e6 Merge branch 'release-9' 2013-08-23 18:58:01 -05:00
Joakim Erdfelt 2e94149ea3 Merge branch 'jetty-9.1' into jetty-9.1-altstart 2013-08-23 11:49:41 -07:00
Greg Wilkins a6b6891d8b 415641 Remove remaining calls to deprecated HttpTranspoert.send
Actually removed the impl of the deprecated method that is no longer called.
2013-08-23 10:23:52 +10:00
Jesse McConnell 0032c1443d add spdy and websocket mod 2013-08-22 13:23:29 -05:00
Thomas Becker 465f151669 415641 Remove remaining calls to deprecated HttpTranspoert.send(HttpGenerator.ResponseInfo info, ByteBuffer content, boolean lastContent) throws IOException 2013-08-22 14:00:27 +02:00
Thomas Becker 525b268d41 415656 SPDY - add IdleTimeout per Stream functionality 2013-08-22 14:00:27 +02:00
Thomas Becker e34ba252a2 413737 hide stacktrace in ReferrerPushStrategyTest 2013-08-15 13:13:23 +02:00
Thomas Becker c5e4457124 413737 hide stacktrace in ReferrerPushStrategyTest 2013-08-15 13:13:15 +02:00
Thomas Becker 345ee15d87 413737 hide stacktrace in ReferrerPushStrategyTest 2013-08-15 13:00:50 +02:00
Thomas Becker 050ac79f3d 413737 hide stacktrace in ReferrerPushStrategyTest 2013-08-15 12:13:44 +02:00
Jan Bartel c80100b4a9 [maven-release-plugin] prepare for next development iteration 2013-08-15 19:13:27 +10:00
Jan Bartel e7e7e45500 [maven-release-plugin] prepare release jetty-9.0.5.v20130815 2013-08-15 19:13:13 +10:00
Jan Bartel 716430bb03 [maven-release-plugin] rollback the release of jetty-9.0.5.v20130815 2013-08-15 18:03:49 +10:00
Jan Bartel 3d13c15d35 [maven-release-plugin] prepare release jetty-9.0.5.v20130815 2013-08-15 17:22:03 +10:00
Jan Bartel 7947b35134 Reset version for rerun of 9.0.5 2013-08-15 16:47:03 +10:00
Jesse McConnell 00d160a1c9 Merge branch 'release-9.1' into jetty-9.1 2013-08-14 14:37:19 -05:00
Jesse McConnell 657e78aff2 [maven-release-plugin] prepare for next development iteration 2013-08-14 13:28:42 -05:00
Jesse McConnell 590fae2bc4 [maven-release-plugin] prepare release jetty-9.1.0.M0 2013-08-14 13:28:32 -05:00
Simone Bordet 34032552ea Avoid boxing of primitive int variables in logging statements. 2013-08-14 14:33:05 +02:00
Jesse McConnell 67a7a37923 ignore test 2013-08-13 14:25:47 -05:00
Jesse McConnell 4383c9042d [maven-release-plugin] prepare for next development iteration 2013-08-13 14:20:56 -05:00
Jesse McConnell 160d34ec23 [maven-release-plugin] prepare release jetty-9.0.5.v20130813 2013-08-13 14:20:47 -05:00
Thomas Becker fffdd6b2fa Connection javadoc fix 2013-08-13 18:27:06 +02:00
Greg Wilkins 34cfc3ed10 Merge remote-tracking branch 'origin/master' into jetty-9.1
Conflicts:
	jetty-http/src/main/java/org/eclipse/jetty/http/HttpFields.java
	jetty-http/src/test/java/org/eclipse/jetty/http/HttpFieldsTest.java
	jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java
2013-08-09 13:50:49 +10:00
Greg Wilkins a779425994 414101 Do not escape special characters in cookies 2013-08-09 12:42:52 +10:00
Thomas Becker e628478eb4 Replace calls to deprecated HttpTransport.send(..) method in SPDY code 2013-07-26 17:52:16 +02:00
Thomas Becker ae785f034e Replace calls to deprecated HttpTransport.send(..) method in SPDY code 2013-07-26 17:51:02 +02:00
Thomas Becker af82e49835 ProxySPDYToSPDYLoadTest small change for shutting down the test 2013-07-26 17:40:57 +02:00
Simone Bordet f4a41efaad Merged branch 'master' into 'jetty-9.1'. 2013-07-24 11:21:36 +02:00
Thomas Becker 0049aa4322 412418 HttpTransportOverSPDY fix race condition while sending push streams that could cause push data not to be sent. Fixes intermittent test issues in ReferrerPushStrategyTest 2013-07-24 10:16:20 +02:00
Thomas Becker 1ab5de8ecd 412418 HttpTransportOverSPDY fix race condition while sending push streams that could cause push data not to be sent. Fixes intermittent test issues in ReferrerPushStrategyTest 2013-07-24 10:14:14 +02:00
Simone Bordet ff3b36cfb0 Merged branch 'master' into 'jetty-9.1'. 2013-07-23 16:28:29 +02:00
Simone Bordet d0f0dedf20 413531 - Introduce pluggable transports for HttpClient.
Merge of the branch 'http_client_transport' is now complete,
and the implementation is sound for the HTTP transport.
A basic implementation for the SPDY transport exists, but needs
improvements.
2013-07-23 16:08:56 +02:00
Simone Bordet 86d51f057d Ignored idle timeout test, not yet implemented in within the SPDY transport. 2013-07-23 15:53:35 +02:00
Simone Bordet aa6226e1fa Merged branch 'jetty-9.1' into 'http_client_transport'. 2013-07-23 15:53:35 +02:00
Simone Bordet beee37e96a Moved HttpClientTransport SPDY implementation in its own module under the SPDY project. 2013-07-23 15:53:35 +02:00
Simone Bordet 52b805697a Moved HTTPSPDYHeader into its own module, for use by a SPDY HttpClientTransport implementation. 2013-07-23 15:53:35 +02:00
Simone Bordet a4c63caf26 Working draft of the abstraction of HttpClient transport. 2013-07-23 15:50:51 +02:00
Thomas Becker 1c546a90d6 ReferrerPushStrategy logging changes 2013-07-23 14:34:46 +02:00
Thomas Becker 4837b75eec 413155 HttpTransportOverSPDY remove constructor argument for version and get version from stream.getSession instead 2013-07-23 10:52:13 +02:00
Greg Wilkins b8f7637e7d Merge remote-tracking branch 'origin/master' into jetty-9.1 2013-07-22 23:32:04 +10:00
Greg Wilkins fede2a7151 413291 Avoid SPDY double dispatch
removed task queue from HttpChannelOverSPDY
2013-07-19 11:07:17 +10:00
Thomas Becker a1789c8f7c 412840 remove Future in SPDYClient.connect() and return Session instead in blocking version 2013-07-17 18:09:11 +02:00
Thomas Becker d65b511447 413155 simplify HttpTransportOverSPDY a bit more. Throw exceptions if send is called with no content, lastContent=false and no responseInfo 2013-07-17 15:52:55 +02:00
Thomas Becker 205ef85ead 413155 refactor HttpTransportOverSPDY to fix some bugs and reduce cyclomatic complexity 2013-07-17 13:34:03 +02:00
Thomas Becker 11e0b57f68 413066 accept lower case method: head 2013-07-16 16:27:59 +02:00
Thomas Becker 0b3d91e94e disable debug logging 2013-07-16 15:52:41 +02:00
Thomas Becker 7d9803972e 413066 fix HttpTransportOverSPDYTest 2013-07-16 15:39:39 +02:00
Thomas Becker b858f266d6 413066 SPDY HEAD requests don't send response body anymore 2013-07-16 14:36:02 +02:00
Greg Wilkins 987aa846cc 398467 Servlet 3.1 Non Blocking IO
ensure that EOF is checked after all calls to nextContent
2013-07-15 14:28:22 +10:00
Greg Wilkins b2be8a5781 turned off debugging 2013-07-15 14:12:00 +10:00
Thomas Becker 64f4ad3b11 Fix SPDYClient refactoring. Wrap FuturePromise<Session> in SessionPromise 2013-07-12 09:57:31 +02:00
Thomas Becker 891a2c2b36 add HttpStalledServerConnectionTest, small improvements to ProxySPDYToHTTPLoadTest 2013-07-12 08:40:35 +02:00
Thomas Becker 6b91b947ab ProxySPDYToHTTPLoadTest add debug logging 2013-07-12 08:40:34 +02:00
Jan Bartel bd2add0ae9 Update to post-release (servlet 3.1/javaee) versions of javaee dependencies. WARNING: jetty-schemas from jetty-toolchain needs to be changed from SNAPSHOT to final release. 2013-07-12 13:53:58 +10:00
Simone Bordet cdf6f17b9e 412729 - SPDYClient needs a Promise-based connect() method.
Implemented the new method, modified the blocking method
(with a better signature) to call the new method.
2013-07-11 10:28:58 +02:00
Greg Wilkins 83b55418f5 Merge remote-tracking branch 'origin/master' into jetty-9.1
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannel.java
	jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannelState.java
2013-07-08 13:58:35 +10:00
Thomas Becker 81e92fcc13 409845 add test that makes sure that DataFrameGenerator correctly prepends the header information 2013-07-05 16:11:29 +02:00
Thomas Becker 5d1225b60e Revert "Revert "412318 HttpChannel fix multiple calls to _transport.completed() if handle() is called multiple times while the channel is COMPLETED""
This reverts commit 474d9fec28.
2013-07-05 10:42:43 +02:00
Greg Wilkins 981102fda5 398467 Servlet 3.1 Non Blocking IO
Asynchronous reads working.
2013-07-05 18:11:09 +10:00
Greg Wilkins 474d9fec28 Revert "412318 HttpChannel fix multiple calls to _transport.completed() if handle() is called multiple times while the channel is COMPLETED"
This reverts commit cb2eb030d1.
2013-07-05 09:21:10 +10:00
Thomas Becker cb2eb030d1 412318 HttpChannel fix multiple calls to _transport.completed() if handle() is called multiple times while the channel is COMPLETED 2013-07-04 15:46:14 +02:00
Greg Wilkins 965918d8f2 Merge remote-tracking branch 'origin/master' into jetty-9.1 2013-07-04 17:28:57 +10:00
Thomas Becker a85711420d 409282 fix intermittently failing MaxConcurrentStreamTest 2013-07-03 17:12:13 +02:00
Thomas Becker e4c7cfbf37 408235 SPDYtoHTTP proxy fix: remove hop headers from upstream server 2013-07-03 15:21:06 +02:00
Thomas Becker 85ef539663 HttpTransportOverSPDY add newline 2013-07-02 08:48:11 +02:00
Thomas Becker 8b31188ca7 405424 add X-Powered-By and Server header to SPDY 2013-07-01 21:57:22 +02:00
Thomas Becker 260b21f7df 405424 add X-Powered-By and Server header to SPDY 2013-07-01 17:08:35 +02:00
Thomas Becker d2470f6170 410805 StandardSession: remove all frameBytes for a given stream from queue if the stream is reset 2013-07-01 11:35:13 +02:00
Greg Wilkins e4716e05e1 Merge remote-tracking branch 'origin/master' into jetty-9.1
Conflicts:
	aggregates/jetty-all/pom.xml
	examples/async-rest/async-rest-jar/pom.xml
	examples/async-rest/async-rest-webapp/pom.xml
	examples/async-rest/pom.xml
	examples/embedded/pom.xml
	examples/pom.xml
	jetty-annotations/pom.xml
	jetty-ant/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-jaas/pom.xml
	jetty-jaspi/pom.xml
	jetty-jmx/pom.xml
	jetty-jndi/pom.xml
	jetty-jsp/pom.xml
	jetty-jspc-maven-plugin/pom.xml
	jetty-maven-plugin/pom.xml
	jetty-monitor/pom.xml
	jetty-nosql/pom.xml
	jetty-osgi/jetty-osgi-boot-jsp/pom.xml
	jetty-osgi/jetty-osgi-boot-warurl/pom.xml
	jetty-osgi/jetty-osgi-boot/pom.xml
	jetty-osgi/jetty-osgi-httpservice/pom.xml
	jetty-osgi/jetty-osgi-npn/pom.xml
	jetty-osgi/pom.xml
	jetty-osgi/test-jetty-osgi-context/pom.xml
	jetty-osgi/test-jetty-osgi-webapp/pom.xml
	jetty-plus/pom.xml
	jetty-proxy/pom.xml
	jetty-rewrite/pom.xml
	jetty-runner/pom.xml
	jetty-security/pom.xml
	jetty-server/pom.xml
	jetty-servlet/pom.xml
	jetty-servlets/pom.xml
	jetty-spdy/pom.xml
	jetty-spdy/spdy-client/pom.xml
	jetty-spdy/spdy-core/pom.xml
	jetty-spdy/spdy-example-webapp/pom.xml
	jetty-spdy/spdy-http-server/pom.xml
	jetty-spdy/spdy-server/pom.xml
	jetty-spring/pom.xml
	jetty-start/pom.xml
	jetty-util-ajax/pom.xml
	jetty-util/pom.xml
	jetty-webapp/pom.xml
	jetty-websocket/pom.xml
	jetty-websocket/websocket-api/pom.xml
	jetty-websocket/websocket-client/pom.xml
	jetty-websocket/websocket-common/pom.xml
	jetty-websocket/websocket-server/pom.xml
	jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/Fuzzer.java
	jetty-websocket/websocket-servlet/pom.xml
	jetty-xml/pom.xml
	pom.xml
	tests/pom.xml
	tests/test-continuation/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-jaas-webapp/pom.xml
	tests/test-webapps/test-jetty-webapp/pom.xml
	tests/test-webapps/test-jndi-webapp/pom.xml
	tests/test-webapps/test-mock-resources/pom.xml
	tests/test-webapps/test-proxy-webapp/pom.xml
	tests/test-webapps/test-servlet-spec/pom.xml
	tests/test-webapps/test-servlet-spec/test-container-initializer/pom.xml
	tests/test-webapps/test-servlet-spec/test-spec-webapp/pom.xml
	tests/test-webapps/test-servlet-spec/test-web-fragment/pom.xml
	tests/test-webapps/test-webapp-rfc2616/pom.xml
2013-06-27 09:12:28 +10:00
Thomas Becker 67fd1e496f 410498 ignore type of exception in GoAwayTest.testDataNotProcessedAfterGoAway 2013-06-25 09:13:34 -07:00
Joakim Erdfelt 78b5f7df1f [maven-release-plugin] prepare for next development iteration 2013-06-25 08:29:26 -07:00
Joakim Erdfelt 5f2c937fcb [maven-release-plugin] prepare release jetty-9.0.4.v20130625 2013-06-25 08:29:18 -07:00
Joakim Erdfelt 31faf2fe20 Reverting failed release from friday 2013-06-25 07:42:45 -07:00
Jesse McConnell 8927c18840 reset versions for release 2013-06-21 15:28:26 -05:00
Jesse McConnell 57bfda2a08 [maven-release-plugin] prepare for next development iteration 2013-06-21 09:49:25 -05:00
Jesse McConnell c1082ad4d4 [maven-release-plugin] prepare release jetty-9.0.4.v20130621 2013-06-21 09:49:15 -05:00
Thomas Becker 4ba9385ebc 411340 add comment why executeOnFillable defaults to true 2013-06-21 15:28:33 +02:00
Thomas Becker 918632d408 411340 SpdyConnection make executeOnFillable configurable and default to true 2013-06-21 14:45:16 +02:00
Thomas Becker b119bdfa24 fix typo in javadoc 2013-06-21 14:45:16 +02:00
Jan Bartel b006496198 Merge remote-tracking branch 'origin/master' into jetty-9.1 2013-06-21 14:55:14 +10:00
Jan Bartel 8c580bd875 Fix spdy pom.xml 2013-06-21 14:54:35 +10:00
Jan Bartel f59ef8cfce Merge remote-tracking branch 'origin/master' into jetty-9.1 2013-06-21 14:52:38 +10:00
Jan Bartel 8d7477218d Add profile for jdk1.7.0_25 2013-06-21 14:51:10 +10:00
Greg Wilkins 507cc074c6 Merge remote-tracking branch 'origin/servlet-3.1-api' into jetty-9.1 2013-06-21 13:04:54 +10:00
Greg Wilkins 3ded04813d Merge remote-tracking branch 'origin/master' into servlet-3.1-api
Conflicts:
	jetty-spdy/spdy-http-server/src/test/java/org/eclipse/jetty/spdy/server/http/ServerHTTPSPDYTest.java
2013-06-21 11:22:58 +10:00
Joakim Erdfelt f8c457f75e Merge branch 'jetty-9.1' into javawebsocket-jsr 2013-06-19 15:07:15 -07:00
Thomas Becker 4085cfb602 411061 fix cookie handling in spdy. If two different HTTP headers with the same name are set, they should be translated to a single multiheader value according to: http://www.chromium.org/spdy/spdy-protocol/spdy-protocol-draft3#TOC-2.6.10-Name-Value-Header-Block. That applies for Set-Cookie headers for example. Before this changed duplicate header names have overwritten the previous one 2013-06-19 16:22:57 +02:00
Joakim Erdfelt 931cfa10ce Merge branch 'master' into javawebsocket-jsr
Conflicts:
	jetty-websocket/websocket-client/src/test/java/org/eclipse/jetty/websocket/client/TomcatServerQuirksTest.java
2013-06-18 12:41:20 -07:00
Thomas Becker ad458105f2 ReferrerPushStrategy fix javadoc 2013-06-18 17:34:20 +02:00
Thomas Becker 117b086f26 PushStrategy.java remove newlines in javadoc 2013-06-18 16:00:59 +02:00
Joakim Erdfelt 2da8c9c306 Merge branch 'master' into javawebsocket-jsr
Conflicts:
	jetty-spdy/spdy-http-server/src/test/java/org/eclipse/jetty/spdy/server/http/ReferrerPushStrategyTest.java
	jetty-util/src/main/java/org/eclipse/jetty/util/BufferUtil.java
	jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/io/UpgradeConnection.java
	jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/events/EventDriver.java
	jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/ServletWebSocketRequest.java
	jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/WebSocketServerFactory.java
	jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/WebSocketLoadRFC6455Test.java
2013-06-17 10:54:10 -07:00
Thomas Becker 00744e42fc 410341 suppress stacktraces that happen during test setup shutdown after successful test run 2013-06-17 09:19:03 -07:00
Thomas Becker 11760a7c83 @Ignore MaxConcurrentStreamsTest for now 2013-06-17 09:19:03 -07:00
Thomas Becker 1efd637dec 409796 fix and cleanup ReferrerPushStrategy. There's more work to do here, so it remains @Ignore for now 2013-06-17 09:19:02 -07:00
Thomas Becker d9ada8a1eb 410098 inject accept-encoding header for all http requests through SPDY as SPDY clients MUST support spdy. Also remove two new tests that have been to implementation agnostic and not needed anymore due to recent code changes 2013-06-17 09:19:02 -07:00
Thomas Becker ba9f9b4195 406759 supressed stacktrace in ReferrerPushStrategyTest 2013-06-17 09:19:02 -07:00