| Ilia Alshanetsky 2006-11-07, 6:56 pm |
| iliaa Tue Nov 7 18:29:20 2006 UTC
Modified files: (Branch: PHP_4_4)
/php-src NEWS
/Zend zend_compile.c
Log:
revert incorrect patch for bug #39129
http://cvs.php.net/viewvc.cgi/php-s...2&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.920.2.171 php-src/NEWS:1.1247.2.920.2.172
--- php-src/NEWS:1.1247.2.920.2.171 Fri Nov 3 14:55:59 2006
+++ php-src/NEWS Tue Nov 7 18:29:20 2006
@@ -5,7 +5,6 @@
- Fixed missing open_basedir check inside chdir() function. (Ilia)
- Fixed bug #39354 (Allow building of curl extension against libcurl
7.16.0). (Ilia)
-- Fixed bug #39129 (avoid creation of a dummy constructor. (Ilia)
- Fixed bug #39034 (curl_exec() with return transfer returns TRUE on empty
files). (Ilia)
- Fixed bug #38963 (Fixed a possible open_basedir bypass in tempnam()). (Ilia)
http://cvs.php.net/viewvc.cgi/Zend/...9&diff_format=u
Index: Zend/zend_compile.c
diff -u Zend/zend_compile.c:1.240.2.10.2.8 Zend/zend_compile.c:1.240.2.10.2.9
--- Zend/zend_compile.c:1.240.2.10.2.8 Sun Oct 15 17:06:14 2006
+++ Zend/zend_compile.c Tue Nov 7 18:29:20 2006
@@ -1164,7 +1164,7 @@
if (zend_hash_find(&ce->parent->function_table, ce->parent->name, ce->parent->name_length+1, (void **) &function)==SUCCESS) {
/* inherit parent's constructor */
- zend_hash_update(&ce->function_table, ce->parent->name, ce->parent->name_length+1, function, sizeof(zend_function), NULL);
+ zend_hash_update(&ce->function_table, ce->name, ce->name_length+1, function, sizeof(zend_function), NULL);
function_add_ref(function);
}
}
|