Changeset 6073 in josm for trunk/src/org/openstreetmap

Timestamp:

2013-07-19T01:41:40+02:00 (11 years ago)

Author:

Don-vip

Message:

fix #8886 - Allow to download plugin jars redirected from https to http, like those hosted on github

Location:

trunk/src/org/openstreetmap/josm

Files:

• io/MirroredInputStream.java (modified) (1 diff)
• plugins/PluginDownloadTask.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/io/MirroredInputStream.java

@@ -259 +259 @@
      * <p>
      * This can causes problems when downloading from certain GitHub URLs.
+     * 
+     * @param downloadUrl The resource URL to download
+     * @return The HTTP connection effectively linked to the resource, after all potential redirections
+     * @throws MalformedURLException If a redirected URL is wrong
+     * @throws IOException If any I/O operation goes wrong
+     * @since 6073
      */
-    protected HttpURLConnection connectFollowingRedirect(URL downloadUrl) throws MalformedURLException, IOException {
+    public static HttpURLConnection connectFollowingRedirect(URL downloadUrl) throws MalformedURLException, IOException {
         HttpURLConnection con = null;
         int numRedirects = 0;

trunk/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java

@@ -22 +22 @@
 import org.openstreetmap.josm.gui.progress.NullProgressMonitor;
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
+import org.openstreetmap.josm.io.MirroredInputStream;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
 import org.openstreetmap.josm.tools.Utils;
@@ -119 +120 @@
             URL url = new URL(pi.downloadlink);
             synchronized(this) {
-                downloadConnection = Utils.openHttpConnection(url);
-                downloadConnection.setRequestProperty("Cache-Control", "no-cache");
-                downloadConnection.connect();
+                downloadConnection = MirroredInputStream.connectFollowingRedirect(url);
             }
             in = downloadConnection.getInputStream();