cvs: php4(PHP_4_0_7) /main main.c /sapi/apache mod_php4.c

zeev Fri Aug 31 21:45:51 2001 EDT Modified files: (Branch: PHP_4_0_7) /php4/main main.c /php4/sapi/apache mod_php4.c Log: MFH Index: php4/main/main.c diff -u php4/main/main.c:1.404.2.2 php4/main/main.c:1.404.2.3 --- php4/main/main.c:1.404.2.2 Thu Aug 30 12:28:34 2001 +++ php4/main/main.c Fri Aug 31 21:45:50 2001 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: main.c,v 1.404.2.2 2001/08/30 16:28:34 sniper Exp $ */ +/* $Id: main.c,v 1.404.2.3 2001/09/01 01:45:50 zeev Exp $ */ /* {{{ includes */ @@ -1307,7 +1307,7 @@ } else { append_file_p = NULL; } - zend_execute_scripts(ZEND_REQUIRE TSRMLS_CC, 3, prepend_file_p, primary_file, append_file_p); + zend_execute_scripts(ZEND_REQUIRE TSRMLS_CC, NULL, 3, prepend_file_p, primary_file, append_file_p); } zend_end_try(); if (old_cwd[0] != '\0') { Index: php4/sapi/apache/mod_php4.c diff -u php4/sapi/apache/mod_php4.c:1.119 php4/sapi/apache/mod_php4.c:1.119.2.1 --- php4/sapi/apache/mod_php4.c:1.119 Tue Aug 14 04:33:21 2001 +++ php4/sapi/apache/mod_php4.c Fri Aug 31 21:45:51 2001 @@ -17,7 +17,7 @@ | PHP 4.0 patches by Zeev Suraski <zeev@zend.com> | +----------------------------------------------------------------------+ */ -/* $Id: mod_php4.c,v 1.119 2001/08/14 08:33:21 thies Exp $ */ +/* $Id: mod_php4.c,v 1.119.2.1 2001/09/01 01:45:51 zeev Exp $ */ #define NO_REGEX_EXTRA_H #ifdef WIN32 @@ -498,7 +498,7 @@ fh.opened_path = NULL; fh.free_filename = 0; fh.type = ZEND_HANDLE_FILENAME; - zend_execute_scripts(ZEND_INCLUDE TSRMLS_CC, 1, &fh); + zend_execute_scripts(ZEND_INCLUDE TSRMLS_CC, NULL, 1, &fh); return OK; }