Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
26,523 Commits 59 Branches 460 Tags 355 MiB
Commit Graph

26523 Commits

Author SHA1 Message Date
Joakim Erdfelt 25dd6d0ef7
Cherry-pick of Improvements to PathSpec for Jetty 10.0.x (#8136) 
* Cherry-pick of Improvements to PathSpec.
* From commit: 5b4d1dd1c6
* Fixing ConstraintSecurityHandler usage of PathMappings
* Fixing bad INCLUDE logic from cherry-pick in ServletHandler.doScope()
* Cleanup of non ServletPathSpec behaviors in ServletPathMapping class
* Skip optional group name/info lookup if regex fails.
* Prevent NPE on static servletPathMappings
* Update WebSocketMappings to use new PathMappings.getMatched(String)

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2022-10-06 15:50:18 -05:00
Greg Wilkins 351fe53c9a
Fix #7891 regex pathInfo (#7892) 
Fix 7891 regex pathInfo

+ Use the pathSpec methods to set servletPath and pathInfo when possible

Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2022-10-06 15:44:01 -05:00
Greg Wilkins 024a053455
Issue #7748 - allow override of path mapping behavior in ServletContextHandler (#7614) 
Added protected method to ServletHandler to allow other servlet mappings (eg regex) in embedded/extended usage

Signed-off-by: Greg Wilkins <gregw@webtide.com>
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2022-10-06 15:42:12 -05:00
ianrifkin f9616fed93
Issue #7182 having running() delete the state file where it previously only deleted the pid file. (#7184) 
* Issue #7182 changing approach from deleting the state file consistently to simply grep'ing for last line in JETTY_STATE file

Signed-off-by: Ian Rifkin <ianrifkin@ianrifkin.com>
 2022-10-06 15:33:43 -05:00
Joakim Erdfelt bfadf5e8e7
Issue #7617 - RequestLog content params extraction prevention (#7618) 2022-10-06 13:16:49 -05:00
markslater 1f844e8d57
#7863 Include value of first accept-encoding header where multiple accept-encoding headers are given. (#7864) 
Signed-off-by: markslater <mark.slater@mail.com>
 2022-10-06 13:10:25 -05:00
Joakim Erdfelt 0b05425aa5
Issue #5681 - clearer warning on JVM Arg / System Property use (#7769) 
- Improved warning on unrecognized Command Line Options

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2022-10-06 12:01:37 -05:00
Jan Bartel 1bd498dd9a
Issue #7657 Remove unused test imports in jetty-nosql (#7658) 
Signed-off-by: Jan Bartel <janb@webtide.com>
 2022-10-06 11:48:50 -05:00
Joakim Erdfelt 660f601f21
Issue #5965 - fixing invalid dot output from start.jar (#7606) 
* Adding testcase that can use `dot` if it exists on the machine.
 2022-10-06 11:41:50 -05:00
Joakim Erdfelt 281f0dc495
Fix bad test cases from merge 2022-10-06 09:17:48 -05:00
Joakim Erdfelt ad337f1fda
Merge remote-tracking branch 'origin/jetty-11.0.x' into jetty-12.0.x 2022-10-06 07:32:48 -05:00
Joakim Erdfelt 128b192b21
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2022-10-06 07:15:18 -05:00
Joakim Erdfelt 5733ffc8c7
Merge pull request #8688 from eclipse/fix/jetty-10-start-extract-traversal 
Fix traversal bug on extraction of bad jar/zip files during jetty-start
 2022-10-06 07:15:06 -05:00
Joakim Erdfelt 11e2e7d059
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2022-10-06 07:14:16 -05:00
Joakim Erdfelt 4b908d9483
Merge pull request #8629 from eclipse/fix/jetty-10-restore-pathmapping-getmatch 
Issue #8628 - pseudo restore `PathMappings.getMatch(String)`
 2022-10-06 07:13:45 -05:00
Jan Bartel f1e39433e8 Fix context paths for some ee10 and ee8 demos 2022-10-06 14:59:07 +11:00
Olivier Lamy eb9d07378a
move flatten mojo configuration in top pom, fix boms and remove non needed content (#8686) 
Signed-off-by: Olivier Lamy <olamy@apache.org>
 2022-10-06 06:50:45 +10:00
Jan Bartel b85f904520
Re-enable and fix loginservice tests ee10 (#8683) 2022-10-06 07:33:51 +11:00
Joakim Erdfelt 4c74dac122
Fixing left-over ee10 replace -> replaceAll javascript usages 2022-10-05 15:31:55 -05:00
Joakim Erdfelt 9a7ce7a1f1
Fixing jackson-databind use in maven-plugins 2022-10-05 15:24:49 -05:00
Joakim Erdfelt a84fe38fef
Fix directory traversal on bad jar/zip files 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2022-10-05 13:26:56 -05:00
Joakim Erdfelt 04dd551919
Merge remote-tracking branch 'origin/jetty-11.0.x' into jetty-12.0.x 2022-10-05 13:04:56 -05:00
Joakim Erdfelt b37c1fe311
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2022-10-05 13:04:18 -05:00
Joakim Erdfelt f8a6a0f5bc
Merge pull request #8687 from eclipse/fix/jetty-10-javascript-replace 
Fix bad Javascript `replace` usage in demos / test
 2022-10-05 13:03:56 -05:00
Joakim Erdfelt 1e13cf4069
Merge remote-tracking branch 'origin/jetty-11.0.x' into jetty-12.0.x 2022-10-05 09:28:58 -05:00
Joakim Erdfelt 7497f9ec05
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2022-10-05 09:24:16 -05:00
Joakim Erdfelt 9b94bcd340
Merge pull request #8684 from eclipse/jetty-10.0.x-jackson-bom 
Issue #8576 use jackson bom
 2022-10-05 09:22:58 -05:00
Joakim Erdfelt d3050dee7b
Fix bad js replace in demos / test 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2022-10-05 09:13:57 -05:00
Simone Bordet 7ed59f46c8
Merged branch 'jetty-11.0.x' into 'jetty-12.0.x'. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2022-10-05 12:16:02 +02:00
Simone Bordet 76b6f9cfe7
Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2022-10-05 11:51:37 +02:00
Simone Bordet ecea0e6d0a
Fixes #7993 - HttpClient idleTimeout configuration being ignored/over… (#8672) 
* Fixes #7993 - HttpClient idleTimeout configuration being ignored/overridden

The problem was that the timeout scheduling was not happening,
because for TunnelRequest the timeouts were set in normalizeRequest(),
which runs after the scheduling.

Now a call to request.sent() is made also after normalizeRequest()
so that the timeouts is scheduled (if it was not scheduled before).

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2022-10-05 11:46:00 +02:00
Simone Bordet 58f0e0744b Fixes #8584 - HttpRequest.send() never returns 
Fixed handling of the idle timeout in case the SOCKS proxy does not reply to the SOCKS bytes.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2022-10-05 11:45:13 +02:00
Lachlan ccb2cc0637
Merge pull request #8682 from eclipse/jetty-10.0.x-jetty-start-expand-properties 
expand jetty properties when generating dry-run command line
 2022-10-05 14:21:03 +11:00
Olivier Lamy 01b4d5c0d1
Issue #8576 use jackson bom 
Signed-off-by: Olivier Lamy <olamy@apache.org>
 2022-10-04 18:11:02 +10:00
Lachlan 05a4b96632
Merge pull request #8621 from eclipse/jetty-12.0.x-CachedContentFactory 
Fix Caching ContentFactories in Jetty-12
 2022-10-04 18:57:29 +11:00
Lachlan Roberts 7e85c2a54c add distribution test to reproduce issue with dry-run 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2022-10-04 17:43:02 +11:00
Lachlan Roberts f60bbf3b11 expand jetty properties when generating dry-run command line 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2022-10-04 17:17:33 +11:00
Jan Bartel f76df2c1bc Reenable test 2022-10-04 11:01:11 +11:00
Joakim Erdfelt 03ec361b57
Fixing bad osgi merge from 10.0.x 2022-10-03 12:14:49 -05:00
Simone Bordet a3f2268766
Merged branch 'jetty-11.0.x' into 'jetty-12.0.x'. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2022-10-03 18:28:36 +02:00
Simone Bordet acc14a841a
Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2022-10-03 17:51:01 +02:00
Simone Bordet 8e63e872f7 Fixes a test tagged as "external" that 
fails during local builds with Java 17+.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2022-10-03 17:50:33 +02:00
Joakim Erdfelt 439c594e89
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2022-10-02 07:37:48 -05:00
dependabot[bot] 94f43548a0
Bump tycho-p2-repository-plugin from 2.7.5 to 3.0.0 (#8652) 
* Bump tycho-p2-repository-plugin from 2.7.5 to 3.0.0

Bumps tycho-p2-repository-plugin from 2.7.5 to 3.0.0.

---
updated-dependencies:
- dependency-name: org.eclipse.tycho:tycho-p2-repository-plugin
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

* activate jetty-p2 module only for jdk 17

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

Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: Olivier Lamy <olamy@apache.org>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Olivier Lamy <olamy@apache.org>
 2022-10-02 07:37:34 -05:00
dependabot[bot] 3128e45545
Merge pull request #8649 from eclipse/dependabot/maven/jetty-11.0.x/org.infinispan.protostream-protostream-4.5.0.Final 2022-10-02 09:20:35 +00:00
Joakim Erdfelt e06c134482
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2022-10-02 00:03:12 -05:00
dependabot[bot] a427d7622d
Bump grpc-core from 1.49.0 to 1.49.2 (#8677) 
Bumps [grpc-core](https://github.com/grpc/grpc-java) from 1.49.0 to 1.49.2.
- [Release notes](https://github.com/grpc/grpc-java/releases)
- [Commits](https://github.com/grpc/grpc-java/compare/v1.49.0...v1.49.2)

---
updated-dependencies:
- dependency-name: io.grpc:grpc-core
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2022-10-02 00:00:48 -05:00
dependabot[bot] b679cff3e2
Bump infinispan-bom from 11.0.15.Final to 11.0.16.Final (#8661) 
Bumps [infinispan-bom](https://github.com/infinispan/infinispan) from 11.0.15.Final to 11.0.16.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.15.Final...11.0.16.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>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2022-10-02 00:00:36 -05:00
dependabot[bot] 6248e70955
Merge pull request #8642 from eclipse/dependabot/maven/jetty-10.0.x/org.eclipse.platform-org.eclipse.osgi.services-3.11.0 2022-10-02 00:49:44 +00:00
Olivier Lamy 2b7ad6a477
Merge pull request #8674 from eclipse/jetty-10.0.x-codeql-log-readable-with-batch-mode 
codeql make log readable with using batch mode -B
 2022-10-02 10:31:52 +10:00