Eclipse/jetty.project
1
0
Fork 0
mirror of https://github.com/jetty/jetty.project.git synced 2025-02-22 06:55:53 +00:00
Code Issues Packages Projects Releases Wiki Activity
10,038 Commits 55 Branches 466 Tags
Commit Graph

10038 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joakim Erdfelt
24adca89ac Removing weld.mod (in favor of cdi.mod) 2014-11-14 06:30:01 -07:00
Joakim Erdfelt
15bf5b02f8 Updating Main.initFiles() to be extensible 2014-11-13 14:23:26 -07:00
Greg Wilkins
a308c087ed Implemented the PROXY protocol 
Moved the PROXY protocol support from HttpParser to a ConnectionFactory.
See http://www.haproxy.org/download/1.5/doc/proxy-protocol.txt
 2014-11-13 19:55:01 +11:00
Greg Wilkins
59fc60972e Merge remote-tracking branch 'origin/jetty-9.2.x' 2014-11-12 17:14:06 +11:00
Greg Wilkins
9904db48ce 450894 jetty.sh does not delete JETTY_STATE at start 2014-11-12 17:01:52 +11:00
Jan Bartel
f10403b41a 450467 Integer overflow in Session expiry calculation in MongoSessionManager 2014-11-12 16:26:14 +11:00
Jan Bartel
3bd03e5549 450467 Integer overflow in Session expiry calculation in MongoSessionManager 2014-11-12 16:11:44 +11:00
Greg Wilkins
ac87e8c389 fixed bad merge of VERSION.TXT 2014-11-12 14:19:44 +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
7939edc8a2 446564 Refactored RequestLog Mechanism 
fixed log race in test
 2014-11-12 13:15:09 +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
4bf2d37d01 Fixing CDI test case 2014-11-11 12:42:10 -07: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
Joakim Erdfelt
52b4f6a51f Merge branch 'jetty-9.2.x' 2014-11-07 10:31:01 -07:00
Joakim Erdfelt
80ff2da394 Restoring License Headers to former glory 2014-11-07 10:30:55 -07:00
Joakim Erdfelt
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
Joakim Erdfelt
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
Simone Bordet
8c65df4ee6 Merged branch 'jetty-9.2.x' into 'master'. 2014-11-07 12:01:04 +01:00
Simone Bordet
9320e9e24a 450484 - Missing parameterization of etc/jetty-http[s].xml. 2014-11-07 11:56:58 +01:00
Simone Bordet
04e948bf3c 450483 - Missing parameterization of etc/jetty-deploy.xml. 2014-11-07 11:56:58 +01: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
186aac6788 Merge branch 'jetty-9.2.x' into pr/23 2014-11-07 12:01:06 +11:00
Greg Wilkins
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
Jan Bartel
244f97a9d1 Added extra debug to jetty osgi; added proper manifest to test-webapp-fragment 2014-11-07 11:43:23 +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
47a92e9608 minor cleanups of HttpContent 2014-11-06 16:46:47 +11:00
Joakim Erdfelt
f2cbde13e2 Attempting to understand windows timeout hang 2014-11-05 14:39:12 -07:00
Joakim Erdfelt
67de171871 Adding test tracking to figure out where the test hang is coming from 2014-11-05 12:01:19 -07:00
Joakim Erdfelt
f645b4a399 Merge branch 'jetty-9.2.x' 2014-11-05 11:12:05 -07:00
Joakim Erdfelt
04e7be7383 Adding overall test timeout 2014-11-05 11:11:57 -07:00