Commit Graph

23675 Commits

Author SHA1 Message Date
Jan Bartel 3648b3916c Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2021-06-10 21:27:05 +10:00
Jan Bartel 900c71902c
Issue #6327 Remove DisabledOnJre or test where appropriate (#6386)
Signed-off-by: Jan Bartel <janb@webtide.com>
2021-06-10 21:26:16 +10:00
Jan Bartel 71a1e419fa Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2021-06-10 21:24:50 +10:00
Jan Bartel 103e1d95fd
Issue #6329 Fix xml config problems (#6348)
* Issue #6392 Review accidental xml config changes

Signed-off-by: Jan Bartel <janb@webtide.com>
2021-06-10 21:11:50 +10:00
Lachlan Roberts b194848baa Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2021-06-10 11:37:22 +10:00
Lachlan e84bdd6e22
Merge pull request #6377 from eclipse/jetty-10.0.x-CVE-2021-28169
Update VERSION.txt with CVE number.
2021-06-10 11:36:47 +10:00
Simone Bordet d190fada9c Merged branch 'release-11.0.4' into 'jetty-11.0.x'. 2021-06-09 11:15:28 +02:00
Simone Bordet 79a2ee3eb0 Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-06-09 11:14:57 +02:00
Simone Bordet f171a5ce61 Merged branch 'release-10.0.4' into 'jetty-10.0.x'. 2021-06-09 11:13:42 +02:00
Simone Bordet 2c9ef5420c Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-06-09 11:13:09 +02:00
Lachlan Roberts ac54a3e5dc Update VERSION.txt with CVE number.
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-06-09 15:56:15 +10:00
Greg Wilkins dceb4184f8
Update enhancement-template.md
removed Enhancement from the title since the label is sufficient
2021-06-09 14:22:20 +10:00
Greg Wilkins fc44ddacf8
Update issue-template.md
Added Bug label
2021-06-09 14:21:27 +10:00
Greg Wilkins 3a155e992e
Create enhancement-template.md
Added template for enhancement
2021-06-09 14:16:01 +10:00
Greg Wilkins 7aa5ed114b
Create config.yml
Added a config.yml in order to add reference to security guideline page
2021-06-09 14:01:48 +10:00
Simone Bordet cb9abedb54 Removed the release template to avoid confusing users that open issues.
Template can be copied/pasted as necessary.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-06-08 17:50:17 +02:00
Greg Wilkins 842f513397
create release issue template
Created template for a release process.
2021-06-08 16:42:59 +10:00
Joakim Erdfelt 063e8c80d5 Updating to version 11.0.5-SNAPSHOT 2021-06-04 13:53:06 -05:00
Joakim Erdfelt 5bcdeb52ae Updating to version 11.0.4 2021-06-04 13:35:11 -05:00
Joakim Erdfelt 987066aac1 Updating to version 10.0.5-SNAPSHOT 2021-06-04 13:28:47 -05:00
Joakim Erdfelt 5523480c54 Updating to version 10.0.4 2021-06-04 13:09:44 -05:00
Simone Bordet d96588efd9 Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-06-04 16:36:12 +02:00
Simone Bordet 3a8af443f5
Fixes #6330 - CustomRequestLog is missing HTTP version format option. (#6362)
Simplified javadoc.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-06-04 16:17:48 +02:00
Simone Bordet c11c8bbd5c Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-06-04 15:27:21 +02:00
Greg Wilkins e3faf81860
Fix #6114 Deploy symlink webapps (#6317)
* Fix #6114 Deploy symlink webapps

Use Path.toRealPath rather than getCanonicalPath in the Scanner
Make following symlinks configurable

Signed-off-by: Greg Wilkins <gregw@webtide.com>
2021-06-04 15:10:54 +02:00
Jan Bartel de37267ae5
Issue #6327 Fix cookie leak test (#6344)
* Issue #6327 Fix cookie leak test

