DefaultPageCreator: force content sniffing for */* content type

duonglaiquang · rbri · commit 422fe176334a · 2026-03-16T13:02:59.000+01:00
diff --git a/src/main/java/org/htmlunit/DefaultPageCreator.java b/src/main/java/org/htmlunit/DefaultPageCreator.java
@@ -155,7 +155,7 @@ public static PageType determinePageType(final String contentType) {
      */
     public static PageType determinePageType(final WebResponse webResponse) throws IOException {
         final String contentType = webResponse.getContentType();
-        if (!StringUtils.isEmptyOrNull(contentType)) {
+        if (!StringUtils.isEmptyOrNull(contentType) && !"*/*".equals(contentType)) {
             return determinePageType(contentType);
         }
 
diff --git a/src/test/java/org/htmlunit/DefaultPageCreatorTest.java b/src/test/java/org/htmlunit/DefaultPageCreatorTest.java
@@ -38,6 +38,7 @@
  * @author Marc Guillemot
  * @author Ahmed Ashour
  * @author Ronald Brill
+ * @author Lai Quang Duong
  */
 public class DefaultPageCreatorTest extends WebServerTestCase {
 
@@ -377,6 +378,32 @@ protected void doGet(final HttpServletRequest request, final HttpServletResponse
         }
     }
 
+    /**
+     * @throws Exception if the test fails
+     */
+    @Test
+    public void wildcardContentType() throws Exception {
+        final Map<String, Class<? extends Servlet>> servlets = new HashMap<>();
+        servlets.put("/test", WildcardContentTypeServlet.class);
+        startWebServer("./", servlets);
+
+        final WebClient client = getWebClient();
+        assertTrue(client.getPage(URL_FIRST + "test") instanceof HtmlPage);
+    }
+
+    /**
+     * Servlet for {@link #wildcardContentType()}.
+     */
+    public static class WildcardContentTypeServlet extends HttpServlet {
+        /** {@inheritDoc} */
+        @Override
+        protected void doGet(final HttpServletRequest request, final HttpServletResponse response) throws IOException {
+            response.setContentType("*/*");
+            final Writer writer = response.getWriter();
+            writer.write("<html><head></head><body>Hello World</body></html>");
+        }
+    }
+
     /**
      * @throws Exception if the test fails
      */

Original file line number	Diff line number	Diff line change
`@@ -155,7 +155,7 @@ public static PageType determinePageType(final String contentType) {`
`155`	`155`	`*/`
`156`	`156`	`public static PageType determinePageType(final WebResponse webResponse) throws IOException {`
`157`	`157`	`final String contentType = webResponse.getContentType();`
`158`		`- if (!StringUtils.isEmptyOrNull(contentType)) {`
	`158`	`+ if (!StringUtils.isEmptyOrNull(contentType) && !"/".equals(contentType)) {`
`159`	`159`	`return determinePageType(contentType);`
`160`	`160`	`}`
`161`	`161`