svn: /php/php-src/branches/PHP_5_2/main/ fopen_wrappers.c
| From: | Pierre Joye | Date: | Thu, 09 Dec 2010 17:04:29 +0000 |
| Subject: | svn: /php/php-src/branches/PHP_5_2/main/ fopen_wrappers.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-64062@lists.php.net to get a copy of this message | ||
pajoye Thu, 09 Dec 2010 17:04:29 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=306136
Log:
- missing merge fix for #53352
Bug: http://bugs.php.net/53352 (error getting bug
information)
Changed paths:
U php/php-src/branches/PHP_5_2/main/fopen_wrappers.c
Modified: php/php-src/branches/PHP_5_2/main/fopen_wrappers.c
===================================================================
--- php/php-src/branches/PHP_5_2/main/fopen_wrappers.c 2010-12-09 16:38:37 UTC (rev 306135)
+++ php/php-src/branches/PHP_5_2/main/fopen_wrappers.c 2010-12-09 17:04:29 UTC (rev 306136)
@@ -172,6 +172,9 @@
resolved_basedir[resolved_basedir_len] = PHP_DIR_SEPARATOR;
resolved_basedir[++resolved_basedir_len] = '\0';
}
+ } else {
+ resolved_basedir[resolved_basedir_len++] = PHP_DIR_SEPARATOR;
+ resolved_basedir[resolved_basedir_len] = '\0';
}
resolved_name_len = strlen(resolved_name);