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 Sun, 15 Aug 2004 21:35:18 GMT
nd          2004/08/15 14:35:18

  Modified:    .        Tag: APACHE_2_0_BRANCH CHANGES STATUS
               modules/mappers Tag: APACHE_2_0_BRANCH mod_dir.c
  Log:
  allow proxying of directoryindex'd resources
  
  PR: 14648, 15112, 29961
  Reviewed by: Justin Erenkrantz, Jeff Trawick
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.988.2.317 +3 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.988.2.316
  retrieving revision 1.988.2.317
  diff -u -u -r1.988.2.316 -r1.988.2.317
  --- CHANGES	4 Aug 2004 23:19:59 -0000	1.988.2.316
  +++ CHANGES	15 Aug 2004 21:35:14 -0000	1.988.2.317
  @@ -1,5 +1,8 @@
   Changes with Apache 2.0.51
   
  +  *) Allow proxying of resources that are invoked via DirectoryIndex.
  +     PR 14648, 15112, 29961.  [André Malo]
  +
     *) util_ldap: Switched the lock types on the shared memory cache 
        from thread reader/writer locks to global mutexes in order to 
        provide cross process cache protection. [Brad Nicholes]
  
  
  
  1.751.2.979 +1 -5      httpd-2.0/STATUS
  
  Index: STATUS
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/STATUS,v
  retrieving revision 1.751.2.978
  retrieving revision 1.751.2.979
  diff -u -u -r1.751.2.978 -r1.751.2.979
  --- STATUS	14 Aug 2004 11:08:20 -0000	1.751.2.978
  +++ STATUS	15 Aug 2004 21:35:15 -0000	1.751.2.979
  @@ -157,10 +157,6 @@
            modules/mappers/mod_dir.c: r1.48
          +1: nd, jerenkrantz, trawick
   
  -    *) mod_dir: Allow proxied DirectoryIndexes. PR 14648, 15112, 29961
  -         modules/mappers/mod_dir.c: r1.44
  -       +1: nd, jerenkrantz, trawick
  -
       *) mod_ssl: Remove some unused functions (after CAN-2004-0488 fix is applied)
          http://cvs.apache.org/viewcvs.cgi/httpd-2.0/modules/ssl/ssl_util.c?r1=1.46&r2=1.47
          +1: jorton
  
  
  
  No                   revision
  No                   revision
  1.41.2.5  +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.41.2.4
  retrieving revision 1.41.2.5
  diff -u -u -r1.41.2.4 -r1.41.2.5
  --- mod_dir.c	9 Feb 2004 20:53:18 -0000	1.41.2.4
  +++ mod_dir.c	15 Aug 2004 21:35:18 -0000	1.41.2.5
  @@ -158,7 +158,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