3644 Commits

Author SHA1 Message Date
Greg Wilkins
0fa8c565bd Issue #1835 reentrant lock in AbstractConnector. 2017-09-22 12:45:14 +10:00
Simone Bordet
7768a781be Fixes #1836 - Review Locker.
Made Locker a simpler wrapper around ReentrantLock.
Deprecated lockIfNotHeld() and replaced its usages.
2017-09-21 19:16:36 +02:00
Greg Wilkins
8abb108b7e Fixed #1833 Request.startAsycn requires a context 2017-09-21 14:09:21 +10:00
Greg Wilkins
bddd5ca5de Issue #1832 SelectChannelServerSslTest.testFullMethod
Work around for now by accepting exception rather than error response.
2017-09-21 14:00:58 +10:00
Joakim Erdfelt
236658d61c Build fix 2017-09-20 15:02:56 -07:00
Joakim Erdfelt
14573025f0 Merge branch 'jetty-9.4.x' of github.com:eclipse/jetty.project into jetty-9.4.x 2017-09-20 14:46:26 -07:00
Joakim Erdfelt
5fc0167003 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2017-09-20 14:46:13 -07:00
Greg Wilkins
31a9b6f2e8 Issue #215 Conscrypt module for SSL and ALPN
Squash of the following commits:

commit 53e503b48d290e2ff83b214fd81572bf4cacd9ab
Merge: cc4ed73 d77ba82
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Sep 21 07:27:45 2017 +1000

    Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-9.4.x-215-conscrypt-alpn

commit cc4ed73ae45e69addbb31221a860dd0984d92ac5
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Sep 21 07:26:45 2017 +1000

    Issue #215 Conscrypt module debug

commit f640693f7ef61f8012d1454b2ed364740b330a6e
Author: Simone Bordet <simone.bordet@gmail.com>
Date:   Wed Sep 20 18:23:51 2017 +0200

    Issue #215 - Consider native ALPN/SSL provider.

    Fixed server-side ALPN negotiation for Conscrypt.

commit 669e992624a0f8f23103c70ba895b877dcec2404
Author: Simone Bordet <simone.bordet@gmail.com>
Date:   Wed Sep 20 16:56:20 2017 +0200

    Issue #215 - Consider native ALPN/SSL provider.

    Fixed client-side ALPN negotiation for Conscrypt.

commit aa873263d73c19461890bd1f9a417c796412b3d2
Author: Simone Bordet <simone.bordet@gmail.com>
Date:   Wed Sep 20 15:26:45 2017 +0200

    Issue #215 - Consider native ALPN/SSL provider.

    Code cleanups.

    Changed ALPNProcessor.init(boolean) to init().
    Removed unnecessary try/catches and simplified exception handling.

commit db9b169c35da956bcc42013f9bb8acddd7238d14
Author: Greg Wilkins <gregw@webtide.com>
Date:   Wed Sep 20 18:07:30 2017 +1000

    Issue #215 Conscrypt SSL pom cleanups

commit 096572e029352428275e86a964fa92dbeee19a65
Author: Greg Wilkins <gregw@webtide.com>
Date:   Wed Sep 20 15:57:20 2017 +1000

    Issue #215 Conscrypt SSL ALPN cleanups

commit b3c1bcb1fa9a7e15517a348270738e24c7b0a820
Merge: c836708 effec06
Author: Greg Wilkins <gregw@webtide.com>
Date:   Wed Sep 20 15:46:13 2017 +1000

    Merge branch 'jetty-9.4.x' into jetty-9.4.x-215-conscrypt-alpn

commit c836708a9bcd5fb61ed26302eb7d71b618cce329
Merge: de039d4 d9ecd5e
Author: Greg Wilkins <gregw@webtide.com>
Date:   Wed Sep 20 14:56:06 2017 +1000

    Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-9.4.x-215-conscrypt-alpn

commit de039d42f23f9caa239e5ddee0242b9a83a45441
Author: Greg Wilkins <gregw@webtide.com>
Date:   Tue Sep 19 17:19:49 2017 +1000

    Fix #1823 MimeTypes for ResourceHandler mp4

commit ff1e08434415cd6d909715547c2a54dbd0fc5dee
Author: Greg Wilkins <gregw@webtide.com>
Date:   Tue Sep 19 14:21:39 2017 +1000

    Issue #215

commit 3bb63147ebf4967698f51a65f009d80010038b20
Author: Greg Wilkins <gregw@webtide.com>
Date:   Tue Sep 19 14:08:05 2017 +1000

    Issue #215

    Use conscrypt 1.0.0.RC10 uber jar

commit 8b18099fde67f12d0e98d0b414568c9b76835459
Merge: 06f6530 eee4117
Author: Greg Wilkins <gregw@webtide.com>
Date:   Tue Sep 19 10:35:43 2017 +1000

    Merge branch 'jetty-9.4.x' into jetty-9.4.x-conscrypt-alpn

