Commit Graph

3807 Commits

Author SHA1 Message Date
Greg Wilkins 54f49dec7d Merge branch 'jetty-9.4.x' into jetty-9.4.x-2022-FineGrainedComplianceModes 2018-01-09 13:32:19 +01:00
Greg Wilkins 88cf4603c5
Merge branch 'jetty-9.4.x' into bugfix/javadoc_fixes_2056 2018-01-08 21:31:48 +01:00
olivier lamy 2a89f23a46 javadoc fixes #2056 greg review
Signed-off-by: olivier lamy <olamy@webtide.com>
2018-01-08 11:22:20 +11:00
Joakim Erdfelt bd01e1877a Updating to version 9.2.25-SNAPSHOT 2018-01-05 11:35:42 -06:00
Joakim Erdfelt a617842695 Updating to version 9.2.24.v20180105 2018-01-05 10:11:08 -06: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
Greg Wilkins a107e543e6 Issue #2090 Java Version JEP223 2018-01-04 12:27:15 +01:00
olivier lamy e07ba49283 more javadoc fixes #2056
Signed-off-by: olivier lamy <olamy@webtide.com>
2017-12-29 11:07:51 +11:00
olivier lamy 942e819a7c more javadoc fixes #2056
Signed-off-by: olivier lamy <olamy@webtide.com>
2017-12-28 18:49:43 +11: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
Greg Wilkins 22beb1d02a Updated tests to use _LEGACY modes
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2017-12-27 14:16:23 +01:00
Greg Wilkins 30e9c84b33 Added RFC7230_LEGACY compliance mode as the default
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2017-12-27 13:50:10 +01:00
Greg Wilkins 7e516e29fb pass existing compliance tests
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2017-12-24 18:00:03 +01:00
Greg Wilkins d8dead35ae Issue #2022 Fine Gramed Compliance Modes
Added HttpComplianceSection and an EnumSet within HttpCompliance

Signed-off-by: Greg Wilkins <gregw@webtide.com>
2017-12-24 14:41:18 +01:00
olivier lamy 3a189ab254 #2056 javadoc warning fixes WIP
Signed-off-by: olivier lamy <olamy@webtide.com>
2017-12-20 10:52:45 +11: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
Greg Wilkins 5ce07dddd6
#2006 Use a NOOP to allow unhandle to cope with stolen read (#2009)
#2006 Use a NOOP to allow unhandle to cope with stolen read

Signed-off-by: Greg Wilkins <gregw@webtide.com>
2017-12-02 12:14:43 +01:00
Greg Wilkins 15c0f79593
Issue #1614 made authentication extensible in request log (#2004)
Issue #1614 made authentication extensible in request log (#2004)
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2017-12-02 10:00:39 +01:00
Joakim Erdfelt 70fe268bde Merge branch 'release-9.4.8' into jetty-9.4.x 2017-11-29 10:52:02 -07:00
Joakim Erdfelt aeb1a1d6cd Merge tag 'jetty-9.4.8.v20171121' into jetty-9.4.x
Tag for release: jetty-9.4.8-SNAPSHOT

 + 212 HttpClient should support pluggable AuthenticationStore
 + 215 Add Conscrypt for native ALPN/TLS/SSL
 + 272 WebSocket hangs in blockingWrite
 + 487 JDK 9 build compatibility
 + 901 Overriding SSL context KeyStoreType requires explicit override of
   TrustStoreType
 + 922 Implements methods Connection.getBytes[In|Out]()
 + 1209 IllegalStateException when HTTP/2 push is disabled
 + 1213 Upgrade to ASM Version 6.0 for JDK9
 + 1509 Improve GZIPContentDecoder buffer pooling sizing
 + 1550 Resolve inconsistent Shutdown configuration with Jetty Runner
 + 1640 Introduce :run-distro goal for local jetty distribution deployment
 + 1692 Annotation scanning should ignore `module-info.class` files
 + 1696 Missing stacktraces on debug of WriteFlusher onFail
 + 1705 Rejected executions in QueuedThreadPool can lead to memory leaks
 + 1760 Update to apache jasper 8.5.20
 + 1768 Allow jetty properties to be set for the jetty:run-forked goal
 + 1782 Using assembly.tarLongFileMode=posix for jetty-home and
   jetty-distribution assembly
 + 1797 JEP 238 - Multi-Release JAR files break bytecode scanning
 + 1806 Improved ReservedThreads idle timeout
 + 1807 Add new HttpChannel listener and events for metrics libraries
 + 1814 Move JavaVersion to jetty-util for future Java 9 support requirements
 + 1818 Improve Infinispan support on JDK 9
 + 1819 Race condition during annotation parsing
 + 1823 ResourceHandler with ranged requests does not return Content-Type
   response header
 + 1829 OSGi webbundle classes scanned twice
 + 1833 Request.startAsync requires context path
 + 1835 Locker is not reentrant on ServerConnector#setConnectionFactories
 + 1836 Migrate Locker implementation to JVM ReentrantLock implementation
 + 1841 Reduce contention on ServletHolder
 + 1845 Allow null User-Agent in HttpClient
 + 1849 Refactoring of SelectorManager.defaultSchedulers()
 + 1851 Improve insufficient thread warnings/errors
 + 1854 Consistent IOException and timeout handling when extracting form
   parameters
 + 1856 ResourceHandler without ServletContext throws NPE for welcome files if
   used directly
 + 1857 GZIPContentTransformer fails to send entire message if used with
   BufferedContentTransformer
 + 1865 Improve Exception on invalid redirect usage
 + 1867 Improve Exception thrown during Expect 100 Continue
 + 1868 Need a way to randomly select ports for tests
 + 1871 JMXify SslContextFactory
 + 1878 Handle 100 Continue response without Expect header
 + 1879 'Bad tld url' seen during :jetty-run when running integration tests
 + 1881 Improve support of WebSocket over Unix Domain Socket
 + 1885 SessionHandler get/set maxInactiveInterval is not symmetric with
   negative values
 + 1888 Implement cookie matching on Path attribute per RFC 6265
 + 1891 Make HTTP/2 async error notifications configurable
 + 1892 NPE resulting from bad JEP 238 MultiReleaseJarFile structure
 + 1893 Add ability to set HttpClient Connection TTL
 + 1897 Introduce a round-robin connection pool for HttpClient
 + 1900 Update to CDI 2.0 for cdi module
 + 1901 Reimplement PathWatcher as scanner
 + 1909 Update to Apache Jasper 8.5.23
 + 1910 Remove unused jetty-jsp module
 + 1912 AbstractConnector EndPoint leak for failed SSL connections
 + 1914 HttpClient fails to parse Content-Type response header with RFC 2045
   charset="utf-8" syntax
 + 1919 Review LowResourceMonitor
 + 1920 Connect Timeouts with NonBlocking CreateEndPoint
 + 1924 ManagedSelector can livelock under high load
 + 1931 Expose RolloverOutputStream for pluggable behaviour
 + 1933 Use CLASSPATH for scanning java9 system classes
 + 1956 Store and report build information of Jetty
 + 1958 Blocking Timeout has different behavior in HttpInput vs HttpOutput
 + 1970 ManagedSelector can lose selector thread under high concurrent load
 + 1980 PushCacheFilter does not push TLS offloaded HTTP/2 requests
 + 1981 Loading resource content failed
 + 1984 Remove jetty-client dependency in jetty-rewrite
