Commit Graph

1045 Commits

Author SHA1 Message Date
Greg Wilkins ac7b515915 465053 Prevent gzip buffer overflow on complete 2015-05-22 10:46:40 +10:00
Greg Wilkins 8aeec6803c 465053 Prevent gzip buffer overflow on complete 2015-05-22 10:36:46 +10:00
Jan Bartel 2e9f46e5d8 457309 Add test to ensure GET and HEAD response headers same for gzip 2015-05-06 14:01:08 +10:00
Greg Wilkins a593d8eef6 Merge remote-tracking branch 'origin/jetty-9.2.x' 2015-04-30 13:52:31 +10:00
Greg Wilkins b5818034eb 465734 DosFilter whitelist bit pattern fix
removed conflicting setter
2015-04-30 13:51:27 +10:00
Jan Bartel e30c05cc2b Merge remote-tracking branch 'origin/jetty-9.2.x'
Conflicts:
	tests/test-integration/src/test/java/org/eclipse/jetty/test/support/TestableJettyServer.java
	tests/test-integration/src/test/resources/BIOHttp.xml
	tests/test-integration/src/test/resources/BIOHttps.xml
	tests/test-integration/src/test/resources/NIOHttp.xml
	tests/test-integration/src/test/resources/NIOHttps.xml
2015-04-30 10:44:44 +10:00
Greg Wilkins 2c65b66f9c 465734 DosFilter whitelist bit pattern fix 2015-04-29 15:18:48 +10:00
Joakim Erdfelt 6b5e45d089 Fixing test on Scanner to use real test directory, not aliased one. 2015-04-24 15:54:43 -07:00
Joakim Erdfelt c9d8d07a63 464727 - Update Javadoc for Java 8 DocLint 2015-04-22 14:21:53 -07:00
Greg Wilkins eee2a53197 Merge remote-tracking branch 'origin/jetty-9.2.x' 2015-04-22 16:12:10 +10:00
Greg Wilkins e97c726ccf 464740 DosFilter whiteList check improvement 2015-04-22 13:19:00 +10:00
Joakim Erdfelt 09b5f680b7 464727 - Update Javadoc for Java 8 DocLint
Eliminate empty tag warnings
+ Changed <p/> to <p>
+ Changed <br/> to <br>
2015-04-15 14:38:35 -07:00
Simone Bordet 3169e3becf 444721 - PushCacheFilter cleanup/improvements.
Only associating secondary resources that have been requested with a GET.
2015-04-13 17:16:26 +02:00
Simone Bordet ffadcd6757 444721 - PushCacheFilter cleanup/improvements.
Ported the "maxAssociations" functionality from SPDY's ReferrerPushStrategy.
Added JMX support.
Removed __renew__ special path in favour of a JMX method.
Added clearPushCache() JMX method.
Made push reentrant by eliminating the check for "org.eclipse.jetty.pushed".
2015-04-10 15:22:49 +02:00
Greg Wilkins 1cb0449be3 Organised imports 2015-03-26 12:32:15 +11:00
Jesse McConnell da4f95f3d3 [maven-release-plugin] prepare for next development iteration 2015-03-25 09:08:27 -05:00
Jesse McConnell e92fd438fd [maven-release-plugin] prepare release jetty-9.2.11.M0 2015-03-25 09:08:21 -05:00
Simone Bordet b8623c125f Merged branch 'jetty-9.2.x' into 'master'. 2015-03-25 11:11:49 +01:00
Simone Bordet aa096d56c1 Fixed Javadocs. 2015-03-25 11:11:12 +01:00
Greg Wilkins 0592ecf3e9 cleaned up PushBuilder API 2015-03-11 12:06:51 +11:00
Jesse McConnell e3fd0056cf [maven-release-plugin] prepare for next development iteration 2015-03-10 08:00:22 -05:00
Jesse McConnell 9d648f4000 [maven-release-plugin] prepare release jetty-9.2.10.v20150310 2015-03-10 08:00:14 -05:00
Greg Wilkins 4e1de48ba6 Simplified Gzip test 2015-02-27 13:54:41 +11:00
Jesse McConnell 1659d83978 [maven-release-plugin] prepare for next development iteration 2015-02-24 10:38:33 -06:00
Jesse McConnell dc0c3f4c52 [maven-release-plugin] prepare release jetty-9.2.9.v20150224 2015-02-24 10:38:28 -06:00
Greg Wilkins 1b62a30abb 460291 - AsyncGzipFilter Mappings
Changed AsyncGzipFilter to default check gzip file to setting from default servlet
2015-02-19 09:53:03 +11:00
Jesse McConnell ce5db2ca55 [maven-release-plugin] prepare for next development iteration 2015-02-17 16:02:22 -06:00
Jesse McConnell 26b7597928 [maven-release-plugin] prepare release jetty-9.2.8.v20150217 2015-02-17 16:02:16 -06:00
Jan Bartel c7b8707849 459125 GzipHandler default mimeType behavior incorrect 2015-02-11 11:15:55 +11:00
Greg Wilkins 14cd10b676 experimenting with push API 2015-02-06 13:48:34 +11:00
Greg Wilkins ab8b7f8c8d PushBuilder uses full URI 2015-02-06 10:44:19 +11:00
Jesse McConnell aa22842c20 [maven-release-plugin] prepare for next development iteration 2015-01-16 17:48:29 -06:00
Jesse McConnell 8c58a9abc4 [maven-release-plugin] prepare release jetty-9.2.7.v20150116 2015-01-16 17:48:23 -06:00
Jesse McConnell 81bb8411d1 [maven-release-plugin] prepare for next development iteration 2015-01-16 12:06:36 -06:00
Jesse McConnell 7865f88b81 [maven-release-plugin] prepare release jetty-9.2.7.v20150116 2015-01-16 12:06:30 -06:00
Jesse McConnell db991355a2 [maven-release-plugin] prepare for next development iteration 2015-01-16 10:41:45 -06:00
Jesse McConnell 6930abb8d3 [maven-release-plugin] prepare release jetty-9.2.7.v20140116 2015-01-16 10:41:39 -06:00
Jesse McConnell 9225b124a4 [maven-release-plugin] prepare for next development iteration 2015-01-16 08:21:35 -06:00
Jesse McConnell ebd563e64d [maven-release-plugin] prepare release 9.2.7.v20140116 2015-01-16 08:21:29 -06:00
Greg Wilkins 9618f45ead Merge branch 'jetty-9.2.x' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9.2.x 2015-01-08 11:40:02 +01:00
Greg Wilkins 3fed24127f 456956 Reduce ThreadLocal.remove() weak reference garbage 2015-01-08 11:39:40 +01:00
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 3270af81e8 456956 Reduce ThreadLocal.remove() weak reference garbage 2015-01-07 19:53:30 +01:00
Greg Wilkins dfe9dc3115 Further experimentation with PushBuilder 2014-12-09 12:27:39 +01:00
Greg Wilkins 06b1efc182 Added alternate push API and example 2014-12-05 17:47:25 +01:00
Jan Bartel bc22ba72dc [maven-release-plugin] prepare for next development iteration 2014-12-05 16:45:12 +01:00
Jan Bartel 1cc075cf98 [maven-release-plugin] prepare release jetty-9.2.6.v20141205 2014-12-05 16:45:01 +01:00
Jesse McConnell 127b48c932 [maven-release-plugin] prepare for next development iteration 2014-12-03 09:00:57 -06:00
Jesse McConnell 028f4b9610 [maven-release-plugin] prepare release jetty-9.2.6.v20141203 2014-12-03 09:00:46 -06:00
Greg Wilkins 88ddab9892 Merge remote-tracking branch 'origin/jetty-9.2.x'
Conflicts:
	VERSION.txt
