| Index: net/socket/ssl_client_socket_openssl.cc
|
| diff --git a/net/socket/ssl_client_socket_openssl.cc b/net/socket/ssl_client_socket_openssl.cc
|
| index 953f3363806cd25c7977b318804154fa6c49eef5..fc74d8caa501b11c79b41d34b910693ced38ce3e 100644
|
| --- a/net/socket/ssl_client_socket_openssl.cc
|
| +++ b/net/socket/ssl_client_socket_openssl.cc
|
| @@ -632,7 +632,7 @@ int SSLClientSocketOpenSSL::Read(IOBuffer* buf,
|
| user_read_buf_ = buf;
|
| user_read_buf_len_ = buf_len;
|
|
|
| - int rv = DoReadLoop(OK);
|
| + int rv = DoReadLoop();
|
|
|
| if (rv == ERR_IO_PENDING) {
|
| user_read_callback_ = callback;
|
| @@ -657,7 +657,7 @@ int SSLClientSocketOpenSSL::Write(IOBuffer* buf,
|
| user_write_buf_ = buf;
|
| user_write_buf_len_ = buf_len;
|
|
|
| - int rv = DoWriteLoop(OK);
|
| + int rv = DoWriteLoop();
|
|
|
| if (rv == ERR_IO_PENDING) {
|
| user_write_callback_ = callback;
|
| @@ -1236,7 +1236,7 @@ void SSLClientSocketOpenSSL::OnRecvComplete(int result) {
|
| if (!user_read_buf_.get())
|
| return;
|
|
|
| - int rv = DoReadLoop(result);
|
| + int rv = DoReadLoop();
|
| if (rv != ERR_IO_PENDING)
|
| DoReadCallback(rv);
|
| }
|
| @@ -1288,10 +1288,7 @@ int SSLClientSocketOpenSSL::DoHandshakeLoop(int last_io_result) {
|
| return rv;
|
| }
|
|
|
| -int SSLClientSocketOpenSSL::DoReadLoop(int result) {
|
| - if (result < 0)
|
| - return result;
|
| -
|
| +int SSLClientSocketOpenSSL::DoReadLoop() {
|
| bool network_moved;
|
| int rv;
|
| do {
|
| @@ -1302,10 +1299,7 @@ int SSLClientSocketOpenSSL::DoReadLoop(int result) {
|
| return rv;
|
| }
|
|
|
| -int SSLClientSocketOpenSSL::DoWriteLoop(int result) {
|
| - if (result < 0)
|
| - return result;
|
| -
|
| +int SSLClientSocketOpenSSL::DoWriteLoop() {
|
| bool network_moved;
|
| int rv;
|
| do {
|
|
|