Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
7,453 Commits 63 Branches 460 Tags 368 MiB
Commit Graph

1833 Commits

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