Commit Graph

291 Commits

Author SHA1 Message Date
Simone Bordet 2339da7cc0 Jetty9 - Marked tests as @Slow. 2012-08-28 13:04:18 +02:00
Simone Bordet 156f07d493 Jetty9 - Greatly simplified HttpChannelOverSPDY.
Removed old code that was not necessary anymore.
2012-08-28 09:33:11 +02:00
Simone Bordet a224a8e962 Jetty9 - Ignored two tests because the functionality they test is not yet implemented. 2012-08-27 17:21:58 +02:00
Simone Bordet edd40ec299 Jetty9 - Fixed ProtocolNegotiationTest and additional minor cleanups/logging/comments. 2012-08-27 17:13:38 +02:00
Simone Bordet 1a2266b1b8 Jetty9 - Fixed test by specifying hardcoded idle timeout to avoiding NPE. 2012-08-27 16:58:29 +02:00
Simone Bordet bc0f9cd9e6 Jetty9 - Made test more robust. 2012-08-27 09:21:56 +02:00
Simone Bordet 5a3a25c880 Jetty9 - Logging idle timeouts. 2012-08-27 09:21:35 +02:00
Simone Bordet 7b58c584b9 Jetty9 - Fixed tests: now creating a connector requires an instance of Server, otherwise throws an NPE. 2012-08-27 08:38:27 +02:00
Greg Wilkins 9a1a020f0e jetty-9 renamed HttpTransport.{commit|write} to send 2012-08-27 14:43:29 +10:00
Simone Bordet cda0528625 Jetty9 - Second draft of SPDY wiring: more test cases pass, still work to do. 2012-08-24 19:36:10 +02:00
Simone Bordet 6b3d5f5390 Jetty9 - First draft of SPDY wiring: most test cases pass, still work to do. 2012-08-24 16:18:53 +02:00
Simone Bordet 171ad66962 Fixed compilation errors after merging branch 'jetty-9-aggregation' into jetty-9-spdy-http 2012-08-24 12:20:44 +02:00
Simone Bordet 06b2de17d5 Merge branch 'jetty-9-aggregation' into jetty-9-spdy-http 2012-08-24 11:52:29 +02:00
Jesse McConnell 6ffaa478c4 standardize license headers 2012-08-17 16:09:49 -05:00
Joakim Erdfelt 3d1d76d214 Merge from jetty-8 to jetty-9 (license header standarization) 2012-08-17 13:44:22 -07:00
Jesse McConnell 5de0cee1eb merge from master + license block standardization 2012-08-17 14:50:43 -05:00
Greg Wilkins 086e74bed8 jetty-9 merged jetty-8
Merge remote-tracking branch 'origin/jetty-8' into jetty-9

Conflicts:
	jetty-security/src/main/java/org/eclipse/jetty/security/authentication/FormAuthenticator.java
	jetty-server/src/main/java/org/eclipse/jetty/server/AbstractHttpConnection.java
	jetty-server/src/test/java/org/eclipse/jetty/server/HttpConnectionTest.java
	jetty-util/src/main/java/org/eclipse/jetty/util/log/StdErrLog.java
	jetty-util/src/main/java/org/eclipse/jetty/util/resource/JarFileResource.java
	jetty-util/src/test/java/org/eclipse/jetty/util/log/StdErrLogTest.java
