packages: xulrunner/xulrunner-ssl_oldapi.patch - apply in proper place

[baggins]

Author: baggins                      Date: Wed Feb  1 13:30:17 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- apply in proper place

---- Files affected:
packages/xulrunner:
   xulrunner-ssl_oldapi.patch (1.4 -> 1.5) 

---- Diffs:

================================================================
Index: packages/xulrunner/xulrunner-ssl_oldapi.patch
diff -u packages/xulrunner/xulrunner-ssl_oldapi.patch:1.4 packages/xulrunner/xulrunner-ssl_oldapi.patch:1.5
--- packages/xulrunner/xulrunner-ssl_oldapi.patch:1.4	Wed Feb  1 13:07:13 2012
+++ packages/xulrunner/xulrunner-ssl_oldapi.patch	Wed Feb  1 14:30:12 2012
@@ -294,9 +294,9 @@
            && !socketInfo->GetHasCleartextPhase()) // mirror PR_CONNECT_RESET_ERROR treament
        {
 @@ -3577,6 +3636,50 @@ nsNSSBadCertHandler(void *arg, PRFileDesc *sslSocket)
-         rv = proxy_bcl->NotifyCertProblem(csi, status, hostWithPortString, 
-                                           &suppressMessage);
-       }
+       nsIInterfaceRequestor *csi = static_cast<nsIInterfaceRequestor*>(mInfoObject);
+       nsrv = bcl->NotifyCertProblem(csi, status, hostWithPortString, &suppressMessage);
+     }
 +    } else {
 +      nsCOMPtr<nsIBadCertListener> handler = do_GetInterface(callbacks);
 +      nsIBadCertListener *badCertHandler = nsnull;
@@ -341,9 +341,9 @@
 +          return SECSuccess;
 +        suppressMessage = true;
 +      }
-     }
    }
  
+   nsCOMPtr<nsIRecentBadCertsService> recentBadCertsService = 
 diff --git a/security/manager/ssl/src/nsNSSIOLayer.h b/security/manager/ssl/src/nsNSSIOLayer.h
 index c619282..fbca648 100644
 --- a/security/manager/ssl/src/nsNSSIOLayer.h
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xulrunner/xulrunner-ssl_oldapi.patch?r1=1.4&r2=1.5&f=u