f8c457f75e
Merge branch 'jetty-9.1' into javawebsocket-jsr
2013-06-19 15:07:15 -07: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
11760a7c83
@Ignore MaxConcurrentStreamsTest for now
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
02de232411
405313 - Websocket client SSL hostname verification is broken, always defaults to raw IP as String
...
+ After discussion with simone, we have changed from using IP address to
hostnames in both websocket and spdy.
2013-06-14 11:40:37 -07: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
eddb49941d
[Bug 408600] set correct jetty.url in all pom files
2013-06-12 15:52:36 -05:00
d93faf589c
409598 spdy: Fix NPE when a broken client tried to create duplicate stream IDs
2013-06-12 16:23:31 +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
ba6ce78fc2
@Ignore MaxConcurrentStreamsTest for now
2013-06-10 11:26:00 +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
5397f16559
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
...
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java
2013-05-17 14:09:17 +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
3d600ed95e
[maven-release-plugin] prepare for next development iteration
2013-05-06 18:13:04 -05:00
d832f3dc7e
[maven-release-plugin] prepare release jetty-9.0.3.v20130506
2013-05-06 18:12:55 -05:00
8d0cf5e949
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
2013-05-06 14:46:28 +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
0d181d9a75
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
2013-05-03 16:59:39 +10: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
e7ecfd2b2b
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
...
Conflicts:
jetty-server/src/test/java/org/eclipse/jetty/server/ResponseTest.java
2013-05-02 09:07:24 +10:00
f4b8e043e5
Added SPDY profile for JDK 7u21.
2013-04-29 16:54:32 +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
2360f5dcd5
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
...
Conflicts:
jetty-security/src/main/java/org/eclipse/jetty/security/ConstraintSecurityHandler.java
2013-04-23 15:08:56 +10: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
a7073d05a6
updated version to 9.1.0-SNAPSHOT
2013-04-19 13:59:18 +10:00
7baaa14ba1
[maven-release-plugin] prepare for next development iteration
2013-04-17 11:46:39 -05:00
Joakim Erdfelt
Thomas Becker
Greg Wilkins
Jesse McConnell
Jan Bartel
Simone Bordet