httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dr...@apache.org
Subject cvs commit: httpd-2.0/server core.c
Date Wed, 04 Apr 2001 21:41:53 GMT
dreid       01/04/04 14:41:53

  Modified:    server   core.c
  Log:
  Move the error logging of a failed send into the core output filter.  This
  should catch errors in any way we send data.
  
  Revision  Changes    Path
  1.7       +4 -6      httpd-2.0/server/core.c
  
  Index: core.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/core.c,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- core.c	2001/04/03 19:32:19	1.6
  +++ core.c	2001/04/04 21:41:52	1.7
  @@ -2616,11 +2616,11 @@
                                     apr_size_t length, apr_size_t *nbytes) 
   {
       apr_status_t rv = APR_SUCCESS;
  -    apr_int32_t togo;         /* Remaining number of bytes in the file to send */
  +    apr_int32_t togo;        /* Remaining number of bytes in the file to send */
       apr_size_t sendlen = 0;
       apr_size_t bytes_sent;
       apr_int32_t i;
  -    apr_off_t o;              /* Track the file offset for partial writes */
  +    apr_off_t o;             /* Track the file offset for partial writes */
       char buffer[8192];
   
       *nbytes = 0;
  @@ -2659,9 +2659,6 @@
                   o += bytes_sent;       /* o is where we are in the buffer */
                   *nbytes += bytes_sent;
                   togo -= bytes_sent;    /* track how much of the file we've sent */
  -            } else {
  -                ap_log_error(APLOG_MARK, APLOG_ERR, rv, NULL,
  -                             "Failed to send data in send_the_file");
               }
           }
       }
  @@ -3208,7 +3205,8 @@
   
           apr_brigade_destroy(b);
           if (rv != APR_SUCCESS) {
  -            /* XXX: log the error */
  +            ap_log_error(APLOG_MARK, APLOG_ERR, rv, c->base_server,
  +               "core_output_filter: writing data to the network");
               if (more)
                   apr_brigade_destroy(more);
               return rv;
  
  
  

Mime
View raw message