cvs: win-installer / PHPInstallerBase52.wxs PHPInstallerBase52NTS.wxs PHPInstallerBase53.wxs PHPInstallerBase53NTS.wxs PHPInstallerBase60.wxs
PHPInstallerBase60NTS.wxs PHPInstallerScripts52.vbs PHPInstallerScripts60.vbs
| From: | John Mertic | Date: | Wed, 04 Feb 2009 18:43:59 +0000 |
| Subject: | cvs: win-installer / PHPInstallerBase52.wxs PHPInstallerBase52NTS.wxs PHPInstallerBase53.wxs PHPInstallerBase53NTS.wxs PHPInstallerBase60.wxs PHPInstallerBase60NTS.wxs PHPInstallerScripts52.vbs PHPInstallerScripts60.vbs |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-56099@lists.php.net to get a copy of this message | ||
jmertic Wed Feb 4 18:43:59 2009 UTC
Modified files:
/win-installer PHPInstallerBase52.wxs PHPInstallerBase52NTS.wxs
PHPInstallerBase53.wxs PHPInstallerBase53NTS.wxs
PHPInstallerBase60.wxs PHPInstallerBase60NTS.wxs
PHPInstallerScripts52.vbs PHPInstallerScripts60.vbs
Log:
Applied fixed contributed from Ruslan Yakushev <ruslany@microsoft.com>:
- Custom actions for fcgiconfigJS* for Win2k3 use the value of â\\localhost\admin$...â.
That ensures that the fcgiconfig.js runs correctly on both x86 and x64 platforms
- Added XP x86 specific custom actions because \\localhost\admin$ syntax is not supported on XP
x86.
- Removed calls to custom actions that invoke configIIS4 and unconfigIIS4. These are not necessary
whenever FastCGI option is used because on IIS5.1 and IIS 6.0 fcgiconfig.js will create and remove
script mappings. On IIS 7.0 the calls to appcmd take care of adding and removing handler mappings.
Because of this change now the fcgiext.ini gets properly cleaned up when uninstalling PHP on IIS 5.1
and IIS 6.0.
- Modified the VBScript to not do anything when is used with FastCGI.
http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase52.wxs?r1=1.38&r2=1.39&diff_format=u Index: win-installer/PHPInstallerBase52.wxs diff -u win-installer/PHPInstallerBase52.wxs:1.38 win-installer/PHPInstallerBase52.wxs:1.39 --- win-installer/PHPInstallerBase52.wxs:1.38 Thu Jan 29 19:03:27 2009 +++ win-installer/PHPInstallerBase52.wxs Wed Feb 4 18:43:59 2009 @@ -31,7 +31,7 @@ </Condition> <Condition - Message="PHP requires Windows NT/2000/XP/2003 or later to install"> + Message="PHP requires Windows NT/2000/XP/2003/Vista/2008 or later to install"> <![CDATA[( VersionNT < 400 ) OR ( Version9x <> 0 )]]> </Condition> @@ -75,13 +75,13 @@ </Property> <Property Id="FASTCGI60MODULEINSTALLED"> - <RegistrySearch - Id="fastcgi60Registry" - Root="HKLM" - Key="SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{E136BB09-1BB2-49A0-9FF3-5C25564D3819}" - Type="raw" - Name="Version" - Win64="yes"/> + <DirectorySearch Id="InetsrvDir" + Path="[WindowsFolder]system32\inetsrv" + Depth="0"> + <FileSearch + Id="FcgiExtFile" + Name="fcgiext.dll"/> + </DirectorySearch> </Property> <Property Id="FASTCGI70MODULEINSTALLED"> <RegistrySearch @@ -426,7 +426,7 @@ Title="$(loc.Featureapache22Title)" Description="$(loc.Featureapache22Description)" Level="10"> - <ComponentRef Id="php5apache2_2DLL"/> + <ComponentRef Id="php5apache2_2DLL"/> <ComponentRef Id="php5apache2_2_filterDLL"/> <ComponentRef Id="php5apache_hooksDLL"/> <ComponentRef Id="phpwinEXE"/> @@ -639,40 +639,76 @@ Impersonate="no" /> <CustomAction Id="fcgiconfigJSFastCGICmd" Property="fcgiconfigJSFastCGI" - Value=""cscript" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -add -section:"PHP" -extension:php -path:"[INSTALLDIR]php-cgi.exe"" /> + Value=""\\localhost\admin$\system32\cscript.exe" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -add -section:"PHP" -extension:php -path:"[INSTALLDIR]php-cgi.exe"" /> <CustomAction Id="fcgiconfigJSFastCGI" BinaryKey="WixCA" DllEntry="CAQuietExec" Return="ignore" Execute="deferred" Impersonate="no" /> + <CustomAction Id="fcgiconfigJSFastCGICmdXP" + Property="fcgiconfigJSFastCGIXP" + Value=""cscript" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -add -section:"PHP" -extension:php -path:"[INSTALLDIR]php-cgi.exe"" /> + <CustomAction Id="fcgiconfigJSFastCGIXP" + BinaryKey="WixCA" + DllEntry="CAQuietExec" + Return="ignore" + Execute="deferred" + Impersonate="no" /> <CustomAction Id="fcgiconfigJSFastCGISetInstanceMaxRequestsCmd" Property="fcgiconfigJSFastCGISetInstanceMaxRequests" - Value=""cscript" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -InstanceMaxRequests:10000" /> + Value=""\\localhost\admin$\system32\cscript.exe" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -InstanceMaxRequests:10000" /> <CustomAction Id="fcgiconfigJSFastCGISetInstanceMaxRequests" BinaryKey="WixCA" DllEntry="CAQuietExec" Return="ignore" Execute="deferred" Impersonate="no" /> + <CustomAction Id="fcgiconfigJSFastCGISetInstanceMaxRequestsCmdXP" + Property="fcgiconfigJSFastCGISetInstanceMaxRequestsXP" + Value=""cscript" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -InstanceMaxRequests:10000" /> + <CustomAction Id="fcgiconfigJSFastCGISetInstanceMaxRequestsXP" + BinaryKey="WixCA" + DllEntry="CAQuietExec" + Return="ignore" + Execute="deferred" + Impersonate="no" /> <CustomAction Id="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSCmd" Property="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTS" - Value=""cscript" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -EnvironmentVars:PHP_FCGI_MAX_REQUESTS:10000,PHPRC:"[INSTALLDIR]"" /> + Value=""\\localhost\admin$\system32\cscript.exe" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -EnvironmentVars:PHP_FCGI_MAX_REQUESTS:10000,PHPRC:"[INSTALLDIR]"" /> <CustomAction Id="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTS" BinaryKey="WixCA" DllEntry="CAQuietExec" Return="ignore" Execute="deferred" Impersonate="no" /> + <CustomAction Id="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSCmdXP" + Property="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSXP" + Value=""cscript" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -EnvironmentVars:PHP_FCGI_MAX_REQUESTS:10000,PHPRC:"[INSTALLDIR]"" /> + <CustomAction Id="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSXP" + BinaryKey="WixCA" + DllEntry="CAQuietExec" + Return="ignore" + Execute="deferred" + Impersonate="no" /> <CustomAction Id="fcgiconfigJSFastCGIremoveCmd" Property="fcgiconfigJSFastCGIremove" - Value=""cscript" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -remove -section:"PHP"" /> + Value=""\\localhost\admin$\system32\cscript.exe" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -remove -section:"PHP"" /> <CustomAction Id="fcgiconfigJSFastCGIremove" BinaryKey="WixCA" DllEntry="CAQuietExec" Return="ignore" Execute="deferred" Impersonate="no" /> + <CustomAction Id="fcgiconfigJSFastCGIremoveCmdXP" + Property="fcgiconfigJSFastCGIremoveXP" + Value=""cscript" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -remove -section:"PHP"" /> + <CustomAction Id="fcgiconfigJSFastCGIremoveXP" + BinaryKey="WixCA" + DllEntry="CAQuietExec" + Return="ignore" + Execute="deferred" + Impersonate="no" /> <CustomAction Id="configIIS4" BinaryKey="PHPInstallerScripts" Return="check" @@ -752,31 +788,55 @@ <![CDATA[VersionNT >= 600 AND &iis4FastCGI = 2]]> </Custom> <Custom Action="fcgiconfigJSFastCGICmd" After="InstallInitialize"> - <![CDATA[((VersionNT = 501 AND ServicePackLevel >= 2) OR (VersionNT = 502 AND ServicePackLevel >= 2)) AND &iis4FastCGI = 3]]> + <![CDATA[(VersionNT = 502 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> </Custom> <Custom Action="fcgiconfigJSFastCGI" After="fcgiconfigJSFastCGICmd"> - <![CDATA[((VersionNT = 501 AND ServicePackLevel >= 2) OR (VersionNT = 502 AND ServicePackLevel >= 2)) AND &iis4FastCGI = 3]]> + <![CDATA[(VersionNT = 502 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> </Custom> <Custom Action="fcgiconfigJSFastCGISetInstanceMaxRequestsCmd" After="fcgiconfigJSFastCGI"> - <![CDATA[((VersionNT = 501 AND ServicePackLevel >= 2) OR (VersionNT = 502 AND ServicePackLevel >= 2)) AND &iis4FastCGI = 3]]> + <![CDATA[(VersionNT = 502 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> </Custom> <Custom Action="fcgiconfigJSFastCGISetInstanceMaxRequests" After="fcgiconfigJSFastCGISetInstanceMaxRequestsCmd"> - <![CDATA[((VersionNT = 501 AND ServicePackLevel >= 2) OR (VersionNT = 502 AND ServicePackLevel >= 2)) AND &iis4FastCGI = 3]]> + <![CDATA[(VersionNT = 502 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> </Custom> <Custom Action="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSCmd" After="fcgiconfigJSFastCGISetInstanceMaxRequests"> - <![CDATA[((VersionNT = 501 AND ServicePackLevel >= 2) OR (VersionNT = 502 AND ServicePackLevel >= 2)) AND &iis4FastCGI = 3]]> + <![CDATA[(VersionNT = 502 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> </Custom> <Custom Action="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTS" After="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSCmd"> - <![CDATA[((VersionNT = 501 AND ServicePackLevel >= 2) OR (VersionNT = 502 AND ServicePackLevel >= 2)) AND &iis4FastCGI = 3]]> + <![CDATA[(VersionNT = 502 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> </Custom> - <Custom Action="configIIS4" After="InstallFinalize"> - <![CDATA[VersionNT < 600 AND &iis4FastCGI = 3]]> + <Custom Action="fcgiconfigJSFastCGICmdXP" After="InstallInitialize"> + <![CDATA[(VersionNT = 501 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="fcgiconfigJSFastCGIXP" After="fcgiconfigJSFastCGICmdXP"> + <![CDATA[(VersionNT = 501 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="fcgiconfigJSFastCGISetInstanceMaxRequestsCmdXP" After="fcgiconfigJSFastCGIXP"> + <![CDATA[(VersionNT = 501 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="fcgiconfigJSFastCGISetInstanceMaxRequestsXP" After="fcgiconfigJSFastCGISetInstanceMaxRequestsCmdXP"> + <![CDATA[(VersionNT = 501 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSCmdXP" After="fcgiconfigJSFastCGISetInstanceMaxRequestsXP"> + <![CDATA[(VersionNT = 501 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSXP" After="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSCmdXP"> + <![CDATA[(VersionNT = 501 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> </Custom> <Custom Action="fcgiconfigJSFastCGIremoveCmd" After="InstallInitialize"> - <![CDATA[((VersionNT = 501 AND ServicePackLevel >= 2) OR (VersionNT = 502 AND ServicePackLevel >= 2)) AND &iis4FastCGI = 2]]> + <![CDATA[(VersionNT = 502 AND ServicePackLevel >= 2) AND &iis4FastCGI = 2]]> </Custom> <Custom Action="fcgiconfigJSFastCGIremove" After="fcgiconfigJSFastCGIremoveCmd"> - <![CDATA[((VersionNT = 501 AND ServicePackLevel >= 2) OR (VersionNT = 502 AND ServicePackLevel >= 2)) AND &iis4FastCGI = 2]]> + <![CDATA[(VersionNT = 502 AND ServicePackLevel >= 2) AND &iis4FastCGI = 2]]> + </Custom> + <Custom Action="fcgiconfigJSFastCGIremoveCmdXP" After="InstallInitialize"> + <![CDATA[(VersionNT = 501 AND ServicePackLevel >= 2) AND &iis4FastCGI = 2]]> + </Custom> + <Custom Action="fcgiconfigJSFastCGIremoveXP" After="fcgiconfigJSFastCGIremoveCmdXP"> + <![CDATA[(VersionNT = 501 AND ServicePackLevel >= 2) AND &iis4FastCGI = 2]]> + </Custom> + <Custom Action="configIIS4" After="InstallFinalize"> + <![CDATA[VersionNT < 600 AND &iis4FastCGI = 3]]> </Custom> <Custom Action="unconfigIIS4" After="fcgiconfigJSFastCGIremove"> <![CDATA[VersionNT < 600 AND &iis4FastCGI = 2]]> http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase52NTS.wxs?r1=1.14&r2=1.15&diff_format=u Index: win-installer/PHPInstallerBase52NTS.wxs diff -u win-installer/PHPInstallerBase52NTS.wxs:1.14 win-installer/PHPInstallerBase52NTS.wxs:1.15 --- win-installer/PHPInstallerBase52NTS.wxs:1.14 Thu Jan 29 19:03:28 2009 +++ win-installer/PHPInstallerBase52NTS.wxs Wed Feb 4 18:43:59 2009 @@ -25,16 +25,14 @@ Minimum='5.2.0' /> </Upgrade> - <Binary Id="WixCA" src="Wix\WixCA.dll" /> - <Condition - Message="You need to be an administrator to install PHP using this installer."> + Message="You need to be an administrator to install PHP using this installer."> <![CDATA[Privileged OR (AdminUser AND VersionNT >= 600]]> </Condition> <Condition - Message="PHP requires Windows NT/2000/XP/2003 or later to install"> - <![CDATA[( VersionNT < 400 ) OR ( Version9x <> 0 )]]> + Message="PHP requires Windows NT/2000/XP/2003/Vista/2008 or later to install"> + <![CDATA[( VersionNT < 400 ) OR ( Version9x <> 0 )]]> </Condition> <Media Id="1" @@ -55,13 +53,13 @@ </Property> <Property Id="FASTCGI60MODULEINSTALLED"> - <RegistrySearch - Id="fastcgi60Registry" - Root="HKLM" - Key="SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{E136BB09-1BB2-49A0-9FF3-5C25564D3819}" - Type="raw" - Name="Version" - Win64="yes"/> + <DirectorySearch Id="InetsrvDir" + Path="[WindowsFolder]system32\inetsrv" + Depth="0"> + <FileSearch + Id="FcgiExtFile" + Name="fcgiext.dll"/> + </DirectorySearch> </Property> <Property Id="FASTCGI70MODULEINSTALLED"> <RegistrySearch @@ -75,14 +73,14 @@ <CustomAction Id='CheckFASTCGIINSTALLED' Property='FASTCGIINSTALLED' Value='1' /> <CustomAction Id='CheckFASTCGINOTINSTALLED' Property='FASTCGIINSTALLED' Value='0' /> <InstallUISequence> - <Custom Action="CheckFASTCGIINSTALLED" After="CostInitialize"> - <![CDATA[FASTCGI60MODULEINSTALLED OR FASTCGI70MODULEINSTALLED]]> - </Custom> - <Custom Action="CheckFASTCGINOTINSTALLED" After="CostInitialize"> - <![CDATA[NOT FASTCGI60MODULEINSTALLED AND NOT FASTCGI70MODULEINSTALLED]]> - </Custom> + <Custom Action="CheckFASTCGIINSTALLED" After="CostInitialize"> + <![CDATA[FASTCGI60MODULEINSTALLED OR FASTCGI70MODULEINSTALLED]]> + </Custom> + <Custom Action="CheckFASTCGINOTINSTALLED" After="CostInitialize"> + <![CDATA[NOT FASTCGI60MODULEINSTALLED AND NOT FASTCGI70MODULEINSTALLED]]> + </Custom> </InstallUISequence> - + <Property Id="APACHEREGDIR"> <RegistrySearch Id="apacheRegistry" Root="HKLM" @@ -508,40 +506,76 @@ Impersonate="no" /> <CustomAction Id="fcgiconfigJSFastCGICmd" Property="fcgiconfigJSFastCGI" - Value=""cscript" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -add -section:"PHP" -extension:php -path:"[INSTALLDIR]php-cgi.exe"" /> + Value=""\\localhost\admin$\system32\cscript.exe" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -add -section:"PHP" -extension:php -path:"[INSTALLDIR]php-cgi.exe"" /> <CustomAction Id="fcgiconfigJSFastCGI" BinaryKey="WixCA" DllEntry="CAQuietExec" Return="ignore" Execute="deferred" Impersonate="no" /> + <CustomAction Id="fcgiconfigJSFastCGICmdXP" + Property="fcgiconfigJSFastCGIXP" + Value=""cscript" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -add -section:"PHP" -extension:php -path:"[INSTALLDIR]php-cgi.exe"" /> + <CustomAction Id="fcgiconfigJSFastCGIXP" + BinaryKey="WixCA" + DllEntry="CAQuietExec" + Return="ignore" + Execute="deferred" + Impersonate="no" /> <CustomAction Id="fcgiconfigJSFastCGISetInstanceMaxRequestsCmd" Property="fcgiconfigJSFastCGISetInstanceMaxRequests" - Value=""cscript" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -InstanceMaxRequests:10000" /> + Value=""\\localhost\admin$\system32\cscript.exe" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -InstanceMaxRequests:10000" /> <CustomAction Id="fcgiconfigJSFastCGISetInstanceMaxRequests" BinaryKey="WixCA" DllEntry="CAQuietExec" Return="ignore" Execute="deferred" Impersonate="no" /> + <CustomAction Id="fcgiconfigJSFastCGISetInstanceMaxRequestsCmdXP" + Property="fcgiconfigJSFastCGISetInstanceMaxRequestsXP" + Value=""cscript" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -InstanceMaxRequests:10000" /> + <CustomAction Id="fcgiconfigJSFastCGISetInstanceMaxRequestsXP" + BinaryKey="WixCA" + DllEntry="CAQuietExec" + Return="ignore" + Execute="deferred" + Impersonate="no" /> <CustomAction Id="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSCmd" Property="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTS" - Value=""cscript" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -EnvironmentVars:PHP_FCGI_MAX_REQUESTS:10000,PHPRC:"[INSTALLDIR]"" /> + Value=""\\localhost\admin$\system32\cscript.exe" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -EnvironmentVars:PHP_FCGI_MAX_REQUESTS:10000,PHPRC:"[INSTALLDIR]"" /> <CustomAction Id="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTS" BinaryKey="WixCA" DllEntry="CAQuietExec" Return="ignore" Execute="deferred" Impersonate="no" /> + <CustomAction Id="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSCmdXP" + Property="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSXP" + Value=""cscript" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -EnvironmentVars:PHP_FCGI_MAX_REQUESTS:10000,PHPRC:"[INSTALLDIR]"" /> + <CustomAction Id="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSXP" + BinaryKey="WixCA" + DllEntry="CAQuietExec" + Return="ignore" + Execute="deferred" + Impersonate="no" /> <CustomAction Id="fcgiconfigJSFastCGIremoveCmd" Property="fcgiconfigJSFastCGIremove" - Value=""cscript" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -remove -section:"PHP"" /> + Value=""\\localhost\admin$\system32\cscript.exe" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -remove -section:"PHP"" /> <CustomAction Id="fcgiconfigJSFastCGIremove" BinaryKey="WixCA" DllEntry="CAQuietExec" Return="ignore" Execute="deferred" Impersonate="no" /> + <CustomAction Id="fcgiconfigJSFastCGIremoveCmdXP" + Property="fcgiconfigJSFastCGIremoveXP" + Value=""cscript" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -remove -section:"PHP"" /> + <CustomAction Id="fcgiconfigJSFastCGIremoveXP" + BinaryKey="WixCA" + DllEntry="CAQuietExec" + Return="ignore" + Execute="deferred" + Impersonate="no" /> <CustomAction Id="configIIS4" BinaryKey="PHPInstallerScripts" Return="check" @@ -595,34 +629,52 @@ <![CDATA[VersionNT >= 600 AND &iis4FastCGI = 2]]> </Custom> <Custom Action="fcgiconfigJSFastCGICmd" After="InstallInitialize"> - <![CDATA[((VersionNT = 501 AND ServicePackLevel >= 2) OR (VersionNT = 502 AND ServicePackLevel >= 2)) AND &iis4FastCGI = 3]]> + <![CDATA[(VersionNT = 502 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> </Custom> <Custom Action="fcgiconfigJSFastCGI" After="fcgiconfigJSFastCGICmd"> - <![CDATA[((VersionNT = 501 AND ServicePackLevel >= 2) OR (VersionNT = 502 AND ServicePackLevel >= 2)) AND &iis4FastCGI = 3]]> + <![CDATA[(VersionNT = 502 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> </Custom> <Custom Action="fcgiconfigJSFastCGISetInstanceMaxRequestsCmd" After="fcgiconfigJSFastCGI"> - <![CDATA[((VersionNT = 501 AND ServicePackLevel >= 2) OR (VersionNT = 502 AND ServicePackLevel >= 2)) AND &iis4FastCGI = 3]]> + <![CDATA[(VersionNT = 502 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> </Custom> <Custom Action="fcgiconfigJSFastCGISetInstanceMaxRequests" After="fcgiconfigJSFastCGISetInstanceMaxRequestsCmd"> - <![CDATA[((VersionNT = 501 AND ServicePackLevel >= 2) OR (VersionNT = 502 AND ServicePackLevel >= 2)) AND &iis4FastCGI = 3]]> + <![CDATA[(VersionNT = 502 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> </Custom> <Custom Action="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSCmd" After="fcgiconfigJSFastCGISetInstanceMaxRequests"> - <![CDATA[((VersionNT = 501 AND ServicePackLevel >= 2) OR (VersionNT = 502 AND ServicePackLevel >= 2)) AND &iis4FastCGI = 3]]> + <![CDATA[(VersionNT = 502 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> </Custom> <Custom Action="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTS" After="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSCmd"> - <![CDATA[((VersionNT = 501 AND ServicePackLevel >= 2) OR (VersionNT = 502 AND ServicePackLevel >= 2)) AND &iis4FastCGI = 3]]> + <![CDATA[(VersionNT = 502 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="fcgiconfigJSFastCGICmdXP" After="InstallInitialize"> + <![CDATA[(VersionNT = 501 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="fcgiconfigJSFastCGIXP" After="fcgiconfigJSFastCGICmdXP"> + <![CDATA[(VersionNT = 501 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> </Custom> - <Custom Action="configIIS4" After="InstallFinalize"> - <![CDATA[VersionNT < 600 AND &iis4FastCGI = 3]]> + <Custom Action="fcgiconfigJSFastCGISetInstanceMaxRequestsCmdXP" After="fcgiconfigJSFastCGIXP"> + <![CDATA[(VersionNT = 501 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="fcgiconfigJSFastCGISetInstanceMaxRequestsXP" After="fcgiconfigJSFastCGISetInstanceMaxRequestsCmdXP"> + <![CDATA[(VersionNT = 501 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSCmdXP" After="fcgiconfigJSFastCGISetInstanceMaxRequestsXP"> + <![CDATA[(VersionNT = 501 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSXP" After="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSCmdXP"> + <![CDATA[(VersionNT = 501 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> </Custom> <Custom Action="fcgiconfigJSFastCGIremoveCmd" After="InstallInitialize"> - <![CDATA[((VersionNT = 501 AND ServicePackLevel >= 2) OR (VersionNT = 502 AND ServicePackLevel >= 2)) AND &iis4FastCGI = 2]]> + <![CDATA[(VersionNT = 502 AND ServicePackLevel >= 2) AND &iis4FastCGI = 2]]> </Custom> <Custom Action="fcgiconfigJSFastCGIremove" After="fcgiconfigJSFastCGIremoveCmd"> - <![CDATA[((VersionNT = 501 AND ServicePackLevel >= 2) OR (VersionNT = 502 AND ServicePackLevel >= 2)) AND &iis4FastCGI = 2]]> + <![CDATA[(VersionNT = 502 AND ServicePackLevel >= 2) AND &iis4FastCGI = 2]]> + </Custom> + <Custom Action="fcgiconfigJSFastCGIremoveCmdXP" After="InstallInitialize"> + <![CDATA[(VersionNT = 501 AND ServicePackLevel >= 2) AND &iis4FastCGI = 2]]> </Custom> - <Custom Action="unconfigIIS4" After="fcgiconfigJSFastCGIremove"> - <![CDATA[VersionNT < 600 AND &iis4FastCGI = 2]]> + <Custom Action="fcgiconfigJSFastCGIremoveXP" After="fcgiconfigJSFastCGIremoveCmdXP"> + <![CDATA[(VersionNT = 501 AND ServicePackLevel >= 2) AND &iis4FastCGI = 2]]> </Custom> <RemoveExistingProducts After="InstallValidate" /> </InstallExecuteSequence> http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase53.wxs?r1=1.14&r2=1.15&diff_format=u Index: win-installer/PHPInstallerBase53.wxs diff -u win-installer/PHPInstallerBase53.wxs:1.14 win-installer/PHPInstallerBase53.wxs:1.15 --- win-installer/PHPInstallerBase53.wxs:1.14 Thu Jan 29 19:03:29 2009 +++ win-installer/PHPInstallerBase53.wxs Wed Feb 4 18:43:59 2009 @@ -31,8 +31,8 @@ </Condition> <Condition - Message="PHP requires Windows NT/2000/XP/2003 or later to install"> - <![CDATA[( VersionNT < 400 ) OR ( Version9x <> 0 )]]> + Message="PHP requires Windows 2000/XP/2003/Vista/2008 or later to install"> + <![CDATA[( VersionNT <= 500 ) OR ( Version9x <> 0 )]]> </Condition> <Media Id="1" @@ -75,13 +75,13 @@ </Property> <Property Id="FASTCGI60MODULEINSTALLED"> - <RegistrySearch - Id="fastcgi60Registry" - Root="HKLM" - Key="SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{E136BB09-1BB2-49A0-9FF3-5C25564D3819}" - Type="raw" - Name="Version" - Win64="yes"/> + <DirectorySearch Id="InetsrvDir" + Path="[WindowsFolder]system32\inetsrv" + Depth="0"> + <FileSearch + Id="FcgiExtFile" + Name="fcgiext.dll"/> + </DirectorySearch> </Property> <Property Id="FASTCGI70MODULEINSTALLED"> <RegistrySearch @@ -453,7 +453,7 @@ Title="$(loc.FeaturensapiTitle)" Description="$(loc.FeaturensapiDescription)" Level="10"> - <ComponentRef Id="phpcgiEXE"/> + <ComponentRef Id="phpcgiEXE"/> <ComponentRef Id="nsapiregistry"/> </Feature> <Feature AllowAdvertise="no" @@ -610,40 +610,76 @@ Impersonate="no" /> <CustomAction Id="fcgiconfigJSFastCGICmd" Property="fcgiconfigJSFastCGI" - Value=""cscript" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -add -section:"PHP" -extension:php -path:"[INSTALLDIR]php-cgi.exe"" /> + Value=""\\localhost\admin$\system32\cscript.exe" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -add -section:"PHP" -extension:php -path:"[INSTALLDIR]php-cgi.exe"" /> <CustomAction Id="fcgiconfigJSFastCGI" BinaryKey="WixCA" DllEntry="CAQuietExec" Return="ignore" Execute="deferred" Impersonate="no" /> + <CustomAction Id="fcgiconfigJSFastCGICmdXP" + Property="fcgiconfigJSFastCGIXP" + Value=""cscript" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -add -section:"PHP" -extension:php -path:"[INSTALLDIR]php-cgi.exe"" /> + <CustomAction Id="fcgiconfigJSFastCGIXP" + BinaryKey="WixCA" + DllEntry="CAQuietExec" + Return="ignore" + Execute="deferred" + Impersonate="no" /> <CustomAction Id="fcgiconfigJSFastCGISetInstanceMaxRequestsCmd" Property="fcgiconfigJSFastCGISetInstanceMaxRequests" - Value=""cscript" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -InstanceMaxRequests:10000" /> + Value=""\\localhost\admin$\system32\cscript.exe" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -InstanceMaxRequests:10000" /> <CustomAction Id="fcgiconfigJSFastCGISetInstanceMaxRequests" BinaryKey="WixCA" DllEntry="CAQuietExec" Return="ignore" Execute="deferred" Impersonate="no" /> + <CustomAction Id="fcgiconfigJSFastCGISetInstanceMaxRequestsCmdXP" + Property="fcgiconfigJSFastCGISetInstanceMaxRequestsXP" + Value=""cscript" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -InstanceMaxRequests:10000" /> + <CustomAction Id="fcgiconfigJSFastCGISetInstanceMaxRequestsXP" + BinaryKey="WixCA" + DllEntry="CAQuietExec" + Return="ignore" + Execute="deferred" + Impersonate="no" /> <CustomAction Id="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSCmd" Property="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTS" - Value=""cscript" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -EnvironmentVars:PHP_FCGI_MAX_REQUESTS:10000,PHPRC:"[INSTALLDIR]"" /> + Value=""\\localhost\admin$\system32\cscript.exe" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -EnvironmentVars:PHP_FCGI_MAX_REQUESTS:10000,PHPRC:"[INSTALLDIR]"" /> <CustomAction Id="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTS" BinaryKey="WixCA" DllEntry="CAQuietExec" Return="ignore" Execute="deferred" Impersonate="no" /> + <CustomAction Id="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSCmdXP" + Property="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSXP" + Value=""cscript" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -EnvironmentVars:PHP_FCGI_MAX_REQUESTS:10000,PHPRC:"[INSTALLDIR]"" /> + <CustomAction Id="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSXP" + BinaryKey="WixCA" + DllEntry="CAQuietExec" + Return="ignore" + Execute="deferred" + Impersonate="no" /> <CustomAction Id="fcgiconfigJSFastCGIremoveCmd" Property="fcgiconfigJSFastCGIremove" - Value=""cscript" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -remove -section:"PHP"" /> + Value=""\\localhost\admin$\system32\cscript.exe" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -remove -section:"PHP"" /> <CustomAction Id="fcgiconfigJSFastCGIremove" BinaryKey="WixCA" DllEntry="CAQuietExec" Return="ignore" Execute="deferred" Impersonate="no" /> + <CustomAction Id="fcgiconfigJSFastCGIremoveCmdXP" + Property="fcgiconfigJSFastCGIremoveXP" + Value=""cscript" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -remove -section:"PHP"" /> + <CustomAction Id="fcgiconfigJSFastCGIremoveXP" + BinaryKey="WixCA" + DllEntry="CAQuietExec" + Return="ignore" + Execute="deferred" + Impersonate="no" /> <CustomAction Id="configIIS4" BinaryKey="PHPInstallerScripts" Return="check" @@ -723,31 +759,55 @@ <![CDATA[VersionNT >= 600 AND &iis4FastCGI = 2]]> </Custom> <Custom Action="fcgiconfigJSFastCGICmd" After="InstallInitialize"> - <![CDATA[((VersionNT = 501 AND ServicePackLevel >= 2) OR (VersionNT = 502 AND ServicePackLevel >= 2)) AND &iis4FastCGI = 3]]> + <![CDATA[(VersionNT = 502 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> </Custom> <Custom Action="fcgiconfigJSFastCGI" After="fcgiconfigJSFastCGICmd"> - <![CDATA[((VersionNT = 501 AND ServicePackLevel >= 2) OR (VersionNT = 502 AND ServicePackLevel >= 2)) AND &iis4FastCGI = 3]]> + <![CDATA[(VersionNT = 502 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> </Custom> <Custom Action="fcgiconfigJSFastCGISetInstanceMaxRequestsCmd" After="fcgiconfigJSFastCGI"> - <![CDATA[((VersionNT = 501 AND ServicePackLevel >= 2) OR (VersionNT = 502 AND ServicePackLevel >= 2)) AND &iis4FastCGI = 3]]> + <![CDATA[(VersionNT = 502 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> </Custom> <Custom Action="fcgiconfigJSFastCGISetInstanceMaxRequests" After="fcgiconfigJSFastCGISetInstanceMaxRequestsCmd"> - <![CDATA[((VersionNT = 501 AND ServicePackLevel >= 2) OR (VersionNT = 502 AND ServicePackLevel >= 2)) AND &iis4FastCGI = 3]]> + <![CDATA[(VersionNT = 502 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> </Custom> <Custom Action="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSCmd" After="fcgiconfigJSFastCGISetInstanceMaxRequests"> - <![CDATA[((VersionNT = 501 AND ServicePackLevel >= 2) OR (VersionNT = 502 AND ServicePackLevel >= 2)) AND &iis4FastCGI = 3]]> + <![CDATA[(VersionNT = 502 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> </Custom> <Custom Action="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTS" After="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSCmd"> - <![CDATA[((VersionNT = 501 AND ServicePackLevel >= 2) OR (VersionNT = 502 AND ServicePackLevel >= 2)) AND &iis4FastCGI = 3]]> + <![CDATA[(VersionNT = 502 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> </Custom> - <Custom Action="configIIS4" After="InstallFinalize"> - <![CDATA[VersionNT < 600 AND &iis4FastCGI = 3]]> + <Custom Action="fcgiconfigJSFastCGICmdXP" After="InstallInitialize"> + <![CDATA[(VersionNT = 501 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="fcgiconfigJSFastCGIXP" After="fcgiconfigJSFastCGICmdXP"> + <![CDATA[(VersionNT = 501 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="fcgiconfigJSFastCGISetInstanceMaxRequestsCmdXP" After="fcgiconfigJSFastCGIXP"> + <![CDATA[(VersionNT = 501 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="fcgiconfigJSFastCGISetInstanceMaxRequestsXP" After="fcgiconfigJSFastCGISetInstanceMaxRequestsCmdXP"> + <![CDATA[(VersionNT = 501 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSCmdXP" After="fcgiconfigJSFastCGISetInstanceMaxRequestsXP"> + <![CDATA[(VersionNT = 501 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSXP" After="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSCmdXP"> + <![CDATA[(VersionNT = 501 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> </Custom> <Custom Action="fcgiconfigJSFastCGIremoveCmd" After="InstallInitialize"> - <![CDATA[((VersionNT = 501 AND ServicePackLevel >= 2) OR (VersionNT = 502 AND ServicePackLevel >= 2)) AND &iis4FastCGI = 2]]> + <![CDATA[(VersionNT = 502 AND ServicePackLevel >= 2) AND &iis4FastCGI = 2]]> </Custom> <Custom Action="fcgiconfigJSFastCGIremove" After="fcgiconfigJSFastCGIremoveCmd"> - <![CDATA[((VersionNT = 501 AND ServicePackLevel >= 2) OR (VersionNT = 502 AND ServicePackLevel >= 2)) AND &iis4FastCGI = 2]]> + <![CDATA[(VersionNT = 502 AND ServicePackLevel >= 2) AND &iis4FastCGI = 2]]> + </Custom> + <Custom Action="fcgiconfigJSFastCGIremoveCmdXP" After="InstallInitialize"> + <![CDATA[(VersionNT = 501 AND ServicePackLevel >= 2) AND &iis4FastCGI = 2]]> + </Custom> + <Custom Action="fcgiconfigJSFastCGIremoveXP" After="fcgiconfigJSFastCGIremoveCmdXP"> + <![CDATA[(VersionNT = 501 AND ServicePackLevel >= 2) AND &iis4FastCGI = 2]]> + </Custom> + <Custom Action="configIIS4" After="InstallFinalize"> + <![CDATA[VersionNT < 600 AND &iis4FastCGI = 3]]> </Custom> <Custom Action="unconfigIIS4" After="fcgiconfigJSFastCGIremove"> <![CDATA[VersionNT < 600 AND &iis4FastCGI = 2]]> http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase53NTS.wxs?r1=1.13&r2=1.14&diff_format=u Index: win-installer/PHPInstallerBase53NTS.wxs diff -u win-installer/PHPInstallerBase53NTS.wxs:1.13 win-installer/PHPInstallerBase53NTS.wxs:1.14 --- win-installer/PHPInstallerBase53NTS.wxs:1.13 Thu Jan 29 19:03:29 2009 +++ win-installer/PHPInstallerBase53NTS.wxs Wed Feb 4 18:43:59 2009 @@ -31,8 +31,8 @@ </Condition> <Condition - Message="PHP requires Windows NT/2000/XP/2003 or later to install"> - <![CDATA[( VersionNT < 400 ) OR ( Version9x <> 0 )]]> + Message="PHP requires Windows 2000/XP/2003/Vista/2008 or later to install"> + <![CDATA[( VersionNT <= 500 ) OR ( Version9x <> 0 )]]> </Condition> <Media Id="1" @@ -53,34 +53,34 @@ </Property> <Property Id="FASTCGI60MODULEINSTALLED"> - <RegistrySearch - Id="fastcgi60Registry" - Root="HKLM" - Key="SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{E136BB09-1BB2-49A0-9FF3-5C25564D3819}" - Type="raw" - Name="Version" - Win64="yes"/> - </Property> - <Property Id="FASTCGI70MODULEINSTALLED"> - <RegistrySearch + <DirectorySearch Id="InetsrvDir" + Path="[WindowsFolder]system32\inetsrv" + Depth="0"> + <FileSearch + Id="FcgiExtFile" + Name="fcgiext.dll"/> + </DirectorySearch> + </Property> + <Property Id="FASTCGI70MODULEINSTALLED"> + <RegistrySearch Id="fastcgi70Registry" Root="HKLM" Key="SOFTWARE\Microsoft\InetStp\Components" Type="raw" Name="FastCgi" Win64="yes"/> - </Property> - <CustomAction Id='CheckFASTCGIINSTALLED' Property='FASTCGIINSTALLED' Value='1' /> - <CustomAction Id='CheckFASTCGINOTINSTALLED' Property='FASTCGIINSTALLED' Value='0' /> - <InstallUISequence> - <Custom Action="CheckFASTCGIINSTALLED" After="CostInitialize"> - <![CDATA[FASTCGI60MODULEINSTALLED OR FASTCGI70MODULEINSTALLED]]> - </Custom> - <Custom Action="CheckFASTCGINOTINSTALLED" After="CostInitialize"> - <![CDATA[NOT FASTCGI60MODULEINSTALLED AND NOT FASTCGI70MODULEINSTALLED]]> - </Custom> + </Property> + <CustomAction Id='CheckFASTCGIINSTALLED' Property='FASTCGIINSTALLED' Value='1' /> + <CustomAction Id='CheckFASTCGINOTINSTALLED' Property='FASTCGIINSTALLED' Value='0' /> + <InstallUISequence> + <Custom Action="CheckFASTCGIINSTALLED" After="CostInitialize"> + <![CDATA[FASTCGI60MODULEINSTALLED OR FASTCGI70MODULEINSTALLED]]> + </Custom> + <Custom Action="CheckFASTCGINOTINSTALLED" After="CostInitialize"> + <![CDATA[NOT FASTCGI60MODULEINSTALLED AND NOT FASTCGI70MODULEINSTALLED]]> + </Custom> </InstallUISequence> - + <Property Id="APACHEREGDIR"> <RegistrySearch Id="apacheRegistry" Root="HKLM" @@ -477,40 +477,76 @@ Impersonate="no" /> <CustomAction Id="fcgiconfigJSFastCGICmd" Property="fcgiconfigJSFastCGI" - Value=""cscript" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -add -section:"PHP" -extension:php -path:"[INSTALLDIR]php-cgi.exe"" /> + Value=""\\localhost\admin$\system32\cscript.exe" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -add -section:"PHP" -extension:php -path:"[INSTALLDIR]php-cgi.exe"" /> <CustomAction Id="fcgiconfigJSFastCGI" BinaryKey="WixCA" DllEntry="CAQuietExec" Return="ignore" Execute="deferred" Impersonate="no" /> + <CustomAction Id="fcgiconfigJSFastCGICmdXP" + Property="fcgiconfigJSFastCGIXP" + Value=""cscript" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -add -section:"PHP" -extension:php -path:"[INSTALLDIR]php-cgi.exe"" /> + <CustomAction Id="fcgiconfigJSFastCGIXP" + BinaryKey="WixCA" + DllEntry="CAQuietExec" + Return="ignore" + Execute="deferred" + Impersonate="no" /> <CustomAction Id="fcgiconfigJSFastCGISetInstanceMaxRequestsCmd" Property="fcgiconfigJSFastCGISetInstanceMaxRequests" - Value=""cscript" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -InstanceMaxRequests:10000" /> + Value=""\\localhost\admin$\system32\cscript.exe" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -InstanceMaxRequests:10000" /> <CustomAction Id="fcgiconfigJSFastCGISetInstanceMaxRequests" BinaryKey="WixCA" DllEntry="CAQuietExec" Return="ignore" Execute="deferred" Impersonate="no" /> + <CustomAction Id="fcgiconfigJSFastCGISetInstanceMaxRequestsCmdXP" + Property="fcgiconfigJSFastCGISetInstanceMaxRequestsXP" + Value=""cscript" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -InstanceMaxRequests:10000" /> + <CustomAction Id="fcgiconfigJSFastCGISetInstanceMaxRequestsXP" + BinaryKey="WixCA" + DllEntry="CAQuietExec" + Return="ignore" + Execute="deferred" + Impersonate="no" /> <CustomAction Id="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSCmd" Property="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTS" - Value=""cscript" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -EnvironmentVars:PHP_FCGI_MAX_REQUESTS:10000,PHPRC:"[INSTALLDIR]"" /> + Value=""\\localhost\admin$\system32\cscript.exe" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -EnvironmentVars:PHP_FCGI_MAX_REQUESTS:10000,PHPRC:"[INSTALLDIR]"" /> <CustomAction Id="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTS" BinaryKey="WixCA" DllEntry="CAQuietExec" Return="ignore" Execute="deferred" Impersonate="no" /> + <CustomAction Id="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSCmdXP" + Property="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSXP" + Value=""cscript" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -EnvironmentVars:PHP_FCGI_MAX_REQUESTS:10000,PHPRC:"[INSTALLDIR]"" /> + <CustomAction Id="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSXP" + BinaryKey="WixCA" + DllEntry="CAQuietExec" + Return="ignore" + Execute="deferred" + Impersonate="no" /> <CustomAction Id="fcgiconfigJSFastCGIremoveCmd" Property="fcgiconfigJSFastCGIremove" - Value=""cscript" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -remove -section:"PHP"" /> + Value=""\\localhost\admin$\system32\cscript.exe" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -remove -section:"PHP"" /> <CustomAction Id="fcgiconfigJSFastCGIremove" BinaryKey="WixCA" DllEntry="CAQuietExec" Return="ignore" Execute="deferred" Impersonate="no" /> + <CustomAction Id="fcgiconfigJSFastCGIremoveCmdXP" + Property="fcgiconfigJSFastCGIremoveXP" + Value=""cscript" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -remove -section:"PHP"" /> + <CustomAction Id="fcgiconfigJSFastCGIremoveXP" + BinaryKey="WixCA" + DllEntry="CAQuietExec" + Return="ignore" + Execute="deferred" + Impersonate="no" /> <CustomAction Id="configIIS4" BinaryKey="PHPInstallerScripts" Return="check" @@ -564,34 +600,52 @@ <![CDATA[VersionNT >= 600 AND &iis4FastCGI = 2]]> </Custom> <Custom Action="fcgiconfigJSFastCGICmd" After="InstallInitialize"> - <![CDATA[((VersionNT = 501 AND ServicePackLevel >= 2) OR (VersionNT = 502 AND ServicePackLevel >= 2)) AND &iis4FastCGI = 3]]> + <![CDATA[(VersionNT = 502 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> </Custom> <Custom Action="fcgiconfigJSFastCGI" After="fcgiconfigJSFastCGICmd"> - <![CDATA[((VersionNT = 501 AND ServicePackLevel >= 2) OR (VersionNT = 502 AND ServicePackLevel >= 2)) AND &iis4FastCGI = 3]]> + <![CDATA[(VersionNT = 502 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> </Custom> <Custom Action="fcgiconfigJSFastCGISetInstanceMaxRequestsCmd" After="fcgiconfigJSFastCGI"> - <![CDATA[((VersionNT = 501 AND ServicePackLevel >= 2) OR (VersionNT = 502 AND ServicePackLevel >= 2)) AND &iis4FastCGI = 3]]> + <![CDATA[(VersionNT = 502 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> </Custom> <Custom Action="fcgiconfigJSFastCGISetInstanceMaxRequests" After="fcgiconfigJSFastCGISetInstanceMaxRequestsCmd"> - <![CDATA[((VersionNT = 501 AND ServicePackLevel >= 2) OR (VersionNT = 502 AND ServicePackLevel >= 2)) AND &iis4FastCGI = 3]]> + <![CDATA[(VersionNT = 502 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> </Custom> <Custom Action="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSCmd" After="fcgiconfigJSFastCGISetInstanceMaxRequests"> - <![CDATA[((VersionNT = 501 AND ServicePackLevel >= 2) OR (VersionNT = 502 AND ServicePackLevel >= 2)) AND &iis4FastCGI = 3]]> + <![CDATA[(VersionNT = 502 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> </Custom> <Custom Action="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTS" After="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSCmd"> - <![CDATA[((VersionNT = 501 AND ServicePackLevel >= 2) OR (VersionNT = 502 AND ServicePackLevel >= 2)) AND &iis4FastCGI = 3]]> + <![CDATA[(VersionNT = 502 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="fcgiconfigJSFastCGICmdXP" After="InstallInitialize"> + <![CDATA[(VersionNT = 501 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="fcgiconfigJSFastCGIXP" After="fcgiconfigJSFastCGICmdXP"> + <![CDATA[(VersionNT = 501 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> </Custom> - <Custom Action="configIIS4" After="InstallFinalize"> - <![CDATA[VersionNT < 600 AND &iis4FastCGI = 3]]> + <Custom Action="fcgiconfigJSFastCGISetInstanceMaxRequestsCmdXP" After="fcgiconfigJSFastCGIXP"> + <![CDATA[(VersionNT = 501 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="fcgiconfigJSFastCGISetInstanceMaxRequestsXP" After="fcgiconfigJSFastCGISetInstanceMaxRequestsCmdXP"> + <![CDATA[(VersionNT = 501 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSCmdXP" After="fcgiconfigJSFastCGISetInstanceMaxRequestsXP"> + <![CDATA[(VersionNT = 501 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSXP" After="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSCmdXP"> + <![CDATA[(VersionNT = 501 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> </Custom> <Custom Action="fcgiconfigJSFastCGIremoveCmd" After="InstallInitialize"> - <![CDATA[((VersionNT = 501 AND ServicePackLevel >= 2) OR (VersionNT = 502 AND ServicePackLevel >= 2)) AND &iis4FastCGI = 2]]> + <![CDATA[(VersionNT = 502 AND ServicePackLevel >= 2) AND &iis4FastCGI = 2]]> </Custom> <Custom Action="fcgiconfigJSFastCGIremove" After="fcgiconfigJSFastCGIremoveCmd"> - <![CDATA[((VersionNT = 501 AND ServicePackLevel >= 2) OR (VersionNT = 502 AND ServicePackLevel >= 2)) AND &iis4FastCGI = 2]]> + <![CDATA[(VersionNT = 502 AND ServicePackLevel >= 2) AND &iis4FastCGI = 2]]> + </Custom> + <Custom Action="fcgiconfigJSFastCGIremoveCmdXP" After="InstallInitialize"> + <![CDATA[(VersionNT = 501 AND ServicePackLevel >= 2) AND &iis4FastCGI = 2]]> </Custom> - <Custom Action="unconfigIIS4" After="fcgiconfigJSFastCGIremove"> - <![CDATA[VersionNT < 600 AND &iis4FastCGI = 2]]> + <Custom Action="fcgiconfigJSFastCGIremoveXP" After="fcgiconfigJSFastCGIremoveCmdXP"> + <![CDATA[(VersionNT = 501 AND ServicePackLevel >= 2) AND &iis4FastCGI = 2]]> </Custom> <RemoveExistingProducts After="InstallValidate" /> </InstallExecuteSequence> http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase60.wxs?r1=1.28&r2=1.29&diff_format=u Index: win-installer/PHPInstallerBase60.wxs diff -u win-installer/PHPInstallerBase60.wxs:1.28 win-installer/PHPInstallerBase60.wxs:1.29 --- win-installer/PHPInstallerBase60.wxs:1.28 Thu Jan 29 19:03:29 2009 +++ win-installer/PHPInstallerBase60.wxs Wed Feb 4 18:43:59 2009 @@ -31,8 +31,8 @@ </Condition> <Condition - Message="PHP requires Windows NT/2000/XP/2003 or later to install"> - <![CDATA[( VersionNT < 400 ) OR ( Version9x <> 0 )]]> + Message="PHP requires Windows 2000/XP/2003/Vista/2008 or later to install"> + <![CDATA[( VersionNT <= 500 ) OR ( Version9x <> 0 )]]> </Condition> <Media Id="1" @@ -75,13 +75,13 @@ </Property> <Property Id="FASTCGI60MODULEINSTALLED"> - <RegistrySearch - Id="fastcgi60Registry" - Root="HKLM" - Key="SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{E136BB09-1BB2-49A0-9FF3-5C25564D3819}" - Type="raw" - Name="Version" - Win64="yes"/> + <DirectorySearch Id="InetsrvDir" + Path="[WindowsFolder]system32\inetsrv" + Depth="0"> + <FileSearch + Id="FcgiExtFile" + Name="fcgiext.dll"/> + </DirectorySearch> </Property> <Property Id="FASTCGI70MODULEINSTALLED"> <RegistrySearch @@ -453,7 +453,7 @@ Title="$(loc.FeaturensapiTitle)" Description="$(loc.FeaturensapiDescription)" Level="10"> - <ComponentRef Id="phpcgiEXE"/> + <ComponentRef Id="phpcgiEXE"/> <ComponentRef Id="nsapiregistry"/> </Feature> <Feature AllowAdvertise="no" @@ -610,40 +610,76 @@ Impersonate="no" /> <CustomAction Id="fcgiconfigJSFastCGICmd" Property="fcgiconfigJSFastCGI" - Value=""cscript" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -add -section:"PHP" -extension:php -path:"[INSTALLDIR]php-cgi.exe"" /> + Value=""\\localhost\admin$\system32\cscript.exe" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -add -section:"PHP" -extension:php -path:"[INSTALLDIR]php-cgi.exe"" /> <CustomAction Id="fcgiconfigJSFastCGI" BinaryKey="WixCA" DllEntry="CAQuietExec" Return="ignore" Execute="deferred" Impersonate="no" /> + <CustomAction Id="fcgiconfigJSFastCGICmdXP" + Property="fcgiconfigJSFastCGIXP" + Value=""cscript" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -add -section:"PHP" -extension:php -path:"[INSTALLDIR]php-cgi.exe"" /> + <CustomAction Id="fcgiconfigJSFastCGIXP" + BinaryKey="WixCA" + DllEntry="CAQuietExec" + Return="ignore" + Execute="deferred" + Impersonate="no" /> <CustomAction Id="fcgiconfigJSFastCGISetInstanceMaxRequestsCmd" Property="fcgiconfigJSFastCGISetInstanceMaxRequests" - Value=""cscript" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -InstanceMaxRequests:10000" /> + Value=""\\localhost\admin$\system32\cscript.exe" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -InstanceMaxRequests:10000" /> <CustomAction Id="fcgiconfigJSFastCGISetInstanceMaxRequests" BinaryKey="WixCA" DllEntry="CAQuietExec" Return="ignore" Execute="deferred" Impersonate="no" /> + <CustomAction Id="fcgiconfigJSFastCGISetInstanceMaxRequestsCmdXP" + Property="fcgiconfigJSFastCGISetInstanceMaxRequestsXP" + Value=""cscript" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -InstanceMaxRequests:10000" /> + <CustomAction Id="fcgiconfigJSFastCGISetInstanceMaxRequestsXP" + BinaryKey="WixCA" + DllEntry="CAQuietExec" + Return="ignore" + Execute="deferred" + Impersonate="no" /> <CustomAction Id="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSCmd" Property="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTS" - Value=""cscript" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -EnvironmentVars:PHP_FCGI_MAX_REQUESTS:10000,PHPRC:"[INSTALLDIR]"" /> + Value=""\\localhost\admin$\system32\cscript.exe" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -EnvironmentVars:PHP_FCGI_MAX_REQUESTS:10000,PHPRC:"[INSTALLDIR]"" /> <CustomAction Id="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTS" BinaryKey="WixCA" DllEntry="CAQuietExec" Return="ignore" Execute="deferred" Impersonate="no" /> + <CustomAction Id="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSCmdXP" + Property="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSXP" + Value=""cscript" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -EnvironmentVars:PHP_FCGI_MAX_REQUESTS:10000,PHPRC:"[INSTALLDIR]"" /> + <CustomAction Id="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSXP" + BinaryKey="WixCA" + DllEntry="CAQuietExec" + Return="ignore" + Execute="deferred" + Impersonate="no" /> <CustomAction Id="fcgiconfigJSFastCGIremoveCmd" Property="fcgiconfigJSFastCGIremove" - Value=""cscript" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -remove -section:"PHP"" /> + Value=""\\localhost\admin$\system32\cscript.exe" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -remove -section:"PHP"" /> <CustomAction Id="fcgiconfigJSFastCGIremove" BinaryKey="WixCA" DllEntry="CAQuietExec" Return="ignore" Execute="deferred" Impersonate="no" /> + <CustomAction Id="fcgiconfigJSFastCGIremoveCmdXP" + Property="fcgiconfigJSFastCGIremoveXP" + Value=""cscript" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -remove -section:"PHP"" /> + <CustomAction Id="fcgiconfigJSFastCGIremoveXP" + BinaryKey="WixCA" + DllEntry="CAQuietExec" + Return="ignore" + Execute="deferred" + Impersonate="no" /> <CustomAction Id="configIIS4" BinaryKey="PHPInstallerScripts" Return="check" @@ -723,31 +759,55 @@ <![CDATA[VersionNT >= 600 AND &iis4FastCGI = 2]]> </Custom> <Custom Action="fcgiconfigJSFastCGICmd" After="InstallInitialize"> - <![CDATA[((VersionNT = 501 AND ServicePackLevel >= 2) OR (VersionNT = 502 AND ServicePackLevel >= 2)) AND &iis4FastCGI = 3]]> + <![CDATA[(VersionNT = 502 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> </Custom> <Custom Action="fcgiconfigJSFastCGI" After="fcgiconfigJSFastCGICmd"> - <![CDATA[((VersionNT = 501 AND ServicePackLevel >= 2) OR (VersionNT = 502 AND ServicePackLevel >= 2)) AND &iis4FastCGI = 3]]> + <![CDATA[(VersionNT = 502 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> </Custom> <Custom Action="fcgiconfigJSFastCGISetInstanceMaxRequestsCmd" After="fcgiconfigJSFastCGI"> - <![CDATA[((VersionNT = 501 AND ServicePackLevel >= 2) OR (VersionNT = 502 AND ServicePackLevel >= 2)) AND &iis4FastCGI = 3]]> + <![CDATA[(VersionNT = 502 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> </Custom> <Custom Action="fcgiconfigJSFastCGISetInstanceMaxRequests" After="fcgiconfigJSFastCGISetInstanceMaxRequestsCmd"> - <![CDATA[((VersionNT = 501 AND ServicePackLevel >= 2) OR (VersionNT = 502 AND ServicePackLevel >= 2)) AND &iis4FastCGI = 3]]> + <![CDATA[(VersionNT = 502 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> </Custom> <Custom Action="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSCmd" After="fcgiconfigJSFastCGISetInstanceMaxRequests"> - <![CDATA[((VersionNT = 501 AND ServicePackLevel >= 2) OR (VersionNT = 502 AND ServicePackLevel >= 2)) AND &iis4FastCGI = 3]]> + <![CDATA[(VersionNT = 502 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> </Custom> <Custom Action="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTS" After="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSCmd"> - <![CDATA[((VersionNT = 501 AND ServicePackLevel >= 2) OR (VersionNT = 502 AND ServicePackLevel >= 2)) AND &iis4FastCGI = 3]]> + <![CDATA[(VersionNT = 502 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> </Custom> - <Custom Action="configIIS4" After="InstallFinalize"> - <![CDATA[VersionNT < 600 AND &iis4FastCGI = 3]]> + <Custom Action="fcgiconfigJSFastCGICmdXP" After="InstallInitialize"> + <![CDATA[(VersionNT = 501 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="fcgiconfigJSFastCGIXP" After="fcgiconfigJSFastCGICmdXP"> + <![CDATA[(VersionNT = 501 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="fcgiconfigJSFastCGISetInstanceMaxRequestsCmdXP" After="fcgiconfigJSFastCGIXP"> + <![CDATA[(VersionNT = 501 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="fcgiconfigJSFastCGISetInstanceMaxRequestsXP" After="fcgiconfigJSFastCGISetInstanceMaxRequestsCmdXP"> + <![CDATA[(VersionNT = 501 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSCmdXP" After="fcgiconfigJSFastCGISetInstanceMaxRequestsXP"> + <![CDATA[(VersionNT = 501 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSXP" After="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSCmdXP"> + <![CDATA[(VersionNT = 501 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> </Custom> <Custom Action="fcgiconfigJSFastCGIremoveCmd" After="InstallInitialize"> - <![CDATA[((VersionNT = 501 AND ServicePackLevel >= 2) OR (VersionNT = 502 AND ServicePackLevel >= 2)) AND &iis4FastCGI = 2]]> + <![CDATA[(VersionNT = 502 AND ServicePackLevel >= 2) AND &iis4FastCGI = 2]]> </Custom> <Custom Action="fcgiconfigJSFastCGIremove" After="fcgiconfigJSFastCGIremoveCmd"> - <![CDATA[((VersionNT = 501 AND ServicePackLevel >= 2) OR (VersionNT = 502 AND ServicePackLevel >= 2)) AND &iis4FastCGI = 2]]> + <![CDATA[(VersionNT = 502 AND ServicePackLevel >= 2) AND &iis4FastCGI = 2]]> + </Custom> + <Custom Action="fcgiconfigJSFastCGIremoveCmdXP" After="InstallInitialize"> + <![CDATA[(VersionNT = 501 AND ServicePackLevel >= 2) AND &iis4FastCGI = 2]]> + </Custom> + <Custom Action="fcgiconfigJSFastCGIremoveXP" After="fcgiconfigJSFastCGIremoveCmdXP"> + <![CDATA[(VersionNT = 501 AND ServicePackLevel >= 2) AND &iis4FastCGI = 2]]> + </Custom> + <Custom Action="configIIS4" After="InstallFinalize"> + <![CDATA[VersionNT < 600 AND &iis4FastCGI = 3]]> </Custom> <Custom Action="unconfigIIS4" After="fcgiconfigJSFastCGIremove"> <![CDATA[VersionNT < 600 AND &iis4FastCGI = 2]]> http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase60NTS.wxs?r1=1.14&r2=1.15&diff_format=u Index: win-installer/PHPInstallerBase60NTS.wxs diff -u win-installer/PHPInstallerBase60NTS.wxs:1.14 win-installer/PHPInstallerBase60NTS.wxs:1.15 --- win-installer/PHPInstallerBase60NTS.wxs:1.14 Thu Jan 29 19:03:29 2009 +++ win-installer/PHPInstallerBase60NTS.wxs Wed Feb 4 18:43:59 2009 @@ -31,8 +31,8 @@ </Condition> <Condition - Message="PHP requires Windows NT/2000/XP/2003 or later to install"> - <![CDATA[( VersionNT < 400 ) OR ( Version9x <> 0 )]]> + Message="PHP requires Windows 2000/XP/2003/Vista/2008 or later to install"> + <![CDATA[( VersionNT <= 500 ) OR ( Version9x <> 0 )]]> </Condition> <Media Id="1" @@ -53,34 +53,34 @@ </Property> <Property Id="FASTCGI60MODULEINSTALLED"> - <RegistrySearch - Id="fastcgi60Registry" - Root="HKLM" - Key="SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{E136BB09-1BB2-49A0-9FF3-5C25564D3819}" - Type="raw" - Name="Version" - Win64="yes"/> - </Property> - <Property Id="FASTCGI70MODULEINSTALLED"> - <RegistrySearch + <DirectorySearch Id="InetsrvDir" + Path="[WindowsFolder]system32\inetsrv" + Depth="0"> + <FileSearch + Id="FcgiExtFile" + Name="fcgiext.dll"/> + </DirectorySearch> + </Property> + <Property Id="FASTCGI70MODULEINSTALLED"> + <RegistrySearch Id="fastcgi70Registry" Root="HKLM" Key="SOFTWARE\Microsoft\InetStp\Components" Type="raw" Name="FastCgi" Win64="yes"/> - </Property> - <CustomAction Id='CheckFASTCGIINSTALLED' Property='FASTCGIINSTALLED' Value='1' /> - <CustomAction Id='CheckFASTCGINOTINSTALLED' Property='FASTCGIINSTALLED' Value='0' /> - <InstallUISequence> - <Custom Action="CheckFASTCGIINSTALLED" After="CostInitialize"> - <![CDATA[FASTCGI60MODULEINSTALLED OR FASTCGI70MODULEINSTALLED]]> - </Custom> - <Custom Action="CheckFASTCGINOTINSTALLED" After="CostInitialize"> - <![CDATA[NOT FASTCGI60MODULEINSTALLED AND NOT FASTCGI70MODULEINSTALLED]]> - </Custom> + </Property> + <CustomAction Id='CheckFASTCGIINSTALLED' Property='FASTCGIINSTALLED' Value='1' /> + <CustomAction Id='CheckFASTCGINOTINSTALLED' Property='FASTCGIINSTALLED' Value='0' /> + <InstallUISequence> + <Custom Action="CheckFASTCGIINSTALLED" After="CostInitialize"> + <![CDATA[FASTCGI60MODULEINSTALLED OR FASTCGI70MODULEINSTALLED]]> + </Custom> + <Custom Action="CheckFASTCGINOTINSTALLED" After="CostInitialize"> + <![CDATA[NOT FASTCGI60MODULEINSTALLED AND NOT FASTCGI70MODULEINSTALLED]]> + </Custom> </InstallUISequence> - + <Property Id="APACHEREGDIR"> <RegistrySearch Id="apacheRegistry" Root="HKLM" @@ -477,40 +477,76 @@ Impersonate="no" /> <CustomAction Id="fcgiconfigJSFastCGICmd" Property="fcgiconfigJSFastCGI" - Value=""cscript" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -add -section:"PHP" -extension:php -path:"[INSTALLDIR]php-cgi.exe"" /> + Value=""\\localhost\admin$\system32\cscript.exe" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -add -section:"PHP" -extension:php -path:"[INSTALLDIR]php-cgi.exe"" /> <CustomAction Id="fcgiconfigJSFastCGI" BinaryKey="WixCA" DllEntry="CAQuietExec" Return="ignore" Execute="deferred" Impersonate="no" /> + <CustomAction Id="fcgiconfigJSFastCGICmdXP" + Property="fcgiconfigJSFastCGIXP" + Value=""cscript" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -add -section:"PHP" -extension:php -path:"[INSTALLDIR]php-cgi.exe"" /> + <CustomAction Id="fcgiconfigJSFastCGIXP" + BinaryKey="WixCA" + DllEntry="CAQuietExec" + Return="ignore" + Execute="deferred" + Impersonate="no" /> <CustomAction Id="fcgiconfigJSFastCGISetInstanceMaxRequestsCmd" Property="fcgiconfigJSFastCGISetInstanceMaxRequests" - Value=""cscript" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -InstanceMaxRequests:10000" /> + Value=""\\localhost\admin$\system32\cscript.exe" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -InstanceMaxRequests:10000" /> <CustomAction Id="fcgiconfigJSFastCGISetInstanceMaxRequests" BinaryKey="WixCA" DllEntry="CAQuietExec" Return="ignore" Execute="deferred" Impersonate="no" /> + <CustomAction Id="fcgiconfigJSFastCGISetInstanceMaxRequestsCmdXP" + Property="fcgiconfigJSFastCGISetInstanceMaxRequestsXP" + Value=""cscript" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -InstanceMaxRequests:10000" /> + <CustomAction Id="fcgiconfigJSFastCGISetInstanceMaxRequestsXP" + BinaryKey="WixCA" + DllEntry="CAQuietExec" + Return="ignore" + Execute="deferred" + Impersonate="no" /> <CustomAction Id="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSCmd" Property="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTS" - Value=""cscript" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -EnvironmentVars:PHP_FCGI_MAX_REQUESTS:10000,PHPRC:"[INSTALLDIR]"" /> + Value=""\\localhost\admin$\system32\cscript.exe" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -EnvironmentVars:PHP_FCGI_MAX_REQUESTS:10000,PHPRC:"[INSTALLDIR]"" /> <CustomAction Id="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTS" BinaryKey="WixCA" DllEntry="CAQuietExec" Return="ignore" Execute="deferred" Impersonate="no" /> + <CustomAction Id="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSCmdXP" + Property="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSXP" + Value=""cscript" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -EnvironmentVars:PHP_FCGI_MAX_REQUESTS:10000,PHPRC:"[INSTALLDIR]"" /> + <CustomAction Id="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSXP" + BinaryKey="WixCA" + DllEntry="CAQuietExec" + Return="ignore" + Execute="deferred" + Impersonate="no" /> <CustomAction Id="fcgiconfigJSFastCGIremoveCmd" Property="fcgiconfigJSFastCGIremove" - Value=""cscript" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -remove -section:"PHP"" /> + Value=""\\localhost\admin$\system32\cscript.exe" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -remove -section:"PHP"" /> <CustomAction Id="fcgiconfigJSFastCGIremove" BinaryKey="WixCA" DllEntry="CAQuietExec" Return="ignore" Execute="deferred" Impersonate="no" /> + <CustomAction Id="fcgiconfigJSFastCGIremoveCmdXP" + Property="fcgiconfigJSFastCGIremoveXP" + Value=""cscript" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -remove -section:"PHP"" /> + <CustomAction Id="fcgiconfigJSFastCGIremoveXP" + BinaryKey="WixCA" + DllEntry="CAQuietExec" + Return="ignore" + Execute="deferred" + Impersonate="no" /> <CustomAction Id="configIIS4" BinaryKey="PHPInstallerScripts" Return="check" @@ -564,34 +600,52 @@ <![CDATA[VersionNT >= 600 AND &iis4FastCGI = 2]]> </Custom> <Custom Action="fcgiconfigJSFastCGICmd" After="InstallInitialize"> - <![CDATA[((VersionNT = 501 AND ServicePackLevel >= 2) OR (VersionNT = 502 AND ServicePackLevel >= 2)) AND &iis4FastCGI = 3]]> + <![CDATA[(VersionNT = 502 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> </Custom> <Custom Action="fcgiconfigJSFastCGI" After="fcgiconfigJSFastCGICmd"> - <![CDATA[((VersionNT = 501 AND ServicePackLevel >= 2) OR (VersionNT = 502 AND ServicePackLevel >= 2)) AND &iis4FastCGI = 3]]> + <![CDATA[(VersionNT = 502 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> </Custom> <Custom Action="fcgiconfigJSFastCGISetInstanceMaxRequestsCmd" After="fcgiconfigJSFastCGI"> - <![CDATA[((VersionNT = 501 AND ServicePackLevel >= 2) OR (VersionNT = 502 AND ServicePackLevel >= 2)) AND &iis4FastCGI = 3]]> + <![CDATA[(VersionNT = 502 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> </Custom> <Custom Action="fcgiconfigJSFastCGISetInstanceMaxRequests" After="fcgiconfigJSFastCGISetInstanceMaxRequestsCmd"> - <![CDATA[((VersionNT = 501 AND ServicePackLevel >= 2) OR (VersionNT = 502 AND ServicePackLevel >= 2)) AND &iis4FastCGI = 3]]> + <![CDATA[(VersionNT = 502 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> </Custom> <Custom Action="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSCmd" After="fcgiconfigJSFastCGISetInstanceMaxRequests"> - <![CDATA[((VersionNT = 501 AND ServicePackLevel >= 2) OR (VersionNT = 502 AND ServicePackLevel >= 2)) AND &iis4FastCGI = 3]]> + <![CDATA[(VersionNT = 502 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> </Custom> <Custom Action="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTS" After="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSCmd"> - <![CDATA[((VersionNT = 501 AND ServicePackLevel >= 2) OR (VersionNT = 502 AND ServicePackLevel >= 2)) AND &iis4FastCGI = 3]]> + <![CDATA[(VersionNT = 502 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="fcgiconfigJSFastCGICmdXP" After="InstallInitialize"> + <![CDATA[(VersionNT = 501 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="fcgiconfigJSFastCGIXP" After="fcgiconfigJSFastCGICmdXP"> + <![CDATA[(VersionNT = 501 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> </Custom> - <Custom Action="configIIS4" After="InstallFinalize"> - <![CDATA[VersionNT < 600 AND &iis4FastCGI = 3]]> + <Custom Action="fcgiconfigJSFastCGISetInstanceMaxRequestsCmdXP" After="fcgiconfigJSFastCGIXP"> + <![CDATA[(VersionNT = 501 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="fcgiconfigJSFastCGISetInstanceMaxRequestsXP" After="fcgiconfigJSFastCGISetInstanceMaxRequestsCmdXP"> + <![CDATA[(VersionNT = 501 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSCmdXP" After="fcgiconfigJSFastCGISetInstanceMaxRequestsXP"> + <![CDATA[(VersionNT = 501 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSXP" After="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSCmdXP"> + <![CDATA[(VersionNT = 501 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> </Custom> <Custom Action="fcgiconfigJSFastCGIremoveCmd" After="InstallInitialize"> - <![CDATA[((VersionNT = 501 AND ServicePackLevel >= 2) OR (VersionNT = 502 AND ServicePackLevel >= 2)) AND &iis4FastCGI = 2]]> + <![CDATA[(VersionNT = 502 AND ServicePackLevel >= 2) AND &iis4FastCGI = 2]]> </Custom> <Custom Action="fcgiconfigJSFastCGIremove" After="fcgiconfigJSFastCGIremoveCmd"> - <![CDATA[((VersionNT = 501 AND ServicePackLevel >= 2) OR (VersionNT = 502 AND ServicePackLevel >= 2)) AND &iis4FastCGI = 2]]> + <![CDATA[(VersionNT = 502 AND ServicePackLevel >= 2) AND &iis4FastCGI = 2]]> + </Custom> + <Custom Action="fcgiconfigJSFastCGIremoveCmdXP" After="InstallInitialize"> + <![CDATA[(VersionNT = 501 AND ServicePackLevel >= 2) AND &iis4FastCGI = 2]]> </Custom> - <Custom Action="unconfigIIS4" After="fcgiconfigJSFastCGIremove"> - <![CDATA[VersionNT < 600 AND &iis4FastCGI = 2]]> + <Custom Action="fcgiconfigJSFastCGIremoveXP" After="fcgiconfigJSFastCGIremoveCmdXP"> + <![CDATA[(VersionNT = 501 AND ServicePackLevel >= 2) AND &iis4FastCGI = 2]]> </Custom> <RemoveExistingProducts After="InstallValidate" /> </InstallExecuteSequence> http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerScripts52.vbs?r1=1.10&r2=1.11&diff_format=u Index: win-installer/PHPInstallerScripts52.vbs diff -u win-installer/PHPInstallerScripts52.vbs:1.10 win-installer/PHPInstallerScripts52.vbs:1.11 --- win-installer/PHPInstallerScripts52.vbs:1.10 Thu Jan 29 18:30:33 2009 +++ win-installer/PHPInstallerScripts52.vbs Wed Feb 4 18:43:59 2009 @@ -171,8 +171,7 @@ PHPExecutable = strPHPPath & "php5isapi.dll" End If If ( Session.FeatureRequestState("iis4FastCGI") = 3 ) Then - Set objShell = CreateObject("WScript.Shell") - PHPExecutable = objShell.ExpandEnvironmentStrings("%WINDIR%") & "\system32\inetsrv\fcgiext.dll" + Exit Sub End If If ( GetWindowsVersion < 5.2 ) Then @@ -245,6 +244,10 @@ 'it could all go dreadfully wrong - so set error handler for graceful exits On Error Resume Next + + If ( Session.FeatureRequestState("iis4FastCGI") = 2 ) Then + Exit Sub + End If Set WebService = GetObject("IIS://LocalHost/W3SVC") If (Err.Number <> 0) Then http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerScripts60.vbs?r1=1.10&r2=1.11&diff_format=u Index: win-installer/PHPInstallerScripts60.vbs diff -u win-installer/PHPInstallerScripts60.vbs:1.10 win-installer/PHPInstallerScripts60.vbs:1.11 --- win-installer/PHPInstallerScripts60.vbs:1.10 Thu Jan 29 18:30:33 2009 +++ win-installer/PHPInstallerScripts60.vbs Wed Feb 4 18:43:59 2009 @@ -171,8 +171,7 @@ PHPExecutable = strPHPPath & "php6isapi.dll" End If If ( Session.FeatureRequestState("iis4FastCGI") = 3 ) Then - Set objShell = CreateObject("WScript.Shell") - PHPExecutable = objShell.ExpandEnvironmentStrings("%WINDIR%") & "\system32\inetsrv\fcgiext.dll" + Exit Sub End If If ( GetWindowsVersion < 5.2 ) Then @@ -245,6 +244,10 @@ 'it could all go dreadfully wrong - so set error handler for graceful exits On Error Resume Next + + If ( Session.FeatureRequestState("iis4FastCGI") = 2 ) Then + Exit Sub + End If Set WebService = GetObject("IIS://LocalHost/W3SVC") If (Err.Number <> 0) Then
http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase52.wxs?r1=1.38&r2=1.39&diff_format=u Index: win-installer/PHPInstallerBase52.wxs diff -u win-installer/PHPInstallerBase52.wxs:1.38 win-installer/PHPInstallerBase52.wxs:1.39 --- win-installer/PHPInstallerBase52.wxs:1.38 Thu Jan 29 19:03:27 2009 +++ win-installer/PHPInstallerBase52.wxs Wed Feb 4 18:43:59 2009 @@ -31,7 +31,7 @@ </Condition> <Condition - Message="PHP requires Windows NT/2000/XP/2003 or later to install"> + Message="PHP requires Windows NT/2000/XP/2003/Vista/2008 or later to install"> <![CDATA[( VersionNT < 400 ) OR ( Version9x <> 0 )]]> </Condition> @@ -75,13 +75,13 @@ </Property> <Property Id="FASTCGI60MODULEINSTALLED"> - <RegistrySearch - Id="fastcgi60Registry" - Root="HKLM" - Key="SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{E136BB09-1BB2-49A0-9FF3-5C25564D3819}" - Type="raw" - Name="Version" - Win64="yes"/> + <DirectorySearch Id="InetsrvDir" + Path="[WindowsFolder]system32\inetsrv" + Depth="0"> + <FileSearch + Id="FcgiExtFile" + Name="fcgiext.dll"/> + </DirectorySearch> </Property> <Property Id="FASTCGI70MODULEINSTALLED"> <RegistrySearch @@ -426,7 +426,7 @@ Title="$(loc.Featureapache22Title)" Description="$(loc.Featureapache22Description)" Level="10"> - <ComponentRef Id="php5apache2_2DLL"/> + <ComponentRef Id="php5apache2_2DLL"/> <ComponentRef Id="php5apache2_2_filterDLL"/> <ComponentRef Id="php5apache_hooksDLL"/> <ComponentRef Id="phpwinEXE"/> @@ -639,40 +639,76 @@ Impersonate="no" /> <CustomAction Id="fcgiconfigJSFastCGICmd" Property="fcgiconfigJSFastCGI" - Value=""cscript" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -add -section:"PHP" -extension:php -path:"[INSTALLDIR]php-cgi.exe"" /> + Value=""\\localhost\admin$\system32\cscript.exe" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -add -section:"PHP" -extension:php -path:"[INSTALLDIR]php-cgi.exe"" /> <CustomAction Id="fcgiconfigJSFastCGI" BinaryKey="WixCA" DllEntry="CAQuietExec" Return="ignore" Execute="deferred" Impersonate="no" /> + <CustomAction Id="fcgiconfigJSFastCGICmdXP" + Property="fcgiconfigJSFastCGIXP" + Value=""cscript" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -add -section:"PHP" -extension:php -path:"[INSTALLDIR]php-cgi.exe"" /> + <CustomAction Id="fcgiconfigJSFastCGIXP" + BinaryKey="WixCA" + DllEntry="CAQuietExec" + Return="ignore" + Execute="deferred" + Impersonate="no" /> <CustomAction Id="fcgiconfigJSFastCGISetInstanceMaxRequestsCmd" Property="fcgiconfigJSFastCGISetInstanceMaxRequests" - Value=""cscript" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -InstanceMaxRequests:10000" /> + Value=""\\localhost\admin$\system32\cscript.exe" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -InstanceMaxRequests:10000" /> <CustomAction Id="fcgiconfigJSFastCGISetInstanceMaxRequests" BinaryKey="WixCA" DllEntry="CAQuietExec" Return="ignore" Execute="deferred" Impersonate="no" /> + <CustomAction Id="fcgiconfigJSFastCGISetInstanceMaxRequestsCmdXP" + Property="fcgiconfigJSFastCGISetInstanceMaxRequestsXP" + Value=""cscript" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -InstanceMaxRequests:10000" /> + <CustomAction Id="fcgiconfigJSFastCGISetInstanceMaxRequestsXP" + BinaryKey="WixCA" + DllEntry="CAQuietExec" + Return="ignore" + Execute="deferred" + Impersonate="no" /> <CustomAction Id="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSCmd" Property="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTS" - Value=""cscript" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -EnvironmentVars:PHP_FCGI_MAX_REQUESTS:10000,PHPRC:"[INSTALLDIR]"" /> + Value=""\\localhost\admin$\system32\cscript.exe" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -EnvironmentVars:PHP_FCGI_MAX_REQUESTS:10000,PHPRC:"[INSTALLDIR]"" /> <CustomAction Id="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTS" BinaryKey="WixCA" DllEntry="CAQuietExec" Return="ignore" Execute="deferred" Impersonate="no" /> + <CustomAction Id="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSCmdXP" + Property="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSXP" + Value=""cscript" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -EnvironmentVars:PHP_FCGI_MAX_REQUESTS:10000,PHPRC:"[INSTALLDIR]"" /> + <CustomAction Id="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSXP" + BinaryKey="WixCA" + DllEntry="CAQuietExec" + Return="ignore" + Execute="deferred" + Impersonate="no" /> <CustomAction Id="fcgiconfigJSFastCGIremoveCmd" Property="fcgiconfigJSFastCGIremove" - Value=""cscript" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -remove -section:"PHP"" /> + Value=""\\localhost\admin$\system32\cscript.exe" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -remove -section:"PHP"" /> <CustomAction Id="fcgiconfigJSFastCGIremove" BinaryKey="WixCA" DllEntry="CAQuietExec" Return="ignore" Execute="deferred" Impersonate="no" /> + <CustomAction Id="fcgiconfigJSFastCGIremoveCmdXP" + Property="fcgiconfigJSFastCGIremoveXP" + Value=""cscript" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -remove -section:"PHP"" /> + <CustomAction Id="fcgiconfigJSFastCGIremoveXP" + BinaryKey="WixCA" + DllEntry="CAQuietExec" + Return="ignore" + Execute="deferred" + Impersonate="no" /> <CustomAction Id="configIIS4" BinaryKey="PHPInstallerScripts" Return="check" @@ -752,31 +788,55 @@ <![CDATA[VersionNT >= 600 AND &iis4FastCGI = 2]]> </Custom> <Custom Action="fcgiconfigJSFastCGICmd" After="InstallInitialize"> - <![CDATA[((VersionNT = 501 AND ServicePackLevel >= 2) OR (VersionNT = 502 AND ServicePackLevel >= 2)) AND &iis4FastCGI = 3]]> + <![CDATA[(VersionNT = 502 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> </Custom> <Custom Action="fcgiconfigJSFastCGI" After="fcgiconfigJSFastCGICmd"> - <![CDATA[((VersionNT = 501 AND ServicePackLevel >= 2) OR (VersionNT = 502 AND ServicePackLevel >= 2)) AND &iis4FastCGI = 3]]> + <![CDATA[(VersionNT = 502 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> </Custom> <Custom Action="fcgiconfigJSFastCGISetInstanceMaxRequestsCmd" After="fcgiconfigJSFastCGI"> - <![CDATA[((VersionNT = 501 AND ServicePackLevel >= 2) OR (VersionNT = 502 AND ServicePackLevel >= 2)) AND &iis4FastCGI = 3]]> + <![CDATA[(VersionNT = 502 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> </Custom> <Custom Action="fcgiconfigJSFastCGISetInstanceMaxRequests" After="fcgiconfigJSFastCGISetInstanceMaxRequestsCmd"> - <![CDATA[((VersionNT = 501 AND ServicePackLevel >= 2) OR (VersionNT = 502 AND ServicePackLevel >= 2)) AND &iis4FastCGI = 3]]> + <![CDATA[(VersionNT = 502 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> </Custom> <Custom Action="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSCmd" After="fcgiconfigJSFastCGISetInstanceMaxRequests"> - <![CDATA[((VersionNT = 501 AND ServicePackLevel >= 2) OR (VersionNT = 502 AND ServicePackLevel >= 2)) AND &iis4FastCGI = 3]]> + <![CDATA[(VersionNT = 502 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> </Custom> <Custom Action="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTS" After="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSCmd"> - <![CDATA[((VersionNT = 501 AND ServicePackLevel >= 2) OR (VersionNT = 502 AND ServicePackLevel >= 2)) AND &iis4FastCGI = 3]]> + <![CDATA[(VersionNT = 502 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> </Custom> - <Custom Action="configIIS4" After="InstallFinalize"> - <![CDATA[VersionNT < 600 AND &iis4FastCGI = 3]]> + <Custom Action="fcgiconfigJSFastCGICmdXP" After="InstallInitialize"> + <![CDATA[(VersionNT = 501 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="fcgiconfigJSFastCGIXP" After="fcgiconfigJSFastCGICmdXP"> + <![CDATA[(VersionNT = 501 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="fcgiconfigJSFastCGISetInstanceMaxRequestsCmdXP" After="fcgiconfigJSFastCGIXP"> + <![CDATA[(VersionNT = 501 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="fcgiconfigJSFastCGISetInstanceMaxRequestsXP" After="fcgiconfigJSFastCGISetInstanceMaxRequestsCmdXP"> + <![CDATA[(VersionNT = 501 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSCmdXP" After="fcgiconfigJSFastCGISetInstanceMaxRequestsXP"> + <![CDATA[(VersionNT = 501 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSXP" After="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSCmdXP"> + <![CDATA[(VersionNT = 501 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> </Custom> <Custom Action="fcgiconfigJSFastCGIremoveCmd" After="InstallInitialize"> - <![CDATA[((VersionNT = 501 AND ServicePackLevel >= 2) OR (VersionNT = 502 AND ServicePackLevel >= 2)) AND &iis4FastCGI = 2]]> + <![CDATA[(VersionNT = 502 AND ServicePackLevel >= 2) AND &iis4FastCGI = 2]]> </Custom> <Custom Action="fcgiconfigJSFastCGIremove" After="fcgiconfigJSFastCGIremoveCmd"> - <![CDATA[((VersionNT = 501 AND ServicePackLevel >= 2) OR (VersionNT = 502 AND ServicePackLevel >= 2)) AND &iis4FastCGI = 2]]> + <![CDATA[(VersionNT = 502 AND ServicePackLevel >= 2) AND &iis4FastCGI = 2]]> + </Custom> + <Custom Action="fcgiconfigJSFastCGIremoveCmdXP" After="InstallInitialize"> + <![CDATA[(VersionNT = 501 AND ServicePackLevel >= 2) AND &iis4FastCGI = 2]]> + </Custom> + <Custom Action="fcgiconfigJSFastCGIremoveXP" After="fcgiconfigJSFastCGIremoveCmdXP"> + <![CDATA[(VersionNT = 501 AND ServicePackLevel >= 2) AND &iis4FastCGI = 2]]> + </Custom> + <Custom Action="configIIS4" After="InstallFinalize"> + <![CDATA[VersionNT < 600 AND &iis4FastCGI = 3]]> </Custom> <Custom Action="unconfigIIS4" After="fcgiconfigJSFastCGIremove"> <![CDATA[VersionNT < 600 AND &iis4FastCGI = 2]]> http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase52NTS.wxs?r1=1.14&r2=1.15&diff_format=u Index: win-installer/PHPInstallerBase52NTS.wxs diff -u win-installer/PHPInstallerBase52NTS.wxs:1.14 win-installer/PHPInstallerBase52NTS.wxs:1.15 --- win-installer/PHPInstallerBase52NTS.wxs:1.14 Thu Jan 29 19:03:28 2009 +++ win-installer/PHPInstallerBase52NTS.wxs Wed Feb 4 18:43:59 2009 @@ -25,16 +25,14 @@ Minimum='5.2.0' /> </Upgrade> - <Binary Id="WixCA" src="Wix\WixCA.dll" /> - <Condition - Message="You need to be an administrator to install PHP using this installer."> + Message="You need to be an administrator to install PHP using this installer."> <![CDATA[Privileged OR (AdminUser AND VersionNT >= 600]]> </Condition> <Condition - Message="PHP requires Windows NT/2000/XP/2003 or later to install"> - <![CDATA[( VersionNT < 400 ) OR ( Version9x <> 0 )]]> + Message="PHP requires Windows NT/2000/XP/2003/Vista/2008 or later to install"> + <![CDATA[( VersionNT < 400 ) OR ( Version9x <> 0 )]]> </Condition> <Media Id="1" @@ -55,13 +53,13 @@ </Property> <Property Id="FASTCGI60MODULEINSTALLED"> - <RegistrySearch - Id="fastcgi60Registry" - Root="HKLM" - Key="SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{E136BB09-1BB2-49A0-9FF3-5C25564D3819}" - Type="raw" - Name="Version" - Win64="yes"/> + <DirectorySearch Id="InetsrvDir" + Path="[WindowsFolder]system32\inetsrv" + Depth="0"> + <FileSearch + Id="FcgiExtFile" + Name="fcgiext.dll"/> + </DirectorySearch> </Property> <Property Id="FASTCGI70MODULEINSTALLED"> <RegistrySearch @@ -75,14 +73,14 @@ <CustomAction Id='CheckFASTCGIINSTALLED' Property='FASTCGIINSTALLED' Value='1' /> <CustomAction Id='CheckFASTCGINOTINSTALLED' Property='FASTCGIINSTALLED' Value='0' /> <InstallUISequence> - <Custom Action="CheckFASTCGIINSTALLED" After="CostInitialize"> - <![CDATA[FASTCGI60MODULEINSTALLED OR FASTCGI70MODULEINSTALLED]]> - </Custom> - <Custom Action="CheckFASTCGINOTINSTALLED" After="CostInitialize"> - <![CDATA[NOT FASTCGI60MODULEINSTALLED AND NOT FASTCGI70MODULEINSTALLED]]> - </Custom> + <Custom Action="CheckFASTCGIINSTALLED" After="CostInitialize"> + <![CDATA[FASTCGI60MODULEINSTALLED OR FASTCGI70MODULEINSTALLED]]> + </Custom> + <Custom Action="CheckFASTCGINOTINSTALLED" After="CostInitialize"> + <![CDATA[NOT FASTCGI60MODULEINSTALLED AND NOT FASTCGI70MODULEINSTALLED]]> + </Custom> </InstallUISequence> - + <Property Id="APACHEREGDIR"> <RegistrySearch Id="apacheRegistry" Root="HKLM" @@ -508,40 +506,76 @@ Impersonate="no" /> <CustomAction Id="fcgiconfigJSFastCGICmd" Property="fcgiconfigJSFastCGI" - Value=""cscript" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -add -section:"PHP" -extension:php -path:"[INSTALLDIR]php-cgi.exe"" /> + Value=""\\localhost\admin$\system32\cscript.exe" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -add -section:"PHP" -extension:php -path:"[INSTALLDIR]php-cgi.exe"" /> <CustomAction Id="fcgiconfigJSFastCGI" BinaryKey="WixCA" DllEntry="CAQuietExec" Return="ignore" Execute="deferred" Impersonate="no" /> + <CustomAction Id="fcgiconfigJSFastCGICmdXP" + Property="fcgiconfigJSFastCGIXP" + Value=""cscript" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -add -section:"PHP" -extension:php -path:"[INSTALLDIR]php-cgi.exe"" /> + <CustomAction Id="fcgiconfigJSFastCGIXP" + BinaryKey="WixCA" + DllEntry="CAQuietExec" + Return="ignore" + Execute="deferred" + Impersonate="no" /> <CustomAction Id="fcgiconfigJSFastCGISetInstanceMaxRequestsCmd" Property="fcgiconfigJSFastCGISetInstanceMaxRequests" - Value=""cscript" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -InstanceMaxRequests:10000" /> + Value=""\\localhost\admin$\system32\cscript.exe" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -InstanceMaxRequests:10000" /> <CustomAction Id="fcgiconfigJSFastCGISetInstanceMaxRequests" BinaryKey="WixCA" DllEntry="CAQuietExec" Return="ignore" Execute="deferred" Impersonate="no" /> + <CustomAction Id="fcgiconfigJSFastCGISetInstanceMaxRequestsCmdXP" + Property="fcgiconfigJSFastCGISetInstanceMaxRequestsXP" + Value=""cscript" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -InstanceMaxRequests:10000" /> + <CustomAction Id="fcgiconfigJSFastCGISetInstanceMaxRequestsXP" + BinaryKey="WixCA" + DllEntry="CAQuietExec" + Return="ignore" + Execute="deferred" + Impersonate="no" /> <CustomAction Id="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSCmd" Property="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTS" - Value=""cscript" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -EnvironmentVars:PHP_FCGI_MAX_REQUESTS:10000,PHPRC:"[INSTALLDIR]"" /> + Value=""\\localhost\admin$\system32\cscript.exe" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -EnvironmentVars:PHP_FCGI_MAX_REQUESTS:10000,PHPRC:"[INSTALLDIR]"" /> <CustomAction Id="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTS" BinaryKey="WixCA" DllEntry="CAQuietExec" Return="ignore" Execute="deferred" Impersonate="no" /> + <CustomAction Id="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSCmdXP" + Property="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSXP" + Value=""cscript" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -EnvironmentVars:PHP_FCGI_MAX_REQUESTS:10000,PHPRC:"[INSTALLDIR]"" /> + <CustomAction Id="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSXP" + BinaryKey="WixCA" + DllEntry="CAQuietExec" + Return="ignore" + Execute="deferred" + Impersonate="no" /> <CustomAction Id="fcgiconfigJSFastCGIremoveCmd" Property="fcgiconfigJSFastCGIremove" - Value=""cscript" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -remove -section:"PHP"" /> + Value=""\\localhost\admin$\system32\cscript.exe" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -remove -section:"PHP"" /> <CustomAction Id="fcgiconfigJSFastCGIremove" BinaryKey="WixCA" DllEntry="CAQuietExec" Return="ignore" Execute="deferred" Impersonate="no" /> + <CustomAction Id="fcgiconfigJSFastCGIremoveCmdXP" + Property="fcgiconfigJSFastCGIremoveXP" + Value=""cscript" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -remove -section:"PHP"" /> + <CustomAction Id="fcgiconfigJSFastCGIremoveXP" + BinaryKey="WixCA" + DllEntry="CAQuietExec" + Return="ignore" + Execute="deferred" + Impersonate="no" /> <CustomAction Id="configIIS4" BinaryKey="PHPInstallerScripts" Return="check" @@ -595,34 +629,52 @@ <![CDATA[VersionNT >= 600 AND &iis4FastCGI = 2]]> </Custom> <Custom Action="fcgiconfigJSFastCGICmd" After="InstallInitialize"> - <![CDATA[((VersionNT = 501 AND ServicePackLevel >= 2) OR (VersionNT = 502 AND ServicePackLevel >= 2)) AND &iis4FastCGI = 3]]> + <![CDATA[(VersionNT = 502 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> </Custom> <Custom Action="fcgiconfigJSFastCGI" After="fcgiconfigJSFastCGICmd"> - <![CDATA[((VersionNT = 501 AND ServicePackLevel >= 2) OR (VersionNT = 502 AND ServicePackLevel >= 2)) AND &iis4FastCGI = 3]]> + <![CDATA[(VersionNT = 502 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> </Custom> <Custom Action="fcgiconfigJSFastCGISetInstanceMaxRequestsCmd" After="fcgiconfigJSFastCGI"> - <![CDATA[((VersionNT = 501 AND ServicePackLevel >= 2) OR (VersionNT = 502 AND ServicePackLevel >= 2)) AND &iis4FastCGI = 3]]> + <![CDATA[(VersionNT = 502 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> </Custom> <Custom Action="fcgiconfigJSFastCGISetInstanceMaxRequests" After="fcgiconfigJSFastCGISetInstanceMaxRequestsCmd"> - <![CDATA[((VersionNT = 501 AND ServicePackLevel >= 2) OR (VersionNT = 502 AND ServicePackLevel >= 2)) AND &iis4FastCGI = 3]]> + <![CDATA[(VersionNT = 502 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> </Custom> <Custom Action="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSCmd" After="fcgiconfigJSFastCGISetInstanceMaxRequests"> - <![CDATA[((VersionNT = 501 AND ServicePackLevel >= 2) OR (VersionNT = 502 AND ServicePackLevel >= 2)) AND &iis4FastCGI = 3]]> + <![CDATA[(VersionNT = 502 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> </Custom> <Custom Action="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTS" After="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSCmd"> - <![CDATA[((VersionNT = 501 AND ServicePackLevel >= 2) OR (VersionNT = 502 AND ServicePackLevel >= 2)) AND &iis4FastCGI = 3]]> + <![CDATA[(VersionNT = 502 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="fcgiconfigJSFastCGICmdXP" After="InstallInitialize"> + <![CDATA[(VersionNT = 501 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="fcgiconfigJSFastCGIXP" After="fcgiconfigJSFastCGICmdXP"> + <![CDATA[(VersionNT = 501 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> </Custom> - <Custom Action="configIIS4" After="InstallFinalize"> - <![CDATA[VersionNT < 600 AND &iis4FastCGI = 3]]> + <Custom Action="fcgiconfigJSFastCGISetInstanceMaxRequestsCmdXP" After="fcgiconfigJSFastCGIXP"> + <![CDATA[(VersionNT = 501 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="fcgiconfigJSFastCGISetInstanceMaxRequestsXP" After="fcgiconfigJSFastCGISetInstanceMaxRequestsCmdXP"> + <![CDATA[(VersionNT = 501 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSCmdXP" After="fcgiconfigJSFastCGISetInstanceMaxRequestsXP"> + <![CDATA[(VersionNT = 501 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSXP" After="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSCmdXP"> + <![CDATA[(VersionNT = 501 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> </Custom> <Custom Action="fcgiconfigJSFastCGIremoveCmd" After="InstallInitialize"> - <![CDATA[((VersionNT = 501 AND ServicePackLevel >= 2) OR (VersionNT = 502 AND ServicePackLevel >= 2)) AND &iis4FastCGI = 2]]> + <![CDATA[(VersionNT = 502 AND ServicePackLevel >= 2) AND &iis4FastCGI = 2]]> </Custom> <Custom Action="fcgiconfigJSFastCGIremove" After="fcgiconfigJSFastCGIremoveCmd"> - <![CDATA[((VersionNT = 501 AND ServicePackLevel >= 2) OR (VersionNT = 502 AND ServicePackLevel >= 2)) AND &iis4FastCGI = 2]]> + <![CDATA[(VersionNT = 502 AND ServicePackLevel >= 2) AND &iis4FastCGI = 2]]> + </Custom> + <Custom Action="fcgiconfigJSFastCGIremoveCmdXP" After="InstallInitialize"> + <![CDATA[(VersionNT = 501 AND ServicePackLevel >= 2) AND &iis4FastCGI = 2]]> </Custom> - <Custom Action="unconfigIIS4" After="fcgiconfigJSFastCGIremove"> - <![CDATA[VersionNT < 600 AND &iis4FastCGI = 2]]> + <Custom Action="fcgiconfigJSFastCGIremoveXP" After="fcgiconfigJSFastCGIremoveCmdXP"> + <![CDATA[(VersionNT = 501 AND ServicePackLevel >= 2) AND &iis4FastCGI = 2]]> </Custom> <RemoveExistingProducts After="InstallValidate" /> </InstallExecuteSequence> http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase53.wxs?r1=1.14&r2=1.15&diff_format=u Index: win-installer/PHPInstallerBase53.wxs diff -u win-installer/PHPInstallerBase53.wxs:1.14 win-installer/PHPInstallerBase53.wxs:1.15 --- win-installer/PHPInstallerBase53.wxs:1.14 Thu Jan 29 19:03:29 2009 +++ win-installer/PHPInstallerBase53.wxs Wed Feb 4 18:43:59 2009 @@ -31,8 +31,8 @@ </Condition> <Condition - Message="PHP requires Windows NT/2000/XP/2003 or later to install"> - <![CDATA[( VersionNT < 400 ) OR ( Version9x <> 0 )]]> + Message="PHP requires Windows 2000/XP/2003/Vista/2008 or later to install"> + <![CDATA[( VersionNT <= 500 ) OR ( Version9x <> 0 )]]> </Condition> <Media Id="1" @@ -75,13 +75,13 @@ </Property> <Property Id="FASTCGI60MODULEINSTALLED"> - <RegistrySearch - Id="fastcgi60Registry" - Root="HKLM" - Key="SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{E136BB09-1BB2-49A0-9FF3-5C25564D3819}" - Type="raw" - Name="Version" - Win64="yes"/> + <DirectorySearch Id="InetsrvDir" + Path="[WindowsFolder]system32\inetsrv" + Depth="0"> + <FileSearch + Id="FcgiExtFile" + Name="fcgiext.dll"/> + </DirectorySearch> </Property> <Property Id="FASTCGI70MODULEINSTALLED"> <RegistrySearch @@ -453,7 +453,7 @@ Title="$(loc.FeaturensapiTitle)" Description="$(loc.FeaturensapiDescription)" Level="10"> - <ComponentRef Id="phpcgiEXE"/> + <ComponentRef Id="phpcgiEXE"/> <ComponentRef Id="nsapiregistry"/> </Feature> <Feature AllowAdvertise="no" @@ -610,40 +610,76 @@ Impersonate="no" /> <CustomAction Id="fcgiconfigJSFastCGICmd" Property="fcgiconfigJSFastCGI" - Value=""cscript" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -add -section:"PHP" -extension:php -path:"[INSTALLDIR]php-cgi.exe"" /> + Value=""\\localhost\admin$\system32\cscript.exe" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -add -section:"PHP" -extension:php -path:"[INSTALLDIR]php-cgi.exe"" /> <CustomAction Id="fcgiconfigJSFastCGI" BinaryKey="WixCA" DllEntry="CAQuietExec" Return="ignore" Execute="deferred" Impersonate="no" /> + <CustomAction Id="fcgiconfigJSFastCGICmdXP" + Property="fcgiconfigJSFastCGIXP" + Value=""cscript" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -add -section:"PHP" -extension:php -path:"[INSTALLDIR]php-cgi.exe"" /> + <CustomAction Id="fcgiconfigJSFastCGIXP" + BinaryKey="WixCA" + DllEntry="CAQuietExec" + Return="ignore" + Execute="deferred" + Impersonate="no" /> <CustomAction Id="fcgiconfigJSFastCGISetInstanceMaxRequestsCmd" Property="fcgiconfigJSFastCGISetInstanceMaxRequests" - Value=""cscript" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -InstanceMaxRequests:10000" /> + Value=""\\localhost\admin$\system32\cscript.exe" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -InstanceMaxRequests:10000" /> <CustomAction Id="fcgiconfigJSFastCGISetInstanceMaxRequests" BinaryKey="WixCA" DllEntry="CAQuietExec" Return="ignore" Execute="deferred" Impersonate="no" /> + <CustomAction Id="fcgiconfigJSFastCGISetInstanceMaxRequestsCmdXP" + Property="fcgiconfigJSFastCGISetInstanceMaxRequestsXP" + Value=""cscript" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -InstanceMaxRequests:10000" /> + <CustomAction Id="fcgiconfigJSFastCGISetInstanceMaxRequestsXP" + BinaryKey="WixCA" + DllEntry="CAQuietExec" + Return="ignore" + Execute="deferred" + Impersonate="no" /> <CustomAction Id="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSCmd" Property="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTS" - Value=""cscript" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -EnvironmentVars:PHP_FCGI_MAX_REQUESTS:10000,PHPRC:"[INSTALLDIR]"" /> + Value=""\\localhost\admin$\system32\cscript.exe" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -EnvironmentVars:PHP_FCGI_MAX_REQUESTS:10000,PHPRC:"[INSTALLDIR]"" /> <CustomAction Id="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTS" BinaryKey="WixCA" DllEntry="CAQuietExec" Return="ignore" Execute="deferred" Impersonate="no" /> + <CustomAction Id="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSCmdXP" + Property="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSXP" + Value=""cscript" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -EnvironmentVars:PHP_FCGI_MAX_REQUESTS:10000,PHPRC:"[INSTALLDIR]"" /> + <CustomAction Id="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSXP" + BinaryKey="WixCA" + DllEntry="CAQuietExec" + Return="ignore" + Execute="deferred" + Impersonate="no" /> <CustomAction Id="fcgiconfigJSFastCGIremoveCmd" Property="fcgiconfigJSFastCGIremove" - Value=""cscript" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -remove -section:"PHP"" /> + Value=""\\localhost\admin$\system32\cscript.exe" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -remove -section:"PHP"" /> <CustomAction Id="fcgiconfigJSFastCGIremove" BinaryKey="WixCA" DllEntry="CAQuietExec" Return="ignore" Execute="deferred" Impersonate="no" /> + <CustomAction Id="fcgiconfigJSFastCGIremoveCmdXP" + Property="fcgiconfigJSFastCGIremoveXP" + Value=""cscript" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -remove -section:"PHP"" /> + <CustomAction Id="fcgiconfigJSFastCGIremoveXP" + BinaryKey="WixCA" + DllEntry="CAQuietExec" + Return="ignore" + Execute="deferred" + Impersonate="no" /> <CustomAction Id="configIIS4" BinaryKey="PHPInstallerScripts" Return="check" @@ -723,31 +759,55 @@ <![CDATA[VersionNT >= 600 AND &iis4FastCGI = 2]]> </Custom> <Custom Action="fcgiconfigJSFastCGICmd" After="InstallInitialize"> - <![CDATA[((VersionNT = 501 AND ServicePackLevel >= 2) OR (VersionNT = 502 AND ServicePackLevel >= 2)) AND &iis4FastCGI = 3]]> + <![CDATA[(VersionNT = 502 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> </Custom> <Custom Action="fcgiconfigJSFastCGI" After="fcgiconfigJSFastCGICmd"> - <![CDATA[((VersionNT = 501 AND ServicePackLevel >= 2) OR (VersionNT = 502 AND ServicePackLevel >= 2)) AND &iis4FastCGI = 3]]> + <![CDATA[(VersionNT = 502 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> </Custom> <Custom Action="fcgiconfigJSFastCGISetInstanceMaxRequestsCmd" After="fcgiconfigJSFastCGI"> - <![CDATA[((VersionNT = 501 AND ServicePackLevel >= 2) OR (VersionNT = 502 AND ServicePackLevel >= 2)) AND &iis4FastCGI = 3]]> + <![CDATA[(VersionNT = 502 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> </Custom> <Custom Action="fcgiconfigJSFastCGISetInstanceMaxRequests" After="fcgiconfigJSFastCGISetInstanceMaxRequestsCmd"> - <![CDATA[((VersionNT = 501 AND ServicePackLevel >= 2) OR (VersionNT = 502 AND ServicePackLevel >= 2)) AND &iis4FastCGI = 3]]> + <![CDATA[(VersionNT = 502 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> </Custom> <Custom Action="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSCmd" After="fcgiconfigJSFastCGISetInstanceMaxRequests"> - <![CDATA[((VersionNT = 501 AND ServicePackLevel >= 2) OR (VersionNT = 502 AND ServicePackLevel >= 2)) AND &iis4FastCGI = 3]]> + <![CDATA[(VersionNT = 502 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> </Custom> <Custom Action="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTS" After="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSCmd"> - <![CDATA[((VersionNT = 501 AND ServicePackLevel >= 2) OR (VersionNT = 502 AND ServicePackLevel >= 2)) AND &iis4FastCGI = 3]]> + <![CDATA[(VersionNT = 502 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> </Custom> - <Custom Action="configIIS4" After="InstallFinalize"> - <![CDATA[VersionNT < 600 AND &iis4FastCGI = 3]]> + <Custom Action="fcgiconfigJSFastCGICmdXP" After="InstallInitialize"> + <![CDATA[(VersionNT = 501 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="fcgiconfigJSFastCGIXP" After="fcgiconfigJSFastCGICmdXP"> + <![CDATA[(VersionNT = 501 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="fcgiconfigJSFastCGISetInstanceMaxRequestsCmdXP" After="fcgiconfigJSFastCGIXP"> + <![CDATA[(VersionNT = 501 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="fcgiconfigJSFastCGISetInstanceMaxRequestsXP" After="fcgiconfigJSFastCGISetInstanceMaxRequestsCmdXP"> + <![CDATA[(VersionNT = 501 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSCmdXP" After="fcgiconfigJSFastCGISetInstanceMaxRequestsXP"> + <![CDATA[(VersionNT = 501 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSXP" After="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSCmdXP"> + <![CDATA[(VersionNT = 501 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> </Custom> <Custom Action="fcgiconfigJSFastCGIremoveCmd" After="InstallInitialize"> - <![CDATA[((VersionNT = 501 AND ServicePackLevel >= 2) OR (VersionNT = 502 AND ServicePackLevel >= 2)) AND &iis4FastCGI = 2]]> + <![CDATA[(VersionNT = 502 AND ServicePackLevel >= 2) AND &iis4FastCGI = 2]]> </Custom> <Custom Action="fcgiconfigJSFastCGIremove" After="fcgiconfigJSFastCGIremoveCmd"> - <![CDATA[((VersionNT = 501 AND ServicePackLevel >= 2) OR (VersionNT = 502 AND ServicePackLevel >= 2)) AND &iis4FastCGI = 2]]> + <![CDATA[(VersionNT = 502 AND ServicePackLevel >= 2) AND &iis4FastCGI = 2]]> + </Custom> + <Custom Action="fcgiconfigJSFastCGIremoveCmdXP" After="InstallInitialize"> + <![CDATA[(VersionNT = 501 AND ServicePackLevel >= 2) AND &iis4FastCGI = 2]]> + </Custom> + <Custom Action="fcgiconfigJSFastCGIremoveXP" After="fcgiconfigJSFastCGIremoveCmdXP"> + <![CDATA[(VersionNT = 501 AND ServicePackLevel >= 2) AND &iis4FastCGI = 2]]> + </Custom> + <Custom Action="configIIS4" After="InstallFinalize"> + <![CDATA[VersionNT < 600 AND &iis4FastCGI = 3]]> </Custom> <Custom Action="unconfigIIS4" After="fcgiconfigJSFastCGIremove"> <![CDATA[VersionNT < 600 AND &iis4FastCGI = 2]]> http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase53NTS.wxs?r1=1.13&r2=1.14&diff_format=u Index: win-installer/PHPInstallerBase53NTS.wxs diff -u win-installer/PHPInstallerBase53NTS.wxs:1.13 win-installer/PHPInstallerBase53NTS.wxs:1.14 --- win-installer/PHPInstallerBase53NTS.wxs:1.13 Thu Jan 29 19:03:29 2009 +++ win-installer/PHPInstallerBase53NTS.wxs Wed Feb 4 18:43:59 2009 @@ -31,8 +31,8 @@ </Condition> <Condition - Message="PHP requires Windows NT/2000/XP/2003 or later to install"> - <![CDATA[( VersionNT < 400 ) OR ( Version9x <> 0 )]]> + Message="PHP requires Windows 2000/XP/2003/Vista/2008 or later to install"> + <![CDATA[( VersionNT <= 500 ) OR ( Version9x <> 0 )]]> </Condition> <Media Id="1" @@ -53,34 +53,34 @@ </Property> <Property Id="FASTCGI60MODULEINSTALLED"> - <RegistrySearch - Id="fastcgi60Registry" - Root="HKLM" - Key="SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{E136BB09-1BB2-49A0-9FF3-5C25564D3819}" - Type="raw" - Name="Version" - Win64="yes"/> - </Property> - <Property Id="FASTCGI70MODULEINSTALLED"> - <RegistrySearch + <DirectorySearch Id="InetsrvDir" + Path="[WindowsFolder]system32\inetsrv" + Depth="0"> + <FileSearch + Id="FcgiExtFile" + Name="fcgiext.dll"/> + </DirectorySearch> + </Property> + <Property Id="FASTCGI70MODULEINSTALLED"> + <RegistrySearch Id="fastcgi70Registry" Root="HKLM" Key="SOFTWARE\Microsoft\InetStp\Components" Type="raw" Name="FastCgi" Win64="yes"/> - </Property> - <CustomAction Id='CheckFASTCGIINSTALLED' Property='FASTCGIINSTALLED' Value='1' /> - <CustomAction Id='CheckFASTCGINOTINSTALLED' Property='FASTCGIINSTALLED' Value='0' /> - <InstallUISequence> - <Custom Action="CheckFASTCGIINSTALLED" After="CostInitialize"> - <![CDATA[FASTCGI60MODULEINSTALLED OR FASTCGI70MODULEINSTALLED]]> - </Custom> - <Custom Action="CheckFASTCGINOTINSTALLED" After="CostInitialize"> - <![CDATA[NOT FASTCGI60MODULEINSTALLED AND NOT FASTCGI70MODULEINSTALLED]]> - </Custom> + </Property> + <CustomAction Id='CheckFASTCGIINSTALLED' Property='FASTCGIINSTALLED' Value='1' /> + <CustomAction Id='CheckFASTCGINOTINSTALLED' Property='FASTCGIINSTALLED' Value='0' /> + <InstallUISequence> + <Custom Action="CheckFASTCGIINSTALLED" After="CostInitialize"> + <![CDATA[FASTCGI60MODULEINSTALLED OR FASTCGI70MODULEINSTALLED]]> + </Custom> + <Custom Action="CheckFASTCGINOTINSTALLED" After="CostInitialize"> + <![CDATA[NOT FASTCGI60MODULEINSTALLED AND NOT FASTCGI70MODULEINSTALLED]]> + </Custom> </InstallUISequence> - + <Property Id="APACHEREGDIR"> <RegistrySearch Id="apacheRegistry" Root="HKLM" @@ -477,40 +477,76 @@ Impersonate="no" /> <CustomAction Id="fcgiconfigJSFastCGICmd" Property="fcgiconfigJSFastCGI" - Value=""cscript" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -add -section:"PHP" -extension:php -path:"[INSTALLDIR]php-cgi.exe"" /> + Value=""\\localhost\admin$\system32\cscript.exe" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -add -section:"PHP" -extension:php -path:"[INSTALLDIR]php-cgi.exe"" /> <CustomAction Id="fcgiconfigJSFastCGI" BinaryKey="WixCA" DllEntry="CAQuietExec" Return="ignore" Execute="deferred" Impersonate="no" /> + <CustomAction Id="fcgiconfigJSFastCGICmdXP" + Property="fcgiconfigJSFastCGIXP" + Value=""cscript" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -add -section:"PHP" -extension:php -path:"[INSTALLDIR]php-cgi.exe"" /> + <CustomAction Id="fcgiconfigJSFastCGIXP" + BinaryKey="WixCA" + DllEntry="CAQuietExec" + Return="ignore" + Execute="deferred" + Impersonate="no" /> <CustomAction Id="fcgiconfigJSFastCGISetInstanceMaxRequestsCmd" Property="fcgiconfigJSFastCGISetInstanceMaxRequests" - Value=""cscript" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -InstanceMaxRequests:10000" /> + Value=""\\localhost\admin$\system32\cscript.exe" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -InstanceMaxRequests:10000" /> <CustomAction Id="fcgiconfigJSFastCGISetInstanceMaxRequests" BinaryKey="WixCA" DllEntry="CAQuietExec" Return="ignore" Execute="deferred" Impersonate="no" /> + <CustomAction Id="fcgiconfigJSFastCGISetInstanceMaxRequestsCmdXP" + Property="fcgiconfigJSFastCGISetInstanceMaxRequestsXP" + Value=""cscript" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -InstanceMaxRequests:10000" /> + <CustomAction Id="fcgiconfigJSFastCGISetInstanceMaxRequestsXP" + BinaryKey="WixCA" + DllEntry="CAQuietExec" + Return="ignore" + Execute="deferred" + Impersonate="no" /> <CustomAction Id="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSCmd" Property="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTS" - Value=""cscript" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -EnvironmentVars:PHP_FCGI_MAX_REQUESTS:10000,PHPRC:"[INSTALLDIR]"" /> + Value=""\\localhost\admin$\system32\cscript.exe" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -EnvironmentVars:PHP_FCGI_MAX_REQUESTS:10000,PHPRC:"[INSTALLDIR]"" /> <CustomAction Id="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTS" BinaryKey="WixCA" DllEntry="CAQuietExec" Return="ignore" Execute="deferred" Impersonate="no" /> + <CustomAction Id="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSCmdXP" + Property="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSXP" + Value=""cscript" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -EnvironmentVars:PHP_FCGI_MAX_REQUESTS:10000,PHPRC:"[INSTALLDIR]"" /> + <CustomAction Id="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSXP" + BinaryKey="WixCA" + DllEntry="CAQuietExec" + Return="ignore" + Execute="deferred" + Impersonate="no" /> <CustomAction Id="fcgiconfigJSFastCGIremoveCmd" Property="fcgiconfigJSFastCGIremove" - Value=""cscript" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -remove -section:"PHP"" /> + Value=""\\localhost\admin$\system32\cscript.exe" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -remove -section:"PHP"" /> <CustomAction Id="fcgiconfigJSFastCGIremove" BinaryKey="WixCA" DllEntry="CAQuietExec" Return="ignore" Execute="deferred" Impersonate="no" /> + <CustomAction Id="fcgiconfigJSFastCGIremoveCmdXP" + Property="fcgiconfigJSFastCGIremoveXP" + Value=""cscript" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -remove -section:"PHP"" /> + <CustomAction Id="fcgiconfigJSFastCGIremoveXP" + BinaryKey="WixCA" + DllEntry="CAQuietExec" + Return="ignore" + Execute="deferred" + Impersonate="no" /> <CustomAction Id="configIIS4" BinaryKey="PHPInstallerScripts" Return="check" @@ -564,34 +600,52 @@ <![CDATA[VersionNT >= 600 AND &iis4FastCGI = 2]]> </Custom> <Custom Action="fcgiconfigJSFastCGICmd" After="InstallInitialize"> - <![CDATA[((VersionNT = 501 AND ServicePackLevel >= 2) OR (VersionNT = 502 AND ServicePackLevel >= 2)) AND &iis4FastCGI = 3]]> + <![CDATA[(VersionNT = 502 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> </Custom> <Custom Action="fcgiconfigJSFastCGI" After="fcgiconfigJSFastCGICmd"> - <![CDATA[((VersionNT = 501 AND ServicePackLevel >= 2) OR (VersionNT = 502 AND ServicePackLevel >= 2)) AND &iis4FastCGI = 3]]> + <![CDATA[(VersionNT = 502 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> </Custom> <Custom Action="fcgiconfigJSFastCGISetInstanceMaxRequestsCmd" After="fcgiconfigJSFastCGI"> - <![CDATA[((VersionNT = 501 AND ServicePackLevel >= 2) OR (VersionNT = 502 AND ServicePackLevel >= 2)) AND &iis4FastCGI = 3]]> + <![CDATA[(VersionNT = 502 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> </Custom> <Custom Action="fcgiconfigJSFastCGISetInstanceMaxRequests" After="fcgiconfigJSFastCGISetInstanceMaxRequestsCmd"> - <![CDATA[((VersionNT = 501 AND ServicePackLevel >= 2) OR (VersionNT = 502 AND ServicePackLevel >= 2)) AND &iis4FastCGI = 3]]> + <![CDATA[(VersionNT = 502 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> </Custom> <Custom Action="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSCmd" After="fcgiconfigJSFastCGISetInstanceMaxRequests"> - <![CDATA[((VersionNT = 501 AND ServicePackLevel >= 2) OR (VersionNT = 502 AND ServicePackLevel >= 2)) AND &iis4FastCGI = 3]]> + <![CDATA[(VersionNT = 502 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> </Custom> <Custom Action="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTS" After="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSCmd"> - <![CDATA[((VersionNT = 501 AND ServicePackLevel >= 2) OR (VersionNT = 502 AND ServicePackLevel >= 2)) AND &iis4FastCGI = 3]]> + <![CDATA[(VersionNT = 502 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="fcgiconfigJSFastCGICmdXP" After="InstallInitialize"> + <![CDATA[(VersionNT = 501 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="fcgiconfigJSFastCGIXP" After="fcgiconfigJSFastCGICmdXP"> + <![CDATA[(VersionNT = 501 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> </Custom> - <Custom Action="configIIS4" After="InstallFinalize"> - <![CDATA[VersionNT < 600 AND &iis4FastCGI = 3]]> + <Custom Action="fcgiconfigJSFastCGISetInstanceMaxRequestsCmdXP" After="fcgiconfigJSFastCGIXP"> + <![CDATA[(VersionNT = 501 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="fcgiconfigJSFastCGISetInstanceMaxRequestsXP" After="fcgiconfigJSFastCGISetInstanceMaxRequestsCmdXP"> + <![CDATA[(VersionNT = 501 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSCmdXP" After="fcgiconfigJSFastCGISetInstanceMaxRequestsXP"> + <![CDATA[(VersionNT = 501 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSXP" After="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSCmdXP"> + <![CDATA[(VersionNT = 501 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> </Custom> <Custom Action="fcgiconfigJSFastCGIremoveCmd" After="InstallInitialize"> - <![CDATA[((VersionNT = 501 AND ServicePackLevel >= 2) OR (VersionNT = 502 AND ServicePackLevel >= 2)) AND &iis4FastCGI = 2]]> + <![CDATA[(VersionNT = 502 AND ServicePackLevel >= 2) AND &iis4FastCGI = 2]]> </Custom> <Custom Action="fcgiconfigJSFastCGIremove" After="fcgiconfigJSFastCGIremoveCmd"> - <![CDATA[((VersionNT = 501 AND ServicePackLevel >= 2) OR (VersionNT = 502 AND ServicePackLevel >= 2)) AND &iis4FastCGI = 2]]> + <![CDATA[(VersionNT = 502 AND ServicePackLevel >= 2) AND &iis4FastCGI = 2]]> + </Custom> + <Custom Action="fcgiconfigJSFastCGIremoveCmdXP" After="InstallInitialize"> + <![CDATA[(VersionNT = 501 AND ServicePackLevel >= 2) AND &iis4FastCGI = 2]]> </Custom> - <Custom Action="unconfigIIS4" After="fcgiconfigJSFastCGIremove"> - <![CDATA[VersionNT < 600 AND &iis4FastCGI = 2]]> + <Custom Action="fcgiconfigJSFastCGIremoveXP" After="fcgiconfigJSFastCGIremoveCmdXP"> + <![CDATA[(VersionNT = 501 AND ServicePackLevel >= 2) AND &iis4FastCGI = 2]]> </Custom> <RemoveExistingProducts After="InstallValidate" /> </InstallExecuteSequence> http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase60.wxs?r1=1.28&r2=1.29&diff_format=u Index: win-installer/PHPInstallerBase60.wxs diff -u win-installer/PHPInstallerBase60.wxs:1.28 win-installer/PHPInstallerBase60.wxs:1.29 --- win-installer/PHPInstallerBase60.wxs:1.28 Thu Jan 29 19:03:29 2009 +++ win-installer/PHPInstallerBase60.wxs Wed Feb 4 18:43:59 2009 @@ -31,8 +31,8 @@ </Condition> <Condition - Message="PHP requires Windows NT/2000/XP/2003 or later to install"> - <![CDATA[( VersionNT < 400 ) OR ( Version9x <> 0 )]]> + Message="PHP requires Windows 2000/XP/2003/Vista/2008 or later to install"> + <![CDATA[( VersionNT <= 500 ) OR ( Version9x <> 0 )]]> </Condition> <Media Id="1" @@ -75,13 +75,13 @@ </Property> <Property Id="FASTCGI60MODULEINSTALLED"> - <RegistrySearch - Id="fastcgi60Registry" - Root="HKLM" - Key="SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{E136BB09-1BB2-49A0-9FF3-5C25564D3819}" - Type="raw" - Name="Version" - Win64="yes"/> + <DirectorySearch Id="InetsrvDir" + Path="[WindowsFolder]system32\inetsrv" + Depth="0"> + <FileSearch + Id="FcgiExtFile" + Name="fcgiext.dll"/> + </DirectorySearch> </Property> <Property Id="FASTCGI70MODULEINSTALLED"> <RegistrySearch @@ -453,7 +453,7 @@ Title="$(loc.FeaturensapiTitle)" Description="$(loc.FeaturensapiDescription)" Level="10"> - <ComponentRef Id="phpcgiEXE"/> + <ComponentRef Id="phpcgiEXE"/> <ComponentRef Id="nsapiregistry"/> </Feature> <Feature AllowAdvertise="no" @@ -610,40 +610,76 @@ Impersonate="no" /> <CustomAction Id="fcgiconfigJSFastCGICmd" Property="fcgiconfigJSFastCGI" - Value=""cscript" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -add -section:"PHP" -extension:php -path:"[INSTALLDIR]php-cgi.exe"" /> + Value=""\\localhost\admin$\system32\cscript.exe" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -add -section:"PHP" -extension:php -path:"[INSTALLDIR]php-cgi.exe"" /> <CustomAction Id="fcgiconfigJSFastCGI" BinaryKey="WixCA" DllEntry="CAQuietExec" Return="ignore" Execute="deferred" Impersonate="no" /> + <CustomAction Id="fcgiconfigJSFastCGICmdXP" + Property="fcgiconfigJSFastCGIXP" + Value=""cscript" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -add -section:"PHP" -extension:php -path:"[INSTALLDIR]php-cgi.exe"" /> + <CustomAction Id="fcgiconfigJSFastCGIXP" + BinaryKey="WixCA" + DllEntry="CAQuietExec" + Return="ignore" + Execute="deferred" + Impersonate="no" /> <CustomAction Id="fcgiconfigJSFastCGISetInstanceMaxRequestsCmd" Property="fcgiconfigJSFastCGISetInstanceMaxRequests" - Value=""cscript" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -InstanceMaxRequests:10000" /> + Value=""\\localhost\admin$\system32\cscript.exe" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -InstanceMaxRequests:10000" /> <CustomAction Id="fcgiconfigJSFastCGISetInstanceMaxRequests" BinaryKey="WixCA" DllEntry="CAQuietExec" Return="ignore" Execute="deferred" Impersonate="no" /> + <CustomAction Id="fcgiconfigJSFastCGISetInstanceMaxRequestsCmdXP" + Property="fcgiconfigJSFastCGISetInstanceMaxRequestsXP" + Value=""cscript" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -InstanceMaxRequests:10000" /> + <CustomAction Id="fcgiconfigJSFastCGISetInstanceMaxRequestsXP" + BinaryKey="WixCA" + DllEntry="CAQuietExec" + Return="ignore" + Execute="deferred" + Impersonate="no" /> <CustomAction Id="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSCmd" Property="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTS" - Value=""cscript" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -EnvironmentVars:PHP_FCGI_MAX_REQUESTS:10000,PHPRC:"[INSTALLDIR]"" /> + Value=""\\localhost\admin$\system32\cscript.exe" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -EnvironmentVars:PHP_FCGI_MAX_REQUESTS:10000,PHPRC:"[INSTALLDIR]"" /> <CustomAction Id="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTS" BinaryKey="WixCA" DllEntry="CAQuietExec" Return="ignore" Execute="deferred" Impersonate="no" /> + <CustomAction Id="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSCmdXP" + Property="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSXP" + Value=""cscript" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -EnvironmentVars:PHP_FCGI_MAX_REQUESTS:10000,PHPRC:"[INSTALLDIR]"" /> + <CustomAction Id="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSXP" + BinaryKey="WixCA" + DllEntry="CAQuietExec" + Return="ignore" + Execute="deferred" + Impersonate="no" /> <CustomAction Id="fcgiconfigJSFastCGIremoveCmd" Property="fcgiconfigJSFastCGIremove" - Value=""cscript" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -remove -section:"PHP"" /> + Value=""\\localhost\admin$\system32\cscript.exe" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -remove -section:"PHP"" /> <CustomAction Id="fcgiconfigJSFastCGIremove" BinaryKey="WixCA" DllEntry="CAQuietExec" Return="ignore" Execute="deferred" Impersonate="no" /> + <CustomAction Id="fcgiconfigJSFastCGIremoveCmdXP" + Property="fcgiconfigJSFastCGIremoveXP" + Value=""cscript" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -remove -section:"PHP"" /> + <CustomAction Id="fcgiconfigJSFastCGIremoveXP" + BinaryKey="WixCA" + DllEntry="CAQuietExec" + Return="ignore" + Execute="deferred" + Impersonate="no" /> <CustomAction Id="configIIS4" BinaryKey="PHPInstallerScripts" Return="check" @@ -723,31 +759,55 @@ <![CDATA[VersionNT >= 600 AND &iis4FastCGI = 2]]> </Custom> <Custom Action="fcgiconfigJSFastCGICmd" After="InstallInitialize"> - <![CDATA[((VersionNT = 501 AND ServicePackLevel >= 2) OR (VersionNT = 502 AND ServicePackLevel >= 2)) AND &iis4FastCGI = 3]]> + <![CDATA[(VersionNT = 502 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> </Custom> <Custom Action="fcgiconfigJSFastCGI" After="fcgiconfigJSFastCGICmd"> - <![CDATA[((VersionNT = 501 AND ServicePackLevel >= 2) OR (VersionNT = 502 AND ServicePackLevel >= 2)) AND &iis4FastCGI = 3]]> + <![CDATA[(VersionNT = 502 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> </Custom> <Custom Action="fcgiconfigJSFastCGISetInstanceMaxRequestsCmd" After="fcgiconfigJSFastCGI"> - <![CDATA[((VersionNT = 501 AND ServicePackLevel >= 2) OR (VersionNT = 502 AND ServicePackLevel >= 2)) AND &iis4FastCGI = 3]]> + <![CDATA[(VersionNT = 502 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> </Custom> <Custom Action="fcgiconfigJSFastCGISetInstanceMaxRequests" After="fcgiconfigJSFastCGISetInstanceMaxRequestsCmd"> - <![CDATA[((VersionNT = 501 AND ServicePackLevel >= 2) OR (VersionNT = 502 AND ServicePackLevel >= 2)) AND &iis4FastCGI = 3]]> + <![CDATA[(VersionNT = 502 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> </Custom> <Custom Action="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSCmd" After="fcgiconfigJSFastCGISetInstanceMaxRequests"> - <![CDATA[((VersionNT = 501 AND ServicePackLevel >= 2) OR (VersionNT = 502 AND ServicePackLevel >= 2)) AND &iis4FastCGI = 3]]> + <![CDATA[(VersionNT = 502 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> </Custom> <Custom Action="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTS" After="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSCmd"> - <![CDATA[((VersionNT = 501 AND ServicePackLevel >= 2) OR (VersionNT = 502 AND ServicePackLevel >= 2)) AND &iis4FastCGI = 3]]> + <![CDATA[(VersionNT = 502 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> </Custom> - <Custom Action="configIIS4" After="InstallFinalize"> - <![CDATA[VersionNT < 600 AND &iis4FastCGI = 3]]> + <Custom Action="fcgiconfigJSFastCGICmdXP" After="InstallInitialize"> + <![CDATA[(VersionNT = 501 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="fcgiconfigJSFastCGIXP" After="fcgiconfigJSFastCGICmdXP"> + <![CDATA[(VersionNT = 501 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="fcgiconfigJSFastCGISetInstanceMaxRequestsCmdXP" After="fcgiconfigJSFastCGIXP"> + <![CDATA[(VersionNT = 501 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="fcgiconfigJSFastCGISetInstanceMaxRequestsXP" After="fcgiconfigJSFastCGISetInstanceMaxRequestsCmdXP"> + <![CDATA[(VersionNT = 501 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSCmdXP" After="fcgiconfigJSFastCGISetInstanceMaxRequestsXP"> + <![CDATA[(VersionNT = 501 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSXP" After="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSCmdXP"> + <![CDATA[(VersionNT = 501 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> </Custom> <Custom Action="fcgiconfigJSFastCGIremoveCmd" After="InstallInitialize"> - <![CDATA[((VersionNT = 501 AND ServicePackLevel >= 2) OR (VersionNT = 502 AND ServicePackLevel >= 2)) AND &iis4FastCGI = 2]]> + <![CDATA[(VersionNT = 502 AND ServicePackLevel >= 2) AND &iis4FastCGI = 2]]> </Custom> <Custom Action="fcgiconfigJSFastCGIremove" After="fcgiconfigJSFastCGIremoveCmd"> - <![CDATA[((VersionNT = 501 AND ServicePackLevel >= 2) OR (VersionNT = 502 AND ServicePackLevel >= 2)) AND &iis4FastCGI = 2]]> + <![CDATA[(VersionNT = 502 AND ServicePackLevel >= 2) AND &iis4FastCGI = 2]]> + </Custom> + <Custom Action="fcgiconfigJSFastCGIremoveCmdXP" After="InstallInitialize"> + <![CDATA[(VersionNT = 501 AND ServicePackLevel >= 2) AND &iis4FastCGI = 2]]> + </Custom> + <Custom Action="fcgiconfigJSFastCGIremoveXP" After="fcgiconfigJSFastCGIremoveCmdXP"> + <![CDATA[(VersionNT = 501 AND ServicePackLevel >= 2) AND &iis4FastCGI = 2]]> + </Custom> + <Custom Action="configIIS4" After="InstallFinalize"> + <![CDATA[VersionNT < 600 AND &iis4FastCGI = 3]]> </Custom> <Custom Action="unconfigIIS4" After="fcgiconfigJSFastCGIremove"> <![CDATA[VersionNT < 600 AND &iis4FastCGI = 2]]> http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase60NTS.wxs?r1=1.14&r2=1.15&diff_format=u Index: win-installer/PHPInstallerBase60NTS.wxs diff -u win-installer/PHPInstallerBase60NTS.wxs:1.14 win-installer/PHPInstallerBase60NTS.wxs:1.15 --- win-installer/PHPInstallerBase60NTS.wxs:1.14 Thu Jan 29 19:03:29 2009 +++ win-installer/PHPInstallerBase60NTS.wxs Wed Feb 4 18:43:59 2009 @@ -31,8 +31,8 @@ </Condition> <Condition - Message="PHP requires Windows NT/2000/XP/2003 or later to install"> - <![CDATA[( VersionNT < 400 ) OR ( Version9x <> 0 )]]> + Message="PHP requires Windows 2000/XP/2003/Vista/2008 or later to install"> + <![CDATA[( VersionNT <= 500 ) OR ( Version9x <> 0 )]]> </Condition> <Media Id="1" @@ -53,34 +53,34 @@ </Property> <Property Id="FASTCGI60MODULEINSTALLED"> - <RegistrySearch - Id="fastcgi60Registry" - Root="HKLM" - Key="SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{E136BB09-1BB2-49A0-9FF3-5C25564D3819}" - Type="raw" - Name="Version" - Win64="yes"/> - </Property> - <Property Id="FASTCGI70MODULEINSTALLED"> - <RegistrySearch + <DirectorySearch Id="InetsrvDir" + Path="[WindowsFolder]system32\inetsrv" + Depth="0"> + <FileSearch + Id="FcgiExtFile" + Name="fcgiext.dll"/> + </DirectorySearch> + </Property> + <Property Id="FASTCGI70MODULEINSTALLED"> + <RegistrySearch Id="fastcgi70Registry" Root="HKLM" Key="SOFTWARE\Microsoft\InetStp\Components" Type="raw" Name="FastCgi" Win64="yes"/> - </Property> - <CustomAction Id='CheckFASTCGIINSTALLED' Property='FASTCGIINSTALLED' Value='1' /> - <CustomAction Id='CheckFASTCGINOTINSTALLED' Property='FASTCGIINSTALLED' Value='0' /> - <InstallUISequence> - <Custom Action="CheckFASTCGIINSTALLED" After="CostInitialize"> - <![CDATA[FASTCGI60MODULEINSTALLED OR FASTCGI70MODULEINSTALLED]]> - </Custom> - <Custom Action="CheckFASTCGINOTINSTALLED" After="CostInitialize"> - <![CDATA[NOT FASTCGI60MODULEINSTALLED AND NOT FASTCGI70MODULEINSTALLED]]> - </Custom> + </Property> + <CustomAction Id='CheckFASTCGIINSTALLED' Property='FASTCGIINSTALLED' Value='1' /> + <CustomAction Id='CheckFASTCGINOTINSTALLED' Property='FASTCGIINSTALLED' Value='0' /> + <InstallUISequence> + <Custom Action="CheckFASTCGIINSTALLED" After="CostInitialize"> + <![CDATA[FASTCGI60MODULEINSTALLED OR FASTCGI70MODULEINSTALLED]]> + </Custom> + <Custom Action="CheckFASTCGINOTINSTALLED" After="CostInitialize"> + <![CDATA[NOT FASTCGI60MODULEINSTALLED AND NOT FASTCGI70MODULEINSTALLED]]> + </Custom> </InstallUISequence> - + <Property Id="APACHEREGDIR"> <RegistrySearch Id="apacheRegistry" Root="HKLM" @@ -477,40 +477,76 @@ Impersonate="no" /> <CustomAction Id="fcgiconfigJSFastCGICmd" Property="fcgiconfigJSFastCGI" - Value=""cscript" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -add -section:"PHP" -extension:php -path:"[INSTALLDIR]php-cgi.exe"" /> + Value=""\\localhost\admin$\system32\cscript.exe" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -add -section:"PHP" -extension:php -path:"[INSTALLDIR]php-cgi.exe"" /> <CustomAction Id="fcgiconfigJSFastCGI" BinaryKey="WixCA" DllEntry="CAQuietExec" Return="ignore" Execute="deferred" Impersonate="no" /> + <CustomAction Id="fcgiconfigJSFastCGICmdXP" + Property="fcgiconfigJSFastCGIXP" + Value=""cscript" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -add -section:"PHP" -extension:php -path:"[INSTALLDIR]php-cgi.exe"" /> + <CustomAction Id="fcgiconfigJSFastCGIXP" + BinaryKey="WixCA" + DllEntry="CAQuietExec" + Return="ignore" + Execute="deferred" + Impersonate="no" /> <CustomAction Id="fcgiconfigJSFastCGISetInstanceMaxRequestsCmd" Property="fcgiconfigJSFastCGISetInstanceMaxRequests" - Value=""cscript" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -InstanceMaxRequests:10000" /> + Value=""\\localhost\admin$\system32\cscript.exe" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -InstanceMaxRequests:10000" /> <CustomAction Id="fcgiconfigJSFastCGISetInstanceMaxRequests" BinaryKey="WixCA" DllEntry="CAQuietExec" Return="ignore" Execute="deferred" Impersonate="no" /> + <CustomAction Id="fcgiconfigJSFastCGISetInstanceMaxRequestsCmdXP" + Property="fcgiconfigJSFastCGISetInstanceMaxRequestsXP" + Value=""cscript" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -InstanceMaxRequests:10000" /> + <CustomAction Id="fcgiconfigJSFastCGISetInstanceMaxRequestsXP" + BinaryKey="WixCA" + DllEntry="CAQuietExec" + Return="ignore" + Execute="deferred" + Impersonate="no" /> <CustomAction Id="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSCmd" Property="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTS" - Value=""cscript" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -EnvironmentVars:PHP_FCGI_MAX_REQUESTS:10000,PHPRC:"[INSTALLDIR]"" /> + Value=""\\localhost\admin$\system32\cscript.exe" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -EnvironmentVars:PHP_FCGI_MAX_REQUESTS:10000,PHPRC:"[INSTALLDIR]"" /> <CustomAction Id="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTS" BinaryKey="WixCA" DllEntry="CAQuietExec" Return="ignore" Execute="deferred" Impersonate="no" /> + <CustomAction Id="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSCmdXP" + Property="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSXP" + Value=""cscript" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -EnvironmentVars:PHP_FCGI_MAX_REQUESTS:10000,PHPRC:"[INSTALLDIR]"" /> + <CustomAction Id="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSXP" + BinaryKey="WixCA" + DllEntry="CAQuietExec" + Return="ignore" + Execute="deferred" + Impersonate="no" /> <CustomAction Id="fcgiconfigJSFastCGIremoveCmd" Property="fcgiconfigJSFastCGIremove" - Value=""cscript" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -remove -section:"PHP"" /> + Value=""\\localhost\admin$\system32\cscript.exe" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -remove -section:"PHP"" /> <CustomAction Id="fcgiconfigJSFastCGIremove" BinaryKey="WixCA" DllEntry="CAQuietExec" Return="ignore" Execute="deferred" Impersonate="no" /> + <CustomAction Id="fcgiconfigJSFastCGIremoveCmdXP" + Property="fcgiconfigJSFastCGIremoveXP" + Value=""cscript" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -remove -section:"PHP"" /> + <CustomAction Id="fcgiconfigJSFastCGIremoveXP" + BinaryKey="WixCA" + DllEntry="CAQuietExec" + Return="ignore" + Execute="deferred" + Impersonate="no" /> <CustomAction Id="configIIS4" BinaryKey="PHPInstallerScripts" Return="check" @@ -564,34 +600,52 @@ <![CDATA[VersionNT >= 600 AND &iis4FastCGI = 2]]> </Custom> <Custom Action="fcgiconfigJSFastCGICmd" After="InstallInitialize"> - <![CDATA[((VersionNT = 501 AND ServicePackLevel >= 2) OR (VersionNT = 502 AND ServicePackLevel >= 2)) AND &iis4FastCGI = 3]]> + <![CDATA[(VersionNT = 502 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> </Custom> <Custom Action="fcgiconfigJSFastCGI" After="fcgiconfigJSFastCGICmd"> - <![CDATA[((VersionNT = 501 AND ServicePackLevel >= 2) OR (VersionNT = 502 AND ServicePackLevel >= 2)) AND &iis4FastCGI = 3]]> + <![CDATA[(VersionNT = 502 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> </Custom> <Custom Action="fcgiconfigJSFastCGISetInstanceMaxRequestsCmd" After="fcgiconfigJSFastCGI"> - <![CDATA[((VersionNT = 501 AND ServicePackLevel >= 2) OR (VersionNT = 502 AND ServicePackLevel >= 2)) AND &iis4FastCGI = 3]]> + <![CDATA[(VersionNT = 502 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> </Custom> <Custom Action="fcgiconfigJSFastCGISetInstanceMaxRequests" After="fcgiconfigJSFastCGISetInstanceMaxRequestsCmd"> - <![CDATA[((VersionNT = 501 AND ServicePackLevel >= 2) OR (VersionNT = 502 AND ServicePackLevel >= 2)) AND &iis4FastCGI = 3]]> + <![CDATA[(VersionNT = 502 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> </Custom> <Custom Action="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSCmd" After="fcgiconfigJSFastCGISetInstanceMaxRequests"> - <![CDATA[((VersionNT = 501 AND ServicePackLevel >= 2) OR (VersionNT = 502 AND ServicePackLevel >= 2)) AND &iis4FastCGI = 3]]> + <![CDATA[(VersionNT = 502 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> </Custom> <Custom Action="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTS" After="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSCmd"> - <![CDATA[((VersionNT = 501 AND ServicePackLevel >= 2) OR (VersionNT = 502 AND ServicePackLevel >= 2)) AND &iis4FastCGI = 3]]> + <![CDATA[(VersionNT = 502 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="fcgiconfigJSFastCGICmdXP" After="InstallInitialize"> + <![CDATA[(VersionNT = 501 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="fcgiconfigJSFastCGIXP" After="fcgiconfigJSFastCGICmdXP"> + <![CDATA[(VersionNT = 501 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> </Custom> - <Custom Action="configIIS4" After="InstallFinalize"> - <![CDATA[VersionNT < 600 AND &iis4FastCGI = 3]]> + <Custom Action="fcgiconfigJSFastCGISetInstanceMaxRequestsCmdXP" After="fcgiconfigJSFastCGIXP"> + <![CDATA[(VersionNT = 501 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="fcgiconfigJSFastCGISetInstanceMaxRequestsXP" After="fcgiconfigJSFastCGISetInstanceMaxRequestsCmdXP"> + <![CDATA[(VersionNT = 501 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSCmdXP" After="fcgiconfigJSFastCGISetInstanceMaxRequestsXP"> + <![CDATA[(VersionNT = 501 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSXP" After="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSCmdXP"> + <![CDATA[(VersionNT = 501 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> </Custom> <Custom Action="fcgiconfigJSFastCGIremoveCmd" After="InstallInitialize"> - <![CDATA[((VersionNT = 501 AND ServicePackLevel >= 2) OR (VersionNT = 502 AND ServicePackLevel >= 2)) AND &iis4FastCGI = 2]]> + <![CDATA[(VersionNT = 502 AND ServicePackLevel >= 2) AND &iis4FastCGI = 2]]> </Custom> <Custom Action="fcgiconfigJSFastCGIremove" After="fcgiconfigJSFastCGIremoveCmd"> - <![CDATA[((VersionNT = 501 AND ServicePackLevel >= 2) OR (VersionNT = 502 AND ServicePackLevel >= 2)) AND &iis4FastCGI = 2]]> + <![CDATA[(VersionNT = 502 AND ServicePackLevel >= 2) AND &iis4FastCGI = 2]]> + </Custom> + <Custom Action="fcgiconfigJSFastCGIremoveCmdXP" After="InstallInitialize"> + <![CDATA[(VersionNT = 501 AND ServicePackLevel >= 2) AND &iis4FastCGI = 2]]> </Custom> - <Custom Action="unconfigIIS4" After="fcgiconfigJSFastCGIremove"> - <![CDATA[VersionNT < 600 AND &iis4FastCGI = 2]]> + <Custom Action="fcgiconfigJSFastCGIremoveXP" After="fcgiconfigJSFastCGIremoveCmdXP"> + <![CDATA[(VersionNT = 501 AND ServicePackLevel >= 2) AND &iis4FastCGI = 2]]> </Custom> <RemoveExistingProducts After="InstallValidate" /> </InstallExecuteSequence> http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerScripts52.vbs?r1=1.10&r2=1.11&diff_format=u Index: win-installer/PHPInstallerScripts52.vbs diff -u win-installer/PHPInstallerScripts52.vbs:1.10 win-installer/PHPInstallerScripts52.vbs:1.11 --- win-installer/PHPInstallerScripts52.vbs:1.10 Thu Jan 29 18:30:33 2009 +++ win-installer/PHPInstallerScripts52.vbs Wed Feb 4 18:43:59 2009 @@ -171,8 +171,7 @@ PHPExecutable = strPHPPath & "php5isapi.dll" End If If ( Session.FeatureRequestState("iis4FastCGI") = 3 ) Then - Set objShell = CreateObject("WScript.Shell") - PHPExecutable = objShell.ExpandEnvironmentStrings("%WINDIR%") & "\system32\inetsrv\fcgiext.dll" + Exit Sub End If If ( GetWindowsVersion < 5.2 ) Then @@ -245,6 +244,10 @@ 'it could all go dreadfully wrong - so set error handler for graceful exits On Error Resume Next + + If ( Session.FeatureRequestState("iis4FastCGI") = 2 ) Then + Exit Sub + End If Set WebService = GetObject("IIS://LocalHost/W3SVC") If (Err.Number <> 0) Then http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerScripts60.vbs?r1=1.10&r2=1.11&diff_format=u Index: win-installer/PHPInstallerScripts60.vbs diff -u win-installer/PHPInstallerScripts60.vbs:1.10 win-installer/PHPInstallerScripts60.vbs:1.11 --- win-installer/PHPInstallerScripts60.vbs:1.10 Thu Jan 29 18:30:33 2009 +++ win-installer/PHPInstallerScripts60.vbs Wed Feb 4 18:43:59 2009 @@ -171,8 +171,7 @@ PHPExecutable = strPHPPath & "php6isapi.dll" End If If ( Session.FeatureRequestState("iis4FastCGI") = 3 ) Then - Set objShell = CreateObject("WScript.Shell") - PHPExecutable = objShell.ExpandEnvironmentStrings("%WINDIR%") & "\system32\inetsrv\fcgiext.dll" + Exit Sub End If If ( GetWindowsVersion < 5.2 ) Then @@ -245,6 +244,10 @@ 'it could all go dreadfully wrong - so set error handler for graceful exits On Error Resume Next + + If ( Session.FeatureRequestState("iis4FastCGI") = 2 ) Then + Exit Sub + End If Set WebService = GetObject("IIS://LocalHost/W3SVC") If (Err.Number <> 0) Then