cvs commit: jakarta-tomcat-connectors/jni/native/src sslnetwork.c

[mturk]

mturk       2005/07/07 08:28:58

  Modified:    jni/native/src sslnetwork.c
  Log:
  Return the original errno on send too.
  
  Revision  Changes    Path
  1.24      +4 -4      jakarta-tomcat-connectors/jni/native/src/sslnetwork.c
  
  Index: sslnetwork.c
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jni/native/src/sslnetwork.c,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- sslnetwork.c      7 Jul 2005 15:20:54 -0000       1.23
  +++ sslnetwork.c      7 Jul 2005 15:28:58 -0000       1.24
  @@ -340,11 +340,11 @@
   ssl_socket_recv(apr_socket_t *sock, char *buf, apr_size_t *len)
   {
       tcn_ssl_conn_t *con = (tcn_ssl_conn_t *)sock;
  -    int s, rd = (int)(*len);
  +    int s, wr = (int)(*len);
       apr_status_t rv = APR_SUCCESS;
   
       for (;;) {
  -        if ((s = SSL_read(con->ssl, buf, rd)) <= 0) {
  +        if ((s = SSL_read(con->ssl, buf, wr)) <= 0) {
               apr_status_t os = apr_get_netos_error();
               int i = SSL_get_error(con->ssl, s);
               /* Special case if the "close notify" alert send by peer */
  @@ -410,7 +410,7 @@
                       if (!APR_STATUS_IS_EAGAIN(os) &&
                           !APR_STATUS_IS_EINTR(os)) {
                           con->shutdown_type = SSL_SHUTDOWN_TYPE_STANDARD;
  -                        return s;
  +                        return os;
                       }
                   break;
                   default:
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]