Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
23,282 Commits 59 Branches 460 Tags 355 MiB
Commit Graph

5460 Commits

Author SHA1 Message Date
Joakim Erdfelt e12c3ce50b
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-10-16 08:11:42 -05:00
Joakim Erdfelt 34d27e8548
Issue #5448 - cleanup request.isSecure logic (#5450) 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-10-16 10:53:47 +02:00
Lachlan Roberts 5f5eff36cb Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-10-16 17:14:00 +11:00
Joakim Erdfelt fdd880b66b
Issue #5451 - Cleanup of temp file cleanup. 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-10-15 18:10:38 -05:00
Lachlan Roberts 0e3cfe8fc2 Issue #5287 - share compression pools and size with max num threads 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-10-14 22:28:26 +11:00
Lachlan Roberts 608a895aab Issue #5287 - make default CompressionPool capacity 1024 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-10-14 22:28:26 +11:00
Lachlan Roberts 21576f2312 Issue #5287 - fix usages of new CompressionPool 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-10-14 22:28:26 +11:00
Joakim Erdfelt ade166de2b
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-10-13 12:38:07 -05:00
Joakim Erdfelt 68560090fe
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-10-13 12:36:01 -05:00
Joakim Erdfelt 89dc16ae09
Issue #5443 - Forwarding Headers are optional 
Cleanup handling of forwarded.authority

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-10-13 10:27:01 -05:00
Joakim Erdfelt 0721178007
Issue #5443 - Forwarding Headers are optional 
The `X-Proxied-Https: off` case should have an implied port
not a hardcoded port.

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-10-13 08:31:32 -05:00
Joakim Erdfelt 457025bc16
Issue #5443 - Forwarding Headers are optional 
Additional NPE safety checks.

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-10-13 08:24:49 -05:00
Joakim Erdfelt ea1103077c
Issue #5443 - Forwarding Headers are optional 
+ Additional tests for HTTP/1.0
+ Overly complex negative test cases for
   `X-Forwarded-Proto: http` and
   `X-Proxied-Https: off`
+ Failure testcase for `X-Proxied-Https: foo`

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-10-13 08:20:27 -05:00
Joakim Erdfelt abdada05b1
Issue #5443 - Forwarding Headers are optional 
+ Improve / document implied secure scheme behaviors
  for both `Proxy-Ssl-Id` or `Proxy-auth-cert`

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-10-13 07:15:38 -05:00
Joakim Erdfelt f0681b33eb
Issue #5443 - Forwarding Headers are optional 
+ Simplify isSecure handling in customize.
+ Simplify handling of `Proxy-Ssl-Id` header.
+ Simplify handling of `Proxy-auth-cert` header.

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-10-13 07:03:37 -05:00
Joakim Erdfelt 0b646ee6b7
Issue #5443 - Forwarding Headers are optional 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-10-13 05:10:42 -05:00
Joakim Erdfelt 96769d28c3
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-10-13 04:55:08 -05:00
Joakim Erdfelt f0607273f3
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-10-13 04:54:36 -05:00
Simone Bordet e99f5835e9 Improvements to the Jetty documentation. 
Ported and updated the documentation about configuring Jetty behind a load balancer.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2020-10-12 23:10:11 +02:00
Joakim Erdfelt b5a957f415
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-10-12 08:50:53 -05:00
Simone Bordet 1cd15e8d85
Fixes #5379 - Better handling for wrong SNI. (#5398) 
* Fixes #5379 - Better handling for wrong SNI.

Reworked the SNI logic.
Added support for IP addresses in the SAN extension of certificates in the X509 class.
Fixed keystores to have CN=localhost and SAN with ip=127.0.0.1 and ip=[::1].
Fixed tests that were not using the correct Host header.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2020-10-12 15:48:53 +02:00
Joakim Erdfelt b20f0fae46
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-10-12 06:20:49 -05:00
Joakim Erdfelt c2266fdd63
Issue #5417 - Cleanup of PR from Review 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-10-12 04:50:51 -05:00
Joakim Erdfelt 149f389fd8
Issue #5417 - Honoring implied ports on ForwardedRequestCustomizer better 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-10-09 09:54:57 -05:00
Joakim Erdfelt 57a9e5236a
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-10-08 09:01:58 -05:00
Joakim Erdfelt 857e888e8b
Issue #5401 - Move HttpTester to jetty-http 
+ leaving jetty-http-tools alone

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-10-07 14:50:31 -05:00
Simone Bordet 7e75215cfc Improvements to the Jetty documentation. 
Ported the TLS documentation.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2020-10-05 18:12:47 +02:00
gregw 911173f8f7 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-10-05 13:57:20 +02:00
Greg Wilkins c40b955e09
Issue #5022 Filter Cache cleanup (#5271) 
* Issue #5022 Filter Cache cleanup

