projects / packages / php.git / blame
| Commit | Line | Data |
|---|---|---|
| fb98beff ER |
1 | --- PHP_5_3/main/fopen_wrappers.c.orig Mon Dec 20 16:53:43 2010 |
| 2 | +++ PHP_5_3/main/fopen_wrappers.c Mon Dec 20 17:27:43 2010 | |
| 3 | *************** | |
| 4 | *** 229,235 **** | |
| 5 | --- 229,239 ---- | |
| 6 | if (expand_filepath(local_open_basedir, resolved_basedir TSRMLS_CC) != NULL) { | |
| 7 | /* Handler for basedirs that end with a / */ | |
| 8 | resolved_basedir_len = strlen(resolved_basedir); | |
| 9 | + #if defined(PHP_WIN32) || defined(NETWARE) | |
| 10 | + if (basedir[strlen(basedir) - 1] == PHP_DIR_SEPARATOR || basedir[strlen(basedir) - 1] == '/') { | |
| 11 | + #else | |
| 12 | if (basedir[strlen(basedir) - 1] == PHP_DIR_SEPARATOR) { | |
| 13 | + #endif | |
| 14 | if (resolved_basedir[resolved_basedir_len - 1] != PHP_DIR_SEPARATOR) { | |
| 15 | resolved_basedir[resolved_basedir_len] = PHP_DIR_SEPARATOR; | |
| 16 | resolved_basedir[++resolved_basedir_len] = '\0'; |