Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
11,076 Commits 59 Branches 460 Tags 355 MiB
Commit Graph

1092 Commits

Author SHA1 Message Date
Jesse McConnell 8936b160c2 Merge branch 'master' into release-9 2014-05-26 10:46:39 -05:00
Jesse McConnell d59dbe936b [maven-release-plugin] prepare for next development iteration 2014-05-23 09:59:19 -05:00
Jesse McConnell edc7646a4c [maven-release-plugin] prepare release jetty-9.2.0.v20140523 2014-05-23 09:59:13 -05:00
Greg Wilkins 1e524f378e 434810 better handling of bad messages 2014-05-21 20:13:21 +02:00
Jesse McConnell 6a3cab2a2f [maven-release-plugin] prepare for next development iteration 2014-05-15 14:44:37 -05:00
Jesse McConnell eec01cbff4 [maven-release-plugin] prepare release jetty-9.2.0.RC0 2014-05-15 14:44:28 -05:00
Jesse McConnell 4d2fdee7fc [maven-release-plugin] prepare for next development iteration 2014-05-08 11:44:34 -05:00
Jesse McConnell 4515fe661b [maven-release-plugin] prepare release jetty-9.2.0.M1 2014-05-08 11:44:27 -05:00
Simone Bordet 43454ebd0a Merged branch 'master' into '431642'. 2014-04-30 15:34:54 +02:00
Simone Bordet 95c6bad654 Improved handling of return values from parser callback, by returning 
as early as possible to avoid race conditions with application code
 that may have returned true and reentered the parsing code.
 2014-04-30 14:58:14 +02:00
Greg Wilkins 2e261b75d6 433692 improved buffer resizing 2014-04-29 20:36:13 +02:00
Greg Wilkins 4785121a53 431642 Allow for immediate return from content callback in HttpParser 2014-04-10 12:59:07 +10:00
Greg Wilkins 4dbabd72f2 429734 Implemented the HA ProxyProtocol 2014-04-04 08:47:37 +11:00
Greg Wilkins c5e1e249e7 set version for 9.2.x 2014-03-31 11:35:06 +11:00
Simone Bordet 1089a33578 Fixed imports referencing JUnit 3 and old matcher libraries. 2014-03-27 15:34:48 +01:00
Greg Wilkins 31a377d829 425991 added qml mime type 2014-03-20 12:49:49 +11:00
Jesse McConnell 0ec0d452e9 [maven-release-plugin] prepare for next development iteration 2014-03-07 09:10:08 -06:00
Jesse McConnell 1e555567a9 [maven-release-plugin] prepare release jetty-9.1.3.v20140225 2014-03-07 09:10:08 -06:00
Greg Wilkins f092561a8a 428383 limit white space between requests 2014-02-18 10:02:00 +11:00
Jesse McConnell eb0aea46ce set versions.txt file to new version and fix mistaken developmentVersion 2014-02-10 13:48:29 -06:00
Jesse McConnell f3d38dfb15 [maven-release-plugin] prepare for next development iteration 2014-02-10 11:17:14 -06:00
Jesse McConnell 8f6cbc9111 [maven-release-plugin] prepare release jetty-9.1.2.v20140210 2014-02-10 11:17:07 -06:00
Simone Bordet 3486046f1e 426870 - HTTP 1.0 Request with Connection: keep-alive and response 
content hangs.

Refactored tests.
 2014-01-29 18:26:32 +01:00
Simone Bordet cbdfd87d78 426870 - HTTP 1.0 Request with Connection: keep-alive and response 
content hangs.

Fixed HttpGenerator to stay in the EOF_CONTENT mode if such case is
detected (while before it was moving to NO_CONTENT mode).
By staying in EOF_CONTENT mode the generator is made non-persistent
and eventually the connection is closed, signaling the end-of-content
to the client.
 2014-01-29 11:20:00 +01:00
Joakim Erdfelt 5ed1a9dfb4 Adding parameterized version of HttpGeneratorServerTest.testHTTP() 2014-01-28 11:57:44 -07:00
Simone Bordet 7ce6aee304 426739 - Response with Connection: keep-alive truncated. 
Fixed copy/paste error.
Also removed unnecessary constant.
 2014-01-27 18:57:24 +01:00
Jesse McConnell b82ec6e668 [maven-release-plugin] prepare for next development iteration 2014-01-08 16:47:09 -06:00
Jesse McConnell b99623a21d [maven-release-plugin] prepare release jetty-9.1.1.v20140108 2014-01-08 16:47:01 -06:00
Simone Bordet a22cfbd885 425049 - add json mime mapping to mime.properties. 2014-01-07 21:46:22 +01:00
Joakim Erdfelt a12fd9ea03 Happy New Year - 2014! 2014-01-02 14:50:14 -07:00
Greg Wilkins 084ed61711 423695 - <HT> Horizontal-tab used as HTTP Header Field separator unsupported 
Added tests to confirm that multivalue parsing is OK
 2013-12-12 15:15:54 +11:00
Joakim Erdfelt 3eb959a1e2 423695 - <HT> Horizontal-tab used as HTTP Header Field separator unsupported 
+ Adding suggested fix to HttpParser
 2013-12-10 06:58:00 -07:00
Joakim Erdfelt a345bdf4ff 423695 - <HT> Horizontal-tab used as HTTP Header Field separator unsupported 
+ Adding @Ignore'd testcase HttpParserTest.testHeaderTab()
 2013-12-10 06:31:56 -07:00
