Merge branch 'master' into file-refactor

1 files changed, 5 insertions, 1 deletions

diff --git a/lib/chef/rest.rb b/lib/chef/rest.rb
index 8f5405f9d2..904c758779 100644
--- a/lib/chef/rest.rb
+++ b/lib/chef/rest.rb
@@ -190,7 +190,11 @@ class Chef
           elsif response.kind_of?(Net::HTTPNotModified) # Must be tested before Net::HTTPRedirection because it's subclass.
             false
           elsif redirect_location = redirected_to(response)
-            follow_redirect {api_request(:GET, create_url(redirect_location))}
+            if [:GET, :HEAD].include?(method)
+              follow_redirect {api_request(method, create_url(redirect_location))}
+            else
+              raise Exceptions::InvalidRedirect, "#{method} request was redirected from #{url} to #{redirect_location}. Only GET and HEAD support redirects."
+            end
           else
             # have to decompress the body before making an exception for it. But the body could be nil.
             response.body.replace(response_body) if response.body.respond_to?(:replace)