16125 Commits

Author SHA1 Message Date
Jan Bartel
bd2fb7a4a7 Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-11-22 09:39:07 +01:00
Jan Bartel
8cc9f9ddcf Issue #1940 Fix NPE 2017-11-22 09:37:42 +01:00
Jan Bartel
b232abd215 Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-11-22 00:38:46 +01:00
Jan Bartel
6a2f39fb3c Issue #1940 2017-11-22 00:37:51 +01:00
Jan Bartel
24699b75e4 Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-11-21 23:21:15 +01:00
WalkerWatch
b02f225470 Additional documentation for Conscrypt. Resolves #1830 2017-11-21 17:13:14 -05:00
Jan Bartel
44d170e2e0 Issue #1933
Do not set java.class.path when running with the distro.
2017-11-21 18:12:16 +01:00
Jan Bartel
26b7058186 Issue #1981 2017-11-21 17:53:44 +01:00
Greg Wilkins
f3041b783e Fix #1984 unused jetty-client dependency 2017-11-21 14:18:59 +01:00
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
WalkerWatch
2e3538076b Merge branch 'jetty-9.4.x' 2017-11-16 16:18:54 -05:00
WalkerWatch
81ec56b7c3 Added docoumentation for Conscrypt SSL.
Consolidated exisitng SSL documentation and move non-root-port80 doc. Resolves #1830.
2017-11-16 16:18:28 -05:00
Greg Wilkins
51d7f859c4 Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-11-16 16:56:41 +01:00
Greg Wilkins
b5a38d82ce
HttpParser is not using cached HTTP Field values (#1979)
* HttpParser is not using cached HTTP Field values

Signed-off-by: Greg Wilkins <gregw@webtide.com>
2017-11-16 16:55:43 +01:00
Jan Bartel
406ebd9fe4 Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-11-16 15:32:41 +01:00
Jan Bartel
29373c6fb4
Merge pull request #1976 from eclipse/jetty-9.4.x-1933-jdk9-classpath
Jetty 9.4.x 1933 jdk9 classpath
2017-11-16 13:57:56 +01:00
Simone Bordet
f672b7e932 Merged branch 'jetty-9.4.x' into 'master'. 2017-11-16 11:36:05 +01:00
Simone Bordet
131f46df64 Improved dump of ManagedSelector.
Now also dumping the actions.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2017-11-16 11:35:18 +01:00
Jan Bartel
98d8c2400d Issue #1933
Add some comments, changes from code review.

Signed-off-by: Jan Bartel <janb@webtide.com>
2017-11-16 10:01: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
76352cad2f Issue #1977 jetty-http-spi tests with java9
For now, I have removed the tests using powermock and replaced with a simple test.
Also fixed some lifecycle issues

Signed-off-by: Greg Wilkins <gregw@webtide.com>
2017-11-15 13:49:23 +01:00
Jan Bartel
10a6f57bd8 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-9.4.x-1933-jdk9-classpath
Signed-off-by: Jan Bartel <janb@webtide.com>
2017-11-15 10:42:08 +01:00
Jan Bartel
12327b8876 Issue #1933
Signed-off-by: Jan Bartel <janb@webtide.com>
2017-11-15 10:33:51 +01:00
Greg Wilkins
bb0f06fecc Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-11-14 18:15:55 +01:00
Simone Bordet
0f07c6518e
Issue #1970 - ManagedSelector loses selector thread (#1971)
* Issue #1970 - ManagedSelector loses selector thread.

Removed broken data structure ConcurrentStack (ABA problem).

Made ReservedThreadExecutor use a ConcurrentLinkedDeque
instead of ConcurrentStack.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2017-11-14 10:48:33 +01:00
Greg Wilkins
47d46ec60e
Issue #1924 - ManagedSelector livelock. (#1963)
* Issue #1924 - ManagedSelector livelock.

Alternate implementation that is count based rather than time based.

Signed-off-by: Greg Wilkins <gregw@webtide.com>
2017-11-14 10:27:04 +01:00
Greg Wilkins
48df74224a
Jetty 9.4.x 1931 rollover (#1932)
* Issue #1931 Rollover log file

Added a protected method that is called whenever a log file is rolled over.
Support a date format of "" so that a rollover file may have the same name and a backup file is created.

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

* removed bad javadoc

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

* Issue #1931 Rollover

Replaced FilteredOutputStream with a volatile field so that rollover events will be seen immediately

* Issue #1931 Rollover

use mutex to avoid write and close race
2017-11-14 09:16:47 +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
80725581e2 Merge branch 'jetty-9.4.x' 2017-11-09 13:46:53 -05:00
WalkerWatch
7ba4428e9f Cleaned up cross reference syntax, leaving only xref and link anchors. Resolves #716. 2017-11-09 13:45:29 -05:00
WalkerWatch
e7f6969059 Merge branch 'jetty-9.4.x' 2017-11-09 13:34:00 -05:00
WalkerWatch
89c5332187 Updating module documentation. Resolves #1887 2017-11-09 13:33:33 -05:00
WalkerWatch
0f3d822f84 Merge branch 'jetty-9.4.x' 2017-11-09 13:20:05 -05:00
WalkerWatch
64858a5f56 Documentation update. Resolves #1549 2017-11-09 13:19:29 -05:00
WalkerWatch
07189b29b4 Merge branch 'jetty-9.4.x' 2017-11-09 13:01:48 -05:00
WalkerWatch
1fb8b2e4ad Updated documentation for Jetty Runner. Resolves #1550 2017-11-09 13:01:24 -05:00
WalkerWatch
5aea24c16f Merge branch 'jetty-9.4.x' 2017-11-09 12:44:41 -05:00
Chris Walker
440ebcb513
Merge pull request #1954 from olamy/bugfix/1550-inconsistencies-shutdown-jetty-runner
fix inconsistencies shutdown for JettyRunner
2017-11-09 12:44:18 -05:00
Simone Bordet
4329df70b5 Merged branch 'jetty-9.4.x' into 'master'. 2017-11-09 10:31:07 +01:00
Simone Bordet
0bc8305535 Improved ReservedThreadExecutor by reporting waiting threads. 2017-11-09 10:26:11 +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
Simone Bordet
1fdb974a35 Merged branch 'jetty-9.4.x' into 'master'. 2017-11-08 22:47:56 +01:00
Simone Bordet
761dccd10c Now dumping also SelectionKeys that throw when accessed. 2017-11-08 22:47:16 +01:00
Simone Bordet
e244aad86e Merged branch 'jetty-9.4.x' into 'master'. 2017-11-08 22:44:20 +01:00
Simone Bordet
d496cc85b6 Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2017-11-08 22:43:48 +01:00