cvs commit: apache/src CHANGES mod_negotiation.c

[Dean Gaudet]

dgaudet     97/04/16 19:50:21

  Modified:    src       CHANGES mod_negotiation.c
  Log:
  Promote per_dir_config and subprocess_env from subrequest to main request.
  Fixes a problem where <Files> sections weren't properly applied to negotiated
  content.
  
  Reviewed by:  Roy, Randy
  
  Revision  Changes    Path
  1.235     +5 -0      apache/src/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /export/home/cvs/apache/src/CHANGES,v
  retrieving revision 1.234
  retrieving revision 1.235
  diff -C3 -r1.234 -r1.235
  *** CHANGES   1997/04/16 06:07:43     1.234
  --- CHANGES   1997/04/17 02:50:19     1.235
  ***************
  *** 1,5 ****
  --- 1,10 ----
    Changes with Apache 1.2
    
  +   *) Promote per_dir_config and subprocess_env from the subrequest to the
  +      main request in mod_negotiation.  In particular this fixes a bug
  +      where <Files> sections wouldn't properly apply to negotiated content.
  +      [Dean Gaudet]
  + 
      *) Updated mod_rewrite to 3.0.4: Fixes HTTP redirects from within
         .htaccess files because the RewriteBase was not replaced correctly.
         [Ralf S. Engelschall]
  
  
  
  1.40      +3 -0      apache/src/mod_negotiation.c
  
  Index: mod_negotiation.c
  ===================================================================
  RCS file: /export/home/cvs/apache/src/mod_negotiation.c,v
  retrieving revision 1.39
  retrieving revision 1.40
  diff -C3 -r1.39 -r1.40
  *** mod_negotiation.c 1997/04/07 10:19:31     1.39
  --- mod_negotiation.c 1997/04/17 02:50:20     1.40
  ***************
  *** 1996,2007 ****
  --- 1996,2010 ----
        r->content_languages = sub_req->content_languages;
        r->content_language = sub_req->content_language;
        r->finfo = sub_req->finfo;
  +     r->per_dir_config = sub_req->per_dir_config;
        /* copy output headers from subrequest, but leave negotiation headers */
        r->notes = overlay_tables(r->pool, sub_req->notes, r->notes);
        r->headers_out = overlay_tables(r->pool, sub_req->headers_out,
                                                 r->headers_out);
        r->err_headers_out = overlay_tables(r->pool, sub_req->err_headers_out,
                                                     r->err_headers_out);
  +     r->subprocess_env = overlay_tables(r->pool, sub_req->subprocess_env,
  +                                             r->subprocess_env);
        avail_recs = (var_rec *)neg->avail_vars->elts;
        for (j = 0; j < neg->avail_vars->nelts; ++j) {
            var_rec *variant = &avail_recs[j];