89be2de57f
Merged branch 'master' into 'jetty-9.1'.
2013-07-26 19:17:30 +02:00
7a5401e506
Merge branch 'jetty-8'
2013-07-26 10:27:43 -05:00
5a0278fc3f
Merge branch 'jetty-7' into jetty-8
2013-07-26 10:26:46 -05:00
192f2d7002
BUG-413812
...
Mark RateTracker as Serializable to allow it to be stored in a Session that is
eventually persisted in a distributed memory platform.
Signed-off-by: David Harrigan <dharrigan@gmail.com>
2013-07-26 10:24:03 -05:00
5c7eb9e265
Reverted version to 7.6.12-SNAPSHOT.
2013-07-26 13:36:35 +02:00
49045558ef
[maven-release-plugin] prepare for next development iteration
2013-07-25 14:07:12 -05:00
9b888d5c22
[maven-release-plugin] prepare release jetty-7.6.12.v20130725
2013-07-25 14:06:53 -05:00
bc679809f8
[maven-release-plugin] prepare for next development iteration
2013-07-25 11:25:58 -05:00
39ec9b8051
[maven-release-plugin] prepare release jetty-7.6.12.v20130725
2013-07-25 11:25:51 -05:00
767dbe6778
[maven-release-plugin] prepare for next development iteration
2013-07-25 07:48:09 -05:00
cfa6076c4f
[maven-release-plugin] prepare release jetty-7.6.11.v20130725
2013-07-25 07:48:02 -05:00
d3ba7e9f2f
added licence headers
2013-07-19 10:41:49 +10:00
5bfcfc908a
398467 Servlet 3.1 Non Blocking IO
...
Added the DataRateLimitedServlet as an async example
2013-07-18 15:40:24 +10:00
bd2add0ae9
Update to post-release (servlet 3.1/javaee) versions of javaee dependencies. WARNING: jetty-schemas from jetty-toolchain needs to be changed from SNAPSHOT to final release.
2013-07-12 13:53:58 +10:00
965918d8f2
Merge remote-tracking branch 'origin/master' into jetty-9.1
2013-07-04 17:28:57 +10:00
bce8eaabe0
Merge remote-tracking branch 'origin/jetty-8'
...
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/handler/RequestLogHandler.java
2013-07-04 17:28:22 +10:00
89ce13c191
Merge remote-tracking branch 'origin/jetty-8'
2013-07-04 15:01:11 +10:00
c33db24d94
Merge remote-tracking branch 'origin/jetty-8'
...
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/handler/RequestLogHandler.java
jetty-servlets/src/test/java/org/eclipse/jetty/servlets/gzip/GzipTester.java
tests/test-continuation/src/test/java/org/eclipse/jetty/continuation/ContinuationTest.java
2013-07-04 15:00:47 +10:00
37de67d3d7
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
2013-07-04 14:59:55 +10:00
49f865c45a
commented out incomplete test for EOF content
2013-07-04 14:59:22 +10:00
8aac3eef48
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
...
Conflicts:
jetty-servlets/src/main/java/org/eclipse/jetty/servlets/MultiPartFilter.java
2013-07-04 11:15:39 +10:00
091a419568
411755 MultiPartInputStreamParser fails on base64 encoded content
2013-07-04 11:11:44 +10:00
aa1aae182a
Instituting Content-Length OR Transfer-Encoding check in GzipFilter tests
...
+ Tests currently fail, will let greg look deeply into jetty's eyes to
determine why it defiantly doesn't want to cooperate with greg.
2013-06-30 16:37:08 -07:00
f262dce23b
add test for gzip streaming and flushing write
2013-06-28 15:39:12 -05:00
c089335f51
add test for gzip streaming and flushing write
2013-06-28 14:58:55 -05:00
d522bb4c19
Merge branch 'jetty-8'
2013-06-28 10:21:42 -07: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
d857562059
Merge branch 'release-9'
2013-06-25 16:37:05 -07:00
78b5f7df1f
[maven-release-plugin] prepare for next development iteration
2013-06-25 08:29:26 -07:00
5f2c937fcb
[maven-release-plugin] prepare release jetty-9.0.4.v20130625
2013-06-25 08:29:18 -07:00
31faf2fe20
Reverting failed release from friday
2013-06-25 07:42:45 -07:00
7ce05f2c49
Merge remote-tracking branch 'origin/jetty-8'
...
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/Response.java
jetty-servlets/src/main/java/org/eclipse/jetty/servlets/MultiPartFilter.java
jetty-servlets/src/test/java/org/eclipse/jetty/servlets/MultipartFilterTest.java
test-jetty-servlet/src/main/java/org/eclipse/jetty/testing/HttpTester.java
2013-06-24 17:28:34 +10:00
a7436bc774
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
...
Conflicts:
jetty-servlets/src/main/java/org/eclipse/jetty/servlets/MultiPartFilter.java
jetty-servlets/src/test/java/org/eclipse/jetty/servlets/MultipartFilterTest.java
2013-06-24 16:44:45 +10:00
0daddd1a3a
411458 MultiPartFilter getParameterMap doesn't preserve multivalued parameters
...
411459 MultiPartFilter.Wrapper getParameter should use charset encoding of part
2013-06-24 16:20:04 +10:00
57bfda2a08
[maven-release-plugin] prepare for next development iteration
2013-06-21 09:49:25 -05:00
c1082ad4d4
[maven-release-plugin] prepare release jetty-9.0.4.v20130621
2013-06-21 09:49:15 -05:00
feca821522
Using try-with-resources on test
2013-06-20 06:25:51 -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
2ea7843d86
Merge remote-tracking branch 'origin/jetty-8'
2013-06-17 14:39:17 +10:00
1908fff38f
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
2013-06-17 14:11:46 +10:00
78cd94edb3
[Bug 396706] CGI support parameters
2013-06-14 11:24:30 -05:00
eddb49941d
[Bug 408600] set correct jetty.url in all pom files
2013-06-12 15:52:36 -05: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
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
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
c708d9ce7c
Removing last remnants of Gzip pipelining tests resources
2013-05-31 10:57:05 -07:00
41ac4a0877
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
2013-05-31 18:46:10 +10:00
0e11c82307
fixed merge
2013-05-31 18:07:01 +10:00
842309e656
Merge remote-tracking branch 'origin/jetty-8'
...
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/Response.java
jetty-server/src/test/java/org/eclipse/jetty/server/ResponseTest.java
jetty-servlets/src/test/java/org/eclipse/jetty/servlets/gzip/GzipTester.java
2013-05-31 18:06:34 +10:00
Simone Bordet
Jesse McConnell
David Harrigan
Greg Wilkins
Jan Bartel
Joakim Erdfelt
Thomas Becker