Commit Graph

10223 Commits

Author SHA1 Message Date
Simone Bordet 7cdcd69f44 Reverted version to 9.2.4-SNAPSHOT. 2014-10-28 11:52:00 +01:00
Jesse McConnell 3a40db32ad set for dev 2014-10-27 17:30:38 -05:00
Jesse McConnell 3b745f06df [maven-release-plugin] prepare for next development iteration 2014-10-27 16:16:24 -05:00
Jesse McConnell 4f0d78c91b [maven-release-plugin] prepare release jetty-9.2.4.v20141027 2014-10-27 16:16:18 -05:00
Jesse McConnell 5caabc8a65 set for reease 2014-10-27 15:46:32 -05:00
Jesse McConnell d17613982b [448761] ContextHandler returns incorrect servlet minor version 2014-10-27 15:43:30 -05:00
Joakim Erdfelt 6ff43a0af1 Merge branch 'jetty-9.2.x' into cdi-testing 2014-10-27 13:42:30 -07:00
Joakim Erdfelt bfd7414b30 Minor typo in SpdyServer 2014-10-27 13:42:02 -07:00
Greg Wilkins e19178fd82 fixed bad merge 2014-10-26 20:34:19 +11:00
Greg Wilkins fbc131b46e Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannel.java
2014-10-26 17:40:16 +11:00
Greg Wilkins 34a8da2ba2 445823 Moved RequestLog calling to HttpChannel
Simplified the RequestLogHandler.  It no longer set's async listeners or tries to catch exeptions etc.
Instead it simply sets the RequestLog instance on the HttpChannel.   The HttpChannel#onCompleted method
then uses the log (if set) as the last thing before recycling the connection.  It uses the actual
bytes written (eg after compression) and the actual status sent (eg if sent from a bad message).
2014-10-26 17:30:50 +11:00
Simone Bordet d13cdf2592 Merged branch 'jetty-9.2.x' into 'master'. 2014-10-24 14:06:54 +02:00
Simone Bordet c66963126f 446563 - Null HttpChannel.getCurrentHttpChannel() in ServletHandler.doFilter().
Moved the finally block that resets the current HttpChannel and the
thread name after the handling of the COMPLETE action.
This is necessary because AsyncListener.onComplete() (triggered by
the handling of the COMPLETE action) may perform a
RequestDispatcher.forward() that requires the current HttpChannel
thread local to be set.
2014-10-24 14:03:06 +02:00
Greg Wilkins 4323e450c5 Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project 2014-10-24 15:52:28 +11:00
Greg Wilkins 31e448ffd6 Removed duplication of HttpGenerator$Info vs http.MetaData
Use MetaData throughout code base
2014-10-24 15:51:20 +11:00
Jan Bartel 7d5c8f2a96 Merge remote-tracking branch 'origin/jetty-9.2.x' 2014-10-24 12:51:01 +11:00
Jan Bartel 1ab6d7398c 447979 Refactor to make MetaData responsible for progressively ordering web-inf jars 2014-10-24 12:48:15 +11:00
Jesse McConnell 2da2897c37 add logs/ directory as require directory for base 2014-10-23 20:20:42 -05:00
Greg Wilkins 98a07789ce 447515 Remove GzipFilter
Improved javadoc and comments
2014-10-24 11:05:19 +11:00
Greg Wilkins 67e686c108 447515 Remove GzipFilter
Added a module to apply GzipHandler to the entire server
2014-10-24 10:48:33 +11:00
Greg Wilkins ac1b111d57 Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project 2014-10-24 08:46:12 +11:00
Greg Wilkins 738c47bc55 447515 Remove GzipFilter
Moved all usages of GzipFilter to GzipHandler
added support to ServerContextHandler to create a GzipHandler
2014-10-24 08:17:05 +11:00
Simone Bordet 360fce58be Merged branch 'jetty-9.2.x' into 'master'. 2014-10-23 12:54:07 +02:00
Simone Bordet fac197f868 Clarified semantic of Request.header(). 2014-10-23 12:53:37 +02:00
Simone Bordet 9cb21d1377 Merged branch 'jetty-9.2.x' into 'master'. 2014-10-23 12:42:00 +02:00
Simone Bordet f7baf9923f Fixed issue caused by the fix to #447746: user agent header must not
be added, but overwritten.
2014-10-23 12:41:16 +02:00
Simone Bordet 65832dfae3 Merged branch 'jetty-9.2.x' into 'master'. 2014-10-23 11:47:02 +02:00
Simone Bordet 84b38aba15 447746 - HttpClient is always going to send User-Agent header even though I do not want it to. 2014-10-23 11:46:18 +02:00
Jan Bartel 01a1fc166e Merge remote-tracking branch 'origin/jetty-9.2.x' 2014-10-23 11:20:44 +11:00
Jan Bartel 9cc3f4b206 447629 getPart()/getParts() fails on Multipart request if getParameter is called in a filter first 2014-10-23 09:58:11 +11:00
Greg Wilkins 627ba945f1 Added AsyncDelayHandler example 2014-10-23 09:11:27 +11:00
Simone Bordet 0eade706a6 Removed Thread.dumpStack() calls used for debugging. 2014-10-22 18:10:25 +02:00
Greg Wilkins b65aed7d10 Merge remote-tracking branch 'origin/jetty-9.2.x' 2014-10-22 22:44:18 +11:00
Greg Wilkins 921381eb7c 448156 Fixed INACTIVE race in IteratingCallback
More code cleanups and review
2014-10-22 22:43:24 +11:00
Greg Wilkins 58b56b0cfb fixed bad merge 2014-10-22 16:47:55 +11:00
Greg Wilkins 3f76eef8d1 Merge remote-tracking branch 'origin/jetty-9.2.x'
Conflicts:
	jetty-util/src/main/java/org/eclipse/jetty/util/IteratingCallback.java
