SSL.File: Improved robustness of close handling.

The close_state is now set correctly even when there's a pending
close_errno and the peer closes the connection.

lib/modules/SSL.pmod/File.pike

@@ -2089,10 +2089,8 @@ protected int ssl_close_callback (int ignored)
       SSL3_DEBUG_MSG ("ssl_close_callback: Propagating errno from another callback\n");
 #endif
 
-    if (!close_errno) {
     if (!conn || conn->state & CONNECTION_peer_closed)
       SSL3_DEBUG_MSG ("ssl_close_callback: After clean close\n");
-
     else {
       // The remote end has closed the connection without sending a
       // close packet.
@@ -2104,8 +2102,9 @@ protected int ssl_close_callback (int ignored)
       SSL3_DEBUG_MSG ("ssl_close_callback: Abrupt close - "
 		      "simulating System.EPIPE\n");
       cleanup_on_error();
-	close_errno = System.EPIPE;
       close_state = ABRUPT_CLOSE;
+      if (!close_errno) {
+	close_errno = System.EPIPE;
       }
     }