httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From grega...@apache.org
Subject cvs commit: httpd-2.0/modules/http http_protocol.c
Date Thu, 08 Aug 2002 20:39:16 GMT
gregames    2002/08/08 13:39:16

  Modified:    modules/http http_protocol.c
  Log:
  remove some dead code.  It's been there since 1996 (1.3 rev 1.28), so
  extra eyeballs would be appreciated.
  
  If it's not really dead, then we need to re-arrange this function so
  that earlier changes to the r aren't lost.
  
  Revision  Changes    Path
  1.453     +6 -7      httpd-2.0/modules/http/http_protocol.c
  
  Index: http_protocol.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/http/http_protocol.c,v
  retrieving revision 1.452
  retrieving revision 1.453
  diff -u -r1.452 -r1.453
  --- http_protocol.c	4 Aug 2002 18:24:10 -0000	1.452
  +++ http_protocol.c	8 Aug 2002 20:39:15 -0000	1.453
  @@ -2284,19 +2284,18 @@
            * as a text message, so first check the custom response
            * string to ensure that it is a text-string (using the
            * same test used in ap_die(), i.e. does it start with a ").
  -         * If it doesn't, we've got a recursive error, so find
  -         * the original error and output that as well.
  +         * 
  +         * If it's not a text string, we've got a recursive error or 
  +         * an external redirect.  If it's a recursive error, ap_die passes
  +         * us the second error code so we can write both, and has already 
  +         * backed up to the original error.  If it's an external redirect, 
  +         * it hasn't happened yet; we may never know if it fails.
            */
           if (custom_response[0] == '\"') {
               ap_rputs(custom_response + 1, r);
               ap_finalize_request_protocol(r);
               return;
           }
  -        /*
  -         * Redirect failed, so get back the original error
  -         */
  -        while (r->prev && (r->prev->status != HTTP_OK))
  -            r = r->prev;
       }
       {
           const char *title = status_lines[idx];
  
  
  

Mime
View raw message