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
981102fda5
398467 Servlet 3.1 Non Blocking IO
...
Asynchronous reads working.
2013-07-05 18:11:09 +10:00
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
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
965918d8f2
Merge remote-tracking branch 'origin/master' into jetty-9.1
2013-07-04 17:28:57 +10:00
e4c7cfbf37
408235 SPDYtoHTTP proxy fix: remove hop headers from upstream server
2013-07-03 15:21:06 +02:00
85ef539663
HttpTransportOverSPDY add newline
2013-07-02 08:48:11 +02:00
8b31188ca7
405424 add X-Powered-By and Server header to SPDY
2013-07-01 21:57:22 +02:00
260b21f7df
405424 add X-Powered-By and Server header to SPDY
2013-07-01 17:08:35 +02:00
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
918632d408
411340 SpdyConnection make executeOnFillable configurable and default to true
2013-06-21 14:45:16 +02:00
b119bdfa24
fix typo in javadoc
2013-06-21 14:45:16 +02:00
507cc074c6
Merge remote-tracking branch 'origin/servlet-3.1-api' into jetty-9.1
2013-06-21 13:04:54 +10:00
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
f8c457f75e
Merge branch 'jetty-9.1' into javawebsocket-jsr
2013-06-19 15:07:15 -07:00
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
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
ad458105f2
ReferrerPushStrategy fix javadoc
2013-06-18 17:34:20 +02:00
117b086f26
PushStrategy.java remove newlines in javadoc
2013-06-18 16:00:59 +02:00
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
00744e42fc
410341 suppress stacktraces that happen during test setup shutdown after successful test run
2013-06-17 09:19:03 -07:00
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
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
ba9f9b4195
406759 supressed stacktrace in ReferrerPushStrategyTest
2013-06-17 09:19:02 -07:00
79ff74ea8e
406759 supressed two stacktraces thrown in ProxySPDYToHTTPTest
2013-06-17 09:19:02 -07:00
c22a8f195e
409403 fix IllegalStateException when SPDY is used and the response is written through BufferUtil.writeTo byte by byte
...
git removed a newline in the file. Fix the filesize in the test accordingly.
2013-06-17 09:19:02 -07:00
4e4ffaa54c
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
...
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannelState.java
jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java
2013-06-17 16:29:39 +10:00
e23bfc82bb
spdy: uncomment pushStrategy in default config
2013-06-14 17:44:54 +02:00
6d75e18661
410799 errors while creating push streams in HttpTransportOverSPDY are now logged to debug instead of warn
2013-06-14 13:27:16 +02:00
9501ef3392
409796 fix intermittent test issue in ReferrerPushStrategy.testResourceOrder. Happened when the client got closed before the server finished sending all data frames. Client waits now until all data is received.
2013-06-12 10:54:57 +02:00
d660cfcff6
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
...
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannelState.java
tests/test-continuation/src/test/java/org/eclipse/jetty/continuation/ContinuationBase.java
2013-06-11 11:17:04 +10:00
fb5de72f76
410341 suppress stacktraces that happen during test setup shutdown after successful test run
2013-06-10 16:01:19 +02:00
654dc1e007
409796 fix and cleanup ReferrerPushStrategy. There's more work to do here, so it remains @Ignore for now
2013-06-07 18:12:19 +02:00
937c3b13b8
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-07 15:13:59 +02:00
d2794584e1
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
...
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannel.java
jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java
jetty-server/src/main/java/org/eclipse/jetty/server/Response.java
2013-06-07 15:48:22 +10:00
bf9a4dd0c0
406759 supressed stacktrace in ReferrerPushStrategyTest
2013-06-06 16:46:45 +02:00
5c8b785962
406759 supressed two stacktraces thrown in ProxySPDYToHTTPTest
2013-06-06 14:48:03 +02:00
544b4414c3
409403 fix IllegalStateException when SPDY is used and the response is written through BufferUtil.writeTo byte by byte
...
git removed a newline in the file. Fix the filesize in the test accordingly.
2013-06-06 08:18:31 +02:00
cefe657ad4
409796 ignored failing test
2013-06-06 12:09:22 +10:00
bb8c58e315
409403 fix IllegalStateException when SPDY is used and the response is written through BufferUtil.writeTo byte by byte
...
ignore broken test
2013-06-06 11:25:46 +10:00
b274fdb0d6
409403 fix IllegalStateException when SPDY is used and the response is written through BufferUtil.writeTo byte by byte
2013-06-05 15:31:24 +02:00
288a452881
398467 Servlet 3.1 Non Blocking IO
...
some cleanup/fixes of SPDY tests. More work needed
2013-05-25 17:07:30 +10:00
d56ee96219
398467 Servlet 3.1 Non Blocking IO
...
fixed SPDY
2013-05-16 23:48:00 +10:00
b22d280e2a
398467 Servlet 3.1 Non Blocking IO
...
Cleaned up exceptions and HttpOutput.write
2013-05-16 19:00:00 +10:00
4dd80e9128
398467 Servlet 3.1 Non Blocking IO
...
More refinements to avoid duplicate code and optimise common paths
2013-05-14 17:52:46 +10:00
5b2aab505f
405570 - spdy push: resource ordering and sequential push.
...
Fixed race condition.
The race was happening when the headers of a push resource
were pushed, then the push resource was completed, which
triggered the send of the next resource, which was polling the
queue but find it empty, because the next resource was not pushed yet.
In this case the activity flag remained true, causing all subsequent
pushes to be skipped.
2013-05-03 17:24:29 +02:00
d351e0790a
406617 Spin in Request.recycle
...
Numerous code cleanups with the handling of early closes of requests, specially when the response has already been sent.
2013-05-03 15:15:03 +10:00
5bea4cc781
Fixed race condition in test.
2013-05-02 23:50:24 +02:00
f62cec561b
406214 fix constructor for PushSynInfo ignores timeout, remove timeout for creating push streams in HttpTransportOverSPDY
2013-04-26 16:33:03 +02:00
270083f6a1
405570 spdy push - send push resources in the order they have been requested. Do not interleave sending the bytes of the push streams.
2013-04-22 13:50:02 +02:00
6a6660bfc6
405364 spdy imeplement MAX_CONCURRENT_STREAMS
2013-04-10 16:49:45 +02:00
d5f84c661e
404323 Improved parameterization of https and SPDY
2013-03-26 13:44:15 +11:00
9079bae9c0
404323 Improved parameterization of https and SPDY
2013-03-26 13:38:28 +11:00
29b83dff9b
402626 Do not required endpoint host checking by default
2013-03-14 09:25:28 +11:00
a90a505316
401806 spdy push properly pass through request and response headers for pushed resources
2013-03-13 18:17:34 +01:00
8aeecf972b
SPDYToSPDYProxy add test where upstream server resets client stream
2013-03-12 14:21:29 +01:00
7037bca94d
Introduced Request.header(HttpHeader, String) to simplify code.
2013-03-04 17:05:18 +01:00
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
41952ebf1d
402075 Dont allocate the parser trie unless needed
2013-03-01 22:16:54 +11:00
88e32cb021
401183 Handle push streams in new method StreamFrameListener.onPush() instead of SessionFrameListener.syn()
2013-02-19 15:22:55 +01:00
c840d3dbb1
400555 HttpProxyEngine: Add http version header in response
2013-02-12 12:16:05 +01:00
ade135ba74
Add ProxySPDYToSPDYLoadTest
2013-02-07 12:21:05 +01:00
209d5bc12f
399721 - Change <Ref id= ...> to <Ref refid= ...>
2013-02-01 13:03:11 +01:00
95698ca248
396606 make spdy proxy capable of receiving SPDY and talk HTTP to the upstream server
2013-01-31 15:11:30 +01:00
80b44f9940
interims
2013-01-28 15:27:03 +01:00
1f6d058b20
intermittent commit
2013-01-28 12:18:30 +01:00
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
e1c516c7d1
merge from jetty-8 and update license blocks.
2013-01-11 17:04:53 -06:00
27c31fb403
jetty-9 organised imports. Cleaned up some TODOs
2013-01-11 16:37:32 +11:00
31def06214
jetty-9 URI parsing passed ByteBuffer so that strange query string encodings can be supported
2012-12-24 19:17:00 +11:00
e1a663865c
394210 spdy api rename stream.syn() to stream.push()
2012-12-21 18:14:14 +01:00
26c5eb428f
396193 spdy remove timeout parameters from api and move them to the Info* classes
2012-12-21 13:24:16 +01:00
c9f4513a89
Reworked HTTP client API, removing usage of Future.
2012-12-19 16:27:20 +01:00
440d4c4bf4
394211 - spdy: Expose RemoteServerAddress and LocalServerAddress in StandardSession
2012-12-12 18:48:49 +01:00
6567940471
HttpTransportOverSPDYTest hide stacktrace
2012-12-12 18:48:49 +01:00
3e151901bf
jetty-9 Use public HttpField
2012-12-08 01:41:01 +11:00
a20d984d30
jetty-9 Added Trie for cached string lookup. HttpFields does not use StringMap
2012-12-08 01:41:00 +11:00
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
efc1a3e98f
Fix javadoc in Stream.java and logging if a Stream is committed twice
2012-11-30 13:55:09 +01:00
61fbc68be7
395312 log.warn if a SPDY stream gets committed twice
2012-11-29 13:37:02 +01:00
21f717078c
jetty-9 handle null push strategy
2012-11-29 17:03:40 +11:00
30091ccd89
395314 Add missing flush() call after StandardSession.complete() has been called. Some test cleanup.
2012-11-28 17:43:53 +01:00
68afcbba6c
395313 HttpTransportOverSPDY.send() does not rethrow exceptions, but call Callback.failed() only
2012-11-28 17:41:44 +01:00
0ec793bee5
395312 Avoid that streams get committed twice
2012-11-28 17:40:43 +01:00
6e70ee4211
394370 Add integration test for client resetting SPDY push SYN's
2012-11-26 15:25:47 +01:00
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
9edac367c8
394854 optimised promise implementation
2012-11-23 12:18:52 +11:00
7737dc8c76
394854 Implemented Promise
2012-11-23 12:18:51 +11:00
e9705abf21
Updated spdy configuration.
2012-11-19 23:29:16 +01:00
a99a3ae254
newline after license header
2012-11-19 16:28:24 +01:00
3edae8a52d
394370 Add unit tests for HttpTransportOverSPDY.send()
2012-11-19 15:27:20 +01:00
139de22bc0
394370 correctly handle last content and responses with no content
2012-11-16 12:42:52 +11:00
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
b5c6555a4a
392237 Improved handling of SPDY async send
2012-11-16 10:45:08 +11:00
971bf4dec7
393281: Add getters to expose ReferrerPushStrategy Config
2012-11-02 14:27:11 +01:00
3d3e077509
393281: Add User-Agent filter to ReferrerPushStrategy
2012-11-02 13:21:42 +01:00
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
add3c2b381
392237 improved names and examples for documentation
2012-10-29 17:59:39 +11:00
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
c51cabccc1
392237 moved HttpTransport towards asynchronous solution
2012-10-25 23:28:32 +11:00
bf7a0ace22
392237 Added BlockingCallback optimisation
2012-10-25 22:36:13 +11:00
18f7293efd
392237 Fixed 3.0 port of chat servlet
2012-10-25 12:27:30 +11:00
35b7a0a62d
block instead of copy
2012-10-24 16:41:09 +02:00
8a6b18c1b0
ServerHTTPSPDYTest fix test
2012-10-19 18:35:17 +02:00
91eaf6b562
ServerHTTPSPDYTest Ignore failing test until fixed
2012-10-19 18:32:38 +02:00
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
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
0ee83d334d
jetty-9: replaced usage of deprecated JUnit class.
2012-10-11 10:58:22 +02:00
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
84f6f65e90
jetty-9: Improved configurability of SPDYClient.Factory.
2012-10-08 11:05:27 +02:00
97d08c399a
jetty-9 removed race with NPN replacing connection and extra wrap causing NPE in SSLEngineImpl
2012-10-02 15:00:31 -07:00
37a7e5977d
Merged branch 'jetty-9' into jetty-9-open-close.
2012-09-20 18:46:16 +02:00
40382bad3a
jetty-9 - Removed references to JUnit 3.x.
2012-09-20 18:23:02 +02:00
0d2627b6e9
jetty-9 improved onOpen onclose handling
2012-09-20 11:05:20 +10:00
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
Thomas Becker
Greg Wilkins
Joakim Erdfelt
Simone Bordet
Jesse McConnell