You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by nd...@apache.org on 2003/04/24 18:16:23 UTC
cvs commit: httpd-2.0/modules/mappers mod_alias.c
nd 2003/04/24 09:16:23
Modified: . Tag: APACHE_2_0_BRANCH CHANGES STATUS
modules/mappers Tag: APACHE_2_0_BRANCH mod_alias.c
Log:
When using Redirect in directory context, append requested query
string if there's no one supplied by configuration.
PR: 10961
Reviewed by: Jeff Trawick, Jim Jagielski
Revision Changes Path
No revision
No revision
1.988.2.85 +4 -0 httpd-2.0/CHANGES
Index: CHANGES
===================================================================
RCS file: /home/cvs/httpd-2.0/CHANGES,v
retrieving revision 1.988.2.84
retrieving revision 1.988.2.85
diff -u -r1.988.2.84 -r1.988.2.85
--- CHANGES 22 Apr 2003 20:02:41 -0000 1.988.2.84
+++ CHANGES 24 Apr 2003 16:16:17 -0000 1.988.2.85
@@ -1,5 +1,9 @@
Changes with Apache 2.0.46
+ *) When using Redirect in directory context, append requested query
+ string if there's no one supplied by configuration. PR 10961.
+ [Andr� Malo]
+
*) Unescape the supplied wildcard pattern in mod_autoindex. Otherwise
the pattern will not always match as desired. PR 12596.
[Andr� Malo]
1.751.2.232 +1 -8 httpd-2.0/STATUS
Index: STATUS
===================================================================
RCS file: /home/cvs/httpd-2.0/STATUS,v
retrieving revision 1.751.2.231
retrieving revision 1.751.2.232
diff -u -r1.751.2.231 -r1.751.2.232
--- STATUS 24 Apr 2003 15:38:41 -0000 1.751.2.231
+++ STATUS 24 Apr 2003 16:16:19 -0000 1.751.2.232
@@ -136,13 +136,6 @@
modules/mappers/mod_rewrite.c: r1.146
+1: nd
- * When using Redirect in directory context, append requested query
- string if there's no one supplied by configuration. PR 10961.
- (2.0 + 1.3)
- modules/mappers/mod_alias.c: r1.49
- +1: nd, trawick (this is simple... look how query string is
- appended in the other situation), jim
-
* mod_negotiation: parse quality values independent from
the current locale and level values as integers. PR 17564.
(essentially: get a rid of atof()) (2.0 + 1.3)
No revision
No revision
1.43.2.2 +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.43.2.1
retrieving revision 1.43.2.2
diff -u -r1.43.2.1 -r1.43.2.2
--- mod_alias.c 3 Feb 2003 17:31:43 -0000 1.43.2.1
+++ mod_alias.c 24 Apr 2003 16:16:22 -0000 1.43.2.2
@@ -463,6 +463,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);
}
}