You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by cz...@apache.org on 2024/04/14 13:56:43 UTC
(felix-dev) branch master updated (598b9f0198 -> a8704fe145)
This is an automated email from the ASF dual-hosted git repository.
cziegeler pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/felix-dev.git
from 598b9f0198 Update Felix HTTP documentation (#303)
new 04bb0b7554 Update webconsole readme
new a8704fe145 FELIX-6696 : Resources content-type are no longer defined when using a whiteboard pattern
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../felix/http/base/internal/whiteboard/ResourceServlet.java | 7 ++++++-
http/jetty/pom.xml | 2 +-
http/jetty12/pom.xml | 2 +-
webconsole/README.md | 9 +++++++++
4 files changed, 17 insertions(+), 3 deletions(-)
(felix-dev) 01/02: Update webconsole readme
Posted by cz...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
cziegeler pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/felix-dev.git
commit 04bb0b75546242fa4f71d119a55c8d329586d445
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Sun Apr 14 15:22:58 2024 +0200
Update webconsole readme
---
webconsole/README.md | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/webconsole/README.md b/webconsole/README.md
index 78c693f5a1..7a5250f71e 100644
--- a/webconsole/README.md
+++ b/webconsole/README.md
@@ -111,6 +111,13 @@ In this case the Configuration Manager displays the name "myRealm, myClass" as d
## Releases
+### Changes in 5.0.2 (14/Apr/24)
+
+#### Bug
+
+- [FELIX-6688](https://issues.apache.org/jira/browse/FELIX-6688) : Context path of outer servlet container is not respected for authentication
+
+
### Changes in 5.0.0 (8/Jan/24)
#### New Feature
@@ -126,6 +133,8 @@ In this case the Configuration Manager displays the name "myRealm, myClass" as d
- [FELIX-6654](https://issues.apache.org/jira/browse/FELIX-6654) : Remove support for commons fileupload
+### Changes in 4.9.8 (14/Apr/24) #### Bug [...]
+
### Changes in 4.9.6 (7/Oct/23)
####
(felix-dev) 02/02: FELIX-6696 : Resources content-type are no longer defined when using a whiteboard pattern
Posted by cz...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
cziegeler pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/felix-dev.git
commit a8704fe1452629a6d03122925a469df426f2dcf2
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Sun Apr 14 15:56:30 2024 +0200
FELIX-6696 : Resources content-type are no longer defined when using a whiteboard pattern
---
.../felix/http/base/internal/whiteboard/ResourceServlet.java | 7 ++++++-
http/jetty/pom.xml | 2 +-
http/jetty12/pom.xml | 2 +-
3 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/http/base/src/main/java/org/apache/felix/http/base/internal/whiteboard/ResourceServlet.java b/http/base/src/main/java/org/apache/felix/http/base/internal/whiteboard/ResourceServlet.java
index 3d873feaa7..d2666061c7 100644
--- a/http/base/src/main/java/org/apache/felix/http/base/internal/whiteboard/ResourceServlet.java
+++ b/http/base/src/main/java/org/apache/felix/http/base/internal/whiteboard/ResourceServlet.java
@@ -24,6 +24,8 @@ import java.net.URISyntaxException;
import java.net.URL;
import java.net.URLConnection;
+import org.apache.felix.http.base.internal.util.MimeTypes;
+
import jakarta.servlet.ServletException;
import jakarta.servlet.http.HttpServlet;
import jakarta.servlet.http.HttpServletRequest;
@@ -64,7 +66,10 @@ public class ResourceServlet extends HttpServlet {
private void handle(final HttpServletRequest req, final HttpServletResponse res, final URL url, final String resName)
throws IOException {
- final String contentType = getServletContext().getMimeType(resName);
+ String contentType = getServletContext().getMimeType(resName);
+ if (contentType == null) {
+ contentType = MimeTypes.get().getByFile(resName);
+ }
if (contentType != null) {
res.setContentType(contentType);
}
diff --git a/http/jetty/pom.xml b/http/jetty/pom.xml
index d66c20cb79..bb16c026a0 100644
--- a/http/jetty/pom.xml
+++ b/http/jetty/pom.xml
@@ -431,7 +431,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.http.base</artifactId>
- <version>5.1.6</version>
+ <version>5.1.7-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
diff --git a/http/jetty12/pom.xml b/http/jetty12/pom.xml
index 6222fdbfc1..02eeb1d911 100644
--- a/http/jetty12/pom.xml
+++ b/http/jetty12/pom.xml
@@ -434,7 +434,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.http.base</artifactId>
- <version>5.1.6</version>
+ <version>5.1.7-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>