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

450 Commits

Author SHA1 Message Date
Jan Bartel dc49639444 Merge remote-tracking branch 'origin/jetty-11.0.x' into jetty-12.0.x 2022-12-19 10:11:49 +11:00
Jan Bartel f139b66d63
Issue #9046 Fix tck session invalidate test (#9047) 2022-12-14 08:25:52 +11:00
Olivier Lamy 139d3f2a41
response#getWriter should throw UnsupportedEncodingException in case of bad character encoding used (#9037) 
* response#getWriter should throw UnsupportedEncodingException in case of bad character encoding used

Signed-off-by: Olivier Lamy <olamy@apache.org>
 2022-12-13 08:47:52 +10: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
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
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
Jan Bartel 91c7a51cbc
Issue #8921 Fix normalization of META-INF resources for quickstart (#8922) 
* Issue #8921 Fix normalization of META-INF resources for quickstart
 2022-12-06 08:51:44 +11:00
Greg Wilkins f59eaa58c9
Fix #8980 addJars to WebAppClassLoader (#8982) 
List of resources is a list of resources, not a combined resource.
 2022-12-01 15:08:13 +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 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 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 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
Jan Bartel 07202102b8
Jetty 12 - Re-enable some disabled session tests. (#8714) 
* Re-enable some disabled session tests.

* Add needed test resources to ee8 jdbc session test.
 2022-11-22 17:25:06 +11:00
Joakim Erdfelt 95e149b236
Issue #8923 - Fixing WebAppClassLoader expectations 2022-11-21 16:20:27 -06:00
Greg Wilkins 11fdbbef02 Fixed switch statement style and format 2022-11-22 09:16:08 +11: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
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
Jan Bartel 9cb6cc62d5 Merge remote-tracking branch 'origin/jetty-11.0.x' into jetty-12.0.x 2022-11-21 13:15:27 +11:00
Joakim Erdfelt 18f22816c9
Merge remote-tracking branch 'origin/jetty-11.0.x' into jetty-12.0.x 2022-11-17 13:01:00 -06: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
Lachlan Roberts eff404cf7d Re-enable and fix StatisticsServletTest for ee9 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2022-11-14 09:37:26 +11: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 7cccd9629f Merge remote-tracking branch 'origin/jetty-11.0.x' into jetty-12.0.x 2022-11-10 17:05:00 +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
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 e2e4d256e7
Merged branch 'jetty-11.0.x' into 'jetty-12.0.x'. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2022-11-09 12:23:27 +01: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
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
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
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 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 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
Lachlan Roberts 02e0a3993c cannot add ContentFactory to servletContext attribute as there may be multiple factories in a single context 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2022-10-25 16:39:42 +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