4 files changed, 24 insertions, 2 deletions
diff --git a/net/third_party/nss/README.chromium b/net/third_party/nss/README.chromium
index d4f9386..8c4e008 100644
--- a/net/third_party/nss/README.chromium
+++ b/net/third_party/nss/README.chromium
@@ -168,6 +168,11 @@ 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
+
 Apply the patches to NSS by running the patches/applypatches.sh script.  Read
 the comments at the top of patches/applypatches.sh for instructions.
 
diff --git a/net/third_party/nss/patches/applypatches.sh b/net/third_party/nss/patches/applypatches.sh
index c07f6e5..89d97bc 100755
--- a/net/third_party/nss/patches/applypatches.sh
+++ b/net/third_party/nss/patches/applypatches.sh
@@ -83,3 +83,5 @@ patch -p4 < $patches_dir/fallbackscsv.patch
 patch -p4 < $patches_dir/disableticketrenewal.patch
 
 patch -p4 < $patches_dir/sessioncache.patch
+
+patch -p4 < $patches_dir/sslnoncestatics.patch
diff --git a/net/third_party/nss/patches/sslnoncestatics.patch b/net/third_party/nss/patches/sslnoncestatics.patch
new file mode 100644
index 0000000..336fe1d5
--- /dev/null
+++ b/net/third_party/nss/patches/sslnoncestatics.patch
@@ -0,0 +1,15 @@
+diff --git a/net/third_party/nss/ssl/sslnonce.c b/net/third_party/nss/ssl/sslnonce.c
+index 758aa4e..a3e6e0a 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 */
+ 
+-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 758aa4e..a3e6e0a 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 */
 
-static sslSessionID *cache = NULL;
-static PZLock *      cacheLock = NULL;
+sslSessionID *cache = NULL;
+PZLock *      cacheLock = NULL;
 
 /* sids can be in one of 4 states:
  *