567 Commits

Author SHA1 Message Date
Greg Wilkins
a17a290eb5 381521 Only set Vary header when content could be compressed 2013-01-10 12:02:11 +11:00
Greg Wilkins
2aab780eba Merge remote-tracking branch 'origin/jetty-7' into jetty-8
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java
	tests/test-integration/src/test/java/org/eclipse/jetty/test/jsp/JspMatchingTest.java
2013-01-07 23:45:38 +11:00
Greg Wilkins
ccda9bb10b 397535 Support pluggable alias checking to support symbolic links 2013-01-07 19:57:52 +11:00
Jan Bartel
23e41673bf Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2012-12-24 14:45:16 +11:00
Jan Bartel
f0a9930693 397112 Requests with byte-range throws NPE if requested file has no mimetype (eg no file extension) 2012-12-24 13:52:28 +11:00
Jan Bartel
f9e76b1620 Merge remote-tracking branch 'origin/jetty-7' into jetty-8
Conflicts:
	jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java
	jetty-servlets/src/main/java/org/eclipse/jetty/servlets/MultiPartFilter.java
	jetty-util/src/main/java/org/eclipse/jetty/util/ReadLineInputStream.java
2012-12-14 11:48:55 +11:00
Thomas Becker
b1a7779bd2 393220 remove dead code from ServletHandler and log ServletExceptions in warn instead of debug 2012-12-12 19:27:31 +01:00
Greg Wilkins
3d3b035b22 Merge remote-tracking branch 'origin/jetty-7' into jetty-8
Conflicts:
	jetty-servlet/src/test/java/org/eclipse/jetty/servlet/DefaultServletTest.java
2012-11-12 09:08:53 +11:00
Greg Wilkins
75aedbbf45 393947 implement ETags and update gzip filter to handle them 2012-11-11 09:52:26 +11:00
Jesse McConnell
bb27f561c1 [maven-release-plugin] prepare for next development iteration 2012-11-05 12:24:06 -06:00
Jesse McConnell
1d767e99a3 [maven-release-plugin] prepare release jetty-8.1.8.v20121105 2012-11-05 12:23:59 -06:00
Jesse McConnell
70d591c430 [maven-release-plugin] prepare for next development iteration 2012-11-05 12:16:03 -06:00
Jesse McConnell
017826b4eb [maven-release-plugin] prepare release jetty-7.6.8.v20121105 2012-11-05 12:15:57 -06:00
Greg Wilkins
8723408731 Merge remote-tracking branch 'origin/jetty-7' into jetty-8
Conflicts:
	jetty-servlets/src/main/java/org/eclipse/jetty/servlets/MultiPartFilter.java
