Commit Graph

2129 Commits

Author SHA1 Message Date
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
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 41ac4a0877 Merge remote-tracking branch 'origin/master' into servlet-3.1-api 2013-05-31 18:46:10 +10:00
Greg Wilkins 0e11c82307 fixed merge 2013-05-31 18:07:01 +10:00
Greg Wilkins 842309e656 Merge remote-tracking branch 'origin/jetty-8'
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/Response.java
	jetty-server/src/test/java/org/eclipse/jetty/server/ResponseTest.java
	jetty-servlets/src/test/java/org/eclipse/jetty/servlets/gzip/GzipTester.java
2013-05-31 18:06:34 +10:00
Greg Wilkins 3849c893e1 Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2013-05-31 11:07:40 +10:00
Greg Wilkins 3094f93ed9 408642 setContentType from addHeader 2013-05-31 11:06:33 +10:00
Greg Wilkins b9014f29dc fixed bad merge 2013-05-31 10:01:13 +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
Greg Wilkins 76457d4807 409441 jetty.xml threadpool arg injection
Do not use arg injection for ThreadPool
2013-05-30 11:59:36 +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 c961d65697 398467 Servlet 3.1 Non Blocking IO
completed removal of HttpOutput.closeIfAllContentWritten
2013-05-30 09:09:47 +10:00
Greg Wilkins 579f8994ca 398467 Servlet 3.1 Non Blocking IO
continue after double dispatch with just a logged error
2013-05-29 09:37:43 +10:00
Greg Wilkins ddd187882f 398467 Servlet 3.1 Non Blocking IO
removed experiment input handling
2013-05-28 23:30:49 +10:00
Greg Wilkins ce662c7ddc 398467 Servlet 3.1 Non Blocking IO
cleaned up test harness
2013-05-28 23:29:38 +10:00
Greg Wilkins f03bc398f8 398467 Servlet 3.1 Non Blocking IO
Looking at async input
2013-05-28 23:28:07 +10:00
Greg Wilkins 942f8a5c40 Merge remote-tracking branch 'origin/master' into servlet-3.1-api
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java
2013-05-28 22:51:31 +10:00
Greg Wilkins 6f0195e0de 398467 Servlet 3.1 Non Blocking IO
Fixed handling of empty writes
fixed double close sendContent
2013-05-28 22:46:16 +10:00
Greg Wilkins 288a452881 398467 Servlet 3.1 Non Blocking IO
some cleanup/fixes of SPDY tests.  More work needed
2013-05-25 17:07:30 +10:00
Greg Wilkins c7be106423 398467 Servlet 3.1 Non Blocking IO
Working async writes after HttpChannelState refactor
2013-05-25 15:45:16 +10:00
Greg Wilkins 94d1f4a020 398467 Servlet 3.1 Non Blocking IO
Check point progress as I dispair at the insane complexity of servlet 3.1 specification
2013-05-24 14:34:27 +10:00
Greg Wilkins 6f8ed5e809 398467 Servlet 3.1 Non Blocking IO
Refactored HttpChannel to be ready to control onWritePossible callbacks
2013-05-23 17:34:28 +10:00
Jan Bartel db2615ab29 408723 Jetty Maven plugin reload ignores web.xml listeners 2013-05-23 17:28: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
Greg Wilkins 79486b5949 408720 NPE in AsyncContext.getRequest()
Do not null the _event during the complete method
2013-05-23 09:48:06 +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 cf71e9559b Merge remote-tracking branch 'origin/master' into servlet-3.1-api 2013-05-17 17:19:54 +10:00
Jan Bartel b6d1158c22 408167 JDBCSessionManager don't mark session as dirty if same attribute value set 2013-05-17 17:18:54 +10:00
Greg Wilkins d703319c87 398467 Servlet 3.1 Non Blocking IO
simplified write
2013-05-17 16:35:58 +10:00
Greg Wilkins 5397f16559 Merge remote-tracking branch 'origin/master' into servlet-3.1-api
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java
2013-05-17 14:09:17 +10:00
Greg Wilkins 8a6ab9ab9d 408117 isAsyncStarted is false on redispatch 2013-05-17 11:41:22 +10:00
Greg Wilkins b22d280e2a 398467 Servlet 3.1 Non Blocking IO
Cleaned up exceptions and HttpOutput.write
2013-05-16 19:00:00 +10:00
Jan Bartel 67a1b2a18f Merge remote-tracking branch 'origin/jetty-8'
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/session/HashSessionManager.java
	jetty-server/src/main/java/org/eclipse/jetty/server/session/HashedSession.java