2014-10-22 16:42:23 +11:00
Greg Wilkins 679b8d30f8 448156 Fixed INACTIVE race in IteratingCallback
Additional cleanups of ICB code
2014-10-22 16:40:28 +11:00
Greg Wilkins 29a9f4f693 448156 Fixed INACTIVE race in IteratingCallback
Fixed double usage of callback
2014-10-22 16:14:51 +11:00
Greg Wilkins 4bbd3e9909 Merge remote-tracking branch 'origin/jetty-9.2.x' 2014-10-22 14:08:52 +11:00
Greg Wilkins 34782005b2 448156 Fixed INACTIVE race in IteratingCallback
Simplified the ICB statemachine with the addition of a lock state to handle the case of iterate() called while a
previous process() iteration is just existing.

Also added the CALLED state to replace INACTIVE when a callback is called before PENDING state entered.

renamed INACTIVE to IDLE
2014-10-22 14:06:40 +11:00
Jan Bartel 592265c21f 447627 MultiPart file always created when "filename" set in Content-Disposition 2014-10-22 12:56:59 +11:00
Greg Wilkins 5da7c29787 Simplified SelectorManager state machine
Removed changing state, as it is just an aspect of processing.
2014-10-22 10:29:41 +11:00
Greg Wilkins 062a5c4113 447515 Remove GzipFilter
misc cleanups in preparation for removal
2014-10-17 15:52:11 +11:00
Greg Wilkins ba7f7589cb Merge remote-tracking branch 'origin/jetty-9.2.x' 2014-10-17 14:31:22 +11:00
Greg Wilkins 8bf6b2c62c 444031 Ensure exceptions do not reduce threadpool below minimum
improved the suppression of warnings
2014-10-17 14:29:40 +11:00
Greg Wilkins a906aaa266 Simplified SelectorManager state machine
Made the SelectorManager use the CaS state machine for both locking and controlling
the mode of handling changes.

Replaced the concurrent change queue with a pair of array lists that are switched while the lock state is held
2014-10-17 14:16:48 +11:00
Greg Wilkins e8a843dc6a Submit selector interest changes
After seeing a stack trace with many threads blocked on setInterest, have reverted to always submitting changes
2014-10-17 12:36:02 +11:00
Greg Wilkins dc33bb84a4 447472 test harness for slow large writes 2014-10-17 11:04:23 +11:00
Simone Bordet 70894962a1 Merged branch 'jetty-9.2.x' into 'master'. 2014-10-16 21:23:22 +02:00
Simone Bordet e4b92d7d1c Added NPN 1.1.9.v20141016 URL. 2014-10-16 21:22:29 +02:00