Issue #5022 Filter Cache cleanup:
 + Fixed many compiler warnings
 + removed old LazyList leftovers
 + Don't create holder string for source unless required
 + Only have a single type of chain, so it can be wrapped regardless of cache
 + Reverse mappings lists to make filter chain creation easier
 + build chain directly rather than build a list then a chain

Signed-off-by: Greg Wilkins <gregw@webtide.com>

* added comment to explain ordering

Signed-off-by: gregw <gregw@webtide.com>

* More cleanups

* fixed toString format
turn off debug in OSGI test
 2020-10-05 13:29:11 +02:00
Joakim Erdfelt c223ee37ab Updating to version 11.0.0-SNAPSHOT 2020-10-02 16:38:23 -05:00
Joakim Erdfelt 9ce21ec22b Updating to version 11.0.0.beta2 2020-10-02 16:20:55 -05:00
Joakim Erdfelt 85e257fc98 Updating to version 9.4.33-SNAPSHOT 2020-09-30 11:53:09 -05:00
Joakim Erdfelt de97d26f7b Updating to version 9.4.32.v20200930 2020-09-30 11:03:24 -05:00
gregw 0e13fc9ebd Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 
Signed-off-by: gregw <gregw@webtide.com>
 2020-09-30 17:02:05 +02:00
gregw 8ff02018ef Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 
Signed-off-by: gregw <gregw@webtide.com>
 2020-09-30 16:55:38 +02:00
Jan Bartel eb02009f87
Issue #5365 ISE not NPE if fail to create session. (#5370) 
If SessionHandler.newHttpSession(Request) fails to create a session
it returns null. Request.getSession(true) cannot throw a checked
exception, nor can it return null, so we should throw ISE.

Signed-off-by: Jan Bartel <janb@webtide.com>
 2020-09-30 16:51:54 +02:00
Joakim Erdfelt 88f3dd5a52
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-09-29 11:37:46 -05:00
Joakim Erdfelt ad2446dd6c
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-09-29 11:24:28 -05:00
Joakim Erdfelt 3423375a97
Issue #5357 - Updating to https://eclipse.org/ (#5358) 
* Issue #5357 - Updating to https://eclipse.org/

 - Removing redundant <url> refs in pom.xml
 - Correcting bad indenting from merge
 - Correcting mailing list references
 - Correcting bugs.eclipse.org references
 - Correcting text file references
 - Correcting html references
 - Correcting further references
 - Correcting download.eclipse.org reference
 - Adding test for demo-base /proxy/current/
 - Ensuring jetty-client is included in javadoc-proxy.war/WEB-INF/lib

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-09-29 11:02:32 -05:00
Greg Wilkins 2d1cc51800 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2020-09-28 13:41:35 +02:00
Greg Wilkins 5e583fa9f3
Fix #5327 NPE in PushBuilder (#5328) 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2020-09-28 13:36:56 +02:00
Joakim Erdfelt fcc3b6b4cd
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-09-25 10:09:58 -05:00
Lachlan Roberts 11465791cc Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-09-25 15:20:25 +10:00
Lachlan 7e627359b3
Merge pull request #5276 from eclipse/jetty-9.4.x-IncludeExcludeConnectionStatistics 
update documentation for statistics collection
 2020-09-25 15:20:04 +10:00
Joakim Erdfelt 39271d6b63
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-09-23 18:33:45 -05:00
Joakim Erdfelt 8fe32ce217
Merge pull request #5251 from eclipse/jetty-9.4.x-5247-forwarded-header-priority 
Issue #5247 ForwardedRequestCustomizer authority order rework
 2020-09-23 16:14:50 -05:00
