summaryrefslogtreecommitdiffstats
path: root/net/base
diff options
context:
space:
mode:
authorbattre@chromium.org <battre@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-03 12:44:19 +0000
committerbattre@chromium.org <battre@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-03 12:44:19 +0000
commite0470bd2dd6b88f88b1e96cae90872a1b84fe265 (patch)
tree68fe6de9bc811ad6ce4237c50812ee3028510196 /net/base
parent82a3767c45e85b77fb41d4fc92fc49fcb879e75b (diff)
downloadchromium_src-e0470bd2dd6b88f88b1e96cae90872a1b84fe265.zip
chromium_src-e0470bd2dd6b88f88b1e96cae90872a1b84fe265.tar.gz
chromium_src-e0470bd2dd6b88f88b1e96cae90872a1b84fe265.tar.bz2
Enable (optional) blocking of webrequests in case a PAC script cannot be fetched or is invalid.
The optional blocking is currently only exposed to the Proxy Settings API, not to command-line parameters or policies. BUG=79344 TEST=Install the sample proxy extension and enter a non-existing url and a URL that does not point to a valid JavaScript file. In either case, the request should fail. Review URL: http://codereview.chromium.org/6871019 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@83882 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/base')
-rw-r--r--net/base/net_error_list.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/net/base/net_error_list.h b/net/base/net_error_list.h
index 1147267..9979394 100644
--- a/net/base/net_error_list.h
+++ b/net/base/net_error_list.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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.
@@ -180,7 +180,9 @@ NET_ERROR(SSL_WEAK_SERVER_EPHEMERAL_DH_KEY, -129)
// of an HTTP proxy.
NET_ERROR(PROXY_CONNECTION_FAILED, -130)
-// Free: 131
+// A mandatory proxy configuration could not be used. Currently this means
+// that a mandatory PAC script could not be fetched, parsed or executed.
+NET_ERROR(MANDATORY_PROXY_CONFIGURATION_FAILED, -131)
// We detected an ESET product intercepting our HTTPS connections. Since these
// products are False Start intolerant, we return this error so that we can