mirror of
https://github.com/php/php-src.git
synced 2024-09-22 02:17:32 +00:00
Fixed bug #26653 (open_basedir incorrectly resolved on win32).
This commit is contained in:
parent
b6e14b44b4
commit
e8beeecf3e
@ -131,15 +131,15 @@ PHPAPI int php_check_specific_open_basedir(const char *basedir, const char *path
|
||||
if ((expand_filepath(path, resolved_name TSRMLS_CC) != NULL) && (expand_filepath(local_open_basedir, resolved_basedir TSRMLS_CC) != NULL)) {
|
||||
/* Handler for basedirs that end with a / */
|
||||
resolved_basedir_len = strlen(resolved_basedir);
|
||||
if (basedir[strlen(basedir)-1] == PHP_DIR_SEPARATOR && resolved_basedir[resolved_basedir_len -1] != PHP_DIR_SEPARATOR) {
|
||||
resolved_basedir[resolved_basedir_len] = '/';
|
||||
if (resolved_basedir[resolved_basedir_len -1] != PHP_DIR_SEPARATOR) {
|
||||
resolved_basedir[resolved_basedir_len] = PHP_DIR_SEPARATOR;
|
||||
resolved_basedir[++resolved_basedir_len] = '\0';
|
||||
}
|
||||
|
||||
if (path[strlen(path)-1] == PHP_DIR_SEPARATOR) {
|
||||
resolved_name_len = strlen(resolved_name);
|
||||
if (resolved_name[resolved_name_len - 1] != PHP_DIR_SEPARATOR) {
|
||||
resolved_name[resolved_name_len] = '/';
|
||||
resolved_name[resolved_name_len] = PHP_DIR_SEPARATOR;
|
||||
resolved_name[++resolved_name_len] = '\0';
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user