* url-http.el (url-http-parse-headers): For HTTP 301/302/307, don't convert to a GET request.

Fixes: debbugs:701

2 files changed, 7 insertions, 10 deletions

diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog
index 6a3638c4232..5714179fcfe 100644
--- a/lisp/url/ChangeLog
+++ b/lisp/url/ChangeLog
@@ -1,3 +1,8 @@
+2011-08-07  Chong Yidong  <cyd@stupidchicken.com>
+
+        * url-http.el (url-http-parse-headers): For HTTP 301/302/307,
+        don't convert to a GET request (Bug#701).
+
 2011-07-13  Chris Newton  <redshodan@gmail.com>  (tiny change)
 
         * url-http.el (url-http): Copy over `url-show-status' to the async
diff --git a/lisp/url/url-http.el b/lisp/url/url-http.el
index def35449397..a21aed21436 100644
--- a/lisp/url/url-http.el
+++ b/lisp/url/url-http.el
@@ -563,16 +563,8 @@ should be shown to the user."
             ;; automatically redirect the request unless it can be
             ;; confirmed by the user, since this might change the
             ;; conditions under which the request was issued.
-            (if (member url-http-method '("HEAD" "GET"))
-                ;; Automatic redirection is ok
-                nil
-              ;; It is just too big of a pain in the ass to get this
-              ;; prompt all the time.  We will just silently lose our
-              ;; data and convert to a GET method.
-              (url-http-debug "Converting `%s' request to `GET' because of REDIRECT(%d)"
-                              url-http-method url-http-response-status)
-              (setq url-http-method "GET"
-                    url-http-data nil)))
+            (unless (member url-http-method '("HEAD" "GET"))
+              (setq redirect-uri nil)))
            (see-other                   ; 303
             ;; The response to the request can be found under a different
             ;; URI and SHOULD be retrieved using a GET method on that