Commit Graph

15068 Commits

Author SHA1 Message Date
Joakim Erdfelt 3eb8b1d59b Issue #1602 - Attempting to add testcase.
* Attempt to replicate reproduction case reported by @janbartel

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-01-08 11:58:55 -06:00
Joakim Erdfelt 4c26ba7998
Merge pull request #2097 from olamy/bugfix/bom-update-2093-jetty-9.4.x
9.4.x branch remove pom dependency from bom and add type for non jar entries #2093
2018-01-08 06:11:02 -06:00
olivier lamy 0630256db0 remove pom dependency from bom and add type for non jar entries #2093
Signed-off-by: olivier lamy <olamy@webtide.com>
2018-01-08 09:48:43 +11:00
Greg Wilkins 26a4909c88
Use shaded utils in start for JavaVersion and TopologicalSort #2090 (#2094)
* shaded TopologicalSort. Use shaded start in jetty-home
* removed unused property
* jetty-start shaded dependency
* removed component dependencies from TopologicalSort

Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-01-06 11:23:37 +01:00
Simone Bordet c35b832251 Fixes #2088 - Recycle HTTP/2 channels on the client.
Recycled channels also for FCGI.
Small improvements to HTTP/2 too.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-01-05 17:19:06 +01:00
Simone Bordet a1a3cb7c80 Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2018-01-05 11:12:25 +01:00
Simone Bordet 887b57649b Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'. 2018-01-05 11:11:11 +01:00
Simone Bordet 4606c773b1 Issue #2065 - Backport #347 to Jetty 9.2.x.
Fixed the mistake of resetting idleTimeoutStamp rather than
idleTimeoutGuard.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-01-05 10:47:39 +01:00
Simone Bordet 48c77b8608
Fixes #2088 - Recycle HTTP/2 channels on the client. (#2089)
Removed the distinction between pushed and non-pushed channels; only
non-pushed channels are released and recycled if they're not failed.

Properly resetting HttpReceiverOverHTTP2.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-01-04 07:09:08 -08:00
Greg Wilkins 41050cd8a4
Issue #2081 No idle timeout exception when dispatch is delayed (#2083)
Issue #2081 No idle timeout exception when dispatch is delayed
* Delegate the readtimeout handling to HttpChannel so that a delayed dispatch can be ended.
* Added unit test for delayed dispatch idle
* Now using HttpInput.onIdleTimeout() to fail the HttpInput, and then dispatching the request in case it has not been dispatched yet. This ensure consistent behavior independently of the value of HttpConfiguration.delayDispatchUntilContent.
* Fixed for both HTTP/1.1 and HTTP/2.
* Added tests for non-blocking reads.

Signed-off-by: Greg Wilkins <gregw@webtide.com>
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-01-04 13:26:31 +01:00
Greg Wilkins 595c6ac1ee Issue #2090 Java Version JEP223. Use shaded util in start. 2018-01-04 13:13:39 +01:00
Jan Bartel bfe79c0afe Enable debug logging for SessionExpiryTest 2018-01-04 12:40:03 +01:00
Greg Wilkins a107e543e6 Issue #2090 Java Version JEP223 2018-01-04 12:27:15 +01:00
Simone Bordet 1cad36969f Made test more robust.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-01-03 10:46:02 +01:00
Greg Wilkins 54c55b602f
ManagedSelector dump improvements from #1970 (#2062)
* ManagedSelector dump improvements from #1970

ManagedSelector dump improvements from #1970:
 + DumpKeys is now prepended to actions list so it is less likely to be delayed by a stuck/busy selector
 + Timestamps are included for actions and keys which may be separated by time
 + Race removed race for updating dumpKey list while it is being added to.

Signed-off-by: Greg Wilkins <gregw@webtide.com>

* moved utility timestamp format method to Log

Signed-off-by: Greg Wilkins <gregw@webtide.com>

* updates after review

Signed-off-by: Greg Wilkins <gregw@webtide.com>

* changes after review

Signed-off-by: Greg Wilkins <gregw@webtide.com>

* Issue #1970 - ManagedSelector dump improvements.

Code cleanups.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>

* Revert "Issue #1970 - ManagedSelector dump improvements."

This reverts commit 4febaf10dc.

* Fixed imports and other review feedback

Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-01-02 11:13:24 +01:00
Simone Bordet 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
olivier lamy 696b60a541 ensure we really use only client test
Signed-off-by: olivier lamy <olamy@webtide.com>

use a randomized map name to store sessions in order to avoid conflicts

Signed-off-by: olivier lamy <olamy@webtide.com>

reduce hazelcast logging noise

Signed-off-by: olivier lamy <olamy@webtide.com>

clarify onlyClient mode

Signed-off-by: olivier lamy <olamy@webtide.com>
2017-12-27 14:49:59 +01:00
Simone Bordet 005ae95bea
Fixes #1949 - Client-side problems with digest authentication. (#1991)
Introduced ContentProvider.isReproducible() to detect whether the
request content can be provided more than once, and modified
ContentProvider implementation accordingly.

Modified AuthenticationProtocolHandler to not send an authenticated
request if the content is not reproducible.

