cvs: win-installer / PHPInstallerBase52.wxs PHPInstallerBase52NTS.wxs PHPInstallerBase53.wxs PHPInstallerBase53NTS.wxs PHPInstallerBase60.wxs
PHPInstallerBase60NTS.wxs
| From: | John Mertic | Date: | Fri, 12 Sep 2008 16:03:32 +0000 |
| Subject: | cvs: win-installer / PHPInstallerBase52.wxs PHPInstallerBase52NTS.wxs PHPInstallerBase53.wxs PHPInstallerBase53NTS.wxs PHPInstallerBase60.wxs PHPInstallerBase60NTS.wxs |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-53091@lists.php.net to get a copy of this message | ||
jmertic Fri Sep 12 16:03:32 2008 UTC
Modified files:
/win-installer PHPInstallerBase52.wxs PHPInstallerBase52NTS.wxs
PHPInstallerBase53.wxs PHPInstallerBase53NTS.wxs
PHPInstallerBase60.wxs PHPInstallerBase60NTS.wxs
Log:
Fix problems with configuring and unconfiguring FastCGI under IIS 7
http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase52.wxs?r1=1.25&r2=1.26&diff_format=u Index: win-installer/PHPInstallerBase52.wxs diff -u win-installer/PHPInstallerBase52.wxs:1.25 win-installer/PHPInstallerBase52.wxs:1.26 --- win-installer/PHPInstallerBase52.wxs:1.25 Wed Sep 10 20:32:05 2008 +++ win-installer/PHPInstallerBase52.wxs Fri Sep 12 16:03:32 2008 @@ -555,16 +555,20 @@ Return="ignore" Directory="INSTALLDIR"/> <CustomAction Id="iis700FastCGIadd" - ExeCommand=""[WindowsFolder]System32\inetsrv\APPCMD.EXE" SET CONFIG /section:system.webServer/fastCGI /+[fullPath='[INSTALLDIR]php-cgi.exe']" + ExeCommand=""[WindowsFolder]system32\inetsrv\APPCMD.EXE" SET CONFIG -section:system.webServer/fastCGI /+"[\[]fullPath='[INSTALLDIR]php-cgi.exe'[\]]"" Return="ignore" + Execute="deferred" + Impersonate="no" Directory="INSTALLDIR"/> <CustomAction Id="iis700CGI" ExeCommand=""[WindowsFolder]System32\inetsrv\APPCMD.EXE" SET CONFIG -section:handlers "-+[name='PHP-CGI',path='*.php',verb='GET,HEAD,POST',modules='CgiModule',scriptProcessor='[INSTALLDIR]php-cgi.exe'"" Return="ignore" Directory="INSTALLDIR"/> <CustomAction Id="iis700FastCGI" - ExeCommand=""[WindowsFolder]System32\inetsrv\APPCMD.EXE" SET CONFIG /section:system.webServer/handlers /+[name='PHP-FastCGI',path='*.php',verb='*',modules='FastCgiModule',scriptProcessor='[INSTALLDIR]php-cgi.exe',resourceType='Either'] " + ExeCommand=""[WindowsFolder]system32\inetsrv\APPCMD.EXE" SET CONFIG /section:system.webServer/handlers /+"[\[]name='PHP_via_FastCGI',path='*.php',verb='*',modules='FastCgiModule',scriptProcessor='[INSTALLDIR]php-cgi.exe',resourceType='Either'[\]]"" Return="ignore" + Execute="deferred" + Impersonate="no" Directory="INSTALLDIR"/> <CustomAction Id="iis700ISAPI" ExeCommand=""[WindowsFolder]System32\inetsrv\APPCMD.EXE" SET CONFIG -section:handlers "-+[name='PHP-ISAPI',path='*.php',verb='GET,HEAD,POST',modules='IsapiModule',scriptProcessor='[INSTALLDIR]php5isapi.dll'"" @@ -582,9 +586,17 @@ ExeCommand=""[WindowsFolder]System32\inetsrv\APPCMD.EXE" SET CONFIG -section:handlers "--[name='PHP-CGI',path='*.php',verb='GET,HEAD,POST',modules='CgiModule',scriptProcessor='[INSTALLDIR]php-cgi.exe'"" Return="ignore" Directory="INSTALLDIR"/> + <CustomAction Id="iis700FastCGIaddremove" + ExeCommand=""[WindowsFolder]system32\inetsrv\APPCMD.EXE" SET CONFIG -section:system.webServer/fastCGI /-"[\[]fullPath='[INSTALLDIR]php-cgi.exe'[\]]"" + Return="ignore" + Execute="deferred" + Impersonate="no" + Directory="INSTALLDIR"/> <CustomAction Id="iis700FastCGIremove" - ExeCommand=""[WindowsFolder]System32\inetsrv\APPCMD.EXE" SET CONFIG /section:system.webServer/handlers /-[name='PHP-FastCGI',path='*.php',verb='*',modules='FastCgiModule',scriptProcessor='[INSTALLDIR]php-cgi.exe',resourceType='Either'] " + ExeCommand=""[WindowsFolder]system32\inetsrv\APPCMD.EXE" SET CONFIG /section:system.webServer/handlers /-"[\[]name='PHP_via_FastCGI',path='*.php',verb='*',modules='FastCgiModule',scriptProcessor='[INSTALLDIR]php-cgi.exe',resourceType='Either'[\]]"" Return="ignore" + Execute="deferred" + Impersonate="no" Directory="INSTALLDIR"/> <CustomAction Id="iis700ISAPIremove" ExeCommand=""[WindowsFolder]System32\inetsrv\APPCMD.EXE" SET CONFIG -section:handlers "--[name='PHP-ISAPI',path='*.php',verb='GET,HEAD,POST',modules='IsapiModule',scriptProcessor='[INSTALLDIR]php5isapi.dll'"" @@ -641,10 +653,10 @@ <Custom Action="netserveCGIInterpretersremove" After="InstallFinalize"> <![CDATA[&netserve = 2]]> </Custom> - <Custom Action="iis700FastCGIadd" After="InstallFinalize"> + <Custom Action="iis700FastCGIadd" After="InstallInitialize"> <![CDATA[VersionNT >= 600 AND &iis4FastCGI = 3]]> </Custom> - <Custom Action="iis700FastCGI" After="InstallFinalize"> + <Custom Action="iis700FastCGI" After="InstallInitialize"> <![CDATA[VersionNT >= 600 AND &iis4FastCGI = 3]]> </Custom> <Custom Action="iis700CGI" After="InstallFinalize"> @@ -662,7 +674,10 @@ <Custom Action="iis700CGIremove" After="InstallFinalize"> <![CDATA[VersionNT >= 600 AND &iis4CGI = 2]]> </Custom> - <Custom Action="iis700FastCGIremove" After="InstallFinalize"> + <Custom Action="iis700FastCGIaddremove" After="InstallInitialize"> + <![CDATA[VersionNT >= 600 AND &iis4FastCGI = 2]]> + </Custom> + <Custom Action="iis700FastCGIremove" After="InstallInitialize"> <![CDATA[VersionNT >= 600 AND &iis4FastCGI = 2]]> </Custom> <Custom Action="iis700ISAPIremove" After="InstallFinalize"> http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase52NTS.wxs?r1=1.4&r2=1.5&diff_format=u Index: win-installer/PHPInstallerBase52NTS.wxs diff -u win-installer/PHPInstallerBase52NTS.wxs:1.4 win-installer/PHPInstallerBase52NTS.wxs:1.5 --- win-installer/PHPInstallerBase52NTS.wxs:1.4 Thu Sep 11 19:14:57 2008 +++ win-installer/PHPInstallerBase52NTS.wxs Fri Sep 12 16:03:32 2008 @@ -440,16 +440,28 @@ <Binary Id="PHPInstallerScripts" SourceFile="PHPInstallerScripts52.vbs" /> <CustomAction Id="iis700FastCGIadd" - ExeCommand=""[WindowsFolder]System32\inetsrv\APPCMD.EXE" SET CONFIG /section:system.webServer/fastCGI /+[fullPath='[INSTALLDIR]php-cgi.exe']" + ExeCommand=""[WindowsFolder]system32\inetsrv\APPCMD.EXE" SET CONFIG -section:system.webServer/fastCGI /+"[\[]fullPath='[INSTALLDIR]php-cgi.exe'[\]]"" Return="ignore" + Execute="deferred" + Impersonate="no" + Directory="INSTALLDIR"/> + <CustomAction Id="iis700FastCGIaddremove" + ExeCommand=""[WindowsFolder]system32\inetsrv\APPCMD.EXE" SET CONFIG -section:system.webServer/fastCGI /-"[\[]fullPath='[INSTALLDIR]php-cgi.exe'[\]]"" + Return="ignore" + Execute="deferred" + Impersonate="no" Directory="INSTALLDIR"/> <CustomAction Id="iis700FastCGI" - ExeCommand=""[WindowsFolder]System32\inetsrv\APPCMD.EXE" SET CONFIG /section:system.webServer/handlers /+[name='PHP-FastCGI',path='*.php',verb='*',modules='FastCgiModule',scriptProcessor='[INSTALLDIR]php-cgi.exe',resourceType='Either'] " + ExeCommand=""[WindowsFolder]system32\inetsrv\APPCMD.EXE" SET CONFIG /section:system.webServer/handlers /+"[\[]name='PHP_via_FastCGI',path='*.php',verb='*',modules='FastCgiModule',scriptProcessor='[INSTALLDIR]php-cgi.exe',resourceType='Either'[\]]"" Return="ignore" + Execute="deferred" + Impersonate="no" Directory="INSTALLDIR"/> <CustomAction Id="iis700FastCGIremove" - ExeCommand=""[WindowsFolder]System32\inetsrv\APPCMD.EXE" SET CONFIG /section:system.webServer/handlers /-[name='PHP-FastCGI',path='*.php',verb='*',modules='FastCgiModule',scriptProcessor='[INSTALLDIR]php-cgi.exe',resourceType='Either'] " + ExeCommand=""[WindowsFolder]system32\inetsrv\APPCMD.EXE" SET CONFIG /section:system.webServer/handlers /-"[\[]name='PHP_via_FastCGI',path='*.php',verb='*',modules='FastCgiModule',scriptProcessor='[INSTALLDIR]php-cgi.exe',resourceType='Either'[\]]"" Return="ignore" + Execute="deferred" + Impersonate="no" Directory="INSTALLDIR"/> <CustomAction Id="fcgiconfigJSFastCGI" ExeCommand="cscript "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -add -section:"PHP" -extension:php -path:"[INSTALLDIR]php-cgi.exe"" @@ -469,13 +481,16 @@ VBScriptCall="unconfigIIS4" /> <InstallExecuteSequence> - <Custom Action="iis700FastCGIadd" After="InstallFinalize"> + <Custom Action="iis700FastCGIadd" After="InstallInitialize"> <![CDATA[VersionNT >= 600 AND &iis4FastCGI = 3]]> </Custom> - <Custom Action="iis700FastCGI" After="InstallFinalize"> + <Custom Action="iis700FastCGIaddremove" After="InstallInitialize"> + <![CDATA[VersionNT >= 600 AND &iis4FastCGI = 2]]> + </Custom> + <Custom Action="iis700FastCGI" After="InstallInitialize"> <![CDATA[VersionNT >= 600 AND &iis4FastCGI = 3]]> </Custom> - <Custom Action="iis700FastCGIremove" After="InstallFinalize"> + <Custom Action="iis700FastCGIremove" After="InstallInitialize"> <![CDATA[VersionNT >= 600 AND &iis4FastCGI = 2]]> </Custom> <Custom Action="fcgiconfigJSFastCGI" After="InstallFinalize"> http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase53.wxs?r1=1.2&r2=1.3&diff_format=u Index: win-installer/PHPInstallerBase53.wxs diff -u win-installer/PHPInstallerBase53.wxs:1.2 win-installer/PHPInstallerBase53.wxs:1.3 --- win-installer/PHPInstallerBase53.wxs:1.2 Wed Sep 10 20:32:05 2008 +++ win-installer/PHPInstallerBase53.wxs Fri Sep 12 16:03:32 2008 @@ -526,16 +526,20 @@ Return="ignore" Directory="INSTALLDIR"/> <CustomAction Id="iis700FastCGIadd" - ExeCommand=""[WindowsFolder]System32\inetsrv\APPCMD.EXE" SET CONFIG /section:system.webServer/fastCGI /+[fullPath='[INSTALLDIR]php-cgi.exe']" + ExeCommand=""[WindowsFolder]system32\inetsrv\APPCMD.EXE" SET CONFIG -section:system.webServer/fastCGI /+"[\[]fullPath='[INSTALLDIR]php-cgi.exe'[\]]"" Return="ignore" + Execute="deferred" + Impersonate="no" Directory="INSTALLDIR"/> <CustomAction Id="iis700CGI" ExeCommand=""[WindowsFolder]System32\inetsrv\APPCMD.EXE" SET CONFIG -section:handlers "-+[name='PHP-CGI',path='*.php',verb='GET,HEAD,POST',modules='CgiModule',scriptProcessor='[INSTALLDIR]php-cgi.exe'"" Return="ignore" Directory="INSTALLDIR"/> <CustomAction Id="iis700FastCGI" - ExeCommand=""[WindowsFolder]System32\inetsrv\APPCMD.EXE" SET CONFIG /section:system.webServer/handlers /+[name='PHP-FastCGI',path='*.php',verb='*',modules='FastCgiModule',scriptProcessor='[INSTALLDIR]php-cgi.exe',resourceType='Either'] " + ExeCommand=""[WindowsFolder]system32\inetsrv\APPCMD.EXE" SET CONFIG /section:system.webServer/handlers /+"[\[]name='PHP_via_FastCGI',path='*.php',verb='*',modules='FastCgiModule',scriptProcessor='[INSTALLDIR]php-cgi.exe',resourceType='Either'[\]]"" Return="ignore" + Execute="deferred" + Impersonate="no" Directory="INSTALLDIR"/> <CustomAction Id="iis700ISAPI" ExeCommand=""[WindowsFolder]System32\inetsrv\APPCMD.EXE" SET CONFIG -section:handlers "-+[name='PHP-ISAPI',path='*.php',verb='GET,HEAD,POST',modules='IsapiModule',scriptProcessor='[INSTALLDIR]php5isapi.dll'"" @@ -553,9 +557,17 @@ ExeCommand=""[WindowsFolder]System32\inetsrv\APPCMD.EXE" SET CONFIG -section:handlers "--[name='PHP-CGI',path='*.php',verb='GET,HEAD,POST',modules='CgiModule',scriptProcessor='[INSTALLDIR]php-cgi.exe'"" Return="ignore" Directory="INSTALLDIR"/> + <CustomAction Id="iis700FastCGIaddremove" + ExeCommand=""[WindowsFolder]system32\inetsrv\APPCMD.EXE" SET CONFIG -section:system.webServer/fastCGI /-"[\[]fullPath='[INSTALLDIR]php-cgi.exe'[\]]"" + Return="ignore" + Execute="deferred" + Impersonate="no" + Directory="INSTALLDIR"/> <CustomAction Id="iis700FastCGIremove" - ExeCommand=""[WindowsFolder]System32\inetsrv\APPCMD.EXE" SET CONFIG /section:system.webServer/handlers /-[name='PHP-FastCGI',path='*.php',verb='*',modules='FastCgiModule',scriptProcessor='[INSTALLDIR]php-cgi.exe',resourceType='Either'] " + ExeCommand=""[WindowsFolder]system32\inetsrv\APPCMD.EXE" SET CONFIG /section:system.webServer/handlers /-"[\[]name='PHP_via_FastCGI',path='*.php',verb='*',modules='FastCgiModule',scriptProcessor='[INSTALLDIR]php-cgi.exe',resourceType='Either'[\]]"" Return="ignore" + Execute="deferred" + Impersonate="no" Directory="INSTALLDIR"/> <CustomAction Id="iis700ISAPIremove" ExeCommand=""[WindowsFolder]System32\inetsrv\APPCMD.EXE" SET CONFIG -section:handlers "--[name='PHP-ISAPI',path='*.php',verb='GET,HEAD,POST',modules='IsapiModule',scriptProcessor='[INSTALLDIR]php5isapi.dll'"" @@ -612,10 +624,10 @@ <Custom Action="netserveCGIInterpretersremove" After="InstallFinalize"> <![CDATA[&netserve = 2]]> </Custom> - <Custom Action="iis700FastCGIadd" After="InstallFinalize"> + <Custom Action="iis700FastCGIadd" After="InstallInitialize"> <![CDATA[VersionNT >= 600 AND &iis4FastCGI = 3]]> </Custom> - <Custom Action="iis700FastCGI" After="InstallFinalize"> + <Custom Action="iis700FastCGI" After="InstallInitialize"> <![CDATA[VersionNT >= 600 AND &iis4FastCGI = 3]]> </Custom> <Custom Action="iis700CGI" After="InstallFinalize"> @@ -633,7 +645,10 @@ <Custom Action="iis700CGIremove" After="InstallFinalize"> <![CDATA[VersionNT >= 600 AND &iis4CGI = 2]]> </Custom> - <Custom Action="iis700FastCGIremove" After="InstallFinalize"> + <Custom Action="iis700FastCGIaddremove" After="InstallInitialize"> + <![CDATA[VersionNT >= 600 AND &iis4FastCGI = 2]]> + </Custom> + <Custom Action="iis700FastCGIremove" After="InstallInitialize"> <![CDATA[VersionNT >= 600 AND &iis4FastCGI = 2]]> </Custom> <Custom Action="iis700ISAPIremove" After="InstallFinalize"> http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase53NTS.wxs?r1=1.3&r2=1.4&diff_format=u Index: win-installer/PHPInstallerBase53NTS.wxs diff -u win-installer/PHPInstallerBase53NTS.wxs:1.3 win-installer/PHPInstallerBase53NTS.wxs:1.4 --- win-installer/PHPInstallerBase53NTS.wxs:1.3 Thu Sep 11 19:14:57 2008 +++ win-installer/PHPInstallerBase53NTS.wxs Fri Sep 12 16:03:32 2008 @@ -410,19 +410,28 @@ <Binary Id="PHPInstallerScripts" SourceFile="PHPInstallerScripts52.vbs" /> <CustomAction Id="iis700FastCGIadd" - ExeCommand=""[WindowsFolder]system32\inetsrv\APPCMD.EXE" SET CONFIG /section:system.webServer/fastCGI /+[fullPath='[INSTALLDIR]php-cgi.exe']" + ExeCommand=""[WindowsFolder]system32\inetsrv\APPCMD.EXE" SET CONFIG -section:system.webServer/fastCGI /+"[\[]fullPath='[INSTALLDIR]php-cgi.exe'[\]]"" Return="ignore" Execute="deferred" + Impersonate="no" + Directory="INSTALLDIR"/> + <CustomAction Id="iis700FastCGIaddremove" + ExeCommand=""[WindowsFolder]system32\inetsrv\APPCMD.EXE" SET CONFIG -section:system.webServer/fastCGI /-"[\[]fullPath='[INSTALLDIR]php-cgi.exe'[\]]"" + Return="ignore" + Execute="deferred" + Impersonate="no" Directory="INSTALLDIR"/> <CustomAction Id="iis700FastCGI" - ExeCommand=""[WindowsFolder]system32\inetsrv\APPCMD.EXE" SET CONFIG /section:system.webServer/handlers /+[name='PHP-FastCGI',path='*.php',verb='*',modules='FastCgiModule',scriptProcessor='[INSTALLDIR]php-cgi.exe',resourceType='Either'] " + ExeCommand=""[WindowsFolder]system32\inetsrv\APPCMD.EXE" SET CONFIG /section:system.webServer/handlers /+"[\[]name='PHP_via_FastCGI',path='*.php',verb='*',modules='FastCgiModule',scriptProcessor='[INSTALLDIR]php-cgi.exe',resourceType='Either'[\]]"" Return="ignore" Execute="deferred" + Impersonate="no" Directory="INSTALLDIR"/> <CustomAction Id="iis700FastCGIremove" - ExeCommand=""[WindowsFolder]system32\inetsrv\APPCMD.EXE" SET CONFIG /section:system.webServer/handlers /-[name='PHP-FastCGI',path='*.php',verb='*',modules='FastCgiModule',scriptProcessor='[INSTALLDIR]php-cgi.exe',resourceType='Either'] " + ExeCommand=""[WindowsFolder]system32\inetsrv\APPCMD.EXE" SET CONFIG /section:system.webServer/handlers /-"[\[]name='PHP_via_FastCGI',path='*.php',verb='*',modules='FastCgiModule',scriptProcessor='[INSTALLDIR]php-cgi.exe',resourceType='Either'[\]]"" Return="ignore" Execute="deferred" + Impersonate="no" Directory="INSTALLDIR"/> <CustomAction Id="fcgiconfigJSFastCGI" ExeCommand="cscript "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -add -section:"PHP" -extension:php -path:"[INSTALLDIR]php-cgi.exe"" @@ -445,6 +454,9 @@ <Custom Action="iis700FastCGIadd" After="InstallInitialize"> <![CDATA[VersionNT >= 600 AND &iis4FastCGI = 3]]> </Custom> + <Custom Action="iis700FastCGIaddremove" After="InstallInitialize"> + <![CDATA[VersionNT >= 600 AND &iis4FastCGI = 2]]> + </Custom> <Custom Action="iis700FastCGI" After="InstallInitialize"> <![CDATA[VersionNT >= 600 AND &iis4FastCGI = 3]]> </Custom> http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase60.wxs?r1=1.18&r2=1.19&diff_format=u Index: win-installer/PHPInstallerBase60.wxs diff -u win-installer/PHPInstallerBase60.wxs:1.18 win-installer/PHPInstallerBase60.wxs:1.19 --- win-installer/PHPInstallerBase60.wxs:1.18 Wed Sep 10 20:33:14 2008 +++ win-installer/PHPInstallerBase60.wxs Fri Sep 12 16:03:32 2008 @@ -526,19 +526,23 @@ Return="ignore" Directory="INSTALLDIR"/> <CustomAction Id="iis700FastCGIadd" - ExeCommand=""[WindowsFolder]System32\inetsrv\APPCMD.EXE" SET CONFIG /section:system.webServer/fastCGI /+[fullPath='[INSTALLDIR]php-cgi.exe']" + ExeCommand=""[WindowsFolder]system32\inetsrv\APPCMD.EXE" SET CONFIG -section:system.webServer/fastCGI /+"[\[]fullPath='[INSTALLDIR]php-cgi.exe'[\]]"" Return="ignore" + Execute="deferred" + Impersonate="no" Directory="INSTALLDIR"/> <CustomAction Id="iis700CGI" ExeCommand=""[WindowsFolder]System32\inetsrv\APPCMD.EXE" SET CONFIG -section:handlers "-+[name='PHP-CGI',path='*.php',verb='GET,HEAD,POST',modules='CgiModule',scriptProcessor='[INSTALLDIR]php-cgi.exe'"" Return="ignore" Directory="INSTALLDIR"/> <CustomAction Id="iis700FastCGI" - ExeCommand=""[WindowsFolder]System32\inetsrv\APPCMD.EXE" SET CONFIG /section:system.webServer/handlers /+[name='PHP-FastCGI',path='*.php',verb='*',modules='FastCgiModule',scriptProcessor='[INSTALLDIR]php-cgi.exe',resourceType='Either'] " + ExeCommand=""[WindowsFolder]system32\inetsrv\APPCMD.EXE" SET CONFIG /section:system.webServer/handlers /+"[\[]name='PHP_via_FastCGI',path='*.php',verb='*',modules='FastCgiModule',scriptProcessor='[INSTALLDIR]php-cgi.exe',resourceType='Either'[\]]"" Return="ignore" + Execute="deferred" + Impersonate="no" Directory="INSTALLDIR"/> <CustomAction Id="iis700ISAPI" - ExeCommand=""[WindowsFolder]System32\inetsrv\APPCMD.EXE" SET CONFIG -section:handlers "-+[name='PHP-ISAPI',path='*.php',verb='GET,HEAD,POST',modules='IsapiModule',scriptProcessor='[INSTALLDIR]php6isapi.dll'"" + ExeCommand=""[WindowsFolder]System32\inetsrv\APPCMD.EXE" SET CONFIG -section:handlers "-+[name='PHP-ISAPI',path='*.php',verb='GET,HEAD,POST',modules='IsapiModule',scriptProcessor='[INSTALLDIR]php5isapi.dll'"" Return="ignore" Directory="INSTALLDIR"/> <CustomAction Id="iis700RCGI" @@ -546,19 +550,27 @@ Return="ignore" Directory="INSTALLDIR"/> <CustomAction Id="iis700RISAPI" - ExeCommand=""[WindowsFolder]System32\inetsrv\APPCMD.EXE" SET CONFIG -section:isapiCgiRestriction "-+[path='[INSTALLDIR]php6isapi.dll',allowed='true',groupId='PHP',description='PHP']"" + ExeCommand=""[WindowsFolder]System32\inetsrv\APPCMD.EXE" SET CONFIG -section:isapiCgiRestriction "-+[path='[INSTALLDIR]php5isapi.dll',allowed='true',groupId='PHP',description='PHP']"" Return="ignore" Directory="INSTALLDIR"/> <CustomAction Id="iis700CGIremove" ExeCommand=""[WindowsFolder]System32\inetsrv\APPCMD.EXE" SET CONFIG -section:handlers "--[name='PHP-CGI',path='*.php',verb='GET,HEAD,POST',modules='CgiModule',scriptProcessor='[INSTALLDIR]php-cgi.exe'"" Return="ignore" Directory="INSTALLDIR"/> + <CustomAction Id="iis700FastCGIaddremove" + ExeCommand=""[WindowsFolder]system32\inetsrv\APPCMD.EXE" SET CONFIG -section:system.webServer/fastCGI /-"[\[]fullPath='[INSTALLDIR]php-cgi.exe'[\]]"" + Return="ignore" + Execute="deferred" + Impersonate="no" + Directory="INSTALLDIR"/> <CustomAction Id="iis700FastCGIremove" - ExeCommand=""[WindowsFolder]System32\inetsrv\APPCMD.EXE" SET CONFIG /section:system.webServer/handlers /-[name='PHP-FastCGI',path='*.php',verb='*',modules='FastCgiModule',scriptProcessor='[INSTALLDIR]php-cgi.exe',resourceType='Either'] " + ExeCommand=""[WindowsFolder]system32\inetsrv\APPCMD.EXE" SET CONFIG /section:system.webServer/handlers /-"[\[]name='PHP_via_FastCGI',path='*.php',verb='*',modules='FastCgiModule',scriptProcessor='[INSTALLDIR]php-cgi.exe',resourceType='Either'[\]]"" Return="ignore" + Execute="deferred" + Impersonate="no" Directory="INSTALLDIR"/> <CustomAction Id="iis700ISAPIremove" - ExeCommand=""[WindowsFolder]System32\inetsrv\APPCMD.EXE" SET CONFIG -section:handlers "--[name='PHP-ISAPI',path='*.php',verb='GET,HEAD,POST',modules='IsapiModule',scriptProcessor='[INSTALLDIR]php6isapi.dll'"" + ExeCommand=""[WindowsFolder]System32\inetsrv\APPCMD.EXE" SET CONFIG -section:handlers "--[name='PHP-ISAPI',path='*.php',verb='GET,HEAD,POST',modules='IsapiModule',scriptProcessor='[INSTALLDIR]php5isapi.dll'"" Return="ignore" Directory="INSTALLDIR"/> <CustomAction Id="iisextVBSCGI" @@ -566,7 +578,7 @@ Return="ignore" Directory="INSTALLDIR"/> <CustomAction Id="iisextVBSISAPI" - ExeCommand="cscript "[WindowsFolder]system32\iisext.vbs" /AddFile "[INSTALLDIR]php6isapi.dll" 1 PHP 1 "PHP: Hypertext Processor"" + ExeCommand="cscript "[WindowsFolder]system32\iisext.vbs" /AddFile "[INSTALLDIR]php5isapi.dll" 1 PHP 1 "PHP: Hypertext Processor"" Return="ignore" Directory="INSTALLDIR"/> <CustomAction Id="iisextVBSCGIremove" @@ -574,7 +586,7 @@ Return="ignore" Directory="INSTALLDIR"/> <CustomAction Id="iisextVBSISAPIremove" - ExeCommand="cscript "[WindowsFolder]system32\iisext.vbs" /rmfile "[INSTALLDIR]php6isapi.dll"" + ExeCommand="cscript "[WindowsFolder]system32\iisext.vbs" /rmfile "[INSTALLDIR]php5isapi.dll"" Return="ignore" Directory="INSTALLDIR"/> <CustomAction Id="fcgiconfigJSFastCGI" @@ -612,10 +624,10 @@ <Custom Action="netserveCGIInterpretersremove" After="InstallFinalize"> <![CDATA[&netserve = 2]]> </Custom> - <Custom Action="iis700FastCGIadd" After="InstallFinalize"> + <Custom Action="iis700FastCGIadd" After="InstallInitialize"> <![CDATA[VersionNT >= 600 AND &iis4FastCGI = 3]]> </Custom> - <Custom Action="iis700FastCGI" After="InstallFinalize"> + <Custom Action="iis700FastCGI" After="InstallInitialize"> <![CDATA[VersionNT >= 600 AND &iis4FastCGI = 3]]> </Custom> <Custom Action="iis700CGI" After="InstallFinalize"> @@ -633,7 +645,10 @@ <Custom Action="iis700CGIremove" After="InstallFinalize"> <![CDATA[VersionNT >= 600 AND &iis4CGI = 2]]> </Custom> - <Custom Action="iis700FastCGIremove" After="InstallFinalize"> + <Custom Action="iis700FastCGIaddremove" After="InstallInitialize"> + <![CDATA[VersionNT >= 600 AND &iis4FastCGI = 2]]> + </Custom> + <Custom Action="iis700FastCGIremove" After="InstallInitialize"> <![CDATA[VersionNT >= 600 AND &iis4FastCGI = 2]]> </Custom> <Custom Action="iis700ISAPIremove" After="InstallFinalize"> http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase60NTS.wxs?r1=1.4&r2=1.5&diff_format=u Index: win-installer/PHPInstallerBase60NTS.wxs diff -u win-installer/PHPInstallerBase60NTS.wxs:1.4 win-installer/PHPInstallerBase60NTS.wxs:1.5 --- win-installer/PHPInstallerBase60NTS.wxs:1.4 Thu Sep 11 19:14:57 2008 +++ win-installer/PHPInstallerBase60NTS.wxs Fri Sep 12 16:03:32 2008 @@ -410,16 +410,28 @@ <Binary Id="PHPInstallerScripts" SourceFile="PHPInstallerScripts52.vbs" /> <CustomAction Id="iis700FastCGIadd" - ExeCommand=""[WindowsFolder]System32\inetsrv\APPCMD.EXE" SET CONFIG /section:system.webServer/fastCGI /+[fullPath='[INSTALLDIR]php-cgi.exe']" + ExeCommand=""[WindowsFolder]system32\inetsrv\APPCMD.EXE" SET CONFIG -section:system.webServer/fastCGI /+"[\[]fullPath='[INSTALLDIR]php-cgi.exe'[\]]"" Return="ignore" + Execute="deferred" + Impersonate="no" + Directory="INSTALLDIR"/> + <CustomAction Id="iis700FastCGIaddremove" + ExeCommand=""[WindowsFolder]system32\inetsrv\APPCMD.EXE" SET CONFIG -section:system.webServer/fastCGI /-"[\[]fullPath='[INSTALLDIR]php-cgi.exe'[\]]"" + Return="ignore" + Execute="deferred" + Impersonate="no" Directory="INSTALLDIR"/> <CustomAction Id="iis700FastCGI" - ExeCommand=""[WindowsFolder]System32\inetsrv\APPCMD.EXE" SET CONFIG /section:system.webServer/handlers /+[name='PHP-FastCGI',path='*.php',verb='*',modules='FastCgiModule',scriptProcessor='[INSTALLDIR]php-cgi.exe',resourceType='Either'] " + ExeCommand=""[WindowsFolder]system32\inetsrv\APPCMD.EXE" SET CONFIG /section:system.webServer/handlers /+"[\[]name='PHP_via_FastCGI',path='*.php',verb='*',modules='FastCgiModule',scriptProcessor='[INSTALLDIR]php-cgi.exe',resourceType='Either'[\]]"" Return="ignore" + Execute="deferred" + Impersonate="no" Directory="INSTALLDIR"/> <CustomAction Id="iis700FastCGIremove" - ExeCommand=""[WindowsFolder]System32\inetsrv\APPCMD.EXE" SET CONFIG /section:system.webServer/handlers /-[name='PHP-FastCGI',path='*.php',verb='*',modules='FastCgiModule',scriptProcessor='[INSTALLDIR]php-cgi.exe',resourceType='Either'] " + ExeCommand=""[WindowsFolder]system32\inetsrv\APPCMD.EXE" SET CONFIG /section:system.webServer/handlers /-"[\[]name='PHP_via_FastCGI',path='*.php',verb='*',modules='FastCgiModule',scriptProcessor='[INSTALLDIR]php-cgi.exe',resourceType='Either'[\]]"" Return="ignore" + Execute="deferred" + Impersonate="no" Directory="INSTALLDIR"/> <CustomAction Id="fcgiconfigJSFastCGI" ExeCommand="cscript "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -add -section:"PHP" -extension:php -path:"[INSTALLDIR]php-cgi.exe"" @@ -439,13 +451,16 @@ VBScriptCall="unconfigIIS4" /> <InstallExecuteSequence> - <Custom Action="iis700FastCGIadd" After="InstallFinalize"> + <Custom Action="iis700FastCGIadd" After="InstallInitialize"> <![CDATA[VersionNT >= 600 AND &iis4FastCGI = 3]]> </Custom> - <Custom Action="iis700FastCGI" After="InstallFinalize"> + <Custom Action="iis700FastCGIaddremove" After="InstallInitialize"> + <![CDATA[VersionNT >= 600 AND &iis4FastCGI = 2]]> + </Custom> + <Custom Action="iis700FastCGI" After="InstallInitialize"> <![CDATA[VersionNT >= 600 AND &iis4FastCGI = 3]]> </Custom> - <Custom Action="iis700FastCGIremove" After="InstallFinalize"> + <Custom Action="iis700FastCGIremove" After="InstallInitialize"> <![CDATA[VersionNT >= 600 AND &iis4FastCGI = 2]]> </Custom> <Custom Action="fcgiconfigJSFastCGI" After="InstallFinalize">
http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase52.wxs?r1=1.25&r2=1.26&diff_format=u Index: win-installer/PHPInstallerBase52.wxs diff -u win-installer/PHPInstallerBase52.wxs:1.25 win-installer/PHPInstallerBase52.wxs:1.26 --- win-installer/PHPInstallerBase52.wxs:1.25 Wed Sep 10 20:32:05 2008 +++ win-installer/PHPInstallerBase52.wxs Fri Sep 12 16:03:32 2008 @@ -555,16 +555,20 @@ Return="ignore" Directory="INSTALLDIR"/> <CustomAction Id="iis700FastCGIadd" - ExeCommand=""[WindowsFolder]System32\inetsrv\APPCMD.EXE" SET CONFIG /section:system.webServer/fastCGI /+[fullPath='[INSTALLDIR]php-cgi.exe']" + ExeCommand=""[WindowsFolder]system32\inetsrv\APPCMD.EXE" SET CONFIG -section:system.webServer/fastCGI /+"[\[]fullPath='[INSTALLDIR]php-cgi.exe'[\]]"" Return="ignore" + Execute="deferred" + Impersonate="no" Directory="INSTALLDIR"/> <CustomAction Id="iis700CGI" ExeCommand=""[WindowsFolder]System32\inetsrv\APPCMD.EXE" SET CONFIG -section:handlers "-+[name='PHP-CGI',path='*.php',verb='GET,HEAD,POST',modules='CgiModule',scriptProcessor='[INSTALLDIR]php-cgi.exe'"" Return="ignore" Directory="INSTALLDIR"/> <CustomAction Id="iis700FastCGI" - ExeCommand=""[WindowsFolder]System32\inetsrv\APPCMD.EXE" SET CONFIG /section:system.webServer/handlers /+[name='PHP-FastCGI',path='*.php',verb='*',modules='FastCgiModule',scriptProcessor='[INSTALLDIR]php-cgi.exe',resourceType='Either'] " + ExeCommand=""[WindowsFolder]system32\inetsrv\APPCMD.EXE" SET CONFIG /section:system.webServer/handlers /+"[\[]name='PHP_via_FastCGI',path='*.php',verb='*',modules='FastCgiModule',scriptProcessor='[INSTALLDIR]php-cgi.exe',resourceType='Either'[\]]"" Return="ignore" + Execute="deferred" + Impersonate="no" Directory="INSTALLDIR"/> <CustomAction Id="iis700ISAPI" ExeCommand=""[WindowsFolder]System32\inetsrv\APPCMD.EXE" SET CONFIG -section:handlers "-+[name='PHP-ISAPI',path='*.php',verb='GET,HEAD,POST',modules='IsapiModule',scriptProcessor='[INSTALLDIR]php5isapi.dll'"" @@ -582,9 +586,17 @@ ExeCommand=""[WindowsFolder]System32\inetsrv\APPCMD.EXE" SET CONFIG -section:handlers "--[name='PHP-CGI',path='*.php',verb='GET,HEAD,POST',modules='CgiModule',scriptProcessor='[INSTALLDIR]php-cgi.exe'"" Return="ignore" Directory="INSTALLDIR"/> + <CustomAction Id="iis700FastCGIaddremove" + ExeCommand=""[WindowsFolder]system32\inetsrv\APPCMD.EXE" SET CONFIG -section:system.webServer/fastCGI /-"[\[]fullPath='[INSTALLDIR]php-cgi.exe'[\]]"" + Return="ignore" + Execute="deferred" + Impersonate="no" + Directory="INSTALLDIR"/> <CustomAction Id="iis700FastCGIremove" - ExeCommand=""[WindowsFolder]System32\inetsrv\APPCMD.EXE" SET CONFIG /section:system.webServer/handlers /-[name='PHP-FastCGI',path='*.php',verb='*',modules='FastCgiModule',scriptProcessor='[INSTALLDIR]php-cgi.exe',resourceType='Either'] " + ExeCommand=""[WindowsFolder]system32\inetsrv\APPCMD.EXE" SET CONFIG /section:system.webServer/handlers /-"[\[]name='PHP_via_FastCGI',path='*.php',verb='*',modules='FastCgiModule',scriptProcessor='[INSTALLDIR]php-cgi.exe',resourceType='Either'[\]]"" Return="ignore" + Execute="deferred" + Impersonate="no" Directory="INSTALLDIR"/> <CustomAction Id="iis700ISAPIremove" ExeCommand=""[WindowsFolder]System32\inetsrv\APPCMD.EXE" SET CONFIG -section:handlers "--[name='PHP-ISAPI',path='*.php',verb='GET,HEAD,POST',modules='IsapiModule',scriptProcessor='[INSTALLDIR]php5isapi.dll'"" @@ -641,10 +653,10 @@ <Custom Action="netserveCGIInterpretersremove" After="InstallFinalize"> <![CDATA[&netserve = 2]]> </Custom> - <Custom Action="iis700FastCGIadd" After="InstallFinalize"> + <Custom Action="iis700FastCGIadd" After="InstallInitialize"> <![CDATA[VersionNT >= 600 AND &iis4FastCGI = 3]]> </Custom> - <Custom Action="iis700FastCGI" After="InstallFinalize"> + <Custom Action="iis700FastCGI" After="InstallInitialize"> <![CDATA[VersionNT >= 600 AND &iis4FastCGI = 3]]> </Custom> <Custom Action="iis700CGI" After="InstallFinalize"> @@ -662,7 +674,10 @@ <Custom Action="iis700CGIremove" After="InstallFinalize"> <![CDATA[VersionNT >= 600 AND &iis4CGI = 2]]> </Custom> - <Custom Action="iis700FastCGIremove" After="InstallFinalize"> + <Custom Action="iis700FastCGIaddremove" After="InstallInitialize"> + <![CDATA[VersionNT >= 600 AND &iis4FastCGI = 2]]> + </Custom> + <Custom Action="iis700FastCGIremove" After="InstallInitialize"> <![CDATA[VersionNT >= 600 AND &iis4FastCGI = 2]]> </Custom> <Custom Action="iis700ISAPIremove" After="InstallFinalize"> http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase52NTS.wxs?r1=1.4&r2=1.5&diff_format=u Index: win-installer/PHPInstallerBase52NTS.wxs diff -u win-installer/PHPInstallerBase52NTS.wxs:1.4 win-installer/PHPInstallerBase52NTS.wxs:1.5 --- win-installer/PHPInstallerBase52NTS.wxs:1.4 Thu Sep 11 19:14:57 2008 +++ win-installer/PHPInstallerBase52NTS.wxs Fri Sep 12 16:03:32 2008 @@ -440,16 +440,28 @@ <Binary Id="PHPInstallerScripts" SourceFile="PHPInstallerScripts52.vbs" /> <CustomAction Id="iis700FastCGIadd" - ExeCommand=""[WindowsFolder]System32\inetsrv\APPCMD.EXE" SET CONFIG /section:system.webServer/fastCGI /+[fullPath='[INSTALLDIR]php-cgi.exe']" + ExeCommand=""[WindowsFolder]system32\inetsrv\APPCMD.EXE" SET CONFIG -section:system.webServer/fastCGI /+"[\[]fullPath='[INSTALLDIR]php-cgi.exe'[\]]"" Return="ignore" + Execute="deferred" + Impersonate="no" + Directory="INSTALLDIR"/> + <CustomAction Id="iis700FastCGIaddremove" + ExeCommand=""[WindowsFolder]system32\inetsrv\APPCMD.EXE" SET CONFIG -section:system.webServer/fastCGI /-"[\[]fullPath='[INSTALLDIR]php-cgi.exe'[\]]"" + Return="ignore" + Execute="deferred" + Impersonate="no" Directory="INSTALLDIR"/> <CustomAction Id="iis700FastCGI" - ExeCommand=""[WindowsFolder]System32\inetsrv\APPCMD.EXE" SET CONFIG /section:system.webServer/handlers /+[name='PHP-FastCGI',path='*.php',verb='*',modules='FastCgiModule',scriptProcessor='[INSTALLDIR]php-cgi.exe',resourceType='Either'] " + ExeCommand=""[WindowsFolder]system32\inetsrv\APPCMD.EXE" SET CONFIG /section:system.webServer/handlers /+"[\[]name='PHP_via_FastCGI',path='*.php',verb='*',modules='FastCgiModule',scriptProcessor='[INSTALLDIR]php-cgi.exe',resourceType='Either'[\]]"" Return="ignore" + Execute="deferred" + Impersonate="no" Directory="INSTALLDIR"/> <CustomAction Id="iis700FastCGIremove" - ExeCommand=""[WindowsFolder]System32\inetsrv\APPCMD.EXE" SET CONFIG /section:system.webServer/handlers /-[name='PHP-FastCGI',path='*.php',verb='*',modules='FastCgiModule',scriptProcessor='[INSTALLDIR]php-cgi.exe',resourceType='Either'] " + ExeCommand=""[WindowsFolder]system32\inetsrv\APPCMD.EXE" SET CONFIG /section:system.webServer/handlers /-"[\[]name='PHP_via_FastCGI',path='*.php',verb='*',modules='FastCgiModule',scriptProcessor='[INSTALLDIR]php-cgi.exe',resourceType='Either'[\]]"" Return="ignore" + Execute="deferred" + Impersonate="no" Directory="INSTALLDIR"/> <CustomAction Id="fcgiconfigJSFastCGI" ExeCommand="cscript "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -add -section:"PHP" -extension:php -path:"[INSTALLDIR]php-cgi.exe"" @@ -469,13 +481,16 @@ VBScriptCall="unconfigIIS4" /> <InstallExecuteSequence> - <Custom Action="iis700FastCGIadd" After="InstallFinalize"> + <Custom Action="iis700FastCGIadd" After="InstallInitialize"> <![CDATA[VersionNT >= 600 AND &iis4FastCGI = 3]]> </Custom> - <Custom Action="iis700FastCGI" After="InstallFinalize"> + <Custom Action="iis700FastCGIaddremove" After="InstallInitialize"> + <![CDATA[VersionNT >= 600 AND &iis4FastCGI = 2]]> + </Custom> + <Custom Action="iis700FastCGI" After="InstallInitialize"> <![CDATA[VersionNT >= 600 AND &iis4FastCGI = 3]]> </Custom> - <Custom Action="iis700FastCGIremove" After="InstallFinalize"> + <Custom Action="iis700FastCGIremove" After="InstallInitialize"> <![CDATA[VersionNT >= 600 AND &iis4FastCGI = 2]]> </Custom> <Custom Action="fcgiconfigJSFastCGI" After="InstallFinalize"> http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase53.wxs?r1=1.2&r2=1.3&diff_format=u Index: win-installer/PHPInstallerBase53.wxs diff -u win-installer/PHPInstallerBase53.wxs:1.2 win-installer/PHPInstallerBase53.wxs:1.3 --- win-installer/PHPInstallerBase53.wxs:1.2 Wed Sep 10 20:32:05 2008 +++ win-installer/PHPInstallerBase53.wxs Fri Sep 12 16:03:32 2008 @@ -526,16 +526,20 @@ Return="ignore" Directory="INSTALLDIR"/> <CustomAction Id="iis700FastCGIadd" - ExeCommand=""[WindowsFolder]System32\inetsrv\APPCMD.EXE" SET CONFIG /section:system.webServer/fastCGI /+[fullPath='[INSTALLDIR]php-cgi.exe']" + ExeCommand=""[WindowsFolder]system32\inetsrv\APPCMD.EXE" SET CONFIG -section:system.webServer/fastCGI /+"[\[]fullPath='[INSTALLDIR]php-cgi.exe'[\]]"" Return="ignore" + Execute="deferred" + Impersonate="no" Directory="INSTALLDIR"/> <CustomAction Id="iis700CGI" ExeCommand=""[WindowsFolder]System32\inetsrv\APPCMD.EXE" SET CONFIG -section:handlers "-+[name='PHP-CGI',path='*.php',verb='GET,HEAD,POST',modules='CgiModule',scriptProcessor='[INSTALLDIR]php-cgi.exe'"" Return="ignore" Directory="INSTALLDIR"/> <CustomAction Id="iis700FastCGI" - ExeCommand=""[WindowsFolder]System32\inetsrv\APPCMD.EXE" SET CONFIG /section:system.webServer/handlers /+[name='PHP-FastCGI',path='*.php',verb='*',modules='FastCgiModule',scriptProcessor='[INSTALLDIR]php-cgi.exe',resourceType='Either'] " + ExeCommand=""[WindowsFolder]system32\inetsrv\APPCMD.EXE" SET CONFIG /section:system.webServer/handlers /+"[\[]name='PHP_via_FastCGI',path='*.php',verb='*',modules='FastCgiModule',scriptProcessor='[INSTALLDIR]php-cgi.exe',resourceType='Either'[\]]"" Return="ignore" + Execute="deferred" + Impersonate="no" Directory="INSTALLDIR"/> <CustomAction Id="iis700ISAPI" ExeCommand=""[WindowsFolder]System32\inetsrv\APPCMD.EXE" SET CONFIG -section:handlers "-+[name='PHP-ISAPI',path='*.php',verb='GET,HEAD,POST',modules='IsapiModule',scriptProcessor='[INSTALLDIR]php5isapi.dll'"" @@ -553,9 +557,17 @@ ExeCommand=""[WindowsFolder]System32\inetsrv\APPCMD.EXE" SET CONFIG -section:handlers "--[name='PHP-CGI',path='*.php',verb='GET,HEAD,POST',modules='CgiModule',scriptProcessor='[INSTALLDIR]php-cgi.exe'"" Return="ignore" Directory="INSTALLDIR"/> + <CustomAction Id="iis700FastCGIaddremove" + ExeCommand=""[WindowsFolder]system32\inetsrv\APPCMD.EXE" SET CONFIG -section:system.webServer/fastCGI /-"[\[]fullPath='[INSTALLDIR]php-cgi.exe'[\]]"" + Return="ignore" + Execute="deferred" + Impersonate="no" + Directory="INSTALLDIR"/> <CustomAction Id="iis700FastCGIremove" - ExeCommand=""[WindowsFolder]System32\inetsrv\APPCMD.EXE" SET CONFIG /section:system.webServer/handlers /-[name='PHP-FastCGI',path='*.php',verb='*',modules='FastCgiModule',scriptProcessor='[INSTALLDIR]php-cgi.exe',resourceType='Either'] " + ExeCommand=""[WindowsFolder]system32\inetsrv\APPCMD.EXE" SET CONFIG /section:system.webServer/handlers /-"[\[]name='PHP_via_FastCGI',path='*.php',verb='*',modules='FastCgiModule',scriptProcessor='[INSTALLDIR]php-cgi.exe',resourceType='Either'[\]]"" Return="ignore" + Execute="deferred" + Impersonate="no" Directory="INSTALLDIR"/> <CustomAction Id="iis700ISAPIremove" ExeCommand=""[WindowsFolder]System32\inetsrv\APPCMD.EXE" SET CONFIG -section:handlers "--[name='PHP-ISAPI',path='*.php',verb='GET,HEAD,POST',modules='IsapiModule',scriptProcessor='[INSTALLDIR]php5isapi.dll'"" @@ -612,10 +624,10 @@ <Custom Action="netserveCGIInterpretersremove" After="InstallFinalize"> <![CDATA[&netserve = 2]]> </Custom> - <Custom Action="iis700FastCGIadd" After="InstallFinalize"> + <Custom Action="iis700FastCGIadd" After="InstallInitialize"> <![CDATA[VersionNT >= 600 AND &iis4FastCGI = 3]]> </Custom> - <Custom Action="iis700FastCGI" After="InstallFinalize"> + <Custom Action="iis700FastCGI" After="InstallInitialize"> <![CDATA[VersionNT >= 600 AND &iis4FastCGI = 3]]> </Custom> <Custom Action="iis700CGI" After="InstallFinalize"> @@ -633,7 +645,10 @@ <Custom Action="iis700CGIremove" After="InstallFinalize"> <![CDATA[VersionNT >= 600 AND &iis4CGI = 2]]> </Custom> - <Custom Action="iis700FastCGIremove" After="InstallFinalize"> + <Custom Action="iis700FastCGIaddremove" After="InstallInitialize"> + <![CDATA[VersionNT >= 600 AND &iis4FastCGI = 2]]> + </Custom> + <Custom Action="iis700FastCGIremove" After="InstallInitialize"> <![CDATA[VersionNT >= 600 AND &iis4FastCGI = 2]]> </Custom> <Custom Action="iis700ISAPIremove" After="InstallFinalize"> http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase53NTS.wxs?r1=1.3&r2=1.4&diff_format=u Index: win-installer/PHPInstallerBase53NTS.wxs diff -u win-installer/PHPInstallerBase53NTS.wxs:1.3 win-installer/PHPInstallerBase53NTS.wxs:1.4 --- win-installer/PHPInstallerBase53NTS.wxs:1.3 Thu Sep 11 19:14:57 2008 +++ win-installer/PHPInstallerBase53NTS.wxs Fri Sep 12 16:03:32 2008 @@ -410,19 +410,28 @@ <Binary Id="PHPInstallerScripts" SourceFile="PHPInstallerScripts52.vbs" /> <CustomAction Id="iis700FastCGIadd" - ExeCommand=""[WindowsFolder]system32\inetsrv\APPCMD.EXE" SET CONFIG /section:system.webServer/fastCGI /+[fullPath='[INSTALLDIR]php-cgi.exe']" + ExeCommand=""[WindowsFolder]system32\inetsrv\APPCMD.EXE" SET CONFIG -section:system.webServer/fastCGI /+"[\[]fullPath='[INSTALLDIR]php-cgi.exe'[\]]"" Return="ignore" Execute="deferred" + Impersonate="no" + Directory="INSTALLDIR"/> + <CustomAction Id="iis700FastCGIaddremove" + ExeCommand=""[WindowsFolder]system32\inetsrv\APPCMD.EXE" SET CONFIG -section:system.webServer/fastCGI /-"[\[]fullPath='[INSTALLDIR]php-cgi.exe'[\]]"" + Return="ignore" + Execute="deferred" + Impersonate="no" Directory="INSTALLDIR"/> <CustomAction Id="iis700FastCGI" - ExeCommand=""[WindowsFolder]system32\inetsrv\APPCMD.EXE" SET CONFIG /section:system.webServer/handlers /+[name='PHP-FastCGI',path='*.php',verb='*',modules='FastCgiModule',scriptProcessor='[INSTALLDIR]php-cgi.exe',resourceType='Either'] " + ExeCommand=""[WindowsFolder]system32\inetsrv\APPCMD.EXE" SET CONFIG /section:system.webServer/handlers /+"[\[]name='PHP_via_FastCGI',path='*.php',verb='*',modules='FastCgiModule',scriptProcessor='[INSTALLDIR]php-cgi.exe',resourceType='Either'[\]]"" Return="ignore" Execute="deferred" + Impersonate="no" Directory="INSTALLDIR"/> <CustomAction Id="iis700FastCGIremove" - ExeCommand=""[WindowsFolder]system32\inetsrv\APPCMD.EXE" SET CONFIG /section:system.webServer/handlers /-[name='PHP-FastCGI',path='*.php',verb='*',modules='FastCgiModule',scriptProcessor='[INSTALLDIR]php-cgi.exe',resourceType='Either'] " + ExeCommand=""[WindowsFolder]system32\inetsrv\APPCMD.EXE" SET CONFIG /section:system.webServer/handlers /-"[\[]name='PHP_via_FastCGI',path='*.php',verb='*',modules='FastCgiModule',scriptProcessor='[INSTALLDIR]php-cgi.exe',resourceType='Either'[\]]"" Return="ignore" Execute="deferred" + Impersonate="no" Directory="INSTALLDIR"/> <CustomAction Id="fcgiconfigJSFastCGI" ExeCommand="cscript "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -add -section:"PHP" -extension:php -path:"[INSTALLDIR]php-cgi.exe"" @@ -445,6 +454,9 @@ <Custom Action="iis700FastCGIadd" After="InstallInitialize"> <![CDATA[VersionNT >= 600 AND &iis4FastCGI = 3]]> </Custom> + <Custom Action="iis700FastCGIaddremove" After="InstallInitialize"> + <![CDATA[VersionNT >= 600 AND &iis4FastCGI = 2]]> + </Custom> <Custom Action="iis700FastCGI" After="InstallInitialize"> <![CDATA[VersionNT >= 600 AND &iis4FastCGI = 3]]> </Custom> http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase60.wxs?r1=1.18&r2=1.19&diff_format=u Index: win-installer/PHPInstallerBase60.wxs diff -u win-installer/PHPInstallerBase60.wxs:1.18 win-installer/PHPInstallerBase60.wxs:1.19 --- win-installer/PHPInstallerBase60.wxs:1.18 Wed Sep 10 20:33:14 2008 +++ win-installer/PHPInstallerBase60.wxs Fri Sep 12 16:03:32 2008 @@ -526,19 +526,23 @@ Return="ignore" Directory="INSTALLDIR"/> <CustomAction Id="iis700FastCGIadd" - ExeCommand=""[WindowsFolder]System32\inetsrv\APPCMD.EXE" SET CONFIG /section:system.webServer/fastCGI /+[fullPath='[INSTALLDIR]php-cgi.exe']" + ExeCommand=""[WindowsFolder]system32\inetsrv\APPCMD.EXE" SET CONFIG -section:system.webServer/fastCGI /+"[\[]fullPath='[INSTALLDIR]php-cgi.exe'[\]]"" Return="ignore" + Execute="deferred" + Impersonate="no" Directory="INSTALLDIR"/> <CustomAction Id="iis700CGI" ExeCommand=""[WindowsFolder]System32\inetsrv\APPCMD.EXE" SET CONFIG -section:handlers "-+[name='PHP-CGI',path='*.php',verb='GET,HEAD,POST',modules='CgiModule',scriptProcessor='[INSTALLDIR]php-cgi.exe'"" Return="ignore" Directory="INSTALLDIR"/> <CustomAction Id="iis700FastCGI" - ExeCommand=""[WindowsFolder]System32\inetsrv\APPCMD.EXE" SET CONFIG /section:system.webServer/handlers /+[name='PHP-FastCGI',path='*.php',verb='*',modules='FastCgiModule',scriptProcessor='[INSTALLDIR]php-cgi.exe',resourceType='Either'] " + ExeCommand=""[WindowsFolder]system32\inetsrv\APPCMD.EXE" SET CONFIG /section:system.webServer/handlers /+"[\[]name='PHP_via_FastCGI',path='*.php',verb='*',modules='FastCgiModule',scriptProcessor='[INSTALLDIR]php-cgi.exe',resourceType='Either'[\]]"" Return="ignore" + Execute="deferred" + Impersonate="no" Directory="INSTALLDIR"/> <CustomAction Id="iis700ISAPI" - ExeCommand=""[WindowsFolder]System32\inetsrv\APPCMD.EXE" SET CONFIG -section:handlers "-+[name='PHP-ISAPI',path='*.php',verb='GET,HEAD,POST',modules='IsapiModule',scriptProcessor='[INSTALLDIR]php6isapi.dll'"" + ExeCommand=""[WindowsFolder]System32\inetsrv\APPCMD.EXE" SET CONFIG -section:handlers "-+[name='PHP-ISAPI',path='*.php',verb='GET,HEAD,POST',modules='IsapiModule',scriptProcessor='[INSTALLDIR]php5isapi.dll'"" Return="ignore" Directory="INSTALLDIR"/> <CustomAction Id="iis700RCGI" @@ -546,19 +550,27 @@ Return="ignore" Directory="INSTALLDIR"/> <CustomAction Id="iis700RISAPI" - ExeCommand=""[WindowsFolder]System32\inetsrv\APPCMD.EXE" SET CONFIG -section:isapiCgiRestriction "-+[path='[INSTALLDIR]php6isapi.dll',allowed='true',groupId='PHP',description='PHP']"" + ExeCommand=""[WindowsFolder]System32\inetsrv\APPCMD.EXE" SET CONFIG -section:isapiCgiRestriction "-+[path='[INSTALLDIR]php5isapi.dll',allowed='true',groupId='PHP',description='PHP']"" Return="ignore" Directory="INSTALLDIR"/> <CustomAction Id="iis700CGIremove" ExeCommand=""[WindowsFolder]System32\inetsrv\APPCMD.EXE" SET CONFIG -section:handlers "--[name='PHP-CGI',path='*.php',verb='GET,HEAD,POST',modules='CgiModule',scriptProcessor='[INSTALLDIR]php-cgi.exe'"" Return="ignore" Directory="INSTALLDIR"/> + <CustomAction Id="iis700FastCGIaddremove" + ExeCommand=""[WindowsFolder]system32\inetsrv\APPCMD.EXE" SET CONFIG -section:system.webServer/fastCGI /-"[\[]fullPath='[INSTALLDIR]php-cgi.exe'[\]]"" + Return="ignore" + Execute="deferred" + Impersonate="no" + Directory="INSTALLDIR"/> <CustomAction Id="iis700FastCGIremove" - ExeCommand=""[WindowsFolder]System32\inetsrv\APPCMD.EXE" SET CONFIG /section:system.webServer/handlers /-[name='PHP-FastCGI',path='*.php',verb='*',modules='FastCgiModule',scriptProcessor='[INSTALLDIR]php-cgi.exe',resourceType='Either'] " + ExeCommand=""[WindowsFolder]system32\inetsrv\APPCMD.EXE" SET CONFIG /section:system.webServer/handlers /-"[\[]name='PHP_via_FastCGI',path='*.php',verb='*',modules='FastCgiModule',scriptProcessor='[INSTALLDIR]php-cgi.exe',resourceType='Either'[\]]"" Return="ignore" + Execute="deferred" + Impersonate="no" Directory="INSTALLDIR"/> <CustomAction Id="iis700ISAPIremove" - ExeCommand=""[WindowsFolder]System32\inetsrv\APPCMD.EXE" SET CONFIG -section:handlers "--[name='PHP-ISAPI',path='*.php',verb='GET,HEAD,POST',modules='IsapiModule',scriptProcessor='[INSTALLDIR]php6isapi.dll'"" + ExeCommand=""[WindowsFolder]System32\inetsrv\APPCMD.EXE" SET CONFIG -section:handlers "--[name='PHP-ISAPI',path='*.php',verb='GET,HEAD,POST',modules='IsapiModule',scriptProcessor='[INSTALLDIR]php5isapi.dll'"" Return="ignore" Directory="INSTALLDIR"/> <CustomAction Id="iisextVBSCGI" @@ -566,7 +578,7 @@ Return="ignore" Directory="INSTALLDIR"/> <CustomAction Id="iisextVBSISAPI" - ExeCommand="cscript "[WindowsFolder]system32\iisext.vbs" /AddFile "[INSTALLDIR]php6isapi.dll" 1 PHP 1 "PHP: Hypertext Processor"" + ExeCommand="cscript "[WindowsFolder]system32\iisext.vbs" /AddFile "[INSTALLDIR]php5isapi.dll" 1 PHP 1 "PHP: Hypertext Processor"" Return="ignore" Directory="INSTALLDIR"/> <CustomAction Id="iisextVBSCGIremove" @@ -574,7 +586,7 @@ Return="ignore" Directory="INSTALLDIR"/> <CustomAction Id="iisextVBSISAPIremove" - ExeCommand="cscript "[WindowsFolder]system32\iisext.vbs" /rmfile "[INSTALLDIR]php6isapi.dll"" + ExeCommand="cscript "[WindowsFolder]system32\iisext.vbs" /rmfile "[INSTALLDIR]php5isapi.dll"" Return="ignore" Directory="INSTALLDIR"/> <CustomAction Id="fcgiconfigJSFastCGI" @@ -612,10 +624,10 @@ <Custom Action="netserveCGIInterpretersremove" After="InstallFinalize"> <![CDATA[&netserve = 2]]> </Custom> - <Custom Action="iis700FastCGIadd" After="InstallFinalize"> + <Custom Action="iis700FastCGIadd" After="InstallInitialize"> <![CDATA[VersionNT >= 600 AND &iis4FastCGI = 3]]> </Custom> - <Custom Action="iis700FastCGI" After="InstallFinalize"> + <Custom Action="iis700FastCGI" After="InstallInitialize"> <![CDATA[VersionNT >= 600 AND &iis4FastCGI = 3]]> </Custom> <Custom Action="iis700CGI" After="InstallFinalize"> @@ -633,7 +645,10 @@ <Custom Action="iis700CGIremove" After="InstallFinalize"> <![CDATA[VersionNT >= 600 AND &iis4CGI = 2]]> </Custom> - <Custom Action="iis700FastCGIremove" After="InstallFinalize"> + <Custom Action="iis700FastCGIaddremove" After="InstallInitialize"> + <![CDATA[VersionNT >= 600 AND &iis4FastCGI = 2]]> + </Custom> + <Custom Action="iis700FastCGIremove" After="InstallInitialize"> <![CDATA[VersionNT >= 600 AND &iis4FastCGI = 2]]> </Custom> <Custom Action="iis700ISAPIremove" After="InstallFinalize"> http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase60NTS.wxs?r1=1.4&r2=1.5&diff_format=u Index: win-installer/PHPInstallerBase60NTS.wxs diff -u win-installer/PHPInstallerBase60NTS.wxs:1.4 win-installer/PHPInstallerBase60NTS.wxs:1.5 --- win-installer/PHPInstallerBase60NTS.wxs:1.4 Thu Sep 11 19:14:57 2008 +++ win-installer/PHPInstallerBase60NTS.wxs Fri Sep 12 16:03:32 2008 @@ -410,16 +410,28 @@ <Binary Id="PHPInstallerScripts" SourceFile="PHPInstallerScripts52.vbs" /> <CustomAction Id="iis700FastCGIadd" - ExeCommand=""[WindowsFolder]System32\inetsrv\APPCMD.EXE" SET CONFIG /section:system.webServer/fastCGI /+[fullPath='[INSTALLDIR]php-cgi.exe']" + ExeCommand=""[WindowsFolder]system32\inetsrv\APPCMD.EXE" SET CONFIG -section:system.webServer/fastCGI /+"[\[]fullPath='[INSTALLDIR]php-cgi.exe'[\]]"" Return="ignore" + Execute="deferred" + Impersonate="no" + Directory="INSTALLDIR"/> + <CustomAction Id="iis700FastCGIaddremove" + ExeCommand=""[WindowsFolder]system32\inetsrv\APPCMD.EXE" SET CONFIG -section:system.webServer/fastCGI /-"[\[]fullPath='[INSTALLDIR]php-cgi.exe'[\]]"" + Return="ignore" + Execute="deferred" + Impersonate="no" Directory="INSTALLDIR"/> <CustomAction Id="iis700FastCGI" - ExeCommand=""[WindowsFolder]System32\inetsrv\APPCMD.EXE" SET CONFIG /section:system.webServer/handlers /+[name='PHP-FastCGI',path='*.php',verb='*',modules='FastCgiModule',scriptProcessor='[INSTALLDIR]php-cgi.exe',resourceType='Either'] " + ExeCommand=""[WindowsFolder]system32\inetsrv\APPCMD.EXE" SET CONFIG /section:system.webServer/handlers /+"[\[]name='PHP_via_FastCGI',path='*.php',verb='*',modules='FastCgiModule',scriptProcessor='[INSTALLDIR]php-cgi.exe',resourceType='Either'[\]]"" Return="ignore" + Execute="deferred" + Impersonate="no" Directory="INSTALLDIR"/> <CustomAction Id="iis700FastCGIremove" - ExeCommand=""[WindowsFolder]System32\inetsrv\APPCMD.EXE" SET CONFIG /section:system.webServer/handlers /-[name='PHP-FastCGI',path='*.php',verb='*',modules='FastCgiModule',scriptProcessor='[INSTALLDIR]php-cgi.exe',resourceType='Either'] " + ExeCommand=""[WindowsFolder]system32\inetsrv\APPCMD.EXE" SET CONFIG /section:system.webServer/handlers /-"[\[]name='PHP_via_FastCGI',path='*.php',verb='*',modules='FastCgiModule',scriptProcessor='[INSTALLDIR]php-cgi.exe',resourceType='Either'[\]]"" Return="ignore" + Execute="deferred" + Impersonate="no" Directory="INSTALLDIR"/> <CustomAction Id="fcgiconfigJSFastCGI" ExeCommand="cscript "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -add -section:"PHP" -extension:php -path:"[INSTALLDIR]php-cgi.exe"" @@ -439,13 +451,16 @@ VBScriptCall="unconfigIIS4" /> <InstallExecuteSequence> - <Custom Action="iis700FastCGIadd" After="InstallFinalize"> + <Custom Action="iis700FastCGIadd" After="InstallInitialize"> <![CDATA[VersionNT >= 600 AND &iis4FastCGI = 3]]> </Custom> - <Custom Action="iis700FastCGI" After="InstallFinalize"> + <Custom Action="iis700FastCGIaddremove" After="InstallInitialize"> + <![CDATA[VersionNT >= 600 AND &iis4FastCGI = 2]]> + </Custom> + <Custom Action="iis700FastCGI" After="InstallInitialize"> <![CDATA[VersionNT >= 600 AND &iis4FastCGI = 3]]> </Custom> - <Custom Action="iis700FastCGIremove" After="InstallFinalize"> + <Custom Action="iis700FastCGIremove" After="InstallInitialize"> <![CDATA[VersionNT >= 600 AND &iis4FastCGI = 2]]> </Custom> <Custom Action="fcgiconfigJSFastCGI" After="InstallFinalize">