Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@httpd.apache.org
Date: 25 Feb 2003 22:59:59 -0000
Message-ID: <20030225225959.53768.qmail@icarus.apache.org>
From: nd@apache.org
To: httpd-2.0-cvs@apache.org
Subject: cvs commit: httpd-2.0/modules/mappers mod_alias.c

nd          2003/02/25 14:59:59

  Modified:    .        CHANGES
               modules/mappers mod_alias.c
  Log:
  When using Redirect in directory context, append requested query
  string if there's no one supplied by configuration.
  
  PR: 10961
  
  Revision  Changes    Path
  1.1089    +4 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.1088
  retrieving revision 1.1089
  diff -u -r1.1088 -r1.1089
  --- CHANGES	25 Feb 2003 13:13:22 -0000	1.1088
  +++ CHANGES	25 Feb 2003 22:59:56 -0000	1.1089
  @@ -2,6 +2,10 @@
   
     [Remove entries to the current 2.0 section below, when backported]
   
  +  *) When using Redirect in directory context, append requested query
  +     string if there's no one supplied by configuration. PR 10961.
  +     [Andr� Malo]
  +
     *) Fix path handling of mod_rewrite, especially on non-unix systems.
        There was some confusion between local paths and URL paths.
        PR 12902.  [Andr� Malo]
  
  
  
  1.49      +6 -0      httpd-2.0/modules/mappers/mod_alias.c
  
  Index: mod_alias.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/mappers/mod_alias.c,v
  retrieving revision 1.48
  retrieving revision 1.49
  diff -u -r1.48 -r1.49
  --- mod_alias.c	20 Feb 2003 14:12:07 -0000	1.48
  +++ mod_alias.c	25 Feb 2003 22:59:58 -0000	1.49
  @@ -489,6 +489,12 @@
                                 r->uri, ret);
               }
               else {
  +                /* append requested query only, if the config didn't
  +                 * supply its own.
  +                 */
  +                if (r->args && !ap_strchr(ret, '?')) {
  +                    ret = apr_pstrcat(r->pool, ret, "?", r->args, NULL);
  +                }
                   apr_table_setn(r->headers_out, "Location", ret);
               }
           }