cvs: php4 /ext/standard file.c

wez Sun Aug 25 08:09:57 2002 EDT Modified files: /php4/ext/standard file.c Log: Prevent possible problems with include_path. Index: php4/ext/standard/file.c diff -u php4/ext/standard/file.c:1.247 php4/ext/standard/file.c:1.248 --- php4/ext/standard/file.c:1.247 Fri Aug 23 21:19:28 2002 +++ php4/ext/standard/file.c Sun Aug 25 08:09:57 2002 @@ -21,7 +21,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: file.c,v 1.247 2002/08/24 01:19:28 helly Exp $ */ +/* $Id: file.c,v 1.248 2002/08/25 12:09:57 wez Exp $ */ /* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */ @@ -264,8 +264,9 @@ php_stream_open_wrapper(filename, "rb", 0, NULL); + md.stream = php_stream_open_wrapper(filename, "rb", - use_include_path | ENFORCE_SAFE_MODE | REPORT_ERRORS, + (use_include_path ? USE_PATH : 0) | ENFORCE_SAFE_MODE | REPORT_ERRORS, NULL); @@ -412,7 +413,7 @@ } stream = php_stream_open_wrapper(filename, "rb", - use_include_path | ENFORCE_SAFE_MODE | REPORT_ERRORS, + (use_include_path ? USE_PATH : 0) | ENFORCE_SAFE_MODE | REPORT_ERRORS, NULL); if (!stream) { RETURN_FALSE; @@ -459,7 +460,7 @@ } stream = php_stream_open_wrapper(filename, "rb", - use_include_path | ENFORCE_SAFE_MODE | REPORT_ERRORS, + (use_include_path ? USE_PATH : 0) | ENFORCE_SAFE_MODE | REPORT_ERRORS, NULL); if (!stream) { RETURN_FALSE; @@ -854,7 +855,7 @@ } stream = php_stream_open_wrapper_ex(filename, mode, - use_include_path | ENFORCE_SAFE_MODE | REPORT_ERRORS, + (use_include_path ? USE_PATH : 0) | ENFORCE_SAFE_MODE | REPORT_ERRORS, NULL, context); if (stream == NULL) { @@ -1579,7 +1580,7 @@ convert_to_string_ex(arg1); stream = php_stream_open_wrapper(Z_STRVAL_PP(arg1), "rb", - use_include_path | ENFORCE_SAFE_MODE | REPORT_ERRORS, + (use_include_path ? USE_PATH : 0) | ENFORCE_SAFE_MODE | REPORT_ERRORS, NULL); if (stream) { size = php_stream_passthru(stream);