Commit Graph

3941 Commits

Author SHA1 Message Date
Greg Wilkins b5a84dc049 Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-11-21 14:07:35 +01: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
Simone Bordet f672b7e932 Merged branch 'jetty-9.4.x' into 'master'. 2017-11-16 11:36:05 +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 bb0f06fecc Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-11-14 18:15:55 +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
Joakim Erdfelt a7283e8e2a
Merge pull request #1959 from olamy/feature/build_properties_master_1956
master merge add a build.properties file containing git hash, build timestamp scm …
2017-11-10 15:55:15 -07:00
Olivier Lamy 99e56f97a2 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:02:10 +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
WalkerWatch 5aea24c16f Merge branch 'jetty-9.4.x' 2017-11-09 12:44:41 -05: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 b7c4b9d0db Merge branch 'jetty-9.4.x' 2017-11-07 15:18:06 -05:00
WalkerWatch ee3b93de03 Updated javadoc language. Resolves #1945 2017-11-07 15:17:42 -05:00
Greg Wilkins 8dc3627d42 Fix #1898 Ignore bad cookies in getCookie 2017-10-25 10:56:13 +11:00
Greg Wilkins 4a0569f2dc Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-10-25 10:46:11 +11:00
Greg Wilkins 6e94d4023c Fixed #1919 LowResourceMonitor@isAcceptingInLowResources 2017-10-25 10:44:55 +11:00
Greg Wilkins a210add95a Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-10-20 10:45:46 +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 03856a9a68 Merged branch 'jetty-9.4.x' into 'master'. 2017-10-19 21:24:34 +02:00
Simone Bordet 5e5355cd20 Improved toString() to add the version. 2017-10-19 21:23:33 +02:00
Jan Bartel 050d593056 Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-10-17 16:45:31 +11: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 b1cb393060 Merged branch 'jetty-9.4.x' into 'master'. 2017-10-17 00:10:17 +02: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 81c3fe1507 Merged branch 'jetty-9.4.x' into 'master'. 2017-10-12 12:26:09 +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
Jan Bartel 6df5377634 Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-10-11 15:41:54 +11: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 e2c411ba25 Merged branch 'jetty-9.4.x' into 'master'. 2017-10-09 18:17:49 +02: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 8efbc53d64 Merged branch 'jetty-9.4.x' into 'master'. 2017-10-09 12:08:41 +02:00
Simone Bordet c69c7b29c7 Fixes #1878 - Handle 100 Continue response without Expect header. 2017-10-09 12:08:24 +02:00
Simone Bordet 23bfdd625d Merged branch 'jetty-9.4.x' into 'master'. 2017-10-06 09:18:47 +02:00
Simone Bordet b38597a5bc Fixes #1865 - NullPointerException on redirect. 2017-10-06 09:18:28 +02:00
Simone Bordet 77c479d6fb Merged branch 'jetty-9.4.x' into 'master'. 2017-10-06 09:03:48 +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
Jan Bartel a615cc86be Update jetty-schemas to 4.0. 2017-10-06 09:37:41 +11:00
Simone Bordet 552250356b Merged branch 'jetty-9.4.x' into 'master'. 2017-10-03 18:55:12 +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
Jan Bartel f4ccbc8c70 Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-10-03 16:35:58 +11:00
Greg Wilkins 1a7ff6854d Fixed #1856 ResourceService without context 2017-10-03 11:34:00 +11:00
Simone Bordet bee383c894 Merged branch 'jetty-9.4.x' into 'master'. 2017-10-03 01:22:35 +02: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 0564b47657 Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-09-28 12:56:30 +10:00