Greg Wilkins f1fc661a2c reenabled integration and RFC2616 tests 2013-11-29 17:33:05 +11:00
Greg Wilkins 8adf552c80 418888 Added strict mode to HttpGenerator 2013-11-22 22:54:09 +11:00
Joakim Erdfelt 9172d6115b [maven-release-plugin] prepare for next development iteration 2013-11-15 16:58:44 -07:00
Joakim Erdfelt 6feeab6ec3 [maven-release-plugin] prepare release jetty-9.1.0.v20131115 2013-11-15 16:58:36 -07:00
Joakim Erdfelt 7bbc0ff4df [maven-release-plugin] rollback the release of jetty-9.1.0.v20131115 2013-11-15 16:33:52 -07:00
Joakim Erdfelt 1126e68971 [maven-release-plugin] prepare for next development iteration 2013-11-15 16:03:28 -07:00
Joakim Erdfelt d6418c73d4 [maven-release-plugin] prepare release jetty-9.1.0.v20131115 2013-11-15 16:03:20 -07:00
Joakim Erdfelt 6c372b9440 Reverting <version> to 9.1.0-SNAPSHOT 2013-11-15 15:36:26 -07:00
Jesse McConnell b5345caed1 [maven-release-plugin] prepare for next development iteration 2013-11-14 15:27:52 -06:00
Jesse McConnell 1582aa196d [maven-release-plugin] prepare release jetty-9.1.0.v20131114 2013-11-14 15:27:37 -06:00
Jesse McConnell 63f20d4518 [maven-release-plugin] prepare for next development iteration 2013-11-07 10:42:54 -06:00
Jesse McConnell dc2fd1b9ce [maven-release-plugin] prepare release jetty-9.1.0.RC2 2013-11-07 10:42:41 -06:00
Greg Wilkins f567bddad9 global clean up imports 2013-11-04 13:48:03 +11:00
Greg Wilkins eb3bb660b5 Merge remote-tracking branch 'origin/master' into jetty-9.1 
Conflicts:
	jetty-client/src/main/java/org/eclipse/jetty/client/util/DigestAuthentication.java
	jetty-client/src/test/java/org/eclipse/jetty/client/HttpReceiverTest.java
	jetty-client/src/test/java/org/eclipse/jetty/client/HttpSenderTest.java
	jetty-http/src/main/java/org/eclipse/jetty/http/HttpField.java
	jetty-server/src/test/java/org/eclipse/jetty/server/AbstractHttpTest.java
	jetty-servlets/src/test/java/org/eclipse/jetty/servlets/AbstractDoSFilterTest.java
	jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/generator/HeadersBlockGenerator.java
	jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/HeadersBlockParser.java
	jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/ClientUpgradeRequest.java
	jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/WebSocketFrame.java
	jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/WebSocketSession.java
	jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/extensions/compress/DeflateCompressionMethodTest.java
	jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/extensions/compress/PerMessageDeflateExtensionTest.java
 2013-11-03 18:22:09 +11:00
Mikhail Mazursky 6b0269a16d [Bug 420930] Use Charset to specify character encoding 
Signed-off-by: Mikhail Mazursky <mikhail.mazursky@gmail.com>
 2013-11-02 14:44:36 +06:00
Greg Wilkins d5f83a8159 420034 Removed threads/timers from Date caching 2013-10-24 11:09:17 +11:00
Greg Wilkins cd1035d1d6 minor code cleanups 2013-10-21 16:30:22 +11:00
Greg Wilkins 33e2055468 minor code cleanups 2013-10-21 15:50:22 +11:00
Greg Wilkins 82a991dd07 Merge remote-tracking branch 'origin/master' into jetty-9.1 2013-10-21 12:32:54 +11:00
Greg Wilkins 24c1b30495 418732 - Add whiteListByPath mode to IPAccessHandler 
Fixed the contribution.

The PathMap changes were not correct as "" is the pattern for "/" path only.
Also removed the use of the lazy list
 2013-10-21 12:20:34 +11:00
Joakim Erdfelt dbc4f5357a Merge fixes 
+ @Ignore on PathMapTest
 2013-10-18 16:12:19 -07:00
Joakim Erdfelt d6d54e048b Merge branch 'master' into jetty-9.1 
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannel.java
	jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ErrorPageErrorHandler.java
	jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/io/UpgradeConnection.java
	jetty-websocket/websocket-client/src/test/java/org/eclipse/jetty/websocket/client/WebSocketClientTest.java
	jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/AnnotatedMaxMessageSizeTest.java
 2013-10-18 16:12:00 -07:00
Constantine Linnick b4052a2b53 [Bug 418732] Swap PathMap with IPAddressMap, also fix PathMap initialization bug 
Signed-off-by: Constantine Linnick <theaspect@gmail.com>
 2013-10-18 01:05:44 -04:00
Greg Wilkins f3b393aa5d Refactored complexity out of HttpFields 
In preparation of merging Fields class and supporting HTTP/2.0 HPACK
 2013-10-17 21:35:11 +11:00
