Merge branch 'PHP-5.6'

* PHP-5.6:
  Removed second zval_copy_ctor()
This commit is contained in:
Dmitry Stogov 2014-07-24 01:16:28 +04:00
commit 8fb7c4dc08
2 changed files with 0 additions and 2 deletions

View File

@ -5397,7 +5397,6 @@ ZEND_VM_HANDLER(143, ZEND_DECLARE_CONST, CONST, CONST)
} else {
zval_copy_ctor(&c.value);
}
zval_copy_ctor(&c.value);
}
c.flags = CONST_CS; /* non persistent, case sensetive */
c.name = str_strndup(Z_STRVAL_P(name), Z_STRLEN_P(name));

View File

@ -4333,7 +4333,6 @@ static int ZEND_FASTCALL ZEND_DECLARE_CONST_SPEC_CONST_CONST_HANDLER(ZEND_OPCOD
} else {
zval_copy_ctor(&c.value);
}
zval_copy_ctor(&c.value);
}
c.flags = CONST_CS; /* non persistent, case sensetive */
c.name = str_strndup(Z_STRVAL_P(name), Z_STRLEN_P(name));