307d23975e
Updating to version 9.3.17.v20170317
2017-03-17 09:07:39 -07:00
9ccf0a5337
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2017-03-09 16:39:30 +11:00
2219863c11
Issue #1340 Consistent optional use of query string in PushCacheFilter
2017-03-09 16:24:31 +11:00
523fab30bd
Updating to version 9.4.3-SNAPSHOT
2017-02-20 08:13:31 -07:00
4a674b9cc9
Updating to version 9.4.2.v20170220
2017-02-20 06:22:45 -07:00
f5d215bb1d
Merged branch 'jetty-9.4.x' into 'master'.
2017-02-02 00:27:38 +01:00
7e7459d825
Fixes #612 - Support HTTP Trailer.
...
Implemented support in the generic HttpChannel and Request classes.
Linked HTTP/1.1 and HTTP/2 trailers to call HttpChannel, so that trailers
are now available in Servlet APIs by casting to Jetty's Request class.
The semantic is that trailers will only be available _after_ reading
the request content.
2017-01-30 15:17:59 +01:00
d0c33ebe8b
Updating to version 9.4.2-SNAPSHOT
2017-01-20 10:49:06 -06:00
556ecbcdcf
Updating to version 9.4.1.v20170120
2017-01-20 09:47:53 -06:00
66b43ecda8
Updating to version 9.3.17-SNAPSHOT
2017-01-20 09:33:43 -06:00
df03355d00
Updating to version 9.3.16.v20170120
2017-01-20 09:06:48 -06:00
cef2ff9522
Happy New Year 2017.
2017-01-19 19:31:53 +01:00
0c8273f2ca
Happy New Year 2017.
2017-01-19 19:26:41 +01:00
07838b057f
Happy New Year 2017.
2017-01-19 18:54:03 +01:00
347c48d657
Revert "resolve merge and update license headers"
...
This reverts commit 53b31b03dd4565c186d7
2017-01-19 18:26:43 +01:00
53b31b03dd
resolve merge and update license headers
2017-01-19 09:33:16 -06:00
b7b3dfdc77
Merged branch 'jetty-9.4.x' into 'master'.
2017-01-12 17:53:09 +01:00
df0f645aa4
fix #1248
2017-01-12 11:29:56 +11:00
a51f800054
Merged branch 'jetty-9.4.x' into 'master'.
2017-01-10 15:07:26 +01:00
95c7e78eaf
Issue #1220 - PushCacheFilter does not add the context path to pushed resources.
...
Now taking into account the context path to cache and push resources.
2017-01-05 16:32:41 +01:00
755de58ab6
Merged branch 'jetty-9.4.x' into 'master'.
2017-01-03 11:01:05 +01:00
c018eb5b92
Issue #1209 - IllegalStateException when HTTP/2 push is disabled.
...
Skipping filter logic when HTTP/2 push is disabled.
2016-12-31 12:19:46 +01:00
7494914ff6
Updating to version 9.3.16-SNAPSHOT
2016-12-20 13:09:32 -07:00
680ecd646b
Updating to version 9.3.15.v20161220
2016-12-20 12:31:58 -07:00
b6c4e5b7c9
Merged branch 'jetty-9.4.x' into 'master'.
2016-12-14 11:53:48 +01:00
dd3a73e57a
Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'.
2016-12-14 11:19:49 +01:00
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
6a7e5dd4f5
Updating to version 9.4.1-SNAPSHOT
2016-12-08 09:41:50 -06:00
c54efb5929
Updating to version 9.4.0.v20161208
2016-12-08 08:56:45 -06:00
19333b8b3b
Merge branch 'jetty-9.4.x' into release-9.4.0
2016-12-08 08:50:15 -06:00
8ea15f4214
Merge remote-tracking branch 'origin/jetty-9.4.x'
2016-12-08 20:17:20 +11:00
a721e8b25d
Fixes #1148 - Support HTTP/2 HEADERS trailer.
2016-12-08 10:08:56 +01:00
f8338b3f59
Updating to version 9.4.1-SNAPSHOT
2016-12-07 10:32:41 -06:00
dac1d17a2d
Updating to version 9.4.0.v20161207
2016-12-07 09:47:30 -06:00
fa6d9029fc
Merge branch 'jetty-9.4.x'
2016-11-15 14:30:19 -07:00
e78c117c01
Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'.
2016-11-14 22:30:08 +01:00
5e5d6913e6
Fixes #1099 - PushCacheFilter pushes POST requests.
2016-11-14 22:28:27 +01:00
2c38511828
Updating to version 9.3.15-SNAPSHOT
2016-10-28 13:01:34 -07:00
14611d2f76
Updating to version 9.3.14.v20161028
2016-10-28 12:21:02 -07:00
ade14ba34b
Updating to version 9.3.14-SNAPSHOT
2016-10-14 11:33:51 -07:00
c3a78e70a8
Updating to version 9.3.13.v20161014
2016-10-14 10:39:37 -07:00
ea6c4ab01a
Merge remote-tracking branch 'origin/jetty-9.4.x'
2016-10-05 16:21:21 +11:00
4eca898ab0
fixed race in test
2016-10-05 16:20:45 +11:00
863913b64e
set for dev
2016-09-30 19:05:47 +00:00
b91cc8a4ea
set for release
2016-09-30 18:01:20 +00:00
f53e288f8b
Merged branch 'jetty-9.4.x' into 'master'.
2016-09-26 15:52:30 +02:00
a292ef0652
Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'.
2016-09-26 15:52:18 +02:00
4fcf22a2c5
Fixes test after the changes for #960 .
2016-09-26 15:51:25 +02:00
6cf10172ca
Updating to version 9.3.13-SNAPSHOT
2016-09-15 07:34:52 -07:00
8b35fdc5a5
Updating to version 9.3.12.v20160915
2016-09-15 06:48:16 -07:00
c87c04e7f0
Merged branch 'jetty-9.4.x' into 'master'.
2016-09-14 16:45:01 +02:00
5ec60a30ed
Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'.
2016-09-14 16:44:39 +02:00
aa00e4207d
Issue #922 - Implements methods Connection.getBytes[In|Out]().
...
Implemented for HTTP/2.
2016-09-14 14:04:23 +02:00
637fa9ce37
Merged branch 'jetty-9.4.x' into 'master'.
2016-08-12 14:58:20 +02:00
6f20feddcb
Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'.
2016-08-12 14:57:47 +02:00
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
6e1b1cdb36
Updating to version 9.3.12-SNAPSHOT
2016-07-21 19:07:19 -07:00
9fd6d4354e
Updating to version 9.3.11.v20160721
2016-07-21 18:37:09 -07:00
8f5985e0e1
Merged branch 'jetty-9.4.x' into 'master'.
2016-07-21 18:16:01 +02:00
823ba4add6
Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'.
2016-07-21 18:15:38 +02:00
6a15bbfb2b
Issue #751 - Remove usages of ArrayQueue.
2016-07-21 17:55:48 +02:00
c9be029669
Merged branch 'jetty-9.4.x' into 'master'.
2016-07-14 16:19:43 +02:00
9c472f959a
Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'.
2016-07-14 16:19:18 +02:00
7172127236
Fixes #694 - http2.client.StreamResetTest.testServerExceptionConsumesQueuedData stack not suppressed in test
2016-07-14 16:18:55 +02:00
20b774cc25
Merged branch 'jetty-9.4.x' into 'master'.
2016-07-14 12:44:55 +02:00
d976b4d36a
Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'.
2016-07-14 12:44:15 +02:00
2387d973ec
Made test more robust on slower machines.
2016-07-14 12:43:33 +02:00
34a9e43c50
restored long test timer
2016-07-14 15:17:50 +10:00
624405d54d
Merged branch 'jetty-9.4.x' into 'master'.
2016-07-13 20:10:56 +02:00
2954ef0fd8
Merge branch 'jetty-9.3.x' into 'jetty-9.4.x'.
2016-07-13 20:10:08 +02:00
811549a06b
Made test more robust on slower machines.
2016-07-13 20:06:42 +02:00
700d051587
Merge remote-tracking branch 'origin/jetty-9.4.x'
2016-07-13 15:32:58 +10:00
6628a42d5d
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2016-07-13 15:32:03 +10:00
cb42ffc706
improved test timeouts
2016-07-13 15:23:46 +10:00
ae931538ab
[maven-release-plugin] prepare for next development iteration
2016-06-22 13:59:10 -05:00
df1ed4fb03
[maven-release-plugin] prepare release jetty-9.3.11.M0
2016-06-22 13:59:06 -05:00
030ec61837
[maven-release-plugin] prepare for next development iteration
2016-06-22 09:14:25 -05:00
9a4cb41122
[maven-release-plugin] prepare release jetty-9.3.11.M0
2016-06-22 09:14:21 -05:00
e7034117ea
[maven-release-plugin] prepare for next development iteration
2016-06-21 08:50:13 -05:00
16c435c69d
[maven-release-plugin] prepare release jetty-9.3.10.v20160621
2016-06-21 08:50:09 -05:00
502f27f43e
Merge remote-tracking branch 'origin/jetty-9.4.x'
2016-06-03 16:22:17 +10:00
66ce47923e
Issue #572 Ignore failing test pending further analysis
2016-06-03 09:08:44 +10:00
98c328fb23
Jetty 9.4.x 572 ( #614 )
...
* Issue #572 Scheduling Strategy Deadlocks
Implemented dual strategy idea from #572 discussion
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* fixed http2 strategy choice
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* code cleanups
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* clean up seelctor actions/products
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* cleanups
2016-06-03 09:07:00 +10:00
856b48c3b4
Merged branch 'jetty-9.4.x' into 'master'.
2016-05-25 19:28:35 +02:00
b912c700ee
Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'.
2016-05-25 19:27:46 +02:00
f3a805887e
Fixes #542 - Support Connection.Listener bean on clients.
...
Introduced ClientConnectionFactory.customize() to look for
Connection.Listener beans.
ClientConnectionFactory implementation calls customize() when they
create a Connection instance, so the Connection.Listener beans are
registered onto the Connection.
2016-05-25 19:27:08 +02:00
2b276e0162
Merged branch 'jetty-9.4.x' into 'master'.
2016-05-24 16:10:31 +02:00
016a7b72a1
Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'.
2016-05-24 16:10:00 +02:00
ddddc3a675
Fixes #574 - Introduce a TLS handshake completed listener.
...
Introduced class SslHandshakeListener that can be registered as a
bean in both the ServerConnector and in clients such as HttpClient
and HTTP2Client.
When creating SslConnection instances, the factory will query the
connector (client or server) for SslHandshakeListener beans and, if
present, will be added to the SslConnection.
2016-05-24 16:09:19 +02:00
3dc8ccc168
Merged branch 'jetty-9.4.x' into 'master'.
2016-05-20 11:20:44 +02:00
b879b58909
Removed @Ignore from test.
2016-05-20 11:20:29 +02:00
1cd3d527ea
Merged branch 'jetty-9.4.x' into 'master'.
2016-05-20 11:19:03 +02:00
ee11e65a8a
Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'.
2016-05-20 11:18:23 +02:00
c8c74da50a
Issue #581 - Initial session recv window setting not working.
...
Updating the local session receive window before sending it to the client.
2016-05-20 11:17:50 +02:00
54f231d2ef
Merged branch 'jetty-9.4.x' into 'master'.
2016-05-20 01:21:57 +02:00
54ae36f8f1
Temporarily ignoring test.
...
The test fails because it hangs on session flow control window
exhaustion. Setting the session flow control window to large values
makes the test fail in a different way. Needs review.
2016-05-20 01:21:36 +02:00
dc4574f380
[maven-release-plugin] prepare for next development iteration
2016-05-17 17:30:17 -05:00
0bbebec1e0
[maven-release-plugin] prepare release jetty-9.3.9.v20160517
2016-05-17 17:30:13 -05:00
1937701127
Merged branch 'jetty-9.4.x' into 'master'.
2016-05-12 00:22:56 +02:00
2a4cbdd111
Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'.
2016-05-12 00:22:31 +02:00
016fc6569f
Fixes #558 - HTTP/2 server hangs when thread pool is low on threads.
...
Modified ExecuteProduceConsume to test for Rejectable tasks when
trying to execute a task in low threads mode, and if so, reject them
immediately.
2016-05-12 00:13:35 +02:00
2c787bbc05
Merged branch 'jetty-9.4.x' into 'master'.
2016-05-11 13:57:32 +02:00
d8961139f3
Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'.
2016-05-11 13:57:08 +02:00
1fc40864e1
Issue #558 (HTTP/2 server hangs when thread pool is low on threads).
...
Verify that rejecting tasks avoids hanging the server when in low
threads mode.
2016-05-11 13:05:16 +02:00
8ac23d187a
Added tests to verify input data consumption.
...
Verify that input data is consumed at the end of a request handling,
either when input is not read and when an exception is thrown,
to make sure that the session flow control is not stalled.
2016-05-11 13:05:16 +02:00
f4353695e5
Merged branch 'jetty-9.4.x' into 'master'.
2016-05-07 14:51:29 +02:00
19c63703ea
Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'.
2016-05-07 14:50:56 +02:00
c14833a7f1
Fixes #552 (Improve HTTP/2 idle timeout handling)
...
Made sure that the stream idle timeout is reset for every stream read
and write.
Made sure that both the stream and the session idle timeouta are reset
for buffered data reads.
2016-05-07 14:45:34 +02:00
c09f31a51d
Bumping up master to version 10.0.0-SNAPSHOT
2016-04-29 11:47:15 -07:00
a37fdcd0e2
Fixes #514 - Allow ExecutionStrategy to be configurable.
...
Introduced setters and constructor parameters to components that use
ExecutionStrategy.
2016-04-14 12:28:52 +02:00
6827c5b045
Fixes #514 - Allow ExecutionStrategy to be configurable.
...
Introduced setters and constructor parameters to components that use
ExecutionStrategy.
2016-04-14 12:20:31 +02:00
6fb338e50d
Updating to version 9.3.9-SNAPSHOT
2016-04-11 16:20:50 -07:00
bb4f3c4882
Updating to version 9.3.9.M1
2016-04-11 15:35:22 -07:00
c68d3b1d8d
Updating to version 9.3.9-SNAPSHOT
2016-03-14 09:07:52 -07:00
1f3b3f31f4
Updating to version 9.3.8.v20160314
2016-03-14 08:30:20 -07:00
d1fc5eb67d
Revert "Issue #346 HttpParser RFC2616 Compliance mode"
...
This reverts commit 58e5a54ab6
2016-03-05 11:03:32 +01:00
58e5a54ab6
Issue #346 HttpParser RFC2616 Compliance mode
...
Ignore headers without values.
2016-03-05 11:03:11 +01:00
bd62320285
Issue #360 (Improve HTTP/2 stream interleaving)
...
Fixed by making the interleave quantum be the frame size rather than
the flow control window size.
Reworked HTTP2Flusher.process() to be simpler and properly
interleave frames.
2016-02-29 18:45:30 +01:00
2c11372bc4
Merged branch 'jetty-9.3.x' into 'master'.
2016-02-29 17:17:09 +01:00
cec3694355
Consistently using BufferUtil, especially clearToFill() and
...
flipToFlush().
2016-02-29 16:31:38 +01:00
b8fcc5112f
Issue #372 (Data race in HttpReceiverOverHTTP2)
...
Fixed implementations of onData() to properly complete the callback
and to copy the data if they use it asynchronously.
2016-02-29 14:39:27 +01:00
f727e2bac3
Merged branch 'jetty9.3.x' into 'master'.
2016-02-13 11:32:53 +01:00
0eef227e84
487750 - HTTP/2 push must not be recursive.
...
Avoid recursive pushes by pushing the whole resource tree on the
primary request, and avoid pushes for synthetic requests generated by
the pushes.
2016-02-13 11:15:58 +01:00
e0ce545ad7
Updating to version 9.3.8-SNAPSHOT
2016-01-15 17:15:14 -07:00
c0b191119b
Updating to version 9.3.7.v20160115
2016-01-15 16:40:15 -07:00
b7f9c9aca9
Updating to version 9.3.7-SNAPSHOT
2016-01-13 08:21:01 -07:00
21ca3f6690
Updating to version 9.3.7.RC1
2016-01-13 07:30:24 -07:00
ac24196b0d
Happy New Year 2016
2016-01-04 14:34:20 -07:00
cd39fd84fe
Happy New Year 2016
2016-01-04 14:31:22 -07:00
c66a4d5aa7
Merged branch 'jetty-9.3.x' into 'master'.
2015-12-24 10:47:10 +01:00
30694b675b
484876 - Make simpler to customize the FlowControlStrategy.
...
Introduced FlowControlStrategy.Factory along with getters and setters
in relevant classes.
2015-12-24 10:32:36 +01:00
8045b0cf67
Merged branch 'jetty-9.3.x' into 'master'.
2015-12-23 16:21:53 +01:00
7a33efdf66
484861 - Improve FlowControlStrategy stall handling.
...
Changed the way on[Session|Stream]Stalled() is notified.
Instead that from within the HTTP2Flusher, those methods are now
called from onDataSending(), invoking them only once per stall.
2015-12-23 15:42:25 +01:00
802948259e
Merged branch 'jetty-9.3.x' into 'master'.
2015-12-23 11:26:11 +01:00
a5983c560a
Avoid allocating the ALPNClientConnectionFactory if there is no
...
SslContextFactory.
2015-12-23 11:20:19 +01:00
14a3b2eab2
484818 - Expose interesting HTTP/2 attributes and operations via JMX.
...
Initial work to expose already existing attributes on the client.
2015-12-23 11:08:25 +01:00
b7ab9e0a22
484818 - Expose interesting HTTP/2 attributes and operations via JMX.
...
Initial work to expose already existing attributes on the server.
2015-12-23 11:08:25 +01:00
ca6eaafdbf
Merged branch 'jetty-9.3.x' into 'master'.
2015-12-15 15:42:36 +01:00
717fc7819d
484262 - Race condition between GOAWAY disconnect and ability to make new request.
...
Fixed by making sure that when a peer received a GOAWAY frame, it
does not also notify the onFailure() callback.
2015-12-15 15:35:04 +01:00
50041395f9
Merged branch 'jetty-9.3.x' into 'master'.
2015-11-25 14:00:19 +01:00
3c54806d47
482959 - Local stream count never decrements when closing a stream causing IllegalStateException.
...
This issue was caused by removeStream(IStream, boolean) to take a
boolean parameter that indicated whether the close of the stream was
caused by a sent frame (local) or by a received frame (remote).
However, this was wrong, since a local stream may be closed by
receiving a frame. This error was causing the local and remote stream
counts held by HTTP2Session to be decremented wrongly, causing the
IllegalStateException mentioned in the bug report.
Fixed by decrementing the stream counters based on whether the stream
itself is local or remote.
2015-11-25 12:58:02 +01:00
279e56d336
481718 - Improve stream interleaving.
...
Introduced the constraint in the API that Stream.headers() and
Stream.data() calls cannot be invoked if the previous operation did
not complete.
Improved interleaving by appending unfinished DATA frames at the end
of the queue, rather than prepending them.
2015-11-09 21:58:48 +01:00
edf686fe0a
Updating to version 9.3.7-SNAPSHOT
2015-11-06 12:13:00 -07:00
d737e1c638
Updating to version 9.3.6.v20151106
2015-11-06 11:09:32 -07:00
7843b7348e
480827 Implemented Unix Domain Socket Connector
...
Squashed commit of the following:
commit fbb680ba7cdb73495524ea9e5b0f49caee7f68d8
Merge: ed2550b 64ea0dbde137ab3e2658a92cc44c303f98efa53b11de7ac729fe73328b2748439768f8c39bfa2
2015-11-06 11:17:46 +11:00
5062756135
Merged branch 'jetty-9.3.x' into 'master'.
2015-11-02 12:17:00 +01:00
58027a3421
481225 - Secondary resources with query parameters are not properly pushed.
...
Fixed by making PushCacheFilter remember the query parameters for
secondary resources, so that the PUSH_PROMISE frame can be correctly
generated with the query parameters.
2015-11-02 11:37:17 +01:00
9fe7332413
Implemented v2 of the ProxyConnection protocol
2015-10-29 16:45:50 +11:00
964afc3020
Merged branch 'jetty-9.3.x' into 'master'.
2015-10-19 12:35:26 +02:00
3c26ffb227
480061 - HTTP/2 server doesn't send GOAWAY frame when shutting down.
...
Fixed by overriding Connection.close() and sending the GOAWAY from
there, which is triggered when the SelectorManager stops.
This allowed simplification of client code too.
2015-10-19 12:18:01 +02:00
Joakim Erdfelt
Greg Wilkins
Simone Bordet
Jesse McConnell
Jan Bartel
Joakim Erdfelt