Commit Graph

1183 Commits

Author SHA1 Message Date
Simone Bordet 8131bb2f85 Fixes #3080 - Do not create and use jars with "tests" classifier.
Updates after review.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-11-26 11:20:36 +01:00
Simone Bordet 3ca8ef0297 Fixes #3080 - Do not create and use jars with "tests" classifier.
Reinstated ServletTester in src/main/java for backwards compatibility.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-11-26 10:48:19 +01:00
Simone Bordet 5d83f6670a Fixes #3080 - Do not create and use jars with "tests" classifier.
Removed the jetty-server and jetty-servlet test-jar artifacts.
The only one left is the jetty-maven-plugin test-jar.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-11-25 19:16:50 +01:00
Lachlan Roberts 7bc4ee6509 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-WebSocketUpgradeFilter 2020-11-19 07:48:16 +11:00
Lachlan Roberts 6a83a261e1 Always add the default WebSocketUpgradeFilter as the first filter.
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-11-18 21:27:25 +11:00
Joakim Erdfelt e9c6c942ea
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-11-17 09:12:50 -06:00
Joakim Erdfelt 314c65fb14
Issue #5539 - Adding StatisticsServlet tests in test-distribution
+ Updating module definition for JSON

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-11-16 12:31:28 -06:00
Joakim Erdfelt 683d9a9349
Issue #5539 - Updating StatisticsServlet accept processing per review
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-11-16 09:10:24 -06:00
Joakim Erdfelt c9440357a7
Issue #5539 - Fixing javadoc
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-11-16 09:10:23 -06:00
Joakim Erdfelt cc952f3a3a
Issue #5539 - Adding query parameter accept variation
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-11-16 09:10:22 -06:00
Joakim Erdfelt b419db90c5
Issue #5539 - Cleanup, adding javadoc, etc.
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-11-16 09:10:21 -06:00
Joakim Erdfelt 02f35deeaa
Issue #5539 - Deprecating 'xml' request parameter in StatisticsServlet
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-11-16 09:10:21 -06:00
Joakim Erdfelt 5362467e67
Issue #5539 - Proper StatisticsServlet output format via content negotiation
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-11-16 09:10:21 -06:00
Joakim Erdfelt 9e22260377
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-11-10 12:12:39 -06:00
Joakim Erdfelt 21c27f6370
Fixing checkstyle violations
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-11-10 06:33:04 -06:00
Joakim Erdfelt a7ed2f072a
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-11-02 19:04:59 -06:00
Joakim Erdfelt 981b50df58
Merge pull request #5559 from eclipse/jetty-9.4.x-5555-NPE-NamedFilterMapping
Jetty 9.4.x 5555 npe named filter mapping
2020-11-02 07:57:18 -06:00
gregw 4c49ca5184 More cleanup for #5555
Some more cleanup for #5555
2020-11-02 14:08:46 +01:00
gregw 27f0c4141c Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-11-02 13:31:19 +01:00
Greg Wilkins b77ee515a5
Fixes #5555 NPE if Filter of named servlet (#5556)
Fixed #5555 NPE if there is a filter with a servlet name mapping, but a request is received for a servlet without a name match.
Added more simple tests for servlet and filter mappings
2020-11-02 13:30:52 +01:00
gregw 47b1583c7f Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-11-02 10:58:06 +01:00
Simone Bordet 40fd98d6a9 Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 2020-11-02 10:47:03 +01:00
gregw f21c606f1d Fixes #5539 Stats XML format
Signed-off-by: gregw <gregw@webtide.com>
2020-11-02 10:45:45 +01:00
Simone Bordet a1b3d3319d
Merge pull request #5491 from eclipse/jetty-9.4.x-5488-jetty-dir.css
Fixes #5488 - jetty-dir.css not found when using JPMS.
2020-11-02 10:40:19 +01:00
gregw 365bab153c Fixes #5555 NPE if Filter of named servlet
Fixed #5555 NPE if there is a filter with a servlet name mapping, but a request is received for a servlet without a name match.
Added more simple tests for servlet and filter mappings
2020-11-02 10:19:08 +01:00
Greg Wilkins d3bdeefa1a Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2020-10-28 18:01:56 +01:00
Greg Wilkins 7a0de6af3a
Fixes #5498 ServletHolder cleanup (#5514)
* Fixes #55498 ServletHolder cleanup

Various cleanups for #5498 including:
 + renaming multiple `_servlet` fields in inner classes to avoid confusion
 + better comments in prepare method to describe why it is needed
 + call prepare from Invoker servlet
 + The `_servlet` field is not set until after the servlet is initialized
 + Consistent wrapping of `SingleThreadedWrapper` now in `initServlet`
 + The `getServlet` method now looks the volatile `_servlet` to avoid locking if possible
 + The `handle` method now calls `getServletInstance` as servlet will have been initialized in `prepare`
 + Found and fixed race with making unavaiable servlet available again
 + fixed nanotime overflow
 + fixed several compiler warnings/suggestions
 + removed while true from unavailable servlet
 + Do not destroy servlets unless init has been called.
 + Added TODOs about calling predestroy on instances not created by the holder.
 + Do not destroy servlets unless init has been called.
 + Added TODOs about calling predestroy on instances not created by the holder.
 + improved dump and toString
2020-10-28 17:46:49 +01:00
Simone Bordet 4a4a73df2e Fixes #5488 - jetty-dir.css not found when using JPMS.
Moved jetty-dir.css from jetty-util to jetty-server,
so that it can be found by ResourceHandler when using JPMS.

