Commit Graph

4784 Commits

Author SHA1 Message Date
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 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 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 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 2013-07-25 07:48:02 -05:00
Jesse McConnell 7fce5e3950 set for release 2013-07-25 07:16:58 -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
Simone Bordet 8eb6649709 412712 - HttpClient does not send the terminal chunk after partial writes.
HttpGenerator._header and HttpGenerator._buffer may be null when
the content is written after a partial write.
In this case, the terminal chunk was not prepared, and therefore never
written.

The fix simply creates a HttpGenerator._header to prepare the terminal
chunk, so that it will be written.
2013-07-10 22:57:48 +02:00
Greg Wilkins 606c042691 Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2013-07-04 15:52:39 +10:00
Greg Wilkins cb0084260f 411216 RequestLogHandler handles async completion 2013-07-04 15:22:56 +10:00
Greg Wilkins 37de67d3d7 Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2013-07-04 14:59:55 +10:00
Greg Wilkins 49f865c45a commented out incomplete test for EOF content 2013-07-04 14:59:22 +10:00
Greg Wilkins 8d455056ec Merge remote-tracking branch 'origin/jetty-7' into jetty-8
Conflicts:
	test-continuation/src/test/java/org/eclipse/jetty/continuation/ContinuationTest.java
2013-07-04 14:40:45 +10:00
Greg Wilkins 7ad4d80af2 411216 RequestLogHandler handles async completion 2013-07-04 14:32:47 +10:00
Jan Bartel 8aac3eef48 Merge remote-tracking branch 'origin/jetty-7' into jetty-8
Conflicts:
	jetty-servlets/src/main/java/org/eclipse/jetty/servlets/MultiPartFilter.java
2013-07-04 11:15:39 +10:00
Jan Bartel 091a419568 411755 MultiPartInputStreamParser fails on base64 encoded content 2013-07-04 11:11:44 +10:00
Jan Bartel c934bbe45c 411755 MultiPartInputStreamParser fails on base64 encoded content 2013-07-04 10:22:22 +10:00
Joakim Erdfelt aa1aae182a Instituting Content-Length OR Transfer-Encoding check in GzipFilter tests
+ Tests currently fail, will let greg look deeply into jetty's eyes to
  determine why it defiantly doesn't want to cooperate with greg.
2013-06-30 16:37:08 -07:00
Jesse McConnell f262dce23b add test for gzip streaming and flushing write 2013-06-28 15:39:12 -05:00
Jesse McConnell c089335f51 add test for gzip streaming and flushing write 2013-06-28 14:58:55 -05:00
Joakim Erdfelt 568bb3db0d Merge branch 'jetty-7' into jetty-8 2013-06-28 10:21:17 -07:00
Joakim Erdfelt 162cbc1416 411909 - GzipFilter flushbuffer() results in erroneous finish() call
+ Bad finish() call changed to more appropriate flush() call
2013-06-28 10:20:20 -07:00
Jan Bartel a7436bc774 Merge remote-tracking branch 'origin/jetty-7' into jetty-8
Conflicts:
	jetty-servlets/src/main/java/org/eclipse/jetty/servlets/MultiPartFilter.java
	jetty-servlets/src/test/java/org/eclipse/jetty/servlets/MultipartFilterTest.java
2013-06-24 16:44:45 +10:00
Jan Bartel 0daddd1a3a 411458 MultiPartFilter getParameterMap doesn't preserve multivalued parameters
411459  MultiPartFilter.Wrapper getParameter should use charset encoding of part
2013-06-24 16:20:04 +10:00
Greg Wilkins 068e67a8df Code cleanups for direct RequestDispatcher access 2013-06-24 13:13:03 +10:00
Greg Wilkins b2b2ce25fc Revert "Code cleanups for direct RequestDispatcher access"
This reverts commit 1ff665f76a.
2013-06-24 13:11:04 +10:00
Greg Wilkins 1ff665f76a Code cleanups for direct RequestDispatcher access 2013-06-24 13:00:21 +10:00