svn: /php/php-src/ branches/PHP_5_4/main/fopen_wrappers.c trunk/main/fopen_wrappers.c
| From: | Pierre Joye | Date: | Wed, 27 Jul 2011 12:20:32 +0000 |
| Subject: | svn: /php/php-src/ branches/PHP_5_4/main/fopen_wrappers.c trunk/main/fopen_wrappers.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-65623@lists.php.net to get a copy of this message | ||
pajoye Wed, 27 Jul 2011 12:20:32 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=313774
Log:
- do not resolve the link if all we want is to open that file
Changed paths:
U php/php-src/branches/PHP_5_4/main/fopen_wrappers.c
U php/php-src/trunk/main/fopen_wrappers.c
Modified: php/php-src/branches/PHP_5_4/main/fopen_wrappers.c
===================================================================
--- php/php-src/branches/PHP_5_4/main/fopen_wrappers.c 2011-07-27 12:18:12 UTC (rev 313773)
+++ php/php-src/branches/PHP_5_4/main/fopen_wrappers.c 2011-07-27 12:20:32 UTC (rev 313774)
@@ -348,7 +348,7 @@
}
fp = VCWD_FOPEN(path, mode);
if (fp && opened_path) {
- *opened_path = expand_filepath(path, NULL TSRMLS_CC);
+ *opened_path = expand_filepath_with_mode(path, NULL, NULL, 0, CWD_EXPAND TSRMLS_CC);
}
return fp;
}
Modified: php/php-src/trunk/main/fopen_wrappers.c
===================================================================
--- php/php-src/trunk/main/fopen_wrappers.c 2011-07-27 12:18:12 UTC (rev 313773)
+++ php/php-src/trunk/main/fopen_wrappers.c 2011-07-27 12:20:32 UTC (rev 313774)
@@ -348,7 +348,7 @@
}
fp = VCWD_FOPEN(path, mode);
if (fp && opened_path) {
- *opened_path = expand_filepath(path, NULL TSRMLS_CC);
+ *opened_path = expand_filepath_with_mode(path, NULL, NULL, 0, CWD_EXPAND TSRMLS_CC);
}
return fp;
}