httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dgau...@hyperreal.org
Subject cvs commit: apache-1.3/src/modules/standard mod_negotiation.c
Date Sat, 30 May 1998 19:15:40 GMT
dgaudet     98/05/30 12:15:39

  Modified:    src      CHANGES
               src/modules/standard mod_negotiation.c
  Log:
  Using a type map file as a custom error document was not possible.
  
  PR:		1031
  Submitted by:	Lars Eilebrecht
  
  Revision  Changes    Path
  1.879     +3 -0      apache-1.3/src/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
  retrieving revision 1.878
  retrieving revision 1.879
  diff -u -r1.878 -r1.879
  --- CHANGES	1998/05/29 20:45:53	1.878
  +++ CHANGES	1998/05/30 19:15:37	1.879
  @@ -1,5 +1,8 @@
   Changes with Apache 1.3b8
   
  +  *) Using a type map file as a custom error document was not possible.
  +     [Lars Eilebrecht] PR#1031
  +
     *) Avoid problems with braindead Awks by additionally searching for gawk 
        and nawk in APACI's configure script.
        [Dave Dykstra <dwd@bell-labs.com>, Ralf S. Engelschall] PR#2319
  
  
  
  1.80      +3 -3      apache-1.3/src/modules/standard/mod_negotiation.c
  
  Index: mod_negotiation.c
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/modules/standard/mod_negotiation.c,v
  retrieving revision 1.79
  retrieving revision 1.80
  diff -u -r1.79 -r1.80
  --- mod_negotiation.c	1998/05/04 06:58:09	1.79
  +++ mod_negotiation.c	1998/05/30 19:15:38	1.80
  @@ -711,9 +711,6 @@
       /* We are not using multiviews */
       neg->count_multiviews_variants = 0;
   
  -    if (rr->status != HTTP_OK) {
  -        return rr->status;
  -    }
       map = ap_pfopen(neg->pool, rr->filename, "r");
       if (map == NULL) {
           ap_log_error(APLOG_MARK, APLOG_ERR, r->server,
  @@ -854,6 +851,9 @@
   
               ap_pclosedir(neg->pool, dirp);
               neg->avail_vars->nelts = 0;
  +	    if (sub_req->status != HTTP_OK) {
  +		return sub_req->status;
  +	    }
               return read_type_map(neg, sub_req);
           }
   
  
  
  

Mime
View raw message