6735 Commits

Author SHA1 Message Date
Greg Wilkins
38d701753c 403281 jetty.sh waits for started before OK
Conflicts:
	jetty-distribution/src/main/resources/bin/jetty.sh
2013-03-14 11:50:06 +11:00
Greg Wilkins
a7238f2688 403281 jetty.sh waits for started before OK 2013-03-14 11:44:04 +11:00
Simone Bordet
f0a9f9caa0 Fixed signalling in ConcurrentArrayBlockingQueue. 2013-03-14 00:09:44 +01:00
Greg Wilkins
29b83dff9b 402626 Do not required endpoint host checking by default 2013-03-14 09:25:28 +11:00
Simone Bordet
4a8b7409af Second draft implementation of bounded and unbounded ConcurrentArrayBlockingQueue. 2013-03-13 22:57:37 +01:00
Simone Bordet
e40e2a9913 Merged branch 'master' into 'unsafe'. 2013-03-13 22:37:36 +01:00
Simone Bordet
0c4d457fce Updated npn-boot version to 1.1.5. 2013-03-13 22:36:30 +01:00
Thomas Becker
a90a505316 401806 spdy push properly pass through request and response headers for pushed resources 2013-03-13 18:17:34 +01:00
Jesse McConnell
1112c268ee updated for source bundle name fix and add osgi version build helper call 2013-03-12 15:29:41 -05:00
Jesse McConnell
f85168a9ac Merge branch 'release-8' into jetty-8 2013-03-12 14:26:52 -05:00
Jesse McConnell
859c15ada3 Merge branch 'release-7' into jetty-7 2013-03-12 14:26:30 -05:00
Jesse McConnell
0959b5a848 set for dev 2013-03-12 14:24:55 -05:00
Jesse McConnell
728dada3b0 set for dev 2013-03-12 14:24:34 -05:00
Jesse McConnell
acb5919844 [maven-release-plugin] prepare for next development iteration 2013-03-12 09:10:50 -05:00
Jesse McConnell
d6ebdc0a4a [maven-release-plugin] prepare release jetty-7.6.10.v20130312 jetty-7.6.10.v20130312 2013-03-12 09:10:42 -05:00
Jesse McConnell
0405c8ded6 [maven-release-plugin] prepare for next development iteration 2013-03-12 09:05:25 -05:00
Jesse McConnell
852178cd01 [maven-release-plugin] prepare release jetty-8.1.10.v20130312 jetty-8.1.10.v20130312 2013-03-12 09:05:14 -05:00
Jesse McConnell
04732ab345 set for release 2013-03-12 08:38:25 -05:00
Jesse McConnell
fdda21c167 Merge branch 'jetty-8' into release-8 2013-03-12 08:37:45 -05:00
Jesse McConnell
c83e023ac3 set for release 2013-03-12 08:35:57 -05:00
Jesse McConnell
d5328b0932 Merge branch 'jetty-7' into release-7 2013-03-12 08:34:31 -05:00
Jesse McConnell
9e4fc0e91f Merge branch 'jetty-8' 2013-03-12 08:32:55 -05:00
Jesse McConnell
d358030299 Merge branch 'jetty-7' into jetty-8 2013-03-12 08:32:34 -05:00
Jesse McConnell
9fd5881f93 [Bug 402735] jetty.sh to support status which is == check 2013-03-12 08:30:30 -05:00
Thomas Becker
8aeecf972b SPDYToSPDYProxy add test where upstream server resets client stream 2013-03-12 14:21:29 +01:00
Simone Bordet
6be028c040 402397 - InputStreamResponseListener early close inputStream cause hold lock. 2013-03-11 17:37:42 +01:00
Simone Bordet
ef834aebe4 Draft implementation of bounded and unbounded ConcurrentArrayBlockingQueue. 2013-03-11 17:00:43 +01:00
Jan Bartel
0834ad259c 402706 HttpSession.setMaxInactiveInterval(int) does not change JDBCSession expiry 2013-03-11 19:31:39 +11:00
Greg Wilkins
11442814fa Merge remote-tracking branch 'origin/jetty-8'
Conflicts:
	jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java