Jesse McConnell 856a24b65a [maven-release-plugin] prepare for next development iteration 2013-09-30 14:46:09 -05:00
Jesse McConnell f466f03c6a [maven-release-plugin] prepare release jetty-9.0.6.v20130930 2013-09-30 14:46:00 -05:00
Jesse McConnell 0b3f431d27 set version back to 9.0.6-SNAPSHOT 2013-09-30 12:33:06 -05:00
Jesse McConnell af2e6ff911 Merge branch 'master' into release-9 2013-09-30 12:28:04 -05:00
Greg Wilkins 0fd656dcbe Merge remote-tracking branch 'origin/master' into jetty-9.1 2013-09-30 13:20:54 +10:00
Greg Wilkins a59439241f 418227 Null cookie value test 2013-09-30 12:59:34 +10:00
Joakim Erdfelt ac40e7ab6a Fixing various javadoc errors 2013-09-25 08:11:32 -07:00
Greg Wilkins 4708c907c1 417284 Precompiled regex in HttpField 2013-09-23 15:19:41 +10:00
Jesse McConnell 0525498ad3 [maven-release-plugin] prepare for next development iteration 2013-09-19 15:06:31 -05:00
Jesse McConnell c05a725db6 [maven-release-plugin] prepare release jetty-9.0.6.v20130919 2013-09-19 15:06:17 -05:00
Greg Wilkins 843e94e4e0 Merge remote-tracking branch 'origin/master' into jetty-9.1 
Conflicts:
	jetty-server/src/test/java/org/eclipse/jetty/server/RequestTest.java
 2013-09-09 17:11:38 +10:00
Greg Wilkins e2e1b47edf 416015 Handle null Accept-Language and other headers 2013-09-09 16:51:37 +10:00
Greg Wilkins 070ce9dd22 Merge remote-tracking branch 'origin/master' into jetty-9.1 
Conflicts:
	jetty-start/src/main/java/org/eclipse/jetty/start/Main.java
	jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebAppContext.java
 2013-09-09 15:41:17 +10:00
Mikhail Mazursky 767faece5c [Bug 415999] Fix some of FindBugs warnings 
Mostly not closed streams/DB resources are fixed. But also less
important things.

Signed-off-by: Mikhail Mazursky <mikhail.mazursky@gmail.com>
 2013-09-09 00:24:31 -04:00
Jan Bartel cdd95bb551 Merge remote-tracking branch 'origin/jetty-8' 2013-09-09 12:42:56 +10:00
Jan Bartel 11085742c8 416787 StringIndexOutOfBounds with a pathMap of "" 2013-09-09 12:41:28 +10:00
Jan Bartel 67bdc29b9b 416787 StringIndexOutOfBounds with a pathMap of "" 2013-09-09 12:30:52 +10:00
Simone Bordet 400f0ce5a2 Made remove() methods return the removed value. 2013-09-08 23:02:24 +02:00
Simone Bordet 8422dd5b1a Relaxed accessibility modifiers of a few methods to support FCGI 
parsing, and introduced method setResponseStatus(int) to set the
response status programmatically (since in FCGI the response line does
not exist and therefore it is not parsed).
 2013-09-03 16:10:07 +02:00
Jan Bartel c80100b4a9 [maven-release-plugin] prepare for next development iteration 2013-08-15 19:13:27 +10:00
Jan Bartel e7e7e45500 [maven-release-plugin] prepare release jetty-9.0.5.v20130815 2013-08-15 19:13:13 +10:00
Jan Bartel 716430bb03 [maven-release-plugin] rollback the release of jetty-9.0.5.v20130815 2013-08-15 18:03:49 +10:00
Jan Bartel 3d13c15d35 [maven-release-plugin] prepare release jetty-9.0.5.v20130815 2013-08-15 17:22:03 +10:00
Jan Bartel 7947b35134 Reset version for rerun of 9.0.5 2013-08-15 16:47:03 +10:00
Jan Bartel 1cd0cd6481 414898 Only upgrade v0 to v1 cookies on dquote , ; backslash space and tab in the value 2013-08-15 16:41:44 +10:00
Greg Wilkins 44b07f44bb Merge remote-tracking branch 'origin/master' into jetty-9.1 2013-08-15 10:01:19 +10:00
Greg Wilkins 89f927ad0f 414898 Only upgrade v0 to v1 cookies on dquote , ; backslash space and tab in the value 2013-08-15 09:11:41 +10:00
Joakim Erdfelt aef8071d1d Fixing malformed Javadoc warnings in jetty-http 2013-08-14 12:46:25 -07:00
Jesse McConnell 4383c9042d [maven-release-plugin] prepare for next development iteration 2013-08-13 14:20:56 -05:00
Jesse McConnell 160d34ec23 [maven-release-plugin] prepare release jetty-9.0.5.v20130813 2013-08-13 14:20:47 -05:00
Greg Wilkins 1e25778d57 Merge remote-tracking branch 'origin/master' into jetty-9.1 
Conflicts:
	jetty-http/src/main/java/org/eclipse/jetty/http/HttpParser.java
	jetty-server/src/test/java/org/eclipse/jetty/server/HttpServerTestBase.java
 2013-08-13 00:44:39 +10:00
Greg Wilkins 43946c62e0 414449 Added HttpParser strict mode for case sensitivity 2013-08-12 23:02:08 +10:00
Greg Wilkins 009113aacb 414640 HTTP header value encoding 
fixed issues with merge
 2013-08-09 16:31:11 +10:00
Greg Wilkins 8ce87ffafc Merge remote-tracking branch 'origin/master' into jetty-9.1 2013-08-09 16:12:55 +10:00
Greg Wilkins 7c2095725f 414640 HTTP header value encoding 
Allow URL to be any encoding (pass the bytes and by default assume UTF-8), the header values are in ISO_8859_1 and everything else
must be US_ASCII
 2013-08-09 16:11:59 +10:00
