[PHP-CVS] svn: /php/win-installer/trunk/ PHPInstallerScripts52.vbs PHPInstallerScripts53.vbs PHPInstallerScripts54.vbs
jmertic Mon, 03 Oct 2011 19:24:19 +
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
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/win-installer/trunk/ ExtensionsFeatures54.wxs ExtensionsFeatures60.wxs ExtensionsFragment54.wxs ExtensionsFragment60.wxs PHPInstallerBase54.wxs PHPInstallerBase54NTS.wxs PHPInstall
jmertic Mon, 03 Oct 2011 19:16:26 + Revision: http://svn.php.net/viewvc?view=revision&revision=317677 Log: Renamed 60 installer components to 54 Changed paths: A php/win-installer/trunk/ExtensionsFeatures54.wxs D php/win-installer/trunk/ExtensionsFeatures60.wxs A php/win-installer/trunk/ExtensionsFragment54.wxs D php/win-installer/trunk/ExtensionsFragment60.wxs A php/win-installer/trunk/PHPInstallerBase54.wxs A php/win-installer/trunk/PHPInstallerBase54NTS.wxs D php/win-installer/trunk/PHPInstallerBase60.wxs D php/win-installer/trunk/PHPInstallerBase60NTS.wxs A php/win-installer/trunk/PHPInstallerCommon54.wxs A php/win-installer/trunk/PHPInstallerCommon54NTS.wxs D php/win-installer/trunk/PHPInstallerCommon60.wxs D php/win-installer/trunk/PHPInstallerCommon60NTS.wxs A php/win-installer/trunk/PHPInstallerScripts54.vbs D php/win-installer/trunk/PHPInstallerScripts60.vbs A php/win-installer/trunk/WebServerConfig54.wxs A php/win-installer/trunk/WebServerConfig54NTS.wxs D php/win-installer/trunk/WebServerConfig60.wxs D php/win-installer/trunk/WebServerConfig60NTS.wxs -- 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, 19 Jan 2011 20:54:39 + 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 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/win-installer/trunk/ PHPInstallerBase53.wxs PHPInstallerBase53NTS.wxs PHPInstallerBase60.wxs PHPInstallerBase60NTS.wxs
jmertic Wed, 22 Dec 2010 19:15:03 + Revision: http://svn.php.net/viewvc?view=revision&revision=306577 Log: Newer versions of Windows allow the use of %*, so let's go with that instead. Changed paths: U php/win-installer/trunk/PHPInstallerBase53.wxs U php/win-installer/trunk/PHPInstallerBase53NTS.wxs U php/win-installer/trunk/PHPInstallerBase60.wxs U php/win-installer/trunk/PHPInstallerBase60NTS.wxs Modified: php/win-installer/trunk/PHPInstallerBase53.wxs === --- php/win-installer/trunk/PHPInstallerBase53.wxs 2010-12-22 18:42:46 UTC (rev 306576) +++ php/win-installer/trunk/PHPInstallerBase53.wxs 2010-12-22 19:15:03 UTC (rev 306577) @@ -197,7 +197,7 @@ Sequence="10" Command="Run" Target="[!file13]" - Argument=""%1" "%2" "%3" "%4" "%5" "%6" "%7" "%8" "%9""/> + Argument=""%*""/> Modified: php/win-installer/trunk/PHPInstallerBase53NTS.wxs === --- php/win-installer/trunk/PHPInstallerBase53NTS.wxs 2010-12-22 18:42:46 UTC (rev 306576) +++ php/win-installer/trunk/PHPInstallerBase53NTS.wxs 2010-12-22 19:15:03 UTC (rev 306577) @@ -175,7 +175,7 @@ Sequence="10" Command="Run" Target="[!file13]" - Argument=""%1" "%2" "%3" "%4" "%5" "%6" "%7" "%8" "%9""/> + Argument=""%*""/> Modified: php/win-installer/trunk/PHPInstallerBase60.wxs === --- php/win-installer/trunk/PHPInstallerBase60.wxs 2010-12-22 18:42:46 UTC (rev 306576) +++ php/win-installer/trunk/PHPInstallerBase60.wxs 2010-12-22 19:15:03 UTC (rev 306577) @@ -197,7 +197,7 @@ Sequence="10" Command="Run" Target="[!file13]" - Argument=""%1" "%2" "%3" "%4" "%5" "%6" "%7" "%8" "%9""/> + Argument=""%*""/> Modified: php/win-installer/trunk/PHPInstallerBase60NTS.wxs === --- php/win-installer/trunk/PHPInstallerBase60NTS.wxs 2010-12-22 18:42:46 UTC (rev 306576) +++ php/win-installer/trunk/PHPInstallerBase60NTS.wxs 2010-12-22 19:15:03 UTC (rev 306577) @@ -175,7 +175,7 @@ Sequence="10" Command="Run" Target="[!file13]" - Argument=""%1" "%2" "%3" "%4" "%5" "%6" "%7" "%8" "%9""/> + Argument=""%*""/> -- 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=revision&revision=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
[PHP-CVS] svn: /php/win-installer/trunk/ PHPInstallerBase52.wxs PHPInstallerBase52NTS.wxs PHPInstallerBase53.wxs PHPInstallerBase53NTS.wxs PHPInstallerBase60.wxs PHPInstallerBase60NTS.wxs
jmertic Wed, 22 Dec 2010 15:53:33 + Revision: http://svn.php.net/viewvc?view=revision&revision=306573 Log: Bug 12595 - Fix problem where only the first argument to the php script is passed; now support up to 9 arguments. Bug: http://bugs.php.net/12595 (Open) $argv passing Changed paths: U php/win-installer/trunk/PHPInstallerBase52.wxs U php/win-installer/trunk/PHPInstallerBase52NTS.wxs U php/win-installer/trunk/PHPInstallerBase53.wxs U php/win-installer/trunk/PHPInstallerBase53NTS.wxs U php/win-installer/trunk/PHPInstallerBase60.wxs U php/win-installer/trunk/PHPInstallerBase60NTS.wxs Modified: php/win-installer/trunk/PHPInstallerBase52.wxs === --- php/win-installer/trunk/PHPInstallerBase52.wxs 2010-12-22 10:25:33 UTC (rev 306572) +++ php/win-installer/trunk/PHPInstallerBase52.wxs 2010-12-22 15:53:33 UTC (rev 306573) @@ -197,7 +197,7 @@ Sequence="10" Command="Run" Target="[!file13]" - Argument=""%1""/> + Argument=""%1" "%2" "%3" "%4" "%5" "%6" "%7" "%8" "%9""/> Modified: php/win-installer/trunk/PHPInstallerBase52NTS.wxs === --- php/win-installer/trunk/PHPInstallerBase52NTS.wxs 2010-12-22 10:25:33 UTC (rev 306572) +++ php/win-installer/trunk/PHPInstallerBase52NTS.wxs 2010-12-22 15:53:33 UTC (rev 306573) @@ -175,7 +175,7 @@ Sequence="10" Command="Run" Target="[!file13]" - Argument=""%1""/> + Argument=""%1" "%2" "%3" "%4" "%5" "%6" "%7" "%8" "%9""/> Modified: php/win-installer/trunk/PHPInstallerBase53.wxs === --- php/win-installer/trunk/PHPInstallerBase53.wxs 2010-12-22 10:25:33 UTC (rev 306572) +++ php/win-installer/trunk/PHPInstallerBase53.wxs 2010-12-22 15:53:33 UTC (rev 306573) @@ -196,8 +196,8 @@ + Target="[!file13]" + Argument=""%1" "%2" "%3" "%4" "%5" "%6" "%7" "%8" "%9""/> Modified: php/win-installer/trunk/PHPInstallerBase53NTS.wxs === --- php/win-installer/trunk/PHPInstallerBase53NTS.wxs 2010-12-22 10:25:33 UTC (rev 306572) +++ php/win-installer/trunk/PHPInstallerBase53NTS.wxs 2010-12-22 15:53:33 UTC (rev 306573) @@ -175,7 +175,7 @@ Sequence="10" Command="Run" Target="[!file13]" - Argument=""%1""/> + Argument=""%1" "%2" "%3" "%4" "%5" "%6" "%7" "%8" "%9""/> Modified: php/win-installer/trunk/PHPInstallerBase60.wxs === --- php/win-installer/trunk/PHPInstallerBase60.wxs 2010-12-22 10:25:33 UTC (rev 306572) +++ php/win-installer/trunk/PHPInstallerBase60.wxs 2010-12-22 15:53:33 UTC (rev 306573) @@ -197,7 +197,7 @@ Sequence="10" Command="Run" Target="[!file13]" - Argument=""%1""/> + Argument=""%1" "%2" "%3" "%4" "%5" "%6" "%7" "%8" "%9""/> Modified: php/win-installer/trunk/PHPInstallerBase60NTS.wxs === --- php/win-installer/trunk/PHPInstallerBase60NTS.wxs 2010-12-22 10:25:33 UTC (rev 306572) +++ php/win-installer/trunk/PHPInstallerBase60NTS.wxs 2010-12-22 15:53:33 UTC (rev 306573) @@ -175,7 +175,7 @@ Sequence="10" Command="Run" Target="[!file13]" - Argument=""%1""/> + Argument=""%1" "%2" "%3" "%4" "%5" "%6" "%7" "%8" "%9""/> -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/win-installer/trunk/ ExtensionsFeatures53.wxs ExtensionsFragment53.wxs
pajoye Thu, 17 Jun 2010 19:44:46 + Revision: http://svn.php.net/viewvc?view=revision&revision=300545 Log: - add libsasl (ldap) Changed paths: U php/win-installer/trunk/ExtensionsFeatures53.wxs U php/win-installer/trunk/ExtensionsFragment53.wxs Modified: php/win-installer/trunk/ExtensionsFeatures53.wxs === --- php/win-installer/trunk/ExtensionsFeatures53.wxs2010-06-17 19:26:34 UTC (rev 300544) +++ php/win-installer/trunk/ExtensionsFeatures53.wxs2010-06-17 19:44:46 UTC (rev 300545) @@ -194,6 +194,7 @@ + Modified: php/win-installer/trunk/ExtensionsFragment53.wxs === --- php/win-installer/trunk/ExtensionsFragment53.wxs2010-06-17 19:26:34 UTC (rev 300544) +++ php/win-installer/trunk/ExtensionsFragment53.wxs2010-06-17 19:44:46 UTC (rev 300545) @@ -44,6 +44,9 @@ + + + -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/win-installer/trunk/ PHPInstallerBase52.wxs PHPInstallerBase52NTS.wxs PHPInstallerBase53.wxs PHPInstallerBase53NTS.wxs PHPInstallerBase60.wxs PHPInstallerBase60NTS.wxs PHPInstaller
jmertic Wed, 12 May 2010 19:18:22 + Revision: http://svn.php.net/viewvc?view=revision&revision=299304 Log: Bug #50584 - Fix problem with expecting newly created registry values to be available in the VB installer scripts by instead passing those values to the custom action via CustomActionData property. Bug: http://bugs.php.net/50584 (Assigned) Windows installer does not configure Apache in silent mode Changed paths: U php/win-installer/trunk/PHPInstallerBase52.wxs U php/win-installer/trunk/PHPInstallerBase52NTS.wxs U php/win-installer/trunk/PHPInstallerBase53.wxs U php/win-installer/trunk/PHPInstallerBase53NTS.wxs U php/win-installer/trunk/PHPInstallerBase60.wxs U php/win-installer/trunk/PHPInstallerBase60NTS.wxs 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/PHPInstallerBase52.wxs === --- php/win-installer/trunk/PHPInstallerBase52.wxs 2010-05-12 18:51:53 UTC (rev 299303) +++ php/win-installer/trunk/PHPInstallerBase52.wxs 2010-05-12 19:18:22 UTC (rev 299304) @@ -794,10 +794,18 @@ Execute="deferred" Impersonate="no" VBScriptCall="configIIS4" /> - + Value="[INSTALLDIR],iis4CGI" /> + + - + Value="[APACHEDIR],[INSTALLDIR],apache13" /> + + + - - + + - + + + + + + + - + - - + + - + + + + + + + + + + Modified: php/win-installer/trunk/PHPInstallerBase52NTS.wxs === --- php/win-installer/trunk/PHPInstallerBase52NTS.wxs 2010-05-12 18:51:53 UTC (rev 299303) +++ php/win-installer/trunk/PHPInstallerBase52NTS.wxs 2010-05-12 19:18:22 UTC (rev 299304) @@ -661,10 +661,18 @@ Execute="deferred" Impersonate="no" VBScriptCall="configIIS4" /> - + Value="[INSTALLDIR],iis4CGI" /> + + - - + + - + + + + + + + Modified: php/win-installer/trunk/PHPInstallerBase53.wxs === --- php/win-installer/trunk/PHPInstallerBase53.wxs 2010-05-12 18:51:53 UTC (rev 299303) +++ php/win-installer/trunk/PHPInstallerBase53.wxs 2010-05-12 19:18:22 UTC (rev 299304) @@ -780,10 +780,18 @@ Execute="deferred" Impersonate="no" VBScriptCall="configIIS4" /> - + Value="[INSTALLDIR],iis4CGI" /> + + - + Value="[APACHEDIR],[INSTALLDIR],apache13" /> + + + - - + + - + + + + + + + - + - - + + - + + + + + + + + + + Modified: php/win-installer/trunk/PHPInstallerBase53NTS.wxs === --- php/win-installer/trunk/PHPInstallerBase53NTS.wxs 2010-05-12 18:51:53 UTC (rev 299303) +++ php/win-installer/trunk/PHPInstallerBase53NTS.wxs 2010-05-12 19:18:22 UTC (rev 299304) @@ -670,10 +670,18 @@ Execute="deferred" Impersonate="no" VBScriptCall="configIIS4" /> - + Value="[INSTALLDIR],iis4CGI" /> + + - - + + - + + + + + + + Modified: php/win-installer/trunk/PHPInstallerBase60.wxs === --- php/win-installer/trunk/PHPInstallerBase60.wxs 2010-05-12 18:51:53 UTC (rev 299303) +++ php/win-installer/trunk/PHPInstallerBase60.wxs 2010-05-12 19:18:22 UTC (rev 299304) @@ -781,10 +781,18 @@ Execute="deferred" Impersonate="no" VBScriptCall="configIIS4" /> - + Value="[INSTALLDIR],iis4CGI" /> + + - + Value="[APACHEDIR],[INSTALLDIR],apache13" /> + + + - - + + - + + + + + + + - + - - + + - + + + + + + + + + +
[PHP-CVS] svn: /php/win-installer/trunk/ license.rtf
jmertic Mon, 10 May 2010 17:43:23 + Revision: http://svn.php.net/viewvc?view=revision&revision=299220 Log: Update license year. Changed paths: U php/win-installer/trunk/license.rtf Modified: php/win-installer/trunk/license.rtf === (Binary files differ) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/win-installer/trunk/
jmertic Tue, 23 Mar 2010 17:34:11 + Revision: http://svn.php.net/viewvc?view=revision&revision=296683 Log: Updated the ignored files. Changed paths: _U php/win-installer/trunk/ Property changes on: php/win-installer/trunk ___ Modified: svn:ignore - *.wixobj *.wixlib *.msi Files + *.wixobj *.wixlib *.msi Files ExtensionsComponents.wxs ExtensionsFeatures.wxs ExtensionsFeaturesBuild.wxs -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/win-installer/trunk/ ExtensionsFragment53.wxs
pajoye Mon, 15 Feb 2010 19:14:30 + Revision: http://svn.php.net/viewvc?view=revision&revision=295097 Log: - #51046, fix long names for enchant deps Bug: http://bugs.php.net/51046 (Feedback) 'gmodul_2.dll' should be named 'gmodule-2.dll' Changed paths: U php/win-installer/trunk/ExtensionsFragment53.wxs Modified: php/win-installer/trunk/ExtensionsFragment53.wxs === --- php/win-installer/trunk/ExtensionsFragment53.wxs2010-02-15 18:50:14 UTC (rev 295096) +++ php/win-installer/trunk/ExtensionsFragment53.wxs2010-02-15 19:14:30 UTC (rev 295097) @@ -24,13 +24,13 @@ - + - + - + -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] svn: /php/win-installer/trunk/ GenPHPInstaller.wxs.php PHPInstallerBase52.wxs PHPInstallerBase52NTS.wxs PHPInstallerBase53.wxs PHPInstallerBase53NTS.wxs PHPInstallerBase60.wxs PHPInstall
It's actually just a placeholder value that get's changed to the correct value as a part of the build script. But good catch nonetheless :-). Thanks! John Mertic jmer...@gmail.com On Oct 29, 2009, at 9:03 AM, Kalle Sommer Nielsen wrote: Hi John 2009/10/28 John Mertic : Modified: php/win-installer/trunk/PHPInstallerBase53.wxs === --- php/win-installer/trunk/PHPInstallerBase53.wxs 2009-10-28 14:53:28 UTC (rev 290032) +++ php/win-installer/trunk/PHPInstallerBase53.wxs 2009-10-28 14:59:10 UTC (rev 290033) @@ -211,6 +211,13 @@ Action='write' Type='string' Value='[INSTALLDIR]' /> + For 5.3 and 6.0 I guess this value shouldn't be 5.2 :) -- regrads, Kalle Sommer Nielsen ka...@php.net -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] svn: /php/win-installer/trunk/ GenPHPInstaller.wxs.php PHPInstallerBase52.wxs PHPInstallerBase52NTS.wxs PHPInstallerBase53.wxs PHPInstallerBase53NTS.wxs PHPInstallerBase60.wxs PHPInsta
Hi John 2009/10/28 John Mertic : > Modified: php/win-installer/trunk/PHPInstallerBase53.wxs > === > --- php/win-installer/trunk/PHPInstallerBase53.wxs 2009-10-28 14:53:28 > UTC (rev 290032) > +++ php/win-installer/trunk/PHPInstallerBase53.wxs 2009-10-28 14:59:10 > UTC (rev 290033) > @@ -211,6 +211,13 @@ > Action='write' > Type='string' > Value='[INSTALLDIR]' /> > + + Root='HKLM' > + Key='Software\PHP' > + Name='Version' > + Action='write' > + Type='string' > + Value='5.2.0' /> > > DiskId="1" For 5.3 and 6.0 I guess this value shouldn't be 5.2 :) -- regrads, Kalle Sommer Nielsen ka...@php.net -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/win-installer/trunk/ GenPHPInstaller.wxs.php PHPInstallerBase52.wxs PHPInstallerBase52NTS.wxs PHPInstallerBase53.wxs PHPInstallerBase53NTS.wxs PHPInstallerBase60.wxs PHPInstallerBa
jmertic Wed, 28 Oct 2009 14:59:10 +
Revision: http://svn.php.net/viewvc?view=revision&revision=290033
Log:
Add HKLM/Software/PHP/Version registry key on install.
Changed paths:
_U php/win-installer/trunk/
U php/win-installer/trunk/GenPHPInstaller.wxs.php
U php/win-installer/trunk/PHPInstallerBase52.wxs
U php/win-installer/trunk/PHPInstallerBase52NTS.wxs
U php/win-installer/trunk/PHPInstallerBase53.wxs
U php/win-installer/trunk/PHPInstallerBase53NTS.wxs
U php/win-installer/trunk/PHPInstallerBase60.wxs
U php/win-installer/trunk/PHPInstallerBase60NTS.wxs
Property changes on: php/win-installer/trunk
___
Modified: svn:ignore
- *.wixobj
*.wixlib
*.msi
+ *.wixobj
*.wixlib
*.msi
Files
Modified: php/win-installer/trunk/GenPHPInstaller.wxs.php
===
--- php/win-installer/trunk/GenPHPInstaller.wxs.php 2009-10-28 14:53:28 UTC
(rev 290032)
+++ php/win-installer/trunk/GenPHPInstaller.wxs.php 2009-10-28 14:59:10 UTC
(rev 290033)
@@ -15,6 +15,15 @@
$PHPInstallerBaseWXS->getElementsByTagName('Product')->item(0)->setAttribute("Version","$version");
$PHPInstallerBaseWXS->getElementsByTagName('Product')->item(0)->setAttribute("Id",genGUID());
$PHPInstallerBaseWXS->getElementsByTagName('Package')->item(0)->setAttribute("Description","PHP
$version Installer");
+$tags = $PHPInstallerBaseWXS->getElementsByTagName('Registry');
+$i = 0;
+while ( $i < $tags->length ) {
+if ( $tags->item($i)->getAttribute('Id') == 'PHPRegistryVersion' ) {
+$tags->item($i)->setAttribute("Value","$version");
+break;
+}
+$i++;
+}
// Add in the VC9 MSM if we are building that installer
if ( !empty($includemsm) ) {
Modified: php/win-installer/trunk/PHPInstallerBase52.wxs
===
--- php/win-installer/trunk/PHPInstallerBase52.wxs 2009-10-28 14:53:28 UTC
(rev 290032)
+++ php/win-installer/trunk/PHPInstallerBase52.wxs 2009-10-28 14:59:10 UTC
(rev 290033)
@@ -211,6 +211,13 @@
Action='write'
Type='string'
Value='[INSTALLDIR]' />
+
+
+
+
+
+
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/win-installer/trunk/ PHPInstallerCommon52NTS.wxs PHPInstallerCommon53NTS.wxs PHPInstallerCommon60NTS.wxs PHPInstallerCommonNTS52.wxs PHPInstallerCommonNTS53.wxs PHPInstallerCommonN
jmertic Wed, 28 Oct 2009 13:13:45 + Revision: http://svn.php.net/viewvc?view=revision&revision=290031 Log: Renamed the PHPInstalerCommon*.php files to use the name naming convention for the NTS variants. Changed paths: A + php/win-installer/trunk/PHPInstallerCommon52NTS.wxs (from php/win-installer/trunk/PHPInstallerCommonNTS52.wxs:r290026) A + php/win-installer/trunk/PHPInstallerCommon53NTS.wxs (from php/win-installer/trunk/PHPInstallerCommonNTS53.wxs:r290026) A + php/win-installer/trunk/PHPInstallerCommon60NTS.wxs (from php/win-installer/trunk/PHPInstallerCommonNTS60.wxs:r290026) D php/win-installer/trunk/PHPInstallerCommonNTS52.wxs D php/win-installer/trunk/PHPInstallerCommonNTS53.wxs D php/win-installer/trunk/PHPInstallerCommonNTS60.wxs U php/win-installer/trunk/build.bat -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/win-installer/trunk/ ExtensionsFeatures53.wxs ExtensionsFragment53.wxs
pajoye Mon, 19 Oct 2009 20:09:19 + Revision: http://svn.php.net/viewvc?view=revision&revision=289771 Log: - add glib and enchant backends to 5.3 Changed paths: U php/win-installer/trunk/ExtensionsFeatures53.wxs U php/win-installer/trunk/ExtensionsFragment53.wxs Modified: php/win-installer/trunk/ExtensionsFeatures53.wxs === --- php/win-installer/trunk/ExtensionsFeatures53.wxs2009-10-19 20:07:25 UTC (rev 289770) +++ php/win-installer/trunk/ExtensionsFeatures53.wxs2009-10-19 20:09:19 UTC (rev 289771) @@ -80,6 +80,10 @@ + + + + Modified: php/win-installer/trunk/ExtensionsFragment53.wxs === --- php/win-installer/trunk/ExtensionsFragment53.wxs2009-10-19 20:07:25 UTC (rev 289770) +++ php/win-installer/trunk/ExtensionsFragment53.wxs2009-10-19 20:09:19 UTC (rev 289771) @@ -20,6 +20,18 @@ + + + + + + + + + + + + -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/win-installer/trunk/ PHPInstallerCommon52.wxs
jmertic Fri, 02 Oct 2009 16:11:30 + Revision: http://svn.php.net/viewvc?view=revision&revision=289090 Log: Fixed bug in 5.2 TS installer where you couldn't select the IIS FastCGI sapi very easily. Changed paths: U php/win-installer/trunk/PHPInstallerCommon52.wxs Modified: php/win-installer/trunk/PHPInstallerCommon52.wxs === --- php/win-installer/trunk/PHPInstallerCommon52.wxs2009-10-02 15:45:06 UTC (rev 289089) +++ php/win-installer/trunk/PHPInstallerCommon52.wxs2009-10-02 16:11:30 UTC (rev 289090) @@ -666,20 +666,19 @@ + Value="iis4FastCGI" X="5" Y="60" Width="250" Height="15" /> + Value="iis4CGI" X="5" Y="72" Width="250" Height="15" /> + Value="nsapi" X="5" Y="84" Width="250" Height="15" /> + Value="xitami" X="5" Y="96" Width="250" Height="15" /> + Value="sambar" X="5" Y="108" Width="250" Height="15" /> + Value="netserve" X="5" Y="120" Width="250" Height="15" /> - + Value="cgi" X="5" Y="132" Width="250" Height="15" /> -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/win-installer/trunk/ PHPInstallerBase52.wxs PHPInstallerBase52NTS.wxs PHPInstallerBase53.wxs PHPInstallerBase53NTS.wxs PHPInstallerBase60.wxs PHPInstallerBase60NTS.wxs PHPInstaller
jmertic Wed, 30 Sep 2009 13:44:28 + Revision: http://svn.php.net/viewvc?view=revision&revision=288996 Log: Bug #47855 - Change the VBScript custom actions to be deferred and not to impersonate the installing user, so the apache config changes are made as an elevated privileges user. Solves problem of not being able to install with Apache under Windows Vista/2008/7. Bug: http://bugs.php.net/47855 (Assigned) VC6 Thread Safe MSI install fails Changed paths: U php/win-installer/trunk/PHPInstallerBase52.wxs U php/win-installer/trunk/PHPInstallerBase52NTS.wxs U php/win-installer/trunk/PHPInstallerBase53.wxs U php/win-installer/trunk/PHPInstallerBase53NTS.wxs U php/win-installer/trunk/PHPInstallerBase60.wxs U php/win-installer/trunk/PHPInstallerBase60NTS.wxs 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/PHPInstallerBase52.wxs === --- php/win-installer/trunk/PHPInstallerBase52.wxs 2009-09-30 13:32:18 UTC (rev 288995) +++ php/win-installer/trunk/PHPInstallerBase52.wxs 2009-09-30 13:44:28 UTC (rev 288996) @@ -708,7 +708,7 @@ DllEntry="CAQuietExec" Return="ignore" Execute="deferred" - Impersonate="no" /> + Impersonate="no" /> @@ -784,18 +784,34 @@ + + @@ -949,18 +965,24 @@ - + + + + - - + + - + + + + Modified: php/win-installer/trunk/PHPInstallerBase52NTS.wxs === --- php/win-installer/trunk/PHPInstallerBase52NTS.wxs 2009-09-30 13:32:18 UTC (rev 288995) +++ php/win-installer/trunk/PHPInstallerBase52NTS.wxs 2009-09-30 13:44:28 UTC (rev 288996) @@ -651,10 +651,18 @@ + @@ -748,9 +756,6 @@ - - - @@ -793,6 +798,12 @@ + + + + + + Modified: php/win-installer/trunk/PHPInstallerBase53.wxs === --- php/win-installer/trunk/PHPInstallerBase53.wxs 2009-09-30 13:32:18 UTC (rev 288995) +++ php/win-installer/trunk/PHPInstallerBase53.wxs 2009-09-30 13:44:28 UTC (rev 288996) @@ -770,18 +770,34 @@ + + @@ -935,18 +951,24 @@ - + + + + - - + + - + + + + Modified: php/win-installer/trunk/PHPInstallerBase53NTS.wxs === --- php/win-installer/trunk/PHPInstallerBase53NTS.wxs 2009-09-30 13:32:18 UTC (rev 288995) +++ php/win-installer/trunk/PHPInstallerBase53NTS.wxs 2009-09-30 13:44:28 UTC (rev 288996) @@ -584,7 +584,7 @@ DllEntry="CAQuietExec" Return="ignore" Execute="deferred" - Impersonate="no" /> + Impersonate="no" /> @@ -660,10 +660,18 @@ + @@ -757,9 +765,6 @@ - - - @@ -802,6 +807,12 @@ + + + + + + Modified: php/win-installer/trunk/PHPInstallerBase60.wxs === --- php/win-installer/trunk/PHPInstallerBase60.wxs 2009-09-30 13:32:18 UTC (rev 288995) +++ php/win-installer/trunk/PHPInstallerBase60.wxs 2009-09-30 13:44:28 UTC (rev 288996) @@ -695,7 +695,7 @@ DllEntry="CAQuietExec" Return="ignore" Execute="deferred" - Impersonate="no" /> + Impersonate="no" /> @@ -771,18 +771,34 @@ + + @@ -936,18 +952,24 @@ - + + + + - - + + - + + + + Modified: php/win-installer/trunk/PHPInstallerBase60NTS.wxs === --- php/win-installer/trunk/PHPInstallerBase60NTS.wxs 2009-09-30 13:32:18 UTC (rev 288995) +++ php/win-installer/trunk/PHPInstallerBase60NTS.wxs 2009-09-30 13:44:28 UTC (rev 288996) @@ -590,7 +590,7 @@ DllEntry="CAQuietExec" Return="ignore" Execute="deferred" - Impersonate="no" /> + Impersonate="no" /> @@ -666,
[PHP-CVS] svn: /php/win-installer/trunk/ PHPInstallerBase53.wxs PHPInstallerBase53NTS.wxs PHPInstallerBase60.wxs PHPInstallerBase60NTS.wxs
jmertic Mon, 21 Sep 2009 03:28:59 + Revision: http://svn.php.net/viewvc?view=revision&revision=288495 Log: Re-add the option to include the pear installer with the PHP install. Changed paths: U php/win-installer/trunk/PHPInstallerBase53.wxs U php/win-installer/trunk/PHPInstallerBase53NTS.wxs U php/win-installer/trunk/PHPInstallerBase60.wxs U php/win-installer/trunk/PHPInstallerBase60NTS.wxs Modified: php/win-installer/trunk/PHPInstallerBase53.wxs === --- php/win-installer/trunk/PHPInstallerBase53.wxs 2009-09-21 03:20:31 UTC (rev 288494) +++ php/win-installer/trunk/PHPInstallerBase53.wxs 2009-09-21 03:28:59 UTC (rev 288495) @@ -131,6 +131,13 @@ + + + @@ -346,6 +353,17 @@ Source="Files\dev\php5ts.lib"/> + + + + + + + + + + + + @@ -324,6 +331,17 @@ Source="Files\dev\php5.lib"/> + + + + + + + + + + + + @@ -346,6 +353,18 @@ Source="Files\dev\php6ts.lib"/> + + + + + + + + + + + + + @@ -324,6 +331,17 @@ Source="Files\dev\php6.lib"/> + + + + + + + + +-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/win-installer/trunk/ ExtensionsFeatures52.wxs ExtensionsFeatures53.wxs ExtensionsFeatures60.wxs ExtensionsFragment52.wxs
pajoye Fri, 04 Sep 2009 07:57:24 + Revision: http://svn.php.net/viewvc?view=revision&revision=288033 Log: - WS Changed paths: U php/win-installer/trunk/ExtensionsFeatures52.wxs U php/win-installer/trunk/ExtensionsFeatures53.wxs U php/win-installer/trunk/ExtensionsFeatures60.wxs U php/win-installer/trunk/ExtensionsFragment52.wxs Modified: php/win-installer/trunk/ExtensionsFeatures52.wxs === --- php/win-installer/trunk/ExtensionsFeatures52.wxs 2009-09-04 07:56:46 UTC (rev 288032) +++ php/win-installer/trunk/ExtensionsFeatures52.wxs 2009-09-04 07:57:24 UTC (rev 288033) @@ -306,10 +306,10 @@ - + - + Modified: php/win-installer/trunk/ExtensionsFeatures53.wxs === --- php/win-installer/trunk/ExtensionsFeatures53.wxs 2009-09-04 07:56:46 UTC (rev 288032) +++ php/win-installer/trunk/ExtensionsFeatures53.wxs 2009-09-04 07:57:24 UTC (rev 288033) @@ -118,7 +118,7 @@ - + @@ -180,7 +180,7 @@ - + @@ -304,15 +304,15 @@ - + - + - + @@ -328,7 +328,7 @@ - + @@ -372,7 +372,7 @@ - + Modified: php/win-installer/trunk/ExtensionsFeatures60.wxs === --- php/win-installer/trunk/ExtensionsFeatures60.wxs 2009-09-04 07:56:46 UTC (rev 288032) +++ php/win-installer/trunk/ExtensionsFeatures60.wxs 2009-09-04 07:57:24 UTC (rev 288033) @@ -118,7 +118,7 @@ - + @@ -304,15 +304,15 @@ - + - + - + @@ -328,7 +328,7 @@ - + @@ -372,7 +372,7 @@ - + Modified: php/win-installer/trunk/ExtensionsFragment52.wxs === --- php/win-installer/trunk/ExtensionsFragment52.wxs 2009-09-04 07:56:46 UTC (rev 288032) +++ php/win-installer/trunk/ExtensionsFragment52.wxs 2009-09-04 07:57:24 UTC (rev 288033) @@ -48,7 +48,7 @@ Section="PHP" Value=""[INSTALLDIR]ext"" /> - + -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/win-installer/trunk/ ExtensionsFeatures52.wxs
pajoye Fri, 04 Sep 2009 07:37:07 + Revision: http://svn.php.net/viewvc?view=revision&revision=288030 Log: - fix install of pgsql and mssql, required DLLs were not installed Changed paths: U php/win-installer/trunk/ExtensionsFeatures52.wxs Modified: php/win-installer/trunk/ExtensionsFeatures52.wxs === --- php/win-installer/trunk/ExtensionsFeatures52.wxs2009-09-04 07:28:53 UTC (rev 288029) +++ php/win-installer/trunk/ExtensionsFeatures52.wxs2009-09-04 07:37:07 UTC (rev 288030) @@ -220,6 +220,7 @@ + @@ -283,6 +284,7 @@ + @@ -299,6 +301,7 @@ + @@ -322,6 +325,7 @@ + -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/win-installer/trunk/ PHPInstallerBase52.wxs PHPInstallerBase52NTS.wxs PHPInstallerBase53.wxs PHPInstallerBase53NTS.wxs PHPInstallerBase60.wxs PHPInstallerBase60NTS.wxs
jmertic Tue, 18 Aug 2009 17:30:02 + Revision: http://svn.php.net/viewvc?view=revision&revision=287460 Log: Point the error_log file to the Windows temp directory rather than the User's temp directory. Changed paths: U php/win-installer/trunk/PHPInstallerBase52.wxs U php/win-installer/trunk/PHPInstallerBase52NTS.wxs U php/win-installer/trunk/PHPInstallerBase53.wxs U php/win-installer/trunk/PHPInstallerBase53NTS.wxs U php/win-installer/trunk/PHPInstallerBase60.wxs U php/win-installer/trunk/PHPInstallerBase60NTS.wxs Modified: php/win-installer/trunk/PHPInstallerBase52.wxs === --- php/win-installer/trunk/PHPInstallerBase52.wxs 2009-08-18 16:11:58 UTC (rev 287459) +++ php/win-installer/trunk/PHPInstallerBase52.wxs 2009-08-18 17:30:02 UTC (rev 287460) @@ -302,7 +302,7 @@ Section="PHP" Value="On" /> + Section="PHP" Value=""[%windir]\temp\php-errors.log"" /> + Section="PHP" Value=""[%windir]\temp\php-errors.log"" /> + Section="PHP" Value=""[%windir]\temp\php-errors.log"" /> + Section="PHP" Value=""[%windir]\temp\php-errors.log"" /> + Section="PHP" Value=""[%windir]\temp\php-errors.log"" /> + Section="PHP" Value=""[%windir]\temp\php-errors.log"" /> -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/win-installer/trunk/ PHPInstallerBase52.wxs PHPInstallerBase52NTS.wxs PHPInstallerBase53.wxs PHPInstallerBase53NTS.wxs PHPInstallerBase60.wxs PHPInstallerBase60NTS.wxs
jmertic Mon, 17 Aug 2009 19:39:02 + Revision: http://svn.php.net/viewvc?view=revision&revision=287426 Log: Correctly quote the error_log attribute value. Changed paths: U php/win-installer/trunk/PHPInstallerBase52.wxs U php/win-installer/trunk/PHPInstallerBase52NTS.wxs U php/win-installer/trunk/PHPInstallerBase53.wxs U php/win-installer/trunk/PHPInstallerBase53NTS.wxs U php/win-installer/trunk/PHPInstallerBase60.wxs U php/win-installer/trunk/PHPInstallerBase60NTS.wxs Modified: php/win-installer/trunk/PHPInstallerBase52.wxs === --- php/win-installer/trunk/PHPInstallerBase52.wxs 2009-08-17 18:23:48 UTC (rev 287425) +++ php/win-installer/trunk/PHPInstallerBase52.wxs 2009-08-17 19:39:02 UTC (rev 287426) @@ -302,7 +302,7 @@ Section="PHP" Value="On" /> + Section="PHP" Value=""[TempFolder]\php-errors.log"" /> + Section="PHP" Value=""[TempFolder]\php-errors.log"" /> + Section="PHP" Value=""[TempFolder]\php-errors.log"" /> + Section="PHP" Value=""[TempFolder]\php-errors.log"" /> + Section="PHP" Value=""[TempFolder]\php-errors.log"" /> + Section="PHP" Value=""[TempFolder]\php-errors.log"" /> -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: php/win-installer/trunk/ WebServerConfig52.wxs WebServerConfig52NTS.wxs WebServerConfig53.wxs WebServerConfig53NTS.wxs WebServerConfig60.wxs WebServerConfig60NTS.wxs
jmertic Thu, 16 Jul 2009 19:56:57 + URL: http://svn.php.net/viewvc?view=revision&revision=284198 Changed paths: U php/win-installer/trunk/WebServerConfig52.wxs U php/win-installer/trunk/WebServerConfig52NTS.wxs U php/win-installer/trunk/WebServerConfig53.wxs U php/win-installer/trunk/WebServerConfig53NTS.wxs U php/win-installer/trunk/WebServerConfig60.wxs U php/win-installer/trunk/WebServerConfig60NTS.wxs Log: Adjust max_execution_time back down to 300 seconds, that one shouldn't have changed. Modified: php/win-installer/trunk/WebServerConfig52.wxs === --- php/win-installer/trunk/WebServerConfig52.wxs 2009-07-16 18:47:14 UTC (rev 284197) +++ php/win-installer/trunk/WebServerConfig52.wxs 2009-07-16 19:56:57 UTC (rev 284198) @@ -49,7 +49,7 @@ + Section="PHP" Value="300"/> + Section="PHP" Value="300"/> + Section="PHP" Value="300"/> + Section="PHP" Value="300"/> + Section="PHP" Value="300"/> + Section="PHP" Value="300"/> -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: php/win-installer/trunk/ PHPInstallerBase52.wxs PHPInstallerBase52NTS.wxs PHPInstallerBase53.wxs PHPInstallerBase53NTS.wxs PHPInstallerBase60.wxs PHPInstallerBase60NTS.wxs WebServerConf
jmertic Thu, 16 Jul 2009 18:47:14 + URL: http://svn.php.net/viewvc?view=revision&revision=284197 Changed paths: U php/win-installer/trunk/PHPInstallerBase52.wxs U php/win-installer/trunk/PHPInstallerBase52NTS.wxs U php/win-installer/trunk/PHPInstallerBase53.wxs U php/win-installer/trunk/PHPInstallerBase53NTS.wxs U php/win-installer/trunk/PHPInstallerBase60.wxs U php/win-installer/trunk/PHPInstallerBase60NTS.wxs U php/win-installer/trunk/WebServerConfig52.wxs U php/win-installer/trunk/WebServerConfig52NTS.wxs U php/win-installer/trunk/WebServerConfig53.wxs U php/win-installer/trunk/WebServerConfig53NTS.wxs U php/win-installer/trunk/WebServerConfig60.wxs U php/win-installer/trunk/WebServerConfig60NTS.wxs Log: - Move the ActivityTimeout and RequestTimeout for IIS/FastCGI to 600 seconds - Set fastcgi.logging to 0 for IIS/FastCGI installs - Turn on log_errors and write all errors to the %TEMP%/php-errors.log file. Modified: php/win-installer/trunk/PHPInstallerBase52.wxs === --- php/win-installer/trunk/PHPInstallerBase52.wxs 2009-07-16 16:11:50 UTC (rev 284196) +++ php/win-installer/trunk/PHPInstallerBase52.wxs 2009-07-16 18:47:14 UTC (rev 284197) @@ -294,6 +294,16 @@ Value="7"/> VersionNT = 502 + + + + @@ -371,6 +381,7 @@ + + @@ -593,7 +605,7 @@ Impersonate="no" /> + Value=""[WindowsFolder]system32\inetsrv\APPCMD.EXE" SET CONFIG -section:system.webServer/fastCGI "/[\[]fullPath='[INSTALLDIR]php-cgi.exe'[\]].activityTimeout:600" /commit:apphost" /> + Value=""[WindowsFolder]system32\inetsrv\APPCMD.EXE" SET CONFIG -section:system.webServer/fastCGI "/[\[]fullPath='[INSTALLDIR]php-cgi.exe'[\]].requestTimeout:600" /commit:apphost" /> + Value=""\\localhost\admin$\system32\cscript.exe" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -ActivityTimeout:600" /> + Value=""cscript" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -ActivityTimeout:600" /> + Value=""\\localhost\admin$\system32\cscript.exe" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -RequestTimeout:600" /> + Value=""cscript" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -RequestTimeout:600" /> VersionNT = 502 + + + + @@ -349,6 +359,7 @@ + + @@ -460,7 +472,7 @@ Impersonate="no" /> + Value=""[WindowsFolder]system32\inetsrv\APPCMD.EXE" SET CONFIG -section:system.webServer/fastCGI "/[\[]fullPath='[INSTALLDIR]php-cgi.exe'[\]].activityTimeout:600" /commit:apphost" /> + Value=""[WindowsFolder]system32\inetsrv\APPCMD.EXE" SET CONFIG -section:system.webServer/fastCGI "/[\[]fullPath='[INSTALLDIR]php-cgi.exe'[\]].requestTimeout:600" /commit:apphost" /> + Value=""\\localhost\admin$\system32\cscript.exe" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -ActivityTimeout:600" /> + Value=""cscript" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -ActivityTimeout:600" /> + Value=""\\localhost\admin$\system32\cscript.exe" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -RequestTimeout:600" /> + Value=""cscript" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -RequestTimeout:600" /> VersionNT = 502 + + + + @@ -366,6 +376,7 @@ + + @@ -553,7 +565,7 @@ Impersonate="no" /> + Value=""[WindowsFolder]system32\inetsrv\APPCMD.EXE" SET CONFIG -section:system.webServer/fastCGI "/[\[]fullPath='[INSTALLDIR]php-cgi.exe'[\]].activityTimeout:600" /commit:apphost" /> + Value=""[WindowsFolder]system32\inetsrv\APPCMD.EXE" SET CONFIG -section:system.webServer/fastCGI "/[\[]fullPath='[INSTALLDIR]php-cgi.exe'[\]].requestTimeout:600" /commit:apphost" /> + Value=""\\localhost\admin$\system32\cscript.exe" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -ActivityTimeout:600" /> + Value=""cscript" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -ActivityTimeout:600" /> + Value=""\\localhost\admin$\system32\cscript.exe" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -RequestTimeout:600" />