Modified AuthenticationProtocolHandler to tolerate request failures.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2017-12-21 02:34:39 -08:00
Joakim Erdfelt 18208a13aa
Merge pull request #2071 from H1Gdev/doc
Fix typo in WebSocket doc.
2017-12-20 08:23:17 -06:00
H1Gdev 8f6978dd36 Fix typo in WebSocket doc.
Signed-off-by: H1Gdev <h1g.z.ouroboros+github@gmail.com>
2017-12-20 10:16:37 +09:00
Greg Wilkins 0c021f2599 EWYK cleanups from #1970
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2017-12-19 09:51:11 -08:00
WalkerWatch 2c0f695386 Documentation formatting corrections 2017-12-19 12:29:44 -05:00
Simone Bordet 19dbab7971 Fixes #2069 - Update the PushCacheFilter documentation. (#2070)
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2017-12-19 10:03:30 -05:00
Joakim Erdfelt 2dd970b055 Updating to version 9.2.24-SNAPSHOT 2017-12-18 10:43:47 -06:00
Joakim Erdfelt cdbe733684 Updating to version 9.2.23.v20171218 2017-12-18 09:06:48 -06:00
Simone Bordet b68fbc4cfb Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2017-12-16 23:36:53 +01:00
Simone Bordet 37388ef105 Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'. 2017-12-16 23:28:05 +01:00
Simone Bordet eaa4c70cfc Issue #2065 - Backport #347 to Jetty 9.2.x.
Implemented as integer guard + timestamp.
The timestamp is not enough to guard against long times spent sending
(and/or in application callbacks during sends).
2017-12-16 22:25:59 +01:00
Simone Bordet ce4fad3deb Fixes #2065 - Backport #347 to Jetty 9.2.x. 2017-12-15 17:48:47 +01:00
WalkerWatch 48a4db637f Issue #2039 - Added link to related documentation 2017-12-14 13:38:02 -05:00
Simone Bordet d3db89d7e3 Fixes #2019 - Expose HttpClientTransport in JMX.
Added missing @ManagedObject annotation to AbstractConnectorHttpClientTransport.

Also exported to JMX the "multiplexed" attribute for the FCGI transport
and the "useALPN" attribute for the HTTP/2 transport.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2017-12-14 12:28:46 +01:00
Simone Bordet ba5ed4c6ce Issue #2050 - Clarify ObjectMBean getObject[Name|Context]Basis() methods.
Clarified the role of the HttpClient name with respect to JMX.
Improved test case.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2017-12-14 11:24:43 +01:00
Simone Bordet f2bf3d63bc Fixes #2020 - Introduce a name for `HttpClient` instances.
Added HttpClientMBean, and overridden getObjectContextBasis() so that
the HttpClient name is inherited by children components such as the
HttpClientTransport, the ThreadPool, etc.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2017-12-14 11:24:43 +01:00
Jan Bartel 18cd1fb8df
Issue #2057 Add conscrypt test in osgi (#2058)
Signed-off-by: Jan Bartel <janb@webtide.com>
2017-12-14 09:48:12 +01:00
Jan Bartel eebe139494
Jetty 9.4.x 2043 concurrentmodification annotation parsing (#2052)
* Issue #2043 Fix ConcurrentModificationException listing duplicate class scanning

Signed-off-by: Jan Bartel <janb@webtide.com>
2017-12-14 09:45:29 +01:00
Greg Wilkins 8660055574
Issue #2010 Support FIPs Key Managers (#2044)
Issue #2010 Support FIPs Key Managers, by only wrapping the default Key Manager if we have wildcard CN's or more than 1 non wild CN.  FIPs users will need to install a
keystore than has no multiple certificates than can only be resolved by SNI. They will also need to have no certificate aliases.

Signed-off-by: Greg Wilkins <gregw@webtide.com>
2017-12-14 00:15:58 +01:00
WalkerWatch ce819b5430 Issue #2039 - Updated documentation examples. 2017-12-13 11:37:00 -05:00
Jan Bartel 8665348258
Issue #2015 add osgi headers for alpn conscrypt (#2027)
* Issue #2015 add osgi headers for alpn conscrypt

Signed-off-by: Jan Bartel <janb@webtide.com>
2017-12-13 14:55:34 +01:00
Jan Bartel f21fb5d6d9
Issue #2030 fix NPE in AnnotationConfiguration with debug enabled (#2031)
* Issue #2030 fix NPE in AnnotationConfiguration with debug enabled

Signed-off-by: Jan Bartel <janb@webtide.com>
2017-12-13 11:04:55 +01:00
Jan Bartel 2df07f29e9
Jetty 9.4.x 2016 openjdk8 osgi headers (#2026)
* Issue #2016 Add osgi headers for openjdk8 alpn and add tests for http2 in osgi

Signed-off-by: Jan Bartel <janb@webtide.com>
2017-12-13 10:38:13 +01:00
Simone Bordet bb4115abf2 Fixes #2050 - Clarify ObjectMBean getObject[Name|Context]Basis() methods.
Updated the class with better formatting, added javadocs, updated old
javadocs, removed warnings, etc.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2017-12-12 19:31:28 +01:00
Simone Bordet 1466aa1f75 Fixes #2017 - Documentation on ALPN needs updating. (#2045)
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2017-12-12 12:17:51 -05:00
WalkerWatch 6b93a8ec9d Issue #2039 - Additional documentation. Resolves #2039. 2017-12-12 10:39:33 -05:00
Jan Bartel c5ffca0c75 Issue #2028 Adding osgi headers for service to alpn-java client and server
Signed-off-by: Jan Bartel <janb@webtide.com>
2017-12-12 06:18:44 -08:00
Zachary Duquette 65fdec0bd7 Configure jetty start timeout using JETTY_START_TIMEOUT
Signed-off-by: Zachary Duquette <zachary.duquette@eidosmontreal.com>
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2017-12-11 12:49:50 +01:00
mhow2 a5db14d0d9 Update jetty.sh (#1890)
Real for loop. Easy to modify in case it's needed to wait longer for jetty to start (from mhow2)
2017-12-11 12:44:35 +01:00
Simone Bordet 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
Simone Bordet 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
Simone Bordet 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
Simone Bordet 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