[PHP-CVS] cvs: php-src /main php_variables.c

[Antony Dovgal]

tony2001                Wed May 27 14:53:05 2009 UTC

  Modified files:              
    /php-src/main       php_variables.c 
  Log:
  use request encoding when parsing cookies
  fixes 14 segfaults in HEAD
  
  
http://cvs.php.net/viewvc.cgi/php-src/main/php_variables.c?r1=1.158&r2=1.159&diff_format=u
Index: php-src/main/php_variables.c
diff -u php-src/main/php_variables.c:1.158 php-src/main/php_variables.c:1.159
--- php-src/main/php_variables.c:1.158  Sat May 23 18:52:03 2009
+++ php-src/main/php_variables.c        Wed May 27 14:53:05 2009
@@ -17,7 +17,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: php_variables.c,v 1.158 2009/05/23 18:52:03 jani Exp $ */
+/* $Id: php_variables.c,v 1.159 2009/05/27 14:53:05 tony2001 Exp $ */
 
 #include <stdio.h>
 #include "php.h"
@@ -563,6 +563,7 @@
                } else {
                        free_buffer = 0;
                }
+               conv = UG(request_encoding_conv);
        } else if (arg == PARSE_STRING) {               /* String data */
                res = str;
                free_buffer = 1;



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php