[PHP-CVS] svn: /php/win-installer/trunk/ PHPInstallerScripts52.vbs PHPInstallerScripts53.vbs PHPInstallerScripts60.vbs
jmertic Wed, 19 Jan 2011 20:54:39 + Revision: http://svn.php.net/viewvc?view=revisionrevision=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 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/win-installer/trunk/ PHPInstallerScripts52.vbs PHPInstallerScripts53.vbs PHPInstallerScripts60.vbs
jmertic Wed, 22 Dec 2010 16:03:43 + Revision: http://svn.php.net/viewvc?view=revisionrevision=306574 Log: Bug 52753 - Comment out changing '\' to '/' in the path to the PHP dll/exe since it causes an invalid http.conf file Bug: http://bugs.php.net/52753 (Assigned) With proposed fix: use of '/' in httpd.conf causes apache crash 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 2010-12-22 15:53:33 UTC (rev 306573) +++ php/win-installer/trunk/PHPInstallerScripts52.vbs 2010-12-22 16:03:43 UTC (rev 306574) @@ -14,7 +14,8 @@ If ( right(strApacheDir,1) \ ) then strApacheDir = strApacheDir \ End If -strPHPPath = Replace(strInstallDir,\,/) +' Bug 52753 - Comment out since it causes an invalid http.conf file +' strPHPPath = Replace(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 2010-12-22 15:53:33 UTC (rev 306573) +++ php/win-installer/trunk/PHPInstallerScripts53.vbs 2010-12-22 16:03:43 UTC (rev 306574) @@ -14,7 +14,8 @@ If ( right(strApacheDir,1) \ ) then strApacheDir = strApacheDir \ End If -strPHPPath = Replace(strInstallDir,\,/) +' Bug 52753 - Comment out since it causes an invalid http.conf file +' strPHPPath = Replace(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 2010-12-22 15:53:33 UTC (rev 306573) +++ php/win-installer/trunk/PHPInstallerScripts60.vbs 2010-12-22 16:03:43 UTC (rev 306574) @@ -14,7 +14,8 @@ If ( right(strApacheDir,1) \ ) then strApacheDir = strApacheDir \ End If -strPHPPath = Replace(strInstallDir,\,/) +' Bug 52753 - Comment out since it causes an invalid http.conf file +' strPHPPath = Replace(strInstallDir,\,/) strDirective = vbCrLf vbCrLf #BEGIN PHP INSTALLER EDITS - REMOVE ONLY ON UNINSTALL vbCrLf If ( strWebServerType = apacheCGI ) Then -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
