pajoye Mon, 13 Dec 2010 20:57:06 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=306349
Log:
- MFH trailing slashes detection
Changed paths:
U php/php-src/branches/PHP_5_3/win32/build/confutils.js
Modified: php/php-src/branches/PHP_5_3/win32/build/confutils.js
===================================================================
--- php/php-src/branches/PHP_5_3/win32/build/confutils.js 2010-12-13
20:56:44 UTC (rev 306348)
+++ php/php-src/branches/PHP_5_3/win32/build/confutils.js 2010-12-13
20:57:06 UTC (rev 306349)
@@ -1955,7 +1955,7 @@
{
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 @@
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',''];
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
