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

768 Commits

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