4804 Commits

Author SHA1 Message Date
Jesse McConnell
223c8ad7b4 Merge branch 'release-8' into jetty-8 2013-07-31 12:12:59 -05:00
Jesse McConnell
2380d748f8 set for dev 2013-07-31 12:12:38 -05:00
Jesse McConnell
20bd1e0f96 [maven-release-plugin] prepare for next development iteration 2013-07-26 11:50:17 -05:00
Jesse McConnell
49c3b2c32a [maven-release-plugin] prepare release jetty-8.1.12.v20130726 jetty-8.1.12.v20130726 2013-07-26 11:49:58 -05:00
Jesse McConnell
6ed360c480 reset for release 2013-07-26 11:23:57 -05:00
Jesse McConnell
8de5fbbac7 Merge branch 'release-8' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into release-8 2013-07-26 11:18:52 -05:00
Jesse McConnell
1a5117e9ab [maven-release-plugin] prepare release jetty-8.1.12.v20130726 2013-07-26 11:18:24 -05:00
Jesse McConnell
ed660fffd7 set for release 2013-07-26 10:51:28 -05:00
Jesse McConnell
98249488d4 set for release 2013-07-26 10:49:24 -05:00
Jesse McConnell
869389e857 set for release 2013-07-26 10:48:53 -05:00
Jesse McConnell
d87a3884ad Merge branch 'jetty-8' into release-8 2013-07-26 10:38:24 -05:00
Jesse McConnell
5a0278fc3f Merge branch 'jetty-7' into jetty-8 2013-07-26 10:26:46 -05:00
David Harrigan
192f2d7002 BUG-413812
Mark RateTracker as Serializable to allow it to be stored in a Session that is
eventually persisted in a distributed memory platform.

Signed-off-by: David Harrigan <dharrigan@gmail.com>
2013-07-26 10:24:03 -05:00
Simone Bordet
b7b3ced092 Merged branch 'jetty-7' into 'jetty-8'. 2013-07-26 13:46:08 +02:00
Simone Bordet
2be4ca5921 Reverted VERSION.txt. 2013-07-26 13:45:41 +02:00
Simone Bordet
5c7eb9e265 Reverted version to 7.6.12-SNAPSHOT. 2013-07-26 13:36:35 +02:00
Simone Bordet
a0519a9693 413371 - Default JSON.Converters for List and Set.
Introduced a JSONCollectionConvertor that is able to convert
Collections, and hence both List and Set.

Code cleanups.
2013-07-26 13:09:11 +02:00
Greg Wilkins
4a5567433c 413372 JSON Enum uses name rather than toString() 2013-07-26 16:06:32 +10:00
Jesse McConnell
9137644595 Merge branch 'release-7' into jetty-7 2013-07-25 15:10:09 -05:00
Jesse McConnell
e810727b55 set for dev 2013-07-25 15:09:03 -05:00
Jesse McConnell
49045558ef [maven-release-plugin] prepare for next development iteration 2013-07-25 14:07:12 -05:00
Jesse McConnell
9b888d5c22 [maven-release-plugin] prepare release jetty-7.6.12.v20130725 2013-07-25 14:06:53 -05:00
Jesse McConnell
de2840ca1e [maven-release-plugin] prepare for next development iteration 2013-07-25 12:52:15 -05:00
Jesse McConnell
3e94867f7f [maven-release-plugin] prepare release jetty-8.1.12.v20130725 jetty-8.1.12.v20130725 2013-07-25 12:52:07 -05:00
Jesse McConnell
6338ce23e0 remove test 2013-07-25 12:28:05 -05:00
Jesse McConnell
6b8f29bb88 add import 2013-07-25 12:27:36 -05:00
Jesse McConnell
3813b2da76 remove for release 2013-07-25 12:05:33 -05:00
Jesse McConnell
bc679809f8 [maven-release-plugin] prepare for next development iteration 2013-07-25 11:25:58 -05:00
Jesse McConnell
39ec9b8051 [maven-release-plugin] prepare release jetty-7.6.12.v20130725 2013-07-25 11:25:51 -05:00
Jesse McConnell
a097e9ff3e set for release 2013-07-25 11:04:03 -05:00
Jesse McConnell
5a0f8f8e4d Merge branch 'jetty-8' into release-8 2013-07-25 11:01:58 -05:00
Jesse McConnell
3c9bcd3ece set for release 2013-07-25 10:59:36 -05:00
Jesse McConnell
f93e83ad3c Merge branch 'jetty-7' into release-7 2013-07-25 10:56:33 -05:00
Simone Bordet
aa66b520f7 Merged branch 'jetty-7' into 'jetty-8'. 2013-07-25 17:41:06 +02:00
Simone Bordet
eed3a7fec0 Increase external proxy test timeout. 2013-07-25 17:36:55 +02:00
Simone Bordet
06504f2c65 Fixed proxy test. 2013-07-25 17:20:17 +02:00
Simone Bordet
ee3c249579 Merged branch 'jetty-7' into 'jetty-8'. 2013-07-25 16:08:58 +02:00
Simone Bordet
3b18490ead 409028 - Jetty HttpClient does not work with proxy CONNECT method.
The problem was due to the fact that the server replied with HTTP/1.0
to the CONNECT request; because of this, the parser was set as non
persistent, and the tunnel was immediately closed.

Now we are setting the parser as persistent if the method is a CONNECT,
no matter what HTTP version the server specifies.
2013-07-25 16:08:02 +02:00
Jesse McConnell
e0ad2c4ee1 [maven-release-plugin] prepare for next development iteration 2013-07-25 07:52:39 -05:00
Jesse McConnell
99712058ca [maven-release-plugin] prepare release jetty-8.1.11.v20130725 2013-07-25 07:52:32 -05:00
Jesse McConnell
767dbe6778 [maven-release-plugin] prepare for next development iteration 2013-07-25 07:48:09 -05:00
Jesse McConnell
cfa6076c4f [maven-release-plugin] prepare release jetty-7.6.11.v20130725 jetty-7.6.11.v20130725 2013-07-25 07:48:02 -05:00
Jesse McConnell
c805b15b3e set for release 2013-07-25 07:17:10 -05:00
Jesse McConnell
7fce5e3950 set for release 2013-07-25 07:16:58 -05:00
Jesse McConnell
e3cc7023f8 Merge branch 'jetty-8' into release-8 2013-07-25 07:12:10 -05:00
Jesse McConnell
4c805903f8 Merge branch 'jetty-7' into release-7 2013-07-25 07:08:49 -05:00
Jan Bartel
72b077921d Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2013-07-25 11:26:35 +10:00
Greg Wilkins
2f08ba2948 413684 - Trailing slash shows JSP source
Fixed alias checkers.   Non existent directory does check for none existence.  Prefix and Suffix check look for none empty/trivial prefix/suffixes
2013-07-25 11:01:23 +10:00
Joakim Erdfelt
ab7268e516 413684 - Trailing slash shows JSP source
+ Adding testcase to replicate issue.
2013-07-24 16:43:02 -07:00
Thomas Becker
af02334ff7 412750 HttpClient close expired connections fix 2013-07-11 15:13:01 +02:00