Joakim Erdfelt
a3201a3c81
Happy New Year 2015
2015-01-07 17:06:59 -07:00
Joakim Erdfelt
6a0668b7a1
Happy New Year 2015
2015-01-07 17:03:30 -07:00
Greg Wilkins
88ddab9892
Merge remote-tracking branch 'origin/jetty-9.2.x'
...
Conflicts:
VERSION.txt
2014-12-04 01:33:56 +11:00
Greg Wilkins
904b6a113f
update javadoc for DoSFilter
2014-12-04 01:01:18 +11:00
Greg Wilkins
1834e360ea
Added RFC6585 status codes and use 429 for DoSFilter
2014-11-12 14:16:41 +11:00
Greg Wilkins
39360d91e6
Merge remote-tracking branch 'origin/jetty-9.2.x'
2014-11-12 13:52:32 +11:00
Greg Wilkins
e0fbd6d9f2
Increased timeout to 5s for gzip tests.
...
Writing large mp3's 1 byte with flush can be slow and 2s was not enough.
2014-11-12 13:51:31 +11:00
Greg Wilkins
dfe799d04c
Merge remote-tracking branch 'origin/jetty-9.2.x'
...
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/handler/gzip/GzipHttpOutputInterceptor.java
jetty-servlets/src/main/java/org/eclipse/jetty/servlets/AsyncGzipFilter.java
jetty-servlets/src/test/java/org/eclipse/jetty/server/handler/gzip/GzipContentLengthTest.java
Added Interceptor chain so that double gzip interception can be prevented.
2014-11-12 12:36:56 +11:00
Greg Wilkins
5fe992bf04
450855 GzipFilter MIGHT_COMPRESS exception
...
Re-enabled some default GzipFilter tests. These will work because the filter rewraps the response on
the dispatch. It is only the timeout test that will not work with default.
2014-11-12 10:46:14 +11:00
Greg Wilkins
85811dad9b
450873 Disable tests that downcaste wrapped GzipFilterResponses
2014-11-12 10:41:48 +11:00
Greg Wilkins
5165d4c7ad
450855 GzipFilter MIGHT_COMPRESS exception
...
Disabled tests that tried to apply the GzipFilter to default async content generation. These
tests will never work as GzipFilter wraps the response and the default async does not preserve wrappers.
For the MIGHT_COMPRESS issue, improved the filter to handle the case that it has already been applied to
a request/response and that the state is already mightCompress.
2014-11-12 10:20:06 +11:00
Joakim Erdfelt
27eccbc9b2
Merge branch 'jetty-9.2.x'
...
Conflicts:
jetty-servlets/src/test/java/org/eclipse/jetty/server/handler/gzip/AsyncScheduledWrite.java
jetty-servlets/src/test/java/org/eclipse/jetty/server/handler/gzip/AsyncTimeoutDispatchBasedWrite.java
jetty-servlets/src/test/java/org/eclipse/jetty/server/handler/gzip/AsyncTimeoutWrite.java
jetty-servlets/src/test/java/org/eclipse/jetty/server/handler/gzip/GzipContentLengthTest.java
jetty-servlets/src/test/java/org/eclipse/jetty/servlets/GzipFilterLayeredTest.java
jetty-servlets/src/test/java/org/eclipse/jetty/servlets/gzip/AsyncScheduledDispatchWrite.java
jetty-servlets/src/test/java/org/eclipse/jetty/servlets/gzip/AsyncScheduledWrite.java
jetty-servlets/src/test/java/org/eclipse/jetty/servlets/gzip/AsyncTimeoutCompleteWrite.java
jetty-servlets/src/test/java/org/eclipse/jetty/servlets/gzip/AsyncTimeoutDispatchBasedWrite.java
jetty-servlets/src/test/java/org/eclipse/jetty/servlets/gzip/AsyncTimeoutDispatchWrite.java
jetty-servlets/src/test/java/org/eclipse/jetty/servlets/gzip/AsyncTimeoutWrite.java
2014-11-11 10:59:02 -07:00
Joakim Erdfelt
f04903fb68
Increasing the variety of Gzip tests per recommendations by Simone
2014-11-11 10:16:41 -07:00
Joakim Erdfelt
00692c0ff3
Merge branch 'jetty-9.2.x'
...
Conflicts:
jetty-servlets/src/test/java/org/eclipse/jetty/server/handler/gzip/GzipDefaultTest.java
jetty-servlets/src/test/java/org/eclipse/jetty/server/handler/gzip/GzipTester.java
2014-11-10 19:31:31 -07:00
Joakim Erdfelt
5941bf76d6
Removing GzipTester.assertIsResponseNotGzipCompressed
2014-11-10 18:37:58 -07:00
Joakim Erdfelt
e83df11eaf
Removing GzipTester.assertIsResponseNotGzipCompressed
2014-11-10 17:58:38 -07:00
Joakim Erdfelt
f8e431da1f
Removing GzipTester.assertIsResponseNotGzipCompressedAndEqualToExpectedString
2014-11-10 17:51:46 -07:00
Joakim Erdfelt
d9d94ec1d2
Merge branch 'jetty-9.2.x'
...
Conflicts:
jetty-servlets/src/test/java/org/eclipse/jetty/server/handler/gzip/GzipContentLengthTest.java
jetty-servlets/src/test/java/org/eclipse/jetty/server/handler/gzip/GzipTester.java
jetty-servlets/src/test/resources/jetty-logging.properties
2014-11-10 16:43:56 -07:00
Joakim Erdfelt
5de887f00f
replace GzipTester.issueRequest with preexisting GzipTester.executeRequest
2014-11-10 16:04:25 -07:00
Joakim Erdfelt
006ea256b0
test names with ':' makes ms windows very unhappy
2014-11-10 12:34:24 -07:00
Joakim Erdfelt
030ff92720
Some cleanup of the Gzip tests
...
+ Seeing more edge cases that can cause problems.
Set those to @Ignore for greg to take a look at
2014-11-10 12:05:23 -07:00
Joakim Erdfelt
9e8a776c3e
450855 - GZipFilter declaration order can result in MIGHT_COMPRESS
...
+ Adding testcase GzipFilterLayeredTest to demonstrate this bug
+ Some cleanup of Gzip testing behavior to be easier to follow
(less reliance on GzipTester utility class)
2014-11-10 11:22:22 -07:00
Joakim Erdfelt
e4cc9ea5de
Updating gzip tests to include 1 other flavor
2014-11-07 11:13:37 -07:00
Greg Wilkins
8578088745
moved gzip after merge
2014-11-07 15:05:01 +11:00
Greg Wilkins
cf025b3638
fixed merge
2014-11-07 14:52:03 +11:00
Jan Bartel
8694d9265d
Merge remote-tracking branch 'origin/jetty-9.2.x'
...
Conflicts:
jetty-servlets/src/test/java/org/eclipse/jetty/server/handler/gzip/GzipContentLengthTest.java
jetty-servlets/src/test/java/org/eclipse/jetty/server/handler/gzip/GzipDefaultTest.java
jetty-servlets/src/test/java/org/eclipse/jetty/server/handler/gzip/GzipTester.java
2014-11-07 14:10:47 +11:00
Greg Wilkins
0b68144a27
fixed asyncgzipfilter tests
2014-11-07 11:23:03 +11:00
Joakim Erdfelt
9223ca965c
Demonstration of Async with GZip
2014-11-06 15:11:34 -07:00
Joakim Erdfelt
c486923ad5
Minor cleanup
2014-11-06 12:33:23 -07:00
Greg Wilkins
67e686c108
447515 Remove GzipFilter
...
Added a module to apply GzipHandler to the entire server
2014-10-24 10:48:33 +11:00
Greg Wilkins
738c47bc55
447515 Remove GzipFilter
...
Moved all usages of GzipFilter to GzipHandler
added support to ServerContextHandler to create a GzipHandler
2014-10-24 08:17:05 +11:00
Greg Wilkins
4bbd3e9909
Merge remote-tracking branch 'origin/jetty-9.2.x'
2014-10-22 14:08:52 +11:00
Jan Bartel
592265c21f
447627 MultiPart file always created when "filename" set in Content-Disposition
2014-10-22 12:56:59 +11:00
Greg Wilkins
062a5c4113
447515 Remove GzipFilter
...
misc cleanups in preparation for removal
2014-10-17 15:52:11 +11:00
Greg Wilkins
aad1f9d058
447515 Remove GzipFilter
...
Made GzipHandler the same as AsyncGzipFilter
Added a HttpOutput.Interceptor
2014-10-16 20:50:11 +11:00
Greg Wilkins
ec79a6f88e
Improve HTTP header pre-encoding
...
The HttpContent class has been reworked to store HttpField instances, we may be generated on
demand or instances of PreEncodedHttpField.
The encoding of HTTP2 fields has been generalized to handle both indexed and literal fields, selected
by header enum set.
Default servlet and response classes have been cleaned up in how they set response headers.
2014-10-16 12:31:37 +11:00
Joakim Erdfelt
dec984302a
Merge branch 'jetty-9.2.x'
...
Conflicts:
jetty-server/src/test/java/org/eclipse/jetty/server/handler/RequestLogHandlerTest.java
2014-10-10 16:14:06 -07:00
Jan Bartel
dd864f9799
443529 CrossOriginFilter does not accept wildcard for allowedHeaders
2014-10-10 15:53:13 +11:00
Greg Wilkins
bb2d77f00b
Merge remote-tracking branch 'origin/jetty-9.2.x'
2014-10-10 14:20:30 +11:00
Jan Bartel
060a26ecfe
443530 CrossOriginFilter does not set the Vary header
2014-10-09 17:23:01 +11:00
Joakim Erdfelt
2755746def
Merge branch 'jetty-http2'
2014-09-11 05:56:55 -07:00
Greg Wilkins
40d84ff1e3
443662 Consume buffer in write(ByteBuffer)
2014-09-10 17:41:14 +10:00
Greg Wilkins
66980f2449
Merge remote-tracking branch 'origin/master' into jetty-http2
...
Conflicts:
VERSION.txt
aggregates/jetty-all/pom.xml
apache-jsp/pom.xml
apache-jstl/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
examples/quickstart/pom.xml
jetty-alpn/jetty-alpn-client/pom.xml
jetty-alpn/jetty-alpn-server/pom.xml
jetty-alpn/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-fcgi/fcgi-client/pom.xml
jetty-fcgi/fcgi-server/pom.xml
jetty-fcgi/pom.xml
jetty-http-spi/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-alpn/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-osgi/test-jetty-osgi/pom.xml
jetty-plus/pom.xml
jetty-proxy/pom.xml
jetty-quickstart/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-alpn-tests/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-client-transport/pom.xml
jetty-spdy/spdy-http-common/pom.xml
jetty-spdy/spdy-http-server/pom.xml
jetty-spdy/spdy-npn-tests/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/javax-websocket-client-impl/pom.xml
jetty-websocket/javax-websocket-server-impl/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-servlet/pom.xml
jetty-xml/pom.xml
pom.xml
tests/pom.xml
tests/test-continuation/pom.xml
tests/test-integration/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-mongodb-sessions/pom.xml
tests/test-sessions/test-sessions-common/pom.xml
tests/test-webapps/pom.xml
tests/test-webapps/test-dispatch-webapp/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
2014-07-25 17:37:53 +10:00
Simone Bordet
5956b9e013
411323 - DosFilter/QoSFilter should use AsyncContext rather than Continuations.
2014-07-23 14:07:14 +02:00
Greg Wilkins
fa3d7d0f7e
Merge remote-tracking branch 'origin/master' into jetty-http2
...
Conflicts:
jetty-servlet/src/test/java/org/eclipse/jetty/servlet/AsyncContextDispatchWithQueryStrings.java
2014-07-23 16:53:13 +10:00
Greg Wilkins
3a6879d3e8
expanded tabs in indents
2014-07-23 16:49:05 +10:00
Simone Bordet
467773dbdf
Merged branch 'master' into 'jetty-http2'.
2014-07-22 21:14:46 +02:00
Simone Bordet
b6ca7b3fa5
411323 - DosFilter/QoSFilter should use AsyncContext rather than Continuations.
2014-07-22 16:03:11 +02:00
Greg Wilkins
f9ffefbe13
refactored to avoid copying MetaData.Request instances
2014-07-11 16:35:25 +10:00
Greg Wilkins
fff2dd2f2d
misc test fixes for rfc7230 issues
2014-07-11 16:10:06 +10:00