Commit Graph

429 Commits

Author SHA1 Message Date
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