2552 Commits

Author SHA1 Message Date
Simone Bordet
9320e9e24a 450484 - Missing parameterization of etc/jetty-http[s].xml. 2014-11-07 11:56:58 +01:00
Greg Wilkins
47a92e9608 minor cleanups of HttpContent 2014-11-06 16:46:47 +11:00
Joakim Erdfelt
f2cbde13e2 Attempting to understand windows timeout hang 2014-11-05 14:39:12 -07:00
Joakim Erdfelt
67de171871 Adding test tracking to figure out where the test hang is coming from 2014-11-05 12:01:19 -07:00
Joakim Erdfelt
f645b4a399 Merge branch 'jetty-9.2.x' 2014-11-05 11:12:05 -07:00
Joakim Erdfelt
04e7be7383 Adding overall test timeout 2014-11-05 11:11:57 -07:00
Greg Wilkins
4cb8e7f644 449811 handle unquoted etags when gzipping 2014-11-05 11:12:17 +11:00
Jesse McConnell
5d0595cabd [maven-release-plugin] prepare for next development iteration 2014-11-03 13:46:58 -06:00
Jesse McConnell
772ff0bfd4 [maven-release-plugin] prepare release jetty-9.2.4.v20141103 2014-11-03 13:46:52 -06:00
Jesse McConnell
1c4a08b35b [maven-release-plugin] prepare for next development iteration 2014-10-31 09:58:16 -05:00
Jesse McConnell
a4ff7bf841 [maven-release-plugin] prepare release jetty-9.2.4.v20141031 2014-10-31 09:58:10 -05:00
Greg Wilkins
e3bda4efbe 446564 Refactored RequestLog Mechanism
RequestLog can now be set on the HttpChannel and is called during the onCommitted callback.
The RequestLog may be set either on the server or via an updated RequestLogHandler that can
be applied to a specific context.
2014-10-31 13:31:29 +11:00
Jesse McConnell
e1b73a64eb [maven-release-plugin] prepare for next development iteration 2014-10-30 11:28:41 -05:00
Jesse McConnell
5770cc1179 [maven-release-plugin] prepare release jetty-9.2.4.v20141030 2014-10-30 11:28:35 -05:00
Greg Wilkins
171f7b5352 improved protocol info log 2014-10-30 17:48:24 +11:00
Greg Wilkins
71d1c434e4 Merge remote-tracking branch 'origin/jetty-9.2.x' 2014-10-30 16:58:55 +11:00
Greg Wilkins
2332b4f734 449175 Removed extra space in NCSA log 2014-10-30 16:42:31 +11:00
Greg Wilkins
4b0193247b 448841 Clarified selectors==0 javadoc
448840 Clarified ServerConnector javadoc
448839 Fixed javadoc typo in ServerConnector
2014-10-30 15:50:54 +11:00
Greg Wilkins
a6e00bc642 Merge remote-tracking branch 'origin/jetty-9.2.x'
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/handler/ResourceHandler.java
	jetty-util/src/test/java/org/eclipse/jetty/util/resource/AbstractFSResourceTest.java
2014-10-30 14:36:50 +11:00
Greg Wilkins
414479795e 443550 improved FileResource encoded alias checking
removed extra debug
2014-10-30 14:29:00 +11:00
Greg Wilkins
8eab088a35 443550 improved FileResource encoded alias checking 2014-10-30 14:12:43 +11:00
Greg Wilkins
9189c934d9 444722 Fixed order of setReuseAddress call 2014-10-30 11:28:45 +11:00
Joakim Erdfelt
8899f6d360 Merge branch 'jetty-9.2.x'
Conflicts:
	VERSION.txt
2014-10-29 15:52:05 -07:00
Joakim Erdfelt
b132b90b03 Simplifying warning message 2014-10-29 15:49:23 -07:00
Joakim Erdfelt
733cc71791 Reworking jetty.home warning to be a module instead.
+ This will cause it to be logged using the configured logger as well.
2014-10-29 15:31:14 -07:00
Joakim Erdfelt
8a72a153a1 Merge branch 'jetty-9.2.x' 2014-10-28 12:32:55 -07:00
Jesse McConnell
58eb6740ec [maven-release-plugin] prepare for next development iteration 2014-10-28 14:20:30 -05:00
Jesse McConnell
19a44846cf [maven-release-plugin] prepare release jetty-9.2.4.v20141028 2014-10-28 14:20:24 -05:00
Joakim Erdfelt
607a560ebd Merge branch 'jetty-9.2.x' into cdi-testing 2014-10-28 09:36:34 -07:00
Simone Bordet
8d2acb6817 Merged branch 'jetty-9.2.x' into 'master'. 2014-10-28 11:55:44 +01:00
Simone Bordet
7cdcd69f44 Reverted version to 9.2.4-SNAPSHOT. 2014-10-28 11:52:00 +01: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
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
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
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
Jan Bartel
01a1fc166e Merge remote-tracking branch 'origin/jetty-9.2.x' 2014-10-23 11:20:44 +11:00
Greg Wilkins
627ba945f1 Added AsyncDelayHandler example 2014-10-23 09:11:27 +11:00
Greg Wilkins
29a9f4f693 448156 Fixed INACTIVE race in IteratingCallback
Fixed double usage of callback
2014-10-22 16:14:51 +11:00