Commit Graph

27007 Commits

Author SHA1 Message Date
Simone Bordet bc0b4149ff
Clarified HttpReceiver.responseFailure().
Added javadocs to relevant methods in HttpChannel.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2022-12-07 23:50:39 +01:00
Simone Bordet 119996c16f
Merged branch 'jetty-11.0.x' into 'jetty-12.0.x'.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2022-12-07 19:28:05 +01:00
Simone Bordet 0e99ae0c8a
Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2022-12-07 19:16:18 +01:00
Joakim Erdfelt 355eebecc4 Update tycho-p2 from 2.7.5 to 3.0.1
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2022-12-07 19:15:39 +01: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
Simone Bordet 411a6e71a8
Fixes after merge.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2022-12-07 16:27:31 +01: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
Simone Bordet ee685b23fa
Merged branch 'jetty-11.0.x' into 'jetty-12.0.x'.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2022-12-07 16:23:11 +01:00
Simone Bordet 6f398cecb2
Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2022-12-07 16:21:09 +01:00
Simone Bordet 2538a91201
Fixes flaky FCGI test HttpClientTest.testPOSTWithContentTracksProgress().
The content must be consumed by the server, otherwise:
* the server Handler exits
* the implementation tries to consume the content on its way to complete
* the request content cannot be consumed, so the connection is closed
* the server closing the connection causes an EOFException on the client

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2022-12-07 16:20:22 +01:00
Joakim Erdfelt 6b8e23e0dc
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2022-12-07 08:17:53 -06:00
Joakim Erdfelt 3d3c95462a
Fixing OSGi bundle + tycho-p2 build failures (#9017)
* Fixing errors/warnings from maven-bundle-plugin
* avoid issues with eclipse ranges
* Fixing version of p2.core
* revert bach tycho eclipse plugin to last working version 2.7.5

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Signed-off-by: Olivier Lamy <olamy@apache.org>
Co-authored-by: Olivier Lamy <olamy@apache.org>
2022-12-07 07:51:59 -06:00
Ludovic Orban b244c9f320 fix testFromEmptyByteBufferWithoutReleaser
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2022-12-06 22:52:12 +01:00
Joakim Erdfelt 2d9c735d63
Merge remote-tracking branch 'origin/jetty-11.0.x' into jetty-12.0.x 2022-12-06 14:38:53 -06:00
Joakim Erdfelt d6b88e2bc4
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2022-12-06 14:32:36 -06:00
Ludovic Orban 017b6c1391 fcgi and ContentTransformer bug fixes
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2022-12-06 20:04:30 +01:00
Ludovic Orban 42186bff18 #8993: Disallow creating new chunks with an empty ByteBuffer to make Chunk.isTerminal() contract stricter
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2022-12-06 19:48:17 +01:00
Joakim Erdfelt 45d0b68850
Jetty 12 - Fix `GzipHandler` handling of chunked and `Content-Length` (#8927)
* Jetty 12 - Enabling ContentLengthTest.testGzippedContentLengthAddedByServer
* Restoring HttpReceiver
* Fixing RequestTest
* Issue #8927 - Cleanup of GzipResponse with eye on RFC-1952 behaviors
* Issue #8927 - Set FINISHED state
* Fixing HEAD from HTTP/2 and HTTP/3
* Adding requested javadoc
2022-12-06 12:32:01 -06:00
Joakim Erdfelt 95fd8adeb8
Jetty 12 - Issue #8999 - Remove FileID.isArchive() from ResourceFactory (#9002)
* Issue #8999 - Remove FileID.isArchive() from ResourceFactory
* Remove FileID.isArchive() from URIUtil.toJarFileUri
2022-12-06 12:31:12 -06:00
Joakim Erdfelt e923123a32
Merge pull request #9011 from eclipse/fix/jetty-10-9009-flaky-StreamCloseTest
Fixes #9009 - Flaky test StreamCloseTest.testRequestDataClosedRespons…
2022-12-06 10:29:10 -06:00
Joakim Erdfelt 5b20fccf6f
Merge pull request #9010 from eclipse/fix/jetty-10-websocket-inputstream-read
Fixes #9006 - WebSocket MessageInputStream.read() returns signed byte
2022-12-06 10:02:21 -06:00
Joakim Erdfelt fab644151a
Tag flaky test - DistributionTests.testVirtualThreadPool 2022-12-06 09:32:15 -06:00
Joakim Erdfelt 486b51ec18
Merge pull request #9008 from eclipse/fix/jetty-10-9005-flaky-ConnectionPoolTest
Fixes #9005 - Flaky test ConnectionPoolTest.testConcurrentRequestsAllBlockedOnServer
2022-12-06 09:30:20 -06:00
Simone Bordet 7c757689a2
Fixes #9009 - Flaky test StreamCloseTest.testRequestDataClosedResponseDataClosedClosesStream.
Regression introduced by #8678.
Now using awaitility to wait for the stream count to go to zero.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2022-12-06 15:48:36 +01:00
Simone Bordet a546027db8
Fixes #9006 - WebSocket MessageInputStream.read() returns signed byte
Now properly coverting to `int`.
Added test.

Also fixed MultiPartInputStreamParser.Base64InputStream for the same issue.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2022-12-06 15:29:05 +01:00
Simone Bordet d5054667df
Improved locking for HttpReceiver.ContentSource. (#9007)
* Improved locking for HttpReceiver.ContentSource.

Improved response failure code path.
Now either responseFailure() must be called, or exchange.responseComplete() followed by HttpReceiver.abort().

Fixed failAndClose() for HTTP/2 and HTTP/3: the connection must not be closed, stream.reset() is sufficient.

Fixed flaky test HttpClientDemandTest.testTwoListenersWithDifferentDemand().

Fixed DistributionTests.testVirtualThreadPool().

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2022-12-06 15:09:48 +01: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
Joakim Erdfelt ca3101814b
Merge remote-tracking branch 'origin/jetty-11.0.x' into jetty-12.0.x 2022-12-06 08:02:21 -06:00
Joakim Erdfelt ccdf6fb983
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2022-12-06 08:01:11 -06:00
Simone Bordet f122e75dd6
Reduced test load and increased timeout to avoid flakyness in Jenkins.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2022-12-06 14:29:51 +01:00
Joakim Erdfelt 390abcccf2
Merge pull request #9004 from eclipse/fix/jetty-10.0.x/jetty-home-cleanup
Excluding javadoc jar from jetty-home
2022-12-06 07:08:35 -06: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
Jan Bartel 91c7a51cbc
Issue #8921 Fix normalization of META-INF resources for quickstart (#8922)
* Issue #8921 Fix normalization of META-INF resources for quickstart
2022-12-06 08:51:44 +11:00
Joakim Erdfelt 72f8fef392
Excluding javadoc jar from jetty-home 2022-12-05 15:47:43 -06:00
Joakim Erdfelt f29dd66804
Merge remote-tracking branch 'origin/jetty-11.0.x' into jetty-12.0.x 2022-12-05 13:49:29 -06:00
Joakim Erdfelt 5c8d7ad013
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2022-12-05 13:47:54 -06:00
Joakim Erdfelt 41c0fae44f
Merge pull request #9001 from eclipse/jetty-10.0.x-jdk-19-disable-maven-its
skip m-invoker-p for jdk 19
2022-12-05 13:47:23 -06:00
Olivier Lamy 694bfc40d8 skip m-invoker-p for jdk 19
Signed-off-by: Olivier Lamy <olamy@apache.org>
2022-12-05 16:28:43 +10:00
Greg Wilkins 9711b04e00 More generous test timeouts
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2022-12-05 16:27:41 +11:00
Simone Bordet e104e48e0f
Merged branch 'jetty-11.0.x' into 'jetty-12.0.x'.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2022-12-01 21:46:57 +01:00
Simone Bordet 87c52707ef
Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2022-12-01 21:45:53 +01:00
Joakim Erdfelt 894a2ee4d9
Fix Jenkins build to not use `-Peclipse-release` (#8996)
Jenkins doesn't have gpg (the executable) or the keyring anyway.
2022-12-01 21:45:16 +01:00
Joakim Erdfelt e552749b78
Merge branch 'jetty-12.0.x' of github.com:eclipse/jetty.project into jetty-12.0.x 2022-12-01 11:08:18 -06: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
Simone Bordet 346a59197b
Merged branch 'jetty-11.0.x' into 'jetty-12.0.x'.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2022-12-01 18:04:54 +01:00
Simone Bordet e80db52306
Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2022-12-01 17:57:23 +01:00
Joakim Erdfelt be5ed905ee
Jetty 10 - Fix OpenJDK 19 related build issues (#8995)
* Add JDK 19 build to Jenkinsfile
* Fix Javadoc on OpenJDK 19

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2022-12-01 17:56:34 +01:00
Joakim Erdfelt dddb846afc
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2022-12-01 10:32:50 -06:00
Joakim Erdfelt 1d9f2dff43
Merge pull request #8988 from eclipse/dependabot/maven/jetty-10.0.x/org.apache.maven.plugins-maven-dependency-plugin-3.4.0
Bump maven-dependency-plugin from 3.3.0 to 3.4.0
2022-12-01 10:32:10 -06:00
Joakim Erdfelt 67d0ddbf7d
Merge pull request #8985 from eclipse/dependabot/maven/jetty-10.0.x/org.apache.httpcomponents-httpcore-4.4.16
Bump httpcore from 4.4.15 to 4.4.16
2022-12-01 10:32:02 -06:00