]> granicus.if.org Git - php/commitdiff
- Fixed bug #50464 (declare encoding doesn't work with)
authorFelipe Pena <felipe@php.net>
Sun, 13 Dec 2009 15:18:58 +0000 (15:18 +0000)
committerFelipe Pena <felipe@php.net>
Sun, 13 Dec 2009 15:18:58 +0000 (15:18 +0000)
# The bug (BC) only happens in this branch.

NEWS
Zend/zend_compile.c

diff --git a/NEWS b/NEWS
index 6a33f63bb2db2c14e66c54734c5d51dbe42cd36d..3d059219ba68844fa23b20504e3e0392ea2dd688 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -33,6 +33,7 @@ PHP                                                                        NEWS
 - 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
index e536f61a10d41dd50097a9aa0507ff7dda2a206f..a30df6bf08e60fe1fb2bafdf482e6fd02b6a917b 100644 (file)
@@ -4664,7 +4664,7 @@ void zend_do_declare_stmt(znode *var, znode *val TSRMLS_DC) /* {{{ */
                                --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");
                        }
                }