cvs commit: apache-1.3/src/main http_config.c

[coar]

coar        98/09/03 11:01:44

  Modified:    src/main http_config.c
  Log:
        If any sort of error is encountered in .htaccess file
        processing, make the details available to any ErrorDocument
        scripts that might field the error.
  
  Revision  Changes    Path
  1.126     +4 -0      apache-1.3/src/main/http_config.c
  
  Index: http_config.c
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/main/http_config.c,v
  retrieving revision 1.125
  retrieving revision 1.126
  diff -u -r1.125 -r1.126
  --- http_config.c     1998/08/13 01:55:06     1.125
  +++ http_config.c     1998/09/03 18:01:43     1.126
  @@ -1240,6 +1240,7 @@
        if (errmsg) {
            ap_log_rerror(APLOG_MARK, APLOG_ALERT|APLOG_NOERRNO, r, "%s: %s",
                           filename, errmsg);
  +         ap_table_setn(r->notes, "error-notes", errmsg);
               return HTTP_INTERNAL_SERVER_ERROR;
        }
   
  @@ -1252,6 +1253,9 @@
            ap_log_rerror(APLOG_MARK, APLOG_CRIT, r,
                        "%s pcfg_openfile: unable to check htaccess file, 
ensure it is readable",
                        filename);
  +         ap_table_setn(r->notes, "error-notes",
  +                       "Server unable to read htaccess file, denying "
  +                       "access to be safe");
            return HTTP_FORBIDDEN;
        }
       }