Commit Graph

8585 Commits

Author SHA1 Message Date
Joakim Erdfelt e92f44ed73 Merge branch 'master' into jetty-9.1 2013-11-19 10:04:52 -07:00
Joakim Erdfelt 724afdaea6 Merge branch 'release-9.1' into jetty-9.1 2013-11-18 09:15:21 -07:00
Joakim Erdfelt dcae1860ae Updating VERSION.txt top section 2013-11-16 07:20:33 -07:00
Joakim Erdfelt 9172d6115b [maven-release-plugin] prepare for next development iteration 2013-11-15 16:58:44 -07:00
Joakim Erdfelt 6feeab6ec3 [maven-release-plugin] prepare release jetty-9.1.0.v20131115 2013-11-15 16:58:36 -07:00
Joakim Erdfelt 3ad20296ae Removing bogus file 2013-11-15 16:35:09 -07:00
Joakim Erdfelt 753a53f77f More overhaul of the startup scripts 2013-11-15 16:34:35 -07:00
Joakim Erdfelt 7bbc0ff4df [maven-release-plugin] rollback the release of jetty-9.1.0.v20131115 2013-11-15 16:33:52 -07:00
Joakim Erdfelt 1126e68971 [maven-release-plugin] prepare for next development iteration 2013-11-15 16:03:28 -07:00
Joakim Erdfelt d6418c73d4 [maven-release-plugin] prepare release jetty-9.1.0.v20131115 2013-11-15 16:03:20 -07:00
Joakim Erdfelt 47e0710faa Updating VERSION.txt top section 2013-11-15 15:40:43 -07:00
Joakim Erdfelt 6c372b9440 Reverting <version> to 9.1.0-SNAPSHOT 2013-11-15 15:36:26 -07:00
Joakim Erdfelt f1ab699cbe More overhaul of the startup scripts 2013-11-15 14:37:57 -07:00
Joakim Erdfelt 3aca7f864e Added security dependency on webapp.mod 2013-11-15 12:18:29 -07:00
Joakim Erdfelt 10a02e8ef6 Added security dependency on webapp.mod 2013-11-15 12:18:08 -07:00
Joakim Erdfelt ead66cd422 Fixing websocket demos for stricter subprotocol checks in Chrome 30 2013-11-15 09:29:40 -07:00
Joakim Erdfelt ffd98bdbf1 Fixing websocket demos for stricter subprotocol checks in Chrome 30 2013-11-15 09:26:35 -07:00
Joakim Erdfelt e097ec1ae2 import cleanup 2013-11-15 09:00:16 -07:00
Jesse McConnell b5345caed1 [maven-release-plugin] prepare for next development iteration 2013-11-14 15:27:52 -06:00
Jesse McConnell 1582aa196d [maven-release-plugin] prepare release jetty-9.1.0.v20131114 2013-11-14 15:27:37 -06:00
Jesse McConnell 3a9861dea1 set for release 2013-11-14 15:02:40 -06:00
Jesse McConnell 80212c1648 Merge branch 'jetty-9.1' into release-9.1 2013-11-14 14:57:05 -06:00
Jesse McConnell d1fc59a611 Merge branch 'release-9.1' into jetty-9.1 2013-11-14 08:59:02 -06:00
Jesse McConnell 45d65ab7c0 set for dev 2013-11-14 08:58:34 -06:00
Jesse McConnell 883fe0e831 set for dev 2013-11-14 08:57:40 -06:00
Jesse McConnell ac6547ff10 [maven-release-plugin] prepare for next development iteration 2013-11-14 08:57:40 -06:00
Jesse McConnell f5d2337cb0 [maven-release-plugin] prepare release jetty-9.0.7.v20131107 2013-11-14 08:57:40 -06:00
Jesse McConnell cf55cfc007 set poms for release 2013-11-14 08:57:40 -06:00
Jesse McConnell 4af6e100c2 set for release 2013-11-14 08:57:40 -06:00
Jesse McConnell 3ff228cf9c set for dev 2013-11-14 08:57:40 -06:00
Jesse McConnell 04c2c1b612 [maven-release-plugin] prepare for next development iteration 2013-11-14 08:57:40 -06:00
Jesse McConnell 1296965695 [maven-release-plugin] prepare release jetty-9.0.7.v20131031 2013-11-14 08:57:40 -06:00
Jesse McConnell 7cb1d4a1fb set for release 2013-11-14 08:57:40 -06:00
Jesse McConnell 996dad6b0c set for dev 2013-11-14 08:57:07 -06:00
Jan Bartel 278e5cb91a Merge remote-tracking branch 'origin/master' into jetty-9.1 2013-11-11 17:47:49 +11:00
Jan Bartel 8d2d598a72 421362 When using the jetty.osgi.boot ContextHandler service feature the wrong ContextHandler can be undeployed 2013-11-11 17:44:39 +11:00
Jan Bartel 50086f6512 Update mongo session tests for latest jetty client api 2013-11-11 17:42:15 +11:00
Jan Bartel 2824d91336 Remove old javadoc.xml from distro 2013-11-11 14:09:25 +11:00
Greg Wilkins f951b8f979 Merge remote-tracking branch 'origin/master' into jetty-9.1
Conflicts:
	tests/test-webapps/test-jetty-webapp/src/main/webapp/remote.html
2013-11-11 14:08:25 +11:00
Greg Wilkins 16d22828fd 416477 - QueuedThreadPool does not reuse interrupted threads 2013-11-11 14:06:41 +11:00
Jan Bartel bd7930416e 397167 Remote Access documentation is wrong 2013-11-11 12:10:02 +11:00
Jan Bartel f0c44ccff7 397167 Remote Access documentation is wrong 2013-11-11 11:41:51 +11:00
Simone Bordet 310c7a543e Updated tests to run over SSL too. 2013-11-09 19:11:43 +01:00
Greg Wilkins 8bda67b82d Merge remote-tracking branch 'origin/master' into jetty-9.1
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannel.java
	jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannelState.java
2013-11-08 15:24:12 +11:00
Greg Wilkins c57a0b90d1 Merge branch 'jetty-9.1' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9.1 2013-11-08 15:09:15 +11:00
Greg Wilkins cbd6c11ab3 added IdleTimeoutHandler 2013-11-08 15:09:05 +11:00
Greg Wilkins 1d5635c76c 420776 complete error pages after startAsync
handle complete and dispatch calls before the thrown exception

Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/AbstractHttpConnection.java
	jetty-server/src/main/java/org/eclipse/jetty/server/AsyncContinuation.java
	jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java
	jetty-servlet/src/test/java/org/eclipse/jetty/servlet/AsyncContextTest.java
2013-11-08 15:08:01 +11:00
Greg Wilkins ed1555e0c4 added QueuedThreadPool.getQueueSize() 2013-11-08 11:58:13 +11:00
Simone Bordet 1f140548fa Updated to use a $NAME variable to create PID and state files,
correcting also locations where these are stored (in jetty.base rather
than jetty.home).
2013-11-07 23:46:55 +01:00
Jesse McConnell 63f20d4518 [maven-release-plugin] prepare for next development iteration 2013-11-07 10:42:54 -06:00