3522 Commits

Author SHA1 Message Date
Simone Bordet
b6c4e5b7c9 Merged branch 'jetty-9.4.x' into 'master'. 2016-12-14 11:53:48 +01:00
Simone Bordet
dd3a73e57a Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2016-12-14 11:19:49 +01:00
Simone Bordet
07c9bc5a51 Fixes #1169 - HTTP/2 reset on a stalled write does not unblock writer thread.
The fix notifies the transport when a reset frame is received,
allowing the transport to fail the write callback which then notifies
the application, either by throwing (in case of blocking writes) or
by calling error listeners.

Also added a guard, in HttpChannel.handle() for the ERROR_DISPATCH case,
that checks if the response is already committed, and if so, abort
the transport - similar to what's already there for 9.4.
2016-12-14 11:07:00 +01:00
Jesse McConnell
9f012dcd17 Merge branch 'release-9.4.0' into jetty-9.4.x 2016-12-12 09:03:57 -06:00
Jan Bartel
5d5b9c5998 Issue #1162 2016-12-12 20:24:54 +11:00
Jesse McConnell
6a7e5dd4f5 Updating to version 9.4.1-SNAPSHOT 2016-12-08 09:41:50 -06:00
Jesse McConnell
c54efb5929 Updating to version 9.4.0.v20161208 2016-12-08 08:56:45 -06:00
Jesse McConnell
19333b8b3b Merge branch 'jetty-9.4.x' into release-9.4.0 2016-12-08 08:50:15 -06:00
Jan Bartel
8ea15f4214 Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-12-08 20:17:20 +11:00
Jan Bartel
4f48d7aadf Issue #1153
Refactor calcExpiry methods a little.
2016-12-08 20:15:49 +11:00
Greg Wilkins
5186c1e6d0 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-12-08 18:35:40 +11:00
Jan Bartel
5a5bec7112 Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-12-08 17:17:12 +11:00
Jan Bartel
51855ba45e Issue #1153 2016-12-08 17:16:27 +11:00
Jan Bartel
c02dec5654 Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-12-08 11:31:00 +11:00
Jan Bartel
8e0725db1c Issue #123
Make sync on id generation more tightly scoped.
2016-12-08 11:29:13 +11:00
Jesse McConnell
f8338b3f59 Updating to version 9.4.1-SNAPSHOT 2016-12-07 10:32:41 -06:00
Jesse McConnell
dac1d17a2d Updating to version 9.4.0.v20161207 2016-12-07 09:47:30 -06:00
Greg Wilkins
af5d27c2f7 Issue #1146 DecryptedEndPoint deadlock 2016-12-07 22:50:27 +11:00
Jan Bartel
3ac3b3cbfc Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-12-01 12:10:21 +11:00
Jan Bartel
4caaad7166 Issue #1142 2016-12-01 12:09:49 +11:00
Simone Bordet
df91fc1092 Merged branch 'jetty-9.4.x' into 'master'. 2016-11-25 09:05:51 +01:00
Simone Bordet
f70c6f790c Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2016-11-25 09:05:07 +01:00
Simone Bordet
dd76ed2449 Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'. 2016-11-25 09:04:16 +01:00
Simone Bordet
f254dbc0b6 Fixes #1130 - PROXY protocol support reports incorrect remote address. 2016-11-25 08:56:56 +01:00
Greg Wilkins
dd2f9d73b6 tests cleanup 2016-11-25 14:37:19 +11:00
Greg Wilkins
aff57fb524 Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-11-24 15:52:49 +11:00
Jan Bartel
79c364368d Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-11-24 15:51:06 +11:00
Greg Wilkins
0b54fa0bc7 Issue #1128 2016-11-24 15:47:11 +11:00
Greg Wilkins
deac849325 Fixes #1127
Fixes #1127 by updating #1074 solution.  Spurious calls to HttpInput.run can be ignored.
Hide some more test stacks
2016-11-24 10:18:06 +11:00
Joakim Erdfelt
5b5a2e845b Removing commented out debug code 2016-11-23 06:05:35 -07:00
Simone Bordet
23753759bb Merged branch 'jetty-9.4.x' into 'master'. 2016-11-23 12:19:31 +01:00
Greg Wilkins
2ef23a6725 Issue #572
Improved to the toString and dump output of connections, endpoints and channel to assist with debugging
made the SSL callbacks and runnables Invocable to avoid thread starvation.
2016-11-23 16:58:35 +11:00
Jan Bartel
d28802ad62 Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-11-23 14:56:55 +11:00
Joakim Erdfelt
efc227e0e4 Updates for better ThreadStarvationTests 2016-11-22 17:37:40 -07:00
Joakim Erdfelt
bb428fb402 Using non-deprecated SocketChannelEndpoint 2016-11-22 16:35:56 -07:00
Joakim Erdfelt
7c90d19983 Minor updates to ThreadStarvationTest to diagnose read starvation under SSL issue 2016-11-22 15:00:13 -07:00
Jan Bartel
bf6f82da60 Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-11-18 13:51:39 +11:00
Greg Wilkins
bf3ea9ae44 Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-11-18 11:19:40 +11:00
Joakim Erdfelt
b5cd3cfca1 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-11-17 17:00:58 -07:00
Joakim Erdfelt
fd20d46659 Issue #1062 - adding https/ssl/tls test varient to ThreadStarvationTest 2016-11-17 16:42:37 -07:00
Greg Wilkins
ed14d739f3 Issue #1103 original URI trimmed 2016-11-16 23:31:03 +11:00
Jan Bartel
05f2e56aa1 Merge pull request #1093 from nevafuse/patch-3
Keep restored file if saving periodically
2016-11-16 10:53:59 +11:00
Joakim Erdfelt
fa6d9029fc Merge branch 'jetty-9.4.x' 2016-11-15 14:30:19 -07:00
nevafuse
236571eaee only periodically save recently accessed sessions
Signed-off-by: nevafuse <nevafuse@gmail.com>
2016-11-12 22:12:56 -05:00
nevafuse
e05faf77c8 keep restored file if saving periodically
Signed-off-by: nevafuse <nevafuse@gmail.com>
2016-11-12 22:11:17 -05:00
Greg Wilkins
62331ce8f0 Issue #1074 javadoc 2016-11-08 16:26:03 +11:00
Greg Wilkins
a7048a325a Issue #1077
Removed concrete handle from AbstractHandler
Added AbstractHandler.ErrorDispatchHandler
cleanup context listeners
Removed vanity inlining of ScopeHandler methods

