Merge branch 'PHP-5.4' into PHP-5.5

laruence · laruence · commit c4f2a20f150c · 2013-01-04T11:05:53.000+08:00
diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
@@ -4936,7 +4936,7 @@ void zend_do_begin_class_declaration(const znode *class_token, znode *class_name
 		tmp.u.constant = *CG(current_namespace);
 		zval_copy_ctor(&tmp.u.constant);
 		zend_do_build_namespace_name(&tmp, &tmp, class_name TSRMLS_CC);
-		class_name = &tmp;
+		*class_name = tmp;
 		efree(lcname);
 		lcname = zend_str_tolower_dup(Z_STRVAL(class_name->u.constant), Z_STRLEN(class_name->u.constant));
 	}

Original file line number	Diff line number	Diff line change
`@@ -4936,7 +4936,7 @@ void zend_do_begin_class_declaration(const znode class_token, znode class_name`
`4936`	`4936`	`tmp.u.constant = *CG(current_namespace);`
`4937`	`4937`	`zval_copy_ctor(&tmp.u.constant);`
`4938`	`4938`	`zend_do_build_namespace_name(&tmp, &tmp, class_name TSRMLS_CC);`
`4939`		`- class_name = &tmp;`
	`4939`	`+ *class_name = tmp;`
`4940`	`4940`	`efree(lcname);`
`4941`	`4941`	`lcname = zend_str_tolower_dup(Z_STRVAL(class_name->u.constant), Z_STRLEN(class_name->u.constant));`
`4942`	`4942`	`}`