Greg Wilkins dbbc43edb1 414640 Improved Bad Message handling for non US_ASCII headers 2013-08-09 14:16:21 +10:00
Greg Wilkins 34cfc3ed10 Merge remote-tracking branch 'origin/master' into jetty-9.1 
Conflicts:
	jetty-http/src/main/java/org/eclipse/jetty/http/HttpFields.java
	jetty-http/src/test/java/org/eclipse/jetty/http/HttpFieldsTest.java
	jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java
 2013-08-09 13:50:49 +10:00
Greg Wilkins a779425994 414101 Do not escape special characters in cookies 2013-08-09 12:42:52 +10:00
Simone Bordet 89be2de57f Merged branch 'master' into 'jetty-9.1'. 2013-07-26 19:17:30 +02:00
Simone Bordet 61ea4d6705 Fixed method parseResponse() that should never return null. 
The response is "filled" by parser events even if at the end of
the parsing the parser returns false.
 2013-07-26 19:07:39 +02:00
Jesse McConnell 20bd1e0f96 [maven-release-plugin] prepare for next development iteration 2013-07-26 11:50:17 -05:00
Jesse McConnell 49c3b2c32a [maven-release-plugin] prepare release jetty-8.1.12.v20130726 2013-07-26 11:49:58 -05:00
Jesse McConnell 6ed360c480 reset for release 2013-07-26 11:23:57 -05:00
Jesse McConnell 1a5117e9ab [maven-release-plugin] prepare release jetty-8.1.12.v20130726 2013-07-26 11:18:24 -05:00
Simone Bordet 9d571af7b0 Merged branch 'master' into 'jetty-9.1'. 2013-07-26 13:55:05 +02:00
Jan Bartel e6974dadab Harmonize with jetty-9 apis 2013-07-26 18:01:37 +10:00
Jesse McConnell de2840ca1e [maven-release-plugin] prepare for next development iteration 2013-07-25 12:52:15 -05:00
Jesse McConnell 3e94867f7f [maven-release-plugin] prepare release jetty-8.1.12.v20130725 2013-07-25 12:52:07 -05:00
Jesse McConnell e0ad2c4ee1 [maven-release-plugin] prepare for next development iteration 2013-07-25 07:52:39 -05:00
Jesse McConnell 99712058ca [maven-release-plugin] prepare release jetty-8.1.11.v20130725 2013-07-25 07:52:32 -05:00
Jan Bartel 72b077921d Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2013-07-25 11:26:35 +10:00
Simone Bordet f4a41efaad Merged branch 'master' into 'jetty-9.1'. 2013-07-24 11:21:36 +02:00
Simone Bordet 0f702624a3 410668 - HTTP client should support the PATCH method. 
Modified the Request interface to add method(String) so that
additional HTTP methods (such as from WebDAV) can be used.
 2013-07-24 10:33:42 +02:00
Greg Wilkins 8645849272 398467 Servlet 3.1 Non Blocking IO 
Added ByteBuffer write and improved test harnesses
 2013-07-18 12:53:07 +10:00
Jan Bartel 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
Greg Wilkins 7303341ecf 398467 Servlet 3.1 Non Blocking IO 
more test fixes
 2013-07-11 18:45:04 +10:00
Greg Wilkins cd97b3dcbf 398467 Servlet 3.1 Non Blocking IO 
fixed more tests
 2013-07-11 15:57:42 +10:00
Simone Bordet 8eb6649709 412712 - HttpClient does not send the terminal chunk after partial writes. 
HttpGenerator._header and HttpGenerator._buffer may be null when
the content is written after a partial write.
In this case, the terminal chunk was not prepared, and therefore never
written.

The fix simply creates a HttpGenerator._header to prepare the terminal
chunk, so that it will be written.
 2013-07-10 22:57:48 +02:00
Greg Wilkins e35914e400 Merge remote-tracking branch 'origin/master' into jetty-9.1 
Conflicts:
	jetty-http/src/main/java/org/eclipse/jetty/http/HttpParser.java
	jetty-server/src/main/java/org/eclipse/jetty/server/HttpConnection.java
 2013-07-09 00:32:41 +10:00
Greg Wilkins 809c3aa472 412442 Avoid connection timeout after FIN-FIN close 2013-07-08 23:23:40 +10:00
Greg Wilkins 70b285eabd 398467 Servlet 3.1 Non Blocking IO 
fixed some tests
 2013-07-08 14:59:08 +10:00
Greg Wilkins 4a49a5e3f0 398467 Servlet 3.1 Non Blocking IO 
Handle bad listeners
 2013-07-08 13:08:53 +10:00
Greg Wilkins 981102fda5 398467 Servlet 3.1 Non Blocking IO 
Asynchronous reads working.
 2013-07-05 18:11:09 +10:00
Greg Wilkins 965918d8f2 Merge remote-tracking branch 'origin/master' into jetty-9.1 2013-07-04 17:28:57 +10:00
Thomas Becker 8b31188ca7 405424 add X-Powered-By and Server header to SPDY 2013-07-01 21:57:22 +02:00
Thomas Becker 260b21f7df 405424 add X-Powered-By and Server header to SPDY 2013-07-01 17:08:35 +02:00
Joakim Erdfelt 568bb3db0d Merge branch 'jetty-7' into jetty-8 2013-06-28 10:21:17 -07:00
Joakim Erdfelt 162cbc1416 411909 - GzipFilter flushbuffer() results in erroneous finish() call 
+ Bad finish() call changed to more appropriate flush() call
 2013-06-28 10:20:20 -07:00