2012-11-02 13:17:53 +11:00
Greg Wilkins
65202e9abe 393363 Use Locale.ENGLISH for all toUpperCase and toLowerCase calls 2012-11-02 11:55:00 +11:00
Jan Bartel
0ad8913034 Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2012-10-18 16:43:03 +11:00
Jan Bartel
4769ada666 392239 Allow no error-code or exception for error-pages 2012-10-18 16:34:15 +11:00
Jan Bartel
36a2ed10be 391080 Multipart temp files can be left on disk from Request.getPart and getParts 2012-10-04 18:31:09 +10:00
Jan Bartel
ce3ba58887 390163 Implement ServletRegistration.Dynamic.setServletSecurity 2012-09-29 16:15:55 +10:00
Jan Bartel
e1e321a243 Merge remote-tracking branch 'origin/master' into jetty-8 2012-09-13 14:10:01 +10:00
Jan Bartel
0035343af3 388675 Non utf8 encoded query strings not decoded to parameter map using queryEncoding 2012-09-13 13:35:27 +10:00
Jesse McConnell
a8994178f5 [maven-release-plugin] prepare for next development iteration 2012-09-10 14:18:11 -05:00
Jesse McConnell
92180a9700 [maven-release-plugin] prepare release jetty-7.6.7.v20120910 2012-09-10 14:18:01 -05:00
Jesse McConnell
10e4027579 [maven-release-plugin] prepare for next development iteration 2012-09-10 13:59:34 -05:00
Jesse McConnell
57a6258f96 [maven-release-plugin] prepare release jetty-8.1.7.v20120910 2012-09-10 13:59:10 -05:00
Jesse McConnell
1ec8b2621b [maven-release-plugin] prepare release jetty-7.6.7.v20120910 2012-09-10 13:47:05 -05:00
Jesse McConnell
4180d7e1f5 prepare for release 2012-09-10 12:59:04 -05:00
Jesse McConnell
d37deeea74 [maven-release-plugin] prepare for next development iteration 2012-09-03 13:33:18 -05:00
Jesse McConnell
b418b0dd57 [maven-release-plugin] prepare for next development iteration 2012-09-03 13:33:16 -05:00
Jesse McConnell
41e9b1f6e2 [maven-release-plugin] prepare release jetty-7.6.6.v20120903 2012-09-03 13:33:10 -05:00
Jesse McConnell
6c0b0af2fe [maven-release-plugin] prepare release jetty-8.1.6.v20120903 2012-09-03 13:33:08 -05:00
Jesse McConnell
fd1ab0ed55 merge from master 2012-08-23 16:44:30 -05:00
Jan Bartel
e0276a8f65 JETTY-1515 Include cookies on 304 responses from DefaultServlet. 2012-08-20 14:52:33 +10:00
Jesse McConnell
5de0cee1eb merge from master + license block standardization 2012-08-17 14:50:43 -05:00
Jesse McConnell
00ed549898 standardize license header blocks 2012-08-16 19:11:27 -05:00
Jan Bartel
9164affe0c 386010 JspRuntimeContext rewraps System.err 2012-07-26 18:21:01 +10:00
Jesse McConnell
136514948f [maven-release-plugin] prepare for next development iteration 2012-07-16 13:24:49 -05:00
Jesse McConnell
1bbc677a09 [maven-release-plugin] prepare release jetty-8.1.5.v20120716 2012-07-16 13:24:42 -05:00
Jesse McConnell
c00bb2d6ca reset for release 2012-07-16 12:55:22 -05:00
Jesse McConnell
205e8f74f0 [maven-release-plugin] prepare for next development iteration 2012-07-13 10:20:48 -05:00
Jesse McConnell
c3b5269d60 [maven-release-plugin] prepare release jetty-8.1.5.v20120713 2012-07-13 10:20:23 -05:00
Jesse McConnell
12ecc10c6a [maven-release-plugin] prepare for next development iteration 2012-07-13 09:35:08 -05:00
Jesse McConnell
bf40110fb8 [maven-release-plugin] prepare release jetty-7.6.5.v20120713 2012-07-13 09:34:52 -05:00
Jan Bartel
3bcfc29469 384280 Implement preliminary ServletRegistrations 2012-07-12 16:27:26 +10:00
Jesse McConnell
81d72052c8 merged master to jetty-8 2012-07-11 14:04:49 -05:00
Jesse McConnell
aa941f5711 quick pass through to clean up missing or incorrect license blocks 2012-07-11 12:29:46 -05:00
Jan Bartel
96fe2d6c3f JETTY-1523 It is imposible to map servlet to "/" using WebApplicationInitializer 2012-07-04 17:11:11 +02:00
Jesse McConnell
571b1da632 Merge branch 'master' into jetty-8 2012-06-14 15:46:59 -05:00
Jan Bartel
f94f9a066a Further tweak to issue 381712 to ensure method of finding system classpath is extensible to cope with other environments (eg ant etc). Also pass in parent loader to Loader.getClassPath() method. 2012-06-07 14:07:39 +02:00
Jan Bartel
a7b1dd5e93 Merge remote-tracking branch 'origin/master' into jetty-8 2012-06-07 00:59:37 +02:00