com php-src: Fix bugs: Zend/zend_compile.c

From: Date: Sat, 26 Jul 2014 16:23:46 +0000
Subject: com php-src: Fix bugs: Zend/zend_compile.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-80925@lists.php.net to get a copy of this message
Commit: 1bdc433259e7b27f739dc7846df37f84054acf50 Author: Nikita Popov <nikic@php.net> Sat, 26 Jul 2014 18:23:46 +0200 Parents: edd9fcab1e2da36e9f6e0261bb7c3187548759c0 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=1bdc433259e7b27f739dc7846df37f84054acf50 Log: Fix bugs Changed paths: M Zend/zend_compile.c Diff: diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 2ae0e7c..57781cb 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -5562,7 +5562,7 @@ void zend_begin_method_decl( zend_string *lcname; if (in_interface) { - if (op_array->fn_flags & ~(ZEND_ACC_STATIC|ZEND_ACC_PUBLIC)) { + if ((op_array->fn_flags & ZEND_ACC_PPP_MASK) != ZEND_ACC_PUBLIC) { zend_error_noreturn(E_COMPILE_ERROR, "Access type for interface method " "%s::%s() must be omitted", ce->name->val, name->val); } @@ -5945,7 +5945,7 @@ void zend_compile_class_const_decl(zend_ast *ast TSRMLS_DC) { name = zend_new_interned_string_safe(name TSRMLS_CC); if (zend_hash_add(&ce->constants_table, name, &value_zv) == NULL) { zend_error_noreturn(E_COMPILE_ERROR, "Cannot redefine class constant %s::%s", - ce->name->val, name); + ce->name->val, name->val); } if (Z_CONSTANT(value_zv)) {

« previous php.cvs (#80925) next »