Greg Wilkins 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
Joakim Erdfelt d857562059 Merge branch 'release-9' 2013-06-25 16:37:05 -07:00
Joakim Erdfelt 78b5f7df1f [maven-release-plugin] prepare for next development iteration 2013-06-25 08:29:26 -07:00
Joakim Erdfelt 5f2c937fcb [maven-release-plugin] prepare release jetty-9.0.4.v20130625 2013-06-25 08:29:18 -07:00
Joakim Erdfelt 31faf2fe20 Reverting failed release from friday 2013-06-25 07:42:45 -07:00
Jan Bartel 26b4db5c7d Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project 2013-06-24 17:29:03 +10:00
Jan Bartel 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
Greg Wilkins 4d0a796f72 405424 X-Powered-By header 2013-06-24 17:09:44 +10:00
Jesse McConnell 57bfda2a08 [maven-release-plugin] prepare for next development iteration 2013-06-21 09:49:25 -05:00
Jesse McConnell c1082ad4d4 [maven-release-plugin] prepare release jetty-9.0.4.v20130621 2013-06-21 09:49:15 -05:00
Greg Wilkins 3ded04813d Merge remote-tracking branch 'origin/master' into servlet-3.1-api 
Conflicts:
	jetty-spdy/spdy-http-server/src/test/java/org/eclipse/jetty/spdy/server/http/ServerHTTPSPDYTest.java
 2013-06-21 11:22:58 +10:00
Greg Wilkins 0b804b3611 improved javadoc 2013-06-20 09:53:39 +10:00
Greg Wilkins 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
Jesse McConnell eddb49941d [Bug 408600] set correct jetty.url in all pom files 2013-06-12 15:52:36 -05:00
Greg Wilkins 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
Greg Wilkins 7bb3a7be28 409556 Resource files not closed 
Made Resource a closeable so that it is easier to close in a try(){} block. Deprecated release() and made it close() instead.

FileResource no longer extends URLResource as it can more efficiently implement all the methods with pure File operations and have no
connections or streams that need to be release/closed
 2013-06-03 18:21:11 +10:00
Greg Wilkins 8cb383e065 Merge remote-tracking branch 'origin/master' into servlet-3.1-api 2013-05-31 10:12:34 +10:00
Greg Wilkins 8a09c4c787 409545 Change HttpChannel contract 
Ensure HttpParser always calls sequential callbacks by avoiding |=
 2013-05-31 10:03:35 +10:00
Greg Wilkins b59949253d Merge remote-tracking branch 'origin/master' into servlet-3.1-api 
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/EncodingHttpWriter.java
	jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java
	jetty-server/src/main/java/org/eclipse/jetty/server/Iso88591HttpWriter.java
	jetty-server/src/main/java/org/eclipse/jetty/server/Utf8HttpWriter.java
 2013-05-30 17:17:54 +10:00
Greg Wilkins d8f2350f50 398467 Servlet 3.1 Non Blocking IO 
Removed double dispatch due to HttpPArser content handler returning true for deferred dispatch.
 2013-05-30 16:15:04 +10:00
Jan Bartel af02e9b16d Update to version to 8.1.12-SNAPSHOT after last release 2013-05-30 10:52:39 +10:00
Greg Wilkins 4996278849 Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2013-05-30 09:53:10 +10:00
Greg Wilkins ecbb532897 408909 GzipFilter setting of headers when reset and/or not compressed 
defer commit until aggregate buffer overflows
 2013-05-30 09:49:50 +10:00
Greg Wilkins 6ef865b153 Merge remote-tracking branch 'origin/jetty-7' into jetty-8 
Conflicts:
	VERSION.txt
	example-jetty-embedded/pom.xml
	jetty-aggregate/jetty-all-server/pom.xml
	jetty-aggregate/jetty-all/pom.xml
	jetty-aggregate/jetty-client/pom.xml
	jetty-aggregate/jetty-plus/pom.xml
	jetty-aggregate/jetty-server/pom.xml
	jetty-aggregate/jetty-servlet/pom.xml
	jetty-aggregate/jetty-webapp/pom.xml
	jetty-aggregate/jetty-websocket/pom.xml
	jetty-aggregate/pom.xml
	jetty-ajp/pom.xml
	jetty-annotations/pom.xml
	jetty-client/pom.xml
	jetty-continuation/pom.xml
	jetty-deploy/pom.xml
	jetty-distribution/pom.xml
	jetty-http-spi/pom.xml
	jetty-http/pom.xml
	jetty-io/pom.xml
	jetty-jaspi/pom.xml
	jetty-jmx/pom.xml
	jetty-jndi/pom.xml
	jetty-jsp/pom.xml
	jetty-monitor/pom.xml
	jetty-nested/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/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-overlay-deployer/pom.xml
	jetty-plus/pom.xml
	jetty-policy/pom.xml
	jetty-rewrite/pom.xml
	jetty-security/pom.xml
	jetty-server/pom.xml
	jetty-servlet/pom.xml
	jetty-servlets/pom.xml
	jetty-servlets/src/test/java/org/eclipse/jetty/servlets/gzip/GzipTester.java
	jetty-spdy/pom.xml
	jetty-spdy/spdy-core/pom.xml
	jetty-spdy/spdy-jetty-http-webapp/pom.xml
	jetty-spdy/spdy-jetty-http/pom.xml
	jetty-spdy/spdy-jetty/pom.xml
	jetty-start/pom.xml
	jetty-util/pom.xml
	jetty-webapp/pom.xml
	jetty-websocket/pom.xml
	jetty-xml/pom.xml
	pom.xml
	test-continuation/pom.xml
	test-jetty-nested/pom.xml
	test-jetty-servlet/pom.xml
	test-jetty-webapp/pom.xml
	tests/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-webapp-rfc2616/pom.xml
 2013-05-27 16:47:27 +10:00
