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
3fd8a2e666
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 17:52:19 +02:00
2cce7510e1
Updating to 9.3.5-SNAPSHOT
2015-10-08 17:49:09 -07:00
9cf0e34a1d
Updating to version 9.4.0-SNAPSHOT
2015-10-07 15:41:32 -07:00
37296bec3c
Updating to version 9.3.4.v20151007
2015-10-07 14:58:38 -07:00
0ca40b59c6
479277 - HttpClient with HTTP/2 transport does not work for "https" URLs.
...
Fixed by reworking how ClientConnectionFactories are handled by both
HTTP2Client and by HttpClientTransportOverHTTP2, to avoid that the
latter wraps the nested factories with SslConnection twice.
2015-10-07 21:39:02 +02:00
6300480c0b
Forwarding HttpClient properties to HTTP2Client at startup.
2015-09-29 12:16:00 +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
3dcdb9f802
Merged branch '477878' into 'master'.
2015-09-25 19:34:45 +02:00
3201d0acd2
477878 - HttpClient over HTTP/2 doesn't close upload stream.
...
Clarified the difference between last and consumed in HttpContent.
Fixed HTTP/2 transport to behave correctly in case of last content.
2015-09-25 19:31:40 +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
d0bc20385a
477885 - Jetty HTTP2 client fails to connect with Netty server - HTTP2 client preface missing or corrupt.
...
Fixed by starting to read from the server only after having sent the
client preface.
2015-09-20 16:55:22 +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
6409366499
[maven-release-plugin] prepare for next development iteration
2015-08-27 10:11:29 -05:00
3086adc965
[maven-release-plugin] prepare release jetty-9.3.3.v20150827
2015-08-27 10:11:21 -05:00
f8734f23ce
[maven-release-plugin] prepare for next development iteration
2015-08-25 14:10:01 -05:00
e9edf4c24b
[maven-release-plugin] prepare release jetty-9.3.3.v20150825
2015-08-25 14:09:54 -05:00
545fa0f72b
475605 - Add support for multi-homed destinations.
...
If DNS lookup returns multiple IP addresses, HttpClient tries to
connect to the first; failing that, to the second, and so on.
2015-08-24 12:31:08 +02:00
fd335d6c3e
Guarded against NPE.
2015-08-20 16:31:09 +02:00
69b90ef59b
474888 - HttpClient JMX support.
2015-08-13 15:16:14 +02:00
aa684a5dcc
470311 - Introduce a proxy-protocol module.
...
Support for the PROXY protocol is now enabled via 2 new modules:
proxy-protocol and proxy-protocol-ssl, respectively for the HTTP
connector and the SSL connector.
2015-08-11 12:17:24 +02:00
3c99c9c9b9
Merge branch 'release-9.3.2'
2015-08-03 10:27:52 -07:00
2a4095590d
473955 - NPE in PushCacheFilter.
...
Fixed by normalizing to "/" the missing path of a referrer URI.
2015-07-30 19:48:38 +02:00
4b3879845d
[maven-release-plugin] prepare for next development iteration
2015-07-30 07:02:10 -07:00
6b7e9ac4b0
[maven-release-plugin] prepare release jetty-9.3.2.v20150730
2015-07-30 07:02:02 -07:00
25ed10d205
473118 - HTTP/2 server does not retrieve Host header from client.
2015-07-28 12:26:53 +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
9b790c38ce
[maven-release-plugin] prepare for next development iteration
2015-07-14 11:42:34 -05:00
b35d32f2b8
[maven-release-plugin] prepare release jetty-9.3.1.v20150714
2015-07-14 11:42:28 -05:00
9549001d8c
472422 - Custom status codes result in a NumberFormatException while using http2.
...
Fixed constructor that was passing the name as the value.
Also other cleanups.
2015-07-11 16:30:05 +02:00
c367ea8a85
441020 - Support HEADERS followed by CONTINUATION+.
2015-07-08 18:55:47 +02:00
30f8eb234e
Allow HTTP2C to be configured separately from HTTP2
2015-06-17 15:01:17 +10:00
cf6c4a914e
Updating version to 9.3.1-SNAPSHOT
2015-06-15 10:25:49 -07:00
1a9da9f9e4
Updating versions to 9.3.0.v20150612
2015-06-12 09:34:24 -07:00
c6ac82f50b
Merge branch 'master' into release-9.3
2015-06-12 09:30:46 -07:00
7c737a587b
Removing [version] sections in modules
2015-06-12 09:14:34 -07:00
496b4dfc83
[maven-release-plugin] prepare for next development iteration
2015-06-11 15:08:36 -07:00
f53c5d8fac
[maven-release-plugin] prepare release jetty-9.3.0.v20150611
2015-06-11 15:08:29 -07:00
916efd6aa7
469860 - Add module metadata versioning to support backwards compat
...
+ Adding [version] section to all existing jetty 9.3 distro modules
+ Updating testcases in jetty-start with new [version] sections too
+ Adding extra testcases for versioned modules
2015-06-10 10:59:18 -07:00
a6ff4da9b1
Made the cipher comparator a constant field.
2015-05-26 18:03:55 +02:00
1a6db17799
Added test for push with query parameters.
2015-05-26 18:03:55 +02:00
3288eb392f
468313 - PushCacheFilter wrongly associates primary resources to themselves.
...
Fixed by not associating secondary resources that are the same as the
primary resource.
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
356600716d
Draft 14 9.2.2 protection
2015-05-13 10:26:45 +10:00
5d041ad54f
466645 Allow XmlConfiguration Properties to use Elements or Attributes
2015-05-07 16:24:11 +10:00
80f46432da
Updated example to show also pushed resources.
2015-05-04 12:33:10 +02:00
39591f3443
466283 - Support specifying ALPN protocols in HTTP2Client.
2015-05-04 12:33:10 +02:00
64033e0958
Improved toString().
2015-05-04 12:33:10 +02:00
8b39e7ffb8
464629 JDK8 Socket customization
...
Added the SocketCustomizationListener class which may be added as a bean to either a Connector or a ConnectionFactory
so that customizations may be made per connector by connection type or even per connection factory.
SSL is unwrapped.
2015-04-30 11:46:10 +10: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
df63400dbe
Introduced overridable configure(SocketChannel) method.
...
This allows subclasses to configure the socket with rarely used
options such as the traffic class and or SocketOptions.
2015-04-29 09:46:26 +02:00
2de8eb936d
464708 - Support HttpConfiguration.delayDispatchUntilContent in HTTP/2.
2015-04-24 12:36:53 +02:00
3d5164b651
Hiding exception stack printed by a successful test.
2015-04-24 12:26:36 +02:00
9e6c8eade1
464727 - Update Javadoc for Java 8 DocLint
2015-04-22 12:43:22 -07:00
e868ab0b0d
464706 - HTTP/2 and async I/O: onDataAvailable() not called.
...
Changed HTTPServerConnection to return a Runnable to be run by the
execution strategy also in case of content.
This allows onDataAvailable() to be called at the proper times.
2015-04-15 17:21:17 +02:00
0360b1cc5b
Made test more reliable.
2015-04-14 22:18:45 +02:00
55e74c6867
460187 - infinite recursion in sending error.
...
Added test case.
2015-04-14 22:11:59 +02:00
599ab9bb1b
460671 - Rationalize property names.
...
Property format is now "jetty.<module|component>.<propertyName>".
Updated all references with new properties.
2015-04-13 16:21:48 +02: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
663ff827ed
Blacklist ciphers only for h2-16 and later
2015-04-09 10:31:45 +10:00
1cb0449be3
Organised imports
2015-03-26 12:32:15 +11: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
d20c7707b7
Merged branch 'jetty-9.2.x' into 'master'.
2015-03-24 20:56:26 +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
4107444beb
Tests for async proxy functionality.
2015-03-20 14:53:11 +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
81f29576e6
Prevented NPE in abort().
2015-03-16 08:17:25 +01:00
4f0c63734c
462162 - StackOverflowException when response commit fails.
...
Fixed HttpChannel to avoid to stack overflow in case of unusual
exceptions thrown while committing.
Now it directly calls the transport to try to send a 500.
2015-03-15 12:10:27 +01:00
3f795da26c
459845 - Support upgrade from http1 to http2
...
Generalised Upgrade Connection Factories
2015-03-13 13:59:29 +11:00
ffb15aa5fb
Made test more reliable.
...
Testing for stream.isClosed() is done in StreamCloseTest.
The tests were failing because receiving the headers does not mean
the sending the headers has notified the callback yet, and hence
closed the stream.
2015-03-12 20:54:40 +01: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
005870811d
Fixed compilation issue: using Jetty's B64Code instead of JDK8 Base64.
2015-03-12 11:06:30 +01:00
0dd58d2efe
459845 - Support upgrade from http1 to http2
...
Moved the sneaky direct upgrade to its own method and added support to detect a standard upgrade.
The standard upgrade now creates the h2c connection and decodes the settings header, but it does not yet process the
settings nor send a response to the request.
2015-03-12 16:52:17 +11:00
a7cfc3dc2d
Renamed methods in FlowControlStrategy.
2015-03-11 20:38:40 +01:00
36f317382f
More flow control tests.
2015-03-11 18:43:00 +01:00
8673c6bba7
Clarified test and made it more reliable.
2015-03-11 17:12:38 +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
560ec6301e
423974 - Optimize flow control.
...
Made the buffering flow control strategy the default.
2015-03-11 16:27:31 +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
4caf991e44
Made test run only under JDK 8.
2015-03-02 16:39:31 +01:00
9f76995086
Restored ALPN tests.
2015-03-02 13:17:26 +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
b533aa6ce5
Made tests more stable.
...
Naked writes could throw WritePendingException.
Now we wait until the client has finished sending the reply to the
server SETTINGS frame, then we do the naked write.
2015-02-27 12:30:42 +01:00
7c315ebce5
Fixed test.
2015-02-24 15:59:32 +01:00
6ad90c259c
Fixed test.
2015-02-24 14:51:30 +01:00
aac427ab8c
Fixing compile error
2015-02-23 18:16:30 -07:00
5d6bb9f5d0
460210 - ExecutionStragegy producer for SelectManager calls onOpen from produce method
...
Additional refactoring to better handle HttpInput state. Moved the unready and read possible states into the HttpChannelState
2015-02-23 23:06:23 +11:00
58ea526b56
Notifying client connection's promise from onOpen().
...
The client connection's promise was succeeded in the context of a
call to SelectorManager.newConnection().
This was wrong, since succeeding the promise may trigger the send
of a request *before* the connection is actually linked to the
endPoint and opened.
This change moves the succeeding of the client connection's promise
to the connection onOpen() method.
2015-02-20 18:23:31 +01:00
08b4bd439e
Fixing tests on http2-hpack
...
+ HttpField.nameHashCode() fixed to actually be US-ASCII case
insensitive per documentation
+ Since removal of MetaData equals/hashcode, the comparison
of the MetaData and MetaData.Response is now done entirely
within the HpackTest
2015-02-20 10:16:03 -07:00
b60ea47ef4
Revert "Revert "Fixed AsyncIO double dispatch""
...
This reverts commit 8bd94ec6be
2015-02-20 00:18:29 +11:00
8bd94ec6be
Revert "Fixed AsyncIO double dispatch"
...
This reverts commit 968063c1ab
2015-02-20 00:03:40 +11:00
968063c1ab
Fixed AsyncIO double dispatch
2015-02-19 18:13:31 +11: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
84b8882624
Using TestTracker Rule in test classes.
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
cb5d91df19
ignored bad http2 client test
2015-02-18 09:20:27 +11:00
fbf7679e34
Fixed compilation issue after merge.
2015-02-15 20:54:36 +01:00
28b9a0927c
Merged branch 'jetty-9.2.x' into 'master'.
2015-02-15 20:51:49 +01:00
5a40ed5a0d
Fixed test, and added test to check close state of pushed streams.
2015-02-13 18:08:39 +01: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
a2e051c4e0
made StreamResetTest test less of a race
2015-02-13 16:15:08 +11:00
c090f179a7
459845 - Support upgrade from http1 to http2/websocket
...
Added jetty-http2c.xml and http2c.mod
2015-02-13 15:06:24 +11: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
7811c10727
Fixing http2-client test quirk when
2015-02-12 14:42:02 -07: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
a147cee480
459731 - Update for drafts hpack-11 and http2-17
2015-02-12 14:45:12 +11:00
b45389ad87
Fix http2 osgi manifests and tests
2015-02-12 10:32:16 +11:00
20fa13605c
459655 - Remove SPDY and NPN
...
+ Flattening protonego-* to alpn.mod + alpn-impl/alpn-${java.version}
2015-02-11 10:58:10 -07: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
2162455b72
Removed SPDY and NPN
...
Because jetty 9.3 is targetted for HTTP2, we have removed support for SPDY and NPN.
2015-02-11 14:20:06 +11:00
44d262c65a
Renamed GatheringCallback to CountingCallback.
2015-02-10 13:16:41 +01:00
273854835f
Made HttpClientTransportOverHTTP2 a ContainerLifeCycle, so that it
...
can manage the start/stop of HTTP2Client.
2015-02-09 17:33:10 +01:00
3855024bba
Added tests for HTTP2Client idle timeout.
2015-02-09 16:53:22 +01:00
f974c74329
Implemented HTTP2Client connect timeout.
2015-02-09 16:22:21 +01:00
85edb7e573
Improved configurability of HTTP2Client.
2015-02-09 14:24:09 +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
14cd10b676
experimenting with push API
2015-02-06 13:48:34 +11:00
f6cfe07a69
added direct buffer configuration
2015-02-05 10:02:01 +11: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
3f59bc4c14
refactored HttpConnector for EWYK - work in progress
2014-12-23 17:15:27 +01:00
ebaf84b97e
Refactored HttpInput to use poison pills
2014-12-21 10:43:37 +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
1c2c83e962
Added TODO to remove references to ByteBuffer.array() without
...
checking whether the ByteBuffer does have a backing array.
2014-12-18 17:14:34 +01:00
cdd2b0a9d2
refacted SelectorManager to have a ManagedSelector
2014-12-17 16:29:24 +01:00
dfe9dc3115
Further experimentation with PushBuilder
2014-12-09 12:27:39 +01:00
06b1efc182
Added alternate push API and example
2014-12-05 17:47:25 +01:00
7b41e78f74
Improved HttpChannelOverHTTP2 recycling
2014-12-05 08:36:51 +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
4296d84a7b
updated hpack for draft 10 name changes
2014-12-04 10:17:06 +01:00
0a144ed3ac
453487 Recycle HttpChannelOverHTTP2
...
This is an initial recyling of the channel. The pool is a concurrent linked list, but it may be better to use an array backed list/stack that can easily enforce a maximum pool size.
The pool is currently on the session listener, when it really should be on the HTTP2ServerConnection, but more refactoring is needed for that.
Also the pool is currently inaccessible to the push mechanism
2014-11-28 12:09:59 +11:00
f853adb43c
fixed debug
2014-11-21 16:01:31 +11:00
d4d6cfdfa7
Removing virtual module [ssl-protonego]
...
+ This virtual module, rolled the ssl + protonego + (xml) into
http2 & spdy modules instead.
2014-11-17 14:08:19 -07:00
5b60e0c98d
support h2-15 and h2-14
2014-11-14 10:53:37 +11:00
e3bda4efbe
446564 Refactored RequestLog Mechanism
...
RequestLog can now be set on the HttpChannel and is called during the onCommitted callback.
The RequestLog may be set either on the server or via an updated RequestLogHandler that can
be applied to a specific context.
2014-10-31 13:31:29 +11:00
31e448ffd6
Removed duplication of HttpGenerator$Info vs http.MetaData
...
Use MetaData throughout code base
2014-10-24 15:51:20 +11:00
ec79a6f88e
Improve HTTP header pre-encoding
...
The HttpContent class has been reworked to store HttpField instances, we may be generated on
demand or instances of PreEncodedHttpField.
The encoding of HTTP2 fields has been generalized to handle both indexed and literal fields, selected
by header enum set.
Default servlet and response classes have been cleaned up in how they set response headers.
2014-10-16 12:31:37 +11:00
8c85b2f591
improved http2 static entry generation
2014-10-15 14:04:54 +11: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
a8b461fe91
Cosmetics: removed unused imports, cleaned up source code, improved javadocs.
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
9a1acd59fc
Made test more robust.
2014-09-26 10:13:15 +02:00
3095a179f9
[maven-release-plugin] prepare for next development iteration
2014-09-24 12:24:31 -05:00
390f3200cc
[maven-release-plugin] prepare release jetty-9.3.0.M0
2014-09-24 12:24:23 -05:00
a573430840
PushCacheFilter handles multiple hosts and ports
2014-09-22 11:10:13 +10:00
fc4bfc8a66
improved debug logging
2014-09-21 15:03:54 +10:00
51631c2a46
Made the test more robust, avoiding WritePendingExceptions.
2014-09-19 10:33:09 +02:00
bfda3620f3
444485 - Client resets stream, pending server data is failed, write hangs.
...
Fixed by ensuring that when a failure happens, either by catching an
exception or by failing a callback, we always call completed() and
abort the channel (via new method terminate()).
2014-09-18 16:31:16 +02:00
418a493337
More simplifications for the send() implementation.
2014-09-18 11:50:18 +02:00
0acee9851f
minor cleanups of exceptions
2014-09-18 18:23:48 +10:00
ef4e0a9e7c
Made the test more reliable.
2014-09-17 20:56:05 +02:00
3e602117b4
Improved send() implementation to be more clear, and covered also a
...
missing case where the callback may have not been notified.
2014-09-17 18:07:22 +02:00
5370f3c8cb
442950 - Embedded Jetty client requests to localhost hangs with high cpu usage (NIO OP_CONNECT Solaris/Sparc).
2014-09-01 12:06:18 +02: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
c10e5e8833
Renamed PushTest -> PushCacheFilterTest.
2014-08-21 11:54:02 +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
c7987b154a
Reverted logging of HTTP2 tests from DEBUG to INFO.
2014-08-15 17:29:38 +02:00
1c71040eca
moved config plugin to profile
2014-08-15 19:53:52 +10:00
b47f9ef605
cleaned up OSGi manifest creation
2014-08-15 19:35:49 +10: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
a14d843382
ignored osgi-spdy tests
2014-08-14 15:18:28 +10: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
20963c9c61
Refactored host and port to local variables.
2014-08-12 18:54:50 +02:00
814c84a212
Introduced configuration properties for ALPN/NPN advertised protocols.
...
No more need to copy protonego-alpn.xml to a jetty.base to specify
which protocols are advertised and in which order.
Instead, simply specify:
alpn.protocols=h2-14,http/1.1
alpn.defaultProtocol=http/1.1
in start.ini (in the example above for http2).
2014-08-12 18:54:33 +02:00
e147ce9528
Updated flow control implementation to detect when senders exceed
...
allowed windows.
2014-08-12 16:37:41 +02:00
4f4c3604a2
Made the test more reliable.
2014-08-12 16:27:33 +02:00
d2fa4dca60
Introduced configuration properties for ALPN/NPN advertised protocols.
...
No more need to copy protonego-alpn.xml to a jetty.base to specify
which protocols are advertised.
Instead, simply specify:
protonego.protocols=h2-14,http/1.1
protonego.defaultProtocol=http/1.1
in start.ini (in the example above for http2).
2014-08-11 23:59:26 +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
5da39140df
remove old TODOs
2014-08-08 18:30:56 +10:00
6b9a069d9d
Waiting for all the frames to arrive before stopping.
2014-08-08 01:11:59 +02:00
466d8db8d8
Sending a SETTINGS frame after the preface, as required by the spec.
2014-08-08 01:11:59 +02:00
69927b935e
Don't send a window update if the length is zero.
2014-08-08 01:11:59 +02:00
287e86b7aa
decomposed https,http2 and spdy modules to share ServerConnector
2014-08-07 12:58:12 +10:00
64e49a1fe5
work around classloaders for field preencoders
2014-08-07 09:10:35 +10:00
55dec378fc
Merged branch 'jetty-http2' into 'http2_flow_control'
2014-08-06 15:43:56 +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
17f46665df
preencoded httpfield optimisation
2014-08-06 21:09:26 +10:00
b5971484a5
Basic push mechanism skeleton
2014-08-06 10:50:55 +10:00
22cdca9131
Merge branch 'jetty-http2' into http2_flow_control
2014-08-05 10:01:30 +02:00
6b3c8d06a9
partial 100 continues support in http2
2014-08-05 16:14:53 +10:00
d7f2c42e2d
misc optimisation of http2 field creation
2014-08-05 12:55:37 +10: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
48d68a4916
handle http/1 host header in http/2
2014-08-05 09:21:27 +10: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
a2faa030cc
Improved logging.
2014-08-04 12:09:35 +02:00
17c03385d6
Fixed send() by properly handling all cases.
2014-08-04 12:09:10 +02:00
35f0103add
Added HTTP2 tests for multiple requests.
2014-08-03 00:27:28 +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
1fb07644a1
Use HttpHeader enum for :path and similar h2 fields
2014-08-02 16:37:43 +10:00
cd59d0085e
improve known header handling in hpack encoding
2014-08-02 15:40:15 +10:00
1873b306b3
Improved hpack encoder handling of custom fields
2014-08-02 12:56:12 +10: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
87c4c5efd3
Updated to point to webtide.com, now HTTP/2 enabled.
2014-08-02 00:02:25 +02:00
51e4885911
Made HTTP2Client support SSL so that it can be used to test websites that serve HTTP2.
2014-08-01 19:03:29 +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
a14b2be0e6
Merge branch 'jetty-http2' into refset
2014-07-31 11:58:30 +10:00
70dafa8eb3
simplified HttpTransport API
2014-07-31 11:53:51 +10:00
5d8780cb4e
Record some TODOs
2014-07-28 15:27:40 +10:00
a1696c0139
updates for hpack huffman and examples
2014-07-25 19:38:16 +10:00
c13be6d932
Merge branch 'jetty-http2' into refset
...
Conflicts:
jetty-http2/http2-hpack/src/test/java/org/eclipse/jetty/http2/hpack/HpackEncoderTest.java
2014-07-25 18:33:10 +10:00
30123607c6
Major refactor of metadata and HttpURI
...
This refactor strives to remove duplication between the Metadata class and the HttpURI class.
Both classes have been made mutable (as they partially were anyway so best not to pretend).
HttpURI now holds the decomposed strings rather than a single string with indexes. This allows it to be rebuilt after changing just parts of the URI. It is now a lot more similar to the
JVM URI class and we could consider replacing it (after checking peformance).
Next step is to refactor the Request class to prevent it duplicating these fields.
2014-07-24 15:49:52 +10:00
d6f841bb87
fixed refactor uri issue
2014-07-23 09:03:52 +10:00
7f62f2600b
refactored URI handling
2014-07-20 10:23:47 +10:00
a639359a7b
do not index content-length
2014-07-18 17:23:44 +10:00
d4e7c0a279
update encoding strategy for no ref-set
2014-07-18 15:59:41 +10:00
89a816843f
removed refset from hpack
2014-07-18 15:59:41 +10:00
f9ffefbe13
refactored to avoid copying MetaData.Request instances
2014-07-11 16:35:25 +10:00
ca1a9ceb7c
fixed merge issues
2014-07-04 23:22:40 +10:00
603985dcd2
Implemented gentler shutdown in case of reading -1.
...
This allows big responses to be sent even if the request half closes
the connection.
2014-06-27 17:06:07 +02:00
58b1ec9935
Improved logging.
2014-06-27 12:55:38 +02:00
2608af8f0d
Merged branch 'origin/master' into 'jetty-http2'.
2014-06-26 11:54:50 +02:00
4c2c7e8352
Guarded calls to LOG.debug() with if (LOG.isDebugEnabled()) to reduce allocation of varargs Object[].
2014-06-25 12:37:05 +02:00
02454ec8de
Improved handling of errors for streams.
2014-06-24 13:52:03 +02:00
05616d1e9d
Cosmetics.
2014-06-24 13:50:52 +02:00
e94b8745f2
PING frames are now processed as soon as possible.
2014-06-24 12:35:06 +02:00
7625844dff
Closing the connection if frames that carry headers don't have the
...
END_HEADERS flag.
2014-06-24 12:35:06 +02:00
8016fb6d0f
Strengthened the checks to avoid to exceed the max frame length.
2014-06-24 12:35:06 +02:00
f09b81835e
Improved handling of RST_STREAM frames.
2014-06-24 12:35:06 +02:00
86b0d77338
Improved the server transport implementation, and fixed a case where
...
the end stream flag was erroneously sent with more content to send.
2014-06-23 21:23:17 +02:00
72e0d800ac
Made ALPN API dependency provided.
2014-06-23 21:23:17 +02:00
0938e1701a
Merge branch 'jetty-http2' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-http2
2014-06-19 15:32:49 +02:00
c0629b6e04
encoding debug
2014-06-19 15:32:27 +02:00
4211653095
Fixed tests.
2014-06-18 16:09:52 +02:00
14dba64164
Fixed handling of zero-length hpacked headers.
2014-06-18 16:09:52 +02:00
9acf971cc1
cache path URI in table
2014-06-18 15:26:33 +02:00
beb5918c3c
fixed client
2014-06-18 13:59:02 +02:00
9d9260e634
Implemented idle timeout functionality for streams.
2014-06-18 13:57:37 +02:00
4dca6a71d3
Update Parser constructor to take additional parameters needed by
...
HpackDecoder.
2014-06-18 11:40:11 +02:00
9c95e29088
Implemented idle timeout functionality for both client and server.
2014-06-18 11:18:48 +02:00
690cd01933
Made sure that exceptions thrown by the generator are caught and the
...
connection closed.
2014-06-18 11:18:48 +02:00
c0e0b802d9
Made sure that exceptions thrown by the parser are caught and the
...
connection closed.
2014-06-18 11:18:48 +02:00
30affa57c7
HpackDecoder implements 413 limit
2014-06-18 11:11:23 +02:00
140e7ed0c5
encoder headers as lowercase
2014-06-18 10:22:23 +02:00
e115dee62f
improved static encoding strategy
2014-06-17 19:54:21 +02:00
7fa4f1e9f8
cleaned up authority handling
2014-06-17 19:40:09 +02:00
82a2dfd03a
Fixed infinite loop when receiving a SETTINGS frame.
2014-06-17 18:51:09 +02:00
2b494fde0e
Miscellaneous refactorings.
2014-06-17 16:23:06 +02:00
6d1e5c9a07
Fixed tests to make the generator and the parser have the same scope.
2014-06-17 11:04:32 +02:00
4c2a3dfbe6
better hpack debug
2014-06-17 11:04:10 +02:00
31b7f0a592
Fixed references to MetaData, that has been moved to the jetty-http module.
2014-06-17 09:28:50 +02:00
25295456ae
renamed HTTP/2.0 to HTTP/2
2014-06-17 00:12:57 +02:00
272e1d8da5
Refactored HttpChannel to not have direct HttpParser dependency
2014-06-17 00:02:50 +02:00
334db9fe72
Updated version to 9.3.0-SNAPSHOT.
2014-06-16 21:33:03 +02:00
1d2690ed11
Removed unneeded reference to jetty-ssl.xml, implicitly referenced
...
transitively by the dependency on the ssl module.
2014-06-16 21:21:43 +02:00
a6329451a1
Updated HTTP2 modules to be included in the distribution.
2014-06-16 18:15:13 +02:00
e6e68c5557
Added license header.
2014-06-16 16:09:47 +02:00
9af8eb9fa7
Replying to SETTINGS frame as requested by the specification.
2014-06-16 15:45:10 +02:00
849360717e
Implemented PUSH_PROMISE generator/parser.
2014-06-16 15:35:48 +02:00
907d303774
Added checks on the validity of the streamId.
2014-06-16 12:46:26 +02:00
7613385578
Moved NPN[Client|Server]Connection[Factory] classes to their own
...
modules, akin for the ALPN classes, and refactored all code that was
referencing them.
2014-06-16 12:46:26 +02:00
a500701bda
Fixed notification of Session's promise upon connect: it must be
...
notified only after we have successfully sent the preface bytes.
2014-06-15 16:39:23 +02:00
75b0a7088b
Fixed onPing() method: replaced call to ping() with control() since
...
ping() should not be called to reply to a ping.
2014-06-13 23:13:26 +02:00
18c3e395df
More flow control tests.
2014-06-13 23:03:49 +02:00
363c18a29e
Improved logging.
2014-06-13 23:03:37 +02:00
2b86d34d5a
Properly closing the stream and eventually removing it when receiving data frames.
2014-06-13 23:03:17 +02:00
d4783369bc
Fixed generation of sliced data frames, setting the end stream flag
...
only when all the content has been generated.
2014-06-13 22:59:48 +02:00
a58a5f8268
Fixed handling of zero length body, that must be HPACK decoded.
2014-06-13 22:57:40 +02:00
b3aa67e0a9
Implemented PING functionality.
2014-06-13 17:59:17 +02:00
8681511f08
Wrapping debug log statements with LOG.isDebugEnabled().
2014-06-13 17:10:38 +02:00
388262227e
Split the generation of frames into 2: flow-controlled and
...
non-flow-controlled.
This gives better code separation and proper removal of streams when
flow controlled frames complete.
2014-06-13 16:28:54 +02:00
fb93973c9d
Improved flow control logging.
2014-06-13 15:22:03 +02:00
b30152df27
Removed generation of padding bytes, which simplified the code a lot.
...
Implemented slicing of flow controlled data to never exceed the flow
control window.
2014-06-13 14:08:56 +02:00
5ed4f312cd
Implemented flow control.
2014-06-13 13:51:42 +02:00
116d654426
cleaned up debug
2014-06-12 15:08:46 +02:00
22c42151bd
Implemented logic to handle a GO_AWAY frame.
2014-06-11 22:43:08 +02:00
5a7f954262
Fixed generation of frames via Session API methods.
2014-06-11 21:21:49 +02:00
8e4c6b7fdd
Put some more flesh on the HTTP2 implementation.
2014-06-11 18:26:48 +02:00
78cbed1236
Added headerTableSize parameter.
2014-06-11 18:24:02 +02:00
1666f54b50
revert httpfields
2014-06-11 17:41:52 +02:00
f258ff1565
improved debug
2014-06-11 17:05:39 +02:00
c319c19125
convert MetaData to HttpField as a list
2014-06-11 16:53:17 +02:00
bbd61f8e19
Multiple mixed in changes and improvements
...
Simplified HttpParser as per rfc7230
implemented local/remote hpack max table sizes
2014-06-11 15:16:40 +02:00
70223cbda9
add status 200 and method GET to ref set
2014-06-11 10:23:29 +02:00
347324b71b
Improved logging.
2014-06-11 08:56:39 +02:00
7c5492acad
Properly linking stream object with HEADERS frame.
2014-06-11 08:56:23 +02:00
3c6663ff21
Fixed parsing in case of zero-length header block and zero-length data.
2014-06-10 22:54:32 +02:00
13b0b90aa9
Fixed logging.
2014-06-10 22:54:32 +02:00
6b77226517
improved debug
2014-06-10 20:28:52 +02:00
d024a46327
debug
2014-06-10 19:05:43 +02:00
630bee5887
Implemented HTTP2 connection preface.
2014-06-10 18:33:13 +02:00
29f8158b51
Merge branch 'jetty-http2' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-http2
...
Conflicts:
jetty-http2/http2-server/src/test/resources/jetty-logging.properties
2014-06-10 16:42:15 +02:00
24cda18114
http2 test server
2014-06-10 16:38:54 +02:00
36e7c41b2f
Improved logging.
2014-06-10 16:02:24 +02:00
c8184077c7
added logging to hpack
2014-06-10 15:26:54 +02:00
073ad924b0
improve value handling on known literal fields
2014-06-10 14:05:41 +02:00
f2e8edca9c
First working test for end-to-end request/response processing on
...
server side.
2014-06-10 13:29:50 +02:00
b55dba82a5
use scheme cache
2014-06-10 13:13:38 +02:00
19c4939ede
flip encode buffer
2014-06-10 13:05:28 +02:00
ab5461d73e
fixed hpack literal encoding bug
2014-06-10 12:56:20 +02:00
ad034f4d54
Reworked generation of frames (split into different generators) and
...
sketched server-side handling and linking with channel.
2014-06-10 12:02:54 +02:00
e0474108d0
Updated Frame inheritance.
2014-06-10 12:01:16 +02:00
3c321e9b8f
split authority field and hold results in header table
2014-06-09 15:34:09 +02:00
b2296cc2d4
simplified startRequest
2014-06-09 14:12:46 +02:00
c1247ff677
Reorganized HTTP2 modules.
2014-06-09 14:01:16 +02:00
1da95c974d
Implemented parser and generator for HEADERS frame.
2014-06-06 16:32:31 +02:00
9c13b300f0
Improved signature for generating DATA frames, with explicit padding
...
bytes.
2014-06-06 12:30:39 +02:00
6481bb926d
Strengthened frame body length checks.
2014-06-06 12:09:11 +02:00
2a485be6c1
Implemented parser and generator for SETTINGS frame.
2014-06-06 11:23:50 +02:00
54577057bb
Implemented parser and generator for WINDOW_UPDATE frame.
2014-06-06 09:21:47 +02:00
7a347e267f
Implemented parser and generator for GO_AWAY frame.
2014-06-05 22:28:39 +02:00
81538c9b59
Implemented parser and generator for PING frame.
2014-06-05 21:04:26 +02:00
6f3f7f5334
Implemented parser and generator for RST_STREAM frame.
2014-06-05 20:30:11 +02:00
21d8435541
Implemented parser and generator for PRIORITY frame.
2014-06-05 19:26:53 +02:00
a7e5963dfa
Implemented parser and generator for DATA frame.
2014-06-05 18:11:22 +02:00
Simone Bordet
Joakim Erdfelt
Jesse McConnell
Greg Wilkins
Greg Wilkins
Jan Bartel