Commit Graph

13272 Commits

Author SHA1 Message Date
Joakim Erdfelt b966ebc6bc Merge branch 'jetty-9.4.x' 2016-08-16 06:30:46 -07:00
Joakim Erdfelt 9a8ed0340c Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-08-16 06:30:26 -07:00
Joakim Erdfelt 988e34489b Merge branch 'jetty-9.2.x' into jetty-9.3.x 2016-08-16 06:29:58 -07:00
Joakim Erdfelt 526d1415a4 Ignoring flappy test 2016-08-16 06:29:41 -07:00
Jesse McConnell d85b072379 set for dev 2016-08-16 08:19:40 -05:00
Jesse McConnell 7aa63e0313 set for dev 2016-08-16 08:19:10 -05:00
Jesse McConnell 9b6af31dce merge from 9.4.x after M1 release 2016-08-16 08:18:27 -05:00
Jesse McConnell e5d7eaafc6 Merge branch 'release-9.4.0.M1' into jetty-9.4.x 2016-08-16 08:17:24 -05:00
Jesse McConnell 984dd7ed3c [maven-release-plugin] prepare for next development iteration 2016-08-15 23:04:15 +00:00
Jesse McConnell e38e6b5a7f [maven-release-plugin] prepare release jetty-9.4.0.M1 2016-08-15 23:04:10 +00:00
Joakim Erdfelt a26bd0ad26 Merge branch 'jetty-9.4.x' 2016-08-15 15:23:57 -07:00
Joakim Erdfelt a9be99123e Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-08-15 15:23:21 -07:00
Joakim Erdfelt 4527ba1801 Merge branch 'jetty-9.2.x' into jetty-9.3.x 2016-08-15 15:22:53 -07:00
Joakim Erdfelt 36ac693385 Some Jenkinsfile cleanup 2016-08-15 15:18:18 -07:00
Joakim Erdfelt 78544b999b Adding email on stage failure 2016-08-15 13:37:38 -07:00
Jesse McConnell eb2cadf7fe Merge branch 'jetty-9.4.x' 2016-08-15 13:41:46 -05:00
Jesse McConnell 72417d2b00 merge 9.4.x 2016-08-15 18:38:50 +00:00
Jesse McConnell d5960d9900 scrape out remaining monitor references 2016-08-15 13:36:50 -05:00
Jesse McConnell be1e9ed9d8 set for release 2016-08-15 09:41:21 -05:00
Greg Wilkins e34718a806 Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-08-16 00:12:20 +10:00
Greg Wilkins a90e197633 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-08-16 00:11:48 +10:00
Greg Wilkins 94c1424029 Issue #841 support reset in buffering interceptors
Added resetBuffers to the output interceptor.
2016-08-15 19:38:18 +10:00
Simone Bordet a99be6de1c Merged branch 'jetty-9.4.x' into 'master'. 2016-08-14 23:29:58 +02:00
Simone Bordet 13f638f710 Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2016-08-14 23:29:36 +02:00
Simone Bordet 11bc5cce66 Fixes #839 - Test Failure: MaxConcurrentStreamsTest.testOneConcurrentStream().
Fixed race condition where the prime request response was arriving to
the client before the server had finished to clean up and remove the
prime stream. Subsequent client requests were rejected because the
prime stream was still "alive".
2016-08-14 23:25:03 +02:00
Simone Bordet 0e28febfd7 Merged branch 'jetty-9.4.x' into 'master'.
Removed deprecated method.
2016-08-14 12:34:20 +02:00
Simone Bordet 0140d09997 Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'.
Restored backwards compatibility on Stream.Listener interface.
2016-08-14 12:22:54 +02:00
Simone Bordet efc5265fe5 Improved javadocs. 2016-08-14 12:17:35 +02:00
Simone Bordet f12d87e5a4 Merged branch 'jetty-9.4.x' into 'master'. 2016-08-12 17:14:26 +02:00
Simone Bordet c5a2770790 Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2016-08-12 17:12:25 +02:00
Simone Bordet ea20a5f2ef Fixes #836 - Test Failure: HttpClientTransportOverHTTP2Test.testLastStreamId()
Fixed race condition: the completion was happening before the stream
promise for the request was succeeded.
2016-08-12 17:10:43 +02:00
Simone Bordet 637fa9ce37 Merged branch 'jetty-9.4.x' into 'master'. 2016-08-12 14:58:20 +02:00
Simone Bordet 6f20feddcb Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2016-08-12 14:57:47 +02:00
Simone Bordet 9f9e9ecaf9 Changes for Issue #824 (#825)
* Issue #824 - Implement notifications of asynchronous error conditions for HTTP/2.

Introduced new method HttpChannelState.asyncError() to be called in
case of asynchronous errors, i.e. those errors that do not happen in
the HttpChannel.handle() loop.

Implemented HTTP/2 callbacks to call HttpChannelState.asyncError()
and plug in the existing error handling mechanism.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>

* Issue #824 - Implement notifications of asynchronous error conditions for HTTP/2.

Improved implementation to ignore idle timeouts for streams and
session in case that requests are being handled, matching the HTTP/1.1
behavior.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2016-08-12 11:02:52 +02:00
Greg Wilkins b1fbcf033a Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-08-12 14:07:04 +10:00
Greg Wilkins 6c635e3263 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-08-12 14:06:36 +10:00
Greg Wilkins 46cdeca543 Use dynamic ports for OSGi tests 2016-08-12 14:06:14 +10:00
Jan Bartel 6da270e265 Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-08-12 11:59:03 +10:00
Greg Wilkins 6828be658f Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-08-12 11:47:56 +10:00
Jan Bartel cb6c8508a9 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-08-12 11:47:16 +10:00
Jan Bartel 56aaf6d1be Issue #700 add osgi ServiceLoader headers to jetty-http-spi 2016-08-12 11:46:04 +10:00
Greg Wilkins 20fd9c08b0 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-08-12 11:44:45 +10:00
Greg Wilkins 5fefd5d8bd Issue #185 Implement RFC 7239
Improved test harness
Added more configurability
Fixed SSL session and certificate bugs
2016-08-12 11:39:36 +10:00
Jan Bartel 176ee5774c Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-08-12 11:32:08 +10:00
Jan Bartel 518c1f2575 Issue #837
Update to apache jsp 8.5.4
2016-08-12 11:00:56 +10:00
Greg Wilkins 5c9a637d4f UnitTest #833 2016-08-12 10:29:38 +10:00
Simone Bordet c699664912 Merged branch 'jetty-9.4.x' into 'master'. 2016-08-12 00:12:18 +02:00
Simone Bordet c42212d7b0 Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2016-08-12 00:08:12 +02:00
Greg Wilkins cafc0f7210 Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-08-12 08:01:41 +10:00
Simone Bordet 7041e5102d Fixes #827 - HTTPClient fails connecting to HTTPS host through an HTTP proxy w/authentication.
Using https scheme in CONNECT request if the proxy is secure.
A Proxy must not match its own address.
Resolved correctly request URI in case of CONNECT requests.
2016-08-11 19:25:41 +02:00