Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
27,287 Commits 69 Branches 462 Tags 354 MiB
Commit Graph

720 Commits

Author SHA1 Message Date
Joakim Erdfelt ce52ffdd33
More meaningful .toString() implementations 2022-12-21 12:14:07 -06:00
Joakim Erdfelt e753f35965
Adding more LOG.debug() 2022-12-21 12:04:22 -06:00
Jan Bartel 1abaeb6cee
Jetty 12.0.x osgi (#9068) 2022-12-21 08:12:44 -06:00
Joakim Erdfelt e9ec1f423c
Merge remote-tracking branch 'origin/jetty-11.0.x' into jetty-12.0.x 2022-12-20 12:56:27 -06:00
Joakim Erdfelt c7e866562f
Enable all jetty-deploy tests (#9058) 
* Enable all jetty-deploy tests
 2022-12-20 11:40:49 -06:00
Greg Wilkins 12d66f083a Merge remote-tracking branch 'origin/jetty-11.0.x' into jetty-12.0.x 2022-12-20 11:20:39 +11:00
Jan Bartel 721a4c74fa
Jetty 12.0.x ee10 convert cookie (#9057) 
* Convert HttpCookie -> Cookie based on compliance mode.
* Fix max-age
* Fix old cookie handling; getCookies return null instead of empty list
 2022-12-20 10:22:38 +11:00
Greg Wilkins c18e790858
Jetty 12 handler as boolean processor (#9035) 
Alternative Handler architecture.

All Handlers are Processors, which now return a boolean to indicate the request has been accepted.
The request/response/callback are no longer modal, so there is no race with the boolean return.

Optimized PathMappings.
Avoid iterations if only ServletPathSpec instances
Avoid tests for empty mappings.
Better reset implementation
Improve suffix matching
Improve exact matching

Renamed HttpStream.getNanoTimeStamp() to getNanoTime().

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
Co-authored-by: Simone Bordet <simone.bordet@gmail.com>
 2022-12-19 16:02:26 +01:00
Lachlan Roberts 06f9e5ec18 Merge remote-tracking branch 'origin/jetty-12.0.x' into jetty-12.0.x-httpcontentFactoryCleanup 2022-12-19 21:46:05 +11:00
Greg Wilkins c55938c3fa Merge remote-tracking branch 'origin/jetty-11.0.x' into jetty-12.0.x 2022-12-17 10:29:34 +11:00
Lachlan Roberts 0f1420fbd7 changes from review 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2022-12-16 17:17:12 +11:00
Joakim Erdfelt 3c4fdad9ce
Enable ExternalSiteTest 2022-12-14 13:43:25 -06:00
Joakim Erdfelt 1cecf13575
Enable ConscryptHTTP2ClientTest 2022-12-14 13:36:59 -06:00
Lachlan Roberts a5817144f6 fix HttpContent.Factory config in ResourceHandlerTest 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2022-12-14 18:16:32 +11:00
Simone Bordet e16b7948b2 Fixes #9038 - Jetty 12 - Review EE10 Http[Input|Output].Interceptor APIs 
Removed HttpInput.Interceptor and HttpOutput.Interceptor.
Simplified AsyncContentProducer.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2022-12-13 15:33:27 +01:00
Lachlan Roberts 60656ebb72 make stylesheet final in StaticHttpContentFactory 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2022-12-13 10:48:06 +11:00
Lachlan Roberts 9270e62f78 rename of StaticHttpContentFactory 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2022-12-13 10:44:35 +11:00
Lachlan Roberts abc40afd89 cleanups for HttpContent Factories 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2022-12-13 09:55:55 +11:00
Ludovic Orban 150cad510f improve javadoc and testing + generously comment the surprising implementation 
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
 2022-12-09 19:25:50 +01:00
Simone Bordet d3a0aa281b
Fixed flaky test MultiPartRequestContentTest. 
The problem was that sometimes content bytes generated randomically ended with \r, confusing the multipart parser.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2022-12-09 15:58:57 +01:00
Jan Bartel 642d983e01
Issue #8984 Fix dump of Attributes (#9024) 2022-12-09 09:48:55 +11:00
Simone Bordet bc0b4149ff
Clarified HttpReceiver.responseFailure(). 
Added javadocs to relevant methods in HttpChannel.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2022-12-07 23:50:39 +01:00
Simone Bordet 119996c16f
Merged branch 'jetty-11.0.x' into 'jetty-12.0.x'. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2022-12-07 19:28:05 +01:00
Simone Bordet ee685b23fa
Merged branch 'jetty-11.0.x' into 'jetty-12.0.x'. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2022-12-07 16:23:11 +01:00
Ludovic Orban b244c9f320 fix testFromEmptyByteBufferWithoutReleaser 
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
 2022-12-06 22:52:12 +01:00
Joakim Erdfelt 2d9c735d63
Merge remote-tracking branch 'origin/jetty-11.0.x' into jetty-12.0.x 2022-12-06 14:38:53 -06:00
Ludovic Orban 017b6c1391 fcgi and ContentTransformer bug fixes 
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
 2022-12-06 20:04:30 +01:00
Ludovic Orban 42186bff18 #8993: Disallow creating new chunks with an empty ByteBuffer to make Chunk.isTerminal() contract stricter 
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
 2022-12-06 19:48:17 +01:00
Joakim Erdfelt 45d0b68850
Jetty 12 - Fix `GzipHandler` handling of chunked and `Content-Length` (#8927) 
* Jetty 12 - Enabling ContentLengthTest.testGzippedContentLengthAddedByServer
* Restoring HttpReceiver
* Fixing RequestTest
* Issue #8927 - Cleanup of GzipResponse with eye on RFC-1952 behaviors
* Issue #8927 - Set FINISHED state
* Fixing HEAD from HTTP/2 and HTTP/3
* Adding requested javadoc
 2022-12-06 12:32:01 -06:00
Joakim Erdfelt 95fd8adeb8
Jetty 12 - Issue #8999 - Remove FileID.isArchive() from ResourceFactory (#9002) 
* Issue #8999 - Remove FileID.isArchive() from ResourceFactory
* Remove FileID.isArchive() from URIUtil.toJarFileUri
 2022-12-06 12:31:12 -06:00
Simone Bordet d5054667df
Improved locking for HttpReceiver.ContentSource. (#9007) 
* Improved locking for HttpReceiver.ContentSource.

Improved response failure code path.
Now either responseFailure() must be called, or exchange.responseComplete() followed by HttpReceiver.abort().

Fixed failAndClose() for HTTP/2 and HTTP/3: the connection must not be closed, stream.reset() is sufficient.

Fixed flaky test HttpClientDemandTest.testTwoListenersWithDifferentDemand().

Fixed DistributionTests.testVirtualThreadPool().

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2022-12-06 15:09:48 +01:00
Greg Wilkins e682f73d54
Cleanup of TypeUtil and ContextHandler stop/start (#8998) 
* Extracted some non controversial cleanups from another mega PR:

 + TypeUtil class shortname used more often and includes trailing digits
 + Fixed direct stopping/starting of a nested ContextHandler
 + Fixed null path handling in nested context
 + more tests for all of the above

* Extracted some non controversial cleanups from another mega PR:

Fixed nested doStart and doStop

* Extracted some non controversial cleanups from another mega PR:

Fixed DistributionTests
 2022-12-06 15:43:31 +11:00
Greg Wilkins 9711b04e00 More generous test timeouts 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2022-12-05 16:27:41 +11:00
Simone Bordet 346a59197b
Merged branch 'jetty-11.0.x' into 'jetty-12.0.x'. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2022-12-01 18:04:54 +01:00
Simone Bordet 9f4bc5e5e2
Added test to external server via HttpClientTransportOverHTTP3. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2022-12-01 11:06:33 +01:00
Ludovic Orban 63f1126abc offer EOF data when header frame has the last flag set to true before calling notifyHeaders() 
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
 2022-11-29 09:31:49 +01:00
Ludovic Orban 12e48a7241 replace FSM with SerializedInvoker 
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
 2022-11-29 09:31:49 +01:00
Greg Wilkins eec5e69079
Converted writeTrailers to a static method (#8940) 
Co-authored-by: Simone Bordet <simone.bordet@gmail.com>
 2022-11-29 15:08:36 +11:00
Greg Wilkins 011a7267de
Cleanup ContextHandler (#8928) 
* Cleanup ContextHandler

Extracted some of the goodness from #8793:
 + Clear enter/exit scope methods rather than opaque suppliers and Runnables
 + Removed overloading of "Context" class name to avoid accidental usage of wrong type.
 + Less holding onto request/response as fields

* Cleanup ContextHandler

fixed test with no server

* Updates from review.
 2022-11-25 14:27:39 +11:00
Greg Wilkins 09594361a1
Jetty-12 Rewrite RuleProcessor (#8934) 
* Rewrite RuleProcessor

This decouples the rewrite module from the `WrapperProcessor` class, which is being considered for significant refactoring or removal.
Having a module specific version of that class allows better code readability and a more appropriate API that avoids duplication request instances.

* Fixed javadoc

* Updates from review.

* Updates from review.
 2022-11-25 14:27:21 +11:00
Lachlan a0a8acd8b9
Merge pull request #8935 from eclipse/jetty-12.0.x-byteranges 
Re-enable DefaultServletRangesTest and fix byte ranges for ee10
 2022-11-25 10:27:33 +11:00
Greg Wilkins ca3055423a
Mutable server MimeTypes (#8933) 
Make the MimeTypes available from the server mutable.
Context MimeTypes are now wrappers over the server MimeTypes, so configuration at the server level is inherited by all contexts.
 2022-11-24 16:57:29 +11:00
Lachlan Roberts c8d22c72ea Re-enable DefaultServletRangesTest and fix byte ranges for ee10 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2022-11-24 14:10:41 +11:00
Greg Wilkins 2460b86d41
Jetty 12 recycle servlet channel (#8909) 
Recycle ServletChannel 
Cleanup caching comments and impl
Don't recycle after completion notification
Delay setting callback until ServletHandler.handle called
Check that the retrieved ServletChannel is for the same context.
 2022-11-24 13:56:43 +11:00
Jan Bartel 842956aca7 Fix after merge hell 2022-11-24 10:13:54 +11:00
Jan Bartel c4e1db57ee Issue #8460 simplify DefaultSessionIdManager start (#8464) 
* Issue #8460 check DefaultSessionIdManager is started
 2022-11-24 09:43:57 +11:00
Greg Wilkins a44af984b5
Jetty 12 mimetype cleanup (#8919) 
MimeTypes now available via context.

Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2022-11-23 14:30:11 +11:00
Joakim Erdfelt 84208f9955
Merge pull request #8888 from eclipse/fix/jetty-12-extensible-resource-schemes 
Issue #8886 - support extensible Resource URI schemes
 2022-11-22 18:52:19 -06:00
Joakim Erdfelt 46ccfa1c9e
Fixing URLResourceFactory 2022-11-22 17:15:03 -06:00
Joakim Erdfelt b7d7e53ac7
Merge pull request #8924 from eclipse/fix/jetty-12-fileid-getextension-jdk-20 
Jetty 12 - Align `FileID.getExtension()` with JDK20 behaviors
 2022-11-22 08:24:03 -06:00
Greg Wilkins 3e9403ef39 improved javadoc 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2022-11-22 18:39:21 +11:00
Greg Wilkins b04e9744ee Fixed dot not removed 2022-11-22 11:17:59 +11:00
Joakim Erdfelt ff77fc247f
Issue #8923 - Fixing checkstyle 2022-11-21 15:40:18 -06:00
Joakim Erdfelt 2c1acc1c7f
Issue #8923 - Align FileID.getExtension with JDK20 behaviors 2022-11-21 15:35:06 -06:00
Joakim Erdfelt dbb3bd8d73
Issue #8923 - Align FileID.getExtension with JDK20 behaviors 2022-11-21 15:34:45 -06:00
Simone Bordet 74cb3eea0b
Merged branch 'jetty-11.0.x' into 'jetty-12.0.x'. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2022-11-21 21:17:51 +01:00
Joakim Erdfelt 0a95ea2f9c
Adding UrlResourceFactory.toString 2022-11-21 11:52:31 -06:00
Joakim Erdfelt c00def58cb
Rename AbstractUrlResourceFactory to UrlResourceFactory 
+ Is package private
+ Add ResourceFactory.registerResourceFactory(String)
 2022-11-21 11:42:40 -06:00
Joakim Erdfelt c981b3b5f5
Introduce CompositeResourceFactory 
+ CompositeResourceFactory is
  doing what Resource.create(URI) did
  before.
+ CompositeResourceFactory is tracking
  mounts, and allowing the ability
  to report onMounted (useful for RF.ROOT)
+ ResourceFactory.ROOT,
  ResourceFactory.Closable, and
  ResourceFactory.LifeCycle all use
  this new CompositeResourceFactory
 2022-11-21 11:35:09 -06:00
Joakim Erdfelt eae1d4c63b
Revert flaky 2022-11-21 10:47:24 -06:00
Joakim Erdfelt d6fa9f2d2e
Merge remote-tracking branch 'origin/jetty-12.0.x' into fix/jetty-12-extensible-resource-schemes 2022-11-21 10:46:18 -06:00
Joakim Erdfelt 834f94bca0
Merge remote-tracking branch 'origin/jetty-11.0.x' into jetty-12.0.x 2022-11-21 10:44:36 -06:00
Joakim Erdfelt 363dcdec3a
Merge pull request #8884 from eclipse/fix/jetty-12-move-gzipdefaultservlettest 
Jetty 12 - Move `GzipDefaultServletTest` tests to jetty-core/jetty-server tests
 2022-11-21 10:41:41 -06:00
Simone Bordet 71e0414cbc
Merged branch 'jetty-11.0.x' into 'jetty-12.0.x'. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2022-11-21 15:52:11 +01:00
Ludovic Orban 00e355bebb
Add debug logging to `SerializedInvoker` (#8914) 
Added debug logging and task naming
 2022-11-21 15:39:25 +01:00
Simone Bordet e7f6f6729a
Restored server push functionality. (#8760) 
* Restored server push functionality.

* Moved Request.isPushSupported() to ConnectionMetaData.
* Removed HttpStream.isPushSupported().
* Implemented ee10 PushBuilder.
* Moved PushCacheFilterTest from core to ee10.
* Duplicated PushCacheFilterTest to ee9.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
Co-authored-by: Greg Wilkins <gregw@webtide.com>
 2022-11-21 12:18:19 +01:00
Simone Bordet ca91ce9140
Merged branch 'jetty-11.0.x' into 'jetty-12.0.x'. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2022-11-18 20:08:31 +01:00
Greg Wilkins 9d433d891e fixed HttpStream javadoc 2022-11-18 12:19:28 +11:00
Greg Wilkins 07f09b5452 improve HttpStream javadoc 2022-11-18 11:44:08 +11:00
Greg Wilkins f7d8ea67f6 Merge remote-tracking branch 'origin/jetty-11.0.x' into jetty-12.0.x 
# Conflicts:
#	jetty-ee9/jetty-ee9-nested/src/main/java/org/eclipse/jetty/ee9/nested/ResourceService.java
#	jetty-server/src/test/java/org/eclipse/jetty/server/handler/ResourceHandlerTest.java
 2022-11-17 13:01:45 +11:00
Simone Bordet ec690e2809
Merged branch 'jetty-11.0.x' into 'jetty-12.0.x'. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2022-11-16 22:04:35 +01:00
Simone Bordet da67879cf1
Fixed inconsistencies in naming for styleSheet. 
Some classes had the second S capitalized, some did not, so now stylesheel -> styleSheet.

CSS has 2 "S" for "S"tyle"S"heet.
Also, the DOM API and the Swing API have "StyleSheet".

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2022-11-16 12:18:23 +01:00
Lachlan d72e39757d
Merge pull request #8767 from eclipse/jetty-12.0.x-HttpContent-Caching-Refactor 
Refactor and improvements to HttpContent Factories
 2022-11-16 12:42:32 +11:00
Simone Bordet 557490e437
Fixes #8896 - Flaky TrailersTest. 
In Jetty 12, demand after last frame invokes onDataAvailable(), so the latch needs to be counted down two times.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2022-11-15 19:47:37 +01:00
Joakim Erdfelt 092d24cde5
Flagging flaky test 2022-11-14 15:12:59 -06:00
Joakim Erdfelt f1822c9720
Merge remote-tracking branch 'origin/jetty-12.0.x' into fix/jetty-12-extensible-resource-schemes 2022-11-14 13:09:01 -06:00
Joakim Erdfelt 43937b1987
Issue #8886 - changes to method names + abstract url impl 2022-11-14 13:08:50 -06:00
Simone Bordet bc3aa21b92
Merged branch 'jetty-11.0.x' into 'jetty-12.0.x'. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2022-11-14 16:11:52 +01:00
Simone Bordet d485d1e9ba
Fixed merge of #8882 by removing deprecated constructor, updating parameter order and removing unused classes. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2022-11-14 12:03:12 +01:00
Greg Wilkins a812b86663 Fix test for #8887 
Don't demand at EOF
 2022-11-12 08:46:55 +11:00
Joakim Erdfelt ee097316bb
Issue #8886 - support extensible Resource URI schemes 2022-11-11 10:10:53 -06:00
Joakim Erdfelt 1fec356118
Cleanup and organization of GzipHandlerTest. 
Names of test methods cleaned up.
Duplicate tests removed.
Assertions standardized.
 2022-11-11 09:33:39 -06:00
Greg Wilkins 681e04d68a Temporary disable test that hangs forever. 2022-11-11 16:36:58 +11:00
Lachlan Roberts 905568a93d fix to ResourceHandler for ResourceHandlerTest.testDirectoryOfCollections 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2022-11-11 15:01:22 +11:00
Joakim Erdfelt cf0c4a2b07
Move GzipDefaultServletTest to jetty-core/jetty-server tests 2022-11-10 15:25:22 -06:00
Joakim Erdfelt d7cc13d972
Merge branch 'jetty-12-more-test-tags' into jetty-12.0.x 2022-11-10 13:24:27 -06:00
Joakim Erdfelt c9b621da84
More flaky tags 2022-11-10 11:57:38 -06:00
Joakim Erdfelt 704442b670
Merge remote-tracking branch 'origin/jetty-11.0.x' into jetty-12.0.x 2022-11-10 11:55:28 -06:00
Joakim Erdfelt a636a7d153
Adding some more test tags 2022-11-10 10:14:58 -06:00
Lachlan Roberts 126658145c remove setter for HttpContentFactory on ResourceHandler 
revert to using computeIfAbsent on CachingHttpContentFactory
make direct buffers configurable on CachingHttpContentFactory

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2022-11-11 00:49:55 +11:00
Lachlan Roberts bff3c83726 Merge remote-tracking branch 'origin/jetty-11.0.x' into jetty-12.0.x 2022-11-10 17:38:46 +11:00
Lachlan Roberts eeb4df9965 Merge remote-tracking branch 'origin/jetty-12.0.x' into jetty-12.0.x-HttpContent-Caching-Refactor 2022-11-10 16:20:30 +11:00
Lachlan Roberts 1c6d36e44a changes from review 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2022-11-10 16:16:51 +11:00
Lachlan Roberts 24ce284e04 add return to BufferUtil.readFrom javadoc 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2022-11-10 10:43:58 +11:00
Lachlan Roberts 387d380f75 fixes to the CachingHttpContentFactory caching algorithm 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2022-11-10 10:42:58 +11:00
Joakim Erdfelt 08c47f5f57
Jetty 12 - use JVM provided null OutputStream (#8789) 
* Remove IO.getNull* methods and use JVM versions

+ This also honors the open/close/error on
  bad use of the streams/writers
 2022-11-09 07:06:43 -06:00
Simone Bordet 0e3f3ac316
Merged branch 'jetty-11.0.x' into 'jetty-12.0.x'. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2022-11-09 12:14:29 +01:00
Lachlan Roberts 3d96b4b7d0 fix javadoc 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2022-11-09 14:52:17 +11:00
Lachlan Roberts 890d02568c use double checked locking for FileMappedHttpContent 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2022-11-09 14:43:42 +11:00
Lachlan Roberts 5fec1801f5 add getters and setters for HttpContentFactory onto ResourceHandler 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2022-11-09 14:20:52 +11:00
Lachlan Roberts a4e773a7ab changes from review 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2022-11-09 14:10:49 +11:00
Joakim Erdfelt aa9df2a402
Merge remote-tracking branch 'origin/jetty-11.0.x' into jetty-12.0.x 2022-11-08 18:16:45 -06:00
Simone Bordet bb3355be83
Merged branch 'jetty-11.0.x' into 'jetty-12.0.x'. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2022-11-08 22:26:39 +01:00
Lachlan Roberts 75f210d20b Merge remote-tracking branch 'origin/jetty-12.0.x' into jetty-12.0.x-HttpContent-Caching-Refactor 2022-11-08 21:22:53 +11:00
Lachlan Roberts 489da47a38 changes from review 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2022-11-08 18:17:37 +11:00
Simone Bordet 4225544222
Merged branch 'jetty-11.0.x' into 'jetty-12.0.x'. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2022-11-07 19:34:43 +01:00
Joakim Erdfelt b3505ae687
Jetty 12 - General cleanup of URIUtil (#8861) 
+ Removal of __CHARSET
+ Removal of unused methods
+ Using new switch/case concepts
+ cleanup of URIUtil constants
+ cleanup of URIUtil methods
+ collapse separate methods
+ simplify encodePath()
* Javadoc updates
* equalsIgnoreEncoding cleanup (no longer used by Resource layer)
 2022-11-04 14:28:53 -05:00
Simone Bordet 41e9842921
Fixes #8858 - Jetty 12 Review MovedContextHandler. (#8859) 
* Fixes #8858 - Jetty 12 Review MovedContextHandler.

Updated method names to avod references to Servlet concepts.
Added test cases.
Updated XML files.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2022-11-03 16:13:46 +01:00
Lachlan Roberts 7bb3fcae03 Merge remote-tracking branch 'origin/jetty-12.0.x' into jetty-12.0.x-HttpContent-Caching-Refactor 2022-11-03 18:13:02 +11:00
Lachlan Roberts d94abe3f3f fix javadoc in ValidatingCachingContentFactory 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2022-11-03 18:10:39 +11:00
Lachlan Roberts 4ad42e3cdb add getBytesOccupied method to HttpContent 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2022-11-03 18:00:03 +11:00
Lachlan Roberts c0bb0272f7 fix release in CachingHttpContentFactory and always use ByteBufferPool 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2022-11-03 17:38:22 +11:00
Simone Bordet e2b00bd4e0
Improved non-blocking algorithm of AdaptiveExecutionStrategy. 
Now only starting one pending producer also in case of CAS failures.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2022-11-02 11:19:08 +01:00
Lachlan Roberts ac2d54aa17 do not cache notFound entries in TryPathsHandlerTests ResourceHandler 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2022-11-02 17:54:16 +11:00
Lachlan Roberts 6facedba75 Merge remote-tracking branch 'origin/jetty-12.0.x' into jetty-12.0.x-HttpContent-Caching-Refactor 2022-11-02 17:28:42 +11:00
Lachlan Roberts e28a528165 changes from review 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2022-11-02 17:21:44 +11:00
Greg Wilkins deb4f3a8e8 Suppress stack in expected warning 2022-11-02 14:42:28 +11:00
Greg Wilkins 8e699866ef Suppress stack in expected warning 2022-11-02 14:37:35 +11:00
Greg Wilkins 7e88b8234c
Experiment with lock free AdaptiveExecutionStrategy (#8762) 
Removed the lock from the AdaptiveExecutionStrategy in favour of a BiInteger.
 2022-11-02 08:16:24 +11:00
Greg Wilkins 976ab3df8d
ResourceCollection should not have a path (#8711) 
ResourceCollection should not have a path
Nor name, nor filename unless all resources agree on it.
revert combine and related methods to return Resource and not explicitly a ResourceCollection, as if there is only 1, then a collection is not needed
cleanup ResourceCollection creation. Avoid sanity checks on resolved resources.
 2022-11-01 15:54:50 +11:00
Greg Wilkins 4225054b62 Improve comments 2022-11-01 11:16:57 +11:00
Joakim Erdfelt 47d2b062f0
Jetty 12 - Fix demo-ee10 `LikeJettyXml` (and testcase) (#8771) 
* Remove DebugBinding config (doesn't exist anymore)

* Make LikeJettyXml work (and test)
 2022-10-31 11:57:05 -05:00
Joakim Erdfelt dee5d14130
Jetty 12 - Alternate `TryPathsHandler` based on `Request.Processor` existence (#8781) 
Now using TryPathsHandler with a PathMappingsHandler.
Introduced original[Path|Query]Attribute.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
Co-authored-by: Simone Bordet <simone.bordet@gmail.com>
 2022-10-28 17:06:52 +02:00
Simone Bordet 3e9bebd05a
Merged branch 'jetty-11.0.x' into 'jetty-12.0.x'. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2022-10-28 16:20:17 +02:00
Simone Bordet 72d2724906
Fixed build with Java 17+. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2022-10-27 11:40:37 +02:00
Simone Bordet 6ca9c4f878
Fixed test case. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2022-10-27 10:46:40 +02:00
Lachlan Roberts af19607f1c use name annotation for EvictingCachingContentFactory constructors 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2022-10-26 11:26:06 +11:00
Joakim Erdfelt 508e0a4484
fixing compilation 2022-10-25 15:32:58 -05:00
Joakim Erdfelt 8eb10b2d74
Jetty 12 - Introduce PathMappingsHandler (#8748) 
* Introduce PathMappingsHandler
 2022-10-25 10:04:33 -05:00
Simone Bordet 05e1722045
Relax test case assert. 
The test may fail either for a SocketTimeoutException, or a NoRouteToHostException.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2022-10-25 15:53:07 +02:00
Simone Bordet cf366b3323
Improved javadocs. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2022-10-25 15:42:49 +02:00
Greg Wilkins 58bfda7cf9 replaced getPathInContext with static method 
updates from review
 2022-10-25 21:47:21 +11:00
Greg Wilkins 3b2d4048fd replaced getPathInContext with static method 
updates from review
 2022-10-25 21:11:10 +11:00
Greg Wilkins 9dc9eaa711 Merge remote-tracking branch 'origin/jetty-12.0.x' into jetty-12-static-pathInContext 2022-10-25 20:42:25 +11:00
Gili Tzabari 0724d1090d
Fixes #8723: Provide a thread-safe way to modify HttpClient proxies at runtime. 2022-10-25 10:23:04 +02:00
Lachlan Roberts 7752720861 Merge remote-tracking branch 'origin/jetty-12.0.x' into jetty-12.0.x-HttpContent-Caching-Refactor 2022-10-25 16:44:53 +11:00
Greg Wilkins 6c9d34c26a Merge remote-tracking branch 'origin/jetty-12.0.x' into jetty-12-static-pathInContext 
# Conflicts:
#	jetty-ee10/jetty-ee10-servlet/src/main/java/org/eclipse/jetty/ee10/servlet/DefaultServlet.java
 2022-10-25 09:11:40 +11:00
Simone Bordet 660093ff3a
Code cleanups. 
Removed obsolete oej.server.HttpTransport.
Cleaned up ConnectionMetaData.Wrapper.
Simplified ee10 DefaultServlet.ServletCoreRequest.
Other minor cleanups.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2022-10-24 16:25:53 +02:00
Greg Wilkins 31e4a8234f replaced getPathInContext with static method 2022-10-24 23:36:02 +11:00
Greg Wilkins 3598d7eb45 replaced getPathInContext with static method 2022-10-24 23:34:35 +11:00
Greg Wilkins b627814a7b
Implement ErrorPageErrorProcessor to resolve #8726 (#8736) 2022-10-24 21:25:38 +11:00
Greg Wilkins 14d912c654 replaced getPathInContext with static method 2022-10-24 21:02:18 +11:00
Greg Wilkins 465ddf0932 WIP replacing getPathInContext with static method 2022-10-24 17:55:16 +11:00
Greg Wilkins b25f69806c WIP replacing getPathInContext with static method 2022-10-24 16:30:09 +11:00
Greg Wilkins 30401d8cf8 WIP replacing getPathInContext with static method 2022-10-24 11:26:50 +11:00
Greg Wilkins 1885df7e03 WIP replacing getPathInContext with static method 2022-10-23 22:36:15 +11:00
Greg Wilkins 128a615773 Merge remote-tracking branch 'origin/jetty-12.0.x' into jetty-12-static-pathInContext 2022-10-23 20:00:45 +11:00
Simone Bordet 76ca392917
Merged branch 'jetty-11.0.x' into 'jetty-12.0.x'. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2022-10-22 15:11:26 +02:00
Ludovic Orban 502cc77da9 fix ContentSourceTransformer demand() to serialize callback invocations and delegate demand to the raw source only when needed 
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
 2022-10-21 15:43:16 +02:00
Ludovic Orban 38289e46d4
Make Client's Request and Response `abort()` fully async (#8725) 
Changed Request and Response abort() to be fully async by returning a CompletableFuture<Boolean>

Signed-off-by: Ludovic Orban <lorban@bitronix.be>
 2022-10-21 15:32:46 +02:00