head	1.2;
access;
symbols
	RELEASE_8_3_0:1.1
	RELEASE_9_0_0:1.1
	RELEASE_7_4_0:1.1
	RELEASE_8_2_0:1.1
	RELEASE_6_EOL:1.1
	RELEASE_8_1_0:1.1
	RELEASE_7_3_0:1.1
	RELEASE_8_0_0:1.1
	RELEASE_7_2_0:1.1;
locks; strict;
comment	@# @;


1.2
date	2012.08.18.14.29.08;	author ohauer;	state dead;
branches;
next	1.1;

1.1
date	2008.12.28.08.08.59;	author pgollucci;	state Exp;
branches;
next	;


desc
@@


1.2
log
@SVN rev 302724 on 2012-08-18 14:29:08Z by ohauer

- remove www/apache20 and devel/apr0
- s/USE_APACHE= 20+/USE_APACHE= 22+/
- unify s/YES/yes/
- cleanup APACHE_VERSION <= 22 usage
- add entry to MOVED

with hat apache@@
@
text
@diff -urN mod_encoding.c.orig mod_encoding.c
--- mod_encoding.c.orig	Tue Jun 11 18:07:14 2002
+++ mod_encoding.c	Fri Dec 13 11:43:46 2002
@@@@ -129,13 +129,21 @@@@
   char *buff;
   char *keys[] = { "Destination", NULL };
   int   i;
+  char *unparsed_uri;
+  char *query_string;
 
   /* Normalize encoding in HTTP request line */
-  ap_unescape_url(r->unparsed_uri);
-  if ((buff = iconv_string(r, cd, r->unparsed_uri,
-			   strlen(r->unparsed_uri))) == NULL)
+  query_string = ap_pstrdup(r->pool, r->unparsed_uri);
+  unparsed_uri = ap_getword(r->pool, &query_string, '?');
+  ap_unescape_url(unparsed_uri);
+  if ((buff = iconv_string(r, cd, unparsed_uri,
+			   strlen(unparsed_uri))) == NULL)
     return -1;
-  ap_parse_uri(r, buff);
+  if (query_string && strlen(query_string) > 0) {
+    ap_parse_uri(r, ap_pstrcat(r->pool, buff, "?", query_string, NULL));
+  } else {
+    ap_parse_uri(r, buff);
+  }
   ap_getparents(r->uri); /* normalize given path for security */
 
   /* Normalize encoding in HTTP request header(s) */

@


1.1
log
@- fix build with www/apache22
- fix build with www/apache20

PR:             ports/127032
Submitted by:   Tsurutani Naoki <turutani@@scphys.kyoto-u.ac.jp>
@
text
@@