Chris Walker 70c8822eef
Updated module descriptions for consistency. Resolves #5313 2020-09-23 13:10:47 -05:00
Greg Wilkins b220fc711e fixed checkstyle from merge 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2020-09-23 19:27:47 +02:00
Greg Wilkins 0ac34ff2b8
Issue #5304 HTTP2 HostHeader (#5307) 
* Issue #5304 HTTP2 HostHeader

Updated HostHeaderCustomizer to actually add the Host header, either from values passed in the custructor or from the getServerName and getServerPort methods.

The HttpURI is no longer updated.

Signed-off-by: Greg Wilkins <gregw@webtide.com>

* Issue #5304 HTTP2 HostHeader

 + Found and fixed bug in HttpFields
 + Added port normalization support to HttpScheme
 + added test

Signed-off-by: Greg Wilkins <gregw@webtide.com>

* blank line

Signed-off-by: Greg Wilkins <gregw@webtide.com>

* Issue #5304 HTTP2 HostHeader

 + refixed bug in HttpFields

Signed-off-by: Greg Wilkins <gregw@webtide.com>

* Issue #5304 HTTP2 HostHeader

 + still fixing HttpFields bug

Signed-off-by: Greg Wilkins <gregw@webtide.com>

* Issue #5304 HTTP2 Host Header

updates from review
 2020-09-23 15:05:52 +02:00
Joakim Erdfelt 8b6031155c
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-09-22 16:05:43 -05:00
Simone Bordet 35305b6a5c Improvements to the Jetty documentation. 
Reworked the start documentation.

Started skeleton of the operations guide.
Removed old_docs/deploying/hot-deployment.adoc and
old_docs/gettingstarted/getting-started/jetty-deployment.adoc,
since its content has been moved to the refactored documentation.

Restructured the skeleton of the operations guide.
Removed old_docs/deploying/anatomy-of-a-webapp.adoc,
since its content has been moved to the refactored documentation.

Removed old_docs/deploying/automatic-webapp-deployment.adoc,
since its content has been moved to the refactored documentation.

Removed old_docs/deploying/configuring-virtual-hosts.adoc,
since its content has been moved to the refactored documentation.

Removed old_docs/contexts/serving-webapps-from-particular-port.adoc
and example-jetty-embedded/src/main/resource/jetty-otherserver.xml,
since its content has been moved to the refactored documentation.

Simplified POMs.
Simplified index.adoc files, refactoring common things into config.adoc.

Expanded the deploy configuration documentation.
Expanded the protocols configuration documentation.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2020-09-22 19:28:43 +02:00
Joakim Erdfelt 33286db44b
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-5133-webappcontext-extraclasspath-cleanup 2020-09-22 12:24:01 -05:00
Joakim Erdfelt e9208fa86e
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-09-22 08:44:25 -05:00
Joakim Erdfelt ebfdf8fc1b
Issue #5247 - Updates from review by greg 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-09-21 10:34:28 -05:00
Joakim Erdfelt f6bcbda689
Issue #5133 - Changes from Review with jan & greg 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-09-21 09:42:26 -05:00
Jan Bartel 36b9661fab
Issue #5280 Remove unused SessionHandler methods. (#5303) 
Signed-off-by: Jan Bartel <janb@webtide.com>
 2020-09-21 14:41:40 +02:00
Lachlan Roberts e31227b6ac Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-09-21 10:45:25 +10:00
Lachlan df085a610f
Merge pull request #5248 from eclipse/jetty-10.0.x-5198-UpdateGzipHandler 
Issue #5198 - update gzip handler
 2020-09-21 10:41:16 +10:00
Joakim Erdfelt 6cf6b78a16
Issue #5246 - Adding DeflaterPool to GzipHandler.dump 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-09-17 10:27:15 -05:00
Joakim Erdfelt 0016463089
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-09-17 02:43:53 -05:00
Joakim Erdfelt 75677b8a61
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-09-17 02:43:18 -05:00
Joakim Erdfelt 290c98e9b1
Issue #5285 - Making Content-Encoding for form content consistent 
+ Fixing unit test expectations

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-09-16 15:48:03 -05:00
Joakim Erdfelt 844f134d21
Issue #5285 - Using Status code 415 Unsupported Media Type instead. 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-09-16 15:39:43 -05:00
gregw afe5044d8c Fixes #5281 
Added work module to create work directory
reviewed by janbartel
 2020-09-16 16:20:16 +02:00