2017-11-29 10:51:22 -07:00
Greg Wilkins 6541848f28
PR #1987 AsyncICB need not execute
PR #1987  AsyncICB need not execute

The HttpOutput AsyncICB is a blocking callback, thus it is always executed and
never runs in the selector thread. It thus does not need to execute its call
the Channel.handle

* HTTP/2 must execute async callbacks
* AsyncICBr need not execute
* Invert the sense of the fix.  AsyncICB now executes, but is flagged as a non-blocking callback.
* removed import

Signed-off-by: Greg Wilkins <gregw@webtide.com>
2017-11-29 18:48:55 +01:00
Joakim Erdfelt ff53002fac Updating to version 9.4.9-SNAPSHOT 2017-11-21 13:11:31 -07:00
Joakim Erdfelt 82b8fb23f7 Updating to version 9.4.8.v20171121 2017-11-21 12:33:52 -07:00
Simone Bordet fab4b95925 Fixes #1980 - PushCacheFilter does not push TLS offloaded HTTP/2 requests.
Changed HttpChannel to call Request.setSecure() with the scheme of the
request URI.

Changed PushCacheFilter to rely on the referrer URI scheme, and only if
that is missing then using Request.isSecure().

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2017-11-16 23:32:44 +01:00
Greg Wilkins 918cf625cc
Issue #1958 Blocking timeout spurious wakeups (#1975)
* Issue #1958 Blocking timeout

Use tryFillInterested to allow retries on spurious wakeups

Signed-off-by: Greg Wilkins <gregw@webtide.com>
2017-11-15 18:13:00 +01:00
Greg Wilkins c66bacba02 Issue #922 (#1965) bytesIn/Out stats
Ensure -1 fill is not appended to bytesIn counts
Don't include discarded bytes from head responses in counts
refactored gather writes in HttpConnection to be clearer and removed
redundant buffer checks
2017-11-14 09:12:00 +01:00
Olivier Lamy 786f128808 implements connection.getBytes[In|Out] for http transport #922 (#1965)
* implements connection.getBytes[In|Out] for http transport, #922

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

* use LongAdder rather than AtomicLong

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

* changes by Greg review

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

* changes by Greg review

