74df6bf1a9
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
# Conflicts:
# jetty-maven-plugin/src/it/it-parent-pom/pom.xml
# jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/ConfiguratorTest.java
# jetty-websocket/javax-websocket-server/src/main/java/org/eclipse/jetty/websocket/javax/server/JavaxWebSocketServerContainerInitializer.java
# jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/WebSocketSession.java
# jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/io/AbstractWebSocketConnection.java
# jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/AbstractExtension.java
# jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/internal/ExtensionStack.java
# jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/internal/FrameFlusher.java
# jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/browser/BrowserDebugTool.java
# jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/browser/BrowserSocket.java
# jetty-websocket/websocket-server/src/test/resources/browser-debug-tool/index.html
# jetty-websocket/websocket-server/src/test/resources/browser-debug-tool/websocket.js
2019-01-11 12:11:38 -06:00
e9143725b0
Issue #3242 - Post-review cleanup of ProxyEndPoint
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-01-11 10:23:51 -06:00
aad5e97336
Issue #3242 - Relying on EndPoint.toString() for ProxyEndPoint.toString()
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-01-08 15:48:22 -06:00
07035b7376
Issue #3236 - fixed CustomRequestLogTest failure when JAVA_HOME not set
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-01-04 09:36:53 +11:00
63f2023e05
happy new year!!
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-01-01 12:17:53 +10:00
9b7afd8a03
Happy new year!! ( #3232 )
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-01-01 11:52:16 +10:00
6ff23e296d
Merge branch 'jetty-9.4.x' into jetty-10.0.x
2018-12-22 22:00:07 +10:00
8f06fa8083
Issue #3207
...
updates after review
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-12-20 08:53:16 +11:00
225760c2de
Issue #3207
...
Fix #3207 by providing async compliant print methods
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-12-19 13:57:58 +11:00
4abc4f8dd4
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2018-12-19 10:54:41 +11:00
503bd71d4c
Issue #3202
...
Handle async cross context session completion
2018-12-18 16:00:46 +11:00
06bbab50f9
Issue #3202
...
Handle async cross context session completion
2018-12-18 14:07:16 +11:00
34b6ecec6c
Issue #3202 Ensure sessions created during async are cleaned up.
...
Signed-off-by: Jan Bartel <janb@webtide.com>
2018-12-18 09:32:12 +11:00
fb06b82172
Issue #3030 ignore identity content encoding during parameter extraction
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-12-13 13:42:08 +11:00
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
18b0ad842a
Merge pull request #3160 from eclipse/jetty-10.0.x-113-customrequestlog
...
Issue #113 CustomRequestLog as default in jetty-10
2018-12-01 16:32:45 +01:00
81ca90b1f6
Issue #113
...
Deletes the deprecated NcsaRequestLog classes
Updates modules to use CustomRequestLog by default
Move jetty-customrequestlog.xml from home to base
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-12-01 16:31:23 +01:00
99d1983ebd
Issue #3011 - Move HttpCompliance to HttpConfiguration.
...
Fixed jetty-https.xml.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-11-29 16:41:25 +01:00
aeb200e583
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2018-11-29 12:10:58 +01:00
132aef4420
Issue #113
...
default to extended format
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-11-29 12:10:18 +01:00
0d4e20b964
Issue #113
...
Fixed merge to 10
2018-11-29 11:08:55 +01:00
bbc7037171
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2018-11-29 11:06:49 +01:00
7742650fa5
Issue #113
...
Fixed property names
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-11-29 10:55:00 +01:00
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
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
720e561008
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2018-11-29 09:32:50 +01:00
bda9307028
Merge pull request #3144 from lachlan-roberts/jetty-9.4.x
...
Issue #113 - CustomRequestLog
2018-11-29 09:29:43 +01:00
472d7a1529
Issue #113 - latency test failures fixed
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-11-28 22:28:40 +01:00
c2749ff5e3
Issue #113 - fixed documentation inconsistency
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-11-28 16:22:37 +01:00
e58fd93742
Issue #113 - StacklessLogging for NcsaRequestLogTest expected exceptions
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-11-28 16:05:03 +01:00
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
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
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
b97c80b3c1
Issue #113 - testing of logConnectionStatus implemented
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-11-27 14:26:31 +01:00
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
2cd579353c
Issue #113 - fix javadoc errors
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-11-26 14:12:16 +01:00
1e15e3e941
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2018-11-24 16:49:40 +01:00
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
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
92317a7bb4
Issue #3132 improve dump readability
...
fixed tests
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-11-23 16:54:36 +01:00
506e4dc682
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2018-11-23 16:45:32 +01:00
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
771f120508
Issue #113 - customrequestlog module
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-11-22 20:01:19 +01:00
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
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
7dcc9d2829
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2018-11-20 14:10:52 +01:00
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
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
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
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
Lachlan Roberts
olivier lamy
Olivier Lamy
Greg Wilkins
Jan Bartel
Bjørn Christian Seime
Simone Bordet