Bug 480619 - FF does not load objects over secure connection after 'clear private data', r=kaie

security/manager/ssl/src/nsSSLThread.cpp

@@ -134,6 +134,13 @@ PRInt32 nsSSLThread::requestRecvMsgPeek(nsNSSSocketInfo *si, void *buf, PRInt32
     return -1;
   }
 
+  // Socket is unusable - set error and return -1. See bug #480619.
+  if (si->isPK11LoggedOut() || si->isAlreadyShutDown())
+  {
+    PR_SetError(PR_SOCKET_SHUTDOWN_ERROR, 0);
+    return -1;
+  }
+
   PRFileDesc *realSSLFD;
 
   {
@@ -222,6 +229,13 @@ PRInt16 nsSSLThread::requestPoll(nsNSSSocketInfo *si, PRInt16 in_flags, PRInt16
 
   *out_flags = 0;
 
+  // Socket is unusable - set EXCEPT-flag and return. See bug #480619.
+  if (si->isPK11LoggedOut() || si->isAlreadyShutDown())
+  {
+    *out_flags |= PR_POLL_EXCEPT;
+    return in_flags;
+  }
+
   PRBool want_sleep_and_wakeup_on_any_socket_activity = PR_FALSE;
   PRBool handshake_timeout = PR_FALSE;