Commit Graph

2102 Commits

Author SHA1 Message Date
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
Thomas Becker 9008210c2e setuid.mod, ext.mod fix module errors 2013-09-06 17:34:28 +02:00
Greg Wilkins ace43502ad refined start.jar mechanism to align with updated documentation 2013-09-06 16:10:03 +10:00
Greg Wilkins 5c3f498624 create directories on module ini 2013-09-06 13:06:15 +10:00
Greg Wilkins c3bd5752ee Merge remote-tracking branch 'origin/master' into jetty-9.1 2013-09-06 09:19:45 +10:00
Greg Wilkins ee52769dea 416663 Content-length set by resourcehandler 2013-09-06 09:19:05 +10:00
Greg Wilkins a3f6633385 Merge remote-tracking branch 'origin/master' into jetty-9.1
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/HttpInput.java
	jetty-server/src/test/java/org/eclipse/jetty/server/HttpConnectionTest.java
	jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java
2013-09-05 13:19:12 +10:00
Greg Wilkins ce098c67de 416477 Improved consumeAll error handling 2013-09-05 12:09:22 +10:00
Simone Bordet 4663fa4992 Renamed "Empty" inner classes to "Adapter" to comply with the rest of
the codebase.
2013-09-04 13:15:23 +02:00
Greg Wilkins 2e444d2f17 Merge remote-tracking branch 'origin/master' into jetty-9.1
Conflicts:
	jetty-io/src/main/java/org/eclipse/jetty/io/AbstractConnection.java
	jetty-server/src/test/java/org/eclipse/jetty/server/HttpServerTestBase.java
	jetty-spdy/spdy-http-server/src/main/java/org/eclipse/jetty/spdy/server/proxy/ProxyHTTPSPDYConnection.java
2013-09-02 17:00:07 +10:00
Greg Wilkins eec9d405e5 416321 handle failure during blocked committing write 2013-09-02 14:56:22 +10:00
Greg Wilkins 07ae3615ed 416321 handle failure during blocked committing write 2013-09-02 14:44:23 +10:00
Greg Wilkins 317a3f27df 416321 improved test harnesses 2013-09-02 12:24:51 +10:00
Thomas Becker d51268977b fix merge issue 2013-08-30 18:00:47 +02:00
Thomas Becker 566065dd34 cleanup import in HttpConnection 2013-08-30 17:21:53 +02:00
Thomas Becker a9955ebc91 cleanup import in HttpConnection 2013-08-30 17:15:14 +02:00
Greg Wilkins 4d6fd407b5 Merge remote-tracking branch 'origin/master' into jetty-9.1 2013-08-30 14:45:42 +10:00
Greg Wilkins 4358302ce0 416102 - Clean up of async sendContent process 2013-08-30 14:45:21 +10:00
Greg Wilkins b5d3aeab0f Merge remote-tracking branch 'origin/master' into jetty-9.1
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java
2013-08-30 14:41:33 +10:00
Greg Wilkins 5fce6408d0 Merge branch 'jetty-9.1' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9.1 2013-08-30 14:38:41 +10:00
Greg Wilkins 79fb4287bb Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project 2013-08-30 14:37:55 +10:00
Greg Wilkins 47c679dabb 416102 - Clean up of async sendContent process 2013-08-30 14:37:43 +10:00
Jesse McConnell ac30f5c9bd update other jetty mods to new format 2013-08-29 16:39:28 -05:00
Thomas Becker e8130f4201 415605 fix status code logging for async requests 2013-08-29 13:25:04 +02:00
Greg Wilkins 12c7da97e2 Merge remote-tracking branch 'origin/master' into jetty-9.1 2013-08-29 16:57:24 +10:00
Greg Wilkins 9bf83d427b 416103 Added AllowSymLinkAliasChecker.java 2013-08-29 16:44:38 +10:00
Greg Wilkins 2b7462e9a9 416103 Added AllowSymLinkAliasChecker.java 2013-08-29 16:17:15 +10:00
Jan Bartel c183c6fad5 Merge branch 'jetty-9.1' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9.1 2013-08-29 12:59:50 +10:00
Jan Bartel 280000e88a Merge remote-tracking branch 'origin/master' into jetty-9.1
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
	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-spi/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-overlay-deployer/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-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java
	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-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-jetty-webapp/src/main/config/demo/webapps/test.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-08-29 12:59:32 +10:00
Greg Wilkins aec807804d 415826 start.jar replace --enable with --module-ini
Added --module-ini and --module-start-ini
jetty.base is set from user.dir
jetty.home is set from start.jar dir
2013-08-29 12:37:50 +10:00
Jan Bartel 35d379a335 416096 DefaultServlet leaves open file descriptors with file sizes greater than response buffer 2013-08-29 12:16:38 +10:00
Greg Wilkins c84063a5f8 415826 start.jar replace --enable with --initialize
refactored impl to be clearer when creating ini
2013-08-28 23:53:32 +10:00
Greg Wilkins c1bd267c17 415826 start.jar replace --enable with --initialize 2013-08-28 15:41:27 +10:00
Greg Wilkins 73cf943b5c Merge branch 'jetty-9.1' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9.1 2013-08-28 09:30:42 +10:00
Greg Wilkins d66778ad06 415826 start.jar module --enable and --disable
morphed mechanism into --initialize based templates
2013-08-28 09:30:03 +10:00
Jan Bartel ac0e30bbb7 415745 Include followed by forward using a PrintWriter incurs unnecessary delay 2013-08-27 17:33:16 +10:00
Jesse McConnell ef166c23e6 Merge branch 'release-9' 2013-08-23 18:58:01 -05:00
Jesse McConnell 28a0c5ce98 updatre base mod with optional jmx dependency 2013-08-23 17:28:38 -05:00
Joakim Erdfelt 2e94149ea3 Merge branch 'jetty-9.1' into jetty-9.1-altstart 2013-08-23 11:49:41 -07:00
Simone Bordet bfd68d7e61 Using old ArrayByteBufferPool defaults to make the
HttpManyWaysToCommitTest tests pass.
See also https://bugs.eclipse.org/bugs/show_bug.cgi?id=415773.
2013-08-23 17:43:16 +02:00
Simone Bordet 9314f6d7ee Cleanup of unused code, variables, tabs, etc. 2013-08-23 17:41:44 +02:00
Greg Wilkins b3c9adac56 fixed header 2013-08-23 20:09:00 +10:00
Greg Wilkins fb82dad812 413684 deprecated unsafe alias checkers
Added extra test harness
2013-08-23 19:55:19 +10:00
Greg Wilkins c3691b60b0 Merge remote-tracking branch 'origin/jetty-8' 2013-08-23 17:17:57 +10:00
Greg Wilkins d2ff475834 Merge remote-tracking branch 'origin/jetty-8'
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java
	jetty-util/src/main/java/org/eclipse/jetty/util/resource/FileResource.java
	tests/test-webapps/test-jetty-webapp/src/main/config/webapps.demo/test.xml
2013-08-23 17:17:34 +10:00
Greg Wilkins 2a178a29fd 413684 deprecated unsafe alias checkers
removed debugs
2013-08-23 17:11:57 +10:00
Greg Wilkins b33b5f2f5d 413684 deprecated unsafe alias checkers 2013-08-23 16:49:42 +10:00
Greg Wilkins a6b6891d8b 415641 Remove remaining calls to deprecated HttpTranspoert.send
Actually removed the impl of the deprecated method that is no longer called.
2013-08-23 10:23:52 +10:00
Jesse McConnell 5c87965ff1 server depends on xml.. 2013-08-22 12:23:29 -05:00
Jesse McConnell 725e405dac first pass for mod files for distribution 2013-08-22 11:53:58 -05:00
Greg Wilkins 59540abeda Merge remote-tracking branch 'origin/master' into jetty-9.1
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java
	jetty-util/src/main/java/org/eclipse/jetty/util/IteratingCallback.java
2013-08-22 22:58:58 +10:00
Greg Wilkins c4583918a3 415330 Avoid multiple callbacks at EOF 2013-08-22 21:31:29 +10:00
Simone Bordet 4f21d42b78 Fixed recycling of fields, now correctly restored to their initial
values.
2013-08-21 22:22:05 +02:00
Jan Bartel ad8db51ed5 415314 Jetty should not commit response on output if < Response.setBufferSize() bytes are written 2013-08-19 17:52:39 +10:00
Joakim Erdfelt 3c28bf8c60 Revert "415062 SelectorManager wakeup optimisation"
This reverts commit edbf6e07aa.
2013-08-16 14:38:10 -07:00
Greg Wilkins edbf6e07aa 415062 SelectorManager wakeup optimisation 2013-08-16 16:35:38 +10: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
Joakim Erdfelt b378049d1a Fixing malformed Javadoc warnings in jetty-server 2013-08-14 12:46:25 -07:00
Joakim Erdfelt ffad720991 Fixing Javadoc errors that JDK 1.7 complains about 2013-08-14 11:50:07 -07:00
Simone Bordet 34032552ea Avoid boxing of primitive int variables in logging statements. 2013-08-14 14:33:05 +02: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
Simone Bordet d3a93a0d68 Merged branch 'master' into 'jetty-9.1'. 2013-08-13 16:13:31 +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 c27e58b785 413901 isAsyncStarted remains true while original request is dispatched 2013-08-13 10:39:26 +10:00
Greg Wilkins 80b422c0e4 413901 isAsyncStarted remains true while original request is dispatched 2013-08-13 10:38:44 +10:00
Simone Bordet 6a831dc2ca Fixed erroneous warning message when the context path is "/". 2013-08-12 22:46:28 +02:00
Simone Bordet 0cc46e8beb 414891 - Errors thrown by ReadListener and WriteListener not handled correctly.
Now correctly catching Throwable to handle all exception cases.
2013-08-12 18:52:14 +02: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
Jan Bartel 3eeb20f5bd Merge remote-tracking branch 'origin/master' into jetty-9.1 2013-08-12 12:12:50 +10:00
Jan Bartel 8cf2744226 414833 HttpSessionListener.destroy must be invoked in reverse order 2013-08-12 12:11:06 +10:00
Jan Bartel 2c3ecf9e38 414731 Request.getCookies() should return null if there are no cookies 2013-08-09 18:08:16 +10:00
Jan Bartel 06ef5b7930 Merge remote-tracking branch 'origin/master' into jetty-9.1
Conflicts:
	jetty-annotations/src/test/java/org/eclipse/jetty/annotations/TestAnnotationParser.java
	jetty-http/src/main/java/org/eclipse/jetty/http/HttpParser.java
2013-08-09 15:59:29 +10:00
Greg Wilkins 3e79877bcc 414727 Ensure asynchronously flushed resources are closed 2013-08-09 14:42:10 +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 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
Greg Wilkins 21e7b67cc7 414635 Modular start.d and jetty.base property 2013-08-08 17:53:52 +10:00
Greg Wilkins 89acff6bdf Merge remote-tracking branch 'origin/master' into jetty-9.1 2013-08-08 11:06:14 +10:00
Greg Wilkins 95416bce76 413568 Made AJP worker name generic 2013-08-08 10:51:43 +10:00
Jan Bartel 7c292c1799 Merge remote-tracking branch 'origin/master' into jetty-9.1 2013-08-06 09:21:40 +10:00
Jan Bartel a900010f81 414235 RequestLogHandler configured on a context fails to handle forwarded requests 2013-08-06 09:14:28 +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
Jan Bartel 47a8809ec7 413018 ServletContext.addListener() should throw IllegalArgumentException if arg is not correct type of listener 2013-08-02 12:26:54 +10: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
Jesse McConnell 650e8e93ae [maven-release-plugin] prepare for next development iteration 2013-07-26 10:57:33 -05:00
Jesse McConnell e7e2fce56e [maven-release-plugin] prepare release jetty-7.6.12.v20130726 2013-07-26 10:57:26 -05:00
Thomas Becker fb04ee8fbd QueuedHttpInput fix javadoc 2013-07-26 17:38:47 +02:00
Thomas Becker b02535698a Double dispatch warning should be logged at debug level 2013-07-26 17:38:46 +02:00
Simone Bordet 9d571af7b0 Merged branch 'master' into 'jetty-9.1'. 2013-07-26 13:55:05 +02:00
Simone Bordet 5c7eb9e265 Reverted version to 7.6.12-SNAPSHOT. 2013-07-26 13:36:35 +02:00
Greg Wilkins c76de0b584 404468 Ported jetty-http-spi to Jetty-9 2013-07-26 11:40:12 +10:00
Jesse McConnell 49045558ef [maven-release-plugin] prepare for next development iteration 2013-07-25 14:07:12 -05:00
Jesse McConnell 9b888d5c22 [maven-release-plugin] prepare release jetty-7.6.12.v20130725 2013-07-25 14:06:53 -05: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 bc679809f8 [maven-release-plugin] prepare for next development iteration 2013-07-25 11:25:58 -05:00
Jesse McConnell 39ec9b8051 [maven-release-plugin] prepare release jetty-7.6.12.v20130725 2013-07-25 11:25:51 -05:00
Jan Bartel 1d77a139fd Merge remote-tracking branch 'origin/master' into jetty-9.1 2013-07-25 23:06:33 +10: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
Jesse McConnell 767dbe6778 [maven-release-plugin] prepare for next development iteration 2013-07-25 07:48:09 -05:00
Jesse McConnell cfa6076c4f [maven-release-plugin] prepare release jetty-7.6.11.v20130725 2013-07-25 07:48:02 -05:00
Jan Bartel 50a67eac6a Merge remote-tracking branch 'origin/jetty-8'
Conflicts:
	jetty-client/src/main/java/org/eclipse/jetty/client/HttpExchange.java
	jetty-client/src/test/java/org/eclipse/jetty/client/IdleTimeoutTest.java
	jetty-http/src/main/java/org/eclipse/jetty/http/HttpGenerator.java
2013-07-25 13:22:14 +10:00
Jan Bartel 72b077921d Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2013-07-25 11:26:35 +10:00
Greg Wilkins 2f08ba2948 413684 - Trailing slash shows JSP source
Fixed alias checkers.   Non existent directory does check for none existence.  Prefix and Suffix check look for none empty/trivial prefix/suffixes
2013-07-25 11:01:23 +10:00
Jan Bartel eb126ebaee Merge remote-tracking branch 'origin/master' into jetty-9.1 2013-07-24 16:38:39 +10:00
Jan Bartel e4a7203225 413486 SessionCookieConfig setters should throw IllegalStateException if called after context started 2013-07-24 16:32:21 +10:00
Jan Bartel 9f7de94f99 413486 SessionCookieConfig setters should throw IllegalStateException if called after context started 2013-07-24 15:14:54 +10:00
Greg Wilkins b8f7637e7d Merge remote-tracking branch 'origin/master' into jetty-9.1 2013-07-22 23:32:04 +10:00
Greg Wilkins e4ef8ee1f4 413154 ContextHandlerCollection defers virtual host handling to ContextHandler 2013-07-22 22:10:13 +10:00
Greg Wilkins 8e83b574a2 412935 setLocale is not an explicit set of character encoding 2013-07-19 14:33:53 +10:00
Greg Wilkins be00279e7e 413291 Avoid SPDY double dispatch
reduced warning to only when debug is on
2013-07-19 11:16:51 +10:00
Jan Bartel 48bedc3fd4 413020 Second call to HttpSession.invalidate() should throw exception
413019 HttpSession.getCreateTime() should throw exception after session is invalidated
2013-07-18 15:02:16 +10: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
Greg Wilkins bad2f113e5 412940 minor threadsafe fixes
better protect event and listeners
2013-07-15 17:48:50 +10:00
Greg Wilkins cbc0a114f4 412940 minor threadsafe fixes 2013-07-15 16:40:27 +10:00
Greg Wilkins 5d3760b17d simplified HttpInput lock design 2013-07-15 15:54:25 +10:00
Greg Wilkins 9f5f7e9ead 398467 Servlet 3.1 Non Blocking IO
fixed lock issue detected by Threadsafe from contemplateltd.com
2013-07-15 15:24:14 +10:00
Greg Wilkins 987aa846cc 398467 Servlet 3.1 Non Blocking IO
ensure that EOF is checked after all calls to nextContent
2013-07-15 14:28:22 +10:00
Greg Wilkins b2be8a5781 turned off debugging 2013-07-15 14:12:00 +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 3add75f135 398467 Servlet 3.1 Non Blocking IO
prevent fillInterest from HTTP after upgrade
2013-07-12 13:01:46 +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 56f2f9c93f Merge remote-tracking branch 'origin/master' into jetty-9.1 2013-07-11 15:20:43 +10:00
Greg Wilkins 7b162460d7 412608 EOF Chunk not sent on inputstream static content
removed debug.
cleaned up imports.
2013-07-11 15:17:08 +10:00
Greg Wilkins a65ca7b5cd Merge remote-tracking branch 'origin/master' into jetty-9.1 2013-07-11 14:45:16 +10:00
Greg Wilkins fdb9d22734 412608 EOF Chunk not sent on inputstream static content
Reworked loop to handle the case of a partial read before EOF
2013-07-11 14:41:46 +10:00
Jan Bartel fde47b1083 412637 ShutdownMonitorThread already started 2013-07-10 17:21:43 +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 83b55418f5 Merge remote-tracking branch 'origin/master' into jetty-9.1
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannel.java
	jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannelState.java
2013-07-08 13:58:35 +10:00
Greg Wilkins 4a49a5e3f0 398467 Servlet 3.1 Non Blocking IO
Handle bad listeners
2013-07-08 13:08:53 +10:00
Thomas Becker 2d911612a0 412318 HttpChannel fix multiple calls to _transport.completed() if handle() is called multiple times while the channel is COMPLETED 2013-07-05 12:02:52 +02:00
Thomas Becker 5d1225b60e Revert "Revert "412318 HttpChannel fix multiple calls to _transport.completed() if handle() is called multiple times while the channel is COMPLETED""
This reverts commit 474d9fec28.
2013-07-05 10:42:43 +02:00
Greg Wilkins 981102fda5 398467 Servlet 3.1 Non Blocking IO
Asynchronous reads working.
2013-07-05 18:11:09 +10:00
Greg Wilkins 474d9fec28 Revert "412318 HttpChannel fix multiple calls to _transport.completed() if handle() is called multiple times while the channel is COMPLETED"
This reverts commit cb2eb030d1.
2013-07-05 09:21:10 +10:00
Thomas Becker cb2eb030d1 412318 HttpChannel fix multiple calls to _transport.completed() if handle() is called multiple times while the channel is COMPLETED 2013-07-04 15:46:14 +02:00
Greg Wilkins 965918d8f2 Merge remote-tracking branch 'origin/master' into jetty-9.1 2013-07-04 17:28:57 +10:00
Greg Wilkins bce8eaabe0 Merge remote-tracking branch 'origin/jetty-8'
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/handler/RequestLogHandler.java
2013-07-04 17:28:22 +10:00
Greg Wilkins 606c042691 Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2013-07-04 15:52:39 +10:00
Greg Wilkins cb0084260f 411216 RequestLogHandler handles async completion 2013-07-04 15:22:56 +10:00
Greg Wilkins c33db24d94 Merge remote-tracking branch 'origin/jetty-8'
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/handler/RequestLogHandler.java
	jetty-servlets/src/test/java/org/eclipse/jetty/servlets/gzip/GzipTester.java
	tests/test-continuation/src/test/java/org/eclipse/jetty/continuation/ContinuationTest.java
2013-07-04 15:00:47 +10:00
Greg Wilkins 8d455056ec Merge remote-tracking branch 'origin/jetty-7' into jetty-8
Conflicts:
	test-continuation/src/test/java/org/eclipse/jetty/continuation/ContinuationTest.java
2013-07-04 14:40:45 +10:00
Greg Wilkins 7ad4d80af2 411216 RequestLogHandler handles async completion 2013-07-04 14:32:47 +10:00
Thomas Becker 8b31188ca7 405424 add X-Powered-By and Server header to SPDY 2013-07-01 21:57:22 +02:00
Greg Wilkins 32ec8255db 411538 Use Replacement character for bad parameter % encodings 2013-06-27 10:19:51 +10: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
Greg Wilkins 4d0a796f72 405424 X-Powered-By header 2013-06-24 17:09:44 +10:00
Greg Wilkins c0facf57f6 398467 simplified AbstractConnection fill interest handling 2013-06-24 14:36:22 +10:00
Greg Wilkins 068e67a8df Code cleanups for direct RequestDispatcher access 2013-06-24 13:13:03 +10:00
Greg Wilkins b2b2ce25fc Revert "Code cleanups for direct RequestDispatcher access"
This reverts commit 1ff665f76a.
2013-06-24 13:11:04 +10:00
Greg Wilkins 1ff665f76a Code cleanups for direct RequestDispatcher access 2013-06-24 13:00:21 +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 f9b4636cdb Merge remote-tracking branch 'origin/master' into jetty-9.1 2013-06-21 13:34:02 +10:00
Greg Wilkins 3cd59fe1b8 optimise out extra notify 2013-06-21 13:10:10 +10: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 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
Greg Wilkins d6d5c04273 410893 async support defaults to false for spec created servlets and filters 2013-06-17 14:47:55 +10:00
Jan Bartel 59889bc149 Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project 2013-06-17 13:17:14 +10:00
Jan Bartel 232eb4491a Merge remote-tracking branch 'origin/jetty-8'
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java
	jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletContextHandler.java
	jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java
	jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebAppContext.java
2013-06-17 13:13:59 +10:00
Jesse McConnell eddb49941d [Bug 408600] set correct jetty.url in all pom files 2013-06-12 15:52:36 -05:00
Thomas Becker f116d76290 410337 throw EofException instead of EOFException in HttpOutput.write() if HttpOutpyt is closed 2013-06-12 10:54:57 +02:00
Jan Bartel 64d979a780 409449 Ensure servlets, filters and listeners added via dynamic registration, annotations or descriptors are cleaned on context restarts 2013-06-12 15:41:03 +10:00
Thomas Becker 91f6170c40 remove debug logging 2013-06-11 16:26:27 +02:00
Thomas Becker beba00c5e0 410337 HttpOutput calls now HttpChannel.close() instead of closing the endPoint directly. That way the different implementations of HttpChannel can decide if the endPoint should be shutdown or not. 2013-06-11 16:17:15 +02:00
Greg Wilkins 6150f29382 Merge branch 'jetty-8' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-8 2013-06-11 15:50:29 +10:00
Greg Wilkins 2d661f18dd 410405 Avoid NPE for requestDispatcher(../)
Test double encoded dot dot
2013-06-11 15:30:40 +10:00
Greg Wilkins 2b1e6bf0de Merge remote-tracking branch 'origin/jetty-8'
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/AbstractHttpConnection.java
	jetty-server/src/main/java/org/eclipse/jetty/server/Request.java
	jetty-server/src/test/java/org/eclipse/jetty/server/HttpConnectionTest.java
2013-06-11 15:11:23 +10:00
Jan Bartel d967ee2c3a 408806 getParameter returns null on Multipart request if called before request.getPart()/getParts() 2013-06-11 14:45:41 +10:00
Greg Wilkins 9b8a78392c 410405 Avoid NPE for requestDispatcher(../)
Added extra tests for dotdot and encoded dotdot.
Also protected against dotdot in absolute URIs
2013-06-11 14:44:26 +10:00
Greg Wilkins ed04753111 410405 Avoid NPE for requestDispatcher(../) 2013-06-11 14:22:54 +10:00
Greg Wilkins d660cfcff6 Merge remote-tracking branch 'origin/master' into servlet-3.1-api
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannelState.java
	tests/test-continuation/src/test/java/org/eclipse/jetty/continuation/ContinuationBase.java
2013-06-11 11:17:04 +10:00
Greg Wilkins 3de2ba33f1 fixed merge 2013-06-11 10:52:15 +10:00
Greg Wilkins 5d17bdcc27 fixed double dispatch in continuation tests 2013-06-11 10:50:15 +10:00
Simone Bordet 27bc0b9d73 405188 - HTTP 1.0 with GET returns internal IP address.
Introduced HostHeaderCustomizer.
2013-06-10 10:29:05 +02: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
Thomas Becker 82b73c065f 409953 return buffer.slice() instead of buffer.asReadOnlyBuffer() in ResourceCache to avoid using inefficent path in BufferUtil.writeTo 2013-06-06 14:09:27 +02:00
Thomas Becker b274fdb0d6 409403 fix IllegalStateException when SPDY is used and the response is written through BufferUtil.writeTo byte by byte 2013-06-05 15:31:24 +02:00
Simone Bordet e65e4e168d 409842 - Suspended request completed by a request thread does not set read interest.
HttpConnection.completed() now performs the right check about the current connection.
2013-06-05 11:34:12 +02:00
Greg Wilkins bacff75b31 Replace reponse.commit with response.closeOutput 2013-06-04 10:51:49 +10:00