Squashed commit of the following:

commit 0f3619ac1101707de476ad9b7f7394e8de18d95f
Author: Greg Wilkins <gregw@webtide.com>
Date:   Tue Nov 8 10:59:55 2016 +1100

    Issue #1077

    Removed concrete handle from AbstractHandler
    Added AbstractHandler.ErrorDispatchHandler

commit 0876fee0334b9f43297f28fc4b855f447b7ee73f
Merge: 5eabad2 7716ada
Author: Greg Wilkins <gregw@webtide.com>
Date:   Tue Nov 8 08:48:53 2016 +1100

    Merge branch 'jetty-9.4.x' into jetty-9.4.x-issue-1077

commit 5eabad29a5c4d893e204cb403a1d276ea3b15281
Author: Greg Wilkins <gregw@webtide.com>
Date:   Mon Nov 7 21:15:40 2016 +1100

    Issue #1077 cleanup context listeners

commit 9edf91a386aa20a3c0af86a634b4b3dbbc8e1092
Author: Greg Wilkins <gregw@webtide.com>
Date:   Mon Nov 7 18:08:01 2016 +1100

    Issue #1077 Removed vanity inlining of ScopeHandler methods
2016-11-08 15:58:15 +11:00
Jesse McConnell
9a6f68be78 Merge branch 'release-9.3.14' into jetty-9.3.x 2016-11-07 10:45:04 -06:00
Simone Bordet
526d385a62 Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2016-11-07 16:23:10 +01:00
Simone Bordet
998c5729ec Fixes #1072 - InetAccessHandler needs InetAddress & Path based restrictions like IPAccessHandler did.
Introduced isAllowed(InetAddress, HttpServletRequest) so that it
would be possible to make access decisions also based on request
information such as context, path, headers, etc.
2016-11-07 16:20:15 +01:00