diff options
| author | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-22 15:01:09 +0000 |
|---|---|---|
| committer | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-22 15:01:09 +0000 |
| commit | c16dcc3a26ced978b7f2042c20096d46753abb9b (patch) | |
| tree | 828dbbf04d4cb896ee08df6229cc0cc592cdcd9f /net/url_request | |
| parent | acabdf57ab6d27b6f909d0141e9e3cbd7a8dab92 (diff) | |
| download | chromium_src-c16dcc3a26ced978b7f2042c20096d46753abb9b.zip chromium_src-c16dcc3a26ced978b7f2042c20096d46753abb9b.tar.gz chromium_src-c16dcc3a26ced978b7f2042c20096d46753abb9b.tar.bz2 | |
net: only enable certificate pinning in official builds.
This is to make sure that pins don't escape into forks of the code which may
not be updated in a timly manner.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/7659016
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@97642 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/url_request')
| -rw-r--r-- | net/url_request/url_request_http_job.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/net/url_request/url_request_http_job.cc b/net/url_request/url_request_http_job.cc index 23e7367..5f30e55 100644 --- a/net/url_request/url_request_http_job.cc +++ b/net/url_request/url_request_http_job.cc @@ -738,7 +738,12 @@ void URLRequestHttpJob::OnStartCompleted(int result) { // Clear the IO_PENDING status SetStatus(URLRequestStatus()); +#if defined(OFFICIAL_BUILD) && !defined(ANDROID) // Take care of any mandates for public key pinning. + // + // Pinning is only enabled for official builds to make sure that others don't + // end up with pins that cannot be easily updated. + // // TODO(agl): we might have an issue here where a request for foo.example.com // merges into a SPDY connection to www.example.com, and gets a different // certificate. @@ -762,6 +767,7 @@ void URLRequestHttpJob::OnStartCompleted(int result) { } } } +#endif if (result == OK) { SaveCookiesAndNotifyHeadersComplete(); |