Changeset 17656 in josm

Timestamp:

2021-03-24T17:56:03+01:00 (4 years ago)

Author:

simon04

Message:

fix #20661 - Remote control: fix usage report (HTML)

​http://localhost:8111/

File:

• trunk/src/org/openstreetmap/josm/io/remotecontrol/RequestProcessor.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/io/remotecontrol/RequestProcessor.java

@@ -254 +254 @@
                 String help = "No command specified! The following commands are available:<ul>" + usage
                         + "</ul>" + "See <a href=\""+websiteDoc+"\">"+websiteDoc+"</a> for complete documentation.";
-                sendBadRequest(out, help);
+                sendErrorHtml(out, 400, "Bad Request", help);
             } else {
                 // create handler object
@@ -302 +302 @@
 
     private static void sendError(Writer out, int errorCode, String errorName, String help) throws IOException {
+        sendErrorHtml(out, errorCode, errorName, help == null ? "" : "<p>"+Utils.escapeReservedCharactersHTML(help) + "</p>");
+    }
+
+    private static void sendErrorHtml(Writer out, int errorCode, String errorName, String helpHtml) throws IOException {
         sendHeader(out, errorCode + " " + errorName, "text/html", true);
         out.write(String.format(
@@ -307 +311 @@
                 "<title>" + errorName + "</title>",
                 "<h1>HTTP Error " + errorCode + ": " + errorName + "</h1>" +
-                (help == null ? "" : "<p>"+Utils.escapeReservedCharactersHTML(help) + "</p>")
+                helpHtml
         ));
         out.flush();