From: Antony Dovgal <tony2001@php.net>
Date: Wed, 27 May 2009 14:53:05 +0000 (+0000)
Subject: use request encoding when parsing cookies
X-Git-Tag: php-5.4.0alpha1~191^2~3498
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=248dc58005d079e3a453a05d4fb487c4953dbde9;p=php

use request encoding when parsing cookies
fixes 14 segfaults in HEAD
---

diff --git a/main/php_variables.c b/main/php_variables.c
index 1d24ea7a89..51cbff6b67 100644
--- a/main/php_variables.c
+++ b/main/php_variables.c
@@ -563,6 +563,7 @@ SAPI_API SAPI_TREAT_DATA_FUNC(php_default_treat_data)
 		} else {
 			free_buffer = 0;
 		}
+		conv = UG(request_encoding_conv);
 	} else if (arg == PARSE_STRING) {		/* String data */
 		res = str;
 		free_buffer = 1;