martin 98/05/29 18:53:05
Modified: src/modules/standard mod_speling.c
Log:
The speling module would "forget" to tack on the query arg again
to a spelling-fixed redirection.
Revision Changes Path
1.19 +8 -4 apache-1.3/src/modules/standard/mod_speling.c
Index: mod_speling.c
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/modules/standard/mod_speling.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -u -r1.18 -r1.19
--- mod_speling.c 1998/04/11 12:00:51 1.18
+++ mod_speling.c 1998/05/30 01:53:05 1.19
@@ -340,8 +340,9 @@
if (variant[0].quality != SP_VERYDIFFERENT &&
(candidates->nelts == 1 || variant[0].quality !=
variant[1].quality)) {
- nuri = ap_pstrcat(r->pool, url, variant[0].name,
- r->path_info, NULL);
+ nuri = ap_pstrcat(r->pool, url, variant[0].name, r->path_info,
+ r->parsed_uri.query ? "?" : "",
+ r->parsed_uri.query ? r->parsed_uri.query : "",
NULL);
ap_table_setn(r->headers_out, "Location",
ap_construct_url(r->pool, nuri, r));
@@ -385,8 +386,11 @@
/* The format isn't very neat... */
t = ap_pstrcat(p, t, "<li><a href=\"", url,
- variant[i].name, r->path_info, "\">",
- variant[i].name, r->path_info, "</a> (",
+ variant[i].name, r->path_info, "\">",
+ variant[i].name, r->path_info,
+ r->parsed_uri.query ? "?" : "",
+ r->parsed_uri.query ? r->parsed_uri.query : "",
+ "</a> (",
sp_reason_str[(int) (variant[i].quality)], ")\n", NULL);
/*
