Simone Bordet
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
Greg Wilkins
bd27e7d2d4
467730 - HTTP2 requires enabled ciphers to be sorted by blacklist
2015-05-21 01:41:12 +10:00
Greg Wilkins
356600716d
Draft 14 9.2.2 protection
2015-05-13 10:26:45 +10:00
Greg Wilkins
5d041ad54f
466645 Allow XmlConfiguration Properties to use Elements or Attributes
2015-05-07 16:24:11 +10:00
Simone Bordet
80f46432da
Updated example to show also pushed resources.
2015-05-04 12:33:10 +02:00
Simone Bordet
39591f3443
466283 - Support specifying ALPN protocols in HTTP2Client.
2015-05-04 12:33:10 +02:00
Simone Bordet
64033e0958
Improved toString().
2015-05-04 12:33:10 +02:00
Greg Wilkins
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
Simone Bordet
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
Simone Bordet
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
Simone Bordet
2de8eb936d
464708 - Support HttpConfiguration.delayDispatchUntilContent in HTTP/2.
2015-04-24 12:36:53 +02:00
Simone Bordet
3d5164b651
Hiding exception stack printed by a successful test.
2015-04-24 12:26:36 +02:00
Joakim Erdfelt
9e6c8eade1
464727 - Update Javadoc for Java 8 DocLint
2015-04-22 12:43:22 -07:00
Simone Bordet
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
Simone Bordet
0360b1cc5b
Made test more reliable.
2015-04-14 22:18:45 +02:00
Simone Bordet
55e74c6867
460187 - infinite recursion in sending error.
...
Added test case.
2015-04-14 22:11:59 +02:00
Simone Bordet
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
Simone Bordet
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
Greg Wilkins
663ff827ed
Blacklist ciphers only for h2-16 and later
2015-04-09 10:31:45 +10:00
Greg Wilkins
1cb0449be3
Organised imports
2015-03-26 12:32:15 +11:00
Simone Bordet
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
Simone Bordet
d20c7707b7
Merged branch 'jetty-9.2.x' into 'master'.
2015-03-24 20:56:26 +01:00
Simone Bordet
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
Simone Bordet
2a21f8cb2f
Renamed ISession.control() to ISession.frames().
2015-03-20 15:02:07 +01:00
Simone Bordet
4107444beb
Tests for async proxy functionality.
2015-03-20 14:53:11 +01:00
Greg Wilkins
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
Simone Bordet
81f29576e6
Prevented NPE in abort().
2015-03-16 08:17:25 +01:00
Simone Bordet
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
Greg Wilkins
3f795da26c
459845 - Support upgrade from http1 to http2
...
Generalised Upgrade Connection Factories
2015-03-13 13:59:29 +11:00
Simone Bordet
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
Simone Bordet
feed8ea158
Small refactoring of HTTP/2 upgrade code.
2015-03-12 19:08:26 +01:00
Greg Wilkins
b7d719be5f
459845 - Support upgrade from http1 to http2
...
Parse setting frame.
2015-03-13 00:54:33 +11:00
Simone Bordet
005870811d
Fixed compilation issue: using Jetty's B64Code instead of JDK8 Base64.
2015-03-12 11:06:30 +01:00
Greg Wilkins
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
Simone Bordet
a7cfc3dc2d
Renamed methods in FlowControlStrategy.
2015-03-11 20:38:40 +01:00
Simone Bordet
36f317382f
More flow control tests.
2015-03-11 18:43:00 +01:00
Simone Bordet
8673c6bba7
Clarified test and made it more reliable.
2015-03-11 17:12:38 +01:00
Simone Bordet
1dbf2be343
423974 - Optimize flow control.
...
Don't send the window update if the stream is closed.
2015-03-11 17:11:16 +01:00
Simone Bordet
560ec6301e
423974 - Optimize flow control.
...
Made the buffering flow control strategy the default.
2015-03-11 16:27:31 +01:00
Simone Bordet
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
Simone Bordet
4caf991e44
Made test run only under JDK 8.
2015-03-02 16:39:31 +01:00
Simone Bordet
9f76995086
Restored ALPN tests.
2015-03-02 13:17:26 +01:00
Simone Bordet
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
Simone Bordet
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
Simone Bordet
7c315ebce5
Fixed test.
2015-02-24 15:59:32 +01:00
Simone Bordet
6ad90c259c
Fixed test.
2015-02-24 14:51:30 +01:00
Joakim Erdfelt
aac427ab8c
Fixing compile error
2015-02-23 18:16:30 -07:00
Greg Wilkins
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
Simone Bordet
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
Joakim Erdfelt
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
Greg Wilkins
b60ea47ef4
Revert "Revert "Fixed AsyncIO double dispatch""
...
This reverts commit 8bd94ec6be
.
This is a revert of the revert to add back in the useful debug, plus some TODO comments describing the problems
2015-02-20 00:18:29 +11:00
Greg Wilkins
8bd94ec6be
Revert "Fixed AsyncIO double dispatch"
...
This reverts commit 968063c1ab
.
2015-02-20 00:03:40 +11:00
Greg Wilkins
968063c1ab
Fixed AsyncIO double dispatch
2015-02-19 18:13:31 +11:00
Simone Bordet
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
Simone Bordet
84b8882624
Using TestTracker Rule in test classes.
2015-02-18 23:00:37 +01:00
Simone Bordet
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
Greg Wilkins
e18573f4a3
460211 Fixed Idle race in ExecuteProduceRun
...
Reimplemented ExecuteProduceRun with a spin lock
2015-02-18 21:47:22 +11:00
Greg Wilkins
cb5d91df19
ignored bad http2 client test
2015-02-18 09:20:27 +11:00
Simone Bordet
fbf7679e34
Fixed compilation issue after merge.
2015-02-15 20:54:36 +01:00
Simone Bordet
28b9a0927c
Merged branch 'jetty-9.2.x' into 'master'.
2015-02-15 20:51:49 +01:00
Simone Bordet
5a40ed5a0d
Fixed test, and added test to check close state of pushed streams.
2015-02-13 18:08:39 +01:00
Simone Bordet
ff7e0e626a
Implemented notification of session failure events.
2015-02-13 14:18:08 +01:00
Simone Bordet
9677988960
Removed TODO.
2015-02-13 13:11:59 +01:00
Greg Wilkins
a2e051c4e0
made StreamResetTest test less of a race
2015-02-13 16:15:08 +11:00
Greg Wilkins
c090f179a7
459845 - Support upgrade from http1 to http2/websocket
...
Added jetty-http2c.xml and http2c.mod
2015-02-13 15:06:24 +11:00
Greg Wilkins
4db654ad32
Organised http2 imports
2015-02-13 13:43:32 +11:00
Greg Wilkins
98e3a28794
459845 - Support upgrade from http1 to http2/websocket
...
Added test harness for h2c upgrade.
2015-02-13 13:41:14 +11:00
Greg Wilkins
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
Joakim Erdfelt
7811c10727
Fixing http2-client test quirk when
2015-02-12 14:42:02 -07:00
Simone Bordet
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
Greg Wilkins
a147cee480
459731 - Update for drafts hpack-11 and http2-17
2015-02-12 14:45:12 +11:00
Jan Bartel
b45389ad87
Fix http2 osgi manifests and tests
2015-02-12 10:32:16 +11:00
Joakim Erdfelt
20fa13605c
459655 - Remove SPDY and NPN
...
+ Flattening protonego-* to alpn.mod + alpn-impl/alpn-${java.version}
2015-02-11 10:58:10 -07:00
Simone Bordet
360b72a29e
HTTP/2 API Javadocs.
2015-02-11 17:44:05 +01:00
Simone Bordet
be860741d5
459655 - Remove SPDY and NPN.
...
Cleanup of javadocs, comments, XML and other text files.
2015-02-11 16:18:07 +01:00
Greg Wilkins
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
Simone Bordet
44d262c65a
Renamed GatheringCallback to CountingCallback.
2015-02-10 13:16:41 +01:00
Simone Bordet
273854835f
Made HttpClientTransportOverHTTP2 a ContainerLifeCycle, so that it
...
can manage the start/stop of HTTP2Client.
2015-02-09 17:33:10 +01:00
Simone Bordet
3855024bba
Added tests for HTTP2Client idle timeout.
2015-02-09 16:53:22 +01:00
Simone Bordet
f974c74329
Implemented HTTP2Client connect timeout.
2015-02-09 16:22:21 +01:00
Simone Bordet
85edb7e573
Improved configurability of HTTP2Client.
2015-02-09 14:24:09 +01:00
Simone Bordet
d0f0aa7c9f
Fixed removal of streams upon sending the response HEADERS frame.
2015-02-09 13:26:01 +01:00
Simone Bordet
7066f65e8c
423974 - Optimize flow control.
...
Implemented a buffering FlowControlStrategy that reduces the amount
of WindowUpdate exchanges.
2015-02-09 13:25:32 +01:00
Simone Bordet
fa72356d1d
Fixed failure of stalled frames.
2015-02-09 09:11:56 +01:00
Simone Bordet
02b5732720
First take at implementing the HttpClientTransport for HTTP2.
2015-02-09 09:11:56 +01:00
Greg Wilkins
14cd10b676
experimenting with push API
2015-02-06 13:48:34 +11:00
Greg Wilkins
f6cfe07a69
added direct buffer configuration
2015-02-05 10:02:01 +11:00
Greg Wilkins
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
Joakim Erdfelt
a3201a3c81
Happy New Year 2015
2015-01-07 17:06:59 -07:00
Simone Bordet
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
Greg Wilkins
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
Greg Wilkins
3af9b145a3
Deprecated the AbstractConnection dispatchIO mechanism
2015-01-01 16:18:13 +01:00
Greg Wilkins
3f59bc4c14
refactored HttpConnector for EWYK - work in progress
2014-12-23 17:15:27 +01:00
Greg Wilkins
ebaf84b97e
Refactored HttpInput to use poison pills
2014-12-21 10:43:37 +01:00
Simone Bordet
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
Simone Bordet
4ccd5207b5
Switched ExecutionStrategy to EWYK.
2014-12-18 17:14:34 +01:00
Simone Bordet
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
Simone Bordet
7f98b64658
Clearing the buffer in case of parser errors that lead to a
...
connection failure.
2014-12-18 17:14:34 +01:00
Simone Bordet
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
Greg Wilkins
cdd2b0a9d2
refacted SelectorManager to have a ManagedSelector
2014-12-17 16:29:24 +01:00