Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
13,244 Commits 70 Branches 462 Tags 370 MiB
Commit Graph

13244 Commits

Author SHA1 Message Date
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
Greg Wilkins d45ebcb2bf Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-08-11 19:14:34 +10:00
Greg Wilkins b45af1a3c9 Issue #185 Implement RFC 7239 
Also handle legacy Https headers for #834
 2016-08-11 18:56:51 +10:00
Greg Wilkins 923f8d5a37 updated test 2016-08-11 08:40:26 +10:00
Jan Bartel 656165619f Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-08-11 08:17:29 +10:00
Jan Bartel e5e3e3300e Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-08-11 08:17:06 +10:00
Jan Bartel c033a3734b Issue #783 
Add loggable exception; remove unused code
 2016-08-11 08:15:45 +10:00
Jesse McConnell a711fac443 Merge branch 'jetty-9.4.x' 2016-08-10 16:56:45 -05:00
Jesse McConnell 7301edefde drop jetty-monitor from build 2016-08-10 16:56:24 -05:00
Jan Bartel 69dbd85b55 Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-08-11 07:54:05 +10:00
Jan Bartel b958298902 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-08-11 07:53:30 +10:00
Jan Bartel 5ef8d50bfb Merge remote-tracking branch 'origin/jetty-9.2.x' into jetty-9.3.x 2016-08-11 07:52:40 +10:00
Jan Bartel 4b8e4707db Issue #832 2016-08-11 07:51:10 +10:00
Simone Bordet 3293df2f36 Merged branch 'jetty-9.4.x' into 'master'. 2016-08-10 18:38:16 +02:00
Simone Bordet 9b6c9438a7 Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2016-08-10 18:37:24 +02:00
Simone Bordet 2eec2251ee Fixes #827 - HTTPClient fails connecting to HTTPS host through an HTTP proxy w/authentication. 
Only successful (200) responses to a CONNECT behave like HEAD and
implicitly have no body.
 2016-08-10 18:36:27 +02:00
Jesse McConnell 3d939de0a8 Merge branch 'jetty-9.4.x' 2016-08-10 09:59:27 -05:00
Jesse McConnell 4c6f6fc290 Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-08-10 09:59:04 -05:00
Jesse McConnell 1bff5c0d6a Merge pull request #823 from WalkerWatch/docupdates/Cleanup 
Doc flow cleanup.
 2016-08-10 09:58:39 -05:00
Jesse McConnell ceed03bbd3 Merge pull request #820 from WalkerWatch/issues/788 
Resolves #788
 2016-08-10 09:58:27 -05:00
Jesse McConnell ffae6fe2a4 Merge pull request #818 from WalkerWatch/docupdates/JettyHandlers 
Updates for Jetty Handlers.
 2016-08-10 09:57:52 -05:00
Jan Bartel e377d53f3a Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-08-10 17:20:53 +10:00
Jan Bartel 0a31aa8416 Issue #830 
Fix merge from 9.3
 2016-08-10 17:18:13 +10:00
Jan Bartel fa8bf3b54a Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-08-10 17:09:18 +10:00
Jan Bartel 5aac143523 Merge remote-tracking branch 'origin/jetty-9.2.x' into jetty-9.3.x 2016-08-10 17:08:42 +10:00
Jan Bartel 0f7cb5e815 Issue #830 2016-08-10 16:52:31 +10:00
Greg Wilkins 352e9ce57e Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-08-10 16:28:31 +10:00
Greg Wilkins 07f547782f Cleanup metadata and HttpURI usage 2016-08-10 16:28:05 +10:00
Greg Wilkins 08b9ac6b27 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-08-10 16:27:22 +10:00