Changeset 2029

Show
Ignore:
Timestamp:
01/15/2008 10:16:13 PM (6 months ago)
Author:
glen
Message:

- con->bytes_read is not set. #1514

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/NEWS

    r2025 r2029  
    44==== 
    55 
    6 - 1.5.0 -  
     6- 1.5.0 - 
    77  * fixed decoding of common headers in AJP13 (#1399) 
    88  * disable experimental linux-aio and posix-aio support, use gthread-aio instead 
    …… 
    1111  * fixed initgroups() called after chroot (#1384) 
    1212  * execute fcgi app without /bin/sh if used as argument to spawn-fcgi (#1428) 
     13  * fix bug that rrdtool reports "0" for incoming data (#1514) 
    1314 
    14 - 1.5.0-r19.. -  
     15- 1.5.0-r19.. - 
    1516  * -F option added for spawn-fcgi 
    1617  * replaced mod_fastcgi, mod_scgi, mod_proxy with mod_proxy_core + backends 

  • trunk/src/network.c

    r1867 r2029  
    676676network_status_t network_read(server *srv, connection *con, iosocket *sock, chunkqueue *cq) { 
    677677        server_socket *srv_socket = con->srv_socket; 
     678        network_status_t ret = NETWORK_STATUS_UNSET; 
     679        off_t start_bytes_in = cq->bytes_in; 
    678680 
    679681        if (srv_socket->is_ssl) { 
    680682#ifdef USE_OPENSSL 
    681                 return srv->network_ssl_backend_read(srv, con, sock, cq); 
    682 #else 
    683                 return NETWORK_STATUS_FATAL_ERROR; 
     683                ret = srv->network_ssl_backend_read(srv, con, sock, cq); 
     684#else 
     685                ret = NETWORK_STATUS_FATAL_ERROR; 
    684686#endif 
    685687        } else { 
    686                 return srv->network_backend_read(srv, con, sock, cq); 
    687         } 
     688                ret =  srv->network_backend_read(srv, con, sock, cq); 
     689        } 
     690 
     691        con->bytes_read += cq->bytes_in - start_bytes_in; 
     692 
     693        return ret; 
    688694} 
    689695