httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From n.@apache.org
Subject cvs commit: httpd-2.0/modules/mappers mod_dir.c
Date Wed, 14 Jan 2004 00:41:25 GMT
nd          2004/01/13 16:41:25

  Modified:    .        CHANGES
               modules/mappers mod_dir.c
  Log:
  allow proxying of directoryindex'd resources
  
  Revision  Changes    Path
  1.1369    +3 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.1368
  retrieving revision 1.1369
  diff -u -u -r1.1368 -r1.1369
  --- CHANGES	13 Jan 2004 21:44:48 -0000	1.1368
  +++ CHANGES	14 Jan 2004 00:41:25 -0000	1.1369
  @@ -2,6 +2,9 @@
   
     [Remove entries to the current 2.0 section below, when backported]
   
  +  *) Allow proxying of resources that are invoked via DirectoryIndex.
  +     PR 14648.  [André Malo]
  +
     *) mod_rewrite: Allow proxying and RewriteRules in directory context
        for subrequests.  PR 14648, 15114.  [André Malo]
   
  
  
  
  1.44      +3 -1      httpd-2.0/modules/mappers/mod_dir.c
  
  Index: mod_dir.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/mappers/mod_dir.c,v
  retrieving revision 1.43
  retrieving revision 1.44
  diff -u -u -r1.43 -r1.44
  --- mod_dir.c	1 Jan 2004 13:26:20 -0000	1.43
  +++ mod_dir.c	14 Jan 2004 00:41:25 -0000	1.44
  @@ -201,7 +201,9 @@
           rr = ap_sub_req_lookup_uri(name_ptr, r, NULL);
   
           /* XXX: (filetype == APR_REG) - we can't use a non-file index??? */
  -        if (rr->status == HTTP_OK && rr->finfo.filetype == APR_REG) {
  +        if (   rr->status == HTTP_OK
  +            && (   (rr->handler && !strcmp(rr->handler, "proxy-server"))
  +                || rr->finfo.filetype == APR_REG)) {
               ap_internal_fast_redirect(rr, r);
               return OK;
           }
  
  
  

Mime
View raw message