Commit Graph

3992 Commits

Author SHA1 Message Date
Jesse McConnell e45a89694a [maven-release-plugin] prepare for next development iteration 2012-05-24 09:30:58 -05:00
Jesse McConnell 36fc6fe890 [maven-release-plugin] prepare release jetty-8.1.4.v20120524 2012-05-24 09:30:52 -05:00
Jesse McConnell d0a92ebb54 Updating VERSION.txt top section 2012-05-24 09:02:07 -05:00
Jesse McConnell 6e4f83f151 Merge branch 'jetty-8' into release-8 2012-05-24 09:00:30 -05:00
Jesse McConnell cf214ffeef Merge branch 'master' into jetty-8 2012-05-24 08:35:22 -05:00
Jesse McConnell c7a9adaa32 reset for release 2012-05-24 08:33:44 -05:00
Jesse McConnell c8fe38733f reset versions for release 2012-05-24 08:30:26 -05:00
Greg Wilkins d80be96e41 379046 avoid closing idle connections from selector thread 2012-05-24 13:20:44 +02:00
Jan Bartel 98ed2a9d9a Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project 2012-05-23 09:57:57 +02:00
Jesse McConnell 482d93eaff Merge branch 'release-8' into jetty-8 2012-05-22 16:49:51 -05:00
Jesse McConnell b51f521772 set for dev 2012-05-22 16:49:20 -05:00
Jesse McConnell fcca540907 Merge branch 'release' 2012-05-22 16:48:52 -05:00
Jesse McConnell 1eb73bae2d set for dev 2012-05-22 16:48:40 -05:00
Jesse McConnell ea176f0586 [maven-release-plugin] prepare for next development iteration 2012-05-22 15:14:05 -05:00
Jesse McConnell 3fdda881d8 [maven-release-plugin] prepare release jetty-8.1.4.v20120522 2012-05-22 15:13:56 -05:00
Jesse McConnell 300a37319a [maven-release-plugin] prepare for next development iteration 2012-05-22 14:34:10 -05:00
Jesse McConnell 9ccd059375 [maven-release-plugin] prepare release jetty-7.6.4.v20120522 2012-05-22 14:33:59 -05:00
Jesse McConnell 5a13828db6 Merge branch 'jetty-8' into release-8 2012-05-22 14:03:30 -05:00
Jesse McConnell ce5e5cbad2 Merge branch 'master' into jetty-8 2012-05-22 14:02:58 -05:00
Jesse McConnell bbe7b4b67c Merge branch 'master' into release 2012-05-22 13:59:02 -05:00
Jesse McConnell 32f8900040 fix broken unit test because getting the last modified time is a time zone dependent thing and we don't _all_ live in germany and italy 2012-05-22 13:57:58 -05:00
Jesse McConnell 54d1ff7a19 Updating VERSION.txt top section 2012-05-22 11:54:50 -05:00
Jesse McConnell a2ed87a046 Updating VERSION.txt top section 2012-05-22 11:52:59 -05:00
Jesse McConnell 13cb38e38e Merge branch 'jetty-8' into release-8 2012-05-22 11:52:30 -05:00
Jesse McConnell 2613425243 Merge branch 'master' into release 2012-05-22 11:51:34 -05:00
Thomas Becker b371315606 make spdy tests more reliable: fix race condition with goAway frame
Change-Id: I3bbdb8eee4a12f082f83730209bd0f8cf2fe7d03
2012-05-22 18:16:12 +02:00
Jan Bartel 34954bc617 Merge remote-tracking branch 'origin/master' into jetty-8 2012-05-22 17:28:40 +02:00
Simone Bordet ced2d9efd3 Made test more reliable. 2012-05-22 15:55:42 +02:00
Greg Wilkins ca2a040a39 380034 last modified times taken from JarEntry for JarFile resources 2012-05-22 15:05:29 +02:00
Greg Wilkins d436400db1 Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project 2012-05-22 14:44:17 +02:00
Greg Wilkins 077b220cf8 380212 Clear buffer if parsing fails due to full buffer 2012-05-22 14:23:40 +02:00
Greg Wilkins 4ed88e71e0 Merge "379194 - ProxyServlet enhancement to enable easy creation of alternative HttpClient implementations" 2012-05-22 08:14:07 -04:00
Greg Wilkins 5c6ad51300 Merge "New test for GzipFilter that tests writing a text message to the outputstream and setting the status code afterwards" 2012-05-22 08:11:28 -04:00
Greg Wilkins 473ebb447a Merge "377403: fix GzipFilter.java javadoc" 2012-05-22 07:59:56 -04:00
Greg Wilkins c6c2e000ad Merge "379116: start.jar fix to shutdown child processes with --exec. Remove finally block and replace with a shutdown hook in _exec if branch." 2012-05-22 07:57:41 -04:00
Jan Bartel 37bce89b8f 379909 FormAuthenticator Rembers only the URL of first Request before authentication 2012-05-22 13:13:10 +02:00
Greg Wilkins e002fc4a5e 367608 - ignore the aysncrequestreadtest as it is known to fail and is waiting for a fix 2012-05-22 12:01:09 +02:00
Jan Bartel 5420009f0f 380222 JettyPolicyRuntimeTest failure 2012-05-22 11:31:33 +02:00
Jan Bartel 6f6164862f Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project 2012-05-22 10:26:31 +02:00
Thomas Becker fdf6dac1d3 spdy: no push if the main request contains if-modified-since header
Change-Id: I9462d8d3ff68dd9cf74ad5a45a093e598c6d704b
2012-05-14 18:50:49 +02:00
Jan Bartel cd614823a6 Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project 2012-05-14 18:44:48 +02:00
pgdad af0a8e4aeb 379194 - ProxyServlet enhancement to enable easy creation of alternative HttpClient implementations
Change-Id: I8246947afa7f3921150efef2040006e346cd0ca5
2012-05-10 22:01:24 -04:00
Thomas Becker d7fec35028 379116: start.jar fix to shutdown child processes with --exec. Remove finally block and replace with a shutdown hook in _exec if branch.
Change-Id: I85af53090a2797f433aca22276b413762999a477
2012-05-10 17:04:47 +02:00
Jan Bartel 9773113a47 After discussion with original author Hugues, decided to remove this implementation in favour of using only JettyServerServiceTracker. 2012-05-10 14:54:42 +02:00
Thomas Becker 5687aa8beb SPDY: move probably blocking/long running flush out of synchronized block in StandardSession.syn(..)
Change-Id: I29b748495adb1fa48fab8dc130a8067ff3be6bc5
2012-05-10 12:29:58 +02:00
Jan Bartel ea557759b3 379089 DefaultServlet ignores its resourceBase and uses context's ResourceCollection when listing diretories 2012-05-10 11:30:04 +02:00
Jan Bartel b281b037dd 379015 Use factored jetty xml config files for defaults 2012-05-10 11:27:58 +02:00
Jan Bartel 9aa5f49df5 379015 Use factored jetty xml config files for defaults 2012-05-09 18:28:28 +02:00
Jan Bartel 3618be23cd Cosmetic changes: typos, javadocs, comments, indenting 2012-05-09 16:47:45 +02:00
Jan Bartel eae1b01122 Reformat and reindent code. 2012-05-09 09:33:44 +02:00