Commit Graph

812 Commits

Author SHA1 Message Date
Greg Wilkins d5f84c661e 404323 Improved parameterization of https and SPDY 2013-03-26 13:44:15 +11:00
Greg Wilkins 9079bae9c0 404323 Improved parameterization of https and SPDY 2013-03-26 13:38:28 +11:00
Thomas Becker e1a31f468e 403370 move frameBytes.fail() call in StandardSession.flush() outside the synchronized block to avoid deadlock 2013-03-15 15:49:05 +01:00
Greg Wilkins 29b83dff9b 402626 Do not required endpoint host checking by default 2013-03-14 09:25:28 +11:00
Simone Bordet 0c4d457fce Updated npn-boot version to 1.1.5. 2013-03-13 22:36:30 +01:00
Thomas Becker a90a505316 401806 spdy push properly pass through request and response headers for pushed resources 2013-03-13 18:17:34 +01:00
Thomas Becker 8aeecf972b SPDYToSPDYProxy add test where upstream server resets client stream 2013-03-12 14:21:29 +01:00
Joakim Erdfelt 897c35c2cb [maven-release-plugin] prepare for next development iteration 2013-03-08 11:33:23 -07:00
Joakim Erdfelt cc6196af50 [maven-release-plugin] prepare release jetty-9.0.0.v20130308 2013-03-08 11:33:15 -07:00
Joakim Erdfelt 7fc38f6c0f [maven-release-plugin] prepare for next development iteration 2013-03-07 19:14:19 -07:00
Joakim Erdfelt 96d045442f [maven-release-plugin] prepare release jetty-9.0.0.v20130307 2013-03-07 19:14:11 -07:00
Jesse McConnell 778ee1411b [maven-release-plugin] prepare for next development iteration 2013-03-06 10:21:46 -06:00
Jesse McConnell d916078711 [maven-release-plugin] prepare release jetty-9.0.0.v20130306 2013-03-06 10:21:38 -06:00
Jan Bartel cde549c0e8 399070 org.eclipse.jetty.spdy.server must declare import of org.eclipse.jetty.npn 2013-03-05 16:51:45 +11:00
Simone Bordet 7037bca94d Introduced Request.header(HttpHeader, String) to simplify code. 2013-03-04 17:05:18 +01:00
Thomas Becker 1aa8fce78b 402277 spdy proxy: fix race condition in nested push streams initiated by upstream server. Fix several other small proxy issues 2013-03-04 10:25:17 +01:00
Greg Wilkins 6478306812 Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project
Conflicts:
	jetty-server/src/main/config/etc/jetty.xml