commit 06f65305d536250c5dfa2aaa84ffacdac113c8fc
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Sep 14 16:04:05 2017 +1000

    Issue #215 Conscrypt ALPN provider

    First attempt at client support

commit 32d77461935263da86fb363233af0aa5a159d1fc
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Sep 14 09:48:43 2017 +1000

    Issue #215 Conscrypt ALPN provider

commit bc051dca5e3ea7fed6ddb3a25ba5cecbd1c5b18b
Merge: 573c9f0 6c47126
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Sep 14 08:49:10 2017 +1000

    Merge branch 'jetty-9.4.x' into jetty-9.4.x-conscrypt-alpn

commit 573c9f060172b2863b0b0a94c1ec2fb9a8762fa2
Merge: 47e22fe 3399fd3
Author: Greg Wilkins <gregw@webtide.com>
Date:   Wed Sep 13 15:24:27 2017 +1000

    Merge branch 'jetty-9.4.x' into jetty-9.4.x-conscrypt-alpn

commit 47e22fe2e4f8e3cc71f3117ad7d789dc3ea56675
Merge: 63ffa2b 187f37d
Author: Greg Wilkins <gregw@webtide.com>
Date:   Wed Sep 13 11:04:24 2017 +1000

    Merge branch 'jetty-9.4.x' into jetty-9.4.x-conscrypt-alpn

commit 63ffa2bdc13fa85d02459855a3f8e0de4f4b4f1b
Merge: cf1443d a0cb424
Author: Greg Wilkins <gregw@webtide.com>
Date:   Tue Sep 12 09:04:45 2017 +1000

    Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-9.4.x-conscrypt-alpn

commit cf1443d3ab71ac1aec7f153c233e869a3d6f783f
Author: Greg Wilkins <gregw@webtide.com>
Date:   Tue Sep 12 09:03:52 2017 +1000

    Issue #215 Conscrypt ALPN provider

commit a37aec327274042e1007f4146a3c3ec06fb424d9
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Sep 7 21:19:28 2017 +1000

    Issue #215 Conscrypt ALPN provider

commit 6d7f39b2b0e53570afa61be5abfef2a352f80cf3
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Sep 7 18:22:19 2017 +1000

    Issue #215 Conscrypt ALPN provider

commit a7d0f46b57091550724242693559d786180896ff
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Sep 7 18:16:35 2017 +1000

    Issue #215 Conscrypt ALPN provider
2017-09-21 07:34:25 +10:00
Joakim Erdfelt
36a649a66c Merge branch 'jetty-9.3.x' of github.com:eclipse/jetty.project into jetty-9.3.x 2017-09-20 14:29:17 -07:00
Joakim Erdfelt
d9865a02ba Updating to version 9.4.8-SNAPSHOT 2017-09-14 08:44:27 -07:00
Joakim Erdfelt
80fb788d0c Updating to version 9.4.7.v20170914 2017-09-14 07:35:18 -07:00
Simone Bordet
5d8c605d96 Updated logic to calculate the minimum number of threads. 2017-09-08 10:52:40 +02:00
Joakim Erdfelt
fb86b8e54f Merge branch 'jetty-9.4.x' of github.com:eclipse/jetty.project into jetty-9.4.x 2017-09-07 08:55:54 -07:00
Jan Bartel
8db5cc4f96 Issue #1795 2017-09-07 08:59:03 +10:00
Joakim Erdfelt
aa85bca2a9 Minor test cleanup 2017-09-06 13:49:20 -07:00
Jan Bartel
df0e6d7f43 Issue #1793 2017-09-06 18:00:31 +10:00
Jan Bartel
d8e035ba0d Issue #1794 2017-09-06 18:00:31 +10:00
Greg Wilkins
57e86c5c41 Issue #1416 GzipHandler If-Match 2017-09-05 18:31:56 +10:00
Greg Wilkins
7be350370c Issue #1732 Connection Limit (#1745)
Configure accepting during low resources from module/ini
2017-09-05 17:27:36 +10:00
Greg Wilkins
dd20272c48 Issue #1732 Connection Limit (#1745)
* Issue #1732 Connection Limit

Added a listener to stop accepting when a limit is reached

