Commit Graph

1462 Commits

Author SHA1 Message Date
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 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 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
Simone Bordet e25e2e2258 Merged branch 'jetty-9.2.x' into 'master'. 2014-10-16 19:48:38 +02:00
Simone Bordet 90e9cfc535 447381 - Disable SSLv3 by default.
Excluded by default also SSLv2Hello.
2014-10-16 19:46:33 +02:00
Simone Bordet 6268421dd0 Merged branch 'jetty-9.2.x' into 'master'. 2014-10-16 18:05:12 +02:00
Simone Bordet aea5070e51 447381 - Disable SSLv3 by default.
Excluded by default SSL, SSLv2 and SSLv3.
2014-10-16 17:53:52 +02:00
Jan Bartel 1729fb045c 446923 SharedBlockingCallback does not handle connector max idle time of Long.MAX_VALUE; BlockerTimeoutException not serializable 2014-10-15 18:17:01 +11:00
Greg Wilkins 6b489c78b6 Merge remote-tracking branch 'origin/jetty-9.2.x' 2014-10-15 11:46:42 +11:00
Greg Wilkins 8a555e669a 444031 Ensure exceptions do not reduce threadpool below minimum 2014-10-15 11:22:53 +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 1f543e9983 System.lineSeparator exists 2014-10-08 11:02:13 -07:00
Jan Bartel 149ee01047 445157 First redeployed servlet leaks WebAppContext 2014-10-01 13:03:39 +10:00
Simone Bordet a8b461fe91 Cosmetics: removed unused imports, cleaned up source code, improved javadocs. 2014-09-26 10:13:16 +02:00
Joakim Erdfelt 90af0a4e5f 437303 - Serving of static filenames with "unwise" characters causes 404
error 

+ Adding testcases for the rest of the unwise characters to show how
PathResource works vs the venerable FileResource
2014-09-24 15:46:08 -07:00
Simone Bordet ffa0fc73a9 Made methods return boolean to indicate whether the update was
successful or not.
2014-09-23 11:33:16 +02:00
Simone Bordet f02194d405 Made methods return boolean to indicate whether the update was
successful or not.
2014-09-12 12:58:35 +02: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
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
Greg Wilkins 40d84ff1e3 443662 Consume buffer in write(ByteBuffer) 2014-09-10 17:41:14 +10:00
Greg Wilkins 5011993ddf Merge remote-tracking branch 'origin/master' into jetty-http2
Conflicts:
	VERSION.txt
	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-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootWithJsp.java
	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-10 14:38:18 +10:00
Greg Wilkins c80f556139 Update Password.java
Fixed typo.

Trivial fix from github/pull/21
2014-09-10 10:06:00 +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
Simone Bordet 3fa302e287 Removed BenchmarkHelper in favour of the version present in the jetty-test-helper. 2014-09-05 15:04:38 +02:00
Greg Wilkins 07ec47adfa improved SSL debug logging 2014-09-04 19:09:39 +10: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
Greg Wilkins 610bac49b9 435322 Added a idleTimeout to the SharedBlockerCallback 2014-09-04 09:30:21 +10:00
Greg Wilkins ed8abd1d53 443049 Improved HttpParser illegal character messages 2014-09-04 09:27:42 +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 0a2aeb54a1 435322 Added a idleTimeout to the SharedBlockerCallback 2014-09-03 10:46:18 +10:00
Simone Bordet bb1d4946bc Merged branch 'master' into 'jetty-http2'. 2014-09-02 10:25:31 +02:00
Simone Bordet 7be9f0d7a4 Fixed doStop() to call super before interrupting the reference queue thread. 2014-09-01 21:16:40 +02: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
Jan Bartel 0aeebc4ec0 435988 ContainerLifeCycle: beans never stopped on remove 2014-08-27 17:13:07 +10:00
Jan Bartel 8ce96cdd2e 441475 org.eclipse.jetty.server.ResourceCache exceptions under high load 2014-08-27 14:46:22 +10:00
Greg Wilkins 1c71040eca moved config plugin to profile 2014-08-15 19:53:52 +10:00
Greg Wilkins b47f9ef605 cleaned up OSGi manifest creation 2014-08-15 19:35:49 +10:00
Simone Bordet 015c34d865 Fixed handling of the close state in case it's already closed. 2014-08-06 15:21:33 +02:00