Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
8,994 Commits 68 Branches 465 Tags 359 MiB
Commit Graph

828 Commits

Author SHA1 Message Date
Mikhail Mazursky 6b0269a16d [Bug 420930] Use Charset to specify character encoding 
Signed-off-by: Mikhail Mazursky <mikhail.mazursky@gmail.com>
 2013-11-02 14:44:36 +06:00
Greg Wilkins 852be79a3c Merge remote-tracking branch 'origin/master' into jetty-9.1 
Conflicts:
	jetty-server/src/test/java/org/eclipse/jetty/server/HttpConnectionTest.java
	jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java
 2013-11-01 14:45:16 +11:00
Greg Wilkins 56fcfa45fb 420844 Connection:close on exceptional errors 2013-11-01 13:37:44 +11:00
Greg Wilkins 37ea88d299 fixed bad merge 2013-11-01 08:09:26 +11:00
Greg Wilkins c64dad6066 Merge remote-tracking branch 'origin/master' into jetty-9.1 
Conflicts:
	jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java
 2013-10-31 14:40:54 +11:00
Greg Wilkins 466725e343 420776 complete error pages after startAsync 
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/AbstractHttpConnection.java
	jetty-servlet/src/test/java/org/eclipse/jetty/servlet/AsyncContextTest.java
 2013-10-31 14:16:34 +11:00
Greg Wilkins d6e301d7fd Merge remote-tracking branch 'origin/master' into jetty-9.1 2013-10-24 16:02:35 +11:00
Greg Wilkins ac3787b167 420033 AsyncContext.onTimeout exceptions passed to onError 
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/AbstractHttpConnection.java
	jetty-server/src/main/java/org/eclipse/jetty/server/AsyncContinuation.java
	jetty-servlet/src/test/java/org/eclipse/jetty/servlet/AsyncContextTest.java
 2013-10-24 15:33:08 +11:00
Greg Wilkins 353357e816 Merge remote-tracking branch 'origin/master' into jetty-9.1 2013-10-23 11:28:55 +11:00
Greg Wilkins 55b279cc3d 420048 - DefaultServlet alias checks configured resourceBase 
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java
 2013-10-23 08:00:30 +11:00
Greg Wilkins ffffd3938c fixed merge 2013-10-21 14:56:23 +11:00
Joakim Erdfelt d6d54e048b Merge branch 'master' into jetty-9.1 
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannel.java
	jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ErrorPageErrorHandler.java
	jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/io/UpgradeConnection.java
	jetty-websocket/websocket-client/src/test/java/org/eclipse/jetty/websocket/client/WebSocketClientTest.java
	jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/AnnotatedMaxMessageSizeTest.java
 2013-10-18 16:12:00 -07:00
Greg Wilkins b31466839a 419799 Async timeout dispatches to error page 
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/handler/ErrorHandler.java
	jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ErrorPageErrorHandler.java
	jetty-servlet/src/test/java/org/eclipse/jetty/servlet/AsyncContextTest.java
 2013-10-18 14:50:01 +11:00
Greg Wilkins f3b393aa5d Refactored complexity out of HttpFields 
In preparation of merging Fields class and supporting HTTP/2.0 HPACK
 2013-10-17 21:35:11 +11:00
Greg Wilkins 33b10efcaa Merge remote-tracking branch 'origin/release-9' 2013-10-14 11:12:31 +11:00
Greg Wilkins 7cb553557e 418636 Name anonymous filter and holders with classname-hashcode 
Conflicts:
	jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java
	jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHolder.java
 2013-10-04 16:12:53 +10:00
Greg Wilkins 52752ae142 418636 Name anonymous filter and holders with classname-hashcode 
Conflicts:
	jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java
	jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHolder.java
	jetty-servlet/src/test/java/org/eclipse/jetty/servlet/ErrorPageTest.java
 2013-10-04 16:10:47 +10:00
Jesse McConnell 856a24b65a [maven-release-plugin] prepare for next development iteration 2013-09-30 14:46:09 -05:00
Jesse McConnell f466f03c6a [maven-release-plugin] prepare release jetty-9.0.6.v20130930 2013-09-30 14:46:00 -05:00
Jesse McConnell 0b3f431d27 set version back to 9.0.6-SNAPSHOT 2013-09-30 12:33:06 -05:00
Jesse McConnell af2e6ff911 Merge branch 'master' into release-9 2013-09-30 12:28:04 -05:00
Joakim Erdfelt ac40e7ab6a Fixing various javadoc errors 2013-09-25 08:11:32 -07:00
Jesse McConnell 0525498ad3 [maven-release-plugin] prepare for next development iteration 2013-09-19 15:06:31 -05:00
Jesse McConnell c05a725db6 [maven-release-plugin] prepare release jetty-9.0.6.v20130919 2013-09-19 15:06:17 -05:00
Greg Wilkins 43c92f8117 416812 - Don't start WebSocketClient for every context 
turn off for all contexts in demo
 2013-09-12 20:44:13 +10:00
Greg Wilkins c21ce1183e 417023 Add Default404Servlet if no default servlet set 2013-09-12 10:15:19 +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
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 9b9c7ba8d1 416568 Simplified servlet exception logging 2013-09-05 11:04:11 +10:00
Jesse McConnell ac30f5c9bd update other jetty mods to new format 2013-08-29 16:39:28 -05:00
Jesse McConnell ef166c23e6 Merge branch 'release-9' 2013-08-23 18:58:01 -05:00
Joakim Erdfelt b8e1f42b37 414635 Modular start.d and jetty.base property 
+ More mod cleanup
 + Adding cyclic module reference detection and reporting
 2013-08-22 14:21:52 -07:00
Jesse McConnell 450cdb3ef4 add servlet/s mod 2013-08-22 12:21:52 -05:00
Simone Bordet 0cdd884672 Merged branch 'master' into 'jetty-9.1'. 2013-08-21 22:20:11 +02:00
Simone Bordet 8951c4c773 Added tests for AsyncContext listeners behaviour. 2013-08-21 22:18:56 +02: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 7fb7fe71ec Fixing malformed Javadoc warnings in jetty-servlet 2013-08-14 12:46:25 -07: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 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 d2c68bb4aa 412830 Error Page match ServletException then root cause 2013-08-08 12:22:28 +10:00
Jan Bartel ca37782229 412829 Allow any mappings from web-default.xml to be overridden by web.xml 2013-07-23 12:18:18 +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
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 4a49a5e3f0 398467 Servlet 3.1 Non Blocking IO 
Handle bad listeners
 2013-07-08 13:08:53 +10:00
Greg Wilkins 981102fda5 398467 Servlet 3.1 Non Blocking IO 
Asynchronous reads working.
 2013-07-05 18:11:09 +10:00
Greg Wilkins 965918d8f2 Merge remote-tracking branch 'origin/master' into jetty-9.1 2013-07-04 17:28:57 +10:00
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
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 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
Joakim Erdfelt f8c457f75e Merge branch 'jetty-9.1' into javawebsocket-jsr 2013-06-19 15:07:15 -07:00
Jan Bartel 31082e1f8e Merge remote-tracking branch 'origin/master' into servlet-3.1-api 2013-06-18 08:37:49 +10:00
Joakim Erdfelt 2da8c9c306 Merge branch 'master' into javawebsocket-jsr 
Conflicts:
	jetty-spdy/spdy-http-server/src/test/java/org/eclipse/jetty/spdy/server/http/ReferrerPushStrategyTest.java
	jetty-util/src/main/java/org/eclipse/jetty/util/BufferUtil.java
	jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/io/UpgradeConnection.java
	jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/events/EventDriver.java
	jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/ServletWebSocketRequest.java
	jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/WebSocketServerFactory.java
	jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/WebSocketLoadRFC6455Test.java
 2013-06-17 10:54:10 -07:00
Jan Bartel d87df5d89e Merge remote-tracking branch 'origin/master' into servlet-3.1-api 2013-06-17 20:39:03 +10:00
Jan Bartel 0e4fbcb1ca 410693 ServletContextHandler.setHandler does not relink handlers - check for null 2013-06-17 20:37:06 +10:00
Jan Bartel 6b9742ff86 Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project 2013-06-17 16:54:47 +10:00
Jan Bartel d47eb462e7 410693 ServletContextHandler.setHandler does not relink handlers 2013-06-17 16:53:22 +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
Greg Wilkins 65a7f9f279 Merge remote-tracking branch 'origin/jetty-8' 
Conflicts:
	jetty-servlet/src/main/java/org/eclipse/jetty/servlet/FilterHolder.java
	jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java
 2013-06-17 14:46:10 +10:00
Jan Bartel 2ea7843d86 Merge remote-tracking branch 'origin/jetty-8' 2013-06-17 14:39:17 +10:00
Greg Wilkins 9bf7870c7c 410893 async support defaults to false for spec created servlets and filters 2013-06-17 14:21:53 +10:00
Jan Bartel 1908fff38f Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2013-06-17 14:11:46 +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
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
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
Greg Wilkins 9ec1378b73 fixed merge 2013-06-11 14:57:48 +10:00
Greg Wilkins ed04753111 410405 Avoid NPE for requestDispatcher(../) 2013-06-11 14:22:54 +10:00
Greg Wilkins f8e0764fa5 Merge remote-tracking branch 'origin/master' into servlet-3.1-api 2013-06-11 14:07:46 +10:00
Greg Wilkins 06d3fbe5aa Merge remote-tracking branch 'origin/jetty-8' 
Conflicts:
	jetty-deploy/src/test/java/org/eclipse/jetty/deploy/providers/ScanningAppProviderRuntimeUpdatesTest.java
	tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/ReloadedSessionMissingClassTest.java
	tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/WebAppObjectInSessionTest.java
 2013-06-11 14:07:00 +10: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
Jan Bartel 52994f336a 408662 In pax-web servlet services requests even if init() has not finished running 2013-06-07 15:39:20 +10:00
Joakim Erdfelt b01e6432a5 Merge branch 'master' into javawebsocket-jsr 2013-06-05 10:20:50 -07: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
Joakim Erdfelt 3db9299369 Merge branch 'jetty-7' into jetty-8 2013-06-04 11:24:44 -07:00
Joakim Erdfelt 0c4a266d60 Fixing JDK5 test error with comparison of query string 2013-06-04 09:04:12 -07:00
Joakim Erdfelt 020dd1022c Merge branch 'master' into javawebsocket-jsr 2013-06-03 09:06:38 -07: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 952f8442e5 408529 Etags set in 304 response 
Improved default servlet setting of etags
 2013-06-03 14:22:24 +10:00
Joakim Erdfelt 2d964313e8 Merge branch 'master' into javawebsocket-jsr 2013-05-31 10:54:16 -07: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