17711 Commits

Author SHA1 Message Date
Simone Bordet
14c2431b1d Updated Conscrypt to 1.4.1.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-11-22 12:46:11 +01:00
Greg Wilkins
8c10d266b2 Merge branch 'jetty-9.4.x' into jetty-9.4.x-cleanup-webapp-context 2018-11-22 12:41:47 +01:00
Simone Bordet
5f972b451c
Jetty 10.0.x 2978 add module info (#3120)
Fixes #2978 - Add module-info to relevant Jetty modules.

Added module-info.java for Jetty modules that are not test modules.
Moved jetty-http test utility classes to new module "jetty-http-tools".
Removed generation of test-jar from websocket-core.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-11-22 12:37:35 +01:00
Greg Wilkins
0462212446 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2018-11-22 12:14:49 +01:00
Greg Wilkins
89e1dd033a
Jetty 9.4.x 3117 retainable byte buffer (#3118)
* Move RetainableByteBuffer to jetty-io=
use RetainableByteBuffer
use RetainableByteBuffer - changes from review.
Reviewed and applied small changes.

Signed-off-by: Greg Wilkins <gregw@webtide.com>
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-11-22 11:31:05 +01:00
Lachlan Roberts
112d57f474 Issue #113 - CustomRequestLog
added missing copyright header in some new files

added CustomRequestLogTest in jetty-servlet to test things like
logFilename and logRequestHandler

the log strings produced do no longer contain a trailing newline

implemented more tests in CustomRequestLogTest
and finished implementing some of the logging in CustomRequestLog

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-11-22 10:32:22 +01:00
Joakim Erdfelt
21f66bb972 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2018-11-21 10:45:05 -06:00
Simone Bordet
910665a55a Fixes #3133 - Logging of key.readyOps() can throw unchecked CancelledKeyException.
Introduced safeInterestOps() and safeReadyOps() to catch exceptions
they may throw and using them in relevant places to fix the issue.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-11-21 17:37:37 +01:00
Greg Wilkins
041e8fd9cf Issue #3038 SSL Connection Leak
Don't call  handleContentMessage after content call if the content call
returns true.

This is a slight bending of the parser contract to work around the current
client interpretation that a true return will prevent other events from being
delivered.

Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-11-21 17:28:40 +01:00
Steven Schlansker
b191d69bb0 bom: inherit project; use flatten plugin to sanitize bom (#3114)
Signed-off-by: Steven Schlansker <stevenschlansker@gmail.com>
2018-11-21 20:38:03 +10:00
Greg Wilkins
4013563db0 Issue #3129 Provisional fix
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-11-21 10:53:40 +01:00
olivier lamy
33eccf82dc remove non used test-dispatch-webapp
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-11-21 15:56:39 +10:00
olivier lamy
7d5ed3089c jmh test has been moved in 10.0.x
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-11-21 14:39:08 +10:00
Greg Wilkins
7dcc9d2829 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2018-11-20 14:10:52 +01:00
Greg Wilkins
8c4ee8496f
Jetty 9.4.x 3038 ssl connection leak (#3121)
Issue #3038 - SSL connection leak.

Fixed SSL spin caused when fill had NEED_WRAP, but a flush/wrap
produced 0 bytes and stayed in NEED_WRAP

Removed check of isInputShutdown prior to filling that allowed EOF to
overtake data already read.

Fix for leak by shutting down output in HttpConnection if
filled -1 and the HttpChannelState was no longer processing
current request.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-11-20 13:53:42 +01:00
Jan Bartel
10622f3455
Issue #3109 Remove unnecessary aries-util. (#3110)
Signed-off-by: Jan Bartel <janb@webtide.com>
2018-11-19 15:19:14 +01:00
Lachlan Roberts
6040bd3497 Issue #113 - AbstractNCSARequestLog no longer abstract and test cleanups
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-11-19 15:05:47 +01:00
Lachlan Roberts
cc1ae54feb Issue #113 - Parameterized RequestLogTest to test NCSA format string
renamed to NcsaRequestLogTest as is only testing NCSA log formats

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-11-19 14:53:48 +01:00
Lachlan Roberts
e4d30b367c Issue #113 - Added Request Log Writers
Introduced the RequestLog.Writer where a RequestLog takes a writer
which manages what to do with the log strings produced by the RequestLog

deprecated the NCSA and SLF4J RequestLogs in favor of CustomRequestLog

Implemented more format codes in CustomRequestLog

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-11-19 13:58:53 +01:00
Simone Bordet
820ccd7bd1 Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 2018-11-16 12:53:38 +01:00
Joakim Erdfelt
52f316e5b3 Updating to 9.4.15-SNAPSHOT 2018-11-15 09:47:43 -06:00
Simone Bordet
d095413aee Added additional JPMS section.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-11-15 16:38:10 +01:00
Simone Bordet
00c2c21700 Fixed small typos and clarified JPMS usage.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-11-15 15:08:42 +01:00
Greg Wilkins
7dd3cfffe6 Issue #113 channel persistance and completed getters
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-11-15 14:36:40 +01:00
Joakim Erdfelt
42d6444c8d Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2018-11-15 07:11:03 -06:00
Joakim Erdfelt
88a9e97a2a
Merge pull request #3096 from eclipse/declarative_jenkinsfile
Using new Declarative Jenkinsfile format
2018-11-15 07:07:43 -06:00
Joakim Erdfelt
2d9f1a22af Merge branch 'jetty-9.4.x' into jetty-10.0.x 2018-11-15 07:06:53 -06:00
Greg Wilkins
7cb65e4f1f Move RetainableByteBuffer to jetty-io
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-11-15 10:04:07 +01:00
Joakim Erdfelt
29fd18e046 Updating to version 9.4.15-SNAPSHOT 2018-11-14 16:42:40 -06:00
Joakim Erdfelt
c4550056e7 Updating to version 9.4.14.v20181114 jetty-9.4.14.v20181114 2018-11-14 15:19:10 -06:00
Joakim Erdfelt
e3d8f06fa9
Merge pull request #3108 from eclipse/jetty-9.4.x-3104-org.mortbay.apache-jsp-update-for-schema-3.1.2
Issue #3104 Update to org.mortbay.apache-jsp 8.5.33.1
2018-11-14 06:11:30 -06:00
Jan Bartel
32af885580 Issue #3104 Update to org.mortbay.apache-jsp 8.5.33.1
Signed-off-by: Jan Bartel <janb@webtide.com>
2018-11-14 12:18:40 +01:00
Simone Bordet
aaa9a1e410 Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 2018-11-13 18:12:16 +01:00
Simone Bordet
f2ed692a1b
Merge pull request #3099 from eclipse/jetty-9.4.x-HttpClient-dump-improvements
Fixes Issue #3103 - HttpClient buffer leak found by dump improvements

The leak problem was an additional, unnecessary, call retain() in ResponseNotifier.notifyContent() that was leaking `ByteBuffer`s.
2018-11-13 18:04:17 +01:00
Greg Wilkins
25914e4776 Issue #3103
use consumer to configure test HttpClient

Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-11-13 17:15:59 +01:00
Greg Wilkins
d1f52d1534 Issue #3103
review results

Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-11-13 16:57:26 +01:00
Greg Wilkins
78a775396e Issue #3103
delay setting transport.setHttpClient until late in doStart
Do not add DumpableCollection as a bean

Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-11-13 16:52:04 +01:00
Greg Wilkins
859004bef4 Issue #3103
Fixed buffer leak
Only warn if HttpClient setters are called after start

Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-11-13 16:42:12 +01:00
Joakim Erdfelt
b9ff34d905
Merge pull request #3102 from eclipse/release-must-use-jdk11
Adding profile to ensure release uses JDK11 (or newer)
2018-11-13 09:17:52 -06:00
Lachlan Roberts
7ca6577ac6 Issue 113 - CustomRequestLog
fixed parsing issues for the format string by parsing left to right
and reversing the list of parsed tokens

reduced to parsing to single regex expression

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-11-13 14:51:06 +01:00
Joakim Erdfelt
77095c626d Adding profile to ensure release uses JDK11 (or newer)
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-11-13 07:37:30 -06:00
Jan Bartel
1845e6ea48
Issue #39078 Duplicated programmatic listeners. (#3101)
Signed-off-by: Jan Bartel <janb@webtide.com>
2018-11-13 14:29:12 +01:00
Joakim Erdfelt
ea315138ab Using new Declarative Jenkinsfile format
+ Ensuring that javadoc and compact3 builds will work in
  isolation to the other stages.

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-11-13 07:24:29 -06:00
Greg Wilkins
d0afc63cd5 Fixing HttpClient tests to configure before start 2018-11-13 14:22:19 +01:00
Greg Wilkins
fa38868406 use setters from doStart
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-11-13 10:37:42 +01:00
Greg Wilkins
26eecd6f8e HttpClient Dump Improvements
Add or update beans in constructor or setter rather than in doStart

Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-11-13 10:32:17 +01:00
Joakim Erdfelt
6f34541bfd Bumping up version of jetty-bom to 9.4.14-SNAPSHOT 2018-11-12 19:09:10 -06:00
Joakim Erdfelt
bebd433740 Merge branch 'release-bom-9.4.13' into jetty-9.4.x 2018-11-12 19:08:24 -06:00
Joakim Erdfelt
22484a18ce Updating jetty-bom to 9.4.13.v20181111 2018-11-12 19:06:18 -06:00
Joakim Erdfelt
67a6ad47b0 Using new Declarative Jenkinsfile format
+ Makes things easier to maintain.
+ Does not solve for bad "unstable" flagging of multiple
  stages when only one is failing.
  See: https://issues.jenkins-ci.org/browse/JENKINS-39203
  But this Declarative format will help once that bug is fixed.

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-11-12 10:12:15 -06:00