7297 Commits

Author SHA1 Message Date
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
ab14c67b66 Update for reroll of release 2013-08-15 16:51:27 +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
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 jetty-9.0.5.v20130813 2013-08-13 14:20:47 -05:00
Jesse McConnell
80945b64fe set for release 2013-08-13 13:25:14 -05:00
Jesse McConnell
e6f1e8a52a Merge branch 'master' into release-9 2013-08-13 13:23:41 -05:00
Simone Bordet
759c7096b2 414972 - HttpClient may read bytes with pre-tunnelled connection.
Now the receiver checks whether the connection is closed, and returns
immediately if it is without "stealing" the bytes to the tunnelled
connection.
2013-08-13 16:01:16 +02:00
Thomas Becker
9a7b0f5c10 412938 Request.setCharacterEncoding now throws UnsupportedEncodingException instead of UnsupportedCharsetException 2013-08-13 13:50:42 +02:00
Thomas Becker
75f87a289a 414951 QueuedThreadPool fix constructor that missed to pass the idleTimeout 2013-08-13 13:35:06 +02:00
Greg Wilkins
80b422c0e4 413901 isAsyncStarted remains true while original request is dispatched 2013-08-13 10:38:44 +10:00
Greg Wilkins
43946c62e0 414449 Added HttpParser strict mode for case sensitivity 2013-08-12 23:02:08 +10:00
Jan Bartel
e3e9264a07 414840 Request.login() throws NPE if username is null 2013-08-12 16:36:08 +10:00
Jan Bartel
80988c8b1f Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project 2013-08-12 12:11:51 +10:00
Jan Bartel
8cf2744226 414833 HttpSessionListener.destroy must be invoked in reverse order 2013-08-12 12:11:06 +10:00
Greg Wilkins
c48cb240a1 414763 Added org.eclipse.jetty.util.log.stderr.ESCAPE option 2013-08-12 11:42:09 +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
Jan Bartel
b17696325b Merge remote-tracking branch 'origin/jetty-8'
Conflicts:
	jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationParser.java
2013-08-09 15:14:09 +10:00
Jan Bartel
6a22a9f5b9 Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2013-08-09 14:46:25 +10:00
Greg Wilkins
3e79877bcc 414727 Ensure asynchronously flushed resources are closed 2013-08-09 14:42:10 +10:00
Jan Bartel
66620b77b8 414507 Ensure AnnotationParser ignores parent dir hierarchy when checking for hidden dirnames 2013-08-09 14:19:04 +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
12f1d0f16e 414625 final static version fields 2013-08-09 12:45:39 +10:00
Greg Wilkins
a779425994 414101 Do not escape special characters in cookies 2013-08-09 12:42:52 +10:00
Simone Bordet
914392e80d Merged branch 'jetty-8' into 'master'. 2013-08-08 12:12:34 +02:00
Simone Bordet
59a070a9fe Merged branch 'jetty-7' into 'jetty-8'. 2013-08-08 12:10:19 +02:00
Simone Bordet
4ce4615597 414652 - WebSocket's sendMessage() may hang on congested connections.
Fixed by using Locks instead of the synchronized keyword, and by using tryLock()
in flushBuffer() and flush(), that are called by WebSocketConnection.handle().

It is quite a hack, but the real fix is in Jetty 9 where the architecture is different
and there are two different paths for reading and writing, so that this problem
could not even happen.
2013-08-08 12:09:11 +02:00
Jan Bartel
bd1b19b45c Merge remote-tracking branch 'origin/jetty-8'
Conflicts:
	jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationParser.java
	jetty-annotations/src/test/java/org/eclipse/jetty/annotations/TestAnnotationParser.java
2013-08-08 14:24:19 +10:00
Jan Bartel
f22217392b Merge remote-tracking branch 'origin/jetty-7' into jetty-8
Conflicts:
	jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationParser.java
2013-08-08 12:28:51 +10:00
Jan Bartel
f983629434 414507 AnnotationParser should skip classes in hidden dirs or with . name prefix 2013-08-08 12:09:29 +10:00
Greg Wilkins
a719418990 413568 Made AJP worker name generic 2013-08-08 12:05:24 +10:00
Greg Wilkins
95416bce76 413568 Made AJP worker name generic 2013-08-08 10:51:43 +10:00
Jan Bartel
a900010f81 414235 RequestLogHandler configured on a context fails to handle forwarded requests 2013-08-06 09:14:28 +10:00
Joakim Erdfelt
74991f90d6 Cleanup from merge 2013-08-05 09:13:32 -07:00
Joakim Erdfelt
e2d872fcc7 Merge branch 'jetty-8'
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/handler/RequestLogHandler.java
	jetty-servlets/src/test/java/org/eclipse/jetty/servlets/MultipartFilterTest.java
	jetty-spdy/spdy-client/pom.xml
	jetty-spdy/spdy-core/pom.xml
	jetty-util/src/main/java/org/eclipse/jetty/util/MultiPartInputStreamParser.java
	jetty-util/src/test/java/org/eclipse/jetty/util/MultiPartInputStreamTest.java
	pom.xml
	tests/test-integration/src/test/java/org/eclipse/jetty/test/monitor/JmxServiceTest.java
	tests/test-integration/src/test/java/org/eclipse/jetty/test/monitor/ProgramConfigTest.java
	tests/test-integration/src/test/java/org/eclipse/jetty/test/monitor/XmlConfigTest.java
2013-08-05 08:47:24 -07:00
Jan Bartel
432964cf5f Merge remote-tracking branch 'origin/jetty-7' into jetty-8
Conflicts:
	jetty-servlets/src/main/java/org/eclipse/jetty/servlets/MultiPartFilter.java
2013-08-05 18:03:11 +10:00
Jan Bartel
f3f2bce36c 414393 StringIndexOutofBoundsException with > 8k multipart content without CR or LF 2013-08-05 17:18:44 +10:00
Jan Bartel
446820071b Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2013-08-05 12:35:16 +10:00
Jan Bartel
f5fb412eba 414235 - RequestLogHandler configured on a context fails to handle forwarded requests 2013-08-05 12:32:21 +10:00
Joakim Erdfelt
01786aa0c2 Merge branch 'jetty-7' into jetty-8 2013-08-02 15:11:05 -07:00
Joakim Erdfelt
79ac8ad22d Fixing License Header to conform with standard with rest of project 2013-08-02 14:34:03 -07:00
Joakim Erdfelt
2057c4c17b Upgrading Junit + Hamcrest 2013-08-02 14:25:53 -07:00
Jan Bartel
e15d83e061 Merge remote-tracking branch 'origin/jetty-8'
Conflicts:
	VERSION.txt
	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
	jetty-aggregate/jetty-all-server/pom.xml
	jetty-aggregate/jetty-client/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-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-jaas/src/main/java/org/eclipse/jetty/jaas/spi/PropertyFileLoginModule.java
	jetty-jaspi/pom.xml
	jetty-jmx/pom.xml
	jetty-jndi/pom.xml
	jetty-jsp/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/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-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-server/pom.xml
	jetty-start/pom.xml
	jetty-util-ajax/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
	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-jetty-webapp/pom.xml
	tests/test-webapps/test-webapp-rfc2616/pom.xml
2013-08-01 13:21:32 +10:00
Jan Bartel
5094dc059d 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-logback/pom.xml
	jetty-osgi/jetty-osgi-boot-warurl/pom.xml
	jetty-osgi/jetty-osgi-boot/pom.xml
	jetty-osgi/jetty-osgi-equinoxtools/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-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-08-01 12:40:23 +10:00
Jan Bartel
e87eee1b46 412629 PropertyFileLoginModule doesn't cache user configuration file even for refreshInterval=0 2013-08-01 11:56:13 +10:00
Jan Bartel
1dbab40863 412629 PropertyFileLoginModule doesn't cache user configuration file even for refreshInterval=0 2013-08-01 10:55:10 +10:00
Jan Bartel
7dea4f85f9 414085 - Add jetty-continuations to plugin dependencies 2013-08-01 09:59:19 +10:00
Jesse McConnell
223c8ad7b4 Merge branch 'release-8' into jetty-8 2013-07-31 12:12:59 -05:00