diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-01-25 11:39:07 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-01-25 15:20:42 +0000 |
| commit | 6c91641271e536ffaa88a1dff5127e42ee99a91e (patch) | |
| tree | 703d9dd49602377ddc90cbf886aad37913f2496b /chromium/net/third_party/nss/patches/secitemarray.patch | |
| parent | b145b7fafd36f0c260d6a768c81fc14e32578099 (diff) | |
| download | qtwebengine-chromium-6c91641271e536ffaa88a1dff5127e42ee99a91e.tar.gz | |
BASELINE: Update Chromium to 49.0.2623.23
Also adds missing printing sources.
Change-Id: I3726b8f0c7d6751c9fc846096c571fadca7108cd
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Diffstat (limited to 'chromium/net/third_party/nss/patches/secitemarray.patch')
| -rw-r--r-- | chromium/net/third_party/nss/patches/secitemarray.patch | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/chromium/net/third_party/nss/patches/secitemarray.patch b/chromium/net/third_party/nss/patches/secitemarray.patch index 136f3e44563..d40e7ca3407 100644 --- a/chromium/net/third_party/nss/patches/secitemarray.patch +++ b/chromium/net/third_party/nss/patches/secitemarray.patch @@ -1,8 +1,8 @@ -diff --git a/ssl/sslimpl.h b/ssl/sslimpl.h -index 0ece0ed..ea71975 100644 ---- a/ssl/sslimpl.h -+++ b/ssl/sslimpl.h -@@ -1373,6 +1373,15 @@ extern sslSessionIDUncacheFunc ssl_sid_uncache; +diff --git a/lib/ssl/sslimpl.h b/lib/ssl/sslimpl.h +index 976330e..60dd243 100644 +--- a/lib/ssl/sslimpl.h ++++ b/lib/ssl/sslimpl.h +@@ -1403,6 +1403,15 @@ extern sslSessionIDUncacheFunc ssl_sid_uncache; SEC_BEGIN_PROTOS @@ -18,11 +18,11 @@ index 0ece0ed..ea71975 100644 /* Internal initialization and installation of the SSL error tables */ extern SECStatus ssl_Init(void); extern SECStatus ssl_InitializePRErrorTable(void); -diff --git a/ssl/sslt.h b/ssl/sslt.h -index 0900f28..430d216 100644 ---- a/ssl/sslt.h -+++ b/ssl/sslt.h -@@ -10,6 +10,19 @@ +diff --git a/lib/ssl/sslt.h b/lib/ssl/sslt.h +index b6616e2..5593579 100644 +--- a/lib/ssl/sslt.h ++++ b/lib/ssl/sslt.h +@@ -11,6 +11,19 @@ #include "prtypes.h" |