4682 Commits

Author SHA1 Message Date
Jesse McConnell
1910fb8ce4 [Bug 391345] fix missing br tag in statistics servlet 2013-01-29 14:55:22 -06:00
Jesse McConnell
ddce31a323 [Bug 396574] add JETTY_HOME as a location for pid to be found 2013-01-29 14:48:25 -06:00
Jesse McConnell
01f7bc1e12 Merge branch 'jetty-7' into jetty-8 2013-01-29 14:08:25 -06:00
Jesse McConnell
b9b7e76b7c [Bug 396574] add /Users/jesse/installs/jetty as a location for pid to be found 2013-01-29 14:07:27 -06:00
Jesse McConnell
3b6cab63e2 Merge branch 'jetty-7' into jetty-8 2013-01-29 13:42:29 -06:00
Jesse McConnell
35ebe6cea3 [Bug 394541] remove continuation jar from distro, add as dep to test-jetty-webapp 2013-01-29 13:34:45 -06:00
Thomas Becker
988206c36a 393968 fix typo in javadoc 2013-01-28 16:11:33 +01:00
Greg Wilkins
9b383c5780 381521 Only set Vary header when content could be compressed 2013-01-26 11:03:46 +11:00
Jesse McConnell
f16fc7e7b7 Merge branch 'jetty-7' into jetty-8 2013-01-25 16:53:18 -06:00
Jesse McConnell
1a31067369 Add note about getCanonicalFile check and fix IdleSession test in test hash sessions 2013-01-25 16:25:59 -06:00
Jesse McConnell
b3043276bc add corresponding correct file removal check 2013-01-25 16:12:08 -06:00
Jesse McConnell
4bed164462 Merge branch 'jetty-7' into jetty-8 2013-01-25 15:31:13 -06:00
Jesse McConnell
111bd19634 doh, header 2013-01-25 15:30:59 -06:00
Jesse McConnell
d8a3b76862 Merge branch 'jetty-7' into jetty-8 2013-01-25 15:24:41 -06:00
Jesse McConnell
d4568feba6 [Bug 399132] check parent dir of session store against file to be removed 2013-01-25 15:22:16 -06:00
Jesse McConnell
368d7bbb72 Merge branch 'jetty-7' into jetty-8 2013-01-25 11:35:11 -06:00
Jesse McConnell
c00e8d0283 Add analystics to aggregate javadoc profile (so it only targeted on actual release deployment.) 2013-01-25 11:26:25 -06:00
Greg Wilkins
4a1a4700c3 382237 support non java JSON classes 2013-01-25 12:28:54 +11:00
Greg Wilkins
3c6deaf83c Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2013-01-25 09:43:57 +11:00
Greg Wilkins
c9d026703f removed System.outs 2013-01-25 09:42:51 +11:00
Greg Wilkins
fd25e3a742 Merge remote-tracking branch 'origin/jetty-7' into jetty-8
Conflicts:
	jetty-servlets/src/test/java/org/eclipse/jetty/servlets/gzip/GzipTester.java
2013-01-24 14:30:45 +11:00
Greg Wilkins
161a14d9d0 381521 Only set Vary header when content could be compressed 2013-01-24 14:07:25 +11:00
Joakim Erdfelt
b6d551675b Merge branch 'jetty-7' into jetty-8 2013-01-23 13:58:34 -07:00
Joakim Erdfelt
a7aab0b6c6 Bumping up jetty-version-maven-plugin to 1.0.9 2013-01-23 13:56:05 -07:00
Jan Bartel
92af54c3fc Make IdleTimeoutTest jdk1.5 compliant 2013-01-22 08:58:35 +11:00
Jan Bartel
fe48239b34 Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2013-01-21 16:54:06 +11:00
Jan Bartel
91a94f8213 362226 HttpConnection "wait" call causes thread resource exhaustion 2013-01-21 16:43:57 +11:00
Greg Wilkins
aba64046cf Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2013-01-21 12:13:10 +11:00
Greg Wilkins
b36411d382 381521 Only set Vary header when content could be compressed 2013-01-21 12:09:46 +11:00
Greg Wilkins
9cf08249e0 Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2013-01-17 09:16:40 +11:00
Greg Wilkins
747eeb87c1 398337 UTF-16 percent encoding in UTF-16 form content 2013-01-17 09:04:04 +11:00
Greg Wilkins
c4e77feefa unit test uses fake JSP 2013-01-15 15:53:54 +11:00
Jan Bartel
0681168eed Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2013-01-15 14:47:53 +11:00
Jan Bartel
98146f2ca2 396500 HttpClient Exchange takes forever to complete when less content sent than Content-Length 2013-01-15 14:17:41 +11:00
Jan Bartel
284d950eee Update date on copyright header for ServletHandlerTest class 2013-01-14 13:47:07 +11:00
Jan Bartel
1689aa8143 396253 FilterRegistration wrong order 2013-01-14 12:56:43 +11:00
Jesse McConnell
863944873d merge from 7 and update license blocks for 2013 2013-01-11 15:01:16 -06:00
Jesse McConnell
a4dbb5823c update license blocks for 2013 2013-01-11 14:57:51 -06:00
Greg Wilkins
e4d51d5c16 Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2013-01-10 13:25:51 +11:00
Greg Wilkins
1add18a57b 397535 Support pluggable alias checking to support symbolic links 2013-01-10 13:23:11 +11:00
Greg Wilkins
08afd17b88 Merge remote-tracking branch 'origin/jetty-7' into jetty-8
Conflicts:
	tests/test-integration/src/test/java/org/eclipse/jetty/test/jsp/JspAndDefaultWithoutAliasesTest.java
2013-01-10 13:04:30 +11:00
Greg Wilkins
8deb1222db Making change to reintroduce this test to merged 8 2013-01-10 13:03:27 +11:00
Greg Wilkins
8232a87411 temporarly remove test 2013-01-10 12:52:21 +11:00
Greg Wilkins
74edf1867c Merge remote-tracking branch 'origin/jetty-7' into jetty-8
Conflicts:
	tests/test-integration/src/test/java/org/eclipse/jetty/test/jsp/JspAndDefaultWithoutAliasesTest.java
2013-01-10 12:06:55 +11:00
Greg Wilkins
a17a290eb5 381521 Only set Vary header when content could be compressed 2013-01-10 12:02:11 +11:00
Joakim Erdfelt
7a3b440a62 Refactoring Jsp + DefaultServlet + Resource Aliasing test cases 2013-01-09 15:22:32 -07:00
Greg Wilkins
3cba027390 Merge remote-tracking branch 'origin/jetty-7' into jetty-8
Conflicts:
	jetty-server/src/test/java/org/eclipse/jetty/server/handler/ContextHandlerAliasTest.java
2013-01-08 09:13:39 +11:00
Greg Wilkins
64ed66db8b Remove test needing java 7 2013-01-08 09:12:08 +11:00
Joakim Erdfelt
83aa65415b Fixing for JDK 6 2013-01-07 09:37:13 -07: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