Greg Wilkins 16994cbd6c 408909 GzipFilter setting of headers when reset and/or not compressed 
The gzip filter now sets deferred headers (content-length and etag) when it decides not to commit.
Also does not allow a reset after a decision to commit
 2013-05-27 16:09:12 +10:00
Greg Wilkins 15e0d50b79 Merge remote-tracking branch 'origin/master' into servlet-3.1-api 2013-05-23 09:50:27 +10:00
Jesse McConnell 725dc261c8 Merge branch 'release-8' into jetty-8 2013-05-22 10:44:14 -05:00
Jesse McConnell a1a6f0e5f2 Merge branch 'release-7' into jetty-7 2013-05-22 10:39:24 -05:00
Jesse McConnell 74a4077dad Add package-info.java files to all jetty packages. 2013-05-21 15:09:49 -05:00
Jesse McConnell 742f6a063d [Bug 408600] set correct jetty.url in all pom files 2013-05-21 13:16:39 -05:00
Jesse McConnell bdbd92dbc9 [Bug 408600] set correct jetty.url in all pom files 2013-05-21 13:10:07 -05:00
Jesse McConnell 0858e69cb1 [maven-release-plugin] prepare for next development iteration 2013-05-20 07:19:34 -05:00
Jesse McConnell d469b77663 [maven-release-plugin] prepare release jetty-8.1.11.v20130520 2013-05-20 07:19:25 -05:00
Jesse McConnell 497c2f7819 [maven-release-plugin] prepare for next development iteration 2013-05-20 07:15:00 -05:00
Jesse McConnell b32d0260c9 [maven-release-plugin] prepare release jetty-7.6.11.v20130520 2013-05-20 07:14:52 -05:00
Jan Bartel cbac0ea5fa Merge remote-tracking branch 'origin/master' into servlet-3.1-api 2013-05-16 07:24:49 +10:00
Greg Wilkins fce27416e3 406923 Accept CRLF or LF but not CR as line termination 
Improved BadMessage handling
 2013-05-09 15:18:47 +10:00
Greg Wilkins 09476ac235 406923 Accept CRLF or LF but not CR as line termination 
Better handling of FF character
 2013-05-09 15:01:50 +10:00
Greg Wilkins 50021c7ce4 407491 Better handle empty Accept-Language 2013-05-09 15:00:27 +10:00
Greg Wilkins 4dcc9b39fc 407614 added excludedMimeTypes to gzipFilter 2013-05-09 14:16:54 +10:00
Jesse McConnell 3d600ed95e [maven-release-plugin] prepare for next development iteration 2013-05-06 18:13:04 -05:00
Jesse McConnell d832f3dc7e [maven-release-plugin] prepare release jetty-9.0.3.v20130506 2013-05-06 18:12:55 -05:00
Jan Bartel 0d181d9a75 Merge remote-tracking branch 'origin/master' into servlet-3.1-api 2013-05-03 16:59:39 +10:00
Greg Wilkins d351e0790a 406617 Spin in Request.recycle 
Numerous code cleanups with the handling of early closes of requests, specially when the response has already been sent.
 2013-05-03 15:15:03 +10:00
Greg Wilkins 0b15aa5a76 406617 Spin in Request.recylce 
Some more cleanups of the loops
 2013-05-02 20:02:29 +10:00
Greg Wilkins e6dc08cf97 406923 Accept CRLF or LF but not CR as line termination 
Fixed lookahead parsing of cached fields
 2013-05-02 14:49:46 +10:00
Greg Wilkins e030088428 Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2013-05-02 11:19:24 +10:00
Greg Wilkins 58a282d01d 406923 CR line termination 
Do not allow CR only line termination. Respond with 400 bad request.
 2013-05-02 10:44:11 +10:00
Jan Bartel e7ecfd2b2b Merge remote-tracking branch 'origin/master' into servlet-3.1-api 
Conflicts:
	jetty-server/src/test/java/org/eclipse/jetty/server/ResponseTest.java
 2013-05-02 09:07:24 +10:00
