svn: /php/win-installer/trunk/ PHPInstallerScripts52.vbs PHPInstallerScripts53.vbs PHPInstallerScripts60.vbs
| From: | John Mertic | Date: | Wed, 19 Jan 2011 20:54:39 +0000 |
| Subject: | svn: /php/win-installer/trunk/ PHPInstallerScripts52.vbs PHPInstallerScripts53.vbs PHPInstallerScripts60.vbs | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-64393@lists.php.net to get a copy of this message | ||
jmertic Wed, 19 Jan 2011 20:54:39 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=307597
Log:
Bug 53689 - Fixed typo in the scripts that add the httpd.conf entries.
Bug: http://bugs.php.net/53689 (Open) Installer fails to
enter PHP-path into httpd.conf
Changed paths:
U php/win-installer/trunk/PHPInstallerScripts52.vbs
U php/win-installer/trunk/PHPInstallerScripts53.vbs
U php/win-installer/trunk/PHPInstallerScripts60.vbs
Modified: php/win-installer/trunk/PHPInstallerScripts52.vbs
===================================================================
--- php/win-installer/trunk/PHPInstallerScripts52.vbs 2011-01-19 19:48:28 UTC (rev 307596)
+++ php/win-installer/trunk/PHPInstallerScripts52.vbs 2011-01-19 20:54:39 UTC (rev 307597)
@@ -14,8 +14,7 @@
If ( right(strApacheDir,1) <> "\" ) then
strApacheDir = strApacheDir & "\"
End If
- ' Bug 52753 - Comment out since it causes an invalid http.conf file
- ' strPHPPath = Replace(strInstallDir,"\","/")
+ strPHPPath = strInstallDir
strDirective = vbCrLf & vbCrLf & "#BEGIN PHP INSTALLER EDITS - REMOVE ONLY ON
UNINSTALL" & vbCrLf
If ( strWebServerType = "apacheCGI" ) Then
Modified: php/win-installer/trunk/PHPInstallerScripts53.vbs
===================================================================
--- php/win-installer/trunk/PHPInstallerScripts53.vbs 2011-01-19 19:48:28 UTC (rev 307596)
+++ php/win-installer/trunk/PHPInstallerScripts53.vbs 2011-01-19 20:54:39 UTC (rev 307597)
@@ -14,8 +14,7 @@
If ( right(strApacheDir,1) <> "\" ) then
strApacheDir = strApacheDir & "\"
End If
- ' Bug 52753 - Comment out since it causes an invalid http.conf file
- ' strPHPPath = Replace(strInstallDir,"\","/")
+ strPHPPath = strInstallDir
strDirective = vbCrLf & vbCrLf & "#BEGIN PHP INSTALLER EDITS - REMOVE ONLY ON
UNINSTALL" & vbCrLf
If ( strWebServerType = "apacheCGI" ) Then
Modified: php/win-installer/trunk/PHPInstallerScripts60.vbs
===================================================================
--- php/win-installer/trunk/PHPInstallerScripts60.vbs 2011-01-19 19:48:28 UTC (rev 307596)
+++ php/win-installer/trunk/PHPInstallerScripts60.vbs 2011-01-19 20:54:39 UTC (rev 307597)
@@ -14,8 +14,7 @@
If ( right(strApacheDir,1) <> "\" ) then
strApacheDir = strApacheDir & "\"
End If
- ' Bug 52753 - Comment out since it causes an invalid http.conf file
- ' strPHPPath = Replace(strInstallDir,"\","/")
+ strPHPPath = strInstallDir
strDirective = vbCrLf & vbCrLf & "#BEGIN PHP INSTALLER EDITS - REMOVE ONLY ON
UNINSTALL" & vbCrLf
If ( strWebServerType = "apacheCGI" ) Then