Commit Graph

796 Commits

Author SHA1 Message Date
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
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
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
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
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
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