2540 Commits

Author SHA1 Message Date
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
Greg Wilkins
9a52d92f03 442048 fixed sendRedirect %2F encoding 2014-08-27 12:34:15 +10:00
Greg Wilkins
e5c1d66916 avoid default port in http2 push 2014-08-22 16:25:20 +10:00