Signed-off-by: olivier lamy <olamy@webtide.com>
2017-11-14 08:41:47 +01:00
Olivier Lamy 6499baa3a2 add a build.properties file containing git hash, build timestamp scm url (#1957)
* add a build.properties file containing git hash, build timestamp and scm url #1956

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

* move build infos to Jetty class so it's available for server and client

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

* apply changes by Greg review

Signed-off-by: olivier lamy <olamy@webtide.com>
2017-11-11 09:26:00 +11:00
Olivier Lamy 9fab69ea02 add a build.properties file containing git hash, build timestamp scm url (#1957)
* add a build.properties file containing git hash, build timestamp and scm url #1956

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

* move build infos to Jetty class so it's available for server and client

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

* apply changes by Greg review

Signed-off-by: olivier lamy <olamy@webtide.com>
2017-11-10 18:39:28 +01:00
olivier lamy 17ce298b98 fix inconsistencies for JettyRunner support -DSTOP.PORT and -DSTOP.KEY as well #1550
Signed-off-by: olivier lamy <olamy@webtide.com>
2017-11-09 17:29:39 +11:00
WalkerWatch ee3b93de03 Updated javadoc language. Resolves #1945 2017-11-07 15:17:42 -05:00
Jesse McConnell a72eb0001d Updating to version 9.3.23-SNAPSHOT 2017-10-30 15:39:57 -05:00
Jesse McConnell 705048cc49 Updating to version 9.3.22.v20171030 2017-10-30 15:16:29 -05:00
Greg Wilkins 6e94d4023c Fixed #1919 LowResourceMonitor@isAcceptingInLowResources 2017-10-25 10:44:55 +11:00
Greg Wilkins 71c78db60e Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2017-10-20 09:48:01 +11:00
Greg Wilkins 06e00355a2 Fixed #1912 2017-10-20 09:41:47 +11:00
Simone Bordet 5e5355cd20 Improved toString() to add the version. 2017-10-19 21:23:33 +02:00
Greg Wilkins 1b7cfbbf2c Test #1898 2017-10-17 14:13:51 +11:00
Greg Wilkins 0f8bf0a64f Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2017-10-17 14:08:36 +11:00
Greg Wilkins 52baec434b Test #1898 2017-10-17 14:04:53 +11:00
Simone Bordet 08a43cd0a2 Issue #1807 - HttpChannel events.
Added "dispatchFailure" event, and renamed "request[Before|After]Dispatch"
events to just "[before|after]Dispatch".
2017-10-17 00:09:45 +02:00
Simone Bordet 4236f14955 Fixes #1891 - Make HTTP/2 async error notifications configurable.
Introduced HttpConfiguration.notifyRemoteAsyncErrors, true by default.
2017-10-12 12:13:02 +02:00
Simone Bordet c454ce88e8 Formatting cleanup. 2017-10-12 12:02:00 +02:00
Dan Smith a579823f29 Issue #1885 Fixed rounding error of negative maxInactiveInterval
Session.getMaxInactiveInterval should return a negative number if the
the session is configured with a negative maxInactiveInterval. It was
being rounded up to 0 by mistake.

Signed-off-by: Dan Smith <upthewaterspout@apache.org>
2017-10-10 13:59:52 -07:00
Simone Bordet 12dcfabd4e Issue #1807 - HttpChannel events.
Implemented events for request and response processing.
Introduced HttpChannel.Listener to handle these events.
2017-10-09 18:06:03 +02:00
Simone Bordet c69c7b29c7 Fixes #1878 - Handle 100 Continue response without Expect header. 2017-10-09 12:08:24 +02:00
Simone Bordet b38597a5bc Fixes #1865 - NullPointerException on redirect. 2017-10-06 09:18:28 +02:00
Simone Bordet b626dbdd16 Fixes #1867 - Verbose exception thrown during successful test.
Added guard against self suppression, which otherwise causes
an IllegalStateException.
2017-10-06 09:03:02 +02:00
Simone Bordet e2d7057988 Fixes #1209 - IllegalStateException when HTTP/2 push is disabled.
Aligned the behavior with Servlet 4.0, returning null if push is
not supported or disabled by the client.
2017-10-03 18:53:00 +02:00
Greg Wilkins 1a7ff6854d Fixed #1856 ResourceService without context 2017-10-03 11:34:00 +11:00
Simone Bordet 3b98a6c000 Issue #1851 - Improve insufficient thread warnings/errors.
ThreadBudget -> ThreadPoolBudget.
Added selectors to the leased threads.
2017-10-02 13:40:31 +02:00
Simone Bordet 17a1484143 Code cleanups.
Removed unnecessary imports and fixed typos.
2017-10-02 11:43:45 +02:00
Greg Wilkins d166881a5a Issue #1806 Concurrent ReservedThreadExcecutor
Squashed commit of the following:

commit ab7f711c30ad1408ecdceffdca51cf167dc11a9c
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Sep 28 10:20:08 2017 +1000

    Fixed format

commit 062b051b56efb9924b81cf755297f538e4691851
Merge: d1e27d4 7d98cbb
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Sep 28 09:19:40 2017 +1000

    Merge branch 'jetty-9.4.x' into jetty-9.4.x-1806-ConcurrentReservedThreadExecutor

commit d1e27d42983487941c6dd7cb0ea1068f36ff92f0
Author: Greg Wilkins <gregw@webtide.com>
Date:   Tue Sep 26 11:28:21 2017 +1000

    improvements after review

commit 477e3ac05610825cc834d3195e39e8e8620a44cb
Merge: 51a3ac3 35d0b59
Author: Greg Wilkins <gregw@webtide.com>
Date:   Tue Sep 26 10:10:30 2017 +1000

    Merge branch 'jetty-9.4.x' into jetty-9.4.x-1806-ConcurrentReservedThreadExecutor

commit 51a3ac37e63108ca93fe2fdd9e02e7f8161072ba
Author: Greg Wilkins <gregw@webtide.com>
Date:   Tue Sep 26 10:08:55 2017 +1000

    improvements after review

commit 23df855bf457fe609576a35327db3fbd4c82b491
Merge: b52c6de 5764afc
Author: Greg Wilkins <gregw@webtide.com>
Date:   Tue Sep 26 09:30:42 2017 +1000

    Merge branch 'jetty-9.4.x' into jetty-9.4.x-1806-ConcurrentReservedThreadExecutor

commit b52c6de6573433a960fdb6f2692e7bbd9effb48c
Author: Greg Wilkins <gregw@webtide.com>
Date:   Fri Sep 22 15:36:53 2017 +1000

    Issue #1806

    Added a concurrent stack class
    Converted ReservedThreadExcecutor to use the concurrent stack
    Added support for idle
2017-09-28 12:44:23 +10:00
Greg Wilkins 7d98cbb870 Issue #1851 Improve insufficient thread warnings/errors
Squashed commit of the following:

commit 1d9e8e4b4d53898cb6435f67529347bd2ba82cf0
Merge: 7280594 55b0f10
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Sep 28 07:20:37 2017 +1000

    Merge branch 'jetty-9.4.x' into jetty-9.4.x-1851-ThreadBudget

commit 7280594a0058538b603ad35625713a79830e9b93
Author: Greg Wilkins <gregw@webtide.com>
Date:   Wed Sep 27 22:48:58 2017 +1000

    fixed headers

commit f962f18e5b098ae40846ee3832736ee4650aed84
Author: Greg Wilkins <gregw@webtide.com>
Date:   Wed Sep 27 18:12:33 2017 +1000

    Issue #1851 added reset

commit a63894de284c8d8dc5ed031f1f6e0fccaf6c7715
Author: Greg Wilkins <gregw@webtide.com>
Date:   Wed Sep 27 18:08:53 2017 +1000

    Issue #1851 improved test

commit 8bcc460dc63273165305a7adcb88e991e30de4b7
Author: Greg Wilkins <gregw@webtide.com>
Date:   Wed Sep 27 18:03:47 2017 +1000

    Issue #1851 Improve insufficient thread warnings/errors

    Refactor approach to use Leases, to handle multiple executors

commit fe4be5f56594f342ab5c2e6c886397d9b4fe9c14
Merge: abc5eac a248d38
Author: Greg Wilkins <gregw@webtide.com>
Date:   Wed Sep 27 15:37:56 2017 +1000

    Merge branch 'jetty-9.4.x' into jetty-9.4.x-1851-ThreadBudget

commit abc5eac2b73d306a91b28ef4db778455095a5bdb
Author: Greg Wilkins <gregw@webtide.com>
Date:   Wed Sep 27 12:20:03 2017 +1000

    Issue #1851 Improve insufficient thread warnings/errors

    Created a ThreadBudget class that can be used to warn/error for
    registered and unregistered allocations of threads.

    The server on doStart does an unregistered check of all its components that
    implement the Allocation interface.

    The client will register itself as an Allocation if a shared Executor is used.
2017-09-28 07:35:05 +10:00
Greg Wilkins a248d38f56 Issue #1854 consistent exception handling for Request parameters 2017-09-27 15:36:53 +10:00
Greg Wilkins e58a7b488e Issue #1832 work around 2017-09-26 17:04:42 +10:00
Greg Wilkins c2b7177628 temporary fix for unit test 2017-09-26 16:41:41 +10:00
Greg Wilkins 0fa8c565bd Issue #1835 reentrant lock in AbstractConnector. 2017-09-22 12:45:14 +10:00
Simone Bordet 7768a781be Fixes #1836 - Review Locker.
Made Locker a simpler wrapper around ReentrantLock.
Deprecated lockIfNotHeld() and replaced its usages.
2017-09-21 19:16:36 +02:00
Greg Wilkins 8abb108b7e Fixed #1833 Request.startAsycn requires a context 2017-09-21 14:09:21 +10:00
Greg Wilkins bddd5ca5de Issue #1832 SelectChannelServerSslTest.testFullMethod
Work around for now by accepting exception rather than error response.
2017-09-21 14:00:58 +10:00
Joakim Erdfelt 236658d61c Build fix 2017-09-20 15:02:56 -07:00
Joakim Erdfelt 14573025f0 Merge branch 'jetty-9.4.x' of github.com:eclipse/jetty.project into jetty-9.4.x 2017-09-20 14:46:26 -07:00
Joakim Erdfelt 5fc0167003 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2017-09-20 14:46:13 -07:00
Greg Wilkins 31a9b6f2e8 Issue #215 Conscrypt module for SSL and ALPN
Squash of the following commits:

commit 53e503b48d290e2ff83b214fd81572bf4cacd9ab
Merge: cc4ed73 d77ba82
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Sep 21 07:27:45 2017 +1000

    Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-9.4.x-215-conscrypt-alpn

commit cc4ed73ae45e69addbb31221a860dd0984d92ac5
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Sep 21 07:26:45 2017 +1000

    Issue #215 Conscrypt module debug

commit f640693f7ef61f8012d1454b2ed364740b330a6e
Author: Simone Bordet <simone.bordet@gmail.com>
Date:   Wed Sep 20 18:23:51 2017 +0200

    Issue #215 - Consider native ALPN/SSL provider.

    Fixed server-side ALPN negotiation for Conscrypt.

commit 669e992624a0f8f23103c70ba895b877dcec2404
Author: Simone Bordet <simone.bordet@gmail.com>
Date:   Wed Sep 20 16:56:20 2017 +0200

    Issue #215 - Consider native ALPN/SSL provider.

    Fixed client-side ALPN negotiation for Conscrypt.

commit aa873263d73c19461890bd1f9a417c796412b3d2
Author: Simone Bordet <simone.bordet@gmail.com>
Date:   Wed Sep 20 15:26:45 2017 +0200

    Issue #215 - Consider native ALPN/SSL provider.

    Code cleanups.

    Changed ALPNProcessor.init(boolean) to init().
    Removed unnecessary try/catches and simplified exception handling.

commit db9b169c35da956bcc42013f9bb8acddd7238d14
Author: Greg Wilkins <gregw@webtide.com>
Date:   Wed Sep 20 18:07:30 2017 +1000

    Issue #215 Conscrypt SSL pom cleanups

commit 096572e029352428275e86a964fa92dbeee19a65
Author: Greg Wilkins <gregw@webtide.com>
Date:   Wed Sep 20 15:57:20 2017 +1000

    Issue #215 Conscrypt SSL ALPN cleanups

commit b3c1bcb1fa9a7e15517a348270738e24c7b0a820
Merge: c836708 effec06
Author: Greg Wilkins <gregw@webtide.com>
Date:   Wed Sep 20 15:46:13 2017 +1000

    Merge branch 'jetty-9.4.x' into jetty-9.4.x-215-conscrypt-alpn

commit c836708a9bcd5fb61ed26302eb7d71b618cce329
Merge: de039d4 d9ecd5e
Author: Greg Wilkins <gregw@webtide.com>
Date:   Wed Sep 20 14:56:06 2017 +1000

    Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-9.4.x-215-conscrypt-alpn

commit de039d42f23f9caa239e5ddee0242b9a83a45441
Author: Greg Wilkins <gregw@webtide.com>
Date:   Tue Sep 19 17:19:49 2017 +1000

    Fix #1823 MimeTypes for ResourceHandler mp4

commit ff1e08434415cd6d909715547c2a54dbd0fc5dee
Author: Greg Wilkins <gregw@webtide.com>
Date:   Tue Sep 19 14:21:39 2017 +1000

    Issue #215

commit 3bb63147ebf4967698f51a65f009d80010038b20
Author: Greg Wilkins <gregw@webtide.com>
Date:   Tue Sep 19 14:08:05 2017 +1000

    Issue #215

    Use conscrypt 1.0.0.RC10 uber jar

commit 8b18099fde67f12d0e98d0b414568c9b76835459
Merge: 06f6530 eee4117
Author: Greg Wilkins <gregw@webtide.com>
Date:   Tue Sep 19 10:35:43 2017 +1000

    Merge branch 'jetty-9.4.x' into jetty-9.4.x-conscrypt-alpn

commit 06f65305d536250c5dfa2aaa84ffacdac113c8fc
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Sep 14 16:04:05 2017 +1000

    Issue #215 Conscrypt ALPN provider

    First attempt at client support

commit 32d77461935263da86fb363233af0aa5a159d1fc
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Sep 14 09:48:43 2017 +1000

    Issue #215 Conscrypt ALPN provider

commit bc051dca5e3ea7fed6ddb3a25ba5cecbd1c5b18b
Merge: 573c9f0 6c47126
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Sep 14 08:49:10 2017 +1000

    Merge branch 'jetty-9.4.x' into jetty-9.4.x-conscrypt-alpn

commit 573c9f060172b2863b0b0a94c1ec2fb9a8762fa2
Merge: 47e22fe 3399fd3
Author: Greg Wilkins <gregw@webtide.com>
Date:   Wed Sep 13 15:24:27 2017 +1000

    Merge branch 'jetty-9.4.x' into jetty-9.4.x-conscrypt-alpn

commit 47e22fe2e4f8e3cc71f3117ad7d789dc3ea56675
Merge: 63ffa2b 187f37d
Author: Greg Wilkins <gregw@webtide.com>
Date:   Wed Sep 13 11:04:24 2017 +1000

    Merge branch 'jetty-9.4.x' into jetty-9.4.x-conscrypt-alpn

commit 63ffa2bdc13fa85d02459855a3f8e0de4f4b4f1b
Merge: cf1443d a0cb424
Author: Greg Wilkins <gregw@webtide.com>
Date:   Tue Sep 12 09:04:45 2017 +1000

    Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-9.4.x-conscrypt-alpn

commit cf1443d3ab71ac1aec7f153c233e869a3d6f783f
Author: Greg Wilkins <gregw@webtide.com>
Date:   Tue Sep 12 09:03:52 2017 +1000

    Issue #215 Conscrypt ALPN provider

commit a37aec327274042e1007f4146a3c3ec06fb424d9
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Sep 7 21:19:28 2017 +1000

    Issue #215 Conscrypt ALPN provider

commit 6d7f39b2b0e53570afa61be5abfef2a352f80cf3
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Sep 7 18:22:19 2017 +1000

    Issue #215 Conscrypt ALPN provider

commit a7d0f46b57091550724242693559d786180896ff
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Sep 7 18:16:35 2017 +1000

    Issue #215 Conscrypt ALPN provider
2017-09-21 07:34:25 +10:00
Joakim Erdfelt 36a649a66c Merge branch 'jetty-9.3.x' of github.com:eclipse/jetty.project into jetty-9.3.x 2017-09-20 14:29:17 -07:00
Joakim Erdfelt d9865a02ba Updating to version 9.4.8-SNAPSHOT 2017-09-14 08:44:27 -07:00
Joakim Erdfelt 80fb788d0c Updating to version 9.4.7.v20170914 2017-09-14 07:35:18 -07:00
Simone Bordet 5d8c605d96 Updated logic to calculate the minimum number of threads. 2017-09-08 10:52:40 +02:00
Joakim Erdfelt fb86b8e54f Merge branch 'jetty-9.4.x' of github.com:eclipse/jetty.project into jetty-9.4.x 2017-09-07 08:55:54 -07:00
Jan Bartel 8db5cc4f96 Issue #1795 2017-09-07 08:59:03 +10:00
Joakim Erdfelt aa85bca2a9 Minor test cleanup 2017-09-06 13:49:20 -07:00
Jan Bartel df0e6d7f43 Issue #1793 2017-09-06 18:00:31 +10:00
Jan Bartel d8e035ba0d Issue #1794 2017-09-06 18:00:31 +10:00
Greg Wilkins 57e86c5c41 Issue #1416 GzipHandler If-Match 2017-09-05 18:31:56 +10:00
Greg Wilkins 7be350370c Issue #1732 Connection Limit (#1745)
Configure accepting during low resources from module/ini
2017-09-05 17:27:36 +10:00
Greg Wilkins dd20272c48 Issue #1732 Connection Limit (#1745)
* Issue #1732 Connection Limit

Added a listener to stop accepting when a limit is reached

Update LowResourceMonitor to not accept in low resources
2017-09-05 15:21:51 +10:00
Simone Bordet cef5358fc8 Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2017-08-21 17:02:20 +02:00
Simone Bordet 6cb6a9e16f Fixes #1719 - Improve handling of HTTP/2 queued requests.
Clearing _waitingForContent in recycle().
2017-08-21 16:41:04 +02:00
Joakim Erdfelt 0bad6d1e90 Merge branch 'jetty-9.3.x' of github.com:eclipse/jetty.project into jetty-9.3.x 2017-08-17 11:50:45 -07:00
Joakim Erdfelt 9c7af33806 Issue #1737 - fixing up ResourceHandler behavior with welcome files 2017-08-16 09:34:07 -07:00
Greg Wilkins c843b809f0 Fixed #1737 DefaultServlet wrong welcome dispatcher using non-root URL path
If operating in pathInfoOnly mode, prepend the serlvet path to the welcome path
2017-08-16 09:54:52 +10:00
Greg Wilkins e4c0dcdd19 Issue #1721 async read failure on big POST
Remove ISE for a S that is perfectly legal
2017-08-15 19:05:44 +10:00
Greg Wilkins 4d56d154ac Issue #1721 async read failure on big POST
fixed HttpInput test
2017-08-15 11:50:07 +10:00
Greg Wilkins 3c3d05f722 Issue #1721 async read failure on big POST
Modified isReady to not fillAndParseContent if known to be isReady()==false already.
Added mutex on produceContent
2017-08-15 10:08:08 +10:00
Greg Wilkins a58447aea1 Issue #1732 Stop accepting new connections
removed debug
2017-08-15 10:07:55 +10:00
Greg Wilkins 5197ce4f54 Issue #1732 Stop accepting new connections 2017-08-12 10:26:17 +10:00
Simone Bordet 87d090e062 Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2017-08-11 16:42:21 +02:00
Greg Wilkins 7179ac0b61 simplified test 2017-08-10 15:11:55 +10:00
Greg Wilkins 08c49a30c0 Improve test reporting 2017-08-10 15:11:55 +10:00
Greg Wilkins ce3bfe63b9 Less verbose tests 2017-08-10 15:11:55 +10:00
Greg Wilkins cf418c639f Revert "added assume from running directly"
This reverts commit 39ea66368c.
2017-08-10 12:52:28 +10:00
Greg Wilkins 39ea66368c added assume from running directly 2017-08-10 11:34:13 +10:00
Simone Bordet d3d02f227e Fixes #1719 - Improve handling of HTTP/2 queued requests.
Idle timeout have a special meaning in that they become a no-operation
if the application is dispatched but idle (neither reading nor writing).

HttpChannelOverHTTP2 now forwards the idle timeout to HttpInput, which
will only change its state if it is interested in reading.

HttpInput.consumeAll() has been modified to consume all input even if
it's already failed.

Failures caused by the other peer (e.g. I/O failures or stream resets)
are now retained and will eagerly consumed any queued data to free up
the flow control windows.
2017-08-09 16:21:53 +02:00
Simone Bordet 7b437cd647 Refactored calls to _transport.abort() to call this.abort(). 2017-08-09 10:25:47 +02:00
Joakim Erdfelt 1311052b15 Cleaning up state of branch to match the original jetty-9.4.x
+ Does not include changes to /jetty-cdi/
+ Does not include changes to /jetty-websocket/ for javax.websocket-1.1
2017-08-08 09:47:04 -07:00
Greg Wilkins 94322f7290 simplify reserved thread configuration 2017-08-08 09:16:11 -07:00
Greg Wilkins 4c2c0add76 Fixed #1713 limit selectors for small thread pool 2017-08-08 09:16:04 -07:00
Greg Wilkins 1a07ddd787 Issue #215 Conscrypt SSL provider
Added module to install Conscrupt SSL provider
2017-08-08 09:15:43 -07:00
Simone Bordet a705f9a2ca Fixes #1703 - Improve HttpInput failure logging. 2017-08-08 09:15:40 -07:00
Greg Wilkins d12cde9cfd Fix commit 2e13208758
use suppressed exceptions to hold local stacktrace rather than wrapping exception, which hides the exception type.
2017-08-08 09:15:37 -07:00
Simone Bordet 3eeeb8ec7e Improved error reporting. 2017-08-08 09:15:30 -07:00
Simone Bordet be1eb26670 Fixes #1671 - Asymmetric usage of trailers in MetaData.Request.
Reviewed with code cleanups.
2017-08-08 09:15:23 -07:00
Jan Bartel 56bf71aec2 Issue #1675 2017-08-08 09:14:54 -07:00
Greg Wilkins 0bc9149ff1 Issue #1671 asymmetric trailer usage on MetaData.Request 2017-08-08 09:14:47 -07:00
Greg Wilkins 2202d333fe Issue #1655 ServerConnector configured with channel
converted setter to open method
added test harness
2017-08-08 09:14:18 -07:00
Greg Wilkins 7dc2559c8b Issue #1655 added setter for accept channel 2017-08-08 09:14:16 -07:00
Greg Wilkins 386ca510e6 Issue #1655 added openAcceptChannel 2017-08-08 09:14:15 -07:00
Greg Wilkins 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 90e5b56
Author: Greg Wilkins <gregw@webtide.com>
Date:   Wed Jun 21 10:48:22 2017 +0200

    Merge branch 'jetty-9.4.x' into jetty-9.4.x-ewyk3

commit 58a5a9a655ee1a72a66f54ac8c95d7c9d73afe85
Author: Simone Bordet <simone.bordet@gmail.com>
Date:   Wed Jun 14 15:56:43 2017 +0200

    Code cleanups.

commit 4e5296216b52948523572352cba391438ff6b494
Author: Greg Wilkins <gregw@webtide.com>
Date:   Wed Jun 14 07:34:58 2017 +0200

    refixed Producing to Reproducing

commit a1f8682f86d1f0803121162e3f14d7768286d3ed
Author: Greg Wilkins <gregw@webtide.com>
Date:   Wed Jun 14 07:26:29 2017 +0200

    fixed Producing to Reproducing

commit 9468932e062d2271d8dc1d43a78544757732fff5
Author: Greg Wilkins <gregw@webtide.com>
Date:   Tue Jun 13 16:33:44 2017 +0200

    fixed javadoc

commit 9d4941eb97638fec09b3fe34d423538d17943b6f
Author: Greg Wilkins <gregw@webtide.com>
Date:   Tue Jun 13 16:05:27 2017 +0200

    Renamed Preallocated to ReservedThread

commit 6d3379ab64c6dcc2a7aa8ec7088afd77863816c2
Author: Greg Wilkins <gregw@webtide.com>
Date:   Tue Jun 13 12:28:52 2017 +0200

    Added configuration in modules

commit 1bd1adea4682538e1546c2ae53f4c9340dafb3bb
Merge: 83418a9 6702248
Author: Greg Wilkins <gregw@webtide.com>
Date:   Tue Jun 13 10:09:29 2017 +0200

    Merge branch 'jetty-9.4.x' into jetty-9.4.x-ewyk3

commit 83418a91320c8bfc54465ca02efdce0d2c874a0e
Author: Greg Wilkins <gregw@webtide.com>
Date:   Tue Jun 13 10:08:35 2017 +0200

    javadoc

commit 62918fd39189fed3414fec4a7c8380c21e90a4b8
Author: Greg Wilkins <gregw@webtide.com>
Date:   Sat Jun 10 00:04:06 2017 +0200

    Improved EatWhatYouKill implementation

    Simplified by abstracting out PreallocatedExecutor
    Removed invocation execution
    HTTP2 now uses a shared PreallocationExcecutor between connection
2017-08-08 09:13:44 -07:00
Greg Wilkins c9a1395f08 Issue #1618 Async dispatch encoded passed URI 2017-08-08 09:13:43 -07:00
Joakim Erdfelt 3fdbcffbbd Updating to version 9.2.23-SNAPSHOT 2017-08-08 09:12:55 -07:00
Jan Bartel b2187b3b1c Issue #1591 2017-08-08 09:12:53 -07:00
Greg Wilkins e7ef74dd4f removed deprecated test method usage 2017-08-08 09:10:25 -07:00
Greg Wilkins 189cc4e369 Issue #1468 Configure PKIX Revocation Checker for SslContextFactory 2017-08-08 09:10:14 -07:00
Joakim Erdfelt a7bcac6d75 Updating to version 9.3.20.v20170531 2017-08-08 09:07:35 -07:00
Joakim Erdfelt 11a544d6ac Updating to version 9.3.22-SNAPSHOT 2017-08-01 11:26:37 -07:00
Joakim Erdfelt bb1d69ca52 Updating to version 9.3.21.M0 2017-08-01 10:47:04 -07:00
Simone Bordet a2b78f1be2 Fixes #1703 - Improve HttpInput failure logging. 2017-08-01 14:21:49 +02:00
Joakim Erdfelt 16d14f90bb Adding test for bad URI query parsing during request.getParameterMap() 2017-07-07 16:28:56 -07:00
Greg Wilkins 070a58ff59 Issue #1655 ServerConnector configured with channel
converted setter to open method
added test harness
2017-07-03 17:48:07 +02:00
Greg Wilkins fd44bbabde Issue #1655 added setter for accept channel 2017-07-03 15:34:23 +02:00
Greg Wilkins 6c0100181e Issue #1655 added openAcceptChannel 2017-07-03 14:51:45 +02:00
Joakim Erdfelt 4d2c299fe8 Updating to version 9.2.23-SNAPSHOT 2017-06-06 08:55:12 -07:00
Joakim Erdfelt 0af30bce5a Updating to version 9.2.22.v20170606 2017-06-06 07:03:05 -07:00
Joakim Erdfelt 6a3c40e935 Updating to version 9.4.7-SNAPSHOT 2017-05-31 17:26:34 -07:00
Joakim Erdfelt 8ba0f2d95d Updating to version 9.4.6.v20170531 2017-05-31 16:22:52 -07:00
Joakim Erdfelt 429380d36a Updating to version 9.3.21-SNAPSHOT 2017-05-31 16:10:04 -07:00
Joakim Erdfelt 0f3b1cbe36 Updating to version 9.3.20.v20170531 2017-05-31 15:24:57 -07:00
Christoph Dreis e9f398cf41 Deprecate ConcurrentHashSet (#1570)
Signed-off-by: dreis2211 <christoph.dreis@freenet.de>
2017-05-30 21:46:11 +02:00
WalkerWatch 82c909acdc Documentation updates 2017-05-18 12:12:32 -04:00
Greg Wilkins 971bdac6b0 Issue #1546 Ignore $names in Cookies in RFC6265 compliance mode 2017-05-18 07:47:33 +02:00
Simone Bordet 5adeee1d2b Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2017-05-17 10:11:57 +02:00
Simone Bordet da05582b9a Marking the parser at EOF in case of exceptions. 2017-05-17 10:11:10 +02:00
Greg Wilkins 155e3e9bcd Issue #1546 - more cookie fixes 2017-05-16 06:05:55 +02:00
Greg Wilkins 5141085fed Issue #1546 - more cookie fixes 2017-05-15 23:34:28 +02:00
Joakim Erdfelt fc6ca37c77 Updating expectations in RequestTest from changes in CookieCutter 2017-05-15 13:22:01 -07:00
Greg Wilkins 166736db55 Issue #1546 - more cookie leniency fixes 2017-05-15 21:01:15 +02:00
Joakim Erdfelt c5a0c5e761 Issue #1546 - more leniency testcase
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2017-05-15 11:04:09 -07:00
Greg Wilkins 04fe477e79 Issue #1546 Fixed cookie tests 2017-05-13 16:21:06 +02:00
Greg Wilkins bdeea10a6f Issue #1546 Fixed some tests. @Ignored for now 2017-05-13 09:12:11 +02:00
Joakim Erdfelt dea2c340a4 Issue #1546 - Adding tests for CookieCutter
+ CookieCutterTest adds basic examples from RFCs
+ CookieCutter_LenientTest adds many examples of problematic
  lenient cookie parsing.
2017-05-12 16:39:33 -07:00
Greg Wilkins 06f721e3c2 Issue #1546 quotes in cookies 2017-05-12 10:38:37 +02:00
WalkerWatch e091701bcd Reviewing modules for #207 2017-05-09 13:38:14 -04:00
Greg Wilkins b0edf18ad9 Issues #1538 #1435
Get base content type directly rather than through Type which maybe null
2017-05-08 15:31:00 +02:00
Joakim Erdfelt cf56168f7d Updating to version 9.3.20-SNAPSHOT 2017-05-02 15:26:56 -07:00
Joakim Erdfelt d36d57d5c7 Updating to version 9.3.19.v20170502 2017-05-02 14:31:51 -07:00
Joakim Erdfelt 782f36f157 Updating to version 9.4.6-SNAPSHOT 2017-05-02 14:29:09 -07:00
Joakim Erdfelt 9d8ad7489c Updating to version 9.4.5.v20170502 2017-05-02 13:22:18 -07:00