httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r..@apache.org
Subject cvs commit: httpd-2.0/server core.c
Date Fri, 22 Mar 2002 21:45:44 GMT
rbb         02/03/22 13:45:44

  Modified:    server   core.c
  Log:
  We have to return valid HTTP status codes from filters.  This fixes two
  cases in the core_output_filters where there was a problem, and the core
  returned an error code instead of an HTTP status code.  This keeps us from
  putting status codes like 32 and 104 in the access log.
  
  Submitted by:	Ryan Morgan <rmorgan@covalent.net>
  
  Revision  Changes    Path
  1.167     +6 -2      httpd-2.0/server/core.c
  
  Index: core.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/core.c,v
  retrieving revision 1.166
  retrieving revision 1.167
  diff -u -r1.166 -r1.167
  --- core.c	20 Mar 2002 22:19:10 -0000	1.166
  +++ core.c	22 Mar 2002 21:45:44 -0000	1.167
  @@ -3744,7 +3744,7 @@
                       if (rv != APR_SUCCESS) {
                           ap_log_error(APLOG_MARK, APLOG_ERR, rv, c->base_server,
                                        "core_output_filter: Error reading from bucket.");
  -                        return rv;
  +                        return HTTP_INTERNAL_SERVER_ERROR;
                       }
   
                       apr_brigade_write(ctx->b, NULL, NULL, str, n);
  @@ -3829,7 +3829,11 @@
                   c->aborted = 1;
               }
   
  -            return rv;
  +            /* The client has aborted, but the request was successful. We
  +             * will report success, and leave it to the access and error
  +             * logs to note that the connection was aborted.
  +             */
  +            return APR_SUCCESS;
           }
   
           b = more;
  
  
  

Mime
View raw message