Preserve transport errors for OpenSSL sockets.

net/socket/ssl_client_socket_openssl.h

Index: net/socket/ssl_client_socket_openssl.h
diff --git a/net/socket/ssl_client_socket_openssl.h b/net/socket/ssl_client_socket_openssl.h
index ac85483c4e370bc08287309abcba64353f8a5631..dd91fccdd2b309ccb0254e94db8c7c0a0466b24e 100644
--- a/net/socket/ssl_client_socket_openssl.h
+++ b/net/socket/ssl_client_socket_openssl.h
@@ -147,9 +147,20 @@ class SSLClientSocketOpenSSL : public SSLClientSocket {
   int SelectNextProtoCallback(unsigned char** out, unsigned char* outlen,
                               const unsigned char* in, unsigned int inlen);
 
+  // Callback from the SSL layer when an operation is performed on
+  // |transport_bio_|'s peer.
+  long BIOCallback(BIO *bio,
+                   int cmd,
+                   const char *argp, int argi, long argl,
+                   long retvalue);
+
+  static long BIOCallbackThunk(BIO *bio,
+                               int cmd,
+                               const char *argp, int argi, long argl,
+                               long retvalue);

[Ryan Sleevi, 2014/07/07 22:36:34]

1) Document
2) Naming - In nss.cc, we use static+"Callback" (except where the one place we
use "Handler" :/). Perhaps BioCallback + HandleBioCallback (or something more
meaningful than "HandleBioCallback", to *actually* describe what it does)?

[davidben, 2014/07/08 00:03:35]

OpenSSL thus far uses the same name for both, but everything else is hanging off
SSLContext. Renamed to hopefully be clearer.

+
   bool transport_send_busy_;
   bool transport_recv_busy_;
-  bool transport_recv_eof_;
 
   scoped_refptr<DrainableIOBuffer> send_buffer_;
   scoped_refptr<IOBuffer> recv_buffer_;
@@ -176,6 +187,11 @@ class SSLClientSocketOpenSSL : public SSLClientSocket {
   // indicates an error.
   int pending_read_error_;
 
+  // Used by TransportReadComplete() to signify an error reading from the
+  // transport socket. A value of OK indicates the socket is still
+  // readable. EOFs are mapped to ERR_CONNECTION_CLOSED.
+  int transport_read_error_;
+
   // Used by TransportWriteComplete() and TransportReadComplete() to signify an
   // error writing to the transport socket. A value of OK indicates no error.
   int transport_write_error_;