2013-05-16 16:06:41 +10:00
Jan Bartel 427c59e2f2 Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2013-05-16 15:47:22 +10:00
Jan Bartel 51c1017b3d 408077 HashSessionManager leaves file handles open after being stopped 2013-05-16 15:39:50 +10:00
Greg Wilkins 01768562ca 398467 Servlet 3.1 Non Blocking IO
fixed ResourceHandler
2013-05-16 14:27:32 +10:00
Jan Bartel 76b767fc22 Merge remote-tracking branch 'origin/jetty-8'
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/session/JDBCSessionIdManager.java
2013-05-16 12:33:08 +10:00
Jan Bartel 4a562f8d89 Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2013-05-16 12:25:19 +10:00
Jan Bartel 8a1ea2f69c 407976 JDBCSessionIdManager potentially leaves server in bad state after startup 2013-05-16 12:18:04 +10:00
Greg Wilkins 76d4859eda 398467 Servlet 3.1 Non Blocking IO
Improved sendContent API and javadoc. Added FastFileServer example
2013-05-16 09:26:37 +10: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 c03cb95e8a removed debug prints 2013-05-14 17:57:52 +10:00
Greg Wilkins 4dd80e9128 398467 Servlet 3.1 Non Blocking IO
More refinements to avoid duplicate code and optimise common paths
2013-05-14 17:52:46 +10:00
Greg Wilkins 0116f45ff0 398467 Servlet 3.1 Non Blocking IO
Asynchronous default servlet
2013-05-14 10:09:09 +10:00
Greg Wilkins 9f3e4dc5b7 398467 Servlet 3.1 Non Blocking IO
Added callbacks to HttpOutput
2013-05-14 10:09:09 +10:00
Jan Bartel 73bee3af4b 407708 - HttpUpgradeHandler must support injection 2013-05-13 17:47:53 +10:00
Greg Wilkins fe582e544a 398467 Non Blocking IO
Working towards 3.1 by exposing more of the underlying async IO operations.
added async support to write in HttpChannel
2013-05-10 20:11:19 +10:00
Greg Wilkins ccc7a71c74 398467 Non Blocking IO
Working towards 3.1 by exposing more of the underlying async IO operations.
2013-05-10 19:45:32 +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
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 b182f09b2c 405944 Check annotation and resource injection is supported for AsyncListener 2013-05-06 16:32:38 +10:00
Jan Bartel 8d0cf5e949 Merge remote-tracking branch 'origin/master' into servlet-3.1-api 2013-05-06 14:46:28 +10:00
Jan Bartel e7564c9dcd Merge remote-tracking branch 'origin/jetty-8' 2013-05-06 13:30:53 +10:00
Jan Bartel 488c1755e0 Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2013-05-06 13:22:26 +10:00
Greg Wilkins 9ec10734e5 fixed warn output 2013-05-06 13:04:39 +10:00
Jan Bartel f10a1d709b 407173 java.lang.IllegalStateException: null when using JDBCSessionManager 2013-05-06 12:24:53 +10:00
Greg Wilkins 11dccd7677 reduced test output 2013-05-06 11:43:37 +10:00
Greg Wilkins 98d260dd92 407075 Do not dispatch from complete
Call HttpChannel.handle directly from thread calling complete
2013-05-06 11:14:53 +10:00
Greg Wilkins 215f3f1f56 406617 Spin in Request.recycle
Improved output in warning
2013-05-06 09:40:49 +10:00
Simone Bordet fe1b71f4a0 Reduced build logging for Travis. 2013-05-04 00:26:29 +02:00
Simone Bordet c4ad43d0cd Removed ugly code that does not seem to be any useful. 2013-05-03 19:50:13 +02:00
Greg Wilkins cb952931d5 connection events in debughandler 2013-05-03 18:54:50 +10:00
Jan Bartel f544d6e701 405422 Implement servlet3.1 spec sections 4.4.3 and 8.1.4 for new HttpSessionIdListener class 2013-05-03 18:27:51 +10: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
Simone Bordet 827a7f48b8 Made the test more robust. 2013-05-02 18:50:24 +02:00
Greg Wilkins 0b15aa5a76 406617 Spin in Request.recylce
Some more cleanups of the loops
2013-05-02 20:02:29 +10:00
Jan Bartel 348cbc2173 405435 Implement servlet3.1 section 13.6.3 for 303 redirects for Form auth 2013-05-02 17:34:06 +10:00
Greg Wilkins 22b0098be7 406617 Spin in Request.recylce
removed loop from read, so only a single attempt a blocking for content.
2013-05-02 12:57:48 +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
Jan Bartel b99a04c674 406962 Improve attribute names in Request 2013-05-01 17:53:33 +10:00
Greg Wilkins 7590ad6795 406390 406617 removed tiny race from handling of suspend and complete 2013-05-01 09:14:26 +10:00
Greg Wilkins e26d8e67e5 406861 Fixed IPv6 redirect 2013-04-30 18:49:29 +10:00
Greg Wilkins 4e62b953e1 406861 Fixed IPv6 redirect 2013-04-30 16:00:17 +10:00
Greg Wilkins e781393258 406768 Improved handling of static content resources 2013-04-30 15:52:11 +10:00
Greg Wilkins 68b9115e07 406768 Close inputstream and channels for 0 length resources 2013-04-30 14:24:05 +10:00
Greg Wilkins 7ce709519a 405327 Merge branch jetty-9-modularstart 2013-04-29 15:44:56 +10:00
Greg Wilkins e5967344a9 406202 re-enabled connector statistics 2013-04-29 15:11:45 +10:00
Greg Wilkins 89da7623dc Merge remote-tracking branch 'origin/master' into jetty-9-modularstart 2013-04-29 14:03:16 +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 9558d7e815 modular start.ini files and --download start option 2013-04-26 13:53:28 +10:00
Jan Bartel 2360f5dcd5 Merge remote-tracking branch 'origin/master' into servlet-3.1-api
Conflicts:
	jetty-security/src/main/java/org/eclipse/jetty/security/ConstraintSecurityHandler.java
