Ticket #8606: 8606.patch

src/org/openstreetmap/josm/data/Version.java

@@ -226 +226 @@
         }
         return "JOSM/1.5 ("+ s+" "+LanguageInfo.getJOSMLocaleCode()+") " + Main.platform.getOSDescription();
     }
+
+    /**
+     * Returns the full User-Agent string
+     * @return The User-Agent
+     * @since 5866
+     */
+    public String getFullAgentString() {
+        return getAgentString + " Java/"+System.getProperty("java.version");
+    }
 }

src/org/openstreetmap/josm/io/imagery/WMSGrabber.java

@@ -50 +50 @@
         if(layer.getInfo().getCookies() != null && !layer.getInfo().getCookies().equals("")) {
             props.put("Cookie", layer.getInfo().getCookies());
         }
+        props.put("User-Agent", Version.getInstance().getFullAgentString()));
         Pattern pattern = Pattern.compile("\\{header\\(([^,]+),([^}]+)\\)\\}");
         StringBuffer output = new StringBuffer();
         Matcher matcher = pattern.matcher(this.baseURL);

src/org/openstreetmap/josm/tools/Utils.java

@@ -553 +553 @@
             throw new IllegalArgumentException("Invalid HTTP url");
         }
         HttpURLConnection connection = (HttpURLConnection) httpURL.openConnection();
+        connection.setRequestProperty("User-Agent", Version.getInstance().getFullAgentString()));
         return connection;
     }