moriyoshi                                Fri, 24 Jul 2009 23:48:58 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=284727

Log:
- MFH (using svn merge; it seems I won't need to repeat the commit message 
anymore)

Changed paths:
    U   php/php-src/branches/PHP_5_3/ext/mbstring/mb_gpc.c

Modified: php/php-src/branches/PHP_5_3/ext/mbstring/mb_gpc.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/mbstring/mb_gpc.c  2009-07-24 23:44:43 UTC 
(rev 284726)
+++ php/php-src/branches/PHP_5_3/ext/mbstring/mb_gpc.c  2009-07-24 23:48:58 UTC 
(rev 284727)
@@ -59,7 +59,7 @@
        enum mbfl_no_encoding detected;
        php_mb_encoding_handler_info_t info;

-       {
+       if (arg != PARSE_STRING) {
                char *value = zend_ini_string("mbstring.internal_encoding", 
sizeof("mbstring.internal_encoding"), 0);
                _php_mb_ini_mbstring_internal_encoding_set(value, value ? 
strlen(value): 0 TSRMLS_CC);
        }

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

Reply via email to