2013-04-23 15:08:56 +10:00
Greg Wilkins 0f7d6547fe 405530 Wrap AsyncContext to throw ISE after complete 2013-04-23 14:13:58 +10:00
Greg Wilkins 03fd068ebc Merge remote-tracking branch 'origin/jetty-8'
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/ResourceCache.java
2013-04-22 14:20:03 +10:00
Greg Wilkins db48bce49d Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2013-04-22 14:15:51 +10:00
Greg Wilkins 3c498f0a2c 405281 allow filemappedbuffers to not be used 2013-04-22 14:15:14 +10:00
Greg Wilkins a275c8fb37 Merge branch 'master' into servlet-3.1-api 2013-04-22 12:10:13 +10:00
Greg Wilkins c3325e8b04 405530 Wrap AsyncContext to throw ISE after complete 2013-04-22 11:33:44 +10:00
Greg Wilkins a7073d05a6 updated version to 9.1.0-SNAPSHOT 2013-04-19 13:59:18 +10:00
Greg Wilkins f9f2a2c405 Merge remote-tracking branch 'origin/master' into servlet-3.1-api 2013-04-19 13:56:34 +10:00
Greg Wilkins 22c3151ad6 added some more properties to the configuration 2013-04-18 17:05:03 +10:00
Jan Bartel d34bd7aec7 Merge remote-tracking branch 'origin/master' into servlet-3.1-api 2013-04-18 12:16:24 +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
Jan Bartel db21b42b4f Update to newer 3.1 api jar published by oracle (3.1-b08 - note DOES NOT contain xsds and dtds). 2013-04-15 17:44:35 +10:00
Greg Wilkins a03a5c340b 405540 ServletContextListeners call in reverse in doStop 2013-04-15 14:31:41 +10:00
Greg Wilkins 4e3c7367af virtual host example 2013-04-15 12:29:08 +10:00
Simone Bordet de7adaf0d2 Reverted usages of ConcurrentArrayBlockingQueue until proven it's correctly implemented. 2013-04-12 13:58:31 +02:00
Jan Bartel 07b844bf85 Merge remote-tracking branch 'origin/master' into servlet-3.1-api 2013-04-11 15:55:04 +10:00
Greg Wilkins 9bb0260410 improved shutdown handling for travis CI 2013-04-11 12:01:01 +10:00
Greg Wilkins 4c04f5dd40 403591 do not use the ConcurrentArrayBlockingQueue for thread pool, selector and async request log 2013-04-11 11:46:07 +10:00
Greg Wilkins e8d9625dcc adjust tests to make them more travis CI compatible 2013-04-11 08:33:28 +10: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 44ec0b3f49 403360 Named connectors 2013-04-08 09:25:54 +10:00
Greg Wilkins 5d451e5fec Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project 2013-04-05 08:31:48 +11:00
Greg Wilkins 1191142c97 Merge remote-tracking branch 'origin/jetty-8'
Conflicts:
	jetty-io/src/main/java/org/eclipse/jetty/io/nio/SelectChannelEndPoint.java
	jetty-servlet/src/main/java/org/eclipse/jetty/servlet/DefaultServlet.java
