Commit Graph

29039 Commits

Author SHA1 Message Date
Olivier Lamy 65b18ac890
Merge branch 'jetty-10.0.x' into jetty-11.0.x 2023-10-17 11:49:30 +10:00
Joakim Erdfelt 536a38aa8e
Address build/test failure against bad entities. (#10742)
Bad entities in test case can lead to:

* external URL references
* required HTTP GET requests
* not testing redirectEntity / resolveEntity
  (the whole point of the test)

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2023-10-17 03:48:28 +02:00
OlexYarm 4b6627ae0c Update RolloverFileOutputStreamTest.java
more simplification
2023-10-16 18:48:09 -04:00
OlexYarm 40a31b8394 Update RolloverFileOutputStreamTest.java
Simplified test class as suggested
2023-10-16 18:26:59 -04:00
Greg Wilkins ffe80cd1f2
MutableHttpFields.asImmutable avoids copy (#10651)
* Avoid a copy in MutableHttpFields.asImmutable if the mutable is never mutated again.
* reduce instance creations needed for iterations
---------
Co-authored-by: Ludovic Orban <lorban@bitronix.be>
2023-10-17 08:58:19 +11:00
Lachlan Roberts 0fa3165018 revert changes to request
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2023-10-17 07:31:03 +11:00
Lachlan Roberts a8bf3ff99d Merge remote-tracking branch 'origin/jetty-12.0.x' into fix/jetty-12.0.x-10333-requestTimeStamp 2023-10-17 07:29:36 +11:00
Lachlan Roberts 791d9e9783 make CustomRequestLogTest.testLogRequestTimeCustomFormats more lenient
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2023-10-17 07:29:26 +11:00
Olivier Lamy 3507e17c86
Issue #10731 wrong context attribute name javax.servlet instead of jakarta.servlet (#10735)
* Issue #10731 wrong context attribute name javax.servlet instead of jakarta.servlet

Signed-off-by: Olivier Lamy <olamy@apache.org>

* Update jetty-server/src/main/java/org/eclipse/jetty/server/MultiPartFormInputStream.java

Co-authored-by: Simone Bordet <simone.bordet@gmail.com>

* Update jetty-server/src/main/java/org/eclipse/jetty/server/Request.java

Co-authored-by: Simone Bordet <simone.bordet@gmail.com>

* fix javadoc

Signed-off-by: Olivier Lamy <olamy@apache.org>

* more usage of constant

Signed-off-by: Olivier Lamy <olamy@apache.org>

---------

Signed-off-by: Olivier Lamy <olamy@apache.org>
Co-authored-by: Simone Bordet <simone.bordet@gmail.com>
2023-10-16 12:35:27 +02:00
Greg Wilkins df6995e125
Fix EE10 removeAttributes (#10727)
Allow all attributes, including synthetic ones, to be removed.
2023-10-16 21:24:46 +11:00
Simone Bordet 825fc6df1f
Merged branch 'jetty-11.0.x' into 'jetty-12.0.x'.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2023-10-16 09:41:45 +02:00
Greg Wilkins 897478a4f6
Fix #10656 return value for HttpServletRequest.getProtocolRequestId() in ee10 (#10715)
Return empty string for HTTP/1.x and previous
2023-10-16 14:52:56 +11:00
Lachlan Roberts ee702b01c2 Issue #10734 - fix websocket CoreSession getParameterMap
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2023-10-16 12:18:37 +11:00
Simone Bordet e45814a49a
Javadocs.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2023-10-13 16:56:36 +02:00
Ludovic Orban 38a57e16e5
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2023-10-13 14:40:49 +02:00
Ludovic Orban f0060d9523 #10705 improve error message when no valid keystore can be found during startup
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2023-10-13 14:36:24 +02:00
Ludovic Orban 937713fc73 #10698 fix racy assertion
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2023-10-13 11:39:21 +02:00
Simone Bordet 57dcf7c525
Added missing API getRequest().
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2023-10-13 11:28:14 +02:00
Ludovic Orban d6c900a783
Fix flaky leaky h2 tests (#10728)
* Fixed more tests that became flaky after #10554.

Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2023-10-13 11:09:30 +02:00
Joakim Erdfelt 58a19b33c6
Merge pull request #10721 from jetty/dependabot/maven/jetty-10.0.x/org.testcontainers-testcontainers-bom-1.19.1
Bump org.testcontainers:testcontainers-bom from 1.19.0 to 1.19.1
2023-10-12 14:44:48 -05:00
Joakim Erdfelt 18b8475d60
Merge pull request #10723 from jetty/dependabot/maven/jetty-10.0.x/org.infinispan-infinispan-bom-11.0.18.Final
Bump org.infinispan:infinispan-bom from 11.0.17.Final to 11.0.18.Final
2023-10-12 14:44:35 -05:00
Joakim Erdfelt ab391e37be
Merge pull request #10720 from jetty/dependabot/maven/jetty-10.0.x/apache.directory.api.version-2.1.5
Bump apache.directory.api.version from 2.1.4 to 2.1.5
2023-10-12 14:20:17 -05:00
dependabot[bot] 1f1f6226b5
Bump apache.directory.api.version from 2.1.4 to 2.1.5
Bumps `apache.directory.api.version` from 2.1.4 to 2.1.5.

Updates `org.apache.directory.api:api-ldap-schema-data` from 2.1.4 to 2.1.5

Updates `org.apache.directory.api:api-ldap-model` from 2.1.4 to 2.1.5

Updates `org.apache.directory.api:api-util` from 2.1.4 to 2.1.5
- [Commits](https://github.com/apache/directory-ldap-api/compare/2.1.4...2.1.5)

Updates `org.apache.directory.api:api-asn1-api` from 2.1.4 to 2.1.5

---
updated-dependencies:
- dependency-name: org.apache.directory.api:api-ldap-schema-data
  dependency-type: direct:development
  update-type: version-update:semver-patch
- dependency-name: org.apache.directory.api:api-ldap-model
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: org.apache.directory.api:api-util
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: org.apache.directory.api:api-asn1-api
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-10-12 17:17:15 +00:00
dependabot[bot] ad544cde5c
Bump org.infinispan:infinispan-bom from 11.0.17.Final to 11.0.18.Final
Bumps [org.infinispan:infinispan-bom](https://github.com/infinispan/infinispan) from 11.0.17.Final to 11.0.18.Final.
- [Release notes](https://github.com/infinispan/infinispan/releases)
- [Changelog](https://github.com/infinispan/infinispan/blob/main/Jenkinsfile-release)
- [Commits](https://github.com/infinispan/infinispan/compare/11.0.17.Final...11.0.18.Final)

---
updated-dependencies:
- dependency-name: org.infinispan:infinispan-bom
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-10-12 08:20:58 +00:00
dependabot[bot] ba499ea17b
Bump org.testcontainers:testcontainers-bom from 1.19.0 to 1.19.1
Bumps [org.testcontainers:testcontainers-bom](https://github.com/testcontainers/testcontainers-java) from 1.19.0 to 1.19.1.
- [Release notes](https://github.com/testcontainers/testcontainers-java/releases)
- [Changelog](https://github.com/testcontainers/testcontainers-java/blob/main/CHANGELOG.md)
- [Commits](https://github.com/testcontainers/testcontainers-java/compare/1.19.0...1.19.1)

---
updated-dependencies:
- dependency-name: org.testcontainers:testcontainers-bom
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-10-12 08:20:18 +00:00
Jan Bartel fffbab015d
Jetty 12.0.x 10582 servlethttpwrapper (#10587)
* Issue #10582 fix DispatcherTest use of ServletRequestWrapper
2023-10-12 07:46:04 +02:00
Olivier Lamy fcc88274a4
Jetty 12.0.x use automatic formatter for poms to have same style for every poms (#10578)
* apply spotless sort pom

---------

Signed-off-by: Olivier Lamy <olamy@apache.org>
2023-10-12 03:51:36 +02:00
Ludovic Orban 2585f46758 Updated GPG key
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2023-10-11 08:42:53 +02:00
Ludovic Orban 9275d2acca Made tests relying on TestForbiddenMethodsEventsHandler not flaky
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2023-10-10 17:09:56 +02:00
Ludovic Orban 39a5f0c168
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2023-10-10 17:06:04 +02:00
Simone Bordet 0bfef5f8c5
Merged branch 'jetty-11.0.x' into 'jetty-12.0.x'.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2023-10-10 17:04:48 +02:00
Ludovic Orban d3aa35511d Updated GPG key
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2023-10-10 17:03:50 +02:00
Simone Bordet ba083b7e41
Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2023-10-10 17:01:30 +02:00
Simone Bordet e1f0ea51b1
Merge pull request #10693 from eclipse/release/10.0.17
Merge `release/10.0.17` back to `jetty-10.0.x`
2023-10-10 16:52:20 +02:00
Ludovic Orban 46ba269e45
Merge pull request #10694 from eclipse/release/11.0.17
Merge `release/11.0.17` back to `jetty-11.0.x`
2023-10-10 14:47:21 +02:00
Ludovic Orban c4e7b97797
Merge pull request #10695 from eclipse/release/12.0.2
Merge `release/12.0.2` back to `jetty-12.0.x`
2023-10-10 14:46:44 +02:00
Joakim Erdfelt 95b29d5f09
Updating for CVEs 2023-10-10 07:40:57 -05:00
Joakim Erdfelt 102c24cb2e
Updating for CVEs 2023-10-10 07:39:41 -05:00
Joakim Erdfelt 5cff7930e5
Updating for CVEs 2023-10-10 07:37:58 -05:00
Joakim Erdfelt 6b3f760b80
Updating to version 12.0.3-SNAPSHOT 2023-10-09 21:16:46 -05:00
Joakim Erdfelt b01e3611cf
Updating to version 12.0.2 2023-10-09 20:59:14 -05:00
Lachlan 0468f67430
Merge pull request #10685 from eclipse/fix/jetty-12.0.x-dumpStackOverflow
fix infinite recursion in server dump with Path
2023-10-10 12:51:15 +11:00
Lachlan Roberts 70b1fd40ef fix infinite recursion in server dump with Path
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2023-10-10 11:26:55 +11:00
Joakim Erdfelt c8829f75bf
Updating to version 11.0.18-SNAPSHOT 2023-10-09 13:49:23 -05:00
Joakim Erdfelt 48e7716b94
Updating to version 11.0.17 2023-10-09 13:38:47 -05:00
Joakim Erdfelt 2f6add5677
Merge remote-tracking branch 'origin/fix/10.0.x/rollback-jdk21-requirement' into release/11.0.17 2023-10-09 13:34:05 -05:00
Joakim Erdfelt 722b97ad6a
Updating to version 10.0.18-SNAPSHOT 2023-10-09 13:32:28 -05:00
Joakim Erdfelt af15f12297
Updating to version 10.0.17 2023-10-09 13:21:53 -05:00
Joakim Erdfelt f8b7f48d56
Merge remote-tracking branch 'origin/fix/10.0.x/rollback-jdk21-requirement' into release/10.0.17 2023-10-09 13:13:32 -05:00
Simone Bordet 3458f0ef13
Merged branch 'jetty-11.0.x' into 'jetty-12.0.x'.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2023-10-09 20:06:48 +02:00