Commit Graph

2994 Commits

Author SHA1 Message Date
gregw a15af55a56 Merge remote-tracking branch 'origin/jetty-11.0.x' into jetty-12.0.x
Signed-off-by: gregw <gregw@webtide.com>
2023-02-15 15:31:33 +11:00
gregw 7cfc239990 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x
Signed-off-by: gregw <gregw@webtide.com>
2023-02-15 15:27:17 +11:00
gregw 7a7d69a69f Happy no year
Remove modification date from copyright notice and instead just have the
project inception year.

Signed-off-by: gregw <gregw@webtide.com>
2023-02-15 15:22:32 +11:00
gregw b7da4bdb2d Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x
Signed-off-by: gregw <gregw@webtide.com>
2023-02-14 08:03:46 +11:00
Greg Wilkins 5f25f5b389
Fix/jetty 10.0.x/uri host mismatch alt (#9343)
* Introduce HttpCompliance.MISMATCHED_AUTHORITY

* Update HttpCompliance.RFC2616

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

* Update NcsaRequestLogTest.testAbsolute

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

* Use RFC2616 mode in RFC2616 tests

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

* Alternative fix for mismatched host headers

This PR fixes the miss-matched host header issue in the Request.setMetaData method. This requires no change to the HttpParser.
A more comprehensive fix can be considered for jetty-12.

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

* Alternative fix for mismatched host headers

Updates from review

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

---------

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Signed-off-by: gregw <gregw@webtide.com>
Co-authored-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2023-02-14 07:43:19 +11:00
Olivier Lamy d94a620798
Merge branch 'jetty-10.0.x' into jetty-11.0.x 2023-02-09 18:12:29 +10:00
Olivier Lamy bd4cf3c835
Jetty 10 Upgrade to Hazelcast 5 and totally disable auto join multicast etc.. (fix build on CI) (#9331)
* upgrade to hazelcast 5.2.1

Signed-off-by: Olivier Lamy <olamy@apache.org
2023-02-09 18:10:22 +10:00
Jan Bartel 342bd40e0b
Jetty 12.0.x 9301 fix ee10 jstl jpms (#9321)
* Issue #9301 Fix dependencies for ee10-glassfish-jstl module

* Fix jstl,el,jsp to work in jpms and osgi.
2023-02-09 09:35:54 +11:00
Simone Bordet 83d6e1756e
Merged branch 'jetty-11.0.x' into 'jetty-12.0.x'.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2023-02-08 10:37:31 +01:00
Simone Bordet ea3429e1b9
Fixed imports.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2023-02-08 10:34:44 +01:00
Simone Bordet a7bd164f8d
Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2023-02-08 10:29:12 +01:00
Ludovic Orban b87f9385c8
Jetty 12: Cleanup `StatisticsHandler` (#9291)
#9145 cleanup statistics

Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2023-02-07 17:43:46 +01:00
Greg Wilkins 60a08f5349
Rename Handler Nested & Collection (#9305)
There is now a Handler interface hierarchy:
 + Container is a Handler that has 1 or more contained Handlers.
 + Wrapper is a Container with only 1 handler and a setHandler method.
 + Collection is a Container with n handlers and a addHandler method

class are now:
 + Abstract implements Handler
 + AbstractContainer extends Abstract implements Container
 + BaseWrapper extends AbstractContainer implements Wrapper
 + Sequence extends AbstractContainer implements Collection

 Lots of other associated cleanups
2023-02-06 12:15:35 +11:00
Joakim Erdfelt 46a316d4df
Issue #9309 - Introducing test for requestlog format with spaces
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2023-02-03 08:45:35 -06:00
Jan Bartel c9391333ce Disable jpms with glassfish jstl test until fixed. 2023-02-02 23:00:06 +11:00
Joakim Erdfelt 490f86e9a6
Merge remote-tracking branch 'origin/jetty-11.0.x' into jetty-12.0.x 2023-02-01 19:33:43 -06:00
Simone Bordet 106382d810
Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2023-02-01 22:49:35 +01:00
Simone Bordet 1283b85b60
More JPMS tests for JSTL.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2023-02-01 22:48:48 +01:00
Joakim Erdfelt 1b1e18bfa1
Merge pull request #9236 from eclipse/fix/jetty-12.0.x/ee10-remove-javax.activation
Jetty 12 - Removing unused / old deps from ee10
2023-02-01 13:10:12 -06:00
Jan Bartel 7e67e33d3c
Jetty 12.0.x reenable jetty ee9 tests (#9224)
* Restore tests in ee9
2023-02-01 15:04:35 +11:00
Joakim Erdfelt 148d276967
More narrowly focused DEBUG logging for JavadocTransparentProxy flaky test 2023-01-31 16:48:57 -06:00
Joakim Erdfelt 4c467e328d
Revert "More DEBUG on CI build/test"
This reverts commit b29d589ebd.
2023-01-31 16:34:10 -06:00
Joakim Erdfelt b29d589ebd
More DEBUG on CI build/test 2023-01-31 15:09:13 -06:00
Joakim Erdfelt dfcd21438a
Adding debug to failing test to see what is causing it to fail. 2023-01-31 12:53:12 -06:00
Simone Bordet af6ecfebfe
Fixes #9210 - Jetty 12 - Review Pool and Pool.Entry (#9211)
* Fixes #9210 - Jetty 12 - Review Pool and Pool.Entry

* Extracted interface Pool, renamed implementation to ConcurrentPool.
* Extracted Pool.Entry as interface.
* Moved StrategyType to ConcurrentPool.
* Made Pool.Factory.wrap() work in order to wrap Pool instances.
* Removed constructors that were explicitly taking Pool parameters, replaced by a single Pool.Factory parameter.
* Added javadocs.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2023-01-30 10:11:29 +01:00
Simone Bordet cd732a175c
Review and normalized all Maven module <name> for consistency.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2023-01-27 19:09:30 +01:00
Ludovic Orban 12deee847d #9145 re-enable DynamicListenerTests
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2023-01-27 17:44:09 +01:00
Ludovic Orban 2424c86b34 #9145 fix websocket modules
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2023-01-27 17:44:09 +01:00
Ludovic Orban 08a829fdd2 #9145 fix ee8 openid module
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2023-01-27 17:44:09 +01:00
Simone Bordet ded18f523d
Fixes #9166 - Jetty 12: review/remove ByteBufferPool (#9195)
* Fixes #9166 - Jetty 12: review/remove ByteBufferPool

* Replaced usages of ByteBufferPool with RetainableByteBufferPool.
* Removed ByteBufferPool and related classes.
* Renamed oej.http2.frames.DataFrame.getData() -> getByteBuffer() for consistency.
* Removed Accumulator.acquire(), and updated code to use RetainableByteBufferPool.acquire() instead.
* Fixed HttpOutput callbacks to correctly call super.onCompleteSuccess() and super.onCompleteFailure().

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2023-01-27 13:40:49 +01:00
Olivier Lamy 779f71ca20
Merge branch 'jetty-10.0.x' into jetty-11.0.x 2023-01-12 10:25:48 +08:00
Olivier Lamy 7c7a7f3c39
re-enable h3 tests (#8773)
* run h3 tests

Signed-off-by: Olivier Lamy <olamy@apache.org>
2023-01-12 09:22:10 +08:00
Simone Bordet a1c5cefd0d
Reorganization of jetty-client classes. (#9127)
* Reorganization of jetty-client classes.

* Moved oej.client.api to oej.client
* Moved oej.client.util to oej.client
* Moved implementation classes to oej.client.internal
* Moved transports to oej.client.transport
* Moved transport implementation classes to oej.client.transport.internal
* Moved TunnelRequest to oej.client.internal.

* Moved FastCGI transport classes to o.e.j.fcgi.transport
* Moved FastCGI transport implementation classes to o.e.j.fcgi.transport.internal

* Updated WebSocket core client to use only exported, non-internal, oej.client classes.

* Expanded oej.client.Destination APIs:
  - added: getOrigin(), isSecure(), getProxy(), getConnectionPool(), getHttpClient(), send(..).
  - removed: getScheme(), getHost(), getPort() because they don't uniquely identify a Destination anymore (Origin does)
* Moved destination sweeper functionality from HttpDestination to HttpClient.
  HttpDestination does not implement close() anymore, now relies on LifeCycle.stop()
* Moved HttpReceiver.storeCookie() logic to HttpClient.putCookie() to avoid exposing CookieManager.
* Moved HttpClient.getAcceptEncodingField() to ContentDecoder.Factories

* Avoid public/protected Logger instances.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2023-01-11 10:05:43 +01:00
Olivier Lamy 56af845cf1
Merge branch 'jetty-11.0.x' into jetty-12.0.x 2022-12-26 09:31:36 +10:00
Olivier Lamy 0cfc5bd353
Merge branch 'jetty-10.0.x' into jetty-11.0.x 2022-12-26 09:30:03 +10:00
Eddú Meléndez Gonzales d5a3d8e1f4
Improve DatastoreEmulatorContainer usage (#9081)
* Improve DatastoreEmulatorContainer usage

Update to testcontainers 1.17.6 and take advantage of
`DatastoreEmulatorContainer#withFlags()`
2022-12-26 09:27:27 +10:00
Joakim Erdfelt 260245c012
Updating to version 11.0.14-SNAPSHOT 2022-12-07 15:04:55 -06:00
Joakim Erdfelt a04bd1ccf8
Updating to version 11.0.13 2022-12-07 14:46:29 -06:00
Joakim Erdfelt 54c4c03244
Updating to version 10.0.14-SNAPSHOT 2022-12-07 14:33:17 -06:00
Joakim Erdfelt 1c2636ea05
Updating to version 10.0.13 2022-12-07 14:12:50 -06:00
Joakim Erdfelt 754bbddf8a
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2022-12-07 09:54:18 -06:00
Joakim Erdfelt 7e1de8b1e2
Issue #8973 - Rework KeyStoreScanner handling for symlink related changes (#9014)
* Issue #8973 - Rework KeyStoreScanner handling for symlink related changes

+ Removed changes from #8786 and #8787
+ More test cases
+ revert jetty.sslContext.reload.followLinks boolean
+ Scanner should follow its own linkOptions setting
+ remove bad documentation in module-ssl-reload.adoc

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
Co-authored-by: Lachlan Roberts <lachlan@webtide.com>
2022-12-07 09:24:19 -06:00
Joakim Erdfelt fab644151a
Tag flaky test - DistributionTests.testVirtualThreadPool 2022-12-06 09:32:15 -06:00
Simone Bordet f8c4783802
Fixes #8975 - Rename getBaseResponse() to getServletContextResponse(). (#8976)
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2022-12-06 15:08:58 +01:00
Greg Wilkins e682f73d54
Cleanup of TypeUtil and ContextHandler stop/start (#8998)
* Extracted some non controversial cleanups from another mega PR:

 + TypeUtil class shortname used more often and includes trailing digits
 + Fixed direct stopping/starting of a nested ContextHandler
 + Fixed null path handling in nested context
 + more tests for all of the above

* Extracted some non controversial cleanups from another mega PR:

Fixed nested doStart and doStop

* Extracted some non controversial cleanups from another mega PR:

Fixed DistributionTests
2022-12-06 15:43:31 +11:00
Joakim Erdfelt 21e8fc185e
Merge remote-tracking branch 'origin/jetty-11.0.x' into jetty-12.0.x 2022-12-01 11:07:38 -06:00
Olivier Lamy 838728201f
force inject javax.inject
Signed-off-by: Olivier Lamy <olamy@apache.org>
2022-11-30 13:21:01 +10:00
Olivier Lamy b50e35a63c
force back to javax.inject as needed by new version of maven-resolver
Signed-off-by: Olivier Lamy <olamy@apache.org>
2022-11-30 12:08:12 +10:00
Olivier Lamy b961ba77cc
Merge branch 'jetty-10.0.x' into jetty-11.0.x 2022-11-29 21:36:10 +10:00
Olivier Lamy c1e570d40e
java inject looks to be needed now
Signed-off-by: Olivier Lamy <olamy@apache.org>
2022-11-29 19:03:01 +10:00