21bdb367fd
Fixes #2313 - Dump HTTP/2 channel state.
...
Dumping also HttpChannelOverHTTP2 when dumping the HTTP2Stream.
The channel is now stored as a field in HTTP2Stream rather than
as an attribute to save the attributes map allocation.
Consequently, IStream has now getter/setter for the property
"attachment" that is used to store the channel without having
a type dependency on HttpChannel.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-03-10 15:11:40 +01:00
5dea9b673e
Fixes #2291 - Expose HTTP/2 close reason in dumps.
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-03-07 00:45:23 +01:00
e3e3f9eb0b
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x-fixed
2018-03-06 11:16:25 -06:00
a639ee9275
Resolved errorprone MissingOverride warnings #2206
...
`@Override` was added to methods which were missing the annotation #2206
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-03-01 13:59:25 +11:00
0cb4f5629d
Jetty 9.4.x 1803 proposal 0+2 ( #2199 )
...
Merging this PR for #2199 as we currently think it is not worse than previous and the code base is definitely simpler. While JMH has shown significant benefits for this approach, we have yet been able to demonstrate them in full scale integration tests - however that is likely due to GC and thread pool issues dominating.
A `org.eclipse.jetty.http2.PEC_MODE` System property has been added to allow the EWYK scheduling to be disabled for HTTP/2 if need be.
* Implementation of #1803 proposal 2 - EITHER dispatch type for EWYK
* made code more readable
* increase small threadpools in tests for extra reserved thread
* clean up
* minor code simplifications
* Work in progress to simplify reserved thread pool
* use a single ReservedThreadPool built into the QueuedThreadPool
* fixed javadoc
* removed more old reserved thread references
* disable EWYK for h2
* fixes from review
* use EWYK for HTTP2
* Fixed javadocs, imports and QueuedThreadPool constructors.
* fix javadoc
* EWYK avoid unnecessary pendings
* after review
* fixed merge with jetty-threadpool.xml
* alternate EWYK implementations
* added jetty copyright headers
* Simplified EWYK code after review
* fixed bad merge
* Code cleanups.
* Improved Javadocs for deprecated property "reservedThreads".
* Improved Javadocs for deprecated property "reservedThreads".
* added a system property to enable only PEC for HTTP/2
Signed-off-by: Greg Wilkins <gregw@webtide.com>
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-02-27 14:29:59 +11:00
c7c85a9a01
Removed unused test class.
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-02-22 15:25:32 +01:00
8a6b33a3e8
Fixes #2190 - HTTP/2 close and GOAWAY behavior.
...
Now the receiver of a GOAWAY also replies with a GOAWAY
before closing the connection.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-02-09 10:55:39 +01:00
ab5fc29cca
Jetty 9.4.x 1803 proposal 0 - single ReservedThreadExecutor ( #2119 )
...
Issue #1803 - Review usage of scheduling strategies
Use a single ReservedThreadExecutor built into the QueuedThreadPool
via new interface TryExecutor.
Signed-off-by: Greg Wilkins <gregw@webtide.com>
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-02-08 11:08:48 +01:00
d5a0878019
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2018-01-09 10:08:30 -06:00
41ed9f29f4
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2018-01-09 09:37:25 -06:00
fa4c7b0ca9
Issue #2108 - Updating license headers for year 2018
2018-01-09 08:39:37 -06:00
45e3abbdcf
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2018-01-09 13:17:32 +01:00
88cf4603c5
Merge branch 'jetty-9.4.x' into bugfix/javadoc_fixes_2056
2018-01-08 21:31:48 +01:00
1a49a6fb7e
more javadoc fixes #2056
...
Signed-off-by: olivier lamy <olamy@webtide.com>
2018-01-08 12:28:12 +11:00
f07ea2bbf3
more javadoc fixes #2056
...
Signed-off-by: olivier lamy <olamy@webtide.com>
2018-01-06 20:26:22 +11:00
12647f51e7
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-12-27 16:04:16 +01:00
e86e8a752c
Issue #1973 - Implement minimum response data rate ( #2012 )
...
* Code cleanups.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
* Improved test case handler.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
* Improved exception message.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
* Issue #1973 - Implement minimum response data rate.
Implemented response content data rate control in HttpOutput.
Introduced a WriteFlusher.Listener interface that produces events
for every flush(). These events are forwarded to the Connection
and from there to the HttpOutput so that the data rate control can
be enforced.
Both HTTP/1.1 and HTTP/2 are implemented.
Data rate control for HTTP/1.1 is approximate because it will count
also headers bytes and the chunk bytes, while for HTTP/2 is precise.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
* Issue #1973 - Implement minimum response data rate.
Addressed review comments.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2017-12-27 15:07:32 +01:00
a116fd05a2
Merged branch 'jetty-9.4.x' into 'master'.
2017-12-11 11:50:49 +01:00
f30c02fa45
Issue #2037 - HTTP/2 stream reset leaves stream frames in the flusher.
...
Simplified stream staleness checks.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2017-12-11 11:50:18 +01:00
d88e2b767f
Fixes #2037 - HTTP/2 stream reset leaves stream frames in the flusher.
...
Now waking up the flusher via iterate() after a reset has been received.
This ensures that frames that may have stalled are removed from the
flusher queue.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2017-12-11 10:57:13 +01:00
6b7f906f9d
Fixes #2034 - Improve HTTP2Session dump.
...
Now the session also dumps the flusher and all the streams.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2017-12-07 22:40:57 +01:00
22308e3c1d
Fixes #2035 - FlowControlStrategy keeps around reset streams.
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2017-12-07 22:40:57 +01:00
76613c0999
Merge branch 'jetty-9.4.x'
2017-12-07 14:47:37 -05:00
158f90bc9e
Fixes #2033 - Improve HTTP/2 session and stream stall times report.
...
Now including both the past and the current stall times.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2017-12-07 19:21:47 +01:00
1b7ebf5599
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-09-23 00:22:57 +10:00
006dee439f
Code cleanups.
...
Added TODOs to remember the link between the HTTP2Connection
fill callback and HTTP2ConnectionFactory.reservedThreads.
2017-09-08 10:52:40 +02:00
d8efc177ec
Merged branch 'jetty-9.4.x' into 'master'.
2017-08-22 19:34:14 +02:00
7e764bad3e
Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'.
2017-08-22 19:33:46 +02:00
f9ff9e1226
Issue #1759 - HTTP/2 producer can block in onReset.
...
Because now the failures are asynchronous, code that was executed after
invoking the failure listener must be now executed after the
asynchronous processing done by the listener and therefore Callbacks
are introduced.
2017-08-22 15:54:40 +02:00
60a7551785
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-08-15 11:55:58 +10:00
64d5131a2a
Issue #1719 - Improve handling of HTTP/2 queued requests.
...
Since for HTTP/2 EWYK has been forced to run in PEC mode, we need the
onFillable() callback to be non blocking.
2017-08-14 11:08:57 +02:00
829fa4fe9b
Improved logging.
2017-08-11 16:48:06 +02:00
a105be95e4
Issue #1637 Thread per HTTP/2 Connection
...
This fix simplifies the EWYK scheduler by factoring out the preallocated producer into a
ReservedThreadExecutor class. A shared ReservedThreadExecutor can then be used by multiple
EWYK instances to avoid over allocation of threads.
Squashed commit of the following:
commit c435dc20e25bd274d69423be1be7b0565925f249
Merge: 58a5a9a 90e5b566702248
2017-08-08 09:13:44 -07:00
88617b9233
Fixes #1595 - Avoid sending unnecessary stream WINDOW_UPDATE frames.
...
Now the flow control strategy checks whether the stream is already
remotely closed, and if so it does not send the window update.
2017-08-08 09:10:24 -07:00
23c8e64fd8
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-06-21 14:40:13 +02:00
11b5cf5a2b
Issue #1637 Thread per HTTP/2 Connection
...
This fix simplifies the EWYK scheduler by factoring out the preallocated producer into a
ReservedThreadExecutor class. A shared ReservedThreadExecutor can then be used by multiple
EWYK instances to avoid over allocation of threads.
Squashed commit of the following:
commit c435dc20e25bd274d69423be1be7b0565925f249
Merge: 58a5a9a 90e5b566702248
2017-06-21 11:48:41 +02:00
b953f8d2d0
Merged branch 'jetty-9.4.x' into 'master'.
2017-06-05 18:07:51 +02:00
28e6378b26
Fixes #1595 - Avoid sending unnecessary stream WINDOW_UPDATE frames.
...
Now the flow control strategy checks whether the stream is already
remotely closed, and if so it does not send the window update.
2017-06-05 18:07:29 +02:00
3aeb8dbd78
Merge remote-tracking branch 'origin/jetty-9.4.x'
...
Conflicts:
jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebAppContext.java
jetty-webapp/src/test/java/org/eclipse/jetty/webapp/WebAppClassLoaderTest.java
2017-04-05 06:47:25 -07:00
f06c7c358f
Fixes #1440
...
Improve low resource solution for scheduling strategy.
Replaced the dual scheduling strategy with a single re-implementation of EatWhatYouKill
that can adapt to act as ProduceConsume, ExectureProduceConsume or ProduceExecuteConsume
as need be.
Squashed commit of the following:
commit 25eeb321814f370d84ca8159c50823cbe18159c508f05805a92daf61cddaf61cd294#1429 )
Looks like this leak shows itself only with asynchronous responses.
Some relevant info: http://www.devguli.com/blog/eng/java-deflater-and-outofmemoryerror/
Signed-off-by: Denis Nedelyaev <denvned@gmail.com>
commit 5805a92d0ecfabbd2dc759dbcfabbd2341c7aa64aa10bacf51a18f17acbacf51a83d11ba4bc2fafa1d11ba4bc84969003d31a0b2df69003d3dd9f89b08da8ff18df89b08d08a7a87c8e00b42ca7a87c8ec9d1a9201512dc1691a92015471c01a910b690b2b9ea67ec4b00b2b9ea187c1d92ebde6d2d6bc3e65c1a159b7a901349ac78f471201349ac9354dc150308f351b4dc15032ba5d18c654b8d52a09a6cdc097db32e7
2017-04-01 09:18:37 +11: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
755de58ab6
Merged branch 'jetty-9.4.x' into 'master'.
2017-01-03 11:01:05 +01:00
a35cf71e93
Improved logging.
2016-12-30 22:01:23 +01:00
b6c4e5b7c9
Merged branch 'jetty-9.4.x' into 'master'.
2016-12-14 11:53:48 +01:00
98fad34ca0
Fixes #1167 - NPE while completing a reset HTTP/2 stream.
2016-12-14 11:09:10 +01: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
fa6d9029fc
Merge branch 'jetty-9.4.x'
2016-11-15 14:30:19 -07:00
c6ad87c3f9
Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'.
2016-10-27 16:55:12 +02:00
8fef113372
Fixes #1046 - Improve HTTP2Flusher error report.
...
Now remembering the cause of the termination, and propagating it to
other components.
2016-10-27 15:43:41 +02:00
8dc18fe088
Merged branch 'jetty-9.4.x' into 'master'.
2016-09-28 11:56:24 +02:00
7e376fd9da
Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'.
2016-09-28 11:53:54 +02:00
0f97c3df5d
Fixes #966 - Remove usages of ConcurrentArrayQueue.
2016-09-28 11:40:39 +02: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
79889f05f5
Merged branch 'jetty-9.4.x' into 'master'.
2016-09-26 12:21:05 +02:00
716c595cdf
Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'.
2016-09-26 12:20:22 +02:00
74b86bad35
Fixes #960 - Async I/O spin when reading early EOF.
...
AsyncIOServletTest is now testing HTTP/1.1 and HTTP/2 transports.
2016-09-26 11:49:57 +02:00
585e243ed9
Merged branch 'jetty-9.4.x' into 'master'.
2016-09-14 21:54:20 +02:00
e3fcb018c4
Fixed merge from branch 'jetty-9.3.x'.
2016-09-14 21:53:35 +02:00
da4819f091
Merged branch 'jetty-9.4.x' into 'master'.
2016-09-14 17:03:05 +02:00
186ad447de
Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'.
2016-09-14 17:02:48 +02:00
464dd0667a
Issue #922 - Implements methods Connection.getBytes[In|Out]().
...
Using int rather than long as return value for generated bytes.
2016-09-14 16:57:11 +02: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
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
efc5265fe5
Improved javadocs.
2016-08-14 12:17:35 +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
49214a9d61
Fixed compilation issue.
2016-08-08 23:24:59 +02:00
f695d9cf31
Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'.
2016-08-06 12:31:47 +02:00
45695e08aa
Fixes #792 - [HTTP/2] Socket seems to be not closed completely.
...
Now sending the GOAWAY and then disconnecting from doStop(), ensuring
that the underlying TCP connection is closed even if the server does
not close.
2016-08-06 12:31:20 +02:00
92c7b991d8
Code cleanups.
2016-08-06 12:31:20 +02:00
87c8e1c019
Merge branch 'jetty-9.3.x' into jetty-9.4.x
2016-07-25 17:02:51 -07:00
e53ea55f48
Issue #752 SETTINGS_MAX_HEADER_LIST_SIZE
...
Defined missing status codes (removed old/wrong javadoc)
Changed use of 413 to 431
Received SETTINGS_MAX_HEADER_LIST_SIZE is set on hpack encoded and warning generated only for large responses.
2016-07-23 12:17:50 +10:00
cceec33f54
Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'.
2016-07-21 19:12:38 +02:00
088dc036b4
Fixes #752 - Implement support for HTTP2 SETTINGS_MAX_HEADER_LIST_SIZE.
2016-07-21 19:12:10 +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
6e4abb3339
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2016-07-21 12:29:54 +10:00
2db91a88cf
HTTP2 SETTINGS_MAX_HEADER_LIST_SIZE #752
2016-07-21 12:28:32 +10:00
0d8f1b9e69
Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'.
2016-07-19 10:34:19 +02:00
766e5ab2ae
Fixes #739 - Illegal WindowUpdate frame with delta=0.
...
Using compareAndSet() rather than getAndSet().
2016-07-19 10:33:43 +02:00
b3fda0b733
Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'.
2016-06-20 23:11:16 +02:00
442a7ce8cc
Improved logging.
2016-06-20 23:10:44 +02:00
9632019e18
Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'.
2016-06-17 11:54:24 +02:00
fdd1cd1e94
Fixes #647 - HTTP/2 CONTINUATION frame parsing throws IllegalStateException.
...
Added the missing "break" statement.
2016-06-17 11:53:58 +02:00
1cec689ece
Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'.
2016-06-17 10:26:16 +02:00
9d9f68da08
Reduced logging level for MAX_HEADER_LIST_SIZE.
2016-06-17 10:25:45 +02: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
fab61b9157
Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'.
2016-05-20 01:12:51 +02:00
d55aaa4a0c
Improved logging.
2016-05-20 01:12:24 +02:00
039ced6e25
Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'.
2016-05-16 15:13:54 +02:00
dee3331ffb
Issue #572 - Don't reject HTTP/2 requests without body in low threads mode.
...
* Made ProduceExecuteConsume the default ExecutionFactory for HTTP/2.
* Made the HTTP/2 fillable callback non-blocking.
* Introduced configuration for the server initial session recv window.
* Sending a WINDOW_UPDATE frame at session setup to inform the client
about the server session recv window.
2016-05-16 15:01:08 +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
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
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
cdcde53c6b
Merged branch 'jetty-9.3.x' into 'master'.
2016-04-01 14:44:50 +02:00
ce04cadb79
Fixes #233 - Add message to idle TimeoutException.
2016-04-01 14:44:26 +02:00
966cc2dcba
Merged branch 'jetty-9.3.x' into 'master'.
2016-03-16 22:14:31 +01:00
18aeca6567
Fixes #242 (Expose HTTP/2 LastStream error)
2016-03-16 22:14:09 +01:00
dcfa0b8910
Merge branch 'jetty-9.3.x'
2016-03-15 07:49:28 -07:00
26f8deddf7
Introduced Callback.Nested.
...
Refactored code that was using nested callbacks and removed
unnecessary overrides now that we have default methods.
2016-03-15 15:24:44 +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
bb08b65d15
Merged branch 'jetty-9.3.x' into 'master'.
2016-02-29 11:33:25 +01:00
aadfae936c
Issue #366 (Avoid HTTP2Flusher reentrancy).
...
Made HTTP2Flusher termination to be atomic and non-reentrant.
2016-02-29 11:32:39 +01:00
51009208d4
Merged branch 'jetty-9.3.x' into 'master'.
2016-02-19 13:23:34 +01:00
1cce6fd69f
Improved logging.
2016-02-19 11:36:06 +01:00
2ac465a343
Merged branch 'jetty-9.3.x' into 'master'.
2016-02-09 18:14:07 +01:00
6306f06e2f
Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'.
2016-02-09 18:12:04 +01:00
cb79379b79
Merged branch 'jetty-9.3.x' into 'master'.
2016-02-05 18:14:56 +01:00
460c778ca1
Added Javadocs.
2016-02-05 18:12:37 +01: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
bf757aafa9
484818 - Expose interesting HTTP/2 attributes and operations via JMX.
...
Added flow control stall times and improved dump().
2016-01-04 13:06:24 +01:00
fdadc942e9
484818 - Expose interesting HTTP/2 attributes and operations via JMX.
...
Added flow control stall times and improved dump().
2015-12-28 14:30:24 +01:00
7b713507c6
Merged branch 'jetty-9.3.x' into 'master'.
2015-12-24 12:37:05 +01:00
997b868ecd
484878 - Make BufferingFlowControlStrategy.bufferRatio configurable via JMX.
...
Made the property writable.
2015-12-24 12:10:20 +01:00
c66a4d5aa7
Merged branch 'jetty-9.3.x' into 'master'.
2015-12-24 10:47:10 +01:00
7598062bbb
Improved logging.
2015-12-24 10:36:17 +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
59680d47d3
484818 - Expose interesting HTTP/2 attributes and operations via JMX.
...
Exposed number of session stalls.
2015-12-23 16:19:08 +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
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
3fb354f884
Merged branch 'jetty-9.3.x' into 'master'.
2015-12-21 13:02:04 +01:00
8f4cc73613
484585 - Avoid sending request using a connection that is idle timing out.
...
Rewritten handling of idle timeouts in light of issue #484718 .
2015-12-21 11:47:05 +01:00
988e596c71
484585 - Avoid sending request using a connection that is idle timing out.
...
Added guard to avoid that the idle timeout expires just before
sending the request.
Reworked the way idle timeouts are handled, to support the case where
the idle timeout just expired and the request can be tried on a
different connection/channel.
2015-12-18 15:56:31 +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
d4d9ceea86
Improved toString().
2015-12-15 14:11:56 +01:00
fc4aacc38a
Merged branch 'jetty-9.3.x' into 'master'.
2015-12-09 11:57:38 +01:00
e7d8980952
Improved generate/parse tests.
2015-12-09 11:56:49 +01:00
35da4a3c54
483878 - Parallel requests stuck via the http client transport over HTTP/2.
...
Fixed by recycling correctly the blockBuffer.
2015-12-09 11:56:26 +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
f596bf1566
Improved javadocs for onPreface().
2015-11-25 12:58:02 +01:00
65d33f8b49
Merged branch 'jetty-9.3.x' into 'master'.
2015-11-18 21:40:51 +01:00
793c816c66
Improved logging.
2015-11-18 19:25:34 +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
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
ccbd626cb2
479537 - Server preface sent after client preface reply.
...
Fixed by anticipating the onPreface() callback on server before
processing the client preface's SETTINGS frame.
2015-10-12 18:36:53 +02:00
64ba5a6ef8
Improved usability of PingFrame.
2015-09-27 17:03:29 +02:00
83c5105e71
478434 - Priority weights should be between 1 and 256 inclusive.
...
Added required +1 in parsers and -1 in generators to convert from
unsigned byte to weight.
2015-09-26 00:14:45 +02:00
0c9eba0485
478275 - Priority information in HEADERS frame is not sent.
...
Now the priority information present in HEADERS frame is correctly
generated and sent as part of the HEADERS frame.
2015-09-25 13:00:26 +02:00
394c105d5d
Cosmetics.
2015-09-25 12:39:53 +02:00
f833f36c64
Cosmetics.
2015-09-21 09:34:15 +02:00
edce119c0e
477270 - Add ability to send a single PRIORITY frame.
...
Also fixed the mistake of sending the stream id as the parent stream id.
2015-09-14 11:51:19 +02:00
dbd66b131b
Introduced a HeadersFrame constructor for HEADERS frames with
...
unspecified stream id, to be used when creating new frames.
2015-09-14 11:51:19 +02:00
30532786cc
Improved logging.
2015-09-14 11:51:19 +02:00
f2a3bd8f05
477087 - Enforce that the preface contains a SETTINGS frame.
...
Now the ServerParser enforces that the preface bytes are followed by
a SETTINGS frame.
2015-09-10 19:04:47 +02:00
fd335d6c3e
Guarded against NPE.
2015-08-20 16:31:09 +02:00
607239028c
470727 - Thread Starvation of selector wakeups.
...
Changed the CallBack.NonBlocking to a default Callback.isNonBlocking, so that wrapping callbacks can determine if they are NonBlocking or not.
2015-07-22 17:31:54 +10:00
c367ea8a85
441020 - Support HEADERS followed by CONTINUATION+.
2015-07-08 18:55:47 +02:00
a6ff4da9b1
Made the cipher comparator a constant field.
2015-05-26 18:03:55 +02:00
bd27e7d2d4
467730 - HTTP2 requires enabled ciphers to be sorted by blacklist
2015-05-21 01:41:12 +10:00
64033e0958
Improved toString().
2015-05-04 12:33:10 +02:00
a6cc4ff2f5
465857 - Support HTTP/2 clear-text server-side upgrade.
...
Fixed and test both types of upgrade, from HTTP/1.1 via its
upgrade mechanism, and direct HTTP/2.
2015-04-29 22:27:50 +02:00
9e6c8eade1
464727 - Update Javadoc for Java 8 DocLint
2015-04-22 12:43:22 -07:00
ffadcd6757
444721 - PushCacheFilter cleanup/improvements.
...
Ported the "maxAssociations" functionality from SPDY's ReferrerPushStrategy.
Added JMX support.
Removed __renew__ special path in favour of a JMX method.
Added clearPushCache() JMX method.
Made push reentrant by eliminating the check for "org.eclipse.jetty.pushed".
2015-04-10 15:22:49 +02:00
999177ccc2
Fixed race sending SETTINGS with INITIAL_WINDOW_SIZE.
...
Before, the sender was updating the window size after the SETTINGS
frame was written.
This was leading to a race where the receiver saw the updated window
size and sent DATA frames; these were received by the original sender
before it had the chance to update its local window size, causing an
error.
Now, the update of the window size happen just before writing the
SETTINGS frame to avoid this race.
2015-03-25 19:24:28 +01:00
e255bda694
459845 - Support upgrade from http1 to http2.
...
Simplified upgrade mechanism, and made it available through clearer
internal APIs.
2015-03-20 15:02:40 +01:00
2a21f8cb2f
Renamed ISession.control() to ISession.frames().
2015-03-20 15:02:07 +01:00
caacebc223
459845 - Support upgrade from http1 to http2
...
functioning implementation. Not exactly the most elegant solution, but works with nghttp2 -u
2015-03-19 12:02:54 +11:00
3f795da26c
459845 - Support upgrade from http1 to http2
...
Generalised Upgrade Connection Factories
2015-03-13 13:59:29 +11:00
feed8ea158
Small refactoring of HTTP/2 upgrade code.
2015-03-12 19:08:26 +01:00
b7d719be5f
459845 - Support upgrade from http1 to http2
...
Parse setting frame.
2015-03-13 00:54:33 +11:00
a7cfc3dc2d
Renamed methods in FlowControlStrategy.
2015-03-11 20:38:40 +01:00
1dbf2be343
423974 - Optimize flow control.
...
Don't send the window update if the stream is closed.
2015-03-11 17:11:16 +01:00
48887377c9
459081 - http2 push failures.
...
Introduced ExecutionStrategy.dispatch() to handle the case where
resources that are being pushed block.
2015-03-11 00:12:57 +01:00
73821e7ac6
461052 - Local streams created after INITIAL_WINDOW_SIZE setting have wrong send window.
...
Fixed by tracking both send and recv initial stream windows.
This is needed because both client and server may send an
INITIAL_WINDOW_SIZE setting, and they must be treated
separately.
2015-02-27 19:21:35 +01:00
aac427ab8c
Fixing compile error
2015-02-23 18:16:30 -07:00
59ae845d30
Guarding against null streams when resetting.
...
This is possible when receiving a frame for a non-existent stream:
it is replied with a reset, but the stream object is never created.
2015-02-18 23:00:37 +01:00
d4809e9b79
Improved handling of the stream close state.
...
Now the stream close state is updated when the frame has been
successfully written, and when it is received.
The stream is closed in case of failures.
Just after the stream close state update, if the stream is closed
then it is removed from the session.
2015-02-18 23:00:37 +01:00
e18573f4a3
460211 Fixed Idle race in ExecuteProduceRun
...
Reimplemented ExecuteProduceRun with a spin lock
2015-02-18 21:47:22 +11:00
ff7e0e626a
Implemented notification of session failure events.
2015-02-13 14:18:08 +01:00
9677988960
Removed TODO.
2015-02-13 13:11:59 +01:00
4db654ad32
Organised http2 imports
2015-02-13 13:43:32 +11:00
98e3a28794
459845 - Support upgrade from http1 to http2/websocket
...
Added test harness for h2c upgrade.
2015-02-13 13:41:14 +11:00
c3332e7d2e
459845 - Support upgrade from http1 to http2/websocket
...
Added support for unofficial "upgrade" from http/1 to h2c
2015-02-13 12:16:03 +11:00
0677735550
Simplified HTTP/2 parser and its listener.
...
It is not possible to perform asynchronous processing of the content
of DATA frames, because otherwise the parser has to stop, stalling
all other streams.
Parser.Listener methods were returning boolean in a vestigial attempt
to handle asynchronous data processing, and have now been converted to
return void.
2015-02-12 19:43:52 +01:00
360b72a29e
HTTP/2 API Javadocs.
2015-02-11 17:44:05 +01:00
be860741d5
459655 - Remove SPDY and NPN.
...
Cleanup of javadocs, comments, XML and other text files.
2015-02-11 16:18:07 +01:00
44d262c65a
Renamed GatheringCallback to CountingCallback.
2015-02-10 13:16:41 +01:00
d0f0aa7c9f
Fixed removal of streams upon sending the response HEADERS frame.
2015-02-09 13:26:01 +01:00
7066f65e8c
423974 - Optimize flow control.
...
Implemented a buffering FlowControlStrategy that reduces the amount
of WindowUpdate exchanges.
2015-02-09 13:25:32 +01:00
fa72356d1d
Fixed failure of stalled frames.
2015-02-09 09:11:56 +01:00
02b5732720
First take at implementing the HttpClientTransport for HTTP2.
2015-02-09 09:11:56 +01:00
e1cc5fb487
Merge remote-tracking branch 'origin/master' into jetty-9.3-ewyk
...
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannel.java
jetty-server/src/main/java/org/eclipse/jetty/server/QueuedHttpInput.java
jetty-util/src/main/java/org/eclipse/jetty/util/thread/NonBlockingThread.java
2015-01-08 15:21:01 +01:00
a3201a3c81
Happy New Year 2015
2015-01-07 17:06:59 -07:00
5bed6323c1
Reworked buffer releasing to ensure that it is always executed before
...
fillInterested() is called.
This is needed to avoid race conditions where fillInterested()
triggers a new thread entering onFillable() and acquiring a new buffer
while the previous thread is releasing the previous buffer.
2015-01-02 18:43:07 +01:00
beacb948b1
Allow configuration of ExecutionStrategy
...
eg -Dorg.eclipse.jetty.io.ManagedSelector.ExecutionStrategy=org.eclipse.jetty.util.thread.ExecutionStrategy$ExecuteProduceRun
2015-01-01 17:04:00 +01:00
3af9b145a3
Deprecated the AbstractConnection dispatchIO mechanism
2015-01-01 16:18:13 +01:00
448f150ac4
Cleaned up ExecutionStrategy by adding javadocs, removing methods not
...
used and renaming classes and methods to better names.
2014-12-19 11:25:09 +01:00
4ccd5207b5
Switched ExecutionStrategy to EWYK.
2014-12-18 17:14:34 +01:00
e35c51eb7d
Implemented dispatch to the application using an ExecutionStrategy.
...
Now instead of having the channel to dispatch when it detects that it
has to call the application (upon receiving a HEADERS frame, or upon
a push "fake" request), now the whole mechanism is controlled by an
ExecutionStrategy.
2014-12-18 17:14:34 +01:00
7f98b64658
Clearing the buffer in case of parser errors that lead to a
...
connection failure.
2014-12-18 17:14:34 +01:00
2536c1cc3f
Handle HTTP2-16 black listed ciphers
2014-12-04 14:17:25 +01:00
c3472f01c4
updated hpack for draft 10 name changes
2014-12-04 10:27:14 +01:00
8d2efaf7eb
445167 - Allow configuration of dispatch after select.
...
Introduced parameter "dispatchIO" in the relevant factories so that
they can be configured by users and connections will be created
taking into account this parameter.
For less configurable connection factories, this parameter is
currently hardcoded to either true or false depending on the case.
For example, ALPN and NPN connections have it to false, since they
don't do any blocking operation in onFillable().
2014-09-26 10:13:16 +02:00
8af9ea4030
Calling notIdle() to avoid the idle timeout triggers when sending frames.
2014-09-26 10:13:16 +02:00
fc4bfc8a66
improved debug logging
2014-09-21 15:03:54 +10:00
0acee9851f
minor cleanups of exceptions
2014-09-18 18:23:48 +10:00
17c8f71724
Renamed onConnect() to onAccept() to reflect its server-side role.
2014-08-21 11:54:03 +02:00
c07ea68b51
Improved configurability of stream idle timeout.
2014-08-21 11:54:03 +02:00
75c1322adc
Rewritten close workflow to make sure that connections are correctly closed.
2014-08-21 11:54:03 +02:00
7a61c96ba1
Removed debug logging (wrongly assumes the ByteBuffer has a backing array).
2014-08-21 11:54:03 +02:00
c15480644f
442083 - Client resets stream, pending server data is failed, connection closed.
...
Introduced ResetException, and using it when failing frames of streams
that have been reset already.
HttpTransportOverHTTP2.abort(Throwable) checks for this exception and
does not close the connection.
2014-08-19 18:40:01 +02:00
d4f140ff65
Ignoring HEADERS, PUSH_PROMISE and DATA if the stream cannot be found.
...
This typically happens when the stream has been reset.
2014-08-19 13:43:24 +02:00
20076fcdc5
Moved reset() from Session to Stream.
2014-08-19 13:41:52 +02:00
09d54eacab
Accounting for the session flow control window in case of reset streams.
2014-08-19 13:38:43 +02:00
728a7c3442
Made push functionality honor configuration parameter sent via SETTINGS.
2014-08-15 18:34:20 +02:00
48b1f9f3f1
Implemented HTTP/2 push functionality.
...
A PushCacheFilter contains the logic to associate secondary resources
to primary resources.
PushCacheFilter calls a Jetty-specific API on the request dispatcher:
Dispatcher.push(ServletRequest). This is a technology preview of the
push functionality slated for Servlet 4.0.
The push() invocation arrives to the transport and it is converted to
HTTP/2 specific PUSH_PROMISE, along with the mechanism to simulate
the request for the secondary resource.
2014-08-14 23:05:35 +02:00
68a3ca8e31
improved debug logging of settings
2014-08-13 12:00:32 +10:00
a97d4642ab
Improved toString() methods for frames.
2014-08-12 23:01:03 +02:00
e147ce9528
Updated flow control implementation to detect when senders exceed
...
allowed windows.
2014-08-12 16:37:41 +02:00
107a4fff20
Fixed handling of INITIAL_WINDOW_SIZE setting.
...
It must update only stream windows, and not the session window.
2014-08-11 18:43:50 +02:00
187c42fa4a
Closing the flusher instead of just disconnecting after a GO_AWAY.
...
This ensures that frames that may have been added to the flusher queue
concurrently after the GO_AWAY are properly failed and the queue
drained.
2014-08-11 11:30:49 +02:00
59a9c0890c
Fixed off-by-one in counting the padding bytes.
2014-08-08 23:53:18 +02:00
f8086dc7c2
Refactored the send of the SETTINGS frame from the client.
...
It's now sent after a call to onPreface(), which has been moved to
the common interface Session.Listener (from ServerSession.Listener),
so that client applications can customize the SETTINGS to send to the
server.
2014-08-08 23:52:20 +02:00
ab96bf775f
Removed unneeded casting to DataFrame.
2014-08-08 18:19:02 +02:00
69927b935e
Don't send a window update if the length is zero.
2014-08-08 01:11:59 +02:00
abd139cc1b
Reworked flow control implementation. Splitted HTTP2Flusher out of HTTP2Session.
...
Flow control window updates are now processed by the flusher, so that
it is the only component that handles window updates.
In the process of this refactoring, HTTP2Flusher was refactored out
of HTTP2Session.
2014-08-06 15:42:36 +02:00
2cd53831c0
Refactored onReadTimeout() to parent class.
2014-08-06 15:39:29 +02:00
22cdca9131
Merge branch 'jetty-http2' into http2_flow_control
2014-08-05 10:01:30 +02:00
636c7eaeae
Fixed handling of max concurrent streams.
...
There is a difference between the value set via configuration, that
always refer to remote streams (streams initiated by remote peers),
and the value received via SETTINGS frame, that always refer to local
streams (streams initiated locally).
2014-08-05 02:01:34 +02:00
ac7aa4decc
Flow control needs improvements.
2014-08-05 00:28:06 +02:00
20925ded97
Fixed insertion of frame header buffer at the right index.
...
In case the lease is not empty, the frame header buffer must not be
inserted at index 0, but just before the frame body buffer.
2014-08-04 12:15:14 +02:00
8d554b54a8
Fixed checks for headers too big.
2014-08-03 00:27:28 +02:00
e332aa9c43
Improved logging.
2014-08-03 00:27:28 +02:00
dcc8bfcd10
Fixed a reentrancy issue that caused a stack overflow.
...
The case was that shutdown was called, ShutdownFlusherEntry called
flusher.close(), which called super.close(), which called
onCompleteFailure(), which looped over the active items to fail them,
calling again ShutdownFlusherEntry, which called again flusher.close(),
etc.
2014-08-02 00:38:24 +02:00
7004d71996
Reporting FRAME_SIZE_ERROR in case wrong frame lengths.
2014-08-01 16:22:36 +02:00
cddfa033f0
Implemented handling of SETTINGS_HEADER_TABLE_SIZE configuration property.
2014-08-01 16:20:20 +02:00
346b726c47
Taking into account the padding bytes in flow control length.
2014-08-01 15:54:12 +02:00
89a045855c
Moved http2.frames.Flag to http2.Flags.
2014-08-01 15:04:14 +02:00
67fd213263
Moved http2.parser.ErrorCode to http2.ErrorCodes.
2014-08-01 15:03:49 +02:00
168a8f7dbf
Reporting FRAME_SIZE_ERROR in case wrong frame lengths.
2014-08-01 15:01:03 +02:00
3283232f02
Added initial support for parsing CONTINUATION frames, and nothing more.
2014-08-01 14:02:11 +02:00
6b6267ed31
Updated implementation to draft-14.
2014-08-01 13:32:56 +02:00
9c3eedfea8
Updates to hpack for hpack-09 draft
2014-07-31 13:26:23 +10:00
Simone Bordet
Joakim Erdfelt
Lachlan Roberts
Greg Wilkins
olivier lamy
WalkerWatch
Jesse McConnell
Jan Bartel
Joakim Erdfelt
Greg Wilkins