651 Commits

Author SHA1 Message Date
Jan Bartel
215d2e2095 405526 Deployment must fail if more than 1 servlet maps to same url pattern 2013-05-10 15:33:57 +10:00
Jan Bartel
0d181d9a75 Merge remote-tracking branch 'origin/master' into servlet-3.1-api 2013-05-03 16:59:39 +10:00
Jan Bartel
dfbef2db05 Merge remote-tracking branch 'origin/jetty-8' 2013-05-03 16:20:51 +10:00
Jan Bartel
f4ee8ba48d Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2013-05-03 16:18:24 +10:00
Jan Bartel
e2c217d405 407136 @PreDestroy called after Servlet.destroy() 2013-05-03 16:17:16 +10:00
Jan Bartel
e7ecfd2b2b Merge remote-tracking branch 'origin/master' into servlet-3.1-api
Conflicts:
	jetty-server/src/test/java/org/eclipse/jetty/server/ResponseTest.java
2013-05-02 09:07:24 +10:00
Greg Wilkins
e781393258 406768 Improved handling of static content resources 2013-04-30 15:52:11 +10:00
Greg Wilkins
7955548d10 406390 Close if at END and content remaining 2013-04-29 14:01:11 +10:00
Jan Bartel
2360f5dcd5 Merge remote-tracking branch 'origin/master' into servlet-3.1-api
Conflicts:
	jetty-security/src/main/java/org/eclipse/jetty/security/ConstraintSecurityHandler.java
2013-04-23 15:08:56 +10:00
Jan Bartel
3df03e18d7 405437 Implement section 13.8.4 Uncovered HTTP methods 2013-04-23 13:52:41 +10:00
Greg Wilkins
03fd068ebc Merge remote-tracking branch 'origin/jetty-8'
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/ResourceCache.java
2013-04-22 14:20:03 +10:00
Greg Wilkins
a275c8fb37 Merge branch 'master' into servlet-3.1-api 2013-04-22 12:10:13 +10:00
Greg Wilkins
c3325e8b04 405530 Wrap AsyncContext to throw ISE after complete 2013-04-22 11:33:44 +10:00
Greg Wilkins
a7073d05a6 updated version to 9.1.0-SNAPSHOT 2013-04-19 13:59:18 +10:00
Jan Bartel
45bc7e6f5c Merge remote-tracking branch 'origin/master' into servlet-3.1-api 2013-04-18 14:50:58 +10:00
Jan Bartel
f23b15adaf Merge remote-tracking branch 'origin/jetty-8'
Conflicts:
	jetty-client/src/test/java/org/eclipse/jetty/client/SslBytesServerTest.java
	jetty-servlet/src/main/java/org/eclipse/jetty/servlet/JspPropertyGroupServlet.java
2013-04-18 14:43:05 +10:00
Jan Bartel
3812622365 Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2013-04-18 14:37:38 +10:00
Jan Bartel
2e5a233cd3 405537 NPE in rendering JSP using SPDY and wrapped ServletRequest 2013-04-18 14:26:18 +10:00
Jan Bartel
d34bd7aec7 Merge remote-tracking branch 'origin/master' into servlet-3.1-api 2013-04-18 12:16:24 +10:00
Jan Bartel
2dd2b78335 405925 Redeploy with jetty-maven-plugin fails 2013-04-18 11:19:03 +10:00
Jesse McConnell
7baaa14ba1 [maven-release-plugin] prepare for next development iteration 2013-04-17 11:46:39 -05:00
Jesse McConnell
e390b54b25 [maven-release-plugin] prepare release jetty-9.0.2.v20140417 2013-04-17 11:46:31 -05:00
Jesse McConnell
0b20467c6f [maven-release-plugin] prepare for next development iteration 2013-04-15 11:40:45 -05:00
Jesse McConnell
3aa4301711 [maven-release-plugin] prepare release jetty-9.0.2.v20140415 2013-04-15 11:40:37 -05:00
Jan Bartel
1092201341 405525 Throw IllegalArgumentException if filter or servlet name is null or empty string in ServletContext.addXXX() methods 2013-04-15 18:09:39 +10:00
Greg Wilkins
b8dd8bde14 [maven-release-plugin] prepare for next development iteration 2013-04-08 12:31:34 +10:00
Greg Wilkins
bf3771904b [maven-release-plugin] prepare release jetty-9.0.1.v20130408 2013-04-08 12:30:59 +10:00
Jan Bartel
0965ca62e2 404906 servlets with load-on-startup = 0 are not fired up on jetty 9 startup 2013-04-08 09:58:46 +10:00
Greg Wilkins
1191142c97 Merge remote-tracking branch 'origin/jetty-8'
Conflicts:
	jetty-io/src/main/java/org/eclipse/jetty/io/nio/SelectChannelEndPoint.java
	jetty-servlet/src/main/java/org/eclipse/jetty/servlet/DefaultServlet.java
2013-04-05 08:31:31 +11:00
Greg Wilkins
e9185aa062 Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2013-04-04 16:09:19 +11:00
Greg Wilkins
060389147b 404128 Add Vary headers rather than set them 2013-04-04 16:05:27 +11:00
Joakim Erdfelt
4d52c3ca8e 402984 - WebSocket Upgrade must honor case insensitive header fields in upgrade request 2013-03-19 11:28:23 -07:00
Jan Bartel
cd47727ce4 402982 Premature initialization of Servlets 2013-03-14 15:28:41 +11: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 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 2013-03-12 09:05:14 -05: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 2013-03-08 11:33:15 -07:00
Jan Bartel
f1cd726ba2 Merge remote-tracking branch 'origin/jetty-8' 2013-03-08 14:27:24 +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
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
face3b3584 392129 fixed handling of timeouts after startAsync 2013-03-08 09:35:08 +11:00
Jesse McConnell
778ee1411b [maven-release-plugin] prepare for next development iteration 2013-03-06 10:21:46 -06:00