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

2442 Commits

Author SHA1 Message Date
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
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
Simone Bordet 54cd00aec3 Javadocs cleanup. 2014-09-26 10:13:15 +02:00
Jan Bartel cc43b9c2c6 444547 Format exception in ResourceCache.Content.toString() 2014-09-23 11:33:44 +02:00
Greg Wilkins fc4bfc8a66 improved debug logging 2014-09-21 15:03:54 +10:00
Greg Wilkins bfe83c765e 444485 - Client resets stream, pending server data is failed, write hangs. 
renamed terminate to abort
 2014-09-19 13:03:41 +10:00
Jan Bartel 059f5e2396 444547 Format exception in ResourceCache.Content.toString() 2014-09-19 10:28:33 +10:00
Simone Bordet bfda3620f3 444485 - Client resets stream, pending server data is failed, write hangs. 
Fixed by ensuring that when a failure happens, either by catching an
exception or by failing a callback, we always call completed() and
abort the channel (via new method terminate()).
 2014-09-18 16:31:16 +02:00
Greg Wilkins c8198d0531 Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project 2014-09-18 07:03:40 +10:00
Simone Bordet 193eaaf1c3 SelectChannelEndPoint should set the interestOps as requested. 
Previously, SCEP was skipping the update of the interestOps in case it
was either input or output shutdown.

Now it always set the interestOps as requested and leaves to the
connection decide what interestOps needs to be set.
 2014-09-17 17:44:49 +02:00
Greg Wilkins 89d8ffa940 Merge remote-tracking branch 'origin/jetty-9.2.x' 
Conflicts:
	aggregates/jetty-all/pom.xml
	apache-jsp/pom.xml
	apache-jstl/pom.xml
	examples/async-rest/async-rest-jar/pom.xml
	examples/async-rest/async-rest-webapp/pom.xml
	examples/async-rest/pom.xml
	examples/embedded/pom.xml
	examples/pom.xml
	jetty-alpn/jetty-alpn-client/pom.xml
	jetty-alpn/jetty-alpn-server/pom.xml
	jetty-alpn/pom.xml
	jetty-annotations/pom.xml
	jetty-ant/pom.xml
	jetty-client/pom.xml
	jetty-continuation/pom.xml
	jetty-deploy/pom.xml
	jetty-distribution/pom.xml
	jetty-fcgi/fcgi-client/pom.xml
	jetty-fcgi/fcgi-server/pom.xml
	jetty-fcgi/pom.xml
	jetty-http-spi/pom.xml
	jetty-http/pom.xml
	jetty-io/pom.xml
	jetty-jaas/pom.xml
	jetty-jaspi/pom.xml
	jetty-jmx/pom.xml
	jetty-jndi/pom.xml
	jetty-jsp/pom.xml
	jetty-jspc-maven-plugin/pom.xml
	jetty-maven-plugin/pom.xml
	jetty-monitor/pom.xml
	jetty-nosql/pom.xml
	jetty-osgi/jetty-osgi-alpn/pom.xml
	jetty-osgi/jetty-osgi-boot-jsp/pom.xml
	jetty-osgi/jetty-osgi-boot-warurl/pom.xml
	jetty-osgi/jetty-osgi-boot/pom.xml
	jetty-osgi/jetty-osgi-httpservice/pom.xml
	jetty-osgi/jetty-osgi-npn/pom.xml
	jetty-osgi/pom.xml
	jetty-osgi/test-jetty-osgi-context/pom.xml
	jetty-osgi/test-jetty-osgi-webapp/pom.xml
	jetty-osgi/test-jetty-osgi/pom.xml
	jetty-plus/pom.xml
	jetty-proxy/pom.xml
	jetty-quickstart/pom.xml
	jetty-rewrite/pom.xml
	jetty-runner/pom.xml
	jetty-security/pom.xml
	jetty-server/pom.xml
	jetty-servlet/pom.xml
	jetty-servlets/pom.xml
	jetty-spdy/pom.xml
	jetty-spdy/spdy-alpn-tests/pom.xml
	jetty-spdy/spdy-client/pom.xml
	jetty-spdy/spdy-core/pom.xml
	jetty-spdy/spdy-example-webapp/pom.xml
	jetty-spdy/spdy-http-client-transport/pom.xml
	jetty-spdy/spdy-http-common/pom.xml
	jetty-spdy/spdy-http-server/pom.xml
	jetty-spdy/spdy-npn-tests/pom.xml
	jetty-spdy/spdy-server/pom.xml
	jetty-spring/pom.xml
	jetty-start/pom.xml
	jetty-util-ajax/pom.xml
	jetty-util/pom.xml
	jetty-webapp/pom.xml
	jetty-websocket/javax-websocket-client-impl/pom.xml
	jetty-websocket/javax-websocket-server-impl/pom.xml
	jetty-websocket/pom.xml
	jetty-websocket/websocket-api/pom.xml
	jetty-websocket/websocket-client/pom.xml
	jetty-websocket/websocket-common/pom.xml
	jetty-websocket/websocket-server/pom.xml
	jetty-websocket/websocket-servlet/pom.xml
	jetty-xml/pom.xml
	pom.xml
	tests/pom.xml
	tests/test-continuation/pom.xml
	tests/test-integration/pom.xml
	tests/test-loginservice/pom.xml
	tests/test-quickstart/pom.xml
	tests/test-sessions/pom.xml
	tests/test-sessions/test-hash-sessions/pom.xml
	tests/test-sessions/test-jdbc-sessions/pom.xml
	tests/test-sessions/test-sessions-common/pom.xml
	tests/test-webapps/pom.xml
	tests/test-webapps/test-jaas-webapp/pom.xml
	tests/test-webapps/test-jetty-webapp/pom.xml
	tests/test-webapps/test-jndi-webapp/pom.xml
	tests/test-webapps/test-mock-resources/pom.xml
	tests/test-webapps/test-proxy-webapp/pom.xml
	tests/test-webapps/test-servlet-spec/pom.xml
	tests/test-webapps/test-servlet-spec/test-container-initializer/pom.xml
	tests/test-webapps/test-servlet-spec/test-spec-webapp/pom.xml
	tests/test-webapps/test-servlet-spec/test-web-fragment/pom.xml
	tests/test-webapps/test-webapp-rfc2616/pom.xml
 2014-09-17 21:15:17 +10:00
