From: Felipe Pena <felipe@php.net>
Date: Sun, 13 Dec 2009 15:18:58 +0000 (+0000)
Subject: - Fixed bug #50464 (declare encoding doesn't work with)
X-Git-Tag: php-5.3.2RC1~57
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=81ad353ec23e207549eb1f1cbd48cd7e68ba1af2;p=php

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

diff --git a/NEWS b/NEWS
index 6a33f63bb2..3d059219ba 100644
--- 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
diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
index e536f61a10..a30df6bf08 100644
--- a/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@ -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");
 			}
 		}