jmertic         Sun Dec 21 04:11:21 2008 UTC

  Modified files:              
    /win-installer      PHPInstallerBase52.wxs PHPInstallerBase52NTS.wxs 
                        PHPInstallerBase53.wxs PHPInstallerBase53NTS.wxs 
                        PHPInstallerBase60.wxs PHPInstallerBase60NTS.wxs 
                        WebServerConfig53.wxs 
  Log:
  Add automatic setting of PHPRC, instanceMaxRequests, and 
PHP_FCGI_MAX_REQUESTS variables for IIS FastCGI.
  
  Don't disable the apache13 components; only the VC9 builds are currently 
broken.
  
http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase52.wxs?r1=1.32&r2=1.33&diff_format=u
Index: win-installer/PHPInstallerBase52.wxs
diff -u win-installer/PHPInstallerBase52.wxs:1.32 
win-installer/PHPInstallerBase52.wxs:1.33
--- win-installer/PHPInstallerBase52.wxs:1.32   Tue Dec 16 21:12:25 2008
+++ win-installer/PHPInstallerBase52.wxs        Sun Dec 21 04:11:21 2008
@@ -584,6 +584,24 @@
          Execute="deferred"
          Impersonate="no"
       Directory="INSTALLDIR"/>
+    <CustomAction Id="iis700FastCGISetPHPRC" 
+      ExeCommand="&quot;[WindowsFolder]system32\inetsrv\APPCMD.EXE&quot; SET 
CONFIG /section:system.webServer/fastCGI 
/+&quot;[fullPath='[INSTALLDIR]php-cgi.exe'].environmentVariables.[name='PHPRC',value='[INSTALLDIR]']&quot;
 /commit:apphost" 
+      Return="ignore" 
+         Execute="deferred"
+         Impersonate="no"
+      Directory="INSTALLDIR"/>
+    <CustomAction Id="iis700FastCGISetInstanceMaxRequests" 
+      ExeCommand="&quot;[WindowsFolder]system32\inetsrv\APPCMD.EXE&quot; SET 
CONFIG /section:system.webServer/fastCGI 
/+&quot;[fullPath='[INSTALLDIR]php-cgi.exe'].instanceMaxRequests:10000 
/commit:apphost" 
+      Return="ignore" 
+         Execute="deferred"
+         Impersonate="no"
+      Directory="INSTALLDIR"/>
+    <CustomAction Id="iis700FastCGISetPHP_FCGI_MAX_REQUESTS" 
+      ExeCommand="&quot;[WindowsFolder]system32\inetsrv\APPCMD.EXE&quot; SET 
CONFIG /section:system.webServer/fastCGI 
/+&quot;[fullPath='[INSTALLDIR]php-cgi.exe'].environmentVariables.[name='PHP_FCGI_MAX_REQUESTS',value='10000']
 /commit:apphost" 
+      Return="ignore" 
+         Execute="deferred"
+         Impersonate="no"
+      Directory="INSTALLDIR"/>
     <CustomAction Id="iis700ISAPI" 
       ExeCommand="&quot;[WindowsFolder]System32\inetsrv\APPCMD.EXE&quot; SET 