2012-08-17 23:35:42 +10:00
Thomas Becker b73ca3e316 interims changes 2012-08-17 11:52:59 +02:00
Jesse McConnell 00ed549898 standardize license header blocks 2012-08-16 19:11:27 -05:00
Thomas Becker f8950b64bd merge with jetty-9 2012-08-16 09:56:51 +02:00
Thomas Becker aa22952368 interims commit 2012-08-16 09:47:33 +02:00
Simone Bordet 279f24faaa Jetty9 - Removed duplicate logger definitions. 2012-08-13 11:48:32 +02:00
Greg Wilkins 73a89427b1 jetty-9 fixed some XML validation issues 2012-08-12 11:23:20 +10:00
Greg Wilkins 488f53f8d6 jetty-9 cleaned up the stop and stopTimeout handlng 2012-08-11 12:51:32 +10:00
Simone Bordet 2d832fa9ad Jetty9 - Introduced Connection.close() for better stop of lifecycle components. 2012-08-10 10:32:45 +02:00
Greg Wilkins afe489e986 jetty-9 potential SSL fix 2012-08-10 15:21:52 +10:00
Greg Wilkins 16b404754e jetty-9 improved logging 2012-08-10 13:31:11 +10:00
Thomas Becker 731eb31c7e interims changes 2012-08-09 18:54:41 +02:00
Simone Bordet c4912f4a1d Jetty9 - Removed "async" from class/method names. 2012-08-08 11:28:53 +02:00
Greg Wilkins 32c5f6c093 jetty-9 reduced LazyList usage 2012-08-08 11:58:50 +10:00
Simone Bordet b1bb418fea Jetty9 - SPDY cleanups. 2012-08-03 19:17:11 +02:00
Simone Bordet 433839bd47 Jetty9 - Introduced ConnectionFactory for SelectChannelConnector.
This change abstracts out the connection creation from the connector itself,
so there can be only one connector managing all protocols, depending on
the configuration of the connection factories.
2012-08-03 19:10:21 +02:00
Greg Wilkins 29833f000b Merge branch 'jetty-9' into jetty-9-oneconnector
Conflicts:
	jetty-io/src/main/java/org/eclipse/jetty/io/AsyncByteArrayEndPoint.java
	jetty-io/src/main/java/org/eclipse/jetty/io/ChannelEndPoint.java
	jetty-io/src/main/java/org/eclipse/jetty/io/WriteFlusher.java
	jetty-io/src/main/java/org/eclipse/jetty/io/ssl/SslConnection.java
	jetty-io/src/test/java/org/eclipse/jetty/io/WriteFlusherTest.java