Jan Bartel cfbede4f27 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-09-16 15:48:58 +02:00
Jan Bartel 16bc946ee8 Reduce startup logging. 2020-09-16 15:44:56 +02:00
Jan Bartel c1fc104381 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-09-16 12:10:10 +02:00
Jan Bartel b36430e5dc Reduce startup session logging 
Signed-off-by: Jan Bartel <janb@webtide.com>
 2020-09-16 12:09:34 +02:00
Jan Bartel 2122c33c68 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-09-16 11:28:51 +02:00
Jan Bartel bf39dc186a Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-09-16 11:28:13 +02:00
Jan Bartel bd589de512
Issue #5268 Change WARN to DEBUG for NullSessionCache eviction setter. (#5270) 
Signed-off-by: Jan Bartel <janb@webtide.com>
 2020-09-16 11:27:07 +02:00
Lachlan Roberts fbaabf5c8f update documentation for statistics collection 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-09-16 15:48:27 +10:00
Greg Wilkins 6305cbce72 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-09-14 18:10:22 +02:00
Greg Wilkins 780e1207c7
Issue #5254 List/Show modules (#5257) 
* Issue #5254 List/Show modules

 * simplified --list-modules output
 * added --show-module

Signed-off-by: Greg Wilkins <gregw@webtide.com>

* improve module descriptions

Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2020-09-14 18:07:16 +02:00
Joakim Erdfelt 59b85b6288
Issue #5247 - Updating Javadoc on ForwardedRequestCustomizer 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-09-11 11:58:04 -05:00
Joakim Erdfelt a2233ce233
Issue #5247 - Introduce ForwardedRequestCustomizer.Priority enum 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-09-11 11:17:31 -05:00
Joakim Erdfelt ac42cbd143
Issue #5247 - Improve testing of ForwardedRequestCustomizer 
+ Merge ProxyPass tests from CheckReverseProxyHeadersTest into
  ForwardedRequestCustomizerTest
+ Deleted CheckReverseProxyHeadersTest.java
+ Add more tests for ForcedHost configuration
+ Updated ForwardedRequestCustomizer to conform to expectations

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-09-11 11:11:09 -05:00
Lachlan Roberts 8d526af3a7 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-09-10 11:07:44 +10:00
Lachlan Roberts f2abf21df6 Move AsciiLowerCaseSet to jetty-util & changes from review 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-09-10 08:02:59 +10:00
Jan Bartel b72343b955
Issue #2609 Add gracePeriod to file session store. (#5243) 
Signed-off-by: Jan Bartel <janb@webtide.com>
 2020-09-09 23:42:53 +02:00
Joakim Erdfelt 4280303046
Issue #5247 - Document ForwardedRequestCustomizer authority search order 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-09-09 15:20:21 -05:00
Joakim Erdfelt f74cada660
Issue #5247 - Priority based ForwardedRequestCustomizer 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-09-09 14:56:33 -05:00
Joakim Erdfelt 9e9bd527e0
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-09-09 11:40:50 -05:00
Joakim Erdfelt fc0683ac17
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-09-09 11:40:00 -05:00
Joakim Erdfelt 165e59b3e2
Merge pull request #5226 from eclipse/jetty-9.4.x-5224-xforwarded-multiple-ports 
Issue #5224 X-Forwarded-Host support for port
 2020-09-09 11:37:33 -05:00
