cvs: ZendEngine2(PHP_5_2) / zend.c
| From: | Ilia Alshanetsky | Date: | Wed, 17 May 2006 13:27:51 +0000 |
| Subject: | cvs: ZendEngine2(PHP_5_2) / zend.c | ||
| Groups: | php.zend-engine.cvs | ||
| Request: | Send a blank email to php-zend-engine-cvs+get-4892@lists.php.net to get a copy of this message | ||
iliaa Wed May 17 13:27:51 2006 UTC
Modified files: (Branch: PHP_5_2)
/ZendEngine2 zend.c
Log:
Fixed bug #35512 (Lack of read permission on main script results in
E_WARNING rather then E_ERROR).
http://cvs.php.net/viewcvs.cgi/ZendEngine2/zend.c?r1=1.308.2.12.2.6&r2=1.308.2.12.2.7&diff_format=u
Index: ZendEngine2/zend.c
diff -u ZendEngine2/zend.c:1.308.2.12.2.6 ZendEngine2/zend.c:1.308.2.12.2.7
--- ZendEngine2/zend.c:1.308.2.12.2.6 Fri May 12 00:21:00 2006
+++ ZendEngine2/zend.c Wed May 17 13:27:51 2006
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend.c,v 1.308.2.12.2.6 2006/05/12 00:21:00 helly Exp $ */
+/* $Id: zend.c,v 1.308.2.12.2.7 2006/05/17 13:27:51 iliaa Exp $ */
#include "zend.h"
#include "zend_extensions.h"
@@ -1088,7 +1088,7 @@
if (!file_handle) {
continue;
}
- EG(active_op_array) = zend_compile_file(file_handle, ZEND_INCLUDE TSRMLS_CC);
+ EG(active_op_array) = zend_compile_file(file_handle, type TSRMLS_CC);
if(file_handle->opened_path) {
int dummy=1;
zend_hash_add(&EG(included_files), file_handle->opened_path,
strlen(file_handle->opened_path)+1, (void *)&dummy, sizeof(int), NULL);