WebRequest.getParameters(): switch order for multipart requests (#836)

HtmlUnit · Aug 5, 2024 · 0e375e3 · 0e375e3
1 parent 24ca458
commit 0e375e3
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 19 deletions.
diff --git a/src/main/java/org/htmlunit/WebRequest.java b/src/main/java/org/htmlunit/WebRequest.java
@@ -408,10 +408,11 @@ public List<NameValuePair> getParameters() {
         if (FormEncodingType.MULTIPART == getEncodingType()) {
             final List<NameValuePair> allParameters = new ArrayList<>();
 
+            allParameters.addAll(HttpUtils.parseUrlQuery(getUrl().getQuery(), getCharset()));
+
             // the servlet api ignores these parameters but to make spring happy we include them
             allParameters.addAll(getRequestParameters());
 
-            allParameters.addAll(HttpUtils.parseUrlQuery(getUrl().getQuery(), getCharset()));
             return normalize(allParameters);
         }
 

diff --git a/src/test/java/org/htmlunit/WebRequest2Test.java b/src/test/java/org/htmlunit/WebRequest2Test.java
@@ -361,24 +361,6 @@ private static void bounce(final Writer writer,
                 final HttpServletRequest req, final HttpServletResponse resp) throws IOException {
             writer.write("Parameters: \n");
 
-            // different from the servlet api spring also uses the file upload information
-            try {
-                // if (ServletFileUpload.isMultipartContent(req)) {
-                // ignore the post request check
-                if (FileUploadBase.isMultipartContent(new ServletRequestContext(req))) {
-                    final DiskFileItemFactory factory = new DiskFileItemFactory();
-
-                    final ServletFileUpload upload = new ServletFileUpload(factory);
-                    final List<FileItem> items = upload.parseRequest(req);
-                    for (final FileItem fileItem : items) {
-                        writer.write("  '" + fileItem.getFieldName() + "': '" + fileItem.getString() + "'\n");
-                    }
-                }
-            }
-            catch (final FileUploadException e) {
-                throw new IOException(e);
-            }
-
             // use only getParameterMap() here because we like to have the same behavior
             for (final Map.Entry<String, String[]> entry : req.getParameterMap().entrySet()) {
                 if (entry.getValue() == null) {
@@ -402,6 +384,24 @@ else if (entry.getValue().length == 0) {
                     writer.write("]\n");
                 }
             }
+
+            // different from the servlet api spring also uses the file upload information
+            try {
+                // if (ServletFileUpload.isMultipartContent(req)) {
+                // ignore the post request check
+                if (FileUploadBase.isMultipartContent(new ServletRequestContext(req))) {
+                    final DiskFileItemFactory factory = new DiskFileItemFactory();
+
+                    final ServletFileUpload upload = new ServletFileUpload(factory);
+                    final List<FileItem> items = upload.parseRequest(req);
+                    for (final FileItem fileItem : items) {
+                        writer.write("  '" + fileItem.getFieldName() + "': '" + fileItem.getString() + "'\n");
+                    }
+                }
+            }
+            catch (final FileUploadException e) {
+                throw new IOException(e);
+            }
         }
     }
 }