cvs: php4 /main fopen_wrappers.c
| From: | Sebastian Bergmann | Date: | Sat, 02 Feb 2002 05:43:55 +0000 |
| Subject: | cvs: php4 /main fopen_wrappers.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-9239@lists.php.net to get a copy of this message | ||
sebastian Sat Feb 2 00:43:55 2002 EDT
Modified files:
/php4/main fopen_wrappers.c
Log:
Fix thread-safe build.
Index: php4/main/fopen_wrappers.c
diff -u php4/main/fopen_wrappers.c:1.141 php4/main/fopen_wrappers.c:1.142
--- php4/main/fopen_wrappers.c:1.141 Fri Feb 1 15:04:14 2002
+++ php4/main/fopen_wrappers.c Sat Feb 2 00:43:55 2002
@@ -16,7 +16,7 @@
| Jim Winstead <jimw@php.net> |
+----------------------------------------------------------------------+
*/
-/* $Id: fopen_wrappers.c,v 1.141 2002/02/01 20:04:14 jflemer Exp $ */
+/* $Id: fopen_wrappers.c,v 1.142 2002/02/02 05:43:55 sebastian Exp $ */
/* {{{ includes
*/
@@ -457,7 +457,7 @@
/* Absolute path open */
if (IS_ABSOLUTE_PATH(filename, filename_length)) {
- if ((php_check_safe_mode_include_dir(filename)) == 0)
+ if ((php_check_safe_mode_include_dir(filename TSRMLS_CC)) == 0)
/* filename is in safe_mode_include_dir (or subdir) */
return php_fopen_and_set_opened_path(filename, mode, opened_path TSRMLS_CC);
@@ -511,7 +511,7 @@
if (PG(safe_mode)) {
if (VCWD_STAT(trypath, &sb) == 0) {
/* file exists ... check permission */
- if ((php_check_safe_mode_include_dir(trypath) == 0) ||
+ if ((php_check_safe_mode_include_dir(trypath TSRMLS_CC) == 0) ||
php_checkuid(trypath, mode, CHECKUID_CHECK_MODE_PARAM))
/* UID ok, or trypath is in safe_mode_include_dir */
fp = php_fopen_and_set_opened_path(trypath, mode, opened_path TSRMLS_CC);