Joakim Erdfelt e278727e22
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-09-09 09:30:55 -05:00
Joakim Erdfelt 4215edd3b9
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-09-09 09:30:30 -05:00
Lachlan Roberts 2f23c5936e Issue #5198 - revert usage of deflater ByteBuffer API for GzipHandler 
The CRC32 checksum may need to convert the ByteBuffer to an array anyway so
we are better off not setting the deflater input with ByteBuffer directly.

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-09-09 14:03:42 +10:00
Lachlan Roberts 4e6827c539 Issue #5198 - fix usage of inflater/deflater ByteBuffer API 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-09-09 13:53:09 +10:00
Joakim Erdfelt 2896ed31d6
Issue #5224 - Updating ForwardedRequestCustomizerTest expectations 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-09-08 12:34:53 -05:00
Joakim Erdfelt 56b1d17d79
Issue #5233 - correcting NCSARequestLogTest expectation on unsupported version 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-09-08 05:59:41 -05:00
Lachlan Roberts 7a04b3eb19 Issue #5198 - use ByteBuffer API for inflater/deflaters for GzipHandler 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-09-08 17:10:36 +10:00
Lachlan Roberts 3bdd82eb5e Issue #5198 - GzipHandler should use InflaterPool as well as DeflaterPool 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-09-08 15:27:21 +10:00
Lachlan Roberts 17ec87f51c Issue #1761 - add extra .ini file configuration for gzip.mod 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-09-08 09:46:51 +10:00
Lachlan Roberts 7642be8fd0 Issue #4988 - make the MIME type comparison in GzipHandler case insensitive 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-09-07 17:29:13 +10:00
Joakim Erdfelt b2e0f69ea8
Issue #5233 - Bad/Unsupported HTTP version should return 505 not 400. 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-09-04 12:23:11 -05:00
Joakim Erdfelt dc1ca5ae98
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-09-02 12:59:41 -05:00
Joakim Erdfelt 9d839fe6e6
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-09-02 12:59:04 -05:00
Joakim Erdfelt 5fef14019a
Merge pull request #5215 from eclipse/jetty-9.4.x-5214-head-huge-static 
Issue #5214 - Servlet HEAD doesn't support content-length over Integer.MAX_VALUE
 2020-09-02 12:54:38 -05:00
Joakim Erdfelt e2134b13d7
Issue #5224 - X-Forwarded-Host support for port 
+ More test cases
+ Allowing X-Forwarded-Host to parse port (if present properly)

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-09-02 10:27:33 -05:00
Joakim Erdfelt e4ca153364
Issue #5224 - Test to replicate reported issue 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-09-02 09:34:16 -05:00
Jan Bartel 1833ab1ff6 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-09-02 12:17:30 +02:00
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
Greg Wilkins a6b7f73019 Merge branch 'jetty-9.4.x-5214-head-huge-static' of https://github.com/eclipse/jetty.project into jetty-9.4.x-5214-head-huge-static 2020-08-31 18:22:10 +02:00
Greg Wilkins 9e326fe520 + improved sentinels values for content-length 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2020-08-31 18:19:11 +02:00
Joakim Erdfelt 9128fc48e4
Cleanup dead code in ResourceService 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-08-31 11:16:22 -05:00
Joakim Erdfelt dcb06d3c35
Issue #5214 - Use known content_length when in HEAD mode 
+ Adding DefaultServlet.doHead() to avoid servlet wrapping
+ Making ResourceService HEAD aware

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-08-31 11:03:49 -05:00
Joakim Erdfelt eba360f662
Issue #5214 - Use known content_length when in bypass write 
+ In the case of HEAD, the servlet-api response is a wrapper
  of javax.servlet.http.HttpServlet$NoBodyResponse
  We know the content_length, use it.

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-08-31 09:43:04 -05:00
Jan Bartel 3df5a5d3d6 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-08-31 12:51:29 +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 19bc10f7c5 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-08-28 13:08:42 +10: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
Simone Bordet 06a2ebc48e Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'. 2020-08-27 00:02:55 +02: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
Joakim Erdfelt ccc863726b
Issue #5133 - Updates based on review 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-08-26 12:19:22 -05:00
Lachlan Roberts 2e0ba2b0f4 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-08-25 14:35:04 +10: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 e47d2fb32b Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-08-24 17:20:56 +02: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 311bcf42a5 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-08-21 10:38:30 +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
Joakim Erdfelt 6848403d34
Issue #5133 - Reworking WebAppContext.extraClasspath 
+ Reverting name ResourceFactory.newResource(String)
  to .getResource(String)
+ Reintroducing Resource.getResource(String)
+ ResourceHandler.getResource(String) cleaned up
  in light of Exception handling requirement
