Attachment #140901 for bug #205716

View | Details | Raw Unified | Return to bug 205716
Collapse All | Expand All

Lines 228-234 Link Here

(-)runkit_import.c (-1 / +3 lines)
228	if (zend_hash_get_current_key_ex(&ce->default_properties, &key, &key_len, &idx, 0, &pos) == HASH_KEY_IS_STRING) {	228	if (zend_hash_get_current_key_ex(&ce->default_properties, &key, &key_len, &idx, 0, &pos) == HASH_KEY_IS_STRING) {
229	char cname = NULL, pname = key;	229	char cname = NULL, pname = key;
230		230
231	#ifdef ZEND_ENGINE_2	231	#ifdef ZEND_ENGINE_2_2
		232	zend_unmangle_property_name(key, key_len - 1, &cname, &pname);
		233	#elif defined(ZEND_ENGINE_2)
232	zend_unmangle_property_name(key, &cname, &pname);	234	zend_unmangle_property_name(key, &cname, &pname);
233	#endif	235	#endif
234	if (zend_hash_exists(&dce->default_properties, key, key_len)) {	236	if (zend_hash_exists(&dce->default_properties, key, key_len)) {

Lines 40-45 Link Here

(-)php_runkit.h (+7 lines)
40	#define PHP_RUNKIT_IMPORT_CLASS_PROPS 0x0008	40	#define PHP_RUNKIT_IMPORT_CLASS_PROPS 0x0008
41	#define PHP_RUNKIT_IMPORT_CLASSES (PHP_RUNKIT_IMPORT_CLASS_METHODS\|PHP_RUNKIT_IMPORT_CLASS_CONSTS\|PHP_RUNKIT_IMPORT_CLASS_PROPS)	41	#define PHP_RUNKIT_IMPORT_CLASSES (PHP_RUNKIT_IMPORT_CLASS_METHODS\|PHP_RUNKIT_IMPORT_CLASS_CONSTS\|PHP_RUNKIT_IMPORT_CLASS_PROPS)
42	#define PHP_RUNKIT_IMPORT_OVERRIDE 0x0010	42	#define PHP_RUNKIT_IMPORT_OVERRIDE 0x0010
		43
		44	#if ZEND_MODULE_API_NO > 20050922
		45	#define ZEND_ENGINE_2_2
		46	#endif
		47	#if ZEND_MODULE_API_NO > 20050921
		48	#define ZEND_ENGINE_2_1
		49	#endif
43		50
44	/* The TSRM interpreter patch required by runkit_sandbox was added in 5.1, but this package includes diffs for older versions	51	/* The TSRM interpreter patch required by runkit_sandbox was added in 5.1, but this package includes diffs for older versions
45	* Those diffs include an additional #define to indicate that they've been applied	52	* Those diffs include an additional #define to indicate that they've been applied

Return to bug 205716