Greg Wilkins 1e3e3d9de0 do not throw when callback passed 2014-09-17 21:06:12 +10:00
Joakim Erdfelt 9249ebb6ef Using 9.2.4-SNAPSHOT for branch 2014-09-11 06:10:44 -07:00
Joakim Erdfelt 2755746def Merge branch 'jetty-http2' 2014-09-11 05:56:55 -07:00
Simone Bordet 15781da755 Fixed spinning loop that called onFillable() in case of closed 
connection.
 2014-09-11 00:33:47 +02:00
Joakim Erdfelt 3e4c9909e0 443652 - Remove dependency on java.lang.management classes 
* Created safer Uptime singleton for use
* Removed direct references to java.lang.management from
   - Server.java
   - Log.java
   - AbstractLifeCycle.java
 2014-09-10 10:30:26 -07:00
Simone Bordet d45a5c861c Introduced factory method to create the SelectorManager instance. 2014-09-10 11:11:12 +02:00
Greg Wilkins 40d84ff1e3 443662 Consume buffer in write(ByteBuffer) 2014-09-10 17:41:14 +10:00
Jesse McConnell 88b19abf52 [maven-release-plugin] prepare for next development iteration 2014-09-05 09:19:30 -05:00
Jesse McConnell 9bfeb2221f [maven-release-plugin] prepare release jetty-9.2.3.v20140905 2014-09-05 09:19:23 -05:00
Greg Wilkins 5b97d652e1 Merge remote-tracking branch 'origin/master' into jetty-http2 
Conflicts:
	jetty-alpn/jetty-alpn-server/src/main/config/modules/protonego-impl/alpn.mod
	jetty-http/src/main/java/org/eclipse/jetty/http/HttpParser.java
	jetty-npn/jetty-npn-server/src/main/config/modules/protonego-impl/npn.mod
	jetty-spdy/spdy-http-server/src/main/java/org/eclipse/jetty/spdy/server/http/HttpChannelOverSPDY.java
 2014-09-04 17:43:18 +10:00
Jan Bartel 51715dbcdb 443231 java.lang.NullPointerException on scavenge scheduling when session id manager declared before shared scheduler 2014-09-04 11:31:08 +10:00
Greg Wilkins 5be1fb6270 Merge remote-tracking branch 'origin/master' into jetty-http2 
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java
 2014-09-03 15:19:54 +10:00
Greg Wilkins c3647f9d9f 443158 Fixed HttpOutput spin 2014-09-03 15:01:10 +10:00
Simone Bordet ee3ab1f8ea Merged branch 'master' into 'jetty-http2'. 2014-09-01 11:57:09 +02:00
Simone Bordet ca2a23c35d Improved Javadocs and code cleanup. 2014-09-01 11:28:59 +02:00
Greg Wilkins 277ca5c065 fixed merge 2014-08-29 17:54:28 +10:00
Greg Wilkins a4debf68c4 fixed merge 2014-08-29 16:03:32 +10:00
Greg Wilkins 5507e267ae Merge remote-tracking branch 'origin/master' into jetty-http2 
Conflicts:
	jetty-server/src/main/config/etc/jetty-https.xml
	jetty-server/src/main/config/modules/ssl.mod
	jetty-start/src/main/java/org/eclipse/jetty/start/Modules.java
 2014-08-29 15:49:25 +10:00
Greg Wilkins 69390954dc 435322 acceptor and selector configuration/priority 2014-08-29 15:36:19 +10:00
Greg Wilkins edcb56ae6b Merge remote-tracking branch 'origin/master' into jetty-http2 
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java
 2014-08-29 12:41:52 +10:00
Greg Wilkins eee2ba206e 435322 Added a idleTimeout to the SharedBlockerCallback 2014-08-29 11:55:06 +10:00
Greg Wilkins d8e6331434 442477 Allow Symlink aliases by default 2014-08-27 17:33:27 +10:00
Greg Wilkins adb56b3d90 Merge remote-tracking branch 'origin/master' into jetty-http2 2014-08-27 12:53:54 +10:00
Greg Wilkins 1a0eb64a1f 442383 Improved insufficient threads message 2014-08-27 12:40:54 +10:00