Jan Bartel
9ab95ed824
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2020-09-02 12:09:23 +02:00
Jan Bartel
ef0c752476
Issue #4888 Ensure HttpSessionListener can access session via ( #5220 )
...
Issue #4888 Ensure HttpSessionListener can call Request.getSession
Signed-off-by: Jan Bartel <janb@webtide.com>
2020-09-02 11:53:23 +02:00
Jan Bartel
ad9d702adb
Issue #2609 - Uniform Find Expired Sessions ( #5097 )
...
* Issue #2609 Make all session stores use same algorithm to find expired sessions
Signed-off-by: Jan Bartel <janb@webtide.com>
2020-08-31 12:39:30 +02:00
Lachlan Roberts
40e37730bc
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2020-08-28 12:38:58 +10:00
Lachlan
001def4905
Merge pull request #5175 from eclipse/jetty-9.4.x-5105-StatisticsHandler
...
Issue #5105 - StatisticsHandler Graceful Shutdown of Async Requests
2020-08-28 11:54:45 +10:00
Lachlan Roberts
a9c90d3309
Issue #5105 - change asyncGraceful to gracefulShutdownWaitsForRequests
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-08-27 08:59:13 +10:00
Greg Wilkins
601710c9dc
Issue #5171 Simplify GzipHandler user-agent handling ( #5196 )
...
* Issue #5171 Simplify GzipHandler user-agent handling
+ Remove User-Agent handling from GzipHandler
+ Allow Vary header to be set
+ Create rewrite MsieRule to remove Accept-Encoding from IE<=6
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* + Full implementation of HttpFields ensure
+ use for Vary field
* + fixed checkstyle
* + fixed test for merged header
* + fixed javadoc
* Issue #5171 Simplify GzipHandler user-agent handling
+ improved comments
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* rename and testing after review
2020-08-26 23:55:36 +02:00
Lachlan Roberts
2282d16c98
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2020-08-25 14:32:16 +10:00
Lachlan Roberts
8edb7682cd
DebugHandler should use isAsyncStarted() instead of isSuspended()
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-08-25 10:40:09 +10:00
Lachlan Roberts
2d5da1fa35
StatisticsHandler should still return 503 responses on shutdown
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-08-25 10:34:59 +10:00
Lachlan Roberts
8faa71818f
change addToAllConnectors method to addBeanToAllConnectors
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-08-25 10:22:18 +10:00
Jan Bartel
77779ed6d8
Issue #4996 - Regularlize logging ( #5167 )
...
* Issue #4996 Regularize logging
Signed-off-by: Jan Bartel <janb@webtide.com>
Co-authored-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-08-24 17:15:13 +02:00
Lachlan Roberts
c0268c590f
change name of waitForSuspendedRequestsOnShutdown to asyncGraceful
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-08-24 16:19:59 +10:00
Lachlan Roberts
623d1be7c7
Change the way ConnectorStatistics is added to the Servers Connectors
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-08-21 15:45:58 +10:00
Lachlan Roberts
ef2f1dfd0d
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2020-08-21 10:37:24 +10:00
Lachlan Roberts
70a679f5f4
reorder some CustomRequestLog methods to be same as jetty-10
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-08-21 10:29:22 +10:00
Lachlan Roberts
12381e9cf5
cleanup various warnings and TODOs in CustomRequestLog
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-08-20 12:02:00 +10:00
Lachlan Roberts
0fae221afa
Issue #5105 - fix GracefulStopTest expectations from 503s to 404s
...
StatisticsHandler no longer gives 503 responses after shutdown.
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-08-20 07:27:12 +10:00
Lachlan Roberts
a65f00156d
Issue #5105 - add optional configuration to not wait for suspended requests in StatisticsHandler
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-08-20 07:27:12 +10:00
Lachlan Roberts
32358b1b77
Issue #5105 - fix StatisticsHandler bug with async dispatched requests
...
If the request is async dispatched, the check state.isSuspended() is not
correct to determine if the request was async or not. The check
state.isAsyncStarted() should be used instead.
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-08-20 07:27:12 +10:00
Thomas Draebing
a46ed5b5f0
Also manage graceful shutdown of already started async requests
...
Signed-off-by: Thomas Draebing <thomas.draebing@sap.com>
2020-08-19 09:59:21 +02:00
Simone Bordet
7b3dccc1bf
Issue #5104 - AbstractProxyServlet include incorrect protocol version in Via header when accessed over H2.
...
Added HttpFields.computeField() for HttpHeader too and updated usages.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-08-13 11:50:43 +02:00
Simone Bordet
79d340fdb6
Fixes #5104 - AbstractProxyServlet include incorrect protocol version in Via header when accessed over H2.
...
* Introduced HttpFields.computeField() to put/append header values.
* Reworked AbstractProxyServlet.addViaHeader().
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-08-13 00:08:52 +02:00
Simone Bordet
16cd552995
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
2020-08-11 21:00:43 +02:00
olivier lamy
c198d26e6b
Updating to version 10.0.0-SNAPSHOT
2020-08-11 16:47:55 +08:00
olivier lamy
429b091578
Updating to version 10.0.0.beta1
2020-08-11 16:47:54 +08:00
Jan Bartel
e117fbe828
Issue #1337 Use either absolute or relative multipart file location ( #5119 )
...
* Issue #1337 Use either absolute or relative multipart file location
Signed-off-by: Jan Bartel <janb@webtide.com>
2020-08-10 10:31:16 +02:00
Simone Bordet
dd4c1dbac0
Merged branch 'jetty-9.4.x' into 'jetty-9.4.x-5079-ipv6_brackets'.
2020-08-08 23:21:14 +02:00
Joakim Erdfelt
dcf867cd2b
Issue #3916 - Improve multi range response Content-Length calc
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-08-08 11:34:25 -05:00
Joakim Erdfelt
2206b3edae
Issue #3916 - Fixing broken Content-Length evaluation
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-08-08 07:18:02 -05:00
Simone Bordet
d53d9d8a1d
Fixes #5079 - :authority header for IPv6 address not having square brackets.
...
On the client:
* Origin.Address.host is passed through HostPort.normalizeHost(),
so that if it is IPv6 is bracketed.
Now the ipv6 address passed to an `HttClient` request is bracketed.
* HttpRequest was de-bracketing the host, but now it does not anymore.
On the server:
* Request.getLocalAddr(), getLocalName(), getRemoteAddr(),
getRemoteHost(), getServerName(), when dealing with an IPv6 address,
return it bracketed.
The reason to return bracketed IPv6 also from *Addr() methods is that
if it is used with InetAddress/InetSocketAddress it still works, but
often it is interpreted as a URI host so brackets are necessary.
* DoSFilter was blindly bracketing - now it does not.
Added a number of test cases, and fixed those that expected
non-bracketed IPv6.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-08-07 15:53:19 +02:00
Jan Bartel
437e2be411
Fix license header.
2020-08-05 16:25:01 +02:00
Jan Bartel
8dd205d18f
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2020-08-05 15:43:08 +02:00
Jan Bartel
4f57810217
Issue #5081 - HouseKeeper synchronization ( #5099 )
...
* Issue #5081 HouseKeeper synchronization
Signed-off-by: Jan Bartel <janb@webtide.com>
2020-08-05 15:33:27 +02:00
Simone Bordet
062878f97b
Issue #5083 - Convert synchronized usages to AutoLock.
...
Fixes after merge.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-08-04 17:59:13 +02:00
Simone Bordet
c49035570e
Merged branch 'jetty-10.0.x' into 'jetty-10.0.x-convert_synchronized_to_autolock'.
2020-08-04 16:32:55 +02:00
Simone Bordet
d2df0fc2e9
Fixes after review of #4975 .
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-07-31 17:59:55 +02:00
Simone Bordet
2fe01626a5
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
2020-07-31 17:47:37 +02:00
Greg Wilkins
66ec16006e
Issue #5088 Review ContextHandler locking ( #5094 )
...
* Issue #5088 Review ContextHandler locking
The locking was primarily as a memory guard for the availability status, which was already volatile.
Have instead using an AtomicReference with a simple state machine layered on top of start/stop lifecycle.
There was also protection for AttributesMap, which is no longer needed as AttributesMap is now concurrent.
* Issue #5088
updates from review
* Issue #5088
updates from review (better this time)
2020-07-30 17:58:34 +02:00
Simone Bordet
089e51f0bc
Fixes #5083 - Convert synchronized usages to AutoLock.
...
Updates after review.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-07-29 15:34:01 +02:00
Simone Bordet
8d69fc41a7
Fixes #5083 - Convert synchronized usages to AutoLock.
...
* Replaced relevant usages of synchronized with AutoLock.
* Made AutoLock serializable since classes that use it may be stored in the HttpSession.
* Added convenience methods to AutoLock to execute lambdas with the lock held.
* Introduced AutoLock.WithCondition to use a Lock and a Condition together.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-07-27 23:14:05 +02:00
Joakim Erdfelt
fe9deae849
Updating to version 9.4.32-SNAPSHOT
2020-07-23 13:53:47 -05:00
Joakim Erdfelt
450ba27947
Updating to version 9.4.31.v20200723
2020-07-23 12:46:54 -05:00
Lachlan Roberts
6364490161
restore old ServletPathMapping even for include dispatch types
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-07-23 23:41:56 +10:00
Lachlan Roberts
5726fa9364
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-07-23 10:19:53 +10:00
Greg Wilkins
65de149f84
Issue #5057 - Included root context path ( #5058 )
...
* Fixes #5057 Included root context path
Root context path in include should be empty string.
* Issue #5057
merged context path methods as result of review.
ServletContent.getContextPath now returns the encoded contextPath (if anybody is silly enough to have one).
2020-07-20 17:35:48 +02:00
Jan Bartel
668174d91d
Issue #5025 - wrong welcome file handling with dispatcher.include() and non-default mapping ( #5026 )
...
Signed-off-by: Grzegorz Grzybek <gr.grzybek@gmail.com>
Signed-off-by: Jan Bartel <janb@webtide.com>
2020-07-16 12:26:39 +02:00
Lachlan Roberts
f0f153cc97
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2020-07-16 09:10:07 +10:00
Lachlan
bbb0f6617c
Merge pull request #5042 from eclipse/jetty-9.4.x-5019-SslReload
...
Issue #5019 - hot-reload SSL certificates if keystore file changed
2020-07-16 09:09:03 +10:00
Lachlan
cadaf87583
Merge pull request #5046 from eclipse/jetty-10.0.x-4985-AttributeNameSet
...
Issue #4985 - fix NPE related to use of Attributes.Wrapper getAttributeNameSet() Jetty 10
2020-07-16 08:51:56 +10:00