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

Timestamp:

2016-01-02T11:39:21+01:00 (9 years ago)

Author:

simon04

Message:

Add functional tests for HttpClient and fix 2 bug found

File:

• trunk/src/org/openstreetmap/josm/tools/HttpClient.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/tools/HttpClient.java

@@ -78 +78 @@
         connection.setConnectTimeout(connectTimeout);
         connection.setReadTimeout(readTimeout);
-        connection.setInstanceFollowRedirects(maxRedirects > 0);
+        connection.setInstanceFollowRedirects(false); // we do that ourselves
         if (ifModifiedSince > 0) {
             connection.setIfModifiedSince(ifModifiedSince);
@@ -136 +136 @@
                     throw new IOException(msg);
                 } else if (maxRedirects > 0) {
-                    url = new URL(redirectLocation);
+                    url = new URL(url, redirectLocation);
                     maxRedirects--;
                     Main.info(tr("Download redirected to ''{0}''", redirectLocation));