+ Resource.addPath(String) implementations can
  never return null now

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-08-12 13:06:09 -05:00
Joakim Erdfelt 0b0d7d3282
Issue #5133 - Reworking WebAppContext.extraClasspath 
+ Now parsed by WebAppContext into List<Resource>
+ Reintroduced Resource.fromList
+ Refactored ResourceFactory to never return null
  and always throw an exception if unable to
  get/create/resolve the Resource

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-08-12 12:50:02 -05:00
olivier lamy 26b2433b3f Merge branch 'jetty-10.0.x' into jetty-11.0.x 2020-08-12 09:50:32 +08: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 e26126264a Updating to version 11.0.0-SNAPSHOT 2020-08-11 16:48:06 +08:00
olivier lamy 6b2b429ba5 Updating to version 11.0.0.beta1 2020-08-11 16:48:06 +08: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 eac59d6124 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-08-10 10:36:24 +02: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 32a8571486 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-08-05 16:25:39 +02:00
Jan Bartel 437e2be411 Fix license header. 2020-08-05 16:25:01 +02:00
Jan Bartel de9e93a0f1 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-08-05 16:23:27 +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 3c0718eaaf Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'. 2020-08-04 18:05:24 +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 e8f76878e3 Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'. 2020-08-04 17:46:55 +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
Joakim Erdfelt e1427ea2ee
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 
# Conflicts:
#	jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java
 2020-07-31 11:04:45 -05: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
Lachlan Roberts 761e114890 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-07-28 13:36:42 +10: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 da9c8e4e55 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-07-23 12:18:23 +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 882b56c0dc Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-07-16 09:12:01 +10: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 Roberts 9c4a7e90ae Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-07-16 08:54:06 +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
Lachlan Roberts 640e1eea54 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-07-16 08:48:45 +10:00
Lachlan Roberts c09e4d6f86 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-07-16 08:46:29 +10:00
Lachlan 42ea202858
Merge pull request #5047 from eclipse/jetty-9.4.x-moduleCommentDoNotEdit 
the "DO NOT EDIT" comment in .mod files should start with '#'
 2020-07-16 08:43:00 +10:00
gregw db415a94cb Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-07-15 23:41:04 +02:00
gregw 7c44d0a01a Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-07-15 23:38:04 +02:00
Greg Wilkins 5c1dda3f7c
Issue #5029 Relative Redirection (#5038) 
* Issue #5029 Relative Redirection

Provide option to allow relative redirection

* Issue #5029 Relative Redirection

Fixed checkstyle

* rename from review
 2020-07-15 23:14:26 +02:00
Jan Bartel a991f77e0e Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-07-15 14:36:36 +02:00
Grzegorz Grzybek b08fd185c8
Issue #5025 - wrong welcome file handling with dispatcher.include() and non-default mapping (#5026) 
Signed-off-by: Grzegorz Grzybek <gr.grzybek@gmail.com>
 2020-07-15 14:29:33 +02:00
Lachlan Roberts de1b6745c5 the DO NOT EDIT comment in .mod files should start with '#' 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-07-15 16:47:22 +10:00
Lachlan Roberts 037097211c fix cast for HttpServletMapping 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-07-15 16:03:12 +10:00
Lachlan Roberts 2541f1f648 add javadoc for KeyStoreScanner class 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-07-15 11:20:57 +10:00
Lachlan Roberts a83844df32 changes from review 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-07-14 16:10:07 +10:00
Lachlan Roberts 62ee077b79 move code of ssl-reload module to jetty-util, move module files to jetty-server 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-07-13 23:11:09 +10:00
Lachlan Roberts e92d35bd2c fix checkstyle error from extra newline 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-07-13 15:56:46 +10:00
Lachlan Roberts 6325d4b55c Issue #4985 - fix NPE related to use of Attributes.Wrapper getAttributeNameSet() 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-07-13 14:17:37 +10:00
olivier lamy eefe3d202b revert fail release 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2020-07-10 15:04:22 +10:00
olivier lamy 9619a5a743 Updating to version 10.0.0.beta1 2020-07-10 14:23:28 +10:00
olivier lamy 6ff39cf848 Updating to version 11.0.0-SNAPSHOT 2020-07-10 06:25:08 +10:00
olivier lamy 4c250b0f93 Updating to version 11.0.0.beta1 2020-07-10 06:25:07 +10:00
olivier lamy 9fa6a5794c Updating to version 11.0.0-SNAPSHOT 2020-07-09 16:24:52 +10:00
olivier lamy 5353ec98e0 Updating to version 11.0.0.beta0 2020-07-09 14:32:48 +10:00
olivier lamy aaeffb719e Updating to version 10.0.0-SNAPSHOT 2020-07-09 12:25:34 +10:00
olivier lamy 23c99ffdbe Updating to version 10.0.0.beta1 2020-07-09 11:20:55 +10:00
Jan Bartel 872b2741be Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-07-07 14:32:57 +02:00
Jan Bartel 7ca67f9948 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-07-07 14:13:11 +02:00
Lachlan Roberts fb4f8ece54 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-07-07 18:19:38 +10:00
Lachlan effcccd27a
Merge pull request #4980 from eclipse/jetty-9.4.x-threadPoolDocumentation 
fix documentation on where to configure ThreadPool
 2020-07-07 18:18:48 +10:00
