summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFelipe Pena <felipe@php.net>2009-12-13 15:18:58 +0000
committerFelipe Pena <felipe@php.net>2009-12-13 15:18:58 +0000
commit81ad353ec23e207549eb1f1cbd48cd7e68ba1af2 (patch)
tree67608fcf7009775c61f5abacf2467eb3bd6a4be2
parent5eae703705e945415952f2135f108dc24d86a328 (diff)
downloadphp-git-81ad353ec23e207549eb1f1cbd48cd7e68ba1af2.tar.gz
- Fixed bug #50464 (declare encoding doesn't work with)
# The bug (BC) only happens in this branch.
-rw-r--r--NEWS1
-rw-r--r--Zend/zend_compile.c2
2 files changed, 2 insertions, 1 deletions
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");
}
}