2013-04-05 08:31:31 +11:00
Simone Bordet 72219d016b 404610 - Reintroduce ability to disallow TLS renegotiation. 2013-04-04 17:11:01 +02:00
Greg Wilkins e9185aa062 Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2013-04-04 16:09:19 +11:00
Greg Wilkins 3cd6d90e9f removed verbose output 2013-04-04 15:38:15 +11:00
Jan Bartel 7523c5234c Merge remote-tracking branch 'origin/master' into servlet-3.1-api
Conflicts:
	jetty-jsp/pom.xml
2013-04-04 13:31:33 +11:00
Simone Bordet b312fffd7e 402666 - Improve handling of TLS exceptions due to raw socket close. 2013-03-29 16:57:05 +01:00
Greg Wilkins 5b3d866a27 Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project 2013-03-28 16:03:34 +11:00
Greg Wilkins 7db1b36be9 Merge remote-tracking branch 'origin/jetty-8'
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/AbstractHttpConnection.java
	jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SslBytesServerTest.java
2013-03-28 15:04:42 +11:00
Jan Bartel af5f8aac33 403122 Session replication fails with ClassNotFoundException when session attribute is Java dynamic proxy 2013-03-28 15:02:33 +11:00
Greg Wilkins 1f9e4f3e5c Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2013-03-28 14:05:24 +11:00
Greg Wilkins 72162c0342 404517 Close connection if request received after half close 2013-03-28 14:04:24 +11:00
Greg Wilkins fd099aa77d 404511 Replaced all StringMap usage with Tries 2013-03-28 13:20:47 +11:00
Jan Bartel 370df6e723 404036 JDBCSessionIdManager.doStart() method should not call cleanExpiredSessions() because Listeners can't be notified 2013-03-26 23:45:28 +11:00
Greg Wilkins 108a8e9dca 404326 set status when Request.setHandled(true) is called 2013-03-26 23:36:31 +11:00
Greg Wilkins 8c405f4503 404323 Improved parameterization of https and SPDY 2013-03-26 16:29:48 +11:00
Greg Wilkins 9079bae9c0 404323 Improved parameterization of https and SPDY 2013-03-26 13:38:28 +11:00
Greg Wilkins 6c9f090479 removed System.outs 2013-03-22 11:34:11 +11:00
Jan Bartel bcdf071a9c 404067 If cannot connect to db fail startup of JDBCSessionIdManager 2013-03-22 10:00:05 +11:00
Jan Bartel 7c2321b9d4 403510 HttpSession maxInactiveInterval is not serialized in HashSession 2013-03-21 12:23:52 +11:00
Greg Wilkins b2f3a05503 403591 do not use the ConcurrentArrayBlockingQueue for thread pool, selector and async request log 2013-03-21 09:24:02 +11:00
Joakim Erdfelt bb7a1d4ca6 396562 - Add an implementation of RequestLog that supports Slf4j 2013-03-20 13:17:14 -07:00
Joakim Erdfelt a4d3740900 Merge branch 'jetty-8' -> 'master' 2013-03-18 12:34:57 -07:00
Jan Bartel 279dff381c Merge remote-tracking branch 'origin/master' into servlet-3.1-api
Conflicts:
	jetty-osgi/pom.xml
	jetty-server/src/main/java/org/eclipse/jetty/server/Response.java
	jetty-servlets/pom.xml
	tests/test-webapps/test-jetty-webapp/pom.xml
