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
4bf2d37d01
Fixing CDI test case
2014-11-11 12:42:10 -07:00
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
f04903fb68
Increasing the variety of Gzip tests per recommendations by Simone
2014-11-11 10:16:41 -07:00
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
5941bf76d6
Removing GzipTester.assertIsResponseNotGzipCompressed
2014-11-10 18:37:58 -07:00
e83df11eaf
Removing GzipTester.assertIsResponseNotGzipCompressed
2014-11-10 17:58:38 -07:00
f8e431da1f
Removing GzipTester.assertIsResponseNotGzipCompressedAndEqualToExpectedString
2014-11-10 17:51:46 -07:00
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
5de887f00f
replace GzipTester.issueRequest with preexisting GzipTester.executeRequest
2014-11-10 16:04:25 -07:00
006ea256b0
test names with ':' makes ms windows very unhappy
2014-11-10 12:34:24 -07:00
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
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
e4cc9ea5de
Updating gzip tests to include 1 other flavor
2014-11-07 11:13:37 -07:00
52b4f6a51f
Merge branch 'jetty-9.2.x'
2014-11-07 10:31:01 -07:00
80ff2da394
Restoring License Headers to former glory
2014-11-07 10:30:55 -07:00
81ef9cdcca
Merge branch 'jetty-9.2.x'
...
Conflicts:
examples/embedded/src/main/java/org/eclipse/jetty/embedded/ManyConnectors.java
examples/embedded/src/main/java/org/eclipse/jetty/embedded/SpdyConnector.java
2014-11-07 10:24:54 -07:00
a1d8a7a121
Making embedded examples more consistent.
...
+ appearance (similar syntax on all examples)
+ declarations (if a variable is used, use it consistently across all of
the examples)
+ line wrap at 80 columns (so that examples make sense when copy/pasted
around for discussion. like github)
+ updating javadoc comments to be consistent
2014-11-07 10:09:41 -07:00
8c65df4ee6
Merged branch 'jetty-9.2.x' into 'master'.
2014-11-07 12:01:04 +01:00
9320e9e24a
450484 - Missing parameterization of etc/jetty-http[s].xml.
2014-11-07 11:56:58 +01:00
04e948bf3c
450483 - Missing parameterization of etc/jetty-deploy.xml.
2014-11-07 11:56:58 +01:00
8578088745
moved gzip after merge
2014-11-07 15:05:01 +11:00
cf025b3638
fixed merge
2014-11-07 14:52:03 +11:00
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
186aac6788
Merge branch 'jetty-9.2.x' into pr/23
2014-11-07 12:01:06 +11:00
18ed9af658
Added backward compatibility to Bash versions prior to version 3.1. The += notation is supported since Bash 3.1, but Jetty is deployed in evironments where it is impossible to upgrade Bash. This commit replace the += notation by a more portable notation.
...
Also-by: Louis-Félix Tessier <louisfelix@gmail.com>
Signed-off-by: Greg Wilkins <gregw@intalio.com>
2014-11-07 11:59:19 +11:00
244f97a9d1
Added extra debug to jetty osgi; added proper manifest to test-webapp-fragment
2014-11-07 11:43:23 +11:00
0b68144a27
fixed asyncgzipfilter tests
2014-11-07 11:23:03 +11:00
9223ca965c
Demonstration of Async with GZip
2014-11-06 15:11:34 -07:00
c486923ad5
Minor cleanup
2014-11-06 12:33:23 -07:00
47a92e9608
minor cleanups of HttpContent
2014-11-06 16:46:47 +11:00
f2cbde13e2
Attempting to understand windows timeout hang
2014-11-05 14:39:12 -07:00
67de171871
Adding test tracking to figure out where the test hang is coming from
2014-11-05 12:01:19 -07:00
f645b4a399
Merge branch 'jetty-9.2.x'
2014-11-05 11:12:05 -07:00
04e7be7383
Adding overall test timeout
2014-11-05 11:11:57 -07:00
d1ead3dcd6
improved javadoc
2014-11-05 17:53:46 +11:00
4cb8e7f644
449811 handle unquoted etags when gzipping
2014-11-05 11:12:17 +11:00
3164243fb8
Merge remote-tracking branch 'origin/jetty-9.2.x'
...
Conflicts:
jetty-servlets/src/main/java/org/eclipse/jetty/servlets/gzip/AbstractCompressedStream.java
2014-11-05 11:08:31 +11:00
c9c6ec8d63
449811 handle unquoted etags when gzipping
2014-11-05 11:07:14 +11:00
d410fa57b5
449811 handle unquoted etags when gzipping
2014-11-05 11:03:10 +11:00
50b6391be1
Merge remote-tracking branch 'origin/jetty-9.2.x'
...
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
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-cdi/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-quickstart/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-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-11-05 10:36:57 +11:00
63d6754ea1
449594 Handle ArrayTrie overflow with false return
2014-11-05 10:32:10 +11:00
04fc803b0e
448446 - org.eclipse.jetty.start.Main create classloader duplicate
...
+ Reuse ClassLoader instead.
2014-11-04 15:04:30 -07:00
5d0595cabd
[maven-release-plugin] prepare for next development iteration
2014-11-03 13:46:58 -06:00
772ff0bfd4
[maven-release-plugin] prepare release jetty-9.2.4.v20141103
2014-11-03 13:46:52 -06:00
8df8b2b158
set for release
2014-11-03 13:17:20 -06:00
bed3e61f35
set for fix
2014-11-03 13:16:21 -06:00
1d88eab518
Merge branch 'jetty-9.2.x'
...
Conflicts:
jetty-start/src/main/java/org/eclipse/jetty/start/Main.java
2014-11-03 10:19:49 -07:00
214246061e
449291 - --create-files downloads without license
...
+ Adding dist-home replicationa real distribution
Adding RebuildTestResources.java to help rebuild this dist-home
occasionally. There is no need to keep this directory up to date
as religiously and frequently as the main distribution.
+ Adding LicenseTest.java to test various licensing scenarios
+ Added ability to ask for license via --create-files flows
2014-11-03 10:18:18 -07:00
64597b318c
Merged branch 'jetty-9.2.x' into 'master'.
2014-11-03 17:25:37 +01:00
Greg Wilkins
Joakim Erdfelt
Simone Bordet
Jan Bartel
Jesse McConnell