Update LowResourceMonitor to not accept in low resources
2017-09-05 15:21:51 +10:00
Simone Bordet
cef5358fc8 Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2017-08-21 17:02:20 +02:00
Simone Bordet
6cb6a9e16f Fixes #1719 - Improve handling of HTTP/2 queued requests.
Clearing _waitingForContent in recycle().
2017-08-21 16:41:04 +02:00
Joakim Erdfelt
0bad6d1e90 Merge branch 'jetty-9.3.x' of github.com:eclipse/jetty.project into jetty-9.3.x 2017-08-17 11:50:45 -07:00
Joakim Erdfelt
9c7af33806 Issue #1737 - fixing up ResourceHandler behavior with welcome files 2017-08-16 09:34:07 -07:00
Greg Wilkins
c843b809f0 Fixed #1737 DefaultServlet wrong welcome dispatcher using non-root URL path
If operating in pathInfoOnly mode, prepend the serlvet path to the welcome path
2017-08-16 09:54:52 +10:00
Greg Wilkins
e4c0dcdd19 Issue #1721 async read failure on big POST
Remove ISE for a S that is perfectly legal
2017-08-15 19:05:44 +10:00
Greg Wilkins
4d56d154ac Issue #1721 async read failure on big POST
fixed HttpInput test
2017-08-15 11:50:07 +10:00
Greg Wilkins
3c3d05f722 Issue #1721 async read failure on big POST
Modified isReady to not fillAndParseContent if known to be isReady()==false already.
Added mutex on produceContent
2017-08-15 10:08:08 +10:00
Greg Wilkins
a58447aea1 Issue #1732 Stop accepting new connections
removed debug
2017-08-15 10:07:55 +10:00
Greg Wilkins
5197ce4f54 Issue #1732 Stop accepting new connections 2017-08-12 10:26:17 +10:00
Simone Bordet
87d090e062 Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2017-08-11 16:42:21 +02:00
Greg Wilkins
7179ac0b61 simplified test 2017-08-10 15:11:55 +10:00
Greg Wilkins
08c49a30c0 Improve test reporting 2017-08-10 15:11:55 +10:00
Greg Wilkins
ce3bfe63b9 Less verbose tests 2017-08-10 15:11:55 +10:00
Greg Wilkins
cf418c639f Revert "added assume from running directly"
This reverts commit 39ea66368ce28f6219dbef386a857e46454b7b95.
2017-08-10 12:52:28 +10:00
Greg Wilkins
39ea66368c added assume from running directly 2017-08-10 11:34:13 +10:00
Simone Bordet
d3d02f227e Fixes #1719 - Improve handling of HTTP/2 queued requests.
Idle timeout have a special meaning in that they become a no-operation
if the application is dispatched but idle (neither reading nor writing).

HttpChannelOverHTTP2 now forwards the idle timeout to HttpInput, which
will only change its state if it is interested in reading.

HttpInput.consumeAll() has been modified to consume all input even if
it's already failed.

Failures caused by the other peer (e.g. I/O failures or stream resets)
are now retained and will eagerly consumed any queued data to free up
the flow control windows.
2017-08-09 16:21:53 +02:00
Simone Bordet
7b437cd647 Refactored calls to _transport.abort() to call this.abort(). 2017-08-09 10:25:47 +02:00
Joakim Erdfelt
1311052b15 Cleaning up state of branch to match the original jetty-9.4.x
+ Does not include changes to /jetty-cdi/
+ Does not include changes to /jetty-websocket/ for javax.websocket-1.1
2017-08-08 09:47:04 -07:00
Greg Wilkins
94322f7290 simplify reserved thread configuration 2017-08-08 09:16:11 -07:00
Greg Wilkins
4c2c0add76 Fixed #1713 limit selectors for small thread pool 2017-08-08 09:16:04 -07:00
Greg Wilkins
1a07ddd787 Issue #215 Conscrypt SSL provider
Added module to install Conscrupt SSL provider
2017-08-08 09:15:43 -07:00
Simone Bordet
a705f9a2ca Fixes #1703 - Improve HttpInput failure logging. 2017-08-08 09:15:40 -07:00
Greg Wilkins
d12cde9cfd Fix commit 2e13208758b6cf0036f3e18406e61683b41a0e14
use suppressed exceptions to hold local stacktrace rather than wrapping exception, which hides the exception type.
2017-08-08 09:15:37 -07:00
Simone Bordet
3eeeb8ec7e Improved error reporting. 2017-08-08 09:15:30 -07:00
Simone Bordet
be1eb26670 Fixes #1671 - Asymmetric usage of trailers in MetaData.Request.
Reviewed with code cleanups.
2017-08-08 09:15:23 -07:00
Jan Bartel
56bf71aec2 Issue #1675 2017-08-08 09:14:54 -07:00
Greg Wilkins
0bc9149ff1 Issue #1671 asymmetric trailer usage on MetaData.Request 2017-08-08 09:14:47 -07:00
Greg Wilkins
2202d333fe Issue #1655 ServerConnector configured with channel
converted setter to open method
added test harness
2017-08-08 09:14:18 -07:00
Greg Wilkins
7dc2559c8b Issue #1655 added setter for accept channel 2017-08-08 09:14:16 -07:00