moriyoshi                                Mon, 14 Sep 2009 04:11:29 +0000

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

Log:
- Looks like bug #48697 has already been fixed in RC1.

Bug: http://bugs.php.net/48697 (Assigned) mb_internal_encoding() value gets 
reset by parse_str() or mb_parse_str()
      
Changed paths:
    U   php/php-src/branches/PHP_5_2/NEWS
    A   php/php-src/branches/PHP_5_2/ext/mbstring/tests/bug48697.phpt
    A   php/php-src/branches/PHP_5_3/ext/mbstring/tests/bug48697.phpt
    A   php/php-src/trunk/ext/mbstring/tests/bug48697.phpt

Modified: php/php-src/branches/PHP_5_2/NEWS
===================================================================
--- php/php-src/branches/PHP_5_2/NEWS   2009-09-14 03:13:03 UTC (rev 288300)
+++ php/php-src/branches/PHP_5_2/NEWS   2009-09-14 04:11:29 UTC (rev 288301)
@@ -80,6 +80,8 @@
 - Fixed bug #48718 (FILTER_VALIDATE_EMAIL does not allow numbers in domain
   components). (Ilia)
 - Fixed bug #48709 (metaphone and 'wh'). (brettz9 at yahoo dot com, Felipe)
+- Fixed bug #48697 (mb_internal_encoding() value gets reset by parse_str()).
+  (Moriyoshi)
 - Fixed bug #48693 (Double declaration of __lambda_func when lambda wrongly
   formatted). (peter at lvp-media dot com, Felipe)
 - Fixed bug #48661 (phpize is broken with non-bash shells). (Jani)

Added: php/php-src/branches/PHP_5_2/ext/mbstring/tests/bug48697.phpt
===================================================================
--- php/php-src/branches/PHP_5_2/ext/mbstring/tests/bug48697.phpt               
                (rev 0)
+++ php/php-src/branches/PHP_5_2/ext/mbstring/tests/bug48697.phpt       
2009-09-14 04:11:29 UTC (rev 288301)
@@ -0,0 +1,24 @@
+--TEST--
+Bug #48697 (mb_internal_encoding() value gets reset by parse_str()
+--SKIPIF--
+<?php extension_loaded('mbstring') or die('skip mbstring not available'); ?>
+--FILE--
+<?php
+ini_set('mbstring.internal_encoding', 'ISO-8859-15');
+ini_set('mbstring.encoding_translation', true);
+var_dump(mb_internal_encoding());
+mb_internal_encoding('UTF-8');
+var_dump(mb_internal_encoding());
+parse_str('a=b');
+var_dump(mb_internal_encoding());
+mb_internal_encoding('UTF-8');
+var_dump(mb_internal_encoding());
+parse_str('a=b');
+var_dump(mb_internal_encoding());
+?>
+--EXPECT--
+string(11) "ISO-8859-15"
+string(5) "UTF-8"
+string(5) "UTF-8"
+string(5) "UTF-8"
+string(5) "UTF-8"

Added: php/php-src/branches/PHP_5_3/ext/mbstring/tests/bug48697.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/mbstring/tests/bug48697.phpt               
                (rev 0)
+++ php/php-src/branches/PHP_5_3/ext/mbstring/tests/bug48697.phpt       
2009-09-14 04:11:29 UTC (rev 288301)
@@ -0,0 +1,24 @@
+--TEST--
+Bug #48697 (mb_internal_encoding() value gets reset by parse_str() or 
mb_parse_str()
+--SKIPIF--
+<?php extension_loaded('mbstring') or die('skip mbstring not available'); ?>
+--FILE--
+<?php
+ini_set('mbstring.internal_encoding', 'ISO-8859-15');
+ini_set('mbstring.encoding_translation', true);
+var_dump(mb_internal_encoding());
+mb_internal_encoding('UTF-8');
+var_dump(mb_internal_encoding());
+parse_str('a=b');
+var_dump(mb_internal_encoding());
+mb_internal_encoding('UTF-8');
+var_dump(mb_internal_encoding());
+parse_str('a=b');
+var_dump(mb_internal_encoding());
+?>
+--EXPECT--
+string(11) "ISO-8859-15"
+string(5) "UTF-8"
+string(5) "UTF-8"
+string(5) "UTF-8"
+string(5) "UTF-8"

Added: php/php-src/trunk/ext/mbstring/tests/bug48697.phpt
===================================================================
--- php/php-src/trunk/ext/mbstring/tests/bug48697.phpt                          
(rev 0)
+++ php/php-src/trunk/ext/mbstring/tests/bug48697.phpt  2009-09-14 04:11:29 UTC 
(rev 288301)
@@ -0,0 +1,24 @@
+--TEST--
+Bug #48697 (mb_internal_encoding() value gets reset by parse_str() or 
mb_parse_str()
+--SKIPIF--
+<?php extension_loaded('mbstring') or die('skip mbstring not available'); ?>
+--FILE--
+<?php
+ini_set('mbstring.internal_encoding', 'ISO-8859-15');
+ini_set('mbstring.encoding_translation', true);
+var_dump(mb_internal_encoding());
+mb_internal_encoding('UTF-8');
+var_dump(mb_internal_encoding());
+parse_str('a=b');
+var_dump(mb_internal_encoding());
+mb_internal_encoding('UTF-8');
+var_dump(mb_internal_encoding());
+parse_str('a=b');
+var_dump(mb_internal_encoding());
+?>
+--EXPECT--
+string(11) "ISO-8859-15"
+string(5) "UTF-8"
+string(5) "UTF-8"
+string(5) "UTF-8"
+string(5) "UTF-8"

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

Reply via email to