cvs: php4 /main main.c /sapi/apache mod_php4.c

zeev Fri Aug 31 10:34:41 2001 EDT Modified files: /php4/main main.c /php4/sapi/apache mod_php4.c Log: API update Index: php4/main/main.c diff -u php4/main/main.c:1.406 php4/main/main.c:1.407 --- php4/main/main.c:1.406 Thu Aug 30 09:38:33 2001 +++ php4/main/main.c Fri Aug 31 10:34:40 2001 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: main.c,v 1.406 2001/08/30 13:38:33 zeev Exp $ */ +/* $Id: main.c,v 1.407 2001/08/31 14:34:40 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.120 --- php4/sapi/apache/mod_php4.c:1.119 Tue Aug 14 04:33:21 2001 +++ php4/sapi/apache/mod_php4.c Fri Aug 31 10:34:40 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.120 2001/08/31 14:34:40 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; }