Greg Wilkins
|
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 |
Thomas Becker
|
67fd1e496f
|
410498 ignore type of exception in GoAwayTest.testDataNotProcessedAfterGoAway
|
2013-06-25 09:13:34 -07:00 |
Joakim Erdfelt
|
78b5f7df1f
|
[maven-release-plugin] prepare for next development iteration
|
2013-06-25 08:29:26 -07:00 |
|
Joakim Erdfelt
|
5f2c937fcb
|
[maven-release-plugin] prepare release jetty-9.0.4.v20130625
|
2013-06-25 08:29:18 -07:00 |
|
Joakim Erdfelt
|
31faf2fe20
|
Reverting failed release from friday
|
2013-06-25 07:42:45 -07:00 |
Jesse McConnell
|
8927c18840
|
reset versions for release
|
2013-06-21 15:28:26 -05:00 |
|
Jesse McConnell
|
57bfda2a08
|
[maven-release-plugin] prepare for next development iteration
|
2013-06-21 09:49:25 -05:00 |
|
Jesse McConnell
|
c1082ad4d4
|
[maven-release-plugin] prepare release jetty-9.0.4.v20130621
|
2013-06-21 09:49:15 -05:00 |
|
Thomas Becker
|
4ba9385ebc
|
411340 add comment why executeOnFillable defaults to true
|
2013-06-21 15:28:33 +02:00 |
|
Thomas Becker
|
918632d408
|
411340 SpdyConnection make executeOnFillable configurable and default to true
|
2013-06-21 14:45:16 +02:00 |
|
Thomas Becker
|
b119bdfa24
|
fix typo in javadoc
|
2013-06-21 14:45:16 +02:00 |
Jan Bartel
|
b006496198
|
Merge remote-tracking branch 'origin/master' into jetty-9.1
|
2013-06-21 14:55:14 +10:00 |
|
Jan Bartel
|
8c580bd875
|
Fix spdy pom.xml
|
2013-06-21 14:54:35 +10:00 |
|
Jan Bartel
|
f59ef8cfce
|
Merge remote-tracking branch 'origin/master' into jetty-9.1
|
2013-06-21 14:52:38 +10:00 |
|
Jan Bartel
|
8d7477218d
|
Add profile for jdk1.7.0_25
|
2013-06-21 14:51:10 +10:00 |
|
Greg Wilkins
|
507cc074c6
|
Merge remote-tracking branch 'origin/servlet-3.1-api' into jetty-9.1
|
2013-06-21 13:04:54 +10:00 |
|
Greg Wilkins
|
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 |
|
Joakim Erdfelt
|
f8c457f75e
|
Merge branch 'jetty-9.1' into javawebsocket-jsr
|
2013-06-19 15:07:15 -07:00 |
|
Thomas Becker
|
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 |
|
Joakim Erdfelt
|
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 |
|
Thomas Becker
|
ad458105f2
|
ReferrerPushStrategy fix javadoc
|
2013-06-18 17:34:20 +02:00 |
|
Thomas Becker
|
117b086f26
|
PushStrategy.java remove newlines in javadoc
|
2013-06-18 16:00:59 +02:00 |
|
Joakim Erdfelt
|
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 |
|
Thomas Becker
|
00744e42fc
|
410341 suppress stacktraces that happen during test setup shutdown after successful test run
|
2013-06-17 09:19:03 -07:00 |
|
Thomas Becker
|
11760a7c83
|
@Ignore MaxConcurrentStreamsTest for now
|
2013-06-17 09:19:03 -07:00 |
|
Thomas Becker
|
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 |
|
Thomas Becker
|
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 |
|
Thomas Becker
|
ba9f9b4195
|
406759 supressed stacktrace in ReferrerPushStrategyTest
|
2013-06-17 09:19:02 -07:00 |
|
Thomas Becker
|
79ff74ea8e
|
406759 supressed two stacktraces thrown in ProxySPDYToHTTPTest
|
2013-06-17 09:19:02 -07:00 |
|
Thomas Becker
|
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 |
|
Greg Wilkins
|
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 |
|
Joakim Erdfelt
|
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 |
|
Thomas Becker
|
e23bfc82bb
|
spdy: uncomment pushStrategy in default config
|
2013-06-14 17:44:54 +02:00 |
|
Thomas Becker
|
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 |
|
Jesse McConnell
|
eddb49941d
|
[Bug 408600] set correct jetty.url in all pom files
|
2013-06-12 15:52:36 -05:00 |
|
Thomas Becker
|
d93faf589c
|
409598 spdy: Fix NPE when a broken client tried to create duplicate stream IDs
|
2013-06-12 16:23:31 +02:00 |
|
Thomas Becker
|
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 |
|
Greg Wilkins
|
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 |
|
Thomas Becker
|
fb5de72f76
|
410341 suppress stacktraces that happen during test setup shutdown after successful test run
|
2013-06-10 16:01:19 +02:00 |
|
Thomas Becker
|
ba6ce78fc2
|
@Ignore MaxConcurrentStreamsTest for now
|
2013-06-10 11:26:00 +02:00 |
|
Thomas Becker
|
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 |
|
Thomas Becker
|
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 |
|
Greg Wilkins
|
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 |
|
Thomas Becker
|
bf9a4dd0c0
|
406759 supressed stacktrace in ReferrerPushStrategyTest
|
2013-06-06 16:46:45 +02:00 |
|
Thomas Becker
|
5c8b785962
|
406759 supressed two stacktraces thrown in ProxySPDYToHTTPTest
|
2013-06-06 14:48:03 +02:00 |
|
Thomas Becker
|
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 |
|
Greg Wilkins
|
cefe657ad4
|
409796 ignored failing test
|
2013-06-06 12:09:22 +10:00 |
|
Greg Wilkins
|
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 |
|
Thomas Becker
|
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 |
|
Greg Wilkins
|
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 |