felipe                                   Sun, 13 Dec 2009 15:18:58 +0000

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

Log:
- Fixed bug #50464 (declare encoding doesn't work with)
# The bug (BC) only happens in this branch.

Bug: http://bugs.php.net/50464 (Open) declare encoding doesn't work with 
      
Changed paths:
    U   php/php-src/branches/PHP_5_3/NEWS
    U   php/php-src/branches/PHP_5_3/Zend/zend_compile.c

Modified: php/php-src/branches/PHP_5_3/NEWS
===================================================================
--- php/php-src/branches/PHP_5_3/NEWS   2009-12-13 14:48:04 UTC (rev 292077)
+++ php/php-src/branches/PHP_5_3/NEWS   2009-12-13 15:18:58 UTC (rev 292078)
@@ -33,6 +33,7 @@
 - Fixed memory leak in extension loading when an error occurs on Windows.
   (Pierre)

+- Fixed bug #50464 (declare encoding doesn't work with). (Felipe)
 - Fixed bug #50445 (PDO-ODBC stored procedure call from Solaris 64-bit causes
   seg fault). (davbrown4 at yahoo dot com, Felipe)
 - Fixed bug #50351 (performance regression handling objects, ten times slower

Modified: php/php-src/branches/PHP_5_3/Zend/zend_compile.c
===================================================================
--- php/php-src/branches/PHP_5_3/Zend/zend_compile.c    2009-12-13 14:48:04 UTC 
(rev 292077)
+++ php/php-src/branches/PHP_5_3/Zend/zend_compile.c    2009-12-13 15:18:58 UTC 
(rev 292078)
@@ -4664,7 +4664,7 @@
                                --num;
                        }

-                       if (num > 0 || CG(encoding_declared)) {
+                       if (num > 0) {
                                zend_error(E_COMPILE_ERROR, "Encoding 
declaration pragma must be the very first statement in the script");
                        }
                }

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

Reply via email to