95ecb4a3e8
Issue #4598 - Changes from review
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-02-29 16:14:20 +11:00
ccd6c845e5
Merge remote-tracking branch 'origin/jetty-9.4.x-4598-InetAccessHandler' into jetty-10.0.x-4598-InetAccessHandler
2020-02-27 19:34:16 +11:00
2edc4920fd
Issue #4598 - fix InetAccessHandlerTest expectations to fit new behavior
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-02-27 18:29:29 +11:00
3c551e960c
Issue #4598 - rework InetAccessHandler to use only one IncludeExcludeSet
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-02-27 15:41:35 +11:00
99a541f051
Fixing checkstyle violations
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-02-26 13:16:32 -06:00
2faec44dfb
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2020-02-26 16:40:35 +01:00
65a22e5e80
Fix NPE in HouseKeeper.stopScavenging ( #4604 )
...
* Fix NPE in HouseKeeper.stopScavenging
Signed-off-by: Hirotaka Ikoma <hikoma@gmail.com>
2020-02-26 16:38:50 +01:00
277ce5f3a5
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2020-02-26 14:36:22 +01:00
9bb6840658
Fixes #4577 IPAccessHandler in context ( #4580 )
...
* Fixes #4577 IPAccessHandler in context
Fixes and tests #4577 IPAccessHandler in context by using target instead of pathInfo for path matching.
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* Tests #4577 IPAccessHandler target
Updates from review.
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* Issue #4577 IpAccessHandler NPE
Match on full URI path rather than target.
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2020-02-25 08:46:02 +01:00
bb7e48043d
Issue #4598 - Add URI mapping to InetAccessHandler
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-02-25 14:58:48 +11:00
03359ec089
Tests #4594 ContextListener removed ( #4595 )
...
Remove ContextListeners from the destroy list when removed.
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2020-02-22 10:43:36 +01:00
b0975aaba0
Fixes #4540 - ProxyConnectionFactory should not ignore TLVs.
...
Generified the API to expose TLVs, so that they are all exposed,
not only the custom TLV types in the 0xE0-0xEF range.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-02-21 09:37:12 +01:00
411624c419
Merge branch 'issue_4540' of https://github.com/m0mus/jetty.project into m0mus-issue_4540
2020-02-21 08:45:21 +01:00
0fc12b0681
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
2020-02-20 11:23:49 +01:00
2958cb1d62
Merge pull request #4544 from eclipse/jetty-9.4.x-4541-OptimalLargeResponseHeader
...
Issue #4541 Large response header
2020-02-20 11:17:39 +01:00
b46b25b450
release buffer on overflow
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2020-02-19 22:38:58 +01:00
ab94409574
ProxyConnectionFactory should not ignore TLVs
...
Signed-off-by: Dmitry Kornilov <dmitry.kornilov@oracle.com>
2020-02-19 15:07:49 +01:00
f6195b39ea
Issue #4581 - fix checkstyle errors
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-02-18 13:52:19 +11:00
55748f12c2
Issue #4581 - remove unnecessary javadoc on Override methods
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-02-18 11:33:56 +11:00
3129202e8a
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
2020-02-17 17:40:06 +01:00
f2c977d619
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
2020-02-17 00:54:22 +01:00
ed7f337856
Issue #4518 - Add a mechanism that allows running multiple protocols on the same port.
...
Made test methods public, so that they will work fine in JDK 11 and JPMS.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-02-17 00:53:44 +01:00
612a70b5be
Issue #4518 - Add a mechanism that allows running multiple protocols on the same port.
...
Fixed tests after merge.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-02-16 22:17:13 +01:00
b73892ccfb
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
2020-02-16 19:41:49 +01:00
9f7a82b128
Merge pull request #4519 from lorban/composable-conn-factories
...
Fixes #4518 - Add a mechanism that allows running multiple protocols on the same port.
2020-02-16 19:25:04 +01:00
6f211d7a34
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
2020-02-16 17:29:10 +01:00
652428ad70
Tests #4573 X-Forwarded ordering
...
Added tests for header ordering
fixed cut-and-paste error of _for to _host
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2020-02-16 11:04:34 +01:00
e363997432
Issue #3924 - Remove Resource.writeTo()
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-02-07 12:21:23 -06:00
f50c2654b9
Fixes #4541 Large Headers
...
Added a HEADER_OVERFLOW result as per review
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2020-02-06 21:17:58 +01:00
8197c12325
Code cleanup.
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-02-06 16:32:19 +01:00
386d9348ca
Use contants for CR and LF fields index
...
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2020-02-06 10:06:33 +01:00
1b59e42294
Issue #4541 Large response header
...
Fix #4541 by initially allocated a header buffer of `min(_config.getResponseHeaderSize(), _config.getOutputBufferSize())`
Only allocate a buffer of `getResponseHeaderSize` if an overflow results.
This should have no effect on the majority of responses where `getOutputBufferSize` is greater than `getResponseHeaderSize` other than the cost of a min operation.
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2020-02-05 10:29:41 +01:00
5df1ad9b66
change the format of detector's generated protocol name
...
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2020-02-04 12:42:35 +01:00
58b1db610c
detectAndUpgrade() shortcut on empty buffer
...
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2020-02-04 10:49:27 +01:00
37edc016d2
improve debug logs
...
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2020-02-04 09:21:41 +01:00
75b4719592
Implement detector connection factory with protocol detection mechanism
...
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2020-02-03 16:56:53 +01:00
fe8b11dd48
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2020-02-01 11:27:09 +01:00
ecd0fe97f7
Issue #4520 Reinstate throw of UnreadableSessionDataException ( #4528 )
...
* Issue #4520 Reinstate throw of UnreadableSessionDataException
Signed-off-by: Jan Bartel <janb@webtide.com>
2020-02-01 11:13:58 +01:00
b6f2fd2432
Issue #4529 Servlet in error page ( #4530 )
...
Added option for #4529 to control showing the servlet in an error page.
Error configuration really needs a module, but will add in 10 with a refactor.
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2020-01-31 19:53:05 +01:00
f88eb73a91
Issue #4533 Hard close from Dispatcher ( #4534 )
...
* Issue #4533 Hard close from Dispatcher
Signed-off-by: Greg Wilkins <gregw@webtide.com>
#4533 Do hard close from Dispatcher so response wrappers may intercept close.
* Issue #4533 Hard close from Dispatcher
Signed-off-by: Greg Wilkins <gregw@webtide.com>
#4533 improve test after review
* Issue #4533 Hard close from Dispatcher
Some renaming of methods to make it clear that softClose should only be used as part of sendError handling. If softClose is used by other components, then sendError can be prevented from setting the error status.
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2020-01-31 11:55:14 +01:00
ce6e146ac1
Merge pull request #4489 from eclipse/jetty-10.0.x-2643-pkcs12_keystores
...
Fixes #2643 - Switch SslContextFactory.keystoreType from JKS to PKCS12.
2020-01-30 19:28:49 +01:00
4b9fec0cf3
Updates after review.
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-01-30 17:53:41 +01:00
5aaec6e23f
Issue #4321 Refactored Graceful shutdown ( #4482 )
...
* Issue #4321 Refactored Graceful shutdown
removed stopTimeout from all abstractLifeCycles. It is on Graceful.LifeCycle, which is only implemented by components that can start a graceful shutdown (eg Server, ContextHandler and QueuedThreadPool)
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* Issue #4321 Refactored Graceful shutdown
cleanup after review
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* Issue #4321 Refactored Graceful shutdown
reinstate other stop tests (more work to do).
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* Issue #4321 Refactored Graceful shutdown
Fixes for stop test by improving LocalConnector shutdown handling
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* Issue #4321 Refactored Graceful shutdown
Removed broken test on LocalConnector that is already tested in GracefulStopTest
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* Issue #4321 Refactored Graceful shutdown
Fixed all stop tests
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* Issue #4321 Refactored Graceful shutdown
fixed checkstyle
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* Issue #4321 Refactored Graceful shutdown
No stopTimeout JMX attribute
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* Issue #4321 Refactored Graceful shutdown
Dump stopTimeout
test with default stopTimeout
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* Issue #4321 Refactored Graceful shutdown
USe sendError for 503
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* Issue #4321 Refactored Graceful shutdown
minor cleanups
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* Issue #4321 Refactored Graceful shutdown
Simplifications after review
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* Issue #4321 Refactored Graceful shutdown
after review
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* Issue #4321 Refactored Graceful shutdown
after review
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2020-01-30 17:05:03 +01:00
45771dbd26
Fix bad merge
2020-01-29 12:08:13 +01:00
79a337567f
Issue #4247 use context default for samesite cookie attribute ( #4512 )
...
* Issue #4247 use context default for samesite cookie attribute
Signed-off-by: Jan Bartel <janb@webtide.com>
2020-01-29 11:54:43 +01:00
842fa6aa53
Issue #4504 Forwarded Host and Server ( #4511 )
...
X-Forwarded-Host has precedence of X-Forwarded-Server and outcome is not order dependent.
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2020-01-29 11:54:43 +01:00
9850c29839
Issue #4247 use context default for samesite cookie attribute ( #4512 )
...
* Issue #4247 use context default for samesite cookie attribute
Signed-off-by: Jan Bartel <janb@webtide.com>
2020-01-29 11:05:35 +01:00
56754f4a29
Issue #4504 Forwarded Host and Server ( #4511 )
...
X-Forwarded-Host has precedence of X-Forwarded-Server and outcome is not order dependent.
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2020-01-24 11:20:52 +01:00
681d0bee3c
Merge pull request #4498 from eclipse/jetty-10.0.x-4383-MultiPartNPE
...
Issue #4383 - synchronize multiparts for cleanup from different thread
2020-01-24 11:42:59 +11:00
f76687ad68
Issue 4383 - changes from review
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-01-24 11:06:37 +11:00
Lachlan Roberts
Joakim Erdfelt
Jan Bartel
Hirotaka Ikoma
Greg Wilkins
Simone Bordet
Dmitry Kornilov
Ludovic Orban