summaryrefslogtreecommitdiffstats
path: root/net/http/http_network_transaction.cc
diff options
context:
space:
mode:
authorcramya@chromium.org <cramya@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-19 22:30:59 +0000
committercramya@chromium.org <cramya@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-19 22:30:59 +0000
commit18d30f325e6407486d93e731bc653223b24123f9 (patch)
tree79f7f761b81420901250a4e7bb0802c93e97827e /net/http/http_network_transaction.cc
parent07e598fc17fdbd0ffc561c64e81d6bc05cc0737a (diff)
downloadchromium_src-18d30f325e6407486d93e731bc653223b24123f9.zip
chromium_src-18d30f325e6407486d93e731bc653223b24123f9.tar.gz
chromium_src-18d30f325e6407486d93e731bc653223b24123f9.tar.bz2
Revert of https://codereview.chromium.org/99283006/
Reason for revert: Broke Android bot again TBR=mef@chromium.org,mmenke@chromium.org,bengr@chromium.org NOTREECHECKS=true NOTRY=true Review URL: https://codereview.chromium.org/107073004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@241954 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/http/http_network_transaction.cc')
-rw-r--r--net/http/http_network_transaction.cc15
1 files changed, 5 insertions, 10 deletions
diff --git a/net/http/http_network_transaction.cc b/net/http/http_network_transaction.cc
index d956fb3..a6d5069 100644
--- a/net/http/http_network_transaction.cc
+++ b/net/http/http_network_transaction.cc
@@ -975,9 +975,9 @@ int HttpNetworkTransaction::DoReadHeadersComplete(int result) {
else
proxy_bypass_event = ProxyService::LONG_BYPASS;
} else {
- // 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.
+ // 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.
if (response_.headers->response_code() == HTTP_INTERNAL_SERVER_ERROR ||
response_.headers->response_code() == HTTP_BAD_GATEWAY ||
response_.headers->response_code() == HTTP_SERVICE_UNAVAILABLE) {
@@ -1008,14 +1008,9 @@ int HttpNetworkTransaction::DoReadHeadersComplete(int result) {
chrome_proxy_info.bypass_duration,
proxy_server,
net_log_)) {
- // Only retry idempotent methods. We don't want to resubmit a POST
+ // 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" ||
- request_->method == "OPTIONS" ||
- request_->method == "HEAD" ||
- request_->method == "PUT" ||
- request_->method == "DELETE" ||
- request_->method == "TRACE") {
+ if (request_->method == "GET") {
ResetConnectionAndRequestForResend();
return OK;
}