Updated DefaultServlet to call a ResourceHandler method
to retrieve the stylesheet.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-10-22 16:48:27 +02:00
Joakim Erdfelt e12c3ce50b
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-10-16 08:11:42 -05:00
Joakim Erdfelt fdd880b66b
Issue #5451 - Cleanup of temp file cleanup.
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-10-15 18:10:38 -05:00
Joakim Erdfelt dfa076fdb5
Merge pull request #5403 from eclipse/jetty-10.0.x-5401-move-httptester
Move HttpTester to jetty-http
2020-10-12 06:14:44 -05:00
gregw 94ef9342bb Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
Signed-off-by: gregw <gregw@webtide.com>
2020-10-07 23:48:38 +02:00
Greg Wilkins 721a05eb9d
Fixes #5378 Setting Holders during STARTING (#5397)
* Fixes #5378 Setting Holders during STARTING

Holders are now started/initialized if needed by a new utility method

* Fixes #5378 Setting Holders during STARTING

Holders are now started/initialized if needed by a new utility method
2020-10-07 23:22:55 +02:00
Joakim Erdfelt 857e888e8b
Issue #5401 - Move HttpTester to jetty-http
+ leaving jetty-http-tools alone

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-10-07 14:50:31 -05:00
gregw 911173f8f7 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-10-05 13:57:20 +02:00
Greg Wilkins c40b955e09
Issue #5022 Filter Cache cleanup (#5271)
* Issue #5022 Filter Cache cleanup

Issue #5022 Filter Cache cleanup:
 + Fixed many compiler warnings
 + removed old LazyList leftovers
 + Don't create holder string for source unless required
 + Only have a single type of chain, so it can be wrapped regardless of cache
 + Reverse mappings lists to make filter chain creation easier
 + build chain directly rather than build a list then a chain

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

* added comment to explain ordering

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

* More cleanups

* fixed toString format
turn off debug in OSGI test
2020-10-05 13:29:11 +02:00
gregw 094a25a405 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-10-05 12:29:00 +02:00
gregw 6d69e31439 Extra tests for #5378 2020-10-05 12:28:10 +02:00
Joakim Erdfelt a8db28f706
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-09-17 06:29:01 -05:00
Joakim Erdfelt 59976dce54
Issue #5032 - Minimal Extensible Web App changes
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-09-17 05:58:06 -05:00
gregw d7b3d62982 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
Signed-off-by: gregw <gregw@webtide.com>
2020-09-07 15:59:27 +02:00
Greg Wilkins 7ecf42e3f8
Issue #5162 CDI embedded integration improvements (#5177)
* Issue #5162 CDI embedded integration improvements

Clean up CDI integration and documentation to better support embedded usage.
 + made listener public
 + added utility class for SCIs

* Issue #5162 CDI embedded integration improvements

Clean up CDI integration and documentation to better support embedded usage.
 + moved EmbeddedWeldTest to jetty-embedded

* fix javadoc

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

* Issue #5162 CDI embedded integration improvements

ventilated text

* fix test pom

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

* Fixed javadoc

* Fixed javadoc

* Issue #5162 CDI embedded integration improvements

Moved tests to jetty-cdi to avoid consequences to other tests in embedded

* trailing new line

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

* updates from review

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

* Feedback from review
2020-09-07 14:00:20 +02:00
Joakim Erdfelt 9d839fe6e6
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-09-02 12:59:04 -05:00
Joakim Erdfelt dcb06d3c35
Issue #5214 - Use known content_length when in HEAD mode
+ Adding DefaultServlet.doHead() to avoid servlet wrapping
+ Making ResourceService HEAD aware

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-08-31 11:03:49 -05:00
Greg Wilkins 601710c9dc
Issue #5171 Simplify GzipHandler user-agent handling (#5196)
* Issue #5171 Simplify GzipHandler user-agent handling

+ Remove User-Agent handling from GzipHandler
+ Allow Vary header to be set
+ Create rewrite MsieRule to remove Accept-Encoding from IE<=6

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

* + Full implementation of HttpFields ensure
 + use for Vary field

* + fixed checkstyle

* + fixed test for merged header

* + fixed javadoc

* Issue #5171 Simplify GzipHandler user-agent handling

 + improved comments

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

* rename and testing after review
2020-08-26 23:55:36 +02:00
Jan Bartel 77779ed6d8
Issue #4996 - Regularlize logging (#5167)
* Issue #4996 Regularize logging

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

Co-authored-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-08-24 17:15:13 +02:00
Simone Bordet d53d9d8a1d Fixes #5079 - :authority header for IPv6 address not having square brackets.
On the client:
* Origin.Address.host is passed through HostPort.normalizeHost(),
so that if it is IPv6 is bracketed.
Now the ipv6 address passed to an `HttClient` request is bracketed.
* HttpRequest was de-bracketing the host, but now it does not anymore.

On the server:
* Request.getLocalAddr(), getLocalName(), getRemoteAddr(),
getRemoteHost(), getServerName(), when dealing with an IPv6 address,
return it bracketed.
The reason to return bracketed IPv6 also from *Addr() methods is that
if it is used with InetAddress/InetSocketAddress it still works, but
often it is interpreted as a URI host so brackets are necessary.
* DoSFilter was blindly bracketing - now it does not.

Added a number of test cases, and fixed those that expected
non-bracketed IPv6.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-08-07 15:53:19 +02:00
Simone Bordet c49035570e Merged branch 'jetty-10.0.x' into 'jetty-10.0.x-convert_synchronized_to_autolock'. 2020-08-04 16:32:55 +02:00
Simone Bordet 2fe01626a5 Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 2020-07-31 17:47:37 +02:00
Greg Wilkins 7adbf247ec
Issue #5093 Static UrlEncoded (#5098)
* Issue #5093 Static UrlEncoded

Updated UrlEncoded to static only class with no synchronization

* Fixed additional tests

* fixed formatting

Signed-off-by: gregw <gregw@webtide.com>
2020-07-30 17:57:38 +02:00