Retry idempotent methods on Chrome-Proxy: bypass

net/http/http_network_transaction.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/http/http_network_transaction.h"
 
 #include <set>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 957 matching lines @@
     }
 #endif
 
     if (chrome_proxy_used || chrome_fallback_proxy_used) {
       if (response_.headers->GetChromeProxyInfo(&chrome_proxy_info)) {
         if (chrome_proxy_info.bypass_duration < TimeDelta::FromMinutes(30))
           proxy_bypass_event = ProxyService::SHORT_BYPASS;
         else
           proxy_bypass_event = ProxyService::LONG_BYPASS;
       } else {
-        // Additionally, fallback if a 500 or 502 is returned via the data
-        // reduction proxy. This is conservative, as the 500 or 502 might have
-        // been generated by the origin, and not the proxy.
+        // Additionally, fallback if a 500, 502 or 503 is returned via the data
+        // reduction proxy. This is conservative, as the 500, 501 or 502 might
+        // have been generated by the origin, and not the proxy.
         if (response_.headers->response_code() == HTTP_INTERNAL_SERVER_ERROR ||
             response_.headers->response_code() == HTTP_BAD_GATEWAY ||
             response_.headers->response_code() == HTTP_SERVICE_UNAVAILABLE) {
           proxy_bypass_event = ProxyService::INTERNAL_SERVER_ERROR_BYPASS;
         }
       }
 
       if (proxy_bypass_event < ProxyService::BYPASS_EVENT_TYPE_MAX) {
         ProxyService* proxy_service = session_->proxy_service();
 
@@ skipping 10 matching lines @@
                                            ProxyServer::SCHEME_HTTP :
                                            ProxyServer::SCHEME_HTTPS,
                                        HostPortPair::FromURL(proxy_url));
             }
         }
 #endif
         if (proxy_service->MarkProxiesAsBad(proxy_info_,
                                             chrome_proxy_info.bypass_duration,
                                             proxy_server,
                                             net_log_)) {
-          // Only retry in the case of GETs. We don't want to resubmit a POST
-          // if the proxy took some action.
-          if (request_->method == "GET") {
+          // Only retry idempotent methods.
+          if (request_->method == "GET" ||
+              request_->method == "OPTIONS" ||

[mef, 2013/12/18 20:36:23]

I'd keep 'We don't want to resubmit a POST if the proxy took some action.'

[bengr, 2013/12/18 21:05:10]

Done.

+              request_->method == "HEAD" ||
+              request_->method == "PUT" ||
+              request_->method == "DELETE" ||
+              request_->method == "TRACE") {
             ResetConnectionAndRequestForResend();
             return OK;
           }
         }
       }
     }
   }
 #endif  // defined(SPDY_PROXY_AUTH_ORIGIN)
 
   // Like Net.HttpResponseCode, but only for MAIN_FRAME loads.
@@ skipping 538 matching lines @@
       description = base::StringPrintf("Unknown state 0x%08X (%u)", state,
                                        state);
       break;
   }
   return description;
 }
 
 #undef STATE_CASE
 
 }  // namespace net