2014-12-04 01:33:56 +11:00
Jesse McConnell 1263d1f3c8 [maven-release-plugin] prepare for next development iteration 2014-12-03 08:26:47 -06:00
Jesse McConnell 5c7f706496 [maven-release-plugin] prepare release jetty-9.2.6.v20141203 2014-12-03 08:26:35 -06:00
Greg Wilkins 904b6a113f update javadoc for DoSFilter 2014-12-04 01:01:18 +11:00
Jesse McConnell 09846e324d [maven-release-plugin] prepare for next development iteration 2014-11-12 17:13:19 -06:00
Jesse McConnell 97d2bd95a6 [maven-release-plugin] prepare release jetty-9.2.5.v20141112 2014-11-12 17:13:14 -06: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 c9c6ec8d63 449811 handle unquoted etags when gzipping 2014-11-05 11:07:14 +11:00
Greg Wilkins d410fa57b5 449811 handle unquoted etags when gzipping 2014-11-05 11:03:10 +11:00
Jesse McConnell 5d0595cabd [maven-release-plugin] prepare for next development iteration 2014-11-03 13:46:58 -06:00
Jesse McConnell 772ff0bfd4 [maven-release-plugin] prepare release jetty-9.2.4.v20141103 2014-11-03 13:46:52 -06:00
Jesse McConnell 1c4a08b35b [maven-release-plugin] prepare for next development iteration 2014-10-31 09:58:16 -05:00
Jesse McConnell a4ff7bf841 [maven-release-plugin] prepare release jetty-9.2.4.v20141031 2014-10-31 09:58:10 -05:00
Jesse McConnell e1b73a64eb [maven-release-plugin] prepare for next development iteration 2014-10-30 11:28:41 -05:00
Jesse McConnell 5770cc1179 [maven-release-plugin] prepare release jetty-9.2.4.v20141030 2014-10-30 11:28:35 -05:00
Joakim Erdfelt b314bfcc94 446944 - ServletTester and HttpTester should be in <classifier>tests</classifier>
Moving HttpTester to "tests" scoped jetty-http artifact.

 + HttpTester, a testing class, was used by jetty-servlets,
   embedded-jetty-examples, and test-integration, all from
   those testing scopes.  Moved the HttpTester into the
   pre-existing jetty-http "tests" classified artifact.

Moving ServletTester to "tests" scoped jetty-servlet artifact.

 + ServletTester, a testing class, was used by jetty-servlets,
   test-integration, and test-jetty-webapp.  This move puts
   this class in the pre-existing jetty-servlet "tests" classified
   artifact.
2014-10-29 09:50:32 -07:00
Joakim Erdfelt 8a72a153a1 Merge branch 'jetty-9.2.x' 2014-10-28 12:32:55 -07:00
Jesse McConnell 58eb6740ec [maven-release-plugin] prepare for next development iteration 2014-10-28 14:20:30 -05:00
Jesse McConnell 19a44846cf [maven-release-plugin] prepare release jetty-9.2.4.v20141028 2014-10-28 14:20:24 -05:00
Joakim Erdfelt 264e0bce39 Revert "Moving HttpTester to "tests" scoped jetty-http artifact."
This reverts commit 8d85940077.
2014-10-28 07:50:56 -07:00
Simone Bordet 7cdcd69f44 Reverted version to 9.2.4-SNAPSHOT. 2014-10-28 11:52:00 +01:00
Jesse McConnell 3b745f06df [maven-release-plugin] prepare for next development iteration 2014-10-27 16:16:24 -05:00
Jesse McConnell 4f0d78c91b [maven-release-plugin] prepare release jetty-9.2.4.v20141027 2014-10-27 16:16:18 -05: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