diff options
| author | wtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-27 01:45:46 +0000 |
|---|---|---|
| committer | wtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-27 01:45:46 +0000 |
| commit | 4282a89ea5b7ba015b3f0545bdcfe738de2cb128 (patch) | |
| tree | 7f37d6b0b11ed25a8b13e05b1cada584790eefe4 /net/third_party | |
| parent | d2b2375048c7caf3854675bccf3c5fada936a8d2 (diff) | |
| download | chromium_src-4282a89ea5b7ba015b3f0545bdcfe738de2cb128.zip chromium_src-4282a89ea5b7ba015b3f0545bdcfe738de2cb128.tar.gz chromium_src-4282a89ea5b7ba015b3f0545bdcfe738de2cb128.tar.bz2 | |
Revert r242742. The Clang codegen bug has been fixed.
> Hack for Mac 10.9 hang when the Keychain is modified with Chrome running.
>
> BUG=326011
R=rsesek@chromium.org,rsleevi@chromium.org
BUG=none
TEST=none
Review URL: https://codereview.chromium.org/177093021
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@253676 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/third_party')
| -rw-r--r-- | net/third_party/nss/README.chromium | 5 | ||||
| -rwxr-xr-x | net/third_party/nss/patches/applypatches.sh | 2 | ||||
| -rw-r--r-- | net/third_party/nss/patches/sslnoncestatics.patch | 14 | ||||
| -rw-r--r-- | net/third_party/nss/ssl/sslnonce.c | 4 |
4 files changed, 2 insertions, 23 deletions
diff --git a/net/third_party/nss/README.chromium b/net/third_party/nss/README.chromium index 3d06388..8bc6495 100644 --- a/net/third_party/nss/README.chromium +++ b/net/third_party/nss/README.chromium @@ -91,11 +91,6 @@ Patches: asynchronous certificate verification. patches/sessioncache.patch - * Remove static storage qualifier from variables in sslnonce.c. Due to - a clang codegen bug on Mac, this caused an infinite loop. - https://code.google.com/p/chromium/issues/detail?id=326011 - patches/sslnoncestatics.patch - * Use NSSRWLock instead of PRRWLock in sslSessionID. This avoids the bugs in the lock rank checking code in PRRWLock. patches/nssrwlock.patch diff --git a/net/third_party/nss/patches/applypatches.sh b/net/third_party/nss/patches/applypatches.sh index abc3c57..5749d3c 100755 --- a/net/third_party/nss/patches/applypatches.sh +++ b/net/third_party/nss/patches/applypatches.sh @@ -45,6 +45,4 @@ patch -p4 < $patches_dir/fallbackscsv.patch patch -p4 < $patches_dir/sessioncache.patch -patch -p4 < $patches_dir/sslnoncestatics.patch - patch -p4 < $patches_dir/nssrwlock.patch diff --git a/net/third_party/nss/patches/sslnoncestatics.patch b/net/third_party/nss/patches/sslnoncestatics.patch deleted file mode 100644 index ca7b448..0000000 --- a/net/third_party/nss/patches/sslnoncestatics.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -pu a/nss/lib/ssl/sslnonce.c b/nss/lib/ssl/sslnonce.c ---- a/nss/lib/ssl/sslnonce.c 2014-01-03 19:08:32.451674629 -0800 -+++ b/nss/lib/ssl/sslnonce.c 2014-01-03 19:10:33.483652358 -0800 -@@ -21,8 +21,8 @@ - PRUint32 ssl_sid_timeout = 100; - PRUint32 ssl3_sid_timeout = 86400L; /* 24 hours */ - --static sslSessionID *cache = NULL; --static PZLock * cacheLock = NULL; -+sslSessionID *cache = NULL; -+PZLock * cacheLock = NULL; - - /* sids can be in one of 4 states: - * diff --git a/net/third_party/nss/ssl/sslnonce.c b/net/third_party/nss/ssl/sslnonce.c index bef0931..3e42bed 100644 --- a/net/third_party/nss/ssl/sslnonce.c +++ b/net/third_party/nss/ssl/sslnonce.c @@ -21,8 +21,8 @@ PRUint32 ssl_sid_timeout = 100; PRUint32 ssl3_sid_timeout = 86400L; /* 24 hours */ -sslSessionID *cache = NULL; -PZLock * cacheLock = NULL; +static sslSessionID *cache = NULL; +static PZLock * cacheLock = NULL; /* sids can be in one of 4 states: * |