From: Pierre Joye <pajoye@php.net>
Date: Mon, 13 Dec 2010 20:57:06 +0000 (+0000)
Subject: - MFH trailing slashes detection
X-Git-Tag: php-5.3.6RC1~229
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=12a3e339f43ba6e258f58073961cf65026b6ba4e;p=php

- MFH trailing slashes detection
---

diff --git a/win32/build/confutils.js b/win32/build/confutils.js
index a3bde86af4..2609cf5c96 100644
--- a/win32/build/confutils.js
+++ b/win32/build/confutils.js
@@ -1955,7 +1955,7 @@ function PHP_INSTALL_HEADERS(dir, headers_list)
 {
 	headers_list = headers_list.split(new RegExp("\\s+"));
 	headers_list.sort();
-	if (dir.length > 0 && dir.substr(dir.length - 1) != '/') {
+	if (dir.length > 0 && dir.substr(dir.length - 1) != '/' && dir.substr(dir.length - 1) != '\\') {
 		dir += '/';
 	}
 	dir = dir.replace(new RegExp("/", "g"), "\\");
@@ -1966,7 +1966,7 @@ function PHP_INSTALL_HEADERS(dir, headers_list)
 		isdir = FSO.FolderExists(dir + src);
 		isfile = FSO.FileExists(dir + src);
 		if (isdir) {
-			if (src.length > 0 && src.substr(src.length - 1) != '/') {
+			if (src.length > 0 && src.substr(src.length - 1) != '/' && src.substr(src.length - 1) != '\\') {
 				src += '\\';
 			}
 			headers_install[headers_install.length] = [dir + src, 'dir',''];