Simone Bordet ba6a6ea67d Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 2020-07-06 23:10:19 +02:00
Simone Bordet f2c6b67827
Fixes #4971 - Simplify Connection.upgradeFrom()/upgradeTo(). (#5008) 
Fixes #4971 - Simplify Connection.upgradeFrom()/upgradeTo().

Now the upgrade-from connection produces a "floating" buffer 
(not belonging to a pool), so that it can release the original buffer.

The upgrade-to connection is free to copy or store this "floating" buffer.

Strengthened ByteBufferPool behavior when releasing non-pooled
ByteBuffers: the buffer is now discarded.

Updated javadocs and all implementations.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2020-07-06 22:45:03 +02:00
Jan Bartel 4ab5a6044f Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-07-06 10:43:01 +02:00
Lachlan Roberts 085a6112c5 Issue #4985 - revert changes from 9.4 merge to Include, Forward and Async Attributes 
The proper ServletPathMapping is not set on the baseRequest when these are constructed
so we can't save fields from this in the constructor. The ServletPathMapping is
later set in the ServletHandler.

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-07-06 16:11:56 +10:00
Lachlan Roberts 5e1dd78379 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-07-06 12:42:20 +10:00
Lachlan Roberts 345440139b Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-07-06 12:18:58 +10:00
Lachlan 9a56301de1
Merge pull request #5004 from eclipse/jetty-9.4.x-4985-AttributeNameSet 
Issue #4985 - fix NPE related to use of Attributes.Wrapper getAttributeNameSet()
 2020-07-06 11:34:27 +10:00
