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

28870 Commits

Author SHA1 Message Date
Olivier Lamy 9da4668937
upgrade h2spec plugin to 1.0.11 and xhtml schema 1.2 (#10732) 
* upgrade h2spec plugin to 1.0.11
* use xhtml schema 1.2

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

---------

Signed-off-by: Olivier Lamy <olamy@apache.org>
 2023-10-24 23:01:16 +02:00
Joakim Erdfelt 33f80838ac
Fixes #10771 - EE10 ServletApi.isSecure() bug with ForwardedRequestCustomizer (#10772) 2023-10-24 11:59:55 -05:00
Greg Wilkins 14152c425b
Better handling of Objects in JMX MetaData (#10762) 
* Send attributes as Map<String,String>
* JMX-annotated ErrorHandler, fixed usage of showMessageInTitle and removed showServlet.
* JMX-annotated Request.Handler.
* Added JMX test module to test improvements to JMX.

Co-authored-by: Simone Bordet <simone.bordet@gmail.com>
 2023-10-24 10:03:28 +11:00
Olivier Lamy 2940528033
awaitility must be only test dependency (#10765) 
Signed-off-by: Olivier Lamy <olamy@apache.org>
 2023-10-21 19:16:54 +10:00
Simone Bordet 2aba4117c2
Fixes #10477 - Jetty 12: Review MBeans for Handlers (#10754) 
Updated base MBean class for o.e.j.server.Handler.
Also updated and modernized existing explicit MBean classes.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2023-10-19 23:48:51 +02:00
Jan Bartel 14a5ba3489
Issue #10661 Allow jetty api to override servlets and mappings from webdefault (#10668) 
* Issue #10661 Allow jetty api to override servlets and mappings from webdefault

---------

Co-authored-by: Greg Wilkins <gregw@webtide.com>
 2023-10-19 08:35:44 +02:00
Jan Bartel 467f026d37
Jetty 12.0.x 10716 charset printwriter (#10737) 
* Issue #10716 tck compliance for setting response charset

---------

Co-authored-by: gregw <gregw@webtide.com>
 2023-10-19 05:09:42 +02:00
gregw 524bde565e Merge remote-tracking branch 'origin/jetty-11.0.x' into jetty-12.0.x 
# Conflicts:
#	jetty-ee10/jetty-ee10-servlets/src/test/java/org/eclipse/jetty/ee10/servlets/AbstractDoSFilterTest.java
#	jetty-ee9/jetty-ee9-servlets/src/main/java/org/eclipse/jetty/ee9/servlets/DoSFilter.java
 2023-10-19 09:24:30 +11:00
gregw 5e820ca144 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 
# Conflicts:
#	jetty-servlets/src/main/java/org/eclipse/jetty/servlets/DoSFilter.java
 2023-10-19 09:03:28 +11:00
gregw 78f3b5c9fb Simplify the DosFilter for #1256 
Use only IP tracking for the DosFilter.
Fix defaults

Signed-off-by: gregw <gregw@webtide.com>
 2023-10-19 08:44:50 +11:00
Olivier Lamy ef9abc02e6
tag this test as external (not running on CI) as it is using external resource from https://open.api.ebay.com (#10686) 
Signed-off-by: Olivier Lamy <olamy@apache.org>
 2023-10-19 07:07:39 +10:00
Greg Wilkins 168d8715d4
Simplify the DosFilter for #1256 (#10748) 
Use only IP tracking for the DosFilter to fix #1256

Signed-off-by: gregw <gregw@webtide.com>
 2023-10-19 07:34:54 +11:00
Simone Bordet a9bcbc6512
Merged branch 'jetty-11.0.x' into 'jetty-12.0.x'. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2023-10-18 17:43:32 +02:00
Simone Bordet 5ea5d65c43
Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2023-10-18 17:31:54 +02:00
Simone Bordet 8c94490e18
Fixes #10390 - jetty http3 client and nghttpx. (#10744) 
Fixed handling of long settings values, so that they do not overflow. Added logging for GREASE cases.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2023-10-18 17:06:56 +02:00
Lachlan 929eec9506
Merge pull request #10658 from jetty/fix/jetty-12.0.x-10333-requestTimeStamp 
Issue #10333 - fix flaky test testLogRequestTimeCustomFormats
 2023-10-18 15:47:20 +11:00
Lachlan Roberts 52b91c42df Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2023-10-18 15:35:11 +11:00
Lachlan caddfb5a41
Merge pull request #10675 from OlexYarm/jetty-10.0.x 
Fixed issue 10305 Embedded Jetty server fails to start when requests path contains not existed directory
 2023-10-18 15:34:50 +11:00
Lachlan 22c7295729
Merge pull request #10736 from jetty/jetty-12.0.x-websocketParameterMap 
Issue #10734 - fix websocket CoreSession getParameterMap
 2023-10-18 15:01:59 +11:00
Lachlan Roberts 8f6a371195 Merge remote-tracking branch 'origin/jetty-12.0.x' into jetty-12.0.x-websocketParameterMap 2023-10-18 07:39:51 +11:00
Joakim Erdfelt 74d301e49d
Merge remote-tracking branch 'origin/jetty-11.0.x' into jetty-12.0.x 2023-10-17 08:14:08 -05:00
Joakim Erdfelt bcd8be2293
Merge branch 'jetty-12.0.x' of github.com:jetty/jetty.project into jetty-12.0.x 2023-10-17 07:33:09 -05:00
Joakim Erdfelt d46217ff5b
Remove test reference from VERSION.txt 2023-10-17 07:33:00 -05:00
Joakim Erdfelt 505e8d02bb
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2023-10-17 07:25:04 -05:00
Ludovic Orban 7e2c9e5e2f
Reintroduce dispatched and errors stats as well as stats-on time (#10678) 
* #10555 reintroduced dispatched and errors stats as well as stats-on time counter

Signed-off-by: Ludovic Orban <lorban@bitronix.be>
 2023-10-17 14:20:08 +02:00
Ludovic Orban 5a21bd328a
Fix NPE in ResponseListeners (#10730) 
* #10726 fix NPE in ResponseListeners when demultiplexing is used and the original source spuriously calls demand()

Signed-off-by: Ludovic Orban <lorban@bitronix.be>
 2023-10-17 14:19:10 +02:00
Ludovic Orban 674a1acf06
Allow POSTing with a URL not ending with '/' to jax-ws endpoints (#10710) 
* #10699 allow POSTing with a URL not ending with '/' to jax-ws endpoints

Signed-off-by: Ludovic Orban <lorban@bitronix.be>
 2023-10-17 14:18:29 +02:00
Ludovic Orban 4ed22a7a71
Fix race condition in `ArrayByteBufferPool.clear()` (#10704) 
* #10703 fix race condition in clear() and make sure non-reusable released entries are removed from the pool

Signed-off-by: Ludovic Orban <lorban@bitronix.be>
 2023-10-17 14:17:32 +02:00
Joakim Erdfelt 909e99ec37
Add configuration to allow deferring the initial Deployment until after Server is started (#10667) 
* Delayed Deployment configuration until after Server is started.

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2023-10-17 06:25:01 -05:00
Olivier Lamy f2ab447c4f
Merge 11 to 12 Issue #10731 wrong context attribute name javax.servlet instead of jakarta.servlet (#10735) and Address build/test failure against bad entities. (#10742) (#10745) 
* 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>

* 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>

* use constant

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

---------

Signed-off-by: Olivier Lamy <olamy@apache.org>
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Co-authored-by: Simone Bordet <simone.bordet@gmail.com>
Co-authored-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2023-10-17 07:29:13 +02:00
Olivier Lamy ec58f687b4
Fix surefire display name in surefire report and restore TestTrackerExtension in output" (#10612) 
* use native junit5 display name for xml reports

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

* upgtade test-helper and enable junit extension auto detect

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

---------

Signed-off-by: Olivier Lamy <olamy@apache.org>
 2023-10-17 05:54:37 +02:00
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