2013-03-11 17:23:54 +11:00
Greg Wilkins
97eec14651 Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2013-03-11 12:47:10 +11:00
Greg Wilkins
59f8d375b9 402833 Test harness for global error page and hide exception message from reason string 2013-03-11 12:12:07 +11:00
Joakim Erdfelt
bbf44a5d32 Merge branch 'release-9' 2013-03-09 06:16:25 -07:00
Joakim Erdfelt
897c35c2cb [maven-release-plugin] prepare for next development iteration 2013-03-08 11:33:23 -07:00
Joakim Erdfelt
cc6196af50 [maven-release-plugin] prepare release jetty-9.0.0.v20130308 jetty-9.0.0.v20130308 2013-03-08 11:33:15 -07:00
Joakim Erdfelt
9025d21fb8 Updating VERSION.txt top section 2013-03-08 11:12:21 -07:00
Simone Bordet
f01e4f0b2c 402757 - WebSocket client module can't be used with WebSocket server module in the same WAR.
Introduced a shaded artifact that relocates the websocket-common classes, so they cannot
be shared with the server.
The shaded artifact has classifier "hybrid", and users will need to exclude the websocket-common
dependency manually when using the classified artifact.
2013-03-08 19:05:48 +01:00
Joakim Erdfelt
9303c65e63 402726 - WebAppContext references old WebSocket packages in system and server classes
+ Removing redundant WebSocketServlet references
 + Changing comments to be more clear about the roles of the 2 remaining
   entries
2013-03-08 19:05:32 +01:00
Joakim Erdfelt
38414eaac7 Minor formatting update TABS to SPACES 2013-03-08 19:05:14 +01:00
Simone Bordet
22504a556f 402757 - WebSocket client module can't be used with WebSocket server module in the same WAR.
Introduced a shaded artifact that relocates the websocket-common classes, so they cannot
be shared with the server.
The shaded artifact has classifier "hybrid", and users will need to exclude the websocket-common
dependency manually when using the classified artifact.
2013-03-08 18:22:30 +01:00
Joakim Erdfelt
a3159e932f 402726 - WebAppContext references old WebSocket packages in system and server classes
+ Removing redundant WebSocketServlet references
 + Changing comments to be more clear about the roles of the 2 remaining
   entries
2013-03-08 07:47:10 -07:00
Joakim Erdfelt
52bec1c44d Minor formatting update TABS to SPACES 2013-03-08 07:47:10 -07:00
Jan Bartel
f1cd726ba2 Merge remote-tracking branch 'origin/jetty-8' 2013-03-08 14:27:24 +11:00
Jan Bartel
9055132144 Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2013-03-08 13:45:56 +11:00
Jan Bartel
57cff606fd 400144 When loading a session fails the JDBCSessionManger produces duplicate session IDs 2013-03-08 13:33:48 +11:00
Joakim Erdfelt
7fc38f6c0f [maven-release-plugin] prepare for next development iteration 2013-03-07 19:14:19 -07:00
Joakim Erdfelt
96d045442f [maven-release-plugin] prepare release jetty-9.0.0.v20130307 2013-03-07 19:14:11 -07:00
Joakim Erdfelt
2f6dacfdb8 Updating VERSION.txt top section 2013-03-07 18:52:43 -07:00
Greg Wilkins
b7aded6e55 392129 fixed merged of handling of timeouts after startAsync 2013-03-08 11:22:07 +11:00
Greg Wilkins
ae7248b6d2 Merge remote-tracking branch 'origin/jetty-8'
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/AbstractHttpConnection.java
	jetty-server/src/main/java/org/eclipse/jetty/server/AsyncContinuation.java
	jetty-server/src/main/java/org/eclipse/jetty/server/Request.java
	jetty-servlets/src/test/java/org/eclipse/jetty/servlets/AbstractDoSFilterTest.java
2013-03-08 11:21:05 +11:00
Greg Wilkins
97de9fc6be 399967 Destroyables destroyed on undeploy and shutdown hook 2013-03-08 09:49:47 +11:00