www

commit 6d73bd325642e3de34896be33d2242add7310d45
parent f7fe9ab64b382e9ab7625e61803828464f84d16b
Author: Dan Stillman <dstillman@gmail.com>
Date:   Fri,  8 Nov 2013 00:38:31 -0800

Merge pull request #412 from aurimasv/webdav-sec

Check network errors against SEC error set as well
Diffstat:
M
chrome/content/zotero/xpcom/storage/webdav.js
 | 
7
+++++--

1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/chrome/content/zotero/xpcom/storage/webdav.js b/chrome/content/zotero/xpcom/storage/webdav.js
@@ -583,10 +583,13 @@ Zotero.Sync.Storage.WebDAV = (function () {
 		
 		// Check if the error we encountered is really an SSL error
 		// Logic borrowed from https://developer.mozilla.org/en-US/docs/How_to_check_the_security_state_of_an_XMLHTTPRequest_over_SSL
-		//  and http://mxr.mozilla.org/mozilla-central/source/security/nss/lib/ssl/sslerr.h
+		//  http://mxr.mozilla.org/mozilla-central/source/security/nss/lib/ssl/sslerr.h
+		//  http://mxr.mozilla.org/mozilla-central/source/security/nss/lib/util/secerr.h
+		var secErrLimit = Ci.nsINSSErrorsService.NSS_SEC_ERROR_LIMIT - Ci.nsINSSErrorsService.NSS_SEC_ERROR_BASE;
+		var secErr = Math.abs(Ci.nsINSSErrorsService.NSS_SEC_ERROR_BASE) - (channel.status & 0xffff);
 		var sslErrLimit = Ci.nsINSSErrorsService.NSS_SSL_ERROR_LIMIT - Ci.nsINSSErrorsService.NSS_SSL_ERROR_BASE;
 		var sslErr = Math.abs(Ci.nsINSSErrorsService.NSS_SSL_ERROR_BASE) - (channel.status & 0xffff);
-		if(sslErr < 0 || sslErr > sslErrLimit) {
+		if( (secErr < 0 || secErr > secErrLimit) && (sslErr < 0 || sslErr > sslErrLimit) ) {
 			return;
 		}