Signed-off-by: Jan Bartel <janb@webtide.com>
2021-06-04 15:08:53 +02:00
Lachlan Roberts 9cc7517d65 Issue #6330 - Improve javadoc for CustomRequestLog %H
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-06-04 15:05:07 +02:00
Jan Bartel f50c4fd4b4 Issue #6327 Remove an invalid RequestTest
Signed-off-by: Jan Bartel <janb@webtide.com>
2021-06-04 15:04:32 +02:00
Simone Bordet eee4a1a4fe Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-06-04 12:48:44 +02:00
Simone Bordet 21aba4a724 Fixes #6323 - HttpClient requests with redirects gets stuck/never calls onComplete()
* Reworked the total timeout handling.
* Now a CyclicTimeouts handles the exchanges in each HttpDestination,
and a CyclicTimeouts handles the exchanges in each HttpConnection
(rather than in HttpChannel).
* Now adjusting the total timeout for copied requests generated by
redirects and authentication.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
(cherry picked from commit 2e7d17400f)
2021-06-04 12:12:40 +02:00
Joakim Erdfelt fbbe584a30
Merge pull request #6356 from tjwatson/jetty-10.0.x
Fixes #6354 - allow jetty bundles to use 1.7 slf4j
2021-06-03 14:42:55 -04:00
Thomas Watson 256ee34765 Fixes #6354 - allow jetty bundles to use 1.7 slf4j
This updates the parent pom to set the range for all
imports of slf4j by the jetty bundles

Signed-off-by: Thomas Watson <tjwatson@us.ibm.com>
2021-06-03 09:58:35 -05:00
Simone Bordet d5f753b3d0 Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-06-03 15:18:08 +02:00
Simone Bordet c151b04535 Fixes #5931 - SslConnection should implement getBytesIn()/getBytesOut(). (#6335)
Updated ConnectionStatistics to report both the stats of all connections,
and the stats grouped by connection class.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
(cherry picked from commit f902d12fe8)
2021-06-03 15:16:12 +02:00
Olivier Lamy 9464c39de2
Add comment on why the test ServerWithJMXTest is disabled (#6338)
* Add comment on why this test is disabled
* Update demos/embedded/src/test/java/org/eclipse/jetty/demos/ServerWithJMXTest.java

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
Co-authored-by: Jan Bartel <janb@webtide.com>
2021-06-03 13:31:19 +10:00
Jan Bartel 155b5319d1 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2021-06-03 11:27:30 +10:00
Jan Bartel d4a8c38b87
Issue #6347 Fix session-store-gcloud,logging-jcl-capture,logging-log4j1-capture (#6349)
* Issue #6347 Fix session-store-gcloud,logging-jcl-capture,logging-log4j1-capture

Signed-off-by: Jan Bartel <janb@webtide.com>
2021-06-03 11:26:47 +10:00
Jan Bartel e6bf3f497b Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2021-06-02 10:34:54 +10:00
Jan Bartel a55b315f14
Issue #6118 Warn if hazelcast cfg file is missing SessionDataSerializer (#6321)
* Issue #6118 Warn if hazelcast cfg file is missing SessionDataSerializer

Signed-off-by: Jan Bartel <janb@webtide.com>
2021-06-02 10:34:01 +10:00
Jan Bartel dabb0a0624 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2021-06-01 10:22:19 +10:00
Jan Bartel b3f4a57c82
Issue #6112 Jetty logging leaking to webapp (#6336)
Signed-off-by: Jan Bartel <janb@webtide.com>
2021-06-01 10:15:49 +10:00
olivier lamy a669c5443d more --add-opens for jetty-jaas tests
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2021-05-29 11:36:23 +10:00
olivier lamy 42153bd57f fix add-opens for cdi tests
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2021-05-29 11:36:23 +10:00
olivier lamy 5b95f2e8ea add-opens for jdk16
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2021-05-29 11:36:23 +10:00
olivier lamy 9982b5dbd3 add-opens for jdk16
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2021-05-29 11:36:23 +10:00
olivier lamy 0e0a122444 add-opens to fix infinispan with java16
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2021-05-29 11:36:23 +10:00
olivier lamy 1ebe7b9453 add-opens to fix infinispan with java16
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2021-05-29 11:36:23 +10:00
Simone Bordet c329c4ca09 Updated CI builds to use Java 16.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-05-29 11:36:23 +10:00
Greg Wilkins 0d71185e10
Fix #6305 Optimise isProtectedTarget (#6306)
* Fix #6305 Optimise isProtectedTarget

Fix #6305 Optimise isProtectedTarget by using case insensitive Index.

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

* Fix #6305 Optimise isProtectedTarget

updates from review

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

* Fix #6305 Optimise isProtectedTarget

updates from review

Signed-off-by: Greg Wilkins <gregw@webtide.com>
2021-05-28 18:01:25 +10:00
Jan Bartel dfa274213d Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2021-05-25 15:41:58 +10:00