Fixed bug #61043: Regression in magic_quotes_gpc fix (CVE-2012-0831)

Merge commit 'refs/pull/12/head' of git://github.com/php/php-src into 5.3

Signed-off-by: Gustavo André dos Santos Lopes <cataphract@php.net>

diff --cc NEWS
index 6866355f5d9956249dfeeadd3fbe9139b8a97d3e,a2d7c051e653aa1505e96909138b5c68a5864e05..fa156b9827eb145d8b138ec4305eec69c72d1b82
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -14,6 -14,6 +14,8 @@@ PH
      (Nikic, Laruence)
    . Fixed bug #61058 (array_fill leaks if start index is PHP_INT_MAX).
        (Laruence)
++  . Fixed bug #61043 (Regression in magic_quotes_gpc fix for CVE-2012-0831).
++    (Ondřej Surý)
    . Fixed bug #61000 (Exceeding max nesting level doesn't delete numerical
        vars). (Laruence)
    . Fix bug #60895 (Possible invalid handler usage in windows random

diff --cc tests/basic/magic_quotes_gpc.phpt
index 0000000000000000000000000000000000000000,d1c880fd390576ff1d3f1e74742a5c8d2d418d15..0be6533b788523853bc211e1101440320e062735
mode 000000,100644..100644
--- /dev/null
--- 2/tests/basic/magic_quotes_gpc.phpt
+++ b/tests/basic/magic_quotes_gpc.phpt
@@@ -1,0 -1,10 +1,11 @@@
+ --TEST--
+ Bug #61043 (Regression in magic_quotes_gpc fix for CVE-2012-0831)
+ --INI--
++error_reporting=E_ALL & ~E_DEPRECATED
+ magic_quotes_gpc=On
+ --FILE--
+ <?php
+ var_dump(ini_get("magic_quotes_gpc"));
+ ?>
+ --EXPECT--
+ string(1) "1"