2013-03-02 09:32:57 +11:00
Simone Bordet e6fed09129 402075 - Massive old gen growth when hit by lots of non persistent connections.
Replaced usages of TimerScheduler with ScheduledExecutorScheduler.
2013-03-01 15:19:51 +01:00
Greg Wilkins 41952ebf1d 402075 Dont allocate the parser trie unless needed 2013-03-01 22:16:54 +11:00
Joakim Erdfelt 29b2118870 [maven-release-plugin] prepare for next development iteration 2013-02-26 09:20:45 -07:00
Joakim Erdfelt 2b82b54f6d [maven-release-plugin] prepare release jetty-9.0.0.RC2 2013-02-26 09:20:45 -07:00
Thomas Becker 88e32cb021 401183 Handle push streams in new method StreamFrameListener.onPush() instead of SessionFrameListener.syn() 2013-02-19 15:22:55 +01:00
Thomas Becker c840d3dbb1 400555 HttpProxyEngine: Add http version header in response 2013-02-12 12:16:05 +01:00
Thomas Becker ade135ba74 Add ProxySPDYToSPDYLoadTest 2013-02-07 12:21:05 +01:00
Joakim Erdfelt 4dc3ed38c2 [maven-release-plugin] prepare for next development iteration 2013-02-05 10:00:36 -07:00
Joakim Erdfelt ed24f78498 [maven-release-plugin] prepare release jetty-9.0.0.RC0 2013-02-05 10:00:36 -07:00
Jesse McConnell e073ceb06d [maven-release-plugin] prepare for next development iteration 2013-02-05 10:00:36 -07:00
Jesse McConnell 2f2ad287af [maven-release-plugin] prepare release jetty-9.0.0.RC0 2013-02-05 10:00:35 -07:00
Simone Bordet 209d5bc12f 399721 - Change <Ref id= ...> to <Ref refid= ...> 2013-02-01 13:03:11 +01:00
Thomas Becker 95698ca248 396606 make spdy proxy capable of receiving SPDY and talk HTTP to the upstream server 2013-01-31 15:11:30 +01:00
Thomas Becker 80b44f9940 interims 2013-01-28 15:27:03 +01:00
Thomas Becker 1f6d058b20 intermittent commit 2013-01-28 12:18:30 +01:00
Simone Bordet 2ba64a59e6 Made the test more reliable. 2013-01-24 10:32:05 +01:00
Thomas Becker 9ebea3938d 393385: Make hostname verification configurable in SslContextFactory and enable it by default (See http://www.ietf.org/rfc/rfc2818.txt section 3.1) 2013-01-17 10:28:15 +01:00
Jesse McConnell e1c516c7d1 merge from jetty-8 and update license blocks. 2013-01-11 17:04:53 -06:00
Jesse McConnell 863944873d merge from 7 and update license blocks for 2013 2013-01-11 15:01:16 -06:00
Jesse McConnell a4dbb5823c update license blocks for 2013 2013-01-11 14:57:51 -06:00
Greg Wilkins 27c31fb403 jetty-9 organised imports. Cleaned up some TODOs 2013-01-11 16:37:32 +11:00
Greg Wilkins 31def06214 jetty-9 URI parsing passed ByteBuffer so that strange query string encodings can be supported 2012-12-24 19:17:00 +11:00
Thomas Becker e1a663865c 394210 spdy api rename stream.syn() to stream.push() 2012-12-21 18:14:14 +01:00
Thomas Becker 26c5eb428f 396193 spdy remove timeout parameters from api and move them to the Info* classes 2012-12-21 13:24:16 +01:00
Simone Bordet c9f4513a89 Reworked HTTP client API, removing usage of Future. 2012-12-19 16:27:20 +01:00
Greg Wilkins 6bfc19be1b jetty-9 optimisation to dispatch before parsing so that handling is done in same thread 2012-12-14 09:50:22 +11:00
Thomas Becker 440d4c4bf4 394211 - spdy: Expose RemoteServerAddress and LocalServerAddress in StandardSession 2012-12-12 18:48:49 +01:00
Thomas Becker e299169ee3 StandardSession change LOG.warn in flush() back to LOG.debug 2012-12-12 18:48:49 +01:00
Thomas Becker 6567940471 HttpTransportOverSPDYTest hide stacktrace 2012-12-12 18:48:49 +01:00
Greg Wilkins 3e151901bf jetty-9 Use public HttpField 2012-12-08 01:41:01 +11:00
Greg Wilkins a20d984d30 jetty-9 Added Trie for cached string lookup. HttpFields does not use StringMap 2012-12-08 01:41:00 +11:00
Thomas Becker dc2850c898 396036 SPDY send controlFrames even if Stream is reset to avoid breaking the compression context 2012-12-07 13:22:19 +01:00
Thomas Becker db6fdca3b9 395922: Unit test that checks if ControlFrameBytes are sent in the right order even with priorization 2012-12-07 11:39:53 +01:00
Thomas Becker 98d17bdea9 395922: Avoid that SPDY frames containing headers are sent in another order than they have been created 2012-12-06 14:18:52 +01:00
Simone Bordet b2e878a7e8 + Introduced Request.content(ContentProvider content, String contentType)
+ Introduced a new renamings to clarify concepts
+ Vastly improved Javadocs.
2012-12-04 16:18:09 +01:00
Thomas Becker efc1a3e98f Fix javadoc in Stream.java and logging if a Stream is committed twice 2012-11-30 13:55:09 +01:00
Thomas Becker e1fb49d4d7 remove log.info in StandardSession.flush() 2012-11-29 14:22:01 +01:00
Thomas Becker 61fbc68be7 395312 log.warn if a SPDY stream gets committed twice 2012-11-29 13:37:02 +01:00
Greg Wilkins 4d823c28bf jetty-9 added jetty-all for javadoc, reinstated static context for javadoc, made proxy to xref 2012-11-29 17:41:54 +11:00
Greg Wilkins 21f717078c jetty-9 handle null push strategy 2012-11-29 17:03:40 +11:00
Thomas Becker 30091ccd89 395314 Add missing flush() call after StandardSession.complete() has been called. Some test cleanup. 2012-11-28 17:43:53 +01:00
Thomas Becker 68afcbba6c 395313 HttpTransportOverSPDY.send() does not rethrow exceptions, but call Callback.failed() only 2012-11-28 17:41:44 +01:00
Thomas Becker 0ec793bee5 395312 Avoid that streams get committed twice 2012-11-28 17:40:43 +01:00
Thomas Becker 6e70ee4211 394370 Add integration test for client resetting SPDY push SYN's 2012-11-26 15:25:47 +01:00
Simone Bordet ee893d8526 Corrected changes introduced with Promise.
Save creation of iterators for every append() and prepend() in StandardSession.
Removed PromisingCallback, only used by SPDY and better implemented otherwise.
2012-11-23 13:16:32 +01:00
Greg Wilkins 9edac367c8 394854 optimised promise implementation 2012-11-23 12:18:52 +11:00
Simone Bordet 04aafcae3c Fixed NPEs caused by guard introduced in AbstractFrameBytes's constructor for null callbacks. 2012-11-23 12:18:52 +11:00
Greg Wilkins 7737dc8c76 394854 Implemented Promise 2012-11-23 12:18:51 +11:00
Simone Bordet e9705abf21 Updated spdy configuration. 2012-11-19 23:29:16 +01:00
Thomas Becker 4ee88c3bc0 jetty-spdy-proxy.xml fixes, still not working 2012-11-19 23:29:16 +01:00
Thomas Becker a99a3ae254 newline after license header 2012-11-19 16:28:24 +01:00
Thomas Becker 3edae8a52d 394370 Add unit tests for HttpTransportOverSPDY.send() 2012-11-19 15:27:20 +01:00
Thomas Becker b76669434f Add messages to StreamExceptions thrown in StandardSession and StandardStream 2012-11-16 12:50:32 +01:00
Thomas Becker 6bc8bab92d 394383 - add logging of the SSLEngine 2012-11-16 11:43:24 +01:00
Greg Wilkins 139de22bc0 394370 correctly handle last content and responses with no content 2012-11-16 12:42:52 +11:00
Greg Wilkins 62e033fcd0 394370 392237 reverted Improved handling of SPDY async send. Added simple NPE protection to further investigate problem 2012-11-16 10:55:10 +11:00
Greg Wilkins b5c6555a4a 392237 Improved handling of SPDY async send 2012-11-16 10:45:08 +11:00
Simone Bordet 73ecfd6755 394383 - NPNServerConnection not upgraded causes spin.
Following a discussion on spdy-dev, we close the connection
if the NextProtocol message is missing.
2012-11-15 17:15:49 +01:00
Simone Bordet eda558aaa8 Added guard in case of null next protocol. 2012-11-15 15:29:03 +01:00
Simone Bordet a736ebc062 394383 - NPNServerConnection not upgraded causes spin.
We now guard the case where fill() returns, the TLS handshake is completed,
but we have no next protocol.
If that happens, we force the default protocol.
2012-11-15 14:22:13 +01:00
Jesse McConnell bb27f561c1 [maven-release-plugin] prepare for next development iteration 2012-11-05 12:24:06 -06:00
Jesse McConnell 1d767e99a3 [maven-release-plugin] prepare release jetty-8.1.8.v20121105 2012-11-05 12:23:59 -06:00
Jesse McConnell 70d591c430 [maven-release-plugin] prepare for next development iteration 2012-11-05 12:16:03 -06:00
Jesse McConnell 017826b4eb [maven-release-plugin] prepare release jetty-7.6.8.v20121105 2012-11-05 12:15:57 -06:00
Thomas Becker accc3b321a config fix 2012-11-02 17:16:13 +01:00
Thomas Becker 971bf4dec7 393281: Add getters to expose ReferrerPushStrategy Config 2012-11-02 14:27:11 +01:00
Thomas Becker 3d3e077509 393281: Add User-Agent filter to ReferrerPushStrategy 2012-11-02 13:21:42 +01:00
Greg Wilkins 52464a5ba6 Merge remote-tracking branch 'origin/jetty-8'
Conflicts:
	jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationParser.java
	jetty-annotations/src/main/java/org/eclipse/jetty/annotations/ResourceAnnotationHandler.java
	jetty-client/src/test/java/org/eclipse/jetty/client/SslHttpExchangeTest.java
	jetty-client/src/test/java/org/eclipse/jetty/client/SslSecurityListenerTest.java
	jetty-deploy/src/main/java/org/eclipse/jetty/deploy/WebAppDeployer.java
	jetty-deploy/src/main/java/org/eclipse/jetty/deploy/providers/ContextProvider.java
	jetty-http/src/main/resources/org/eclipse/jetty/http/mime.properties
	jetty-http/src/test/java/org/eclipse/jetty/http/HttpFieldsTest.java
	jetty-io/src/main/java/org/eclipse/jetty/io/nio/SelectChannelEndPoint.java
	jetty-jmx/src/main/java/org/eclipse/jetty/jmx/MBeanContainer.java
	jetty-jmx/src/main/java/org/eclipse/jetty/jmx/ObjectMBean.java
	jetty-overlay-deployer/src/main/java/org/eclipse/jetty/overlays/OverlayedAppProvider.java
	jetty-plus/src/main/java/org/eclipse/jetty/plus/annotation/Injection.java
	jetty-plus/src/main/java/org/eclipse/jetty/plus/security/DataSourceLoginService.java
	jetty-proxy/src/main/java/org/eclipse/jetty/proxy/ProxyServlet.java
	jetty-rewrite/src/main/java/org/eclipse/jetty/rewrite/handler/ProxyRule.java
	jetty-security/src/main/java/org/eclipse/jetty/security/authentication/FormAuthenticator.java
	jetty-server/src/main/java/org/eclipse/jetty/server/session/JDBCSessionIdManager.java
	jetty-spdy/spdy-http-server/src/main/java/org/eclipse/jetty/spdy/server/proxy/ProxyHTTPSPDYConnection.java
	jetty-spdy/spdy-jetty-http/src/main/java/org/eclipse/jetty/spdy/http/ServerHTTPSPDYAsyncConnection.java
	jetty-start/src/main/java/org/eclipse/jetty/start/Main.java
	jetty-util/src/main/java/org/eclipse/jetty/util/Fields.java
	jetty-websocket/src/main/java/org/eclipse/jetty/websocket/WebSocketClientFactory.java
	jetty-websocket/src/main/java/org/eclipse/jetty/websocket/WebSocketConnectionRFC6455.java
	jetty-websocket/src/test/java/org/eclipse/jetty/websocket/WebSocketClientTest.java
	jetty-websocket/src/test/java/org/eclipse/jetty/websocket/WebSocketMessageRFC6455Test.java
	test-jetty-nested/src/main/java/org/eclipse/jetty/nested/Dump.java
	test-jetty-webapp/src/main/java/com/acme/Dump.java
2012-11-02 14:08:05 +11:00
Greg Wilkins 8723408731 Merge remote-tracking branch 'origin/jetty-7' into jetty-8
Conflicts:
	jetty-servlets/src/main/java/org/eclipse/jetty/servlets/MultiPartFilter.java
2012-11-02 13:17:53 +11:00
Greg Wilkins 65202e9abe 393363 Use Locale.ENGLISH for all toUpperCase and toLowerCase calls 2012-11-02 11:55:00 +11:00
Thomas Becker 1d6ec310b5 393160: fix connection leaks in NextProtoNegoClientConnection and NextProtoNegoServerConnection 2012-10-30 18:48:38 +01:00
Greg Wilkins add3c2b381 392237 improved names and examples for documentation 2012-10-29 17:59:39 +11:00
Simone Bordet 605b0360e1 HTTP client: reviewed API.
The API were inconsistent: sometimes using the C format for getters and setters
(e.g. String host(), void host(String)), sometimes using the JavaBeans format.

Now the API stick with the JavaBean format apart the "fluent" API in Request,
that is in the fluent format (i.e. C setter format, but returning this instead of void).
2012-10-26 23:42:18 +02:00
Greg Wilkins c51cabccc1 392237 moved HttpTransport towards asynchronous solution 2012-10-25 23:28:32 +11:00
Greg Wilkins bf7a0ace22 392237 Added BlockingCallback optimisation 2012-10-25 22:36:13 +11:00
Greg Wilkins 18f7293efd 392237 Fixed 3.0 port of chat servlet 2012-10-25 12:27:30 +11:00
Thomas Becker 35b7a0a62d block instead of copy 2012-10-24 16:41:09 +02:00
Greg Wilkins b08dd26284 392237 Added some more debugging 2012-10-21 16:51:35 +11:00
Greg Wilkins 7c1039940f 392237 Added some debugging 2012-10-21 16:39:05 +11:00
Greg Wilkins be3432ad55 392237 removed server dependency on contination. All Continuations are now Servlet3Continuations or FauxContinuations 2012-10-21 16:19:40 +11:00
Thomas Becker 8a6b18c1b0 ServerHTTPSPDYTest fix test 2012-10-19 18:35:17 +02:00
Thomas Becker 91eaf6b562 ServerHTTPSPDYTest Ignore failing test until fixed 2012-10-19 18:32:38 +02:00
Thomas Becker 8c3642754e 392470: Fix problem in suspend, expire cycle when HttpChannel.run() is called multiple times (happens for SPDY). Add test cases. Remove unused argument from HttpHandler.messageComplete() interface and it's implementations. 2012-10-19 18:17:29 +02:00
Simone Bordet aa1a6347c1 #392465 - NextProtoNegoClientConnection does not replace the connection if handshake terminates in onOpen().
Now we check in NextProtoNegoClientConnection.onOpen() if the NPN is completed, and if so, we replace the connection.
2012-10-19 17:53:54 +02:00
Thomas Becker dd651b0d9f Expose more stuff via jmx like threadpool details, connector details, etc.
Enhance start.ini documentation for spdy.
2012-10-17 13:37:34 +02:00
Jesse McConnell 64ec72e1d5 [maven-release-plugin] prepare for next development iteration 2012-10-15 13:10:04 -05:00
Jesse McConnell 8e6d049dd8 [maven-release-plugin] prepare release jetty-9.0.0.M1 2012-10-15 13:09:56 -05:00
Jesse McConnell 4d86e5762e Merge branch 'jetty-9' into release-9 2012-10-15 12:35:25 -05:00
Greg Wilkins d173e91ef5 Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9 2012-10-12 13:05:31 +11:00
Simone Bordet 0ee83d334d jetty-9: replaced usage of deprecated JUnit class. 2012-10-11 10:58:22 +02:00
Greg Wilkins 8c3fa91b26 jetty-9 reverted to more start.ini rather than start.d usage as we will not be using plugins. More configuration documentation added 2012-10-11 16:15:57 +11:00
Simone Bordet 84f6f65e90 jetty-9: Improved configurability of SPDYClient.Factory. 2012-10-08 11:05:27 +02:00
Simone Bordet 2748a9381e jetty-9: Added support for connect timeout. 2012-10-08 11:05:26 +02:00
Greg Wilkins f4d12412eb jetty-9 added FilterConnectionFactory and made SpdyServer use it 2012-10-08 15:22:49 +11:00
Hugues Malphettes 3efefe37bc Clean-up OSGi test; add spdy OSGi test; fix felix
Upgrade to the latest pax-exam
Support for felix-3.x and 4.x as tested
Fix the spdy MANIFEST.MF generations
Add an integration test for SPDY
Refactor the test code

Squashed commit of the following:

commit bd020ee1214992d8d21a11dc800e04dc5e9b2001
Author: Hugues Malphettes <hmalphettes@gmail.com>
Date:   Sat Oct 6 16:58:43 2012 +0800

    Add spdy integration test for OSGi and clean-up

    Refacor the pax-exam OSGi integration tests
    Add an integration test for spdy.
    Execute the test under 2 versions of felix and 2 versions of equinox.

commit f3151a272ab92560432f3b76f564bf06b19bc22b
Author: Hugues Malphettes <hmalphettes@gmail.com>
Date:   Sat Oct 6 16:28:51 2012 +0800

    Fix the generated MANIFEST.MF

    OSGi integration test in the next commit.

commit 3152aa2b5e39cf2d3b81f8400488c0672e922b8d
Author: Hugues Malphettes <hmalphettes@gmail.com>
Date:   Fri Oct 5 16:58:29 2012 +0800

    Fix the startup of the servlet.

    setInitOrder(0) was working in jetty-7 and jetty-8 but not in jetty-9
    anymore. setInitOrder(1) is fine.

commit 8038d314f4f423e8608fd09dd42b840e101a0c13
Author: Hugues Malphettes <hmalphettes@gmail.com>
Date:   Thu Oct 4 17:53:28 2012 +0800

    Upgrade to pax-exam-2.6

commit 7136fa88e2410ac345b6ae0657d882c7e9714c0b
Author: Hugues Malphettes <hmalphettes@gmail.com>
Date:   Thu Oct 4 17:53:07 2012 +0800

    Support for felix-3.x and felix-4.x

commit 0bcc6b0d8ed5144150f90f578a90c558419349d1
Author: Hugues Malphettes <hmalphettes@gmail.com>
Date:   Thu Oct 4 17:53:28 2012 +0800

    Upgrade to pax-exam-2.6

commit 2e17466624650df433b6c5f11abafb56539ee740
Author: Hugues Malphettes <hmalphettes@gmail.com>
Date:   Thu Oct 4 17:53:07 2012 +0800

    Support for felix-3.x and felix-4.x
2012-10-06 17:26:14 +08:00
Greg Wilkins 435f8a6db8 jetty 9: Improved NPN client connection to perform the connection replacement from onFillable() rather than from NPN callback methods. 2012-10-02 15:49:25 -07:00
Greg Wilkins 604f4985d3 jetty 9: Improved NPN client connection to perform the connection replacement from onFillable() rather than from NPN callback methods. 2012-10-02 15:47:57 -07:00
Greg Wilkins 97d08c399a jetty-9 removed race with NPN replacing connection and extra wrap causing NPE in SSLEngineImpl 2012-10-02 15:00:31 -07:00
Greg Wilkins 6cc0734a1a jetty-9 miscillaneous optimizations: donot dispatch to HTTP and SPDY; improved executorCallback 2012-10-02 13:48:51 -07:00
Thomas Becker ef2939b86c jetty-9: AbstractTest replace deprecated TestWatchmen with TestWatcher 2012-10-02 12:12:33 +02:00
Hugues Malphettes 29c18fc4d5 OSGi manifests generation fixes cleanup 2012-09-25 11:24:16 +08:00
Hugues Malphettes 1cfa277c6c jetty-9 osgi support 2012-09-24 13:04:57 +08:00
Jesse McConnell a69cab7ae9 [maven-release-plugin] prepare for next development iteration 2012-09-21 13:58:16 -05:00
Jesse McConnell 1237b739c7 [maven-release-plugin] prepare release jetty-9.0.0.M0 2012-09-21 13:58:09 -05:00
Greg Wilkins 68ee346b8a jetty-9 combined the Container and AggregateLifeCycle into ContainerLifeCycle 2012-09-21 11:45:51 +10:00
Greg Wilkins b9ceb8703d Merge branch 'jetty-9' into jetty-9-open-close 2012-09-21 08:36:22 +10:00
Joakim Erdfelt 857498b115 Upgrading to junit-dep-4.10.jar (banning junit.jar) 2012-09-20 11:52:59 -07:00
Simone Bordet 37a7e5977d Merged branch 'jetty-9' into jetty-9-open-close. 2012-09-20 18:46:16 +02:00
Simone Bordet 40382bad3a jetty-9 - Removed references to JUnit 3.x. 2012-09-20 18:23:02 +02:00
Greg Wilkins 0d2627b6e9 jetty-9 improved onOpen onclose handling 2012-09-20 11:05:20 +10:00
Simone Bordet 851de69d9d jetty-9 - Third take at open/close refactoring. 2012-09-19 18:04:15 +02:00
Simone Bordet f257f4b2bb jetty-9 - First take at open/close refactoring. 2012-09-19 13:37:47 +02:00
Simone Bordet bfe08d1a99 jetty-9 - Reorganized SPDY modules.
This change was due to the fact that the old spdy-core and spdy-jetty modules had classes in the same package,
which is a problem for OSGi.
The old spdy-jetty module has been split in 2: spdy-client and spdy-server, and other SPDY modules just underwent a
renaming to make them more sound.
2012-09-18 23:33:31 +02:00
Simone Bordet 707ff4aea8 jetty-9 - Ported test to use new HttpClient. 2012-09-17 16:59:24 +02:00
Simone Bordet 0915b2b0ab jetty-9 - Refactored code that was counting the number of reentrant invocations into a common utility class, ForkInvoker. 2012-09-17 14:39:13 +02:00
Greg Wilkins 129583679a jetty-9 javadoc improvements and renamed SelectChannelConnector to ServerConnector 2012-09-17 17:37:56 +10:00
Simone Bordet 88cbfed7e0 jetty-9 - Made SelectorManager.connection[Opened|Closed]() concrete, since they are overridden only by SelectChannelConnector. 2012-09-14 23:30:21 +02:00
Simone Bordet 3be83efbae jetty-9 - Calling connectionOpened() to trigger the necessary call to connection.onOpen(). 2012-09-14 23:30:21 +02:00
Simone Bordet cf3f12297f jetty-9 - Cosmetics. 2012-09-14 23:30:21 +02:00
Greg Wilkins 22ba57b8d2 jetty-9 refactored onOpen and onClose 2012-09-14 17:38:47 +10:00
Greg Wilkins 35a86c3373 jetty-9 more configuration clean ups 2012-09-13 16:49:15 +10:00
Greg Wilkins 9940796a32 jetty-9 xml configurations 2012-09-13 14:43:03 +10:00
Greg Wilkins c709981aa5 jetty-9 finished refactor for oneconnector and configuration pluggability 2012-09-13 10:00:44 +10:00
Greg Wilkins a41b6e32ac Merge branch 'jetty-9-configuration' into jetty-9
Conflicts:
	jetty-io/src/main/java/org/eclipse/jetty/io/ssl/SslConnection.java
2012-09-13 08:22:06 +10:00
Greg Wilkins b3e8f91026 jetty-9 flush returns boolean to say completely flushed or not 2012-09-13 08:11:05 +10:00
Greg Wilkins 79caf45604 Merge branch 'jetty-9' into jetty-9-configuration
Conflicts:
	jetty-io/src/main/java/org/eclipse/jetty/io/ssl/SslConnection.java
2012-09-12 23:11:12 +10:00
Greg Wilkins 427a01855c jetty-9 WriteFlusher handlers buffering endpoints 2012-09-12 23:06:19 +10:00
Jesse McConnell a8994178f5 [maven-release-plugin] prepare for next development iteration 2012-09-10 14:18:11 -05:00
Jesse McConnell 92180a9700 [maven-release-plugin] prepare release jetty-7.6.7.v20120910 2012-09-10 14:18:01 -05:00
Jesse McConnell 10e4027579 [maven-release-plugin] prepare for next development iteration 2012-09-10 13:59:34 -05:00
Jesse McConnell 57a6258f96 [maven-release-plugin] prepare release jetty-8.1.7.v20120910 2012-09-10 13:59:10 -05:00
Jesse McConnell 1ec8b2621b [maven-release-plugin] prepare release jetty-7.6.7.v20120910 2012-09-10 13:47:05 -05:00
Jesse McConnell 4180d7e1f5 prepare for release 2012-09-10 12:59:04 -05:00
Greg Wilkins 73ebe89019 jetty-9 refactored configuration 2012-09-10 20:26:14 +10:00
Simone Bordet d8ed9116f1 jetty-9 - Moved SPDY's Headers class to jetty-util module as Fields. 2012-09-06 13:22:04 +02:00
Simone Bordet 7231c82b69 Merged branch 'jetty-9' into jetty-9-client. 2012-09-06 08:41:48 +02:00
Greg Wilkins 3acf2e65ed jetty-9 moved servlet dependencies out of jetty-http 2012-09-06 09:13:17 +10:00
Jesse McConnell d37deeea74 [maven-release-plugin] prepare for next development iteration 2012-09-03 13:33:18 -05:00
Jesse McConnell b418b0dd57 [maven-release-plugin] prepare for next development iteration 2012-09-03 13:33:16 -05:00
Jesse McConnell 41e9b1f6e2 [maven-release-plugin] prepare release jetty-7.6.6.v20120903 2012-09-03 13:33:10 -05:00
Jesse McConnell 6c0b0af2fe [maven-release-plugin] prepare release jetty-8.1.6.v20120903 2012-09-03 13:33:08 -05:00
Jesse McConnell 6d2c793edc Merge branch 'master' into jetty-8 2012-09-03 12:48:21 -05:00
Greg Wilkins fd01a1b496 JETTY-1541 fixed different behaviour for single byte writes 2012-09-03 17:57:37 +10:00
Greg Wilkins c3776764f4 jetty-9 ConcurrentScheduler refinements 2012-09-03 15:24:36 +10:00
Greg Wilkins 8331b1db71 jetty-9 some useful debug 2012-08-31 14:05:40 +10:00
Greg Wilkins 83dbca6553 jetty-9 reworked the schedulers 2012-08-31 13:22:58 +10:00
Greg Wilkins 72827aa44d jetty-9 TODOs 2012-08-31 08:05:09 +10:00
Simone Bordet 6531cbb69c Jetty9 - Renamed class removing "Async". 2012-08-30 11:14:00 +02:00
Simone Bordet 7586e5c9e9 Jetty9 - More tests for HTTP over SPDY. 2012-08-29 22:42:35 +02:00
Simone Bordet 2d7a80c44b Jetty9 - Parametrized tests on the SPDY version. 2012-08-29 21:04:00 +02:00
Simone Bordet bf30ec24a5 Jetty9 - Removed the concept of multiple connection factories in SPDYClient.
A client is given a version when instantiated; as such it makes no sense to have
multiple connection factories, as the client only supports one SPDY version.
2012-08-29 21:04:00 +02:00
Simone Bordet 8920cd16b6 Jetty9 - Ported the HTTP SPDY Proxy code. 2012-08-29 18:12:28 +02:00
Simone Bordet 9522bcb404 Jetty9 - Including also the spdy-jetty-http-webapp module. 2012-08-28 16:39:09 +02:00
Simone Bordet 7a2b53d987 Jetty9 - Dispatching the onConnect(Session) callback in a different thread.
This is needed for two reasons: the first is that onOpen() is called from the selector thread
and onConnect() may perform I/O (such as sending a SETTINGS frame), and second
because onOpen() may be called when NPN upgrades the connection.
In the latter case, SslConnection is busy with the SSL handshake (for example is filling)
and calling onConnect() triggers a write, that ends up in the SslConnection that sees that
it is still in the SSL handshake and needs to fill, resulting in a reentrant fill, which is not
supported correctly by SslConnection.
Dispatching to a new thread makes the call safe, since SslConnection is properly synchronized.
2012-08-28 15:20:14 +02:00
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
Simone Bordet af836eb4b7 As per the Future contract, throw CancellationException if the Promise has been cancelled. 2012-06-11 14:23:53 +02:00
Simone Bordet 836c647fb8 Added utility method valuesAsString(). 2012-06-11 14:22:46 +02:00
Simone Bordet 4bb0a30839 Overridden allocate() to support direct buffers. 2012-06-11 14:21:03 +02:00
Simone Bordet b4e45d1bb7 Added method to allow to clear the async connection factories, for better configurability. 2012-06-08 12:29:39 +02:00
Simone Bordet 8894cdc31d Reviewed handling of the last stream id.
Now the last stream id is updated when a SYN is received, as the spec states.
2012-06-08 10:13:18 +02:00
Simone Bordet 7f39b8b7a4 Refactored atomic updates of max and min into utility class Atomics. 2012-06-08 09:59:36 +02:00
Jan Bartel a7b1dd5e93 Merge remote-tracking branch 'origin/master' into jetty-8 2012-06-07 00:59:37 +02:00
Simone Bordet cd05259be4 Updated ReferrerPushStrategy to limit the number of associated resources. 2012-06-05 13:30:15 +02:00
Simone Bordet c7d09af3f2 Improved ReferrerPushStrategy to check also for content-type of pushed resources. 2012-06-05 12:33:10 +02:00
Simone Bordet f5d63e8626 Moved version() method to base test class, and using HTTPSPDYHeader instead of hardcoded strings. 2012-06-05 12:32:07 +02:00
Simone Bordet b9a3c98055 Benchmark for PushStrategy: HTTP vs SPDY no push vs SPDY push. 2012-06-04 19:28:45 +02:00
Simone Bordet 3b0076fc6a Fixed completeHeader() to just not attempt to detect the close state.
This is needed because the buffer to write may be big, and while it's
the only buffer, it may take multiple writes to be written.
If it takes more than one write, we risk to mark the first frame as closed
and subsequent frames cannot be written.

Fixed flush() to loop until the whole content has been flushed.
2012-06-04 19:28:45 +02:00
Simone Bordet e328cb8141 Improved push of resources by executing them in a different thread.\nAdded a HTTP header that signal to the application that the HTTP request is actually a push. 2012-06-04 19:28:45 +02:00
Simone Bordet 51f307ca7c Made test more reliable. 2012-06-04 19:28:45 +02:00
Simone Bordet 20c0f23cc7 Improved exception logging. 2012-06-04 19:28:45 +02:00
Simone Bordet f0c2fd2474 Improved error reporting in case of a write failure. 2012-06-04 19:28:45 +02:00
Greg Wilkins 96cbd53c47 jetty-9 jetty-server passing tests 2012-06-04 17:27:46 +02:00
Jan Bartel 9149a69446 Merge remote-tracking branch 'origin/master' into jetty-8 2012-06-04 13:49:25 +02:00
Simone Bordet c9251e5c73 Fixed bug in AbstractFrameBytes.compareTo(), avoiding NPE when comparing
FrameBytes that have a related stream, and those that don't (such as PING).
2012-06-03 22:53:06 +02:00
Simone Bordet a2a9fd59a2 Cosmetics. 2012-06-03 18:30:06 +02:00
Simone Bordet 2cb703b0b5 Fixed bug in case of large files being downloaded, and refactored writing of data frames. 2012-06-03 18:30:06 +02:00
Simone Bordet b0156b69bc Moved factory method for FlowControlStrategy to SPDYServerConnector for easier overriding. 2012-06-03 18:30:06 +02:00
Simone Bordet 4b29f18703 Removed constructors that take the "compressed" parameter (compression has been removed from the specification).
Added constructor that takes byte[], offset and length.
2012-06-03 18:30:05 +02:00
Simone Bordet d84889b2e9 Added configuration to enable NPN debugging, but commented out. 2012-06-01 22:13:26 +02:00
Simone Bordet eb47f93d86 Corrected order of SPDY protocols, so that most recent ones are chosen over older ones
(e.g. spdy/3 over spdy/2 over http/1.1).
2012-06-01 22:13:26 +02:00
Simone Bordet 6ff1a5fddc Implemented SPDY/3 HTTP layering. 2012-06-01 19:31:14 +02:00
Simone Bordet f872676a65 Added handling of the "slot" field in SYN_STREAM frames.
Modified parser and generator, and the session implementation
for now ignores this field.
2012-06-01 19:31:14 +02:00
Simone Bordet 70e4a103ec Implemented correctly SPDY v2 parsing and generation of the HEADERS frame. 2012-06-01 19:31:14 +02:00
Simone Bordet d12c2fec21 Renamed enum constant. 2012-06-01 19:31:14 +02:00
Simone Bordet 85e2503eec Added handling of the "slot" field in SYN_STREAM frames.
Modified parser and generator, and the session implementation
for now ignores this field.
2012-06-01 19:31:14 +02:00
Simone Bordet fb34f9b824 Added handling of Credential frames (for now just issuing a warning). 2012-06-01 19:31:14 +02:00
Simone Bordet 91105910ca Added handling of Certificate encoding and decoding. 2012-06-01 19:31:14 +02:00
Simone Bordet 395d49ba71 Basic implementation of CREDENTIAL frame, parser and generator. 2012-06-01 19:31:14 +02:00
Simone Bordet 24f4631a06 Refactored flow control, encapsulating it into a strategy.
The reason for this change is that the server will soon be serving both SPDY/2 and SPDY/3 browsers,
so the flow control strategy must be dynamically chosen depending on the SPDY version.
2012-06-01 10:46:18 +02:00
Simone Bordet 58dd9c3bf1 Enabled flow control configuration in SPDYClient. 2012-05-26 22:49:43 +02:00
Simone Bordet 0ea58ab1d5 Updated default maxIdleTime for SPDYClient to -1, so that the default from the SelectorManager is used. 2012-05-26 22:49:17 +02:00
Simone Bordet f41e43bce3 Updated to NPN API version 1.1.0, calling NextProtoNego.remove(), instead of using AtomicReferences to clear the SSLEngine references. 2012-05-26 22:44:57 +02:00
Simone Bordet 146f5edfde Updated to NPN API version 1.1.0, calling NextProtoNego.remove(), instead of using AtomicReferences to clear the SSLEngine references. 2012-05-26 22:31:02 +02:00
Thomas Becker b92e7b01a9 spdy: improve errorHandling, additional tests for sending big data with/without flow control, test that no more frames are sent on reset pushstreams, test for failing controller.writer(), small improvements
Change-Id: Ide714e01b0ed3753b3e37103de2665158f41f35d
2012-05-25 20:21:10 +02:00
Jesse McConnell 30e8e40ef2 [maven-release-plugin] prepare for next development iteration 2012-05-24 15:41:45 -05:00
Jesse McConnell 667cf9a643 [maven-release-plugin] prepare release jetty-8.1.4.v20120524 2012-05-24 15:41:38 -05:00
Jesse McConnell e45a89694a [maven-release-plugin] prepare for next development iteration 2012-05-24 09:30:58 -05:00
Jesse McConnell 36fc6fe890 [maven-release-plugin] prepare release jetty-8.1.4.v20120524 2012-05-24 09:30:52 -05:00
Jesse McConnell c7a9adaa32 reset for release 2012-05-24 08:33:44 -05:00
Greg Wilkins 1e662c6311 jetty-9 RequestTests passing 2012-05-23 22:52:27 +02:00
Jesse McConnell ea176f0586 [maven-release-plugin] prepare for next development iteration 2012-05-22 15:14:05 -05:00
Jesse McConnell 3fdda881d8 [maven-release-plugin] prepare release jetty-8.1.4.v20120522 2012-05-22 15:13:56 -05:00
Jesse McConnell 300a37319a [maven-release-plugin] prepare for next development iteration 2012-05-22 14:34:10 -05:00
Jesse McConnell 9ccd059375 [maven-release-plugin] prepare release jetty-7.6.4.v20120522 2012-05-22 14:33:59 -05:00
Jesse McConnell ce5e5cbad2 Merge branch 'master' into jetty-8 2012-05-22 14:02:58 -05:00
Thomas Becker b371315606 make spdy tests more reliable: fix race condition with goAway frame
Change-Id: I3bbdb8eee4a12f082f83730209bd0f8cf2fe7d03
2012-05-22 18:16:12 +02:00
Jan Bartel 34954bc617 Merge remote-tracking branch 'origin/master' into jetty-8 2012-05-22 17:28:40 +02:00
Simone Bordet ced2d9efd3 Made test more reliable. 2012-05-22 15:55:42 +02:00
Greg Wilkins b9a2661a4e jetty-9 removed HttpException 2012-05-17 15:12:45 +02:00
Greg Wilkins 68f8e073db jetty-9 progress on unit tests and LocalConnector 2012-05-14 19:58:09 +02:00
Thomas Becker fdf6dac1d3 spdy: no push if the main request contains if-modified-since header
Change-Id: I9462d8d3ff68dd9cf74ad5a45a093e598c6d704b
2012-05-14 18:50:49 +02:00
Simone Bordet 4b8f6b8413 jetty-9 SelectorManager refactorings. 2012-05-11 19:30:30 +02:00
Simone Bordet 9e8b2f1aad SSL refactorings. 2012-05-11 10:19:47 +02:00
Thomas Becker 5687aa8beb SPDY: move probably blocking/long running flush out of synchronized block in StandardSession.syn(..)
Change-Id: I29b748495adb1fa48fab8dc130a8067ff3be6bc5
2012-05-10 12:29:58 +02:00
Greg Wilkins e348f2d4f5 jetty-9 progress on jetty-server 2012-05-10 12:19:16 +02:00
Greg Wilkins 2b9ff87e02 Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9
Conflicts:
	jetty-io/src/main/java/org/eclipse/jetty/io/AsyncConnection.java
2012-05-09 11:19:52 +02:00
Greg Wilkins c1011c54a4 jetty-9 work in progress 2012-05-09 11:18:20 +02:00
Simone Bordet 44d2735a21 Changes to jetty-io related to integration with jetty-spdy. 2012-05-09 11:15:07 +02:00
Simone Bordet f0421723b8 SPDY refactorings. 2012-05-08 19:00:40 +02:00
Simone Bordet 72befc31b0 Adding the scheme header to the tests. 2012-05-07 22:45:21 +02:00
Simone Bordet 858c143b4f Fixed tests: pushed streams cannot reply. 2012-05-07 22:45:21 +02:00
Simone Bordet 14f8091252 Completed implementation of the referrer SPDY push strategy. 2012-05-07 22:45:21 +02:00
Simone Bordet 362e011851 Fixed SPDY push implementation, by correctly supporting pushed streams also on the client side. 2012-05-07 22:45:21 +02:00
Simone Bordet f607d34fdc Fixed Javadocs. 2012-05-07 22:45:21 +02:00
Simone Bordet 75414a05c0 Guarded against NPE in case of null Header. 2012-05-07 22:45:21 +02:00
Simone Bordet f75a9d83f1 Updates to the SPDY push implementation. 2012-05-07 22:45:21 +02:00
Simone Bordet 3ce07230d5 Initial draft for SPDY push. 2012-05-07 22:45:20 +02:00
Jan Bartel 2131a40559 Merge remote-tracking branch 'origin/master' into jetty-8 2012-05-07 13:54:30 +02:00
Thomas Becker f362fb0b48 spdy push implementation
Change-Id: Ibca8ce444588785f13c9890370422a2dc4b149ac
2012-04-27 17:44:22 +02:00
Simone Bordet 45b2c3b1b5 Merged from master after fixing typo in jetty-spdy.xml. 2012-04-16 15:55:49 +02:00
Simone Bordet 5ef7c3f2da Fixed typo: server --> Server. 2012-04-16 15:18:11 +02:00
Jesse McConnell b64909900c [maven-release-plugin] prepare for next development iteration 2012-04-13 15:31:47 -05:00
Jesse McConnell 2c0a35d430 [maven-release-plugin] prepare release jetty-8.1.3.v20120413 2012-04-13 15:31:38 -05:00
Jesse McConnell b963840d40 [maven-release-plugin] prepare for next development iteration 2012-04-13 15:29:14 -05:00
Jesse McConnell a652ee7396 [maven-release-plugin] prepare release jetty-7.6.3.v20120413 2012-04-13 15:29:05 -05:00
Simone Bordet 72040202d4 Reverted release back to 8.1.3-SNAPSHOT. 2012-04-13 17:27:37 +02:00
Simone Bordet 85710fb9ea Reverted release back to 7.6.3-SNAPSHOT. 2012-04-13 16:59:06 +02:00
Jesse McConnell 3b87e91cbe [maven-release-plugin] prepare for next development iteration 2012-04-12 10:29:30 -05:00
Jesse McConnell 308b010744 [maven-release-plugin] prepare release jetty-8.1.3.v20120412 2012-04-12 10:29:20 -05:00
Jesse McConnell cdcc0922c3 [maven-release-plugin] prepare for next development iteration 2012-04-12 09:49:52 -05:00
Jesse McConnell 5966c86571 [maven-release-plugin] prepare release jetty-7.6.3.v20120412 2012-04-12 09:49:46 -05:00
Greg Wilkins f144b6562e Merge remote-tracking branch 'origin/master' into jetty-8
Conflicts:
	jetty-servlets/src/test/java/org/eclipse/jetty/servlets/gzip/GzipTester.java
2012-04-12 22:20:01 +10:00
Simone Bordet a389d08c26 376201 - HalfClosed state not handled properly.
Addendum to restore previous behavior, where a closed stream was also half closed.
2012-04-12 12:57:04 +02:00
Greg Wilkins ee2d289f63 Merge remote-tracking branch 'origin/master' into jetty-8
Conflicts:
	jetty-npn/pom.xml
	jetty-osgi/jetty-osgi-boot-jsp/META-INF/MANIFEST.MF
	jetty-osgi/jetty-osgi-boot-jsp/src/main/java/org/eclipse/jetty/osgi/boot/jasper/WebappRegistrationCustomizerImpl.java
	jetty-osgi/jetty-osgi-boot-jsp/src/main/java/org/eclipse/jetty/osgi/boot/jsp/FragmentActivator.java
	jetty-osgi/jetty-osgi-boot-logback/META-INF/MANIFEST.MF
	jetty-osgi/jetty-osgi-boot-warurl/META-INF/MANIFEST.MF
	jetty-osgi/jetty-osgi-boot/META-INF/MANIFEST.MF
	jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/internal/webapp/WebBundleDeployerHelper.java
	jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/internal/webapp/WebBundleTrackerCustomizer.java
	jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/utils/internal/DefaultFileLocatorHelper.java
	jetty-osgi/jetty-osgi-equinoxtools/META-INF/MANIFEST.MF
	jetty-osgi/jetty-osgi-httpservice/META-INF/MANIFEST.MF
	jetty-spdy/spdy-jetty-http-webapp/pom.xml
	jetty-spdy/spdy-jetty-http/pom.xml
	jetty-spdy/spdy-jetty/pom.xml
2012-04-12 16:02:34 +10:00
Simone Bordet 972087d068 376201 - HalfClosed state not handled properly. 2012-04-11 12:18:56 +02:00
Simone Bordet 47c1587166 Strengthen the behavior of Stream methods to throw if they are used wrongly,
for example sending DATA frames before a REPLY and so on.
2012-04-11 10:39:23 +02:00
Simone Bordet 6ec1594010 Updated path location of the jetty config file for SPDY. 2012-04-05 17:33:48 +02:00
Simone Bordet eaacd69ede Moved from SLF4J to Jetty logging. 2012-04-05 17:30:05 +02:00
Simone Bordet 50f545b29a Vastly improved queueing of FrameBytes, by appending at the end of the queue (instead of iterating over the queue).
Also, implemented a better fix for the missing flush() in case of missing handlers: now instead of flushing in the write
completion handler (which could lead to stack overflows), we use the same mechanism employed for FrameBytes,
where we avoid stack overflows by dispatching to a new thread after few recursive invocations.
2012-04-04 19:21:16 +02:00
Simone Bordet 5b668fd6f1 375970 - HttpServletRequest.getRemoteAddr() returns null when HTTP is over SPDY. 2012-04-03 18:23:16 +02:00
Simone Bordet 6c464238b7 Updated dependency on jetty-npn, now that it moved to its own project at github and it's unlocked from jetty releases. 2012-04-03 12:00:38 +02:00
Greg Wilkins b2b4b2733b jetty-spdy fixed version of api 2012-04-03 10:12:46 +10:00
Simone Bordet d231b57144 Made the test more reliable. 2012-04-02 15:39:01 +02:00
Simone Bordet 30adf7cd18 Added missing flush after writing frames.
Frames may be written asynchronously but without a Handler, and therefore it was possible that frames
queued up, that one flush() was writing a frame without Handler, and the flush was stopping even if the
queue was non-empty.
Now we call flush() after writing a frame.
2012-04-02 13:22:06 +02:00
Simone Bordet b44fe2094f Fixed Maven warning. 2012-04-02 13:16:40 +02:00
Simone Bordet bd0cc72439 Made the test more reliable. 2012-04-02 13:14:57 +02:00
Simone Bordet bb429a7f18 375509 - Stalled stream stalls other streams or session control frames.
Now using a "death pill" instead of a boolean in order to avoid race conditions where
DataInfos were read from the queue (but the boolean not updated yet), and viceversa.
2012-04-02 10:09:55 +02:00
Simone Bordet 00b31b6577 Added defaults in switches. 2012-04-02 10:07:51 +02:00
Simone Bordet fff059f7a9 Making sure bytes are masked when doing int operations. 2012-04-02 10:07:25 +02:00
Jan Bartel 45050ebac9 Merge remote-tracking branch 'origin/master' into jetty-8 2012-04-02 17:49:33 +10:00
Simone Bordet b0a3d031aa 375509 - Stalled stream stalls other streams or session control frames.
Additional fixes to the implementation of flush(). Also implemented frame priority.
2012-03-30 18:47:47 +02:00
Simone Bordet 2a44fa5c22 Cosmetics. 2012-03-30 18:46:53 +02:00
Jan Bartel 17269583fb Merge remote-tracking branch 'origin/master' into jetty-8 2012-03-30 12:05:46 +11:00
Simone Bordet 50bc8fa400 375509 - Stalled stream stalls other streams or session control frames.
Additional improvements for thread visibility, and clarified code comment.
2012-03-29 12:50:01 +02:00
Simone Bordet 294c588023 375509 - Stalled stream stalls other streams or session control frames. 2012-03-28 11:41:06 +02:00
Simone Bordet bb66cfc877 375083 - Flow control should take in account window size changes from concurrent SETTINGS 2012-03-22 17:08:11 +01:00
Greg Wilkins d8b1d80e4e Merge remote-tracking branch 'origin/master' into jetty-8
Conflicts:
	jetty-spdy/spdy-jetty-http-webapp/pom.xml
	jetty-spdy/spdy-jetty-http/pom.xml
	jetty-spdy/spdy-jetty/pom.xml
2012-03-19 17:22:02 +11:00
Greg Wilkins 7e3b8bcfd4 374611: do not redispatch if already dispatched when SSL reads content on write 2012-03-19 15:48:39 +11:00
Jesse McConnell b3ac9235f7 add spdy to the distribution and make npn-boot test dependency pull from internal to build as opposed to out of a local repository 2012-03-16 12:46:47 -05:00
Simone Bordet 5624a5721e Merged from master. 2012-03-14 18:24:57 +01:00
Simone Bordet 44017f18af 374258 - SPDY leaks SSLEngines. Made the test more reliable. 2012-03-14 17:49:57 +01:00
Simone Bordet ab9bcf26b2 374258 - SPDY leaks SSLEngines 2012-03-14 16:31:29 +01:00
Simone Bordet 2f7f232d12 Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project 2012-03-12 15:31:54 +01:00
Simone Bordet 9158115a82 Improved SPDY connector to take into account confidential and integral settings. 2012-03-12 15:31:23 +01:00
Simone Bordet 41874b5fbe Made the test portable between Jetty7 and Jetty8. 2012-03-12 15:30:26 +01:00
Jesse McConnell 567d61083c fix import 2012-03-09 00:29:09 -06:00
Jesse McConnell b4985ad0d5 [maven-release-plugin] prepare for next development iteration 2012-03-08 23:53:50 -06:00
Jesse McConnell 7a99af4ffe [maven-release-plugin] prepare release jetty-8.1.2.v20120308 2012-03-08 23:53:42 -06:00
Jesse McConnell 246e3ed756 [maven-release-plugin] prepare for next development iteration 2012-03-08 21:09:46 -06:00
Jesse McConnell a63b3fdc5e [maven-release-plugin] prepare release jetty-7.6.2.v20120308 2012-03-08 21:09:37 -06:00
Simone Bordet 6d34d6fdc6 Fixed recursive flush(): a stack overflow was still possible because the invocation count was not correctly decreased. 2012-03-08 15:36:54 +01:00
Simone Bordet 182efa38fa Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project 2012-03-08 09:50:31 +01:00
Jesse McConnell 3134984bb2 disabling spdy tests on release and commenting out jetty maven plugin usage 2012-03-07 15:08:05 -06:00
Jesse McConnell 0284e5e9d5 make sure tests run with profile 2012-03-07 14:16:36 -06:00
Jesse McConnell 313475576b lock up spdy tests that rely on npn-boot codehaus artifact behind a profile for activation 2012-03-07 14:11:28 -06:00
Simone Bordet c5c4425a0b Ignoring data frames after RST_STREAM. 2012-03-07 14:04:27 +01:00
Simone Bordet 8f37221b56 Updated v3 stream status codes. 2012-03-07 13:40:58 +01:00
Simone Bordet c67357f005 Fixed handling of unknown control frames. 2012-03-07 11:55:20 +01:00
Simone Bordet 156f138780 Introduced onException() callback in SessionFrameListener in case of processing exceptions.
Added test for unsupported SYN_STREAM versions.
2012-03-07 11:24:39 +01:00
Jesse McConnell f12e3c390c reset versions 2012-03-06 17:06:10 -06:00
Simone Bordet 234b2d8115 Updated NPN groupId and artifactId. 2012-03-05 22:15:51 +01:00
Simone Bordet c1de3c0727 Updated NPN groupId and artifactId. 2012-03-05 21:51:28 +01:00
Simone Bordet 839a7cb15b Fixed configuration of Jetty Maven plugin to make it work (needs to be changed because of JETTY-1494). 2012-03-05 21:31:30 +01:00
Simone Bordet fef252eb6e Added log statement that SPDY is experimental. 2012-03-05 21:03:20 +01:00
Simone Bordet c66bbae8ae Fully integrated SPDY module. 2012-03-05 20:18:21 +01:00
Simone Bordet fa4668ce5c Imported SPDY module. 2012-03-05 19:17:30 +01:00