Simone Bordet 7d8e56bd10 Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 2020-07-03 16:46:23 +02:00
Simone Bordet ae43b70a9f
Jetty 9.4.x 4967 buffer corruption for http2 failures (#5001) 
Fixes #4967 - Possible buffer corruption in HTTP/2 session failures

Partially reverted the changes introduced in #4855, because they
were working only when sends were synchronous.

Introduced ByteBufferPool.remove(ByteBuffer) to fix the issue.
Now when a concurrent failure happens while frames are being
generated or sent, the buffer is discarded instead of being
recycled, therefore resolving the buffer corruption.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2020-07-03 16:35:33 +02:00
Lachlan Roberts f35d6cfd80 Issue #4985 - remove TODO in Dispatcher 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-07-02 16:02:24 +10:00
Lachlan Roberts 50654b0dde Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-06-30 15:47:49 +10:00
Lachlan Roberts 9126b282b1 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-9.4.x-4985-AttributeNameSet 2020-06-30 11:22:41 +10:00
Joakim Erdfelt e1c8a0e8b8
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-06-25 12:52:29 -05:00
Joakim Erdfelt 3adec35cf5
Fixing CustomImportOrder checkstyle violations 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-06-25 09:25:05 -05:00
Lachlan Roberts 693312a577 Issue #4985 - ensure every attribute in getAttributeNameSet has a non null value 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-06-25 23:15:12 +10:00
Lachlan Roberts 5ce5737395 fix information on ThreadPool configuration 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-06-18 17:45:32 +10:00
olivier lamy b95abd6f4e Merge branch 'jetty-10.0.x' into jetty-11.0.x 2020-06-13 20:46:06 +10:00
Joakim Erdfelt 6795f3915f
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-06-12 12:04:50 -05:00
Joakim Erdfelt 6df6fa33b8 Updating to version 9.4.31-SNAPSHOT 2020-06-11 08:24:34 -05:00
Joakim Erdfelt 271836e4c1 Updating to version 9.4.30.v20200611 2020-06-11 07:21:18 -05:00
Jan Bartel cb09abe873
Issue #4920 Restore ability to invalidate sessions on shutdown (#4933) 
Signed-off-by: Jan Bartel <janb@webtide.com>
 2020-06-10 18:40:19 +02:00
Lachlan Roberts 1881bb72e8 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-06-10 08:48:40 +10:00
Simone Bordet dd6cd4b881 Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 2020-06-09 16:11:53 +02:00
Simone Bordet 56bda1b3ae
Jetty 9.4.x 4855 h2spec failures (#4946) 
* Fixes #4855 - Occasional h2spec failures on CI

In case of bad usage of the HTTP/2 API, we don't want to close()
the stream but just fail the callback, because the stream
may be performing actions triggered by a legit API usage.

In case of a call to `AsyncListener.onError()`, applications may decide to call
AsyncContext.complete() and that would be a correct usage of the Servlet API.
This case was not well handled and was wrongly producing a WARN log with an
`IllegalStateException`.

Completely rewritten `HttpTransportOverHTTP2.TransportCallback`.
The rewrite handles correctly asynchronous failures that now are executed
sequentially (and not concurrently) with writes.
If a write is in progress, the failure will just change the state and at the
end of the write a check on the state will determine what actions to take.

A session failure is now handled in HTTP2Session by first failing all the
streams - which notifies the Stream.Listeners - and then failing the session
- which notifies the Session.Listener.
The stream failures are executed concurrently by dispatching each one to a
different thread; this means that the stream failure callbacks are executed
concurrently (likely sending RST_STREAM frames).
The session failure callback is completed only when all the stream failure
callbacks have completed, to ensure that a GOAWAY frame is processed after
all the RST_STREAM frames.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2020-06-09 13:15:05 +02:00
olivier lamy 804c525083 Merge branch 'jetty-10.0.x' into jetty-11.0.x 2020-06-07 09:32:28 +10:00
olivier lamy 2413f551f1 Merge branch 'jetty-9.4.x' into jetty-10.0.x 2020-06-07 09:30:54 +10:00
Simone Bordet 029470c5dc Fixes #4939 - acceptorQueueSize [sic] 
acceptorQueueSize -> acceptQueueSize.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2020-06-04 18:31:40 +02:00
Lachlan Roberts 551a9b4839 fix imports of LargeHeaderTest 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-06-04 09:43:26 +10:00
Lachlan Roberts 73f908a6cb Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-06-04 09:30:24 +10:00
Lachlan Roberts 86ea115e1f Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-06-04 09:27:43 +10:00
Lachlan Roberts 38f56f5973 make some test methods public to fix build 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-06-04 09:26:35 +10:00
Joakim Erdfelt dcf74ebab0
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-06-03 16:14:59 -05:00
Joakim Erdfelt 426795660f
Cleaning up double-merge final issues. 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-06-03 16:14:32 -05:00
Joakim Erdfelt 022ae38a8b
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-06-03 16:12:35 -05:00
Joakim Erdfelt 90c1fc668c
Merge branch 'jetty-10.0.x' of github.com:eclipse/jetty.project into jetty-10.0.x 2020-06-03 16:10:51 -05:00
Joakim Erdfelt 0cce039e7c
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-06-03 16:10:41 -05:00
Greg Wilkins b9933242d7 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-06-03 23:02:39 +02:00
Greg Wilkins 0f48708922 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2020-06-03 23:01:52 +02:00
Greg Wilkins ff8ae56fa9
Issue #4936 response buffer corruption (#4937) 
* Issue #4936 - Adding LargeHeaderTest to replicate issue

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

* Issue #4936 - Updating LargeHeaderTest to use ServerConnector

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

* Issue #4936 - Fail LargeHeaderTest if client detects issues.

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

* Issue #4936 large response header buffer corruption

If the response buffer is too large, the header buffer was released
but not nulled, then an exception thrown, which again released the
not nulled buffer.  The buffer thus ends up in the buffer pool twice!

Signed-off-by: Greg Wilkins <gregw@webtide.com>

* Issue #4936 large response header buffer corruption

removed old comment

Signed-off-by: Greg Wilkins <gregw@webtide.com>

Co-authored-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-06-03 22:54:12 +02:00
Joakim Erdfelt 2e9caba325
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-06-01 09:43:34 -05:00
Joakim Erdfelt 41440b6c2c
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-06-01 09:40:43 -05:00
Jan Bartel f4fe391c4d Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-06-01 14:52:52 +02:00
Jan Bartel 42155e889b Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-06-01 14:47:07 +02:00
Joakim Erdfelt f9b75ff1a3
Issue #4923 - Applying changes requested in PR 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-06-01 07:15:07 -05:00