CONFIG -section:handlers 
&quot;-+[name='PHP-ISAPI',path='*.php',verb='GET,HEAD,POST',modules='IsapiModule',scriptProcessor='[INSTALLDIR]php5isapi.dll'&quot;"
 
       Return="ignore" 
@@ -656,8 +674,26 @@
       Execute="deferred"
          Impersonate="no"
       Directory="INSTALLDIR"/>
+    <CustomAction Id="fcgiconfigJSFastCGISetPHPRC" 
+      ExeCommand="cscript 
&quot;[WindowsFolder]system32\inetsrv\fcgiconfig.js&quot; -set 
-section:&quot;PHP&quot; -EnvironmentVars:PHPRC:&quot;[INSTALLDIR]&quot;"
+      Return="ignore" 
+      Execute="deferred"
+         Impersonate="no"
+      Directory="INSTALLDIR"/>
+    <CustomAction Id="fcgiconfigJSFastCGISetInstanceMaxRequests" 
+      ExeCommand="cscript 
&quot;[WindowsFolder]system32\inetsrv\fcgiconfig.js&quot; -set 
-section:&quot;PHP&quot; -InstanceMaxRequests:10000"
+      Return="ignore" 
+      Execute="deferred"
+         Impersonate="no"
+      Directory="INSTALLDIR"/>
+    <CustomAction Id="fcgiconfigJSFastCGISetPHP_FCGI_MAX_REQUESTS" 
+      ExeCommand="cscript 
&quot;[WindowsFolder]system32\inetsrv\fcgiconfig.js&quot; -set 
-section:&quot;PHP&quot; -EnvironmentVars:PHP_FCGI_MAX_REQUESTS:10000"
+      Return="ignore" 
+      Execute="deferred"
+         Impersonate="no"
+      Directory="INSTALLDIR"/>
     <CustomAction Id="fcgiconfigJSFastCGIremove" 
-      ExeCommand="cscript 
&quot;[WindowsFolder]system32\inetsrv\fcgiconfig.js&quot; -remove 
-section:&quot;PHP&quot;ß"
+      ExeCommand="cscript 
&quot;[WindowsFolder]system32\inetsrv\fcgiconfig.js&quot; -remove 
-section:&quot;PHP&quot;"
       Return="ignore" 
       Execute="deferred"
          Impersonate="no"
@@ -695,6 +731,15 @@
       <Custom Action="iis700FastCGI" After="InstallInitialize">
         <![CDATA[VersionNT >= 600 AND &iis4FastCGI = 3]]>
       </Custom>
+      <Custom Action="iis700FastCGISetPHPRC" After="InstallInitialize">
+        <![CDATA[VersionNT >= 600 AND &iis4FastCGI = 3]]>
+      </Custom>
+      <Custom Action="iis700FastCGISetInstanceMaxRequests" 
After="InstallInitialize">
+        <![CDATA[VersionNT >= 600 AND &iis4FastCGI = 3]]>
+      </Custom>
+      <Custom Action="iis700FastCGISetPHPRC" After="InstallInitialize">
+        <![CDATA[VersionNT >= 600 AND &iis4FastCGI = 3]]>
+      </Custom>
       <Custom Action="iis700CGI" After="InstallInitialize">
         <![CDATA[VersionNT >= 600 AND &iis4CGI = 3]]>
       </Custom>
@@ -734,6 +779,15 @@
       <Custom Action="fcgiconfigJSFastCGI" After="InstallInitialize">
         <![CDATA[((VersionNT = 501 AND ServicePackLevel >= 2) OR (VersionNT = 
502 AND ServicePackLevel >= 2)) AND &iis4FastCGI = 3]]>
       </Custom>
+      <Custom Action="fcgiconfigJSFastCGISetPHPRC" After="InstallInitialize">
+        <![CDATA[((VersionNT = 501 AND ServicePackLevel >= 2) OR (VersionNT = 
502 AND ServicePackLevel >= 2)) AND &iis4FastCGI = 3]]>
+      </Custom>
+      <Custom Action="fcgiconfigJSFastCGISetInstanceMaxRequests" 
After="InstallInitialize">
+        <![CDATA[((VersionNT = 501 AND ServicePackLevel >= 2) OR (VersionNT = 
502 AND ServicePackLevel >= 2)) AND &iis4FastCGI = 3]]>
+      </Custom>
+      <Custom Action="fcgiconfigJSFastCGISetPHP_FCGI_MAX_REQUESTS" 
After="InstallInitialize">
+        <![CDATA[((VersionNT = 501 AND ServicePackLevel >= 2) OR (VersionNT = 
502 AND ServicePackLevel >= 2)) AND &iis4FastCGI = 3]]>
+      </Custom>
       <Custom Action="fcgiconfigJSFastCGIremove" After="InstallInitialize">
         <![CDATA[((VersionNT = 501 AND ServicePackLevel >= 2) OR (VersionNT = 
502 AND ServicePackLevel >= 2)) AND &iis4FastCGI = 2]]>
       </Custom>
http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase52NTS.wxs?r1=1.8&r2=1.9&diff_format=u
Index: win-installer/PHPInstallerBase52NTS.wxs
diff -u win-installer/PHPInstallerBase52NTS.wxs:1.8 
win-installer/PHPInstallerBase52NTS.wxs:1.9
--- win-installer/PHPInstallerBase52NTS.wxs:1.8 Tue Dec 16 21:12:25 2008
+++ win-installer/PHPInstallerBase52NTS.wxs     Sun Dec 21 04:11:21 2008
@@ -460,6 +460,24 @@
          Execute="deferred"
          Impersonate="no"
       Directory="INSTALLDIR"/>
+    <CustomAction Id="iis700FastCGISetPHPRC" 
+      ExeCommand="&quot;[WindowsFolder]system32\inetsrv\APPCMD.EXE&quot; SET 
CONFIG /section:system.webServer/fastCGI 
/+&quot;[fullPath='[INSTALLDIR]php-cgi.exe'].environmentVariables.[name='PHPRC',value='[INSTALLDIR]']&quot;
 /commit:apphost" 
+      Return="ignore" 
+         Execute="deferred"
+         Impersonate="no"
+      Directory="INSTALLDIR"/>
+    <CustomAction Id="iis700FastCGISetInstanceMaxRequests" 
+      ExeCommand="&quot;[WindowsFolder]system32\inetsrv\APPCMD.EXE&quot; SET 
CONFIG /section:system.webServer/fastCGI 
/+&quot;[fullPath='[INSTALLDIR]php-cgi.exe'].instanceMaxRequests:10000 
/commit:apphost" 
+      Return="ignore" 
+         Execute="deferred"
+         Impersonate="no"
+      Directory="INSTALLDIR"/>
+    <CustomAction Id="iis700FastCGISetPHP_FCGI_MAX_REQUESTS" 
+      ExeCommand="&quot;[WindowsFolder]system32\inetsrv\APPCMD.EXE&quot; SET 
CONFIG /section:system.webServer/fastCGI 
/+&quot;[fullPath='[INSTALLDIR]php-cgi.exe'].environmentVariables.[name='PHP_FCGI_MAX_REQUESTS',value='10000']
 /commit:apphost" 
+      Return="ignore" 
+         Execute="deferred"
+         Impersonate="no"
+      Directory="INSTALLDIR"/>
     <CustomAction Id="iis700FastCGIremove" 
       ExeCommand="&quot;[WindowsFolder]system32\inetsrv\APPCMD.EXE&quot; SET 
CONFIG /section:system.webServer/handlers 
/-&quot;[\[]name='PHP_via_FastCGI',path='*.php',verb='*',modules='FastCgiModule',scriptProcessor='[INSTALLDIR]php-cgi.exe',resourceType='Either'[\]]&quot;"
 
       Return="ignore" 
@@ -469,10 +487,32 @@
     <CustomAction Id="fcgiconfigJSFastCGI" 
       ExeCommand="cscript 
&quot;[WindowsFolder]system32\inetsrv\fcgiconfig.js&quot; -add 
-section:&quot;PHP&quot; -extension:php 
-path:&quot;[INSTALLDIR]php-cgi.exe&quot;"
       Return="ignore" 
+      Execute="deferred"
+         Impersonate="no"
+      Directory="INSTALLDIR"/>
+    <CustomAction Id="fcgiconfigJSFastCGISetPHPRC" 
+      ExeCommand="cscript 
&quot;[WindowsFolder]system32\inetsrv\fcgiconfig.js&quot; -set 
-section:&quot;PHP&quot; -EnvironmentVars:PHPRC:&quot;[INSTALLDIR]&quot;"
+      Return="ignore" 
+      Execute="deferred"
+         Impersonate="no"
+      Directory="INSTALLDIR"/>
+    <CustomAction Id="fcgiconfigJSFastCGISetInstanceMaxRequests" 
+      ExeCommand="cscript 
&quot;[WindowsFolder]system32\inetsrv\fcgiconfig.js&quot; -set 
-section:&quot;PHP&quot; -InstanceMaxRequests:10000"
+      Return="ignore" 
+      Execute="deferred"
+         Impersonate="no"
+      Directory="INSTALLDIR"/>
+    <CustomAction Id="fcgiconfigJSFastCGISetPHP_FCGI_MAX_REQUESTS" 
+      ExeCommand="cscript 
&quot;[WindowsFolder]system32\inetsrv\fcgiconfig.js&quot; -set 
-section:&quot;PHP&quot; -EnvironmentVars:PHP_FCGI_MAX_REQUESTS:10000"
+      Return="ignore" 
+      Execute="deferred"
+         Impersonate="no"
       Directory="INSTALLDIR"/>
     <CustomAction Id="fcgiconfigJSFastCGIremove" 
       ExeCommand="cscript 
&quot;[WindowsFolder]system32\inetsrv\fcgiconfig.js&quot; -remove 
-section:&quot;PHP&quot;ß"
       Return="ignore" 
+      Execute="deferred"
+         Impersonate="no"
       Directory="INSTALLDIR"/>
     <CustomAction Id="configIIS4" 
       BinaryKey="PHPInstallerScripts" 
@@ -493,12 +533,30 @@
       <Custom Action="iis700FastCGI" After="InstallInitialize">
         <![CDATA[VersionNT >= 600 AND &iis4FastCGI = 3]]>
       </Custom>
+      <Custom Action="iis700FastCGISetPHPRC" After="InstallInitialize">
+        <![CDATA[VersionNT >= 600 AND &iis4FastCGI = 3]]>
+      </Custom>
+      <Custom Action="iis700FastCGISetInstanceMaxRequests" 
After="InstallInitialize">
+        <![CDATA[VersionNT >= 600 AND &iis4FastCGI = 3]]>
+      </Custom>
+      <Custom Action="iis700FastCGISetPHPRC" After="InstallInitialize">
+        <![CDATA[VersionNT >= 600 AND &iis4FastCGI = 3]]>
+      </Custom>
       <Custom Action="iis700FastCGIremove" After="InstallInitialize">
         <![CDATA[VersionNT >= 600 AND &iis4FastCGI = 2]]>
       </Custom>
       <Custom Action="fcgiconfigJSFastCGI" After="InstallInitialize">
         <![CDATA[((VersionNT = 501 AND ServicePackLevel >= 2) OR (VersionNT = 
502 AND ServicePackLevel >= 2)) AND &iis4FastCGI = 3]]>
       </Custom>
+      <Custom Action="fcgiconfigJSFastCGISetPHPRC" After="InstallInitialize">
+        <![CDATA[((VersionNT = 501 AND ServicePackLevel >= 2) OR (VersionNT = 
502 AND ServicePackLevel >= 2)) AND &iis4FastCGI = 3]]>
+      </Custom>
+      <Custom Action="fcgiconfigJSFastCGISetInstanceMaxRequests" 
After="InstallInitialize">
+        <![CDATA[((VersionNT = 501 AND ServicePackLevel >= 2) OR (VersionNT = 
502 AND ServicePackLevel >= 2)) AND &iis4FastCGI = 3]]>
+      </Custom>
+      <Custom Action="fcgiconfigJSFastCGISetPHP_FCGI_MAX_REQUESTS" 
After="InstallInitialize">
+        <![CDATA[((VersionNT = 501 AND ServicePackLevel >= 2) OR (VersionNT = 
502 AND ServicePackLevel >= 2)) AND &iis4FastCGI = 3]]>
+      </Custom>
       <Custom Action="fcgiconfigJSFastCGIremove" After="InstallInitialize">
         <![CDATA[((VersionNT = 501 AND ServicePackLevel >= 2) OR (VersionNT = 
502 AND ServicePackLevel >= 2)) AND &iis4FastCGI = 2]]>
       </Custom>
http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase53.wxs?r1=1.8&r2=1.9&diff_format=u
Index: win-installer/PHPInstallerBase53.wxs
diff -u win-installer/PHPInstallerBase53.wxs:1.8 
win-installer/PHPInstallerBase53.wxs:1.9
--- win-installer/PHPInstallerBase53.wxs:1.8    Tue Dec 16 21:12:25 2008
+++ win-installer/PHPInstallerBase53.wxs        Sun Dec 21 04:11:21 2008
@@ -407,7 +407,7 @@
           Level="10">
           <ComponentRef Id="php5apache2_2DLL"/>
           <ComponentRef Id="php5apache2_2_filterDLL"/>
-<!--          <ComponentRef Id="php5apache_hooksDLL"/>-->
+          <ComponentRef Id="php5apache_hooksDLL"/>
           <ComponentRef Id="phpwinEXE"/>
           <ComponentRef Id="apache22registry"/>
         </Feature>
@@ -532,7 +532,7 @@
          Impersonate="no"
       Directory="INSTALLDIR"/>
     <CustomAction Id="netserveCGIInterpretersremove" 
-      ExeCommand="&quot;[%sProgramFiles]NetServe Web Server\config.exe /del 
CGIInterpreters php^|[INSTALLDIR]php-cgi.exe']" 
+      ExeCommand="&quot;[%ProgramFiles]NetServe Web Server\config.exe /del 
CGIInterpreters php^|[INSTALLDIR]php-cgi.exe']" 
       Return="ignore" 
       Execute="deferred"
          Impersonate="no"
@@ -555,6 +555,24 @@
          Execute="deferred"
          Impersonate="no"
       Directory="INSTALLDIR"/>
+    <CustomAction Id="iis700FastCGISetPHPRC" 
+      ExeCommand="&quot;[WindowsFolder]system32\inetsrv\APPCMD.EXE&quot; SET 
CONFIG /section:system.webServer/fastCGI 
/+&quot;[fullPath='[INSTALLDIR]php-cgi.exe'].environmentVariables.[name='PHPRC',value='[INSTALLDIR]']&quot;
 /commit:apphost" 
+      Return="ignore" 
+         Execute="deferred"
+         Impersonate="no"
+      Directory="INSTALLDIR"/>
+    <CustomAction Id="iis700FastCGISetInstanceMaxRequests" 
+      ExeCommand="&quot;[WindowsFolder]system32\inetsrv\APPCMD.EXE&quot; SET 
CONFIG /section:system.webServer/fastCGI 
/+&quot;[fullPath='[INSTALLDIR]php-cgi.exe'].instanceMaxRequests:10000 
/commit:apphost" 
+      Return="ignore" 
+         Execute="deferred"
+         Impersonate="no"
+      Directory="INSTALLDIR"/>
+    <CustomAction Id="iis700FastCGISetPHP_FCGI_MAX_REQUESTS" 
+      ExeCommand="&quot;[WindowsFolder]system32\inetsrv\APPCMD.EXE&quot; SET 
CONFIG /section:system.webServer/fastCGI 
/+&quot;[fullPath='[INSTALLDIR]php-cgi.exe'].environmentVariables.[name='PHP_FCGI_MAX_REQUESTS',value='10000']
 /commit:apphost" 
+      Return="ignore" 
+         Execute="deferred"
+         Impersonate="no"
+      Directory="INSTALLDIR"/>
     <CustomAction Id="iis700ISAPI" 
       ExeCommand="&quot;[WindowsFolder]System32\inetsrv\APPCMD.EXE&quot; SET 
CONFIG -section:handlers 
&quot;-+[name='PHP-ISAPI',path='*.php',verb='GET,HEAD,POST',modules='IsapiModule',scriptProcessor='[INSTALLDIR]php5isapi.dll'&quot;"
 
       Return="ignore" 
@@ -627,10 +645,29 @@
       Execute="deferred"
          Impersonate="no"
       Directory="INSTALLDIR"/>
+    <CustomAction Id="fcgiconfigJSFastCGISetPHPRC" 
+      ExeCommand="cscript 
&quot;[WindowsFolder]system32\inetsrv\fcgiconfig.js&quot; -set 
-section:&quot;PHP&quot; -EnvironmentVars:PHPRC:&quot;[INSTALLDIR]&quot;"
+      Return="ignore" 
+      Execute="deferred"
+         Impersonate="no"
+      Directory="INSTALLDIR"/>
+    <CustomAction Id="fcgiconfigJSFastCGISetInstanceMaxRequests" 
+      ExeCommand="cscript 
&quot;[WindowsFolder]system32\inetsrv\fcgiconfig.js&quot; -set 
-section:&quot;PHP&quot; -InstanceMaxRequests:10000"
+      Return="ignore" 
+      Execute="deferred"
+         Impersonate="no"
+      Directory="INSTALLDIR"/>
+    <CustomAction Id="fcgiconfigJSFastCGISetPHP_FCGI_MAX_REQUESTS" 
+      ExeCommand="cscript 
&quot;[WindowsFolder]system32\inetsrv\fcgiconfig.js&quot; -set 
-section:&quot;PHP&quot; -EnvironmentVars:PHP_FCGI_MAX_REQUESTS:10000"
+      Return="ignore" 
+      Execute="deferred"
+         Impersonate="no"
+      Directory="INSTALLDIR"/>
     <CustomAction Id="fcgiconfigJSFastCGIremove" 
-      ExeCommand="cscript 
&quot;[WindowsFolder]system32\inetsrv\fcgiconfig.js&quot; -remove 
-section:&quot;PHP&quot;ß"
+      ExeCommand="cscript 
&quot;[WindowsFolder]system32\inetsrv\fcgiconfig.js&quot; -remove 
-section:&quot;PHP&quot;"
       Return="ignore" 
-      Impersonate="no"
+      Execute="deferred"
+         Impersonate="no"
       Directory="INSTALLDIR"/>
     <CustomAction Id="configIIS4" 
       BinaryKey="PHPInstallerScripts" 
@@ -665,6 +702,15 @@
       <Custom Action="iis700FastCGI" After="InstallInitialize">
         <![CDATA[VersionNT >= 600 AND &iis4FastCGI = 3]]>
       </Custom>
+      <Custom Action="iis700FastCGISetPHPRC" After="InstallInitialize">
+        <![CDATA[VersionNT >= 600 AND &iis4FastCGI = 3]]>
+      </Custom>
+      <Custom Action="iis700FastCGISetInstanceMaxRequests" 
After="InstallInitialize">
+        <![CDATA[VersionNT >= 600 AND &iis4FastCGI = 3]]>
+      </Custom>
+      <Custom Action="iis700FastCGISetPHPRC" After="InstallInitialize">
+        <![CDATA[VersionNT >= 600 AND &iis4FastCGI = 3]]>
+      </Custom>
       <Custom Action="iis700CGI" After="InstallInitialize">
         <![CDATA[VersionNT >= 600 AND &iis4CGI = 3]]>
       </Custom>
@@ -704,6 +750,15 @@
       <Custom Action="fcgiconfigJSFastCGI" After="InstallInitialize">
         <![CDATA[((VersionNT = 501 AND ServicePackLevel >= 2) OR (VersionNT = 
502 AND ServicePackLevel >= 2)) AND &iis4FastCGI = 3]]>
       </Custom>
+      <Custom Action="fcgiconfigJSFastCGISetPHPRC" After="InstallInitialize">
+        <![CDATA[((VersionNT = 501 AND ServicePackLevel >= 2) OR (VersionNT = 
502 AND ServicePackLevel >= 2)) AND &iis4FastCGI = 3]]>
+      </Custom>
+      <Custom Action="fcgiconfigJSFastCGISetInstanceMaxRequests" 
After="InstallInitialize">
+        <![CDATA[((VersionNT = 501 AND ServicePackLevel >= 2) OR (VersionNT = 
502 AND ServicePackLevel >= 2)) AND &iis4FastCGI = 3]]>
+      </Custom>
+      <Custom Action="fcgiconfigJSFastCGISetPHP_FCGI_MAX_REQUESTS" 
After="InstallInitialize">
+        <![CDATA[((VersionNT = 501 AND ServicePackLevel >= 2) OR (VersionNT = 
502 AND ServicePackLevel >= 2)) AND &iis4FastCGI = 3]]>
+      </Custom>
       <Custom Action="fcgiconfigJSFastCGIremove" After="InstallInitialize">
         <![CDATA[((VersionNT = 501 AND ServicePackLevel >= 2) OR (VersionNT = 
502 AND ServicePackLevel >= 2)) AND &iis4FastCGI = 2]]>
       </Custom>
http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase53NTS.wxs?r1=1.7&r2=1.8&diff_format=u
Index: win-installer/PHPInstallerBase53NTS.wxs
diff -u win-installer/PHPInstallerBase53NTS.wxs:1.7 
win-installer/PHPInstallerBase53NTS.wxs:1.8
--- win-installer/PHPInstallerBase53NTS.wxs:1.7 Tue Dec 16 21:12:25 2008
+++ win-installer/PHPInstallerBase53NTS.wxs     Sun Dec 21 04:11:21 2008
@@ -431,6 +431,24 @@
          Execute="deferred"
          Impersonate="no"
       Directory="INSTALLDIR"/>
+    <CustomAction Id="iis700FastCGISetPHPRC" 
+      ExeCommand="&quot;[WindowsFolder]system32\inetsrv\APPCMD.EXE&quot; SET 
CONFIG /section:system.webServer/fastCGI 
/+&quot;[fullPath='[INSTALLDIR]php-cgi.exe'].environmentVariables.[name='PHPRC',value='[INSTALLDIR]']&quot;
 /commit:apphost" 
+      Return="ignore" 
+         Execute="deferred"
+         Impersonate="no"
+      Directory="INSTALLDIR"/>
+    <CustomAction Id="iis700FastCGISetInstanceMaxRequests" 
+      ExeCommand="&quot;[WindowsFolder]system32\inetsrv\APPCMD.EXE&quot; SET 
CONFIG /section:system.webServer/fastCGI 
/+&quot;[fullPath='[INSTALLDIR]php-cgi.exe'].instanceMaxRequests:10000 
/commit:apphost" 
+      Return="ignore" 
+         Execute="deferred"
+         Impersonate="no"
+      Directory="INSTALLDIR"/>
+    <CustomAction Id="iis700FastCGISetPHP_FCGI_MAX_REQUESTS" 
+      ExeCommand="&quot;[WindowsFolder]system32\inetsrv\APPCMD.EXE&quot; SET 
CONFIG /section:system.webServer/fastCGI 
/+&quot;[fullPath='[INSTALLDIR]php-cgi.exe'].environmentVariables.[name='PHP_FCGI_MAX_REQUESTS',value='10000']
 /commit:apphost" 
+      Return="ignore" 
+         Execute="deferred"
+         Impersonate="no"
+      Directory="INSTALLDIR"/>
     <CustomAction Id="iis700FastCGIremove" 
       ExeCommand="&quot;[WindowsFolder]system32\inetsrv\APPCMD.EXE&quot; SET 
CONFIG /section:system.webServer/handlers 
/-&quot;[\[]name='PHP_via_FastCGI',path='*.php',verb='*',modules='FastCgiModule',scriptProcessor='[INSTALLDIR]php-cgi.exe',resourceType='Either'[\]]&quot;"
 
       Return="ignore" 
@@ -440,10 +458,32 @@
     <CustomAction Id="fcgiconfigJSFastCGI" 
       ExeCommand="cscript 
&quot;[WindowsFolder]system32\inetsrv\fcgiconfig.js&quot; -add 
-section:&quot;PHP&quot; -extension:php 
-path:&quot;[INSTALLDIR]php-cgi.exe&quot;"
       Return="ignore" 
+      Execute="deferred"
+         Impersonate="no"
+      Directory="INSTALLDIR"/>
+    <CustomAction Id="fcgiconfigJSFastCGISetPHPRC" 
+      ExeCommand="cscript 
&quot;[WindowsFolder]system32\inetsrv\fcgiconfig.js&quot; -set 
-section:&quot;PHP&quot; -EnvironmentVars:PHPRC:&quot;[INSTALLDIR]&quot;"
+      Return="ignore" 
+      Execute="deferred"
+         Impersonate="no"
+      Directory="INSTALLDIR"/>
+    <CustomAction Id="fcgiconfigJSFastCGISetInstanceMaxRequests" 
+      ExeCommand="cscript 
&quot;[WindowsFolder]system32\inetsrv\fcgiconfig.js&quot; -set 
-section:&quot;PHP&quot; -InstanceMaxRequests:10000"
+      Return="ignore" 
+      Execute="deferred"
+         Impersonate="no"
+      Directory="INSTALLDIR"/>
+    <CustomAction Id="fcgiconfigJSFastCGISetPHP_FCGI_MAX_REQUESTS" 
+      ExeCommand="cscript 
&quot;[WindowsFolder]system32\inetsrv\fcgiconfig.js&quot; -set 
-section:&quot;PHP&quot; -EnvironmentVars:PHP_FCGI_MAX_REQUESTS:10000"
+      Return="ignore" 
+      Execute="deferred"
+         Impersonate="no"
       Directory="INSTALLDIR"/>
     <CustomAction Id="fcgiconfigJSFastCGIremove" 
       ExeCommand="cscript 
&quot;[WindowsFolder]system32\inetsrv\fcgiconfig.js&quot; -remove 
-section:&quot;PHP&quot;ß"
       Return="ignore" 
+      Execute="deferred"
+         Impersonate="no"
       Directory="INSTALLDIR"/>
     <CustomAction Id="configIIS4" 
       BinaryKey="PHPInstallerScripts" 
@@ -464,12 +504,30 @@
       <Custom Action="iis700FastCGI" After="InstallInitialize">
         <![CDATA[VersionNT >= 600 AND &iis4FastCGI = 3]]>
       </Custom>
+      <Custom Action="iis700FastCGISetPHPRC" After="InstallInitialize">
+        <![CDATA[VersionNT >= 600 AND &iis4FastCGI = 3]]>
+      </Custom>
+      <Custom Action="iis700FastCGISetInstanceMaxRequests" 
After="InstallInitialize">
+        <![CDATA[VersionNT >= 600 AND &iis4FastCGI = 3]]>
+      </Custom>
+      <Custom Action="iis700FastCGISetPHPRC" After="InstallInitialize">
+        <![CDATA[VersionNT >= 600 AND &iis4FastCGI = 3]]>
+      </Custom>
       <Custom Action="iis700FastCGIremove" After="InstallInitialize">
         <![CDATA[VersionNT >= 600 AND &iis4FastCGI = 2]]>
       </Custom>
       <Custom Action="fcgiconfigJSFastCGI" After="InstallInitialize">
         <![CDATA[((VersionNT = 501 AND ServicePackLevel >= 2) OR (VersionNT = 
502 AND ServicePackLevel >= 2)) AND &iis4FastCGI = 3]]>
       </Custom>
+      <Custom Action="fcgiconfigJSFastCGISetPHPRC" After="InstallInitialize">
+        <![CDATA[((VersionNT = 501 AND ServicePackLevel >= 2) OR (VersionNT = 
502 AND ServicePackLevel >= 2)) AND &iis4FastCGI = 3]]>
+      </Custom>
+      <Custom Action="fcgiconfigJSFastCGISetInstanceMaxRequests" 
After="InstallInitialize">
+        <![CDATA[((VersionNT = 501 AND ServicePackLevel >= 2) OR (VersionNT = 
502 AND ServicePackLevel >= 2)) AND &iis4FastCGI = 3]]>
+      </Custom>
+      <Custom Action="fcgiconfigJSFastCGISetPHP_FCGI_MAX_REQUESTS" 
After="InstallInitialize">
+        <![CDATA[((VersionNT = 501 AND ServicePackLevel >= 2) OR (VersionNT = 
502 AND ServicePackLevel >= 2)) AND &iis4FastCGI = 3]]>
+      </Custom>
       <Custom Action="fcgiconfigJSFastCGIremove" After="InstallInitialize">
         <![CDATA[((VersionNT = 501 AND ServicePackLevel >= 2) OR (VersionNT = 
502 AND ServicePackLevel >= 2)) AND &iis4FastCGI = 2]]>
       </Custom>
http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase60.wxs?r1=1.22&r2=1.23&diff_format=u
Index: win-installer/PHPInstallerBase60.wxs
diff -u win-installer/PHPInstallerBase60.wxs:1.22 
win-installer/PHPInstallerBase60.wxs:1.23
--- win-installer/PHPInstallerBase60.wxs:1.22   Tue Dec 16 21:12:25 2008
+++ win-installer/PHPInstallerBase60.wxs        Sun Dec 21 04:11:21 2008
@@ -522,14 +522,20 @@
     <CustomAction Id="netserveCGIInterpretersadd" 
       ExeCommand="&quot;[%ProgramFiles]NetServe Web Server\config.exe /add 
CGIInterpreters php^|[INSTALLDIR]php-cgi.exe']" 
       Return="ignore" 
+      Execute="deferred"
+         Impersonate="no"
       Directory="INSTALLDIR"/>
     <CustomAction Id="netserveCustomCGIVariablesadd" 
       ExeCommand="&quot;[%ProgramFiles]NetServe Web Server\config.exe /add 
CustomCGIVariables REDIRECT_STATUS^|200']" 
       Return="ignore" 
+      Execute="deferred"
+         Impersonate="no"
       Directory="INSTALLDIR"/>
     <CustomAction Id="netserveCGIInterpretersremove" 
       ExeCommand="&quot;[%ProgramFiles]NetServe Web Server\config.exe /del 
CGIInterpreters php^|[INSTALLDIR]php-cgi.exe']" 
       Return="ignore" 
+      Execute="deferred"
+         Impersonate="no"
       Directory="INSTALLDIR"/>
     <CustomAction Id="iis700FastCGIadd" 
       ExeCommand="&quot;[WindowsFolder]system32\inetsrv\APPCMD.EXE&quot; SET 
CONFIG -section:system.webServer/fastCGI 
/+&quot;[\[]fullPath='[INSTALLDIR]php-cgi.exe'[\]]&quot;" 
@@ -540,6 +546,8 @@
     <CustomAction Id="iis700CGI" 
       ExeCommand="&quot;[WindowsFolder]System32\inetsrv\APPCMD.EXE&quot; SET 
CONFIG -section:handlers 
&quot;-+[name='PHP-CGI',path='*.php',verb='GET,HEAD,POST',modules='CgiModule',scriptProcessor='[INSTALLDIR]php-cgi.exe'&quot;"
 
       Return="ignore" 
+      Execute="deferred"
+         Impersonate="no"
       Directory="INSTALLDIR"/>
     <CustomAction Id="iis700FastCGI" 
       ExeCommand="&quot;[WindowsFolder]system32\inetsrv\APPCMD.EXE&quot; SET 
CONFIG /section:system.webServer/handlers 
/+&quot;[\[]name='PHP_via_FastCGI',path='*.php',verb='*',modules='FastCgiModule',scriptProcessor='[INSTALLDIR]php-cgi.exe',resourceType='Either'[\]]&quot;"
 
@@ -547,21 +555,47 @@
          Execute="deferred"
          Impersonate="no"
       Directory="INSTALLDIR"/>
+    <CustomAction Id="iis700FastCGISetPHPRC" 
+      ExeCommand="&quot;[WindowsFolder]system32\inetsrv\APPCMD.EXE&quot; SET 
CONFIG /section:system.webServer/fastCGI 
/+&quot;[fullPath='[INSTALLDIR]php-cgi.exe'].environmentVariables.[name='PHPRC',value='[INSTALLDIR]']&quot;
 /commit:apphost" 
+      Return="ignore" 
+         Execute="deferred"
+         Impersonate="no"
+      Directory="INSTALLDIR"/>
+    <CustomAction Id="iis700FastCGISetInstanceMaxRequests" 
+      ExeCommand="&quot;[WindowsFolder]system32\inetsrv\APPCMD.EXE&quot; SET 
CONFIG /section:system.webServer/fastCGI 
/+&quot;[fullPath='[INSTALLDIR]php-cgi.exe'].instanceMaxRequests:10000 
/commit:apphost" 
+      Return="ignore" 
+         Execute="deferred"
+         Impersonate="no"
+      Directory="INSTALLDIR"/>
+    <CustomAction Id="iis700FastCGISetPHP_FCGI_MAX_REQUESTS" 
+      ExeCommand="&quot;[WindowsFolder]system32\inetsrv\APPCMD.EXE&quot; SET 
CONFIG /section:system.webServer/fastCGI 
/+&quot;[fullPath='[INSTALLDIR]php-cgi.exe'].environmentVariables.[name='PHP_FCGI_MAX_REQUESTS',value='10000']
 /commit:apphost" 
+      Return="ignore" 
+         Execute="deferred"
+         Impersonate="no"
+      Directory="INSTALLDIR"/>
     <CustomAction Id="iis700ISAPI" 
       ExeCommand="&quot;[WindowsFolder]System32\inetsrv\APPCMD.EXE&quot; SET 
CONFIG -section:handlers 
&quot;-+[name='PHP-ISAPI',path='*.php',verb='GET,HEAD,POST',modules='IsapiModule',scriptProcessor='[INSTALLDIR]php5isapi.dll'&quot;"
 
       Return="ignore" 
+      Execute="deferred"
+         Impersonate="no"
       Directory="INSTALLDIR"/>
     <CustomAction Id="iis700RCGI" 
       ExeCommand="&quot;[WindowsFolder]System32\inetsrv\APPCMD.EXE&quot; SET 
CONFIG -section:isapiCgiRestriction 
&quot;-+[path='[INSTALLDIR]php-cgi.exe',allowed='true',groupId='PHP',description='PHP']&quot;"
 
       Return="ignore" 
+      Execute="deferred"
+         Impersonate="no"
       Directory="INSTALLDIR"/>
     <CustomAction Id="iis700RISAPI" 
       ExeCommand="&quot;[WindowsFolder]System32\inetsrv\APPCMD.EXE&quot; SET 
CONFIG -section:isapiCgiRestriction 
&quot;-+[path='[INSTALLDIR]php5isapi.dll',allowed='true',groupId='PHP',description='PHP']&quot;"
 
       Return="ignore" 
+      Execute="deferred"
+         Impersonate="no"
       Directory="INSTALLDIR"/>
     <CustomAction Id="iis700CGIremove" 
       ExeCommand="&quot;[WindowsFolder]System32\inetsrv\APPCMD.EXE&quot; SET 
CONFIG -section:handlers 
&quot;--[name='PHP-CGI',path='*.php',verb='GET,HEAD,POST',modules='CgiModule',scriptProcessor='[INSTALLDIR]php-cgi.exe'&quot;"
 
       Return="ignore" 
+      Execute="deferred"
+         Impersonate="no"
       Directory="INSTALLDIR"/>
     <CustomAction Id="iis700FastCGIaddremove" 
       ExeCommand="&quot;[WindowsFolder]system32\inetsrv\APPCMD.EXE&quot; SET 
CONFIG -section:system.webServer/fastCGI 
/-&quot;[\[]fullPath='[INSTALLDIR]php-cgi.exe'[\]]&quot;" 
@@ -578,30 +612,62 @@
     <CustomAction Id="iis700ISAPIremove" 
       ExeCommand="&quot;[WindowsFolder]System32\inetsrv\APPCMD.EXE&quot; SET 
CONFIG -section:handlers 
&quot;--[name='PHP-ISAPI',path='*.php',verb='GET,HEAD,POST',modules='IsapiModule',scriptProcessor='[INSTALLDIR]php5isapi.dll'&quot;"
 
       Return="ignore" 
+      Execute="deferred"
+         Impersonate="no"
       Directory="INSTALLDIR"/>
     <CustomAction Id="iisextVBSCGI" 
       ExeCommand="cscript &quot;[WindowsFolder]system32\iisext.vbs&quot; 
/AddFile &quot;[INSTALLDIR]php-cgi.exe&quot; 1 PHP 1 &quot;PHP: Hypertext 
Processor&quot;"
       Return="ignore" 
+      Execute="deferred"
+         Impersonate="no"
       Directory="INSTALLDIR"/>
     <CustomAction Id="iisextVBSISAPI" 
       ExeCommand="cscript &quot;[WindowsFolder]system32\iisext.vbs&quot; 
/AddFile &quot;[INSTALLDIR]php5isapi.dll&quot; 1 PHP 1 &quot;PHP: Hypertext 
Processor&quot;" 
       Return="ignore" 
+      Execute="deferred"
+         Impersonate="no"
       Directory="INSTALLDIR"/>
     <CustomAction Id="iisextVBSCGIremove" 
       ExeCommand="cscript &quot;[WindowsFolder]system32\iisext.vbs&quot; 
/rmfile &quot;[INSTALLDIR]php-cgi.exe&quot;"
       Return="ignore" 
+      Execute="deferred"
+         Impersonate="no"
       Directory="INSTALLDIR"/>
     <CustomAction Id="iisextVBSISAPIremove" 
       ExeCommand="cscript &quot;[WindowsFolder]system32\iisext.vbs&quot; 
/rmfile &quot;[INSTALLDIR]php5isapi.dll&quot;" 
       Return="ignore" 
+      Execute="deferred"
+         Impersonate="no"
       Directory="INSTALLDIR"/>
     <CustomAction Id="fcgiconfigJSFastCGI" 
       ExeCommand="cscript 
&quot;[WindowsFolder]system32\inetsrv\fcgiconfig.js&quot; -add 
-section:&quot;PHP&quot; -extension:php 
-path:&quot;[INSTALLDIR]php-cgi.exe&quot;"
       Return="ignore" 
+      Execute="deferred"
+         Impersonate="no"
+      Directory="INSTALLDIR"/>
+    <CustomAction Id="fcgiconfigJSFastCGISetPHPRC" 
+      ExeCommand="cscript 
&quot;[WindowsFolder]system32\inetsrv\fcgiconfig.js&quot; -set 
-section:&quot;PHP&quot; -EnvironmentVars:PHPRC:&quot;[INSTALLDIR]&quot;"
+      Return="ignore" 
+      Execute="deferred"
+         Impersonate="no"
+      Directory="INSTALLDIR"/>
+    <CustomAction Id="fcgiconfigJSFastCGISetInstanceMaxRequests" 
+      ExeCommand="cscript 
&quot;[WindowsFolder]system32\inetsrv\fcgiconfig.js&quot; -set 
-section:&quot;PHP&quot; -InstanceMaxRequests:10000"
+      Return="ignore" 
+      Execute="deferred"
+         Impersonate="no"
+      Directory="INSTALLDIR"/>
+    <CustomAction Id="fcgiconfigJSFastCGISetPHP_FCGI_MAX_REQUESTS" 
+      ExeCommand="cscript 
&quot;[WindowsFolder]system32\inetsrv\fcgiconfig.js&quot; -set 
-section:&quot;PHP&quot; -EnvironmentVars:PHP_FCGI_MAX_REQUESTS:10000"
+      Return="ignore" 
+      Execute="deferred"
+         Impersonate="no"
       Directory="INSTALLDIR"/>
     <CustomAction Id="fcgiconfigJSFastCGIremove" 
-      ExeCommand="cscript 
&quot;[WindowsFolder]system32\inetsrv\fcgiconfig.js&quot; -remove 
-section:&quot;PHP&quot;ß"
+      ExeCommand="cscript 
&quot;[WindowsFolder]system32\inetsrv\fcgiconfig.js&quot; -remove 
-section:&quot;PHP&quot;"
       Return="ignore" 
+      Execute="deferred"
+         Impersonate="no"
       Directory="INSTALLDIR"/>
     <CustomAction Id="configIIS4" 
       BinaryKey="PHPInstallerScripts" 
@@ -621,13 +687,13 @@
       VBScriptCall="unconfigApache" />
   
     <InstallExecuteSequence>
-      <Custom Action="netserveCGIInterpretersadd" After="InstallFinalize">
+      <Custom Action="netserveCGIInterpretersadd" After="InstallInitialize">
         <![CDATA[&netserve = 3]]>
       </Custom>
-      <Custom Action="netserveCustomCGIVariablesadd" After="InstallFinalize">
+      <Custom Action="netserveCustomCGIVariablesadd" After="InstallInitialize">
         <![CDATA[&netserve = 3]]>
       </Custom>
-      <Custom Action="netserveCGIInterpretersremove" After="InstallFinalize">
+      <Custom Action="netserveCGIInterpretersremove" After="InstallInitialize">
         <![CDATA[&netserve = 2]]>
       </Custom>
       <Custom Action="iis700FastCGIadd" After="InstallInitialize">
@@ -636,19 +702,28 @@
       <Custom Action="iis700FastCGI" After="InstallInitialize">
         <![CDATA[VersionNT >= 600 AND &iis4FastCGI = 3]]>
       </Custom>
-      <Custom Action="iis700CGI" After="InstallFinalize">
+      <Custom Action="iis700FastCGISetPHPRC" After="InstallInitialize">
+        <![CDATA[VersionNT >= 600 AND &iis4FastCGI = 3]]>
+      </Custom>
+      <Custom Action="iis700FastCGISetInstanceMaxRequests" 
After="InstallInitialize">
+        <![CDATA[VersionNT >= 600 AND &iis4FastCGI = 3]]>
+      </Custom>
+      <Custom Action="iis700FastCGISetPHPRC" After="InstallInitialize">
+        <![CDATA[VersionNT >= 600 AND &iis4FastCGI = 3]]>
+      </Custom>
+      <Custom Action="iis700CGI" After="InstallInitialize">
         <![CDATA[VersionNT >= 600 AND &iis4CGI = 3]]>
       </Custom>
-      <Custom Action="iis700ISAPI" After="InstallFinalize">
+      <Custom Action="iis700ISAPI" After="InstallInitialize">
         <![CDATA[VersionNT >= 600 AND &iis4ISAPI = 3]]>
       </Custom>
-      <Custom Action="iis700RCGI" After="InstallFinalize">
+      <Custom Action="iis700RCGI" After="InstallInitialize">
         <![CDATA[VersionNT >= 600 AND &iis4CGI = 3]]>
       </Custom>
-      <Custom Action="iis700RISAPI" After="InstallFinalize">
+      <Custom Action="iis700RISAPI" After="InstallInitialize">
         <![CDATA[VersionNT >= 600 AND &iis4ISAPI = 3]]>
       </Custom>
-      <Custom Action="iis700CGIremove" After="InstallFinalize">
+      <Custom Action="iis700CGIremove" After="InstallInitialize">
         <![CDATA[VersionNT >= 600 AND &iis4CGI = 2]]>
       </Custom>
       <Custom Action="iis700FastCGIaddremove" After="InstallInitialize">
@@ -657,25 +732,34 @@
       <Custom Action="iis700FastCGIremove" After="InstallInitialize">
         <![CDATA[VersionNT >= 600 AND &iis4FastCGI = 2]]>
       </Custom>
-      <Custom Action="iis700ISAPIremove" After="InstallFinalize">
+      <Custom Action="iis700ISAPIremove" After="InstallInitialize">
         <![CDATA[VersionNT >= 600 AND &iis4ISAPI = 2]]>
       </Custom>
-      <Custom Action="iisextVBSCGI" After="InstallFinalize">
+      <Custom Action="iisextVBSCGI" After="InstallInitialize">
         <![CDATA[VersionNT = 502 AND &iis4CGI = 3]]>
       </Custom>
-      <Custom Action="iisextVBSISAPI" After="InstallFinalize">
+      <Custom Action="iisextVBSISAPI" After="InstallInitialize">
         <![CDATA[VersionNT = 502 AND &iis4ISAPI = 3]]>
       </Custom>
-      <Custom Action="iisextVBSCGIremove" After="InstallFinalize">
+      <Custom Action="iisextVBSCGIremove" After="InstallInitialize">
         <![CDATA[VersionNT = 502 AND &iis4CGI = 2]]>
       </Custom>
-      <Custom Action="iisextVBSISAPIremove" After="InstallFinalize">
+      <Custom Action="iisextVBSISAPIremove" After="InstallInitialize">
         <![CDATA[VersionNT = 502 AND &iis4ISAPI = 2]]>
       </Custom>
-      <Custom Action="fcgiconfigJSFastCGI" After="InstallFinalize">
+      <Custom Action="fcgiconfigJSFastCGI" After="InstallInitialize">
+        <![CDATA[((VersionNT = 501 AND ServicePackLevel >= 2) OR (VersionNT = 
502 AND ServicePackLevel >= 2)) AND &iis4FastCGI = 3]]>
+      </Custom>
+      <Custom Action="fcgiconfigJSFastCGISetPHPRC" After="InstallInitialize">
+        <![CDATA[((VersionNT = 501 AND ServicePackLevel >= 2) OR (VersionNT = 
502 AND ServicePackLevel >= 2)) AND &iis4FastCGI = 3]]>
+      </Custom>
+      <Custom Action="fcgiconfigJSFastCGISetInstanceMaxRequests" 
After="InstallInitialize">
+        <![CDATA[((VersionNT = 501 AND ServicePackLevel >= 2) OR (VersionNT = 
502 AND ServicePackLevel >= 2)) AND &iis4FastCGI = 3]]>
+      </Custom>
+      <Custom Action="fcgiconfigJSFastCGISetPHP_FCGI_MAX_REQUESTS" 
After="InstallInitialize">
         <![CDATA[((VersionNT = 501 AND ServicePackLevel >= 2) OR (VersionNT = 
502 AND ServicePackLevel >= 2)) AND &iis4FastCGI = 3]]>
       </Custom>
-      <Custom Action="fcgiconfigJSFastCGIremove" After="InstallFinalize">
+      <Custom Action="fcgiconfigJSFastCGIremove" After="InstallInitialize">
         <![CDATA[((VersionNT = 501 AND ServicePackLevel >= 2) OR (VersionNT = 
502 AND ServicePackLevel >= 2)) AND &iis4FastCGI = 2]]>
       </Custom>
       <Custom Action="unconfigIIS4" After="InstallValidate">
http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase60NTS.wxs?r1=1.8&r2=1.9&diff_format=u
Index: win-installer/PHPInstallerBase60NTS.wxs
diff -u win-installer/PHPInstallerBase60NTS.wxs:1.8 
win-installer/PHPInstallerBase60NTS.wxs:1.9
--- win-installer/PHPInstallerBase60NTS.wxs:1.8 Tue Dec 16 21:12:25 2008
+++ win-installer/PHPInstallerBase60NTS.wxs     Sun Dec 21 04:11:21 2008
@@ -431,6 +431,24 @@
          Execute="deferred"
          Impersonate="no"
       Directory="INSTALLDIR"/>
+    <CustomAction Id="iis700FastCGISetPHPRC" 
+      ExeCommand="&quot;[WindowsFolder]system32\inetsrv\APPCMD.EXE&quot; SET 
CONFIG /section:system.webServer/fastCGI 
/+&quot;[fullPath='[INSTALLDIR]php-cgi.exe'].environmentVariables.[name='PHPRC',value='[INSTALLDIR]']&quot;
 /commit:apphost" 
+      Return="ignore" 
+         Execute="deferred"
+         Impersonate="no"
+      Directory="INSTALLDIR"/>
+    <CustomAction Id="iis700FastCGISetInstanceMaxRequests" 
+      ExeCommand="&quot;[WindowsFolder]system32\inetsrv\APPCMD.EXE&quot; SET 
CONFIG /section:system.webServer/fastCGI 
/+&quot;[fullPath='[INSTALLDIR]php-cgi.exe'].instanceMaxRequests:10000 
/commit:apphost" 
+      Return="ignore" 
+         Execute="deferred"
+         Impersonate="no"
+      Directory="INSTALLDIR"/>
+    <CustomAction Id="iis700FastCGISetPHP_FCGI_MAX_REQUESTS" 
+      ExeCommand="&quot;[WindowsFolder]system32\inetsrv\APPCMD.EXE&quot; SET 
CONFIG /section:system.webServer/fastCGI 
/+&quot;[fullPath='[INSTALLDIR]php-cgi.exe'].environmentVariables.[name='PHP_FCGI_MAX_REQUESTS',value='10000']
 /commit:apphost" 
+      Return="ignore" 
+         Execute="deferred"
+         Impersonate="no"
+      Directory="INSTALLDIR"/>
     <CustomAction Id="iis700FastCGIremove" 
       ExeCommand="&quot;[WindowsFolder]system32\inetsrv\APPCMD.EXE&quot; SET 
CONFIG /section:system.webServer/handlers 
/-&quot;[\[]name='PHP_via_FastCGI',path='*.php',verb='*',modules='FastCgiModule',scriptProcessor='[INSTALLDIR]php-cgi.exe',resourceType='Either'[\]]&quot;"
 
       Return="ignore" 
@@ -440,10 +458,32 @@
     <CustomAction Id="fcgiconfigJSFastCGI" 
       ExeCommand="cscript 
&quot;[WindowsFolder]system32\inetsrv\fcgiconfig.js&quot; -add 
-section:&quot;PHP&quot; -extension:php 
-path:&quot;[INSTALLDIR]php-cgi.exe&quot;"
       Return="ignore" 
+      Execute="deferred"
+         Impersonate="no"
+      Directory="INSTALLDIR"/>
+    <CustomAction Id="fcgiconfigJSFastCGISetPHPRC" 
+      ExeCommand="cscript 
&quot;[WindowsFolder]system32\inetsrv\fcgiconfig.js&quot; -set 
-section:&quot;PHP&quot; -EnvironmentVars:PHPRC:&quot;[INSTALLDIR]&quot;"
+      Return="ignore" 
+      Execute="deferred"
+         Impersonate="no"
+      Directory="INSTALLDIR"/>
+    <CustomAction Id="fcgiconfigJSFastCGISetInstanceMaxRequests" 
+      ExeCommand="cscript 
&quot;[WindowsFolder]system32\inetsrv\fcgiconfig.js&quot; -set 
-section:&quot;PHP&quot; -InstanceMaxRequests:10000"
+      Return="ignore" 
+      Execute="deferred"
+         Impersonate="no"
+      Directory="INSTALLDIR"/>
+    <CustomAction Id="fcgiconfigJSFastCGISetPHP_FCGI_MAX_REQUESTS" 
+      ExeCommand="cscript 
&quot;[WindowsFolder]system32\inetsrv\fcgiconfig.js&quot; -set 
-section:&quot;PHP&quot; -EnvironmentVars:PHP_FCGI_MAX_REQUESTS:10000"
+      Return="ignore" 
+      Execute="deferred"
+         Impersonate="no"
       Directory="INSTALLDIR"/>
     <CustomAction Id="fcgiconfigJSFastCGIremove" 
       ExeCommand="cscript 
&quot;[WindowsFolder]system32\inetsrv\fcgiconfig.js&quot; -remove 
-section:&quot;PHP&quot;ß"
       Return="ignore" 
+      Execute="deferred"
+         Impersonate="no"
       Directory="INSTALLDIR"/>
     <CustomAction Id="configIIS4" 
       BinaryKey="PHPInstallerScripts" 
@@ -464,12 +504,30 @@
       <Custom Action="iis700FastCGI" After="InstallInitialize">
         <![CDATA[VersionNT >= 600 AND &iis4FastCGI = 3]]>
       </Custom>
+      <Custom Action="iis700FastCGISetPHPRC" After="InstallInitialize">
+        <![CDATA[VersionNT >= 600 AND &iis4FastCGI = 3]]>
+      </Custom>
+      <Custom Action="iis700FastCGISetInstanceMaxRequests" 
After="InstallInitialize">
+        <![CDATA[VersionNT >= 600 AND &iis4FastCGI = 3]]>
+      </Custom>
+      <Custom Action="iis700FastCGISetPHPRC" After="InstallInitialize">
+        <![CDATA[VersionNT >= 600 AND &iis4FastCGI = 3]]>
+      </Custom>
       <Custom Action="iis700FastCGIremove" After="InstallInitialize">
         <![CDATA[VersionNT >= 600 AND &iis4FastCGI = 2]]>
       </Custom>
       <Custom Action="fcgiconfigJSFastCGI" After="InstallInitialize">
         <![CDATA[((VersionNT = 501 AND ServicePackLevel >= 2) OR (VersionNT = 
502 AND ServicePackLevel >= 2)) AND &iis4FastCGI = 3]]>
       </Custom>
+      <Custom Action="fcgiconfigJSFastCGISetPHPRC" After="InstallInitialize">
+        <![CDATA[((VersionNT = 501 AND ServicePackLevel >= 2) OR (VersionNT = 
502 AND ServicePackLevel >= 2)) AND &iis4FastCGI = 3]]>
+      </Custom>
+      <Custom Action="fcgiconfigJSFastCGISetInstanceMaxRequests" 
After="InstallInitialize">
+        <![CDATA[((VersionNT = 501 AND ServicePackLevel >= 2) OR (VersionNT = 
502 AND ServicePackLevel >= 2)) AND &iis4FastCGI = 3]]>
+      </Custom>
+      <Custom Action="fcgiconfigJSFastCGISetPHP_FCGI_MAX_REQUESTS" 
After="InstallInitialize">
+        <![CDATA[((VersionNT = 501 AND ServicePackLevel >= 2) OR (VersionNT = 
502 AND ServicePackLevel >= 2)) AND &iis4FastCGI = 3]]>
+      </Custom>
       <Custom Action="fcgiconfigJSFastCGIremove" After="InstallInitialize">
         <![CDATA[((VersionNT = 501 AND ServicePackLevel >= 2) OR (VersionNT = 
502 AND ServicePackLevel >= 2)) AND &iis4FastCGI = 2]]>
       </Custom>
http://cvs.php.net/viewvc.cgi/win-installer/WebServerConfig53.wxs?r1=1.2&r2=1.3&diff_format=u
Index: win-installer/WebServerConfig53.wxs
diff -u win-installer/WebServerConfig53.wxs:1.2 
win-installer/WebServerConfig53.wxs:1.3
--- win-installer/WebServerConfig53.wxs:1.2     Mon Oct 13 09:57:01 2008
+++ win-installer/WebServerConfig53.wxs Sun Dec 21 04:11:21 2008
@@ -2,11 +2,9 @@
 <Wix xmlns='http://schemas.microsoft.com/wix/2003/01/wi'>
   <Fragment Id='FragmentWebServerConfig'>
     <DirectoryRef Id='INSTALLDIR'>
-<!--
       <Component Id="php5apacheDLL" DiskId="1" 
Guid="FEEF42A9-BCCA-44DD-88E5-501D39B87DA0">
         <File Id="filephp5apacheDLL" Name="PHP5AP_1.DLL" 
LongName="php5apache.dll" Source="Files\php5apache.dll" />
       </Component>
--->
       <Component Id="php5apache2DLL" DiskId="1" 
Guid="97997967-0ED5-4695-A714-F1333A0FC1B9">
         <File Id="filephp5apache2DLL" Name="PHP5AP_2.DLL" 
LongName="php5apache2.dll" Source="Files\php5apache2.dll" />
       </Component>
@@ -19,11 +17,9 @@
       <Component Id="php5apache2_2_filterDLL" DiskId="1" 
Guid="828FA07E-3624-11DC-8CB8-308555D89593">
         <File Id="filephp5apache2_2_filterDLL" Name="PHP5AP_3.DLL" 
LongName="php5apache2_2_filter.dll" Source="Files\php5apache2_2_filter.dll" />
       </Component>
-<!--
       <Component Id="php5apache_hooksDLL" DiskId="1" 
Guid="C4DB476D-1A0A-4C46-826C-1D3FD4BA45D0">
         <File Id="filephp5apache_hooksDLL" Name="PHP5AP_4.DLL" 
LongName="php5apache_hooks.dll" Source="Files\php5apache_hooks.dll" />
       </Component>
--->
       <Component Id="php5isapiDLL" DiskId="1" 
Guid="5B5419B5-917A-462A-B325-CB61B82E5FF2">
         <File Id="filephp5isapiDLL" Name="PHP5IS_1.DLL" 
LongName="php5isapi.dll" Source="Files\php5isapi.dll" />
       </Component>

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to