Commit Graph

22607 Commits

Author SHA1 Message Date
gregw 8c2a6992f4 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
Signed-off-by: gregw <gregw@webtide.com>
2021-02-16 16:56:34 +01:00
gregw 7769f61242 Fixed checkstyle 2021-02-16 16:55:14 +01:00
gregw ff3d5656a2 fix test style 2021-02-16 16:54:05 +01:00
gregw ccfec2fc4f Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
Signed-off-by: gregw <gregw@webtide.com>
2021-02-16 16:40:11 +01:00
gregw 172cd61878 merge from 9.4.x
Signed-off-by: gregw <gregw@webtide.com>
2021-02-16 16:35:57 +01:00
Greg Wilkins 20ef71fe5d
Fix #4275 fail URIs with ambiguous segments (#5954)
Handle URIs by first resolving relative paths and then decoding.
Added compliance mode to return 400 if there are ambiguous path segments.

Signed-off-by: Greg Wilkins <gregw@webtide.com>
2021-02-16 14:47:41 +01:00
olivier lamy 19c32d6087 fix compilation
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2021-02-16 21:01:13 +10:00
Joakim Erdfelt e3760b8126
Fixing accidentally doubled line in license header
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2021-02-15 14:27:02 -06:00
Joakim Erdfelt d6ec96fe1b
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2021-02-15 14:18:08 -06:00
Joakim Erdfelt 5dd987779c
Adding `WhitespaceAfter` checkstyle rule.
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2021-02-15 12:48:24 -06:00
Joakim Erdfelt a8597e07fe
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2021-02-15 12:25:15 -06:00
Joakim Erdfelt 64c7fe076a
Merge pull request #5957 from eclipse/jetty-9.4.x-5950-remove-logging-during-classloading
Issue #5950 - remove WebAppClassLoader logging during loadClass
2021-02-15 12:22:11 -06:00
Joakim Erdfelt 900b9d52c1
Merge pull request #5967 from eclipse/jetty-10.0.x-5966-remove-webapps-from-jetty-home
Issue #5966 - Remove /webapps from jetty-home
2021-02-15 12:21:20 -06:00
Nicolas 358526be04
Fix SampleStatistic.toString: mean dispay the max (#5962)
Signed-off-by: Nicolas Trangosi <nicolas.trangosi@dcbrain.com>
2021-02-12 14:32:54 +10:00
Joakim Erdfelt d6572823b9
Issue #5966 - Remove /webapps from jetty-home
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2021-02-11 08:04:29 -06:00
Simone Bordet 29d48b0de5 Improvements to the Jetty documentation.
Documented the Jetty start mechanism.

Reorganized the documentation to look better on the TOC.

Improved JettyIncludeExtension to support replacements, deletions and callouts.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-02-10 11:27:30 +01:00
Olivier Lamy 68790d861c
Issue #5933 ClientCertAuthenticator is not using SslContextFactory (#5934)
Added SslClientCertAuthenticator
Co-authored-by: olivier lamy <oliver.lamy@gmail.com>
Signed-off-by: Greg Wilkins <gregw@webtide.com>

Co-authored-by: gregw <gregw@webtide.com>
2021-02-10 11:03:54 +10:00
Lachlan 2549df99ce
Merge pull request #5935 from eclipse/jetty-10.0.x-5868-WSUpgradeRequestResponse
Issue #5868 - allow request attributes to be set in websocket upgrade
2021-02-10 10:56:18 +11:00
Lachlan 0fe4e78643
Merge pull request #5951 from eclipse/jetty-10.0.x-4515-WebSocketValidation
Issue #4515 - ValidationExtension should not downcast CoreSession
2021-02-10 10:56:03 +11:00
Greg Wilkins 3321ae71be
Fix #5939 unwrap ServletException (#5958)
* Fix #5939 unwrap ServletException

Fix #5939 unwrap ServletException

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

* Fix #5939 unwrap ServletException

reverted default to false

Signed-off-by: Greg Wilkins <gregw@webtide.com>
2021-02-09 10:03:00 +01:00
Jan Bartel de76d44c97 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2021-02-09 09:49:24 +01:00
Jan Bartel 75183e8413
Issue #5909 - Better handling of merged RoleInfo during omitted method constraints (#5917)
* Fix #5909 Better handle merged RoleInfo

Signed-off-by: Jan Bartel <janb@webtide.com>

Co-authored-by: gregw <gregw@webtide.com>
2021-02-09 09:44:53 +01:00
Lachlan Roberts 1dc98b611e Issue #5868 - changes from review
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-02-09 10:56:31 +11:00
Joakim Erdfelt 165aa1a60a
Issue #5950 - remove WebAppClassLoader logging during loadClass
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2021-02-08 13:02:48 -06:00
Lachlan Roberts 8bc84d3119 Issue #4515 - ValidationExtension should not downcast CoreSession
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-02-08 16:14:38 +11:00
Greg Wilkins f768e2ed68
Fix #5937 (#5949)
Remove size limit on async static content.
2021-02-05 14:50:14 +01:00
Simone Bordet 4c67b886a4 Merged branch 'jetty-10.0.x-more_docs' into 'jetty-10.0.x'.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-02-03 19:46:54 +01:00
Simone Bordet 0ccaa9f87b Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-02-03 15:25:09 +01:00
Simone Bordet a26ad6d7ea
Merge pull request #5910 from eclipse/jetty-9.4.x-5787-managedselector_jmx
Fixes #5787 - Make ManagedSelector report better JMX data.
2021-02-03 15:22:58 +01:00
Simone Bordet 0bbc9429a1 Fixed javadoc error.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-02-03 15:21:44 +01:00
Ludovic Orban 04cb3f3736
Merge pull request #5926 from eclipse/jetty-10.0.x-tck-run-12-servlet-upgrade
Implementation of HttpServletRequest.upgrade
2021-02-03 13:11:50 +01:00
Ludovic Orban 421ed6bf8d implementation of HttpServletRequest.upgrade
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2021-02-03 13:10:38 +01:00
Joakim Erdfelt 4b568264f1
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2021-02-02 12:17:10 -06:00
Joakim Erdfelt 5ad9bc9b3d
Merge pull request #5669 from eclipse/dependabot/maven/jetty-9.4.x/org.eclipse.jetty.toolchain-jetty-version-maven-plugin-2.7
Bump jetty-version-maven-plugin from 2.6 to 2.7
2021-02-02 12:15:53 -06:00
Joakim Erdfelt b16313b1c8
Merge pull request #5876 from eclipse/jetty-10.0.x-logging-jmx-dynamic
Issue #5872 - JMX DynamicMBean for jetty-slf4j-impl
2021-02-02 08:59:48 -06:00
Joakim Erdfelt 4444e15d6e
Reducing build timeout from 4 hours to 2 hours
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2021-02-02 08:58:17 -06:00
Lachlan Roberts 2ac50130d6 Issue #5868 - allow request attributes to be set during websocket handshake
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-02-02 17:48:11 +11:00
Jan Bartel 49098e6302 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
Signed-off-by: Jan Bartel <janb@webtide.com>
2021-02-01 17:15:35 +01:00
Jan Bartel 4bf250fbaa
Jetty 9.4.x 5859 classloader leak queuedthreadpool (#5894)
* Issue #5859 Fix Classloader leak from QueuedThreadPool

Signed-off-by: Jan Bartel <janb@webtide.com>
2021-02-01 16:58:02 +01:00
olivier lamy 5b97d91f59 Merge branch 'jetty-9.4.x' into jetty-10.0.x 2021-02-01 10:12:39 +10:00
Olivier Lamy efbd1813ff
force properties encoding when filtering resources (#5929)
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2021-02-01 10:11:09 +10:00
Simone Bordet 2f766632b3 Fixes #5924 - Javadoc build triggers maven error
Fixed javadoc generation error.
Apparently, this is caused by a doxia dependency of asciidoctor-maven-plugin
that transitively pulls in Apache HttpClient, but at an older version
that causes this error:

Exception in thread “main” java.lang.NoSuchMethodError: ‘org.apache.http.HttpHost org.apache.http.client.utils.URIUtils.extractHost(java.net.URI)’

Adding Apache HttpClient as an explicit dependency of the asciidoctor-maven-plugin
works around the issue.

Co-authored-by: olivier lamy <oliver.lamy@gmail.com>
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-02-01 00:32:24 +01:00
Simone Bordet f4323a3e3f Improvements to the Jetty documentation.
Moved documentation examples back into jetty-documentation module.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-02-01 00:24:13 +01:00
Joakim Erdfelt 17958ef79d
Issue #5924 - Disabling javadoc module (again)
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2021-01-30 10:12:50 -06:00
olivier lamy f80792f377 version from pom interpolation and fix mvn central url
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2021-01-29 12:50:23 +10:00
Joakim Erdfelt 8c34fdd4ca
Merge pull request #5928 from eclipse/jetty-10.0.x-5924-asciidoc-breakout
Issue #5924 - Reorganized jetty-documentation
2021-01-28 16:08:32 -06:00
Joakim Erdfelt 6a5e1d3961
Merge pull request #5927 from eclipse/jetty-10.0.x-5942-enable-javadoc
Issue #5924 - Enable javadoc module again
2021-01-28 16:07:52 -06:00
Joakim Erdfelt 618bff71e2
Issue #5924 - Reorganized jetty-documentation
* New top level /documentation/
  Which is a parent pom
* Existing /jetty-documentation/ moved to new
  /documentation/jetty-documentation/ location
* New /documentation/jetty-asciidoctor-extensions/ project
  Created from the java code in the old
  /jetty-documentation/src/main/ tree
* Referencing new jetty-asciidoctor-extensions project
  in asciidoc plugin on /documentation/jetty-documentation/pom.xml
* All projects in /documentation/ are now on
  org.eclipse.jetty.documentation groupId

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2021-01-28 10:49:21 -06:00
Joakim Erdfelt f2fe26ffcd
Issue #5924 - Enable javadoc module again
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2021-01-28 10:10:26 -06:00
Jesse McConnell fb4ecf09e9
#5924 remove odd jetty-documentation dependency busting javadoc generation (#5925) 2021-01-28 10:56:21 +10:00