Commit Graph

16323 Commits

Author SHA1 Message Date
Jan Bartel 6af567a4b9
Handle ServletContainerInitializer from WEB-INF/classes #3146 (#3158)
* Handle the case where a ServletContainerInitializer comes from
WEB-INF/classes

Signed-off-by: Jan Bartel <janb@webtide.com>
2018-12-11 06:33:44 +01:00
Simone Bordet 2497cf6feb
Merge pull request #3193 from bjorncs/low-resource-monitor
Change access of LowResourceCheck to public
2018-12-10 14:17:21 +01:00
Bjørn Christian Seime 71c0e47446 Change access of LowResourceCheck to public
This interface is currently package-private while it's in the
signature of several public methods (e.g. addLowResourceCheck, getLowResourceChecks)

Signed-off-by: Bjørn Christian Seime <bjorncs@yahoo-inc.com>
2018-12-10 13:39:29 +01:00
Torbjørn Martinsen e7be376882 Update DoSFilter.java (#3191)
Add missing word and remove extra space in comments
2018-12-06 17:59:08 +10:00
Olivier Lamy b4ab8a07c1
#2718 take care of starting new created context (#3145)
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-11-30 17:55:51 +10:00
Greg Wilkins 132aef4420 Issue #113
default to extended format

Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-11-29 12:10:18 +01:00
Greg Wilkins 7742650fa5 Issue #113
Fixed property names

Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-11-29 10:55:00 +01:00
Greg Wilkins fc39e96653 Issue #113
Updated customrequestlog module defaults for timezone

Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-11-29 10:34:42 +01:00
Greg Wilkins e7d4f55891 Issue #113
Use CustomRequestLog in examples.
Convenience constructors

Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-11-29 10:13:12 +01:00
Greg Wilkins bda9307028
Merge pull request #3144 from lachlan-roberts/jetty-9.4.x
Issue #113 - CustomRequestLog
2018-11-29 09:29:43 +01:00
Lachlan Roberts 472d7a1529 Issue #113 - latency test failures fixed
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-11-28 22:28:40 +01:00
Lachlan Roberts c2749ff5e3 Issue #113 - fixed documentation inconsistency
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-11-28 16:22:37 +01:00
Lachlan Roberts e58fd93742 Issue #113 - StacklessLogging for NcsaRequestLogTest expected exceptions
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-11-28 16:05:03 +01:00
Raymond Augé 7ef8f882bd fixes #3141 Upgrade jetty osgi tests to use spifly 1.2 (#3142)
Signed-off-by: Raymond Auge <raymond.auge@liferay.com>
2018-11-28 15:00:31 +01:00
Lachlan Roberts 982895719c Issue #113 - changes from review and bug fixes
%t now takes in locale and timezone in the format string argument
instead of getting it from the setters on the CustomRequestLog class

fixed issue with multiline format strings

requestLog writers are now managed objects

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-11-28 14:58:28 +01:00
Alexander Kurtakov 69daacf8a9 Bring back packageRoot parameter in jetty-jspc-maven-plugin (#3157)
* Cleanup JspcMojo.
* Remove useless import.
* Generify where possible.
* Use setWebXmlInclude instead of setWebXmlFragment.
* Add it test verifying and demonstrating how to set JspC package param.

Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
2018-11-28 12:53:14 +01:00
Greg Wilkins 871e05fd6a
Merge pull request #3081 from eclipse/jetty-9.4.x-cleanup-webapp-context
Cleanup webapp context
2018-11-28 11:32:00 +01:00
Greg Wilkins e08a4e55dd Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-9.4.x-cleanup-webapp-context 2018-11-28 10:58:55 +01:00
Lachlan Roberts 63aa9ce97d Issue #113 - problems with latency tests and request handler name
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-11-28 10:52:17 +01:00
Lachlan Roberts 8aa3655c55 Issue #113 - fix to failing tests
removed tests for %B and %b which have been removed in favor of %O
adjusted the NcsaRequestLogTest to only test ExtendedNCSA format

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-11-28 09:26:55 +01:00
Olivier Lamy bee1487ecc
copying base resources must happen when preparing packaging we must not rely on id (#3138)
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-11-28 10:13:04 +10:00
Olivier Lamy 9ee57192dc
use withMaven junit publisher (#3150)
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-11-28 10:12:07 +10:00
Lachlan Roberts b97c80b3c1 Issue #113 - testing of logConnectionStatus implemented
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-11-27 14:26:31 +01:00
Lachlan Roberts b35df419bb Issue #113 - reformat, javadoc update and changes after review
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-11-27 14:26:12 +01:00
Paweł Nawrocki f5445a759e Fixed invalid QoS Filter parameter names (#3149)
Signed-off-by: Pawel Nawrocki <pnaw94@hotmail.com>
2018-11-27 10:57:28 +10:00
Lachlan Roberts 2cd579353c Issue #113 - fix javadoc errors
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-11-26 14:12:16 +01:00
Greg Wilkins 00e2026594 Fix conscrypt version for osgi jdk8
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-11-24 21:16:19 +01:00
Lachlan Roberts 7c0ea57923 Issue #113 - CustomRequestLog terminology refactor
replaced terminology for addresses and ports to use
client and server referring to the logical connection and
local and remote referring to the physical connection to the first hop

finished implementing tests in CustomRequestLogTest otherwise
disabled tests which will be verified manually instead

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-11-24 10:28:57 +01:00
Greg Wilkins 97cb063a57 Merge branch 'jetty-9.4.x' of github.com:eclipse/jetty.project into jetty-9.4.x 2018-11-23 17:01:39 +01:00
Greg Wilkins 92317a7bb4 Issue #3132 improve dump readability
fixed tests

Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-11-23 16:54:36 +01:00
Jan Bartel 4e672c6b27
Issue #2646 - Better handle concurrent calls to change session id and invalidate within a context (#2670)
* Issue #2646 handle concurrent invalidate/changeid calls

Signed-off-by: Jan Bartel <janb@webtide.com>
2018-11-23 16:15:27 +01:00
Jan Bartel 54319589a4 Fix conscrypt version for osgi 2018-11-23 16:13:30 +01:00
Lachlan Roberts 771f120508 Issue #113 - customrequestlog module
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-11-22 20:01:19 +01:00
Greg Wilkins fc0d2569ef Issue #3132 improve dump readability
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-11-22 18:08:46 +01:00
Greg Wilkins 0900d5ad75
Merge pull request #3130 from eclipse/remove_test-dispatch-webapp
remove non used test-dispatch-webapp module
2018-11-22 17:57:10 +01:00
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
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
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
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
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
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