2012-08-03 12:39:21 +10:00
Thomas Becker 137ccca7c5 jetty9 - Make WriteFlusher.java threadsafe 2012-08-03 01:06:41 +02:00
Thomas Becker a4018d3484 merge with jetty-9 2012-08-02 15:00:43 +02:00
Thomas Becker 4e94601619 jetty-9: Make WriteFlusher threadsafe. 2012-08-02 14:38:54 +02:00
Greg Wilkins 0865a9cfb0 jetty-9 removed more AsyncConnection names 2012-08-02 18:10:29 +10:00
Greg Wilkins b63e09df61 jetty-9 rudimentary connectionFactory impl 2012-08-02 17:44:29 +10:00
Greg Wilkins b52930be14 jetty-9 merged Async and non-Async classes for EndPoint and Connection 2012-08-02 16:08:49 +10:00
Greg Wilkins 7c4fd9326e jetty-9 one connector passing more tests 2012-08-02 14:17:49 +10:00
Simone Bordet 78802c35c2 Jetty9 - SPDY: computing return value for write() and small optimization in fill(). 2012-07-31 16:18:42 +02:00
Simone Bordet 9c717d552f Jetty9 - SPDY: gracefully shutting down the Session in case of read of -1 from the remote peer.
A special item is queued into the Session for flushing, and when it is dequeued it closes the
underlying connection.
This allows pending writes to complete before the underlying connection is closed.
2012-07-30 23:02:26 +02:00
Simone Bordet b4b1bc814c Jetty9 - SPDY: fixed copyright headers. 2012-07-30 23:02:26 +02:00
Simone Bordet 8d12e49988 Jetty9 - SPDY: removed System.out statements. 2012-07-30 23:02:25 +02:00
Thomas Becker 51d7404956 jetty-9: spdy replaced log4j with jetty-logging.properties 2012-07-30 16:19:24 +02:00
Simone Bordet 36729c4248 Jetty9 - Always returning false from onReadTimeout(). Either we do not have to close, or the goAway() will close after it is written. 2012-07-30 12:45:39 +02:00
Simone Bordet 3abb8cfd37 Jetty9 - Reverted test logging to INFO. 2012-07-29 15:04:27 +02:00
Simone Bordet 2dcee671e1 Jetty9 - Removed leftover debug statement. 2012-07-27 23:28:27 +02:00
Simone Bordet 592cb3432e Jetty9 - Introduced NextProtoNego AsyncConnections to handle SSL with NPN. 2012-07-27 21:54:09 +02:00
Thomas Becker 369bc035fc jetty-9: jetty-spdy refactored to match jetty-9. 2012-07-27 16:18:47 +02:00
Thomas Becker b36a6cc9cc jetty-9 checkout jetty-spdy from jetty-8 2012-07-27 15:51:14 +02:00
Jan Bartel c67b2d89c0 Merge remote-tracking branch 'origin/master' into jetty-8 2012-07-27 16:05:15 +10:00
Thomas Becker 37e0b8ffe4 spdy: StandardSession format toString method 2012-07-26 13:10:08 +02:00
Simone Bordet 6aba6d1e8c Jetty9 - Refactored SelectorManager and SelectChannelEndPoint.
Simplified Selectable interface, and improved idle timeout checking.
2012-07-20 13:04:28 +02:00
Simone Bordet dfeb761306 Jetty9 - Now calling SelectorManager.newConnection() from a single call site rather than having to duplicate the call in every newEndPoint() implementation. 2012-07-19 18:43:23 +02:00
Simone Bordet ebb7806edc Jetty9 - Implemented abstract methods on SelectorManager that were always implemented in the same way, making them consistent. 2012-07-18 19:47:10 +02:00
Jesse McConnell 136514948f [maven-release-plugin] prepare for next development iteration 2012-07-16 13:24:49 -05:00
Jesse McConnell 1bbc677a09 [maven-release-plugin] prepare release jetty-8.1.5.v20120716 2012-07-16 13:24:42 -05:00
Jesse McConnell f755d014cd [maven-release-plugin] prepare for next development iteration 2012-07-16 13:23:59 -05:00
Jesse McConnell 04b7e807a0 [maven-release-plugin] prepare release jetty-7.6.5.v20120716 2012-07-16 13:23:53 -05:00
Jesse McConnell c00bb2d6ca reset for release 2012-07-16 12:55:22 -05:00
Jesse McConnell f59b2a0632 reset release 2012-07-16 12:54:36 -05:00
Jesse McConnell 957d39da17 merge master 2012-07-16 12:51:18 -05:00
Jesse McConnell 9315ed8b73 Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project 2012-07-13 12:24:50 -05:00
Jesse McConnell 205e8f74f0 [maven-release-plugin] prepare for next development iteration 2012-07-13 10:20:48 -05:00
Jesse McConnell c3b5269d60 [maven-release-plugin] prepare release jetty-8.1.5.v20120713 2012-07-13 10:20:23 -05:00
Thomas Becker 0fcb42e7bf spdy: add logging when ProxyEngineSelector resets a stream 2012-07-13 16:46:24 +02:00
Jesse McConnell 12ecc10c6a [maven-release-plugin] prepare for next development iteration 2012-07-13 09:35:08 -05:00
Jesse McConnell bf40110fb8 [maven-release-plugin] prepare release jetty-7.6.5.v20120713 2012-07-13 09:34:52 -05:00
Jesse McConnell 5222459aa7 Merge branch 'master' into jetty-8 2012-07-13 09:05:05 -05:00
Thomas Becker 198f713f7d spdy: spdy-proxy refactoring to allow multiple ProxyEngine implementations for different protocols. Header name fix to lowercase header names before creating the bytes to sent over the wire. 2012-07-13 11:53:56 +02:00
Simone Bordet 1843324bab Added support for X-Forwarded-For header. 2012-07-12 17:45:00 +02:00
Simone Bordet a7dab4bd2d Fixed spin loop caused by interaction of HttpGenerator._bypass and HttpGenerator.isBufferFull().
In HttpOutput.write(), an infinite spin loop was triggered when a previous write() set _bypass to true,
but _bypass was not reset after the write was complete. An additional write would have caused
a call to isBufferFull(), implemented in terms of _bypass, which would have returned true erroneously,
and this would have caused the infinite spin loop.
Now we properly reset _bypass when we fully write a data frame, so that isBufferFull() can properly
return false and allow for further writes.
2012-07-12 17:16:57 +02:00
Simone Bordet 0ad04eca6e Fixed test that was broken by changes to the pushed URI header in spdy/2. 2012-07-12 15:13:47 +02:00
Jesse McConnell 81d72052c8 merged master to jetty-8 2012-07-11 14:04:49 -05:00
Jesse McConnell aa941f5711 quick pass through to clean up missing or incorrect license blocks 2012-07-11 12:29:46 -05:00
Jesse McConnell 0fa17c13b1 Merge branch 'master' into jetty-8 2012-07-11 10:10:00 -05:00
Simone Bordet 6348a96071 Added test to show how to connect to an external server with the SPDY client. 2012-07-10 16:16:41 +02:00
Simone Bordet 9253bb791e Added capability of customizing request and response headers by overriding a method, and added Via header also on responses. 2012-07-09 16:00:44 +02:00
Thomas Becker e3b6344641 spdy: proxy fix to keep scheme on forwarded requests 2012-07-09 14:09:47 +02:00
Simone Bordet 4738584ccd Improved proxy logging. 2012-07-09 13:21:32 +02:00
Thomas Becker 77c673c89b spdy: push referrer call period starts when first resource is added. Before it started when main resource was created 2012-07-06 17:33:52 +02:00
Simone Bordet 652fcc3552 Merge "spdy: move x-spdy-push header to internal request. fix StandardStream.toString()" 2012-07-06 09:54:57 -04:00
Simone Bordet dd7eb898c9 Merge "spdy: different push strategies per connection factory" 2012-07-06 09:53:28 -04:00
Thomas Becker ac7c3c8f0d spdy: move x-spdy-push header to internal request. fix StandardStream.toString() 2012-07-06 15:46:31 +02:00
Thomas Becker e7a52df43d spdy: different push strategies per connection factory 2012-07-06 15:23:06 +02:00
Simone Bordet f4ebc89ee3 Merge "spdy: add StandardSession and StandardStream toString() improvements" 2012-07-06 06:52:27 -04:00
Thomas Becker 17b585d2ce spdy: isIfModifiedSinceHeaderPresent should have been removed, but slipped through a conflict merge. remove that method. 2012-07-05 17:47:50 +02:00
Thomas Becker 1ff0b18b94 spdy: ReferrerPushStrategy configurable by SPDY version and add referrer push period 2012-07-04 19:28:08 +02:00
Simone Bordet 5e619ce525 Merge "spdy: push strategy move if-modified-since check from connection to ReferrerPushStrategy" 2012-07-04 11:38:19 -04:00
Thomas Becker 091fd73c3e spdy: add StandardSession and StandardStream toString() improvements 2012-07-04 15:43:09 +02:00
Greg Wilkins a519ecc1fb improved SPDY dump 2012-07-03 15:31:56 +02:00
Thomas Becker f09eaee521 spdy: push strategy move if-modified-since check from connection to ReferrerPushStrategy 2012-06-18 18:17:25 +02:00
Jesse McConnell 571b1da632 Merge branch 'master' into jetty-8 2012-06-14 15:46:59 -05:00
Simone Bordet 3c0e13a7fe Fixed test after changes to the semantic of last-good-stream-id. 2012-06-12 14:07:18 +02:00
Simone Bordet 0ac2b99f6a Final pass at the implementation of a reverse SPDY proxy. 2012-06-12 12:56:58 +02:00
Simone Bordet 8f356ea922 Second pass at the implementation of a reverse SPDY proxy. 2012-06-12 00:38:46 +02:00
Simone Bordet 479c957a68 First pass at the implementation of a reverse SPDY proxy. 2012-06-11 18:53:37 +02:00
Simone Bordet 457fdc74e5 Modified StandardStream to not depend on SynStreamFrame. 2012-06-11 14:32:14 +02:00
Simone Bordet aeb3a23482 Making sure that cancelling the attempt to connect closes the channel. 2012-06-11 14:25:51 +02:00