Commit Graph

4075 Commits

Author SHA1 Message Date
Olivier Lamy 8829602201
Exclude ipv6 tests for ci profile (Jenkins) (#3528)
* exclude ipv6 test as currently failing on kubernetes, using junit tag and ci profile activated via Jenkinsfile

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

* upgrade surefire to 3.0.0-M3

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-04-06 13:27:42 +10:00
Simone Bordet e4e72968cd Issue #3361 - HandlerCollection.addHandler is lacking synchronization.
Removed unused code.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-04-05 09:00:45 +02:00
Simone Bordet 97d501d444 Merged branch 'jetty-9.4.x' into 'jetty-9.4.x-3361-thread-safe-setHandlers'. 2019-04-05 08:47:34 +02:00
Joakim Erdfelt 9b19374c5d Updating to version 9.2.28-SNAPSHOT 2019-04-03 19:38:05 -05:00
Joakim Erdfelt 84dfe74b97 Updating to version 9.2.27.v20190403 2019-04-03 19:04:45 -05:00
Joakim Erdfelt c70034766e Updating to version 9.3.27-SNAPSHOT 2019-04-03 18:46:31 -05:00
Joakim Erdfelt dae476e369 Updating to version 9.3.26.v20190403 2019-04-03 18:16:32 -05:00
Joakim Erdfelt 2ccde9772b Undoing bad release-9.3.26 2019-04-03 18:11:16 -05:00
Joakim Erdfelt 7478c04351 Merge branch `jetty-9.3.x` into `jetty-9.4.x`
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

# Conflicts:
#	Jenkinsfile
#	VERSION.txt
#	aggregates/jetty-all-compact3/pom.xml
#	aggregates/jetty-all/pom.xml
#	apache-jsp/pom.xml
#	apache-jstl/pom.xml
#	examples/async-rest/async-rest-jar/pom.xml
#	examples/async-rest/async-rest-webapp/pom.xml
#	examples/async-rest/pom.xml
#	examples/embedded/pom.xml
#	examples/pom.xml
#	jetty-alpn/jetty-alpn-client/pom.xml
#	jetty-alpn/jetty-alpn-java-client/pom.xml
#	jetty-alpn/jetty-alpn-java-server/pom.xml
#	jetty-alpn/jetty-alpn-server/pom.xml
#	jetty-alpn/pom.xml
#	jetty-annotations/pom.xml
#	jetty-ant/pom.xml
#	jetty-bom/pom.xml
#	jetty-cdi/cdi-core/pom.xml
#	jetty-cdi/cdi-full-servlet/pom.xml
#	jetty-cdi/cdi-servlet/pom.xml
#	jetty-cdi/cdi-websocket/pom.xml
#	jetty-cdi/pom.xml
#	jetty-cdi/test-cdi-webapp/pom.xml
#	jetty-client/pom.xml
#	jetty-continuation/pom.xml
#	jetty-deploy/pom.xml
#	jetty-distribution/pom.xml
#	jetty-documentation/pom.xml
#	jetty-fcgi/fcgi-client/pom.xml
#	jetty-fcgi/fcgi-server/pom.xml
#	jetty-fcgi/pom.xml
#	jetty-gcloud/jetty-gcloud-memcached-session-manager/pom.xml
#	jetty-gcloud/jetty-gcloud-session-manager/pom.xml
#	jetty-gcloud/pom.xml
#	jetty-hazelcast/pom.xml
#	jetty-http-spi/pom.xml
#	jetty-http-spi/src/main/java/org/eclipse/jetty/http/spi/HttpSpiContextHandler.java
#	jetty-http-spi/src/main/java/org/eclipse/jetty/http/spi/JettyHttpContext.java
#	jetty-http-spi/src/main/java/org/eclipse/jetty/http/spi/JettyHttpExchangeDelegate.java
#	jetty-http-spi/src/main/java/org/eclipse/jetty/http/spi/JettyHttpServerProvider.java
#	jetty-http/pom.xml
#	jetty-http2/http2-alpn-tests/pom.xml
#	jetty-http2/http2-client/pom.xml
#	jetty-http2/http2-common/pom.xml
#	jetty-http2/http2-hpack/pom.xml
#	jetty-http2/http2-http-client-transport/pom.xml
#	jetty-http2/http2-server/pom.xml
#	jetty-http2/pom.xml
#	jetty-infinispan/pom.xml
#	jetty-io/pom.xml
#	jetty-jaas/pom.xml
#	jetty-jaspi/pom.xml
#	jetty-jmx/pom.xml
#	jetty-jndi/pom.xml
#	jetty-jspc-maven-plugin/pom.xml
#	jetty-maven-plugin/pom.xml
#	jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/JettyDeployWar.java
#	jetty-monitor/pom.xml
#	jetty-nosql/pom.xml
#	jetty-osgi/jetty-osgi-alpn/pom.xml
#	jetty-osgi/jetty-osgi-boot-jsp/pom.xml
#	jetty-osgi/jetty-osgi-boot-warurl/pom.xml
#	jetty-osgi/jetty-osgi-boot/pom.xml
#	jetty-osgi/jetty-osgi-httpservice/pom.xml
#	jetty-osgi/pom.xml
#	jetty-osgi/test-jetty-osgi-context/pom.xml
#	jetty-osgi/test-jetty-osgi-fragment/pom.xml
#	jetty-osgi/test-jetty-osgi-webapp/pom.xml
#	jetty-osgi/test-jetty-osgi/pom.xml
#	jetty-plus/pom.xml
#	jetty-proxy/pom.xml
#	jetty-quickstart/pom.xml
#	jetty-rewrite/pom.xml
#	jetty-runner/pom.xml
#	jetty-security/pom.xml
#	jetty-security/src/test/java/org/eclipse/jetty/security/AliasedConstraintTest.java
#	jetty-server/pom.xml
#	jetty-server/src/main/java/org/eclipse/jetty/server/handler/ResourceHandler.java
#	jetty-servlet/pom.xml
#	jetty-servlet/src/main/java/org/eclipse/jetty/servlet/DefaultServlet.java
#	jetty-servlet/src/test/java/org/eclipse/jetty/servlet/DefaultServletTest.java
#	jetty-servlets/pom.xml
#	jetty-servlets/src/test/java/org/eclipse/jetty/servlets/ThreadStarvationTest.java
#	jetty-spring/pom.xml
#	jetty-start/pom.xml
#	jetty-start/src/test/java/org/eclipse/jetty/start/BaseHomeTest.java
#	jetty-start/src/test/java/org/eclipse/jetty/start/ConfigurationAssert.java
#	jetty-util-ajax/pom.xml
#	jetty-util/pom.xml
#	jetty-util/src/main/java/org/eclipse/jetty/util/resource/Resource.java
#	jetty-webapp/pom.xml
#	jetty-websocket/javax-websocket-client-impl/pom.xml
#	jetty-websocket/javax-websocket-server-impl/pom.xml
#	jetty-websocket/pom.xml
#	jetty-websocket/websocket-api/pom.xml
#	jetty-websocket/websocket-client/pom.xml
#	jetty-websocket/websocket-common/pom.xml
#	jetty-websocket/websocket-server/pom.xml
#	jetty-websocket/websocket-servlet/pom.xml
#	jetty-xml/pom.xml
#	pom.xml
#	tests/pom.xml
#	tests/test-continuation/pom.xml
#	tests/test-http-client-transport/pom.xml
#	tests/test-integration/pom.xml
#	tests/test-jmx/jmx-webapp-it/pom.xml
#	tests/test-jmx/jmx-webapp/pom.xml
#	tests/test-jmx/pom.xml
#	tests/test-loginservice/pom.xml
#	tests/test-quickstart/pom.xml
#	tests/test-sessions/pom.xml
#	tests/test-sessions/test-file-sessions/pom.xml
#	tests/test-sessions/test-gcloud-sessions/pom.xml
#	tests/test-sessions/test-infinispan-sessions/pom.xml
#	tests/test-sessions/test-jdbc-sessions/pom.xml
#	tests/test-sessions/test-memcached-sessions/pom.xml
#	tests/test-sessions/test-mongodb-sessions/pom.xml
#	tests/test-sessions/test-sessions-common/pom.xml
#	tests/test-webapps/pom.xml
#	tests/test-webapps/test-jaas-webapp/pom.xml
#	tests/test-webapps/test-jetty-webapp/pom.xml
#	tests/test-webapps/test-jndi-webapp/pom.xml
#	tests/test-webapps/test-mock-resources/pom.xml
#	tests/test-webapps/test-proxy-webapp/pom.xml
#	tests/test-webapps/test-servlet-spec/pom.xml
#	tests/test-webapps/test-servlet-spec/test-container-initializer/pom.xml
#	tests/test-webapps/test-servlet-spec/test-spec-webapp/pom.xml
#	tests/test-webapps/test-servlet-spec/test-web-fragment/pom.xml
#	tests/test-webapps/test-webapp-rfc2616/pom.xml
2019-04-03 17:47:18 -05:00
Joakim Erdfelt 554fc39f06 Merge branch `jetty-9.2.x` into `jetty-9.3.x`
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

# Conflicts:
#	jetty-http-spi/src/main/java/org/eclipse/jetty/http/spi/HttpSpiContextHandler.java
#	jetty-http-spi/src/main/java/org/eclipse/jetty/http/spi/JettyHttpServerProvider.java
#	jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/JettyDeployWar.java
#	jetty-security/src/test/java/org/eclipse/jetty/security/AliasedConstraintTest.java
#	jetty-server/src/main/java/org/eclipse/jetty/server/handler/ResourceHandler.java
#	jetty-servlet/src/test/java/org/eclipse/jetty/servlet/DefaultServletTest.java
#	jetty-start/src/test/java/org/eclipse/jetty/start/BaseHomeTest.java
#	jetty-start/src/test/java/org/eclipse/jetty/start/ConfigurationAssert.java
#	jetty-util/src/main/java/org/eclipse/jetty/util/resource/Resource.java
2019-04-03 17:19:34 -05:00
Joakim Erdfelt ca77bd384a Issue #3319 - Refactoring DefaultServlet Index/Listing
+ Now generates valid HTML5
+ Now allows column sort

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-04-03 16:28:26 -05:00
Greg Wilkins 9f4b3542cb Updating to version 9.3.27-SNAPSHOT 2019-04-03 17:32:08 +11:00
Greg Wilkins 7ec6d2fb32 Updating to version 9.3.26.v20190403 2019-04-03 13:06:51 +11:00
Simone Bordet c4b2621f56
Merge pull request #3480 from eclipse/jetty-9.4.x-3464-split_sslcontextfactory
Issue #3464 - Split SslContextFactory into Client and Server
2019-04-02 12:39:37 +02:00
Greg Wilkins 879b9f5d6b Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-9.4.x-3361-thread-safe-setHandlers 2019-04-02 12:44:08 +11:00
Greg Wilkins 1c956dc470 Issue #3361 thread safe addHandler
Updates from review:
 - undeploy destroys context
 - reinstated mapContexts

Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-03-26 14:15:36 +11:00
Joakim Erdfelt 10d3ea2548 Merge branch `jetty-9.4.x-3427-classpath-with-spaces` into `jetty-9.4.x` 2019-03-21 14:26:00 -05:00
Simone Bordet 6fb243ff6c Issue #3464 - Split SslContextFactory into Client and Server
Introduced SslContextFactory subclasses Client and Server.
Replaced all usages of SslContextFactory with either Client or Server
as required.

Refactored configuration checking so that warnings are not emitted
when non necessary.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-03-21 14:42:42 +01:00
Greg Wilkins f2e9f2f7b3 Issue #3361 thread safe addHandler
Updates from review:
 - private fields
 - better blocker for deployment

Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-03-21 17:11:47 +11:00
Greg Wilkins 790dbbfaaa Issue #3361 thread safe addHandler
Updates from review:
 - private fields
 - callbacks on deploy/undeploy
 - more deprecated javadoc

Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-03-21 10:24:14 +11:00
Greg Wilkins 2f2c9f2f3f Merge branch 'jetty-9.4.x-3361-thread-safe-setHandlers' of github.com:eclipse/jetty.project into jetty-9.4.x-3361-thread-safe-setHandlers 2019-03-21 10:05:45 +11:00
Greg Wilkins a2195e5fe3 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-9.4.x-3361-thread-safe-setHandlers 2019-03-21 10:05:24 +11:00
Simone Bordet 512886ae7f Issue #3361 thread safe addHandler
Code cleanup.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-03-20 10:51:16 +01:00
Greg Wilkins 338f56ea93 Issue #3361 thread safe addHandler
Improved names and javadoc.

Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-03-20 18:36:48 +11:00
Jan Bartel 432fc41a32
Jetty 9.4.x 3456 programmatic authentication (#3472)
* Issue #3456 Allow multiple programmatic login/logout in same request.

Signed-off-by: Jan Bartel <janb@webtide.com>
2019-03-20 18:19:55 +11:00
Greg Wilkins 1accced62f Issue #3361 thread safe addHandler
Added new thread safe methods deployHandler and undeployHandler

Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-03-20 18:18:55 +11:00
Greg Wilkins 79c1700f62 Issue #3361 thread safe addHandler
Make handler list and context mappings controlled by a single CaS
operation

Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-03-19 18:57:55 +11:00
Greg Wilkins 49eadc5246 Issue #3361 thread safe addHandler
Made Context mapping atomic with a volatile mapping

Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-03-19 17:58:27 +11:00
Greg Wilkins b7e3d6ce5e Issue #3361 thread safe addHandler
Removed synchronization for now, leaving just some cleanups

Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-03-19 16:40:45 +11:00
Greg Wilkins d6ed19a97c Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-9.4.x-3361-thread-safe-setHandlers 2019-03-19 16:12:50 +11:00
Greg Wilkins ffdbbd1821 Issue #3440 Stop failed lifecycle
check that contexts after error are not started.

Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-03-14 09:07:16 +11:00
Greg Wilkins 6db357d2fc Completed implementation of GzipRequestCustomizer 2019-03-13 13:30:54 +11:00
Greg Wilkins c1f6f6b608 Implementation of a request customizer to do gzip inflation
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-03-12 18:05:41 +11:00
Greg Wilkins 76a37352f5 Issue #3440 Stop on Unavailable
+ revert schedulers to non-daemon threads for now so this PR can
   proceed.

Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-03-12 09:21:19 +11:00
Greg Wilkins a9707471a0 Issue #3440 Stop on Unavailable
+ ContainerLifeCycle stops started beans on failure.

Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-03-11 17:10:03 +11:00
Greg Wilkins 054d7f240e Issue #3440 Stop on Unavailable
+ cleanup after review

Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-03-11 16:41:20 +11:00
Greg Wilkins 375ad81f4b Issue #3440 Stop on Unavailable
+ Any schedulers created are named (for ease of debug) and daemon
   so they do not stop the JVM exiting.
 + If the server.doStart() fails, it calls server.doStop to ensure
   connectors are stopped, ports are free etc.
 + cleanup of addBean handling of scheduler in proxy

Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-03-07 15:10:53 +11:00
Greg Wilkins dbf0d2e6be Issue #3421 Duplicate session set-cookie (#3426)
Added Response.replaceCookieuse replaceCookie in sessions
unit tests

Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-03-06 14:44:48 +11:00
Joakim Erdfelt 0bccaf0246 Issue #3427 - Testing .getClassPath() handling of directory with spaces
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-03-05 11:48:27 -05:00
Greg Wilkins 73e68ac7b5 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-9.4.x-3404-QCSV-Doubles 2019-03-05 08:52:36 +11:00
Greg Wilkins ca8a10a9d5 Issue #3404 Cleanup QCSV mime ordering
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-03-01 10:17:02 +11:00
Simone Bordet 676b7ecaba Issue #1861 - Limit total bytes pooled by ByteBufferPools.
Added a bytebufferpool module to be able to configure
the ByteBufferPool used by ServerConnectors.

Added JMX methods to the ByteBufferPool implementations.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-02-27 17:16:09 +01:00
Greg Wilkins b478332793 Issue #3361 thread set setHandlers
protect handler mutation with synchronized.
Correctly use copy-on-write semantics for accessing volatile

Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-02-20 14:15:51 +11:00
Joakim Erdfelt 9cdb59d4d7 Updating to version 9.4.16-SNAPSHOT 2019-02-15 13:35:15 -05:00
Joakim Erdfelt eb70b24016 Updating to version 9.4.15.v20190215 2019-02-15 11:53:00 -05:00
Simone Bordet d22ec03acc
Merge pull request #3287 from eclipse/jetty-9.4.x-3049-sslcontextfactory_warnings
Issue #3049 - Warn on common SslContextFactory problematic configurations
2019-02-04 22:56:32 +01:00
Simone Bordet 6c0eee7012
Merge pull request #3322 from eclipse/jetty-9.4.x-3210-unmanaged_threadpool
Fixes #3210 - Threadpool module creates unmanged threadpool.
2019-02-04 22:52:30 +01:00
Greg Wilkins 0809228549 Issue #3317 avoid double log of exception
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-02-05 08:28:37 +11:00
Greg Wilkins 051edc94d7 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-02-05 08:21:38 +11:00
Simone Bordet 6a64031840 Fixes #3210 - Threadpool module creates unmanged threadpool.
The thread pool is now created as a nested object, rather than a top
level object, so that it is not started before the Server instance.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-02-04 19:40:29 +01:00
Simone Bordet da490673af Fixes #3311 - Ability to serve HTTP and HTTPS from the same port.
Updated implementation and tests after reviews.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-02-03 14:24:07 +01:00
alexey.barsov 25afa868da Issue #3302 Supporting host:ip in X-Forwarded-For (fixing unit tests)
Signed-off-by: alexey.barsov <alexey.barsov@jetbrains.com>
2019-02-01 15:48:58 +01:00
alexey.barsov 803a45b43b Issue #3302 Supporting host:ip in X-Forwarded-For (fixing review remarks)
Signed-off-by: alexey.barsov <alexey.barsov@jetbrains.com>
2019-02-01 15:38:33 +01:00
Simone Bordet d9855fb1bc Fixes #3311 - Ability to serve HTTP and HTTPS from the same port.
Do not assume that the read from the network produced more than 1 byte.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-02-01 09:14:32 +01:00
Simone Bordet 5061a5ca30 Fixes #3311 - Ability to serve HTTP and HTTPS from the same port.
Fixed handling of upgradeTo() in case of null buffers.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-01-31 17:15:07 +01:00
Simone Bordet ccda1ee5f6 Fixes #3311 - Ability to serve HTTP and HTTPS from the same port.
Introduced PlainOrSslConnectionFactory, to "sniff" the first bytes
on a connection and upgrade to SSL (if the bytes are TLS bytes), or
upgrade to a specific, configured, protocol.

Added also the ability to fail the upgrade in case of a `http`
request to a `https` port and write a minimal response to the client.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-01-31 13:23:58 +01:00
alexey.barsov edf74a6554 Issue #3302 Supporting host:ip in X-Forwarded-For
Signed-off-by: alexey.barsov <foster_licey_reg@mail.ru>
2019-01-30 11:11:44 +01:00
Jan Bartel 169d93e790
Jetty 9.4.x 3284 sessions and system clock jitter (#3296)
* Issue 3284 System clock jitter can affect session timers.

Signed-off-by: Jan Bartel <janb@webtide.com>
2019-01-30 14:02:35 +11:00
Simone Bordet e4d78608a7 Issue #3049 - Warn on common SslContextFactory problematic configurations.
Made default endpointIdentificationAlgorithm=HTTPS to avoid warnings
when SslContextFactory is used on a server.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-01-23 17:31:41 +01:00
Lachlan Roberts 2fc6185c29 Issue #3236 - fixed CustomRequestLogTest failure when JAVA_HOME not set
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-01-15 13:11:06 -06:00
Joakim Erdfelt 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
Joakim Erdfelt 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
Olivier Lamy 9b7afd8a03
Happy new year!! (#3232)
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-01-01 11:52:16 +10:00
Greg Wilkins 8f06fa8083 Issue #3207
updates after review

Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-12-20 08:53:16 +11:00
Greg Wilkins 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
Greg Wilkins 503bd71d4c Issue #3202
Handle async cross context session completion
2018-12-18 16:00:46 +11:00
Greg Wilkins 06bbab50f9 Issue #3202
Handle async cross context session completion
2018-12-18 14:07:16 +11:00
Jan Bartel 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
Greg Wilkins 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
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
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
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
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
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
Lachlan Roberts 2cd579353c Issue #113 - fix javadoc errors
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-11-26 14:12:16 +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
Lachlan Roberts 771f120508 Issue #113 - customrequestlog module
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-11-22 20:01:19 +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
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
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
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 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 2018-11-14 15:19:10 -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 a903017f5f Updating to version 9.4.14-SNAPSHOT 2018-11-11 21:06:50 -06:00
Joakim Erdfelt 49123a3313 Updating to version 9.4.13.v20181111 2018-11-11 20:02:42 -06:00