Greg Wilkins 7ddd2c6cfd 406923 Accept CRLF or LF but not CR as line termination 2013-05-01 21:17:35 +10:00
Greg Wilkins e26d8e67e5 406861 Fixed IPv6 redirect 2013-04-30 18:49:29 +10:00
Greg Wilkins 7955548d10 406390 Close if at END and content remaining 2013-04-29 14:01:11 +10:00
Greg Wilkins cbb76283c9 406390 Close if at END and content remaining 2013-04-29 10:40:05 +10:00
Greg Wilkins a5c701c237 406390 Close if at END and content remaining 2013-04-29 09:55:34 +10:00
Greg Wilkins 04bcde9b14 406617 fixed close handling during content 2013-04-26 16:10:33 +10:00
Greg Wilkins a7073d05a6 updated version to 9.1.0-SNAPSHOT 2013-04-19 13:59:18 +10:00
Jesse McConnell 7baaa14ba1 [maven-release-plugin] prepare for next development iteration 2013-04-17 11:46:39 -05:00
Jesse McConnell e390b54b25 [maven-release-plugin] prepare release jetty-9.0.2.v20140417 2013-04-17 11:46:31 -05:00
Jesse McConnell 0b20467c6f [maven-release-plugin] prepare for next development iteration 2013-04-15 11:40:45 -05:00
Jesse McConnell 3aa4301711 [maven-release-plugin] prepare release jetty-9.0.2.v20140415 2013-04-15 11:40:37 -05:00
Greg Wilkins b8dd8bde14 [maven-release-plugin] prepare for next development iteration 2013-04-08 12:31:34 +10:00
Greg Wilkins bf3771904b [maven-release-plugin] prepare release jetty-9.0.1.v20130408 2013-04-08 12:30:59 +10:00
Greg Wilkins e9185aa062 Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2013-04-04 16:09:19 +11:00
Greg Wilkins 060389147b 404128 Add Vary headers rather than set them 2013-04-04 16:05:27 +11:00
Greg Wilkins fd099aa77d 404511 Replaced all StringMap usage with Tries 2013-03-28 13:20:47 +11:00
Greg Wilkins d0f3db0f34 401150 close input stream used from cached resource 2013-03-15 16:00:40 +11:00
Jesse McConnell acb5919844 [maven-release-plugin] prepare for next development iteration 2013-03-12 09:10:50 -05:00
Jesse McConnell d6ebdc0a4a [maven-release-plugin] prepare release jetty-7.6.10.v20130312 2013-03-12 09:10:42 -05:00
Jesse McConnell 0405c8ded6 [maven-release-plugin] prepare for next development iteration 2013-03-12 09:05:25 -05:00
Jesse McConnell 852178cd01 [maven-release-plugin] prepare release jetty-8.1.10.v20130312 2013-03-12 09:05:14 -05:00
Joakim Erdfelt 897c35c2cb [maven-release-plugin] prepare for next development iteration 2013-03-08 11:33:23 -07:00
Joakim Erdfelt cc6196af50 [maven-release-plugin] prepare release jetty-9.0.0.v20130308 2013-03-08 11:33:15 -07:00
Joakim Erdfelt 7fc38f6c0f [maven-release-plugin] prepare for next development iteration 2013-03-07 19:14:19 -07:00
Joakim Erdfelt 96d045442f [maven-release-plugin] prepare release jetty-9.0.0.v20130307 2013-03-07 19:14:11 -07:00
Jesse McConnell 778ee1411b [maven-release-plugin] prepare for next development iteration 2013-03-06 10:21:46 -06:00
Jesse McConnell d916078711 [maven-release-plugin] prepare release jetty-9.0.0.v20130306 2013-03-06 10:21:38 -06:00
Greg Wilkins 41f7df18a6 402185 updated javascript mime-type 2013-03-04 16:52:49 +11:00
Greg Wilkins 7d7769475c removed printStackTrace 2013-03-04 15:44:30 +11:00
Greg Wilkins 8f2aa2f667 402106 fixed URI resize in HttpParser 2013-03-02 14:22:40 +11:00
Greg Wilkins 41952ebf1d 402075 Dont allocate the parser trie unless needed 2013-03-01 22:16:54 +11:00
Joakim Erdfelt 29b2118870 [maven-release-plugin] prepare for next development iteration 2013-02-26 09:20:45 -07:00
Joakim Erdfelt 2b82b54f6d [maven-release-plugin] prepare release jetty-9.0.0.RC2 2013-02-26 09:20:45 -07:00
Jan Bartel 6a48749f0c Merge remote-tracking branch 'origin/jetty-7' into jetty-8 
Conflicts:
	jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationParser.java
 2013-02-22 11:32:57 +11:00
Greg Wilkins 27cad4960b 401382 Prevent parseAvailable from parsing next chunk when previous has not been consumed 2013-02-21 12:43:18 +11:00
Joakim Erdfelt a9f6f30242 Merge branch 'jetty-7' into jetty-8 2013-02-05 18:08:15 -07:00
Joakim Erdfelt 14e24c97aa 400040 - NullPointerException in HttpGenerator.prepareBuffers 
+ Adding safety check on _header use
 2013-02-05 18:07:23 -07:00
Joakim Erdfelt 4dc3ed38c2 [maven-release-plugin] prepare for next development iteration 2013-02-05 10:00:36 -07:00
Joakim Erdfelt ed24f78498 [maven-release-plugin] prepare release jetty-9.0.0.RC0 2013-02-05 10:00:36 -07:00
Jesse McConnell e073ceb06d [maven-release-plugin] prepare for next development iteration 2013-02-05 10:00:36 -07:00
Jesse McConnell 2f2ad287af [maven-release-plugin] prepare release jetty-9.0.0.RC0 2013-02-05 10:00:35 -07:00
Jesse McConnell 5c58878c3c [maven-release-plugin] prepare for next development iteration 2013-01-31 11:34:38 -06:00
Jesse McConnell ebbe37294f [maven-release-plugin] prepare release jetty-8.1.9.v20130131 2013-01-31 11:34:30 -06:00
Jesse McConnell a5e1e04af1 [maven-release-plugin] prepare for next development iteration 2013-01-31 08:42:20 -06:00
Jesse McConnell b7fb18fd65 [maven-release-plugin] prepare release jetty-7.6.9.v20130131 2013-01-31 08:42:12 -06:00
Jesse McConnell 06563d01b3 [Bug 393933] remove http's ssl context factory, it is in util 2013-01-28 15:04:21 -06:00
Greg Wilkins fd25e3a742 Merge remote-tracking branch 'origin/jetty-7' into jetty-8 
Conflicts:
	jetty-servlets/src/test/java/org/eclipse/jetty/servlets/gzip/GzipTester.java
 2013-01-24 14:30:45 +11:00
Greg Wilkins 161a14d9d0 381521 Only set Vary header when content could be compressed 2013-01-24 14:07:25 +11:00
Greg Wilkins aba64046cf Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2013-01-21 12:13:10 +11:00
Greg Wilkins b36411d382 381521 Only set Vary header when content could be compressed 2013-01-21 12:09:46 +11:00
Greg Wilkins bc36eff330 jetty-9 fixed null value handling 2013-01-14 18:12:14 +11:00
Greg Wilkins 2d7b96bab1 jetty-9 added Ternary Trie impl for connection field cache 2013-01-14 17:36:03 +11:00
Jesse McConnell e1c516c7d1 merge from jetty-8 and update license blocks. 2013-01-11 17:04:53 -06:00
Jesse McConnell 863944873d merge from 7 and update license blocks for 2013 2013-01-11 15:01:16 -06:00
Jesse McConnell a4dbb5823c update license blocks for 2013 2013-01-11 14:57:51 -06:00
Greg Wilkins 27c31fb403 jetty-9 organised imports. Cleaned up some TODOs 2013-01-11 16:37:32 +11:00
Greg Wilkins 25324b666c jetty-9 made Trie abstract and added TreeTrie for the HttpParser cache to save space 2013-01-10 17:31:57 +11:00
Greg Wilkins 31def06214 jetty-9 URI parsing passed ByteBuffer so that strange query string encodings can be supported 2012-12-24 19:17:00 +11:00
Jan Bartel aa3b829fb1 Revert "395794 slightly modified fix for empty file extenstion to mime type mapping. Added a default, so it will also work with unknown file extensions" 
This reverts commit 72cdab4934.
 2012-12-24 14:11:15 +11:00
Jan Bartel 37ac5e7b16 Merge remote-tracking branch 'origin/jetty-8' 
Conflicts:
	jetty-http/src/main/java/org/eclipse/jetty/http/HttpURI.java
	jetty-servlets/src/test/java/org/eclipse/jetty/servlets/MultipartFilterTest.java
	jetty-util/src/main/java/org/eclipse/jetty/util/MultiPartInputStream.java
	jetty-util/src/test/java/org/eclipse/jetty/util/MultiPartInputStreamTest.java
	jetty-util/src/test/java/org/eclipse/jetty/util/URLEncodedTest.java
 2012-12-22 16:42:33 +11:00
Greg Wilkins d4c4637f4d Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2012-12-22 12:30:20 +11:00
Greg Wilkins 810ff3802f 397110 Accept %uXXXX encodings in URIs 2012-12-22 12:00:54 +11:00
Greg Wilkins 3216a284b3 jetty-9 per parser fields cache 2012-12-20 13:50:48 +11:00
Greg Wilkins f7c2e85040 jetty-9 per parser fields cache 2012-12-20 13:13:46 +11:00
Thomas Becker 72cdab4934 395794 slightly modified fix for empty file extenstion to mime type mapping. Added a default, so it will also work with unknown file extensions 2012-12-18 13:09:21 +01:00
Greg Wilkins 4d34e83c1c jetty-9 replaced Trie with indexed implementation 2012-12-17 19:21:28 +11:00
Jan Bartel 2966192aa4 395794 NullPointerException in when requesting a file without extension 2012-12-17 13:58:39 +11:00
Greg Wilkins ecf7563a79 jetty-9 use direct buffers for generated headers 2012-12-14 14:07:42 +11:00
Greg Wilkins 6f098dd69c jetty-9 use DateCache timer to set Date header once per second 2012-12-10 12:58:14 +11:00
Greg Wilkins aeade16b99 jetty-9 optimise generation of common fields 2012-12-09 09:46:50 +11:00
Greg Wilkins f01da31a0a jetty-9 some optimizations 2012-12-08 01:41:01 +11:00
Greg Wilkins 620d051087 jetty-9 recycle content-type 2012-12-08 01:41:01 +11:00
Greg Wilkins 3e151901bf jetty-9 Use public HttpField 2012-12-08 01:41:01 +11:00
Greg Wilkins a20d984d30 jetty-9 Added Trie for cached string lookup. HttpFields does not use StringMap 2012-12-08 01:41:00 +11:00
Greg Wilkins f89909e301 jetty-9 cleaning up dependencies 2012-11-23 16:25:57 +11:00
Greg Wilkins 8ff291d223 Merge remote-tracking branch 'origin/jetty-8' 
Conflicts:
	jetty-http/src/main/java/org/eclipse/jetty/http/HttpContent.java
	jetty-overlay-deployer/src/main/java/org/eclipse/jetty/overlays/OverlayedAppProvider.java
	jetty-overlay-deployer/src/main/java/org/eclipse/jetty/overlays/TemplateContext.java
	jetty-server/src/main/java/org/eclipse/jetty/server/AbstractHttpConnection.java
	jetty-server/src/main/java/org/eclipse/jetty/server/ResourceCache.java
	jetty-server/src/main/java/org/eclipse/jetty/server/handler/ResourceHandler.java
	jetty-server/src/test/java/org/eclipse/jetty/server/ResourceCacheTest.java
	jetty-servlet/src/main/java/org/eclipse/jetty/servlet/DefaultServlet.java
	jetty-servlet/src/test/java/org/eclipse/jetty/servlet/DefaultServletTest.java
	jetty-servlets/src/main/java/org/eclipse/jetty/servlets/GzipFilter.java
	jetty-servlets/src/main/java/org/eclipse/jetty/servlets/gzip/AbstractCompressedStream.java
	jetty-servlets/src/main/java/org/eclipse/jetty/servlets/gzip/CompressedResponseWrapper.java
 2012-11-12 12:30:26 +11:00