svn: /php/win-installer/trunk/ PHPInstallerScripts52.vbs PHPInstallerScripts53.vbs PHPInstallerScripts54.vbs

jmertic Mon, 03 Oct 2011 19:24:19 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=317678 Log: Bug 55778 - Write out httpd.conf with forward slashes on Windows 7. Bug: https://bugs.php.net/55778 (Assigned) PHPIniDir only works correctly for forward slashes, not backward slashes Changed paths: U php/win-installer/trunk/PHPInstallerScripts52.vbs U php/win-installer/trunk/PHPInstallerScripts53.vbs U php/win-installer/trunk/PHPInstallerScripts54.vbs Modified: php/win-installer/trunk/PHPInstallerScripts52.vbs =================================================================== --- php/win-installer/trunk/PHPInstallerScripts52.vbs 2011-10-03 19:16:26 UTC (rev 317677) +++ php/win-installer/trunk/PHPInstallerScripts52.vbs 2011-10-03 19:24:19 UTC (rev 317678) @@ -14,8 +14,14 @@ If ( right(strApacheDir,1) <> "\" ) then strApacheDir = strApacheDir & "\" End If - strPHPPath = strInstallDir + ' Bug 55778 - Use forward slashes in Windows 7 + If ( FormatNumber(GetWindowsVersion) >= FormatNumber("7.0") ) Then + strPHPPath = Replace(strInstallDir,"\","/") + Else + strPHPPath = strInstallDir + End If + strDirective = vbCrLf & vbCrLf & "#BEGIN PHP INSTALLER EDITS - REMOVE ONLY ON UNINSTALL" & vbCrLf If ( strWebServerType = "apacheCGI" ) Then strDirective = strDirective & "ScriptAlias /php/ """ & strPHPPath & """" & vbCrLf Modified: php/win-installer/trunk/PHPInstallerScripts53.vbs =================================================================== --- php/win-installer/trunk/PHPInstallerScripts53.vbs 2011-10-03 19:16:26 UTC (rev 317677) +++ php/win-installer/trunk/PHPInstallerScripts53.vbs 2011-10-03 19:24:19 UTC (rev 317678) @@ -14,8 +14,14 @@ If ( right(strApacheDir,1) <> "\" ) then strApacheDir = strApacheDir & "\" End If - strPHPPath = strInstallDir + ' Bug 55778 - Use forward slashes in Windows 7 + If ( FormatNumber(GetWindowsVersion) >= FormatNumber("7.0") ) Then + strPHPPath = Replace(strInstallDir,"\","/") + Else + strPHPPath = strInstallDir + End If + strDirective = vbCrLf & vbCrLf & "#BEGIN PHP INSTALLER EDITS - REMOVE ONLY ON UNINSTALL" & vbCrLf If ( strWebServerType = "apacheCGI" ) Then strDirective = strDirective & "ScriptAlias /php/ """ & strPHPPath & """" & vbCrLf Modified: php/win-installer/trunk/PHPInstallerScripts54.vbs =================================================================== --- php/win-installer/trunk/PHPInstallerScripts54.vbs 2011-10-03 19:16:26 UTC (rev 317677) +++ php/win-installer/trunk/PHPInstallerScripts54.vbs 2011-10-03 19:24:19 UTC (rev 317678) @@ -14,8 +14,14 @@ If ( right(strApacheDir,1) <> "\" ) then strApacheDir = strApacheDir & "\" End If - strPHPPath = strInstallDir + ' Bug 55778 - Use forward slashes in Windows 7 + If ( FormatNumber(GetWindowsVersion) >= FormatNumber("7.0") ) Then + strPHPPath = Replace(strInstallDir,"\","/") + Else + strPHPPath = strInstallDir + End If + strDirective = vbCrLf & vbCrLf & "#BEGIN PHP INSTALLER EDITS - REMOVE ONLY ON UNINSTALL" & vbCrLf If ( strWebServerType = "apacheCGI" ) Then strDirective = strDirective & "ScriptAlias /php/ """ & strPHPPath & """" & vbCrLf