Commit Graph

2375 Commits

Author SHA1 Message Date
Joakim Erdfelt 8a72a153a1 Merge branch 'jetty-9.2.x' 2014-10-28 12:32:55 -07: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
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 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 dc33bb84a4 447472 test harness for slow large writes 2014-10-17 11:04:23 +11:00
Greg Wilkins aad1f9d058 447515 Remove GzipFilter
Made GzipHandler the same as AsyncGzipFilter
Added a HttpOutput.Interceptor
2014-10-16 20:50:11 +11:00
Greg Wilkins ec79a6f88e Improve HTTP header pre-encoding
The HttpContent class has been reworked to store HttpField instances, we may be generated on
demand or instances of PreEncodedHttpField.

The encoding of HTTP2 fields has been generalized to handle both indexed and literal fields, selected
by header enum set.

Default servlet and response classes have been cleaned up in how they set response headers.
2014-10-16 12:31:37 +11:00
Joakim Erdfelt dec984302a Merge branch 'jetty-9.2.x'
Conflicts:
	jetty-server/src/test/java/org/eclipse/jetty/server/handler/RequestLogHandlerTest.java
2014-10-10 16:14:06 -07:00
Joakim Erdfelt e7b86b99cb 445823 - RequestLogHandler at end of HandlerCollection doesn't work
+ Adding more varieties of server side collection vs wrapper with error
  handlers
+ Adding servlet version of tests to demonstrate behavior in servlet
  context, when also using the mapped error handler
2014-10-10 11:21:40 -07:00
Jan Bartel e292b572f1 446425 Oracle Sql error on JettySessions table when this table do not exist already 2014-10-10 17:36:36 +11:00
Greg Wilkins bb2d77f00b Merge remote-tracking branch 'origin/jetty-9.2.x' 2014-10-10 14:20:30 +11:00
Greg Wilkins 6a0e220b9c 446506 getAsyncContext ISE before startAsync on async dispatches 2014-10-10 14:19:42 +11:00
Greg Wilkins cd15bb187d 446559 Avoid spin consuming extra data 2014-10-10 13:16:41 +11:00
Jan Bartel f07387c703 442942 Content sent with status 204 (No Content) 2014-10-10 12:58:45 +11:00
Greg Wilkins 0df54fd279 fixed merge 2014-10-10 09:17:48 +11:00
Joakim Erdfelt 17aa2eaf7a Adding note about weld requirement on .getServerInfo() 2014-10-09 15:11:07 -07:00
Greg Wilkins 7e68a98dcd fixes from merge 2014-10-10 08:54:11 +11:00
Greg Wilkins 758ce66c8d Merge remote-tracking branch 'origin/jetty-9.2.x'
Conflicts:
	jetty-websocket/pom.xml
	tests/test-sessions/test-mongodb-sessions/pom.xml
2014-10-10 08:53:43 +11:00
Joakim Erdfelt 086bea097d Using StandardCharset where appropriate 2014-10-08 11:02:13 -07:00
Joakim Erdfelt 61dd2c9620 Fixing encoding tests (that actually didn't validate results) 2014-10-02 15:12:32 -07:00
Joakim Erdfelt 43d2c59394 445821 - Error 400 should be logged with RequestLog
+ Adding BadRequestLogHandlerTest to demonstrate error 400 not being
captured by RequestLogHandler
2014-10-02 13:55:14 -07:00
Joakim Erdfelt e93e024166 445823 - RequestLogHandler at end of HandlerCollection doesn't work
+ Adding example of RequestLogHandler use in HandlerCollection
2014-10-02 13:54:22 -07:00
Joakim Erdfelt 3636bd6894 Moving hardcoded ports to ephemeral range suitable for more environments 2014-10-02 10:31:32 -07:00
Jan Bartel 149ee01047 445157 First redeployed servlet leaks WebAppContext 2014-10-01 13:03:39 +10:00
Joakim Erdfelt d0fa66ddf0 445542 - Add SecuredRedirectHandler for embedded jetty use to redirect to secure port/scheme
+ Adding SecuredRedirectHandler as option for those jetty embedded folks
  to have a simple http -> https solution (can even be setup and bound
  to specific connectors via the named virtualhosts concepts)
2014-09-30 12:54:42 -07:00
Simone Bordet 8d2efaf7eb 445167 - Allow configuration of dispatch after select.
Introduced parameter "dispatchIO" in the relevant factories so that
they can be configured by users and connections will be created
taking into account this parameter.

For less configurable connection factories, this parameter is
currently hardcoded to either true or false depending on the case.
For example, ALPN and NPN connections have it to false, since they
don't do any blocking operation in onFillable().
2014-09-26 10:13:16 +02:00
Simone Bordet a8b461fe91 Cosmetics: removed unused imports, cleaned up source code, improved javadocs. 2014-09-26 10:13:16 +02:00
Simone Bordet a9dcfd5c5a Removed rotten comment and cleaned up javadocs. 2014-09-26 10:13:15 +02:00