- fix regression introduced in 5.3.4 in open_basedir on windows/novell with trailing...

diff --git a/main/fopen_wrappers.c b/main/fopen_wrappers.c
index fe830922859cd7b2fc215ba9b4fa4aaccbff30a8..4ec3e5ee7af833a669dd75dcf6dd518a2eec3ac6 100644 (file)
--- a/main/fopen_wrappers.c
+++ b/main/fopen_wrappers.c
@@ -228,7 +228,11 @@ PHPAPI int php_check_specific_open_basedir(const char *basedir, const char *path
        if (expand_filepath(local_open_basedir, resolved_basedir TSRMLS_CC) != NULL) {
                /* Handler for basedirs that end with a / */
                resolved_basedir_len = strlen(resolved_basedir);
+#if defined(PHP_WIN32) || defined(NETWARE)
+               if (basedir[strlen(basedir) - 1] == PHP_DIR_SEPARATOR || basedir[strlen(basedir) - 1] == '/') {
+#else
                if (basedir[strlen(basedir) - 1] == PHP_DIR_SEPARATOR) {
+#endif
                        if (resolved_basedir[resolved_basedir_len - 1] != PHP_DIR_SEPARATOR) {
                                resolved_basedir[resolved_basedir_len] = PHP_DIR_SEPARATOR;
                                resolved_basedir[++resolved_basedir_len] = '\0';