2013-03-18 16:00:23 +11:00
Greg Wilkins 8514e8452b 403591 use the ConcurrentArrayBlockingQueue for thread pool, selector and async request log 2013-03-18 15:37:00 +11:00
Jan Bartel b69b52d984 Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2013-03-18 15:27:10 +11:00
Jan Bartel 25f5e38e13 403513 jetty:run goal cannot be executed twice during the maven build 2013-03-18 14:33:49 +11:00
Greg Wilkins 5f1980f408 merged unsafe blocking Q, removed unsafe usage and usage of Q 2013-03-18 13:27:37 +11:00
Greg Wilkins ba9d70589a Merge branch 'master' into unsafe 2013-03-18 12:02:37 +11:00
Greg Wilkins 47bf3eef0c use async request log by default 2013-03-18 11:09:50 +11:00
Greg Wilkins e8d76ef12c Merge remote-tracking branch 'origin/jetty-8'
Conflicts:
	examples/embedded/src/main/java/org/eclipse/jetty/embedded/SpdyServer.java
	jetty-client/src/test/java/org/eclipse/jetty/client/HttpExchangeTest.java
	jetty-io/src/test/java/org/eclipse/jetty/io/ThreadLocalBuffersTest.java
	jetty-server/src/main/config/etc/jetty-requestlog.xml
	jetty-server/src/test/java/org/eclipse/jetty/server/AsyncStressTest.java
	jetty-server/src/test/java/org/eclipse/jetty/server/HttpServerTestFixture.java
	jetty-server/src/test/java/org/eclipse/jetty/server/StressTest.java
	jetty-servlets/pom.xml
2013-03-18 11:09:13 +11:00
Greg Wilkins d21c8e5ca4 Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2013-03-18 10:53:14 +11:00
Greg Wilkins 63f2719938 403570 Asynchronous Request Logging 2013-03-18 10:48:06 +11:00
Jan Bartel b15f9340d0 Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2013-03-15 14:40:19 +11:00
Jan Bartel 41feea7e01 402844 STOP.PORT & STOP.KEY behaviour has changed 2013-03-15 14:38:53 +11:00
Greg Wilkins c577783fa6 inject new Q into ThreadPool 2013-03-15 12:30:49 +11:00
Joakim Erdfelt 8a96cc8c4a Merge branch 'jetty-7' into jetty-8 2013-03-14 16:54:35 -07:00
Joakim Erdfelt 5084a1430f Fixing build.
+ Bumping jetty-test-helper to 2.0
 + Bumping jetty-version-maven-plugin to 1.0.10
 + Fixing JDK 1.5 build warts
 + Updating Stress use for new "test.stress" property introduced by upgrades
2013-03-14 16:52:52 -07:00
Thomas Becker 93efdcf080 384552 add comment to jetty-https.xml describing keymanager password 2013-03-14 11:23:55 +01:00
Greg Wilkins 29b83dff9b 402626 Do not required endpoint host checking by default 2013-03-14 09:25:28 +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
Jan Bartel 0834ad259c 402706 HttpSession.setMaxInactiveInterval(int) does not change JDBCSession expiry 2013-03-11 19:31:39 +11:00
Greg Wilkins 11442814fa Merge remote-tracking branch 'origin/jetty-8'
Conflicts:
	jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java
2013-03-11 17:23:54 +11:00
Joakim Erdfelt bbf44a5d32 Merge branch 'release-9' 2013-03-09 06:16:25 -07: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
Jan Bartel f1cd726ba2 Merge remote-tracking branch 'origin/jetty-8' 2013-03-08 14:27:24 +11:00
Jan Bartel 9055132144 Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2013-03-08 13:45:56 +11:00
Jan Bartel 57cff606fd 400144 When loading a session fails the JDBCSessionManger produces duplicate session IDs 2013-03-08 13:33:48 +11: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
Greg Wilkins b7aded6e55 392129 fixed merged of handling of timeouts after startAsync 2013-03-08 11:22:07 +11:00
Greg Wilkins ae7248b6d2 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/AsyncContinuation.java
	jetty-server/src/main/java/org/eclipse/jetty/server/Request.java
	jetty-servlets/src/test/java/org/eclipse/jetty/servlets/AbstractDoSFilterTest.java
2013-03-08 11:21:05 +11:00
Greg Wilkins face3b3584 392129 fixed handling of timeouts after startAsync 2013-03-08 09:35:08 +11:00
Jan Bartel f714504acc Merge remote-tracking branch 'origin/jetty-8'
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/session/JDBCSessionManager.java
2013-03-07 12:56:42 +11:00
Jan Bartel 621b1489e1 Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2013-03-07 12:17:20 +11:00
Jan Bartel a636fbfe7b 400142 ConcurrentModificationException in JDBC SessionManger
As part of this fix, refactored the JDBCSession to remove the SessionData object.
2013-03-07 12:02:27 +11:00
Greg Wilkins e283d72f25 Merge remote-tracking branch 'origin/jetty-8'
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/session/AbstractSessionIdManager.java
2013-03-07 09:09:23 +11:00
Greg Wilkins 60a6340f8f Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2013-03-07 08:36:23 +11:00
Greg Wilkins 1e0b9d4d97 402485 reseed secure random 2013-03-07 08:34:42 +11: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 0f415a735a 399799 do not hold lock while calling invalidation listeners 2013-03-05 17:05:50 +11:00
Greg Wilkins 0c941a878d Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2013-03-05 14:42:55 +11:00
Greg Wilkins 777817dd0f 399799 do not hold lock while calling invalidation listeners 2013-03-05 14:32:17 +11:00
Greg Wilkins 3bc0411e65 401904 fixed getRemoteAddr to return IP instead of hostname 2013-03-04 17:10:27 +11:00
Greg Wilkins 8933a8bdca less verbose exception 2013-03-04 16:22:03 +11:00
Greg Wilkins 7d7769475c removed printStackTrace 2013-03-04 15:44:30 +11:00
Greg Wilkins 663b45770a Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project 2013-03-02 12:56:06 +11:00
Jan Bartel afbf98bd88 Merge remote-tracking branch 'origin/jetty-8' 2013-03-02 10:29:15 +11:00
Jan Bartel 3ed3dfc7a1 402048 org.eclipse.jetty.server.ShutdownMonitor doesn't stop after the jetty server is stopped 2013-03-02 10:12:24 +11:00
Greg Wilkins 6478306812 Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project
Conflicts:
	jetty-server/src/main/config/etc/jetty.xml
2013-03-02 09:32:57 +11:00
Simone Bordet e6fed09129 402075 - Massive old gen growth when hit by lots of non persistent connections.
Replaced usages of TimerScheduler with ScheduledExecutorScheduler.
2013-03-01 15:19:51 +01:00
Greg Wilkins 41952ebf1d 402075 Dont allocate the parser trie unless needed 2013-03-01 22:16:54 +11:00
Jan Bartel bf154404fe 402048 org.eclipse.jetty.server.ShutdownMonitor thread doesn't stop after the jetty server is stopped 2013-03-01 19:58:44 +11:00
Jan Bartel 90b5ea2c5e Merge remote-tracking branch 'origin/jetty-8'
Conflicts:
	jetty-annotations/src/main/java/org/eclipse/jetty/annotations/ServletContainerInitializerListener.java
	jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java
2013-03-01 19:08:09 +11:00
Jan Bartel caa0199efe 400312 ServletContextListener.contextInitialized() is not called when added in ServletContainerInitializer.onStartup 2013-03-01 18:09:19 +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
Greg Wilkins 859710c2c5 401643 Improved Authentication exception messages and provided quiet servlet exception 2013-02-25 13:59:56 +11:00
Greg Wilkins 6d850146fb jetty-9 fixed error from doco change 2013-02-24 09:27:05 +11:00
Greg Wilkins 0671514e34 jetty-9 fixed error from doco change 2013-02-24 09:15:40 +11:00
Greg Wilkins 999db7f4d8 refined jetty embedded examples 2013-02-22 16:19:06 +11:00
Greg Wilkins c302a404cd refined jetty embedded examples 2013-02-22 15:51:17 +11:00
Greg Wilkins b82a781113 400864 Added LowResourcesMonitor 2013-02-18 20:03:36 +11:00
Joakim Erdfelt f15d4c0376 400738 - ResourceHandler doesn't support range requests
+ Adding testcase to replicate issue.
2013-02-13 14:27:26 -07:00
Simone Bordet 6d0f233c80 362854 - Continuation implementations may deadlock.
HttpChannelState was already notifying listeners from outside synchronized blocks,
apart one case, in expired().
Also taken the chance to cleanup the class from warnings.
2013-02-13 16:00:40 +01:00
Simone Bordet ef81982579 400631 - Calling flush() on HttpServletResponse.getOutputStream() after last byte of body causes EofException.
Now flush() is a no-operation if the stream is already closed, consistently with previous Jetty versions.
2013-02-13 12:03:31 +01:00
Jesse McConnell e09d401fd2 add configuration option to not send server version 2013-02-12 10:08:56 -06: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
Simone Bordet 209d5bc12f 399721 - Change <Ref id= ...> to <Ref refid= ...> 2013-02-01 13:03:11 +01: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
Jan Bartel 9194fe1b7b 399566 Running org.eclipse.jetty.server.session.MaxInactiveMigrationTest produces stack trace 2013-01-31 15:42:27 +11:00
Greg Wilkins b132663c2b jetty-9 made WebAppContext configuration additive 2013-01-31 12:21:04 +11:00
Jesse McConnell 3b6cab63e2 Merge branch 'jetty-7' into jetty-8 2013-01-29 13:42:29 -06:00
Jesse McConnell a086451bc7 [Bug 393933] remove deprecated classes/methods and consolidate some static methods to SslContextFactory 2013-01-28 16:15:34 -06:00
Thomas Becker 988206c36a 393968 fix typo in javadoc 2013-01-28 16:11:33 +01:00
Jesse McConnell 2cbb630f8e Merge branch 'jetty-8' 2013-01-25 16:53:46 -06:00
Jesse McConnell f16fc7e7b7 Merge branch 'jetty-7' into jetty-8 2013-01-25 16:53:18 -06:00
Jesse McConnell 1a31067369 Add note about getCanonicalFile check and fix IdleSession test in test hash sessions 2013-01-25 16:25:59 -06:00
Jesse McConnell b3043276bc add corresponding correct file removal check 2013-01-25 16:12:08 -06:00
Jesse McConnell a7c074a86c merge from jetty-8 2013-01-25 15:32:08 -06:00
Jesse McConnell 4bed164462 Merge branch 'jetty-7' into jetty-8 2013-01-25 15:31:13 -06:00
Jesse McConnell 111bd19634 doh, header 2013-01-25 15:30:59 -06:00
Jesse McConnell d8a3b76862 Merge branch 'jetty-7' into jetty-8 2013-01-25 15:24:41 -06:00
Jesse McConnell d4568feba6 [Bug 399132] check parent dir of session store against file to be removed 2013-01-25 15:22:16 -06:00
Greg Wilkins 5435cd3365 385306 added getURI method 2013-01-25 13:52:32 +11:00
Greg Wilkins ff350c3740 Merge remote-tracking branch 'origin/jetty-8'
Conflicts:
	jetty-client/src/main/java/org/eclipse/jetty/client/BlockingHttpConnection.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/test/java/org/eclipse/jetty/servlets/gzip/GzipTester.java
2013-01-25 11:46:03 +11:00
Greg Wilkins 3c6deaf83c Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2013-01-25 09:43:57 +11:00
Greg Wilkins c9d026703f removed System.outs 2013-01-25 09:42:51 +11: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
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 3a0291929c removed some TODOs 2013-01-11 23:53:26 +11:00
Greg Wilkins 27c31fb403 jetty-9 organised imports. Cleaned up some TODOs 2013-01-11 16:37:32 +11:00
Greg Wilkins e6d3397c1c jetty-9 removed alias option 2013-01-11 08:50:09 +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 3efcc2af41 Merge remote-tracking branch 'origin/jetty-8'
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/Request.java
	jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java
	jetty-servlet/src/main/java/org/eclipse/jetty/servlet/DefaultServlet.java
	jetty-servlets/src/main/java/org/eclipse/jetty/servlets/GzipFilter.java
2013-01-10 16:24:41 +11:00
Greg Wilkins 3cba027390 Merge remote-tracking branch 'origin/jetty-7' into jetty-8
Conflicts:
	jetty-server/src/test/java/org/eclipse/jetty/server/handler/ContextHandlerAliasTest.java
2013-01-08 09:13:39 +11:00
Greg Wilkins 64ed66db8b Remove test needing java 7 2013-01-08 09:12:08 +11:00
Joakim Erdfelt 83aa65415b Fixing for JDK 6 2013-01-07 09:37:13 -07:00
Greg Wilkins 2aab780eba Merge remote-tracking branch 'origin/jetty-7' into jetty-8
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java
	tests/test-integration/src/test/java/org/eclipse/jetty/test/jsp/JspMatchingTest.java
2013-01-07 23:45:38 +11:00
Jan Bartel 96fd7dc562 Merge branch 'jetty-7' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-7 2013-01-07 20:12:49 +11:00
Jan Bartel 3265c334cb 397130 maxFormContentSize set in jetty.xml is ignored 2013-01-07 20:10:54 +11:00
Greg Wilkins ccda9bb10b 397535 Support pluggable alias checking to support symbolic links 2013-01-07 19:57:52 +11:00
Joakim Erdfelt 4037e6111f 395885 - ResourceCache should honor useFileMappedBuffer if set 2013-01-02 14:47:02 -07: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
Jan Bartel 346918577f Merge remote-tracking branch 'origin/jetty-8'
Conflicts:
	jetty-client/src/main/java/org/eclipse/jetty/client/AsyncHttpConnection.java
	jetty-server/src/main/java/org/eclipse/jetty/server/AbstractHttpConnection.java
	jetty-server/src/main/java/org/eclipse/jetty/server/Server.java
	jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java
	jetty-servlets/src/main/java/org/eclipse/jetty/servlets/MultiPartFilter.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-webapp/src/test/java/org/eclipse/jetty/webapp/WebAppContextTest.java
	test-jetty-servlet/src/main/java/org/eclipse/jetty/testing/ServletTester.java
	test-jetty-webapp/src/main/java/com/acme/CookieDump.java
	test-jetty-webapp/src/main/java/com/acme/HelloWorld.java
2012-12-22 15:12:17 +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
Jan Bartel 191040b736 Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2012-12-21 14:00:13 +11:00
Jan Bartel 32e1d0f29c Merge remote-tracking branch 'origin/jetty-7' into jetty-8
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/Server.java
	jetty-servlets/src/main/java/org/eclipse/jetty/servlets/MultiPartFilter.java
	jetty-servlets/src/test/java/org/eclipse/jetty/servlets/MultipartFilterTest.java
2012-12-21 13:00:14 +11:00
Joakim Erdfelt 5e4711fdb0 Fixing confusing output 2012-12-20 17:32:34 -07:00
Joakim Erdfelt a371a8963d Fixing NPE 2012-12-20 17:30:46 -07:00
Joakim Erdfelt b65973afdd Bug 391623 - Add option to --stop to wait for target jetty to stop
* Reworked ShutdownMonitor to better support multiple servers +
  jetty-maven-plugin requirements.
2012-12-20 15:32:36 -07:00
Joakim Erdfelt 69b9856998 Squashing JMX warnings on jetty startup 2012-12-19 13:50:51 -07:00
Joakim Erdfelt a5c1ced201 Merge branch 'jetty-7' into jetty-7-graceful-stop 2012-12-19 12:40:46 -07: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 3ce8c2ba58 jetty-9 recycle response print writers 2012-12-17 16:02:06 +11:00
Jan Bartel 2966192aa4 395794 NullPointerException in when requesting a file without extension 2012-12-17 13:58:39 +11:00
Greg Wilkins c87ebcb4a5 jetty-9 avoid additional dispatch for pipelined requests to optimize pipeline handling 2012-12-17 11:35:26 +11:00
Greg Wilkins ecf7563a79 jetty-9 use direct buffers for generated headers 2012-12-14 14:07:42 +11:00