cvs: win-installer / PHPInstallerBase52.wxs PHPInstallerBase52NTS.wxs PHPInstallerBase53.wxs PHPInstallerBase53NTS.wxs PHPInstallerBase60.wxs
PHPInstallerBase60NTS.wxs WebServerConfig52.wxs WebServerConfig52NTS.wxs WebServerConfig53.wxs WebServerConfig53NTS.wxs WebServerConfig60.wxs
WebServerConfig60NTS.wxs
| From: | John Mertic | Date: | Mon, 08 Jun 2009 21:02:56 +0000 |
| Subject: | cvs: win-installer / PHPInstallerBase52.wxs PHPInstallerBase52NTS.wxs PHPInstallerBase53.wxs PHPInstallerBase53NTS.wxs PHPInstallerBase60.wxs PHPInstallerBase60NTS.wxs WebServerConfig52.wxs WebServerConfig52NTS.wxs WebServerConfig53.wxs WebServerConfig53NTS.wxs WebServerConfig60.wxs WebServerConfig60NTS.wxs |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-58564@lists.php.net to get a copy of this message | ||
jmertic Mon Jun 8 21:02:56 2009 UTC
Modified files:
/win-installer PHPInstallerBase52.wxs PHPInstallerBase52NTS.wxs
PHPInstallerBase53.wxs PHPInstallerBase53NTS.wxs
PHPInstallerBase60.wxs PHPInstallerBase60NTS.wxs
WebServerConfig52.wxs WebServerConfig52NTS.wxs
WebServerConfig53.wxs WebServerConfig53NTS.wxs
WebServerConfig60.wxs WebServerConfig60NTS.wxs
Log:
Default max_execution_time to 300 seconds, and set the FastCGI RequestTimeout and ActivityTimeout
to the same amount of time.
http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase52.wxs?r1=1.43&r2=1.44&diff_format=u Index: win-installer/PHPInstallerBase52.wxs diff -u win-installer/PHPInstallerBase52.wxs:1.43 win-installer/PHPInstallerBase52.wxs:1.44 --- win-installer/PHPInstallerBase52.wxs:1.43 Wed May 27 19:40:57 2009 +++ win-installer/PHPInstallerBase52.wxs Mon Jun 8 21:02:56 2009 @@ -454,6 +454,7 @@ <ComponentRef Id="phpcgiEXE"/> <ComponentRef Id="cgiforceredirect"/> <ComponentRef Id="fastcgiimpersonate"/> + <ComponentRef Id="maxexecutiontime" /> <ComponentRef Id="iis4FastCGIregistry"/> </Feature> <Feature AllowAdvertise="no" @@ -581,6 +582,24 @@ Return="ignore" Execute="deferred" Impersonate="no" /> + <CustomAction Id="iis700FastCGISetActivityTimeoutCmd" + Property="iis700FastCGISetActivityTimeout" + Value=""[WindowsFolder]system32\inetsrv\APPCMD.EXE" SET CONFIG -section:system.webServer/fastCGI "/[\[]fullPath='[INSTALLDIR]php-cgi.exe'[\]].activityTimeout:300" /commit:apphost" /> + <CustomAction Id="iis700FastCGISetActivityTimeout" + BinaryKey="WixCA" + DllEntry="CAQuietExec" + Return="ignore" + Execute="deferred" + Impersonate="no" /> + <CustomAction Id="iis700FastCGISetRequestTimeoutCmd" + Property="iis700FastCGISetRequestTimeout" + Value=""[WindowsFolder]system32\inetsrv\APPCMD.EXE" SET CONFIG -section:system.webServer/fastCGI "/[\[]fullPath='[INSTALLDIR]php-cgi.exe'[\]].requestTimeout:300" /commit:apphost" /> + <CustomAction Id="iis700FastCGISetRequestTimeout" + BinaryKey="WixCA" + DllEntry="CAQuietExec" + Return="ignore" + Execute="deferred" + Impersonate="no" /> <CustomAction Id="iis700FastCGISetPHP_FCGI_MAX_REQUESTSCmd" Property="iis700FastCGISetPHP_FCGI_MAX_REQUESTS" Value=""[WindowsFolder]system32\inetsrv\APPCMD.EXE" SET CONFIG -section:system.webServer/fastCGI /+"[\[]fullPath='[INSTALLDIR]php-cgi.exe'[\]].environmentVariables.[\[]name='PHP_FCGI_MAX_REQUESTS',value='10000'[\]]" /commit:apphost" /> @@ -669,6 +688,42 @@ Return="ignore" Execute="deferred" Impersonate="no" /> + <CustomAction Id="fcgiconfigJSFastCGISetActivityTimeoutCmd" + Property="fcgiconfigJSFastCGISetActivityTimeout" + Value=""\\localhost\admin$\system32\cscript.exe" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -ActivityTimeout:300" /> + <CustomAction Id="fcgiconfigJSFastCGISetActivityTimeout" + BinaryKey="WixCA" + DllEntry="CAQuietExec" + Return="ignore" + Execute="deferred" + Impersonate="no" /> + <CustomAction Id="fcgiconfigJSFastCGISetActivityTimeoutCmdXP" + Property="fcgiconfigJSFastCGISetActivityTimeoutXP" + Value=""cscript" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -ActivityTimeout:300" /> + <CustomAction Id="fcgiconfigJSFastCGISetActivityTimeoutXP" + BinaryKey="WixCA" + DllEntry="CAQuietExec" + Return="ignore" + Execute="deferred" + Impersonate="no" /> + <CustomAction Id="fcgiconfigJSFastCGISetRequestTimeoutCmd" + Property="fcgiconfigJSFastCGISetRequestTimeout" + Value=""\\localhost\admin$\system32\cscript.exe" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -RequestTimeout:300" /> + <CustomAction Id="fcgiconfigJSFastCGISetRequestTimeout" + BinaryKey="WixCA" + DllEntry="CAQuietExec" + Return="ignore" + Execute="deferred" + Impersonate="no" /> + <CustomAction Id="fcgiconfigJSFastCGISetRequestTimeoutCmdXP" + Property="fcgiconfigJSFastCGISetRequestTimeoutXP" + Value=""cscript" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -RequestTimeout:300" /> + <CustomAction Id="fcgiconfigJSFastCGISetRequestTimeoutXP" + BinaryKey="WixCA" + DllEntry="CAQuietExec" + Return="ignore" + Execute="deferred" + Impersonate="no" /> <CustomAction Id="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSCmd" Property="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTS" Value=""\\localhost\admin$\system32\cscript.exe" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -EnvironmentVars:PHP_FCGI_MAX_REQUESTS:10000,PHPRC:"[INSTALLDIR]"" /> @@ -753,7 +808,19 @@ <Custom Action="iis700FastCGISetInstanceMaxRequests" After="iis700FastCGISetInstanceMaxRequestsCmd"> <![CDATA[VersionNT >= 600 AND &iis4FastCGI = 3]]> </Custom> - <Custom Action="iis700FastCGISetPHP_FCGI_MAX_REQUESTSCmd" After="iis700FastCGISetInstanceMaxRequests"> + <Custom Action="iis700FastCGISetActivityTimeoutCmd" After="iis700FastCGISetInstanceMaxRequests"> + <![CDATA[VersionNT >= 600 AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="iis700FastCGISetActivityTimeout" After="iis700FastCGISetActivityTimeoutCmd"> + <![CDATA[VersionNT >= 600 AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="iis700FastCGISetRequestTimeoutCmd" After="iis700FastCGISetActivityTimeout"> + <![CDATA[VersionNT >= 600 AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="iis700FastCGISetRequestTimeout" After="iis700FastCGISetRequestTimeoutCmd"> + <![CDATA[VersionNT >= 600 AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="iis700FastCGISetPHP_FCGI_MAX_REQUESTSCmd" After="iis700FastCGISetRequestTimeout"> <![CDATA[VersionNT >= 600 AND &iis4FastCGI = 3]]> </Custom> <Custom Action="iis700FastCGISetPHP_FCGI_MAX_REQUESTS" After="iis700FastCGISetPHP_FCGI_MAX_REQUESTSCmd"> @@ -801,7 +868,19 @@ <Custom Action="fcgiconfigJSFastCGISetInstanceMaxRequests" After="fcgiconfigJSFastCGISetInstanceMaxRequestsCmd"> <![CDATA[(VersionNT = 502 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> </Custom> - <Custom Action="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSCmd" After="fcgiconfigJSFastCGISetInstanceMaxRequests"> + <Custom Action="fcgiconfigJSFastCGISetActivityTimeoutCmd" After="fcgiconfigJSFastCGISetInstanceMaxRequests"> + <![CDATA[(VersionNT = 502 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="fcgiconfigJSFastCGISetActivityTimeout" After="fcgiconfigJSFastCGISetActivityTimeoutCmd"> + <![CDATA[(VersionNT = 502 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="fcgiconfigJSFastCGISetRequestTimeoutCmd" After="fcgiconfigJSFastCGISetActivityTimeout"> + <![CDATA[(VersionNT = 502 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="fcgiconfigJSFastCGISetRequestTimeout" After="fcgiconfigJSFastCGISetRequestTimeoutCmd"> + <![CDATA[(VersionNT = 502 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSCmd" After="fcgiconfigJSFastCGISetRequestTimeout"> <![CDATA[(VersionNT = 502 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> </Custom> <Custom Action="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTS" After="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSCmd"> @@ -819,7 +898,19 @@ <Custom Action="fcgiconfigJSFastCGISetInstanceMaxRequestsXP" After="fcgiconfigJSFastCGISetInstanceMaxRequestsCmdXP"> <![CDATA[(VersionNT = 501 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> </Custom> - <Custom Action="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSCmdXP" After="fcgiconfigJSFastCGISetInstanceMaxRequestsXP"> + <Custom Action="fcgiconfigJSFastCGISetActivityTimeoutCmdXP" After="fcgiconfigJSFastCGISetInstanceMaxRequestsXP"> + <![CDATA[(VersionNT = 501 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="fcgiconfigJSFastCGISetActivityTimeoutXP" After="fcgiconfigJSFastCGISetActivityTimeoutCmdXP"> + <![CDATA[(VersionNT = 501 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="fcgiconfigJSFastCGISetRequestTimeoutCmdXP" After="fcgiconfigJSFastCGISetActivityTimeoutXP"> + <![CDATA[(VersionNT = 501 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="fcgiconfigJSFastCGISetRequestTimeoutXP" After="fcgiconfigJSFastCGISetRequestTimeoutCmdXP"> + <![CDATA[(VersionNT = 501 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSCmdXP" After="fcgiconfigJSFastCGISetRequestTimeoutXP"> <![CDATA[(VersionNT = 501 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> </Custom> <Custom Action="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSXP" After="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSCmdXP"> http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase52NTS.wxs?r1=1.19&r2=1.20&diff_format=u Index: win-installer/PHPInstallerBase52NTS.wxs diff -u win-installer/PHPInstallerBase52NTS.wxs:1.19 win-installer/PHPInstallerBase52NTS.wxs:1.20 --- win-installer/PHPInstallerBase52NTS.wxs:1.19 Wed May 27 19:40:57 2009 +++ win-installer/PHPInstallerBase52NTS.wxs Mon Jun 8 21:02:56 2009 @@ -384,6 +384,7 @@ <ComponentRef Id="phpcgiEXE"/> <ComponentRef Id="cgiforceredirect"/> <ComponentRef Id="fastcgiimpersonate"/> + <ComponentRef Id="maxexecutiontime" /> <ComponentRef Id="iis4FastCGIregistry"/> </Feature> <Feature AllowAdvertise="no" @@ -448,6 +449,24 @@ Return="ignore" Execute="deferred" Impersonate="no" /> + <CustomAction Id="iis700FastCGISetActivityTimeoutCmd" + Property="iis700FastCGISetActivityTimeout" + Value=""[WindowsFolder]system32\inetsrv\APPCMD.EXE" SET CONFIG -section:system.webServer/fastCGI "/[\[]fullPath='[INSTALLDIR]php-cgi.exe'[\]].activityTimeout:300" /commit:apphost" /> + <CustomAction Id="iis700FastCGISetActivityTimeout" + BinaryKey="WixCA" + DllEntry="CAQuietExec" + Return="ignore" + Execute="deferred" + Impersonate="no" /> + <CustomAction Id="iis700FastCGISetRequestTimeoutCmd" + Property="iis700FastCGISetRequestTimeout" + Value=""[WindowsFolder]system32\inetsrv\APPCMD.EXE" SET CONFIG -section:system.webServer/fastCGI "/[\[]fullPath='[INSTALLDIR]php-cgi.exe'[\]].requestTimeout:300" /commit:apphost" /> + <CustomAction Id="iis700FastCGISetRequestTimeout" + BinaryKey="WixCA" + DllEntry="CAQuietExec" + Return="ignore" + Execute="deferred" + Impersonate="no" /> <CustomAction Id="iis700FastCGISetPHP_FCGI_MAX_REQUESTSCmd" Property="iis700FastCGISetPHP_FCGI_MAX_REQUESTS" Value=""[WindowsFolder]system32\inetsrv\APPCMD.EXE" SET CONFIG -section:system.webServer/fastCGI /+"[\[]fullPath='[INSTALLDIR]php-cgi.exe'[\]].environmentVariables.[\[]name='PHP_FCGI_MAX_REQUESTS',value='10000'[\]]" /commit:apphost" /> @@ -535,7 +554,43 @@ DllEntry="CAQuietExec" Return="ignore" Execute="deferred" - Impersonate="no" /> + Impersonate="no" /> + <CustomAction Id="fcgiconfigJSFastCGISetActivityTimeoutCmd" + Property="fcgiconfigJSFastCGISetActivityTimeout" + Value=""\\localhost\admin$\system32\cscript.exe" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -ActivityTimeout:300" /> + <CustomAction Id="fcgiconfigJSFastCGISetActivityTimeout" + BinaryKey="WixCA" + DllEntry="CAQuietExec" + Return="ignore" + Execute="deferred" + Impersonate="no" /> + <CustomAction Id="fcgiconfigJSFastCGISetActivityTimeoutCmdXP" + Property="fcgiconfigJSFastCGISetActivityTimeoutXP" + Value=""cscript" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -ActivityTimeout:300" /> + <CustomAction Id="fcgiconfigJSFastCGISetActivityTimeoutXP" + BinaryKey="WixCA" + DllEntry="CAQuietExec" + Return="ignore" + Execute="deferred" + Impersonate="no" /> + <CustomAction Id="fcgiconfigJSFastCGISetRequestTimeoutCmd" + Property="fcgiconfigJSFastCGISetRequestTimeout" + Value=""\\localhost\admin$\system32\cscript.exe" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -RequestTimeout:300" /> + <CustomAction Id="fcgiconfigJSFastCGISetRequestTimeout" + BinaryKey="WixCA" + DllEntry="CAQuietExec" + Return="ignore" + Execute="deferred" + Impersonate="no" /> + <CustomAction Id="fcgiconfigJSFastCGISetRequestTimeoutCmdXP" + Property="fcgiconfigJSFastCGISetRequestTimeoutXP" + Value=""cscript" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -RequestTimeout:300" /> + <CustomAction Id="fcgiconfigJSFastCGISetRequestTimeoutXP" + BinaryKey="WixCA" + DllEntry="CAQuietExec" + Return="ignore" + Execute="deferred" + Impersonate="no" /> <CustomAction Id="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSCmd" Property="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTS" Value=""\\localhost\admin$\system32\cscript.exe" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -EnvironmentVars:PHP_FCGI_MAX_REQUESTS:10000,PHPRC:"[INSTALLDIR]"" /> @@ -594,7 +649,19 @@ <Custom Action="iis700FastCGISetInstanceMaxRequests" After="iis700FastCGISetInstanceMaxRequestsCmd"> <![CDATA[VersionNT >= 600 AND &iis4FastCGI = 3]]> </Custom> - <Custom Action="iis700FastCGISetPHP_FCGI_MAX_REQUESTSCmd" After="iis700FastCGISetInstanceMaxRequests"> + <Custom Action="iis700FastCGISetActivityTimeoutCmd" After="iis700FastCGISetInstanceMaxRequests"> + <![CDATA[VersionNT >= 600 AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="iis700FastCGISetActivityTimeout" After="iis700FastCGISetActivityTimeoutCmd"> + <![CDATA[VersionNT >= 600 AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="iis700FastCGISetRequestTimeoutCmd" After="iis700FastCGISetActivityTimeout"> + <![CDATA[VersionNT >= 600 AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="iis700FastCGISetRequestTimeout" After="iis700FastCGISetRequestTimeoutCmd"> + <![CDATA[VersionNT >= 600 AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="iis700FastCGISetPHP_FCGI_MAX_REQUESTSCmd" After="iis700FastCGISetRequestTimeout"> <![CDATA[VersionNT >= 600 AND &iis4FastCGI = 3]]> </Custom> <Custom Action="iis700FastCGISetPHP_FCGI_MAX_REQUESTS" After="iis700FastCGISetPHP_FCGI_MAX_REQUESTSCmd"> @@ -642,7 +709,19 @@ <Custom Action="fcgiconfigJSFastCGISetInstanceMaxRequests" After="fcgiconfigJSFastCGISetInstanceMaxRequestsCmd"> <![CDATA[(VersionNT = 502 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> </Custom> - <Custom Action="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSCmd" After="fcgiconfigJSFastCGISetInstanceMaxRequests"> + <Custom Action="fcgiconfigJSFastCGISetActivityTimeoutCmd" After="fcgiconfigJSFastCGISetInstanceMaxRequests"> + <![CDATA[(VersionNT = 502 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="fcgiconfigJSFastCGISetActivityTimeout" After="fcgiconfigJSFastCGISetActivityTimeoutCmd"> + <![CDATA[(VersionNT = 502 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="fcgiconfigJSFastCGISetRequestTimeoutCmd" After="fcgiconfigJSFastCGISetActivityTimeout"> + <![CDATA[(VersionNT = 502 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="fcgiconfigJSFastCGISetRequestTimeout" After="fcgiconfigJSFastCGISetRequestTimeoutCmd"> + <![CDATA[(VersionNT = 502 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSCmd" After="fcgiconfigJSFastCGISetRequestTimeout"> <![CDATA[(VersionNT = 502 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> </Custom> <Custom Action="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTS" After="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSCmd"> @@ -663,7 +742,19 @@ <Custom Action="fcgiconfigJSFastCGISetInstanceMaxRequestsXP" After="fcgiconfigJSFastCGISetInstanceMaxRequestsCmdXP"> <![CDATA[(VersionNT = 501 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> </Custom> - <Custom Action="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSCmdXP" After="fcgiconfigJSFastCGISetInstanceMaxRequestsXP"> + <Custom Action="fcgiconfigJSFastCGISetActivityTimeoutCmdXP" After="fcgiconfigJSFastCGISetInstanceMaxRequestsXP"> + <![CDATA[(VersionNT = 501 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="fcgiconfigJSFastCGISetActivityTimeoutXP" After="fcgiconfigJSFastCGISetActivityTimeoutCmdXP"> + <![CDATA[(VersionNT = 501 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="fcgiconfigJSFastCGISetRequestTimeoutCmdXP" After="fcgiconfigJSFastCGISetActivityTimeoutXP"> + <![CDATA[(VersionNT = 501 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="fcgiconfigJSFastCGISetRequestTimeoutXP" After="fcgiconfigJSFastCGISetRequestTimeoutCmdXP"> + <![CDATA[(VersionNT = 501 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSCmdXP" After="fcgiconfigJSFastCGISetRequestTimeoutXP"> <![CDATA[(VersionNT = 501 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> </Custom> <Custom Action="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSXP" After="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSCmdXP"> http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase53.wxs?r1=1.22&r2=1.23&diff_format=u Index: win-installer/PHPInstallerBase53.wxs diff -u win-installer/PHPInstallerBase53.wxs:1.22 win-installer/PHPInstallerBase53.wxs:1.23 --- win-installer/PHPInstallerBase53.wxs:1.22 Wed May 27 19:40:57 2009 +++ win-installer/PHPInstallerBase53.wxs Mon Jun 8 21:02:56 2009 @@ -413,6 +413,7 @@ <ComponentRef Id="phpcgiEXE"/> <ComponentRef Id="cgiforceredirect"/> <ComponentRef Id="fastcgiimpersonate"/> + <ComponentRef Id="maxexecutiontime" /> <ComponentRef Id="iis4FastCGIregistry"/> </Feature> <Feature AllowAdvertise="no" @@ -523,6 +524,24 @@ Return="ignore" Execute="deferred" Impersonate="no" /> + <CustomAction Id="iis700FastCGISetActivityTimeoutCmd" + Property="iis700FastCGISetActivityTimeout" + Value=""[WindowsFolder]system32\inetsrv\APPCMD.EXE" SET CONFIG -section:system.webServer/fastCGI "/[\[]fullPath='[INSTALLDIR]php-cgi.exe'[\]].activityTimeout:300" /commit:apphost" /> + <CustomAction Id="iis700FastCGISetActivityTimeout" + BinaryKey="WixCA" + DllEntry="CAQuietExec" + Return="ignore" + Execute="deferred" + Impersonate="no" /> + <CustomAction Id="iis700FastCGISetRequestTimeoutCmd" + Property="iis700FastCGISetRequestTimeout" + Value=""[WindowsFolder]system32\inetsrv\APPCMD.EXE" SET CONFIG -section:system.webServer/fastCGI "/[\[]fullPath='[INSTALLDIR]php-cgi.exe'[\]].requestTimeout:300" /commit:apphost" /> + <CustomAction Id="iis700FastCGISetRequestTimeout" + BinaryKey="WixCA" + DllEntry="CAQuietExec" + Return="ignore" + Execute="deferred" + Impersonate="no" /> <CustomAction Id="iis700FastCGISetPHP_FCGI_MAX_REQUESTSCmd" Property="iis700FastCGISetPHP_FCGI_MAX_REQUESTS" Value=""[WindowsFolder]system32\inetsrv\APPCMD.EXE" SET CONFIG -section:system.webServer/fastCGI /+"[\[]fullPath='[INSTALLDIR]php-cgi.exe'[\]].environmentVariables.[\[]name='PHP_FCGI_MAX_REQUESTS',value='10000'[\]]" /commit:apphost" /> @@ -610,7 +629,43 @@ DllEntry="CAQuietExec" Return="ignore" Execute="deferred" - Impersonate="no" /> + Impersonate="no" /> + <CustomAction Id="fcgiconfigJSFastCGISetActivityTimeoutCmd" + Property="fcgiconfigJSFastCGISetActivityTimeout" + Value=""\\localhost\admin$\system32\cscript.exe" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -ActivityTimeout:300" /> + <CustomAction Id="fcgiconfigJSFastCGISetActivityTimeout" + BinaryKey="WixCA" + DllEntry="CAQuietExec" + Return="ignore" + Execute="deferred" + Impersonate="no" /> + <CustomAction Id="fcgiconfigJSFastCGISetActivityTimeoutCmdXP" + Property="fcgiconfigJSFastCGISetActivityTimeoutXP" + Value=""cscript" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -ActivityTimeout:300" /> + <CustomAction Id="fcgiconfigJSFastCGISetActivityTimeoutXP" + BinaryKey="WixCA" + DllEntry="CAQuietExec" + Return="ignore" + Execute="deferred" + Impersonate="no" /> + <CustomAction Id="fcgiconfigJSFastCGISetRequestTimeoutCmd" + Property="fcgiconfigJSFastCGISetRequestTimeout" + Value=""\\localhost\admin$\system32\cscript.exe" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -RequestTimeout:300" /> + <CustomAction Id="fcgiconfigJSFastCGISetRequestTimeout" + BinaryKey="WixCA" + DllEntry="CAQuietExec" + Return="ignore" + Execute="deferred" + Impersonate="no" /> + <CustomAction Id="fcgiconfigJSFastCGISetRequestTimeoutCmdXP" + Property="fcgiconfigJSFastCGISetRequestTimeoutXP" + Value=""cscript" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -RequestTimeout:300" /> + <CustomAction Id="fcgiconfigJSFastCGISetRequestTimeoutXP" + BinaryKey="WixCA" + DllEntry="CAQuietExec" + Return="ignore" + Execute="deferred" + Impersonate="no" /> <CustomAction Id="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSCmd" Property="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTS" Value=""\\localhost\admin$\system32\cscript.exe" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -EnvironmentVars:PHP_FCGI_MAX_REQUESTS:10000,PHPRC:"[INSTALLDIR]"" /> @@ -695,7 +750,19 @@ <Custom Action="iis700FastCGISetInstanceMaxRequests" After="iis700FastCGISetInstanceMaxRequestsCmd"> <![CDATA[VersionNT >= 600 AND &iis4FastCGI = 3]]> </Custom> - <Custom Action="iis700FastCGISetPHP_FCGI_MAX_REQUESTSCmd" After="iis700FastCGISetInstanceMaxRequests"> + <Custom Action="iis700FastCGISetActivityTimeoutCmd" After="iis700FastCGISetInstanceMaxRequests"> + <![CDATA[VersionNT >= 600 AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="iis700FastCGISetActivityTimeout" After="iis700FastCGISetActivityTimeoutCmd"> + <![CDATA[VersionNT >= 600 AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="iis700FastCGISetRequestTimeoutCmd" After="iis700FastCGISetActivityTimeout"> + <![CDATA[VersionNT >= 600 AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="iis700FastCGISetRequestTimeout" After="iis700FastCGISetRequestTimeoutCmd"> + <![CDATA[VersionNT >= 600 AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="iis700FastCGISetPHP_FCGI_MAX_REQUESTSCmd" After="iis700FastCGISetRequestTimeout"> <![CDATA[VersionNT >= 600 AND &iis4FastCGI = 3]]> </Custom> <Custom Action="iis700FastCGISetPHP_FCGI_MAX_REQUESTS" After="iis700FastCGISetPHP_FCGI_MAX_REQUESTSCmd"> @@ -743,7 +810,19 @@ <Custom Action="fcgiconfigJSFastCGISetInstanceMaxRequests" After="fcgiconfigJSFastCGISetInstanceMaxRequestsCmd"> <![CDATA[(VersionNT = 502 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> </Custom> - <Custom Action="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSCmd" After="fcgiconfigJSFastCGISetInstanceMaxRequests"> + <Custom Action="fcgiconfigJSFastCGISetActivityTimeoutCmd" After="fcgiconfigJSFastCGISetInstanceMaxRequests"> + <![CDATA[(VersionNT = 502 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="fcgiconfigJSFastCGISetActivityTimeout" After="fcgiconfigJSFastCGISetActivityTimeoutCmd"> + <![CDATA[(VersionNT = 502 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="fcgiconfigJSFastCGISetRequestTimeoutCmd" After="fcgiconfigJSFastCGISetActivityTimeout"> + <![CDATA[(VersionNT = 502 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="fcgiconfigJSFastCGISetRequestTimeout" After="fcgiconfigJSFastCGISetRequestTimeoutCmd"> + <![CDATA[(VersionNT = 502 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSCmd" After="fcgiconfigJSFastCGISetRequestTimeout"> <![CDATA[(VersionNT = 502 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> </Custom> <Custom Action="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTS" After="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSCmd"> @@ -761,7 +840,19 @@ <Custom Action="fcgiconfigJSFastCGISetInstanceMaxRequestsXP" After="fcgiconfigJSFastCGISetInstanceMaxRequestsCmdXP"> <![CDATA[(VersionNT = 501 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> </Custom> - <Custom Action="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSCmdXP" After="fcgiconfigJSFastCGISetInstanceMaxRequestsXP"> + <Custom Action="fcgiconfigJSFastCGISetActivityTimeoutCmdXP" After="fcgiconfigJSFastCGISetInstanceMaxRequestsXP"> + <![CDATA[(VersionNT = 501 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="fcgiconfigJSFastCGISetActivityTimeoutXP" After="fcgiconfigJSFastCGISetActivityTimeoutCmdXP"> + <![CDATA[(VersionNT = 501 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="fcgiconfigJSFastCGISetRequestTimeoutCmdXP" After="fcgiconfigJSFastCGISetActivityTimeoutXP"> + <![CDATA[(VersionNT = 501 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="fcgiconfigJSFastCGISetRequestTimeoutXP" After="fcgiconfigJSFastCGISetRequestTimeoutCmdXP"> + <![CDATA[(VersionNT = 501 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSCmdXP" After="fcgiconfigJSFastCGISetRequestTimeoutXP"> <![CDATA[(VersionNT = 501 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> </Custom> <Custom Action="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSXP" After="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSCmdXP"> http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase53NTS.wxs?r1=1.19&r2=1.20&diff_format=u Index: win-installer/PHPInstallerBase53NTS.wxs diff -u win-installer/PHPInstallerBase53NTS.wxs:1.19 win-installer/PHPInstallerBase53NTS.wxs:1.20 --- win-installer/PHPInstallerBase53NTS.wxs:1.19 Wed May 27 19:40:57 2009 +++ win-installer/PHPInstallerBase53NTS.wxs Mon Jun 8 21:02:56 2009 @@ -363,6 +363,7 @@ <ComponentRef Id="phpcgiEXE"/> <ComponentRef Id="cgiforceredirect"/> <ComponentRef Id="fastcgiimpersonate"/> + <ComponentRef Id="maxexecutiontime" /> <ComponentRef Id="iis4FastCGIregistry"/> </Feature> <Feature AllowAdvertise="no" @@ -419,6 +420,24 @@ Return="ignore" Execute="deferred" Impersonate="no" /> + <CustomAction Id="iis700FastCGISetActivityTimeoutCmd" + Property="iis700FastCGISetActivityTimeout" + Value=""[WindowsFolder]system32\inetsrv\APPCMD.EXE" SET CONFIG -section:system.webServer/fastCGI "/[\[]fullPath='[INSTALLDIR]php-cgi.exe'[\]].activityTimeout:300" /commit:apphost" /> + <CustomAction Id="iis700FastCGISetActivityTimeout" + BinaryKey="WixCA" + DllEntry="CAQuietExec" + Return="ignore" + Execute="deferred" + Impersonate="no" /> + <CustomAction Id="iis700FastCGISetRequestTimeoutCmd" + Property="iis700FastCGISetRequestTimeout" + Value=""[WindowsFolder]system32\inetsrv\APPCMD.EXE" SET CONFIG -section:system.webServer/fastCGI "/[\[]fullPath='[INSTALLDIR]php-cgi.exe'[\]].requestTimeout:300" /commit:apphost" /> + <CustomAction Id="iis700FastCGISetRequestTimeout" + BinaryKey="WixCA" + DllEntry="CAQuietExec" + Return="ignore" + Execute="deferred" + Impersonate="no" /> <CustomAction Id="iis700FastCGISetPHP_FCGI_MAX_REQUESTSCmd" Property="iis700FastCGISetPHP_FCGI_MAX_REQUESTS" Value=""[WindowsFolder]system32\inetsrv\APPCMD.EXE" SET CONFIG -section:system.webServer/fastCGI /+"[\[]fullPath='[INSTALLDIR]php-cgi.exe'[\]].environmentVariables.[\[]name='PHP_FCGI_MAX_REQUESTS',value='10000'[\]]" /commit:apphost" /> @@ -507,6 +526,42 @@ Return="ignore" Execute="deferred" Impersonate="no" /> + <CustomAction Id="fcgiconfigJSFastCGISetActivityTimeoutCmd" + Property="fcgiconfigJSFastCGISetActivityTimeout" + Value=""\\localhost\admin$\system32\cscript.exe" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -ActivityTimeout:300" /> + <CustomAction Id="fcgiconfigJSFastCGISetActivityTimeout" + BinaryKey="WixCA" + DllEntry="CAQuietExec" + Return="ignore" + Execute="deferred" + Impersonate="no" /> + <CustomAction Id="fcgiconfigJSFastCGISetActivityTimeoutCmdXP" + Property="fcgiconfigJSFastCGISetActivityTimeoutXP" + Value=""cscript" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -ActivityTimeout:300" /> + <CustomAction Id="fcgiconfigJSFastCGISetActivityTimeoutXP" + BinaryKey="WixCA" + DllEntry="CAQuietExec" + Return="ignore" + Execute="deferred" + Impersonate="no" /> + <CustomAction Id="fcgiconfigJSFastCGISetRequestTimeoutCmd" + Property="fcgiconfigJSFastCGISetRequestTimeout" + Value=""\\localhost\admin$\system32\cscript.exe" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -RequestTimeout:300" /> + <CustomAction Id="fcgiconfigJSFastCGISetRequestTimeout" + BinaryKey="WixCA" + DllEntry="CAQuietExec" + Return="ignore" + Execute="deferred" + Impersonate="no" /> + <CustomAction Id="fcgiconfigJSFastCGISetRequestTimeoutCmdXP" + Property="fcgiconfigJSFastCGISetRequestTimeoutXP" + Value=""cscript" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -RequestTimeout:300" /> + <CustomAction Id="fcgiconfigJSFastCGISetRequestTimeoutXP" + BinaryKey="WixCA" + DllEntry="CAQuietExec" + Return="ignore" + Execute="deferred" + Impersonate="no" /> <CustomAction Id="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSCmd" Property="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTS" Value=""\\localhost\admin$\system32\cscript.exe" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -EnvironmentVars:PHP_FCGI_MAX_REQUESTS:10000,PHPRC:"[INSTALLDIR]"" /> @@ -565,7 +620,19 @@ <Custom Action="iis700FastCGISetInstanceMaxRequests" After="iis700FastCGISetInstanceMaxRequestsCmd"> <![CDATA[VersionNT >= 600 AND &iis4FastCGI = 3]]> </Custom> - <Custom Action="iis700FastCGISetPHP_FCGI_MAX_REQUESTSCmd" After="iis700FastCGISetInstanceMaxRequests"> + <Custom Action="iis700FastCGISetActivityTimeoutCmd" After="iis700FastCGISetInstanceMaxRequests"> + <![CDATA[VersionNT >= 600 AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="iis700FastCGISetActivityTimeout" After="iis700FastCGISetActivityTimeoutCmd"> + <![CDATA[VersionNT >= 600 AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="iis700FastCGISetRequestTimeoutCmd" After="iis700FastCGISetActivityTimeout"> + <![CDATA[VersionNT >= 600 AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="iis700FastCGISetRequestTimeout" After="iis700FastCGISetRequestTimeoutCmd"> + <![CDATA[VersionNT >= 600 AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="iis700FastCGISetPHP_FCGI_MAX_REQUESTSCmd" After="iis700FastCGISetRequestTimeout"> <![CDATA[VersionNT >= 600 AND &iis4FastCGI = 3]]> </Custom> <Custom Action="iis700FastCGISetPHP_FCGI_MAX_REQUESTS" After="iis700FastCGISetPHP_FCGI_MAX_REQUESTSCmd"> @@ -613,7 +680,19 @@ <Custom Action="fcgiconfigJSFastCGISetInstanceMaxRequests" After="fcgiconfigJSFastCGISetInstanceMaxRequestsCmd"> <![CDATA[(VersionNT = 502 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> </Custom> - <Custom Action="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSCmd" After="fcgiconfigJSFastCGISetInstanceMaxRequests"> + <Custom Action="fcgiconfigJSFastCGISetActivityTimeoutCmd" After="fcgiconfigJSFastCGISetInstanceMaxRequests"> + <![CDATA[(VersionNT = 502 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="fcgiconfigJSFastCGISetActivityTimeout" After="fcgiconfigJSFastCGISetActivityTimeoutCmd"> + <![CDATA[(VersionNT = 502 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="fcgiconfigJSFastCGISetRequestTimeoutCmd" After="fcgiconfigJSFastCGISetActivityTimeout"> + <![CDATA[(VersionNT = 502 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="fcgiconfigJSFastCGISetRequestTimeout" After="fcgiconfigJSFastCGISetRequestTimeoutCmd"> + <![CDATA[(VersionNT = 502 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSCmd" After="fcgiconfigJSFastCGISetRequestTimeout"> <![CDATA[(VersionNT = 502 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> </Custom> <Custom Action="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTS" After="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSCmd"> @@ -634,7 +713,19 @@ <Custom Action="fcgiconfigJSFastCGISetInstanceMaxRequestsXP" After="fcgiconfigJSFastCGISetInstanceMaxRequestsCmdXP"> <![CDATA[(VersionNT = 501 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> </Custom> - <Custom Action="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSCmdXP" After="fcgiconfigJSFastCGISetInstanceMaxRequestsXP"> + <Custom Action="fcgiconfigJSFastCGISetActivityTimeoutCmdXP" After="fcgiconfigJSFastCGISetInstanceMaxRequestsXP"> + <![CDATA[(VersionNT = 501 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="fcgiconfigJSFastCGISetActivityTimeoutXP" After="fcgiconfigJSFastCGISetActivityTimeoutCmdXP"> + <![CDATA[(VersionNT = 501 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="fcgiconfigJSFastCGISetRequestTimeoutCmdXP" After="fcgiconfigJSFastCGISetActivityTimeoutXP"> + <![CDATA[(VersionNT = 501 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="fcgiconfigJSFastCGISetRequestTimeoutXP" After="fcgiconfigJSFastCGISetRequestTimeoutCmdXP"> + <![CDATA[(VersionNT = 501 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSCmdXP" After="fcgiconfigJSFastCGISetRequestTimeoutXP"> <![CDATA[(VersionNT = 501 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> </Custom> <Custom Action="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSXP" After="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSCmdXP"> http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase60.wxs?r1=1.35&r2=1.36&diff_format=u Index: win-installer/PHPInstallerBase60.wxs diff -u win-installer/PHPInstallerBase60.wxs:1.35 win-installer/PHPInstallerBase60.wxs:1.36 --- win-installer/PHPInstallerBase60.wxs:1.35 Wed May 27 19:40:57 2009 +++ win-installer/PHPInstallerBase60.wxs Mon Jun 8 21:02:56 2009 @@ -413,6 +413,7 @@ <ComponentRef Id="phpcgiEXE"/> <ComponentRef Id="cgiforceredirect"/> <ComponentRef Id="fastcgiimpersonate"/> + <ComponentRef Id="maxexecutiontime" /> <ComponentRef Id="iis4FastCGIregistry"/> </Feature> <Feature AllowAdvertise="no" @@ -523,6 +524,24 @@ Return="ignore" Execute="deferred" Impersonate="no" /> + <CustomAction Id="iis700FastCGISetActivityTimeoutCmd" + Property="iis700FastCGISetActivityTimeout" + Value=""[WindowsFolder]system32\inetsrv\APPCMD.EXE" SET CONFIG -section:system.webServer/fastCGI "/[\[]fullPath='[INSTALLDIR]php-cgi.exe'[\]].activityTimeout:300" /commit:apphost" /> + <CustomAction Id="iis700FastCGISetActivityTimeout" + BinaryKey="WixCA" + DllEntry="CAQuietExec" + Return="ignore" + Execute="deferred" + Impersonate="no" /> + <CustomAction Id="iis700FastCGISetRequestTimeoutCmd" + Property="iis700FastCGISetRequestTimeout" + Value=""[WindowsFolder]system32\inetsrv\APPCMD.EXE" SET CONFIG -section:system.webServer/fastCGI "/[\[]fullPath='[INSTALLDIR]php-cgi.exe'[\]].requestTimeout:300" /commit:apphost" /> + <CustomAction Id="iis700FastCGISetRequestTimeout" + BinaryKey="WixCA" + DllEntry="CAQuietExec" + Return="ignore" + Execute="deferred" + Impersonate="no" /> <CustomAction Id="iis700FastCGISetPHP_FCGI_MAX_REQUESTSCmd" Property="iis700FastCGISetPHP_FCGI_MAX_REQUESTS" Value=""[WindowsFolder]system32\inetsrv\APPCMD.EXE" SET CONFIG -section:system.webServer/fastCGI /+"[\[]fullPath='[INSTALLDIR]php-cgi.exe'[\]].environmentVariables.[\[]name='PHP_FCGI_MAX_REQUESTS',value='10000'[\]]" /commit:apphost" /> @@ -611,6 +630,42 @@ Return="ignore" Execute="deferred" Impersonate="no" /> + <CustomAction Id="fcgiconfigJSFastCGISetActivityTimeoutCmd" + Property="fcgiconfigJSFastCGISetActivityTimeout" + Value=""\\localhost\admin$\system32\cscript.exe" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -ActivityTimeout:300" /> + <CustomAction Id="fcgiconfigJSFastCGISetActivityTimeout" + BinaryKey="WixCA" + DllEntry="CAQuietExec" + Return="ignore" + Execute="deferred" + Impersonate="no" /> + <CustomAction Id="fcgiconfigJSFastCGISetActivityTimeoutCmdXP" + Property="fcgiconfigJSFastCGISetActivityTimeoutXP" + Value=""cscript" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -ActivityTimeout:300" /> + <CustomAction Id="fcgiconfigJSFastCGISetActivityTimeoutXP" + BinaryKey="WixCA" + DllEntry="CAQuietExec" + Return="ignore" + Execute="deferred" + Impersonate="no" /> + <CustomAction Id="fcgiconfigJSFastCGISetRequestTimeoutCmd" + Property="fcgiconfigJSFastCGISetRequestTimeout" + Value=""\\localhost\admin$\system32\cscript.exe" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -RequestTimeout:300" /> + <CustomAction Id="fcgiconfigJSFastCGISetRequestTimeout" + BinaryKey="WixCA" + DllEntry="CAQuietExec" + Return="ignore" + Execute="deferred" + Impersonate="no" /> + <CustomAction Id="fcgiconfigJSFastCGISetRequestTimeoutCmdXP" + Property="fcgiconfigJSFastCGISetRequestTimeoutXP" + Value=""cscript" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -RequestTimeout:300" /> + <CustomAction Id="fcgiconfigJSFastCGISetRequestTimeoutXP" + BinaryKey="WixCA" + DllEntry="CAQuietExec" + Return="ignore" + Execute="deferred" + Impersonate="no" /> <CustomAction Id="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSCmd" Property="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTS" Value=""\\localhost\admin$\system32\cscript.exe" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -EnvironmentVars:PHP_FCGI_MAX_REQUESTS:10000,PHPRC:"[INSTALLDIR]"" /> @@ -695,7 +750,19 @@ <Custom Action="iis700FastCGISetInstanceMaxRequests" After="iis700FastCGISetInstanceMaxRequestsCmd"> <![CDATA[VersionNT >= 600 AND &iis4FastCGI = 3]]> </Custom> - <Custom Action="iis700FastCGISetPHP_FCGI_MAX_REQUESTSCmd" After="iis700FastCGISetInstanceMaxRequests"> + <Custom Action="iis700FastCGISetActivityTimeoutCmd" After="iis700FastCGISetInstanceMaxRequests"> + <![CDATA[VersionNT >= 600 AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="iis700FastCGISetActivityTimeout" After="iis700FastCGISetActivityTimeoutCmd"> + <![CDATA[VersionNT >= 600 AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="iis700FastCGISetRequestTimeoutCmd" After="iis700FastCGISetActivityTimeout"> + <![CDATA[VersionNT >= 600 AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="iis700FastCGISetRequestTimeout" After="iis700FastCGISetRequestTimeoutCmd"> + <![CDATA[VersionNT >= 600 AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="iis700FastCGISetPHP_FCGI_MAX_REQUESTSCmd" After="iis700FastCGISetRequestTimeout"> <![CDATA[VersionNT >= 600 AND &iis4FastCGI = 3]]> </Custom> <Custom Action="iis700FastCGISetPHP_FCGI_MAX_REQUESTS" After="iis700FastCGISetPHP_FCGI_MAX_REQUESTSCmd"> @@ -743,7 +810,19 @@ <Custom Action="fcgiconfigJSFastCGISetInstanceMaxRequests" After="fcgiconfigJSFastCGISetInstanceMaxRequestsCmd"> <![CDATA[(VersionNT = 502 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> </Custom> - <Custom Action="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSCmd" After="fcgiconfigJSFastCGISetInstanceMaxRequests"> + <Custom Action="fcgiconfigJSFastCGISetActivityTimeoutCmd" After="fcgiconfigJSFastCGISetInstanceMaxRequests"> + <![CDATA[(VersionNT = 502 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="fcgiconfigJSFastCGISetActivityTimeout" After="fcgiconfigJSFastCGISetActivityTimeoutCmd"> + <![CDATA[(VersionNT = 502 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="fcgiconfigJSFastCGISetRequestTimeoutCmd" After="fcgiconfigJSFastCGISetActivityTimeout"> + <![CDATA[(VersionNT = 502 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="fcgiconfigJSFastCGISetRequestTimeout" After="fcgiconfigJSFastCGISetRequestTimeoutCmd"> + <![CDATA[(VersionNT = 502 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSCmd" After="fcgiconfigJSFastCGISetRequestTimeout"> <![CDATA[(VersionNT = 502 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> </Custom> <Custom Action="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTS" After="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSCmd"> @@ -761,7 +840,19 @@ <Custom Action="fcgiconfigJSFastCGISetInstanceMaxRequestsXP" After="fcgiconfigJSFastCGISetInstanceMaxRequestsCmdXP"> <![CDATA[(VersionNT = 501 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> </Custom> - <Custom Action="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSCmdXP" After="fcgiconfigJSFastCGISetInstanceMaxRequestsXP"> + <Custom Action="fcgiconfigJSFastCGISetActivityTimeoutCmdXP" After="fcgiconfigJSFastCGISetInstanceMaxRequestsXP"> + <![CDATA[(VersionNT = 501 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="fcgiconfigJSFastCGISetActivityTimeoutXP" After="fcgiconfigJSFastCGISetActivityTimeoutCmdXP"> + <![CDATA[(VersionNT = 501 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="fcgiconfigJSFastCGISetRequestTimeoutCmdXP" After="fcgiconfigJSFastCGISetActivityTimeoutXP"> + <![CDATA[(VersionNT = 501 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="fcgiconfigJSFastCGISetRequestTimeoutXP" After="fcgiconfigJSFastCGISetRequestTimeoutCmdXP"> + <![CDATA[(VersionNT = 501 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSCmdXP" After="fcgiconfigJSFastCGISetRequestTimeoutXP"> <![CDATA[(VersionNT = 501 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> </Custom> <Custom Action="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSXP" After="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSCmdXP"> http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase60NTS.wxs?r1=1.19&r2=1.20&diff_format=u Index: win-installer/PHPInstallerBase60NTS.wxs diff -u win-installer/PHPInstallerBase60NTS.wxs:1.19 win-installer/PHPInstallerBase60NTS.wxs:1.20 --- win-installer/PHPInstallerBase60NTS.wxs:1.19 Wed May 27 19:40:57 2009 +++ win-installer/PHPInstallerBase60NTS.wxs Mon Jun 8 21:02:56 2009 @@ -363,6 +363,7 @@ <ComponentRef Id="phpcgiEXE"/> <ComponentRef Id="cgiforceredirect"/> <ComponentRef Id="fastcgiimpersonate"/> + <ComponentRef Id="maxexecutiontime" /> <ComponentRef Id="iis4FastCGIregistry"/> </Feature> <Feature AllowAdvertise="no" @@ -419,6 +420,24 @@ Return="ignore" Execute="deferred" Impersonate="no" /> + <CustomAction Id="iis700FastCGISetActivityTimeoutCmd" + Property="iis700FastCGISetActivityTimeout" + Value=""[WindowsFolder]system32\inetsrv\APPCMD.EXE" SET CONFIG -section:system.webServer/fastCGI "/[\[]fullPath='[INSTALLDIR]php-cgi.exe'[\]].activityTimeout:300" /commit:apphost" /> + <CustomAction Id="iis700FastCGISetActivityTimeout" + BinaryKey="WixCA" + DllEntry="CAQuietExec" + Return="ignore" + Execute="deferred" + Impersonate="no" /> + <CustomAction Id="iis700FastCGISetRequestTimeoutCmd" + Property="iis700FastCGISetRequestTimeout" + Value=""[WindowsFolder]system32\inetsrv\APPCMD.EXE" SET CONFIG -section:system.webServer/fastCGI "/[\[]fullPath='[INSTALLDIR]php-cgi.exe'[\]].requestTimeout:300" /commit:apphost" /> + <CustomAction Id="iis700FastCGISetRequestTimeout" + BinaryKey="WixCA" + DllEntry="CAQuietExec" + Return="ignore" + Execute="deferred" + Impersonate="no" /> <CustomAction Id="iis700FastCGISetPHP_FCGI_MAX_REQUESTSCmd" Property="iis700FastCGISetPHP_FCGI_MAX_REQUESTS" Value=""[WindowsFolder]system32\inetsrv\APPCMD.EXE" SET CONFIG -section:system.webServer/fastCGI /+"[\[]fullPath='[INSTALLDIR]php-cgi.exe'[\]].environmentVariables.[\[]name='PHP_FCGI_MAX_REQUESTS',value='10000'[\]]" /commit:apphost" /> @@ -507,6 +526,42 @@ Return="ignore" Execute="deferred" Impersonate="no" /> + <CustomAction Id="fcgiconfigJSFastCGISetActivityTimeoutCmd" + Property="fcgiconfigJSFastCGISetActivityTimeout" + Value=""\\localhost\admin$\system32\cscript.exe" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -ActivityTimeout:300" /> + <CustomAction Id="fcgiconfigJSFastCGISetActivityTimeout" + BinaryKey="WixCA" + DllEntry="CAQuietExec" + Return="ignore" + Execute="deferred" + Impersonate="no" /> + <CustomAction Id="fcgiconfigJSFastCGISetActivityTimeoutCmdXP" + Property="fcgiconfigJSFastCGISetActivityTimeoutXP" + Value=""cscript" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -ActivityTimeout:300" /> + <CustomAction Id="fcgiconfigJSFastCGISetActivityTimeoutXP" + BinaryKey="WixCA" + DllEntry="CAQuietExec" + Return="ignore" + Execute="deferred" + Impersonate="no" /> + <CustomAction Id="fcgiconfigJSFastCGISetRequestTimeoutCmd" + Property="fcgiconfigJSFastCGISetRequestTimeout" + Value=""\\localhost\admin$\system32\cscript.exe" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -RequestTimeout:300" /> + <CustomAction Id="fcgiconfigJSFastCGISetRequestTimeout" + BinaryKey="WixCA" + DllEntry="CAQuietExec" + Return="ignore" + Execute="deferred" + Impersonate="no" /> + <CustomAction Id="fcgiconfigJSFastCGISetRequestTimeoutCmdXP" + Property="fcgiconfigJSFastCGISetRequestTimeoutXP" + Value=""cscript" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -RequestTimeout:300" /> + <CustomAction Id="fcgiconfigJSFastCGISetRequestTimeoutXP" + BinaryKey="WixCA" + DllEntry="CAQuietExec" + Return="ignore" + Execute="deferred" + Impersonate="no" /> <CustomAction Id="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSCmd" Property="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTS" Value=""\\localhost\admin$\system32\cscript.exe" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -EnvironmentVars:PHP_FCGI_MAX_REQUESTS:10000,PHPRC:"[INSTALLDIR]"" /> @@ -565,7 +620,19 @@ <Custom Action="iis700FastCGISetInstanceMaxRequests" After="iis700FastCGISetInstanceMaxRequestsCmd"> <![CDATA[VersionNT >= 600 AND &iis4FastCGI = 3]]> </Custom> - <Custom Action="iis700FastCGISetPHP_FCGI_MAX_REQUESTSCmd" After="iis700FastCGISetInstanceMaxRequests"> + <Custom Action="iis700FastCGISetActivityTimeoutCmd" After="iis700FastCGISetInstanceMaxRequests"> + <![CDATA[VersionNT >= 600 AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="iis700FastCGISetActivityTimeout" After="iis700FastCGISetActivityTimeoutCmd"> + <![CDATA[VersionNT >= 600 AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="iis700FastCGISetRequestTimeoutCmd" After="iis700FastCGISetActivityTimeout"> + <![CDATA[VersionNT >= 600 AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="iis700FastCGISetRequestTimeout" After="iis700FastCGISetRequestTimeoutCmd"> + <![CDATA[VersionNT >= 600 AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="iis700FastCGISetPHP_FCGI_MAX_REQUESTSCmd" After="iis700FastCGISetRequestTimeout"> <![CDATA[VersionNT >= 600 AND &iis4FastCGI = 3]]> </Custom> <Custom Action="iis700FastCGISetPHP_FCGI_MAX_REQUESTS" After="iis700FastCGISetPHP_FCGI_MAX_REQUESTSCmd"> @@ -613,7 +680,19 @@ <Custom Action="fcgiconfigJSFastCGISetInstanceMaxRequests" After="fcgiconfigJSFastCGISetInstanceMaxRequestsCmd"> <![CDATA[(VersionNT = 502 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> </Custom> - <Custom Action="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSCmd" After="fcgiconfigJSFastCGISetInstanceMaxRequests"> + <Custom Action="fcgiconfigJSFastCGISetActivityTimeoutCmd" After="fcgiconfigJSFastCGISetInstanceMaxRequests"> + <![CDATA[(VersionNT = 502 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="fcgiconfigJSFastCGISetActivityTimeout" After="fcgiconfigJSFastCGISetActivityTimeoutCmd"> + <![CDATA[(VersionNT = 502 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="fcgiconfigJSFastCGISetRequestTimeoutCmd" After="fcgiconfigJSFastCGISetActivityTimeout"> + <![CDATA[(VersionNT = 502 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="fcgiconfigJSFastCGISetRequestTimeout" After="fcgiconfigJSFastCGISetRequestTimeoutCmd"> + <![CDATA[(VersionNT = 502 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSCmd" After="fcgiconfigJSFastCGISetRequestTimeout"> <![CDATA[(VersionNT = 502 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> </Custom> <Custom Action="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTS" After="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSCmd"> @@ -634,7 +713,19 @@ <Custom Action="fcgiconfigJSFastCGISetInstanceMaxRequestsXP" After="fcgiconfigJSFastCGISetInstanceMaxRequestsCmdXP"> <![CDATA[(VersionNT = 501 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> </Custom> - <Custom Action="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSCmdXP" After="fcgiconfigJSFastCGISetInstanceMaxRequestsXP"> + <Custom Action="fcgiconfigJSFastCGISetActivityTimeoutCmdXP" After="fcgiconfigJSFastCGISetInstanceMaxRequestsXP"> + <![CDATA[(VersionNT = 501 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="fcgiconfigJSFastCGISetActivityTimeoutXP" After="fcgiconfigJSFastCGISetActivityTimeoutCmdXP"> + <![CDATA[(VersionNT = 501 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="fcgiconfigJSFastCGISetRequestTimeoutCmdXP" After="fcgiconfigJSFastCGISetActivityTimeoutXP"> + <![CDATA[(VersionNT = 501 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="fcgiconfigJSFastCGISetRequestTimeoutXP" After="fcgiconfigJSFastCGISetRequestTimeoutCmdXP"> + <![CDATA[(VersionNT = 501 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSCmdXP" After="fcgiconfigJSFastCGISetRequestTimeoutXP"> <![CDATA[(VersionNT = 501 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> </Custom> <Custom Action="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSXP" After="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSCmdXP"> http://cvs.php.net/viewvc.cgi/win-installer/WebServerConfig52.wxs?r1=1.5&r2=1.6&diff_format=u Index: win-installer/WebServerConfig52.wxs diff -u win-installer/WebServerConfig52.wxs:1.5 win-installer/WebServerConfig52.wxs:1.6 --- win-installer/WebServerConfig52.wxs:1.5 Tue Feb 17 16:44:59 2009 +++ win-installer/WebServerConfig52.wxs Mon Jun 8 21:02:56 2009 @@ -37,13 +37,14 @@ Section="PHP" Value="1" /> </Component> <Component Id="fastcgiimpersonate" DiskId="1" Guid="61290EEB-616B-4434-8283-D7BDC7008D25"> - <IniFile Id="fastcgiimpersonateINI" - Action="addLine" - Key="fastcgi.impersonate" - Directory="INSTALLDIR" - Name="php.ini" - Section="PHP" - Value="1"/> + <IniFile Id="fastcgiimpersonateINI" Action="addLine" + Key="fastcgi.impersonate" Directory="INSTALLDIR" Name="php.ini" + Section="PHP" Value="1"/> + </Component> + <Component Id="maxexecutiontime" DiskId="1" Guid="5C6D1771-0D27-42C3-946B-3E0E138CF5DA"> + <IniFile Id="maxexecutiontimeINI" Action="addLine" + Key="max_execution_time" Directory="INSTALLDIR" Name="php.ini" + Section="PHP" Value="300"/> </Component> <Component Id="iis3CGI" DiskId="1" Guid="20842834-47E2-483C-AE09-B4E90C12E314"> <Registry Id="iis3RegScriptMap" http://cvs.php.net/viewvc.cgi/win-installer/WebServerConfig52NTS.wxs?r1=1.3&r2=1.4&diff_format=u Index: win-installer/WebServerConfig52NTS.wxs diff -u win-installer/WebServerConfig52NTS.wxs:1.3 win-installer/WebServerConfig52NTS.wxs:1.4 --- win-installer/WebServerConfig52NTS.wxs:1.3 Tue Feb 17 16:44:59 2009 +++ win-installer/WebServerConfig52NTS.wxs Mon Jun 8 21:02:56 2009 @@ -8,13 +8,14 @@ Section="PHP" Value="0" /> </Component> <Component Id="fastcgiimpersonate" DiskId="1" Guid="61290EEB-616B-4434-8283-D7BDC7008D25"> - <IniFile Id="fastcgiimpersonateINI" - Action="addLine" - Key="fastcgi.impersonate" - Directory="INSTALLDIR" - Name="php.ini" - Section="PHP" - Value="1"/> + <IniFile Id="fastcgiimpersonateINI" Action="addLine" + Key="fastcgi.impersonate" Directory="INSTALLDIR" Name="php.ini" + Section="PHP" Value="1"/> + </Component> + <Component Id="maxexecutiontime" DiskId="1" Guid="5C6D1771-0D27-42C3-946B-3E0E138CF5DA"> + <IniFile Id="maxexecutiontimeINI" Action="addLine" + Key="max_execution_time" Directory="INSTALLDIR" Name="php.ini" + Section="PHP" Value="300"/> </Component> <Component Id="iis4FastCGIregistry" DiskId="1" http://cvs.php.net/viewvc.cgi/win-installer/WebServerConfig53.wxs?r1=1.6&r2=1.7&diff_format=u Index: win-installer/WebServerConfig53.wxs diff -u win-installer/WebServerConfig53.wxs:1.6 win-installer/WebServerConfig53.wxs:1.7 --- win-installer/WebServerConfig53.wxs:1.6 Sat Mar 21 01:58:33 2009 +++ win-installer/WebServerConfig53.wxs Mon Jun 8 21:02:56 2009 @@ -25,13 +25,14 @@ Section="PHP" Value="1" /> </Component> <Component Id="fastcgiimpersonate" DiskId="1" Guid="61290EEB-616B-4434-8283-D7BDC7008D25"> - <IniFile Id="fastcgiimpersonateINI" - Action="addLine" - Key="fastcgi.impersonate" - Directory="INSTALLDIR" - Name="php.ini" - Section="PHP" - Value="1"/> + <IniFile Id="fastcgiimpersonateINI" Action="addLine" + Key="fastcgi.impersonate" Directory="INSTALLDIR" Name="php.ini" + Section="PHP" Value="1"/> + </Component> + <Component Id="maxexecutiontime" DiskId="1" Guid="5C6D1771-0D27-42C3-946B-3E0E138CF5DA"> + <IniFile Id="maxexecutiontimeINI" Action="addLine" + Key="max_execution_time" Directory="INSTALLDIR" Name="php.ini" + Section="PHP" Value="300"/> </Component> <Component Id="iis3CGI" DiskId="1" Guid="20842834-47E2-483C-AE09-B4E90C12E314"> <Registry Id="iis3RegScriptMap" http://cvs.php.net/viewvc.cgi/win-installer/WebServerConfig53NTS.wxs?r1=1.3&r2=1.4&diff_format=u Index: win-installer/WebServerConfig53NTS.wxs diff -u win-installer/WebServerConfig53NTS.wxs:1.3 win-installer/WebServerConfig53NTS.wxs:1.4 --- win-installer/WebServerConfig53NTS.wxs:1.3 Tue Feb 17 16:44:59 2009 +++ win-installer/WebServerConfig53NTS.wxs Mon Jun 8 21:02:56 2009 @@ -8,13 +8,14 @@ Section="PHP" Value="0" /> </Component> <Component Id="fastcgiimpersonate" DiskId="1" Guid="61290EEB-616B-4434-8283-D7BDC7008D25"> - <IniFile Id="fastcgiimpersonateINI" - Action="addLine" - Key="fastcgi.impersonate" - Directory="INSTALLDIR" - Name="php.ini" - Section="PHP" - Value="1"/> + <IniFile Id="fastcgiimpersonateINI" Action="addLine" + Key="fastcgi.impersonate" Directory="INSTALLDIR" Name="php.ini" + Section="PHP" Value="1"/> + </Component> + <Component Id="maxexecutiontime" DiskId="1" Guid="5C6D1771-0D27-42C3-946B-3E0E138CF5DA"> + <IniFile Id="maxexecutiontimeINI" Action="addLine" + Key="max_execution_time" Directory="INSTALLDIR" Name="php.ini" + Section="PHP" Value="300"/> </Component> <Component Id="iis4FastCGIregistry" DiskId="1" http://cvs.php.net/viewvc.cgi/win-installer/WebServerConfig60.wxs?r1=1.8&r2=1.9&diff_format=u Index: win-installer/WebServerConfig60.wxs diff -u win-installer/WebServerConfig60.wxs:1.8 win-installer/WebServerConfig60.wxs:1.9 --- win-installer/WebServerConfig60.wxs:1.8 Sat Mar 21 01:58:33 2009 +++ win-installer/WebServerConfig60.wxs Mon Jun 8 21:02:56 2009 @@ -25,13 +25,14 @@ Section="PHP" Value="1" /> </Component> <Component Id="fastcgiimpersonate" DiskId="1" Guid="61290EEB-616B-4434-8283-D7BDC7008D25"> - <IniFile Id="fastcgiimpersonateINI" - Action="addLine" - Key="fastcgi.impersonate" - Directory="INSTALLDIR" - Name="php.ini" - Section="PHP" - Value="1"/> + <IniFile Id="fastcgiimpersonateINI" Action="addLine" + Key="fastcgi.impersonate" Directory="INSTALLDIR" Name="php.ini" + Section="PHP" Value="1"/> + </Component> + <Component Id="maxexecutiontime" DiskId="1" Guid="5C6D1771-0D27-42C3-946B-3E0E138CF5DA"> + <IniFile Id="maxexecutiontimeINI" Action="addLine" + Key="max_execution_time" Directory="INSTALLDIR" Name="php.ini" + Section="PHP" Value="300"/> </Component> <Component Id="iis3CGI" DiskId="1" Guid="20842834-47E2-483C-AE09-B4E90C12E314"> <Registry Id="iis3RegScriptMap" http://cvs.php.net/viewvc.cgi/win-installer/WebServerConfig60NTS.wxs?r1=1.3&r2=1.4&diff_format=u Index: win-installer/WebServerConfig60NTS.wxs diff -u win-installer/WebServerConfig60NTS.wxs:1.3 win-installer/WebServerConfig60NTS.wxs:1.4 --- win-installer/WebServerConfig60NTS.wxs:1.3 Tue Feb 17 16:44:59 2009 +++ win-installer/WebServerConfig60NTS.wxs Mon Jun 8 21:02:56 2009 @@ -8,13 +8,14 @@ Section="PHP" Value="0" /> </Component> <Component Id="fastcgiimpersonate" DiskId="1" Guid="61290EEB-616B-4434-8283-D7BDC7008D25"> - <IniFile Id="fastcgiimpersonateINI" - Action="addLine" - Key="fastcgi.impersonate" - Directory="INSTALLDIR" - Name="php.ini" - Section="PHP" - Value="1"/> + <IniFile Id="fastcgiimpersonateINI" Action="addLine" + Key="fastcgi.impersonate" Directory="INSTALLDIR" Name="php.ini" + Section="PHP" Value="1"/> + </Component> + <Component Id="maxexecutiontime" DiskId="1" Guid="5C6D1771-0D27-42C3-946B-3E0E138CF5DA"> + <IniFile Id="maxexecutiontimeINI" Action="addLine" + Key="max_execution_time" Directory="INSTALLDIR" Name="php.ini" + Section="PHP" Value="300"/> </Component> <Component Id="iis4FastCGIregistry" DiskId="1"
http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase52.wxs?r1=1.43&r2=1.44&diff_format=u Index: win-installer/PHPInstallerBase52.wxs diff -u win-installer/PHPInstallerBase52.wxs:1.43 win-installer/PHPInstallerBase52.wxs:1.44 --- win-installer/PHPInstallerBase52.wxs:1.43 Wed May 27 19:40:57 2009 +++ win-installer/PHPInstallerBase52.wxs Mon Jun 8 21:02:56 2009 @@ -454,6 +454,7 @@ <ComponentRef Id="phpcgiEXE"/> <ComponentRef Id="cgiforceredirect"/> <ComponentRef Id="fastcgiimpersonate"/> + <ComponentRef Id="maxexecutiontime" /> <ComponentRef Id="iis4FastCGIregistry"/> </Feature> <Feature AllowAdvertise="no" @@ -581,6 +582,24 @@ Return="ignore" Execute="deferred" Impersonate="no" /> + <CustomAction Id="iis700FastCGISetActivityTimeoutCmd" + Property="iis700FastCGISetActivityTimeout" + Value=""[WindowsFolder]system32\inetsrv\APPCMD.EXE" SET CONFIG -section:system.webServer/fastCGI "/[\[]fullPath='[INSTALLDIR]php-cgi.exe'[\]].activityTimeout:300" /commit:apphost" /> + <CustomAction Id="iis700FastCGISetActivityTimeout" + BinaryKey="WixCA" + DllEntry="CAQuietExec" + Return="ignore" + Execute="deferred" + Impersonate="no" /> + <CustomAction Id="iis700FastCGISetRequestTimeoutCmd" + Property="iis700FastCGISetRequestTimeout" + Value=""[WindowsFolder]system32\inetsrv\APPCMD.EXE" SET CONFIG -section:system.webServer/fastCGI "/[\[]fullPath='[INSTALLDIR]php-cgi.exe'[\]].requestTimeout:300" /commit:apphost" /> + <CustomAction Id="iis700FastCGISetRequestTimeout" + BinaryKey="WixCA" + DllEntry="CAQuietExec" + Return="ignore" + Execute="deferred" + Impersonate="no" /> <CustomAction Id="iis700FastCGISetPHP_FCGI_MAX_REQUESTSCmd" Property="iis700FastCGISetPHP_FCGI_MAX_REQUESTS" Value=""[WindowsFolder]system32\inetsrv\APPCMD.EXE" SET CONFIG -section:system.webServer/fastCGI /+"[\[]fullPath='[INSTALLDIR]php-cgi.exe'[\]].environmentVariables.[\[]name='PHP_FCGI_MAX_REQUESTS',value='10000'[\]]" /commit:apphost" /> @@ -669,6 +688,42 @@ Return="ignore" Execute="deferred" Impersonate="no" /> + <CustomAction Id="fcgiconfigJSFastCGISetActivityTimeoutCmd" + Property="fcgiconfigJSFastCGISetActivityTimeout" + Value=""\\localhost\admin$\system32\cscript.exe" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -ActivityTimeout:300" /> + <CustomAction Id="fcgiconfigJSFastCGISetActivityTimeout" + BinaryKey="WixCA" + DllEntry="CAQuietExec" + Return="ignore" + Execute="deferred" + Impersonate="no" /> + <CustomAction Id="fcgiconfigJSFastCGISetActivityTimeoutCmdXP" + Property="fcgiconfigJSFastCGISetActivityTimeoutXP" + Value=""cscript" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -ActivityTimeout:300" /> + <CustomAction Id="fcgiconfigJSFastCGISetActivityTimeoutXP" + BinaryKey="WixCA" + DllEntry="CAQuietExec" + Return="ignore" + Execute="deferred" + Impersonate="no" /> + <CustomAction Id="fcgiconfigJSFastCGISetRequestTimeoutCmd" + Property="fcgiconfigJSFastCGISetRequestTimeout" + Value=""\\localhost\admin$\system32\cscript.exe" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -RequestTimeout:300" /> + <CustomAction Id="fcgiconfigJSFastCGISetRequestTimeout" + BinaryKey="WixCA" + DllEntry="CAQuietExec" + Return="ignore" + Execute="deferred" + Impersonate="no" /> + <CustomAction Id="fcgiconfigJSFastCGISetRequestTimeoutCmdXP" + Property="fcgiconfigJSFastCGISetRequestTimeoutXP" + Value=""cscript" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -RequestTimeout:300" /> + <CustomAction Id="fcgiconfigJSFastCGISetRequestTimeoutXP" + BinaryKey="WixCA" + DllEntry="CAQuietExec" + Return="ignore" + Execute="deferred" + Impersonate="no" /> <CustomAction Id="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSCmd" Property="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTS" Value=""\\localhost\admin$\system32\cscript.exe" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -EnvironmentVars:PHP_FCGI_MAX_REQUESTS:10000,PHPRC:"[INSTALLDIR]"" /> @@ -753,7 +808,19 @@ <Custom Action="iis700FastCGISetInstanceMaxRequests" After="iis700FastCGISetInstanceMaxRequestsCmd"> <![CDATA[VersionNT >= 600 AND &iis4FastCGI = 3]]> </Custom> - <Custom Action="iis700FastCGISetPHP_FCGI_MAX_REQUESTSCmd" After="iis700FastCGISetInstanceMaxRequests"> + <Custom Action="iis700FastCGISetActivityTimeoutCmd" After="iis700FastCGISetInstanceMaxRequests"> + <![CDATA[VersionNT >= 600 AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="iis700FastCGISetActivityTimeout" After="iis700FastCGISetActivityTimeoutCmd"> + <![CDATA[VersionNT >= 600 AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="iis700FastCGISetRequestTimeoutCmd" After="iis700FastCGISetActivityTimeout"> + <![CDATA[VersionNT >= 600 AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="iis700FastCGISetRequestTimeout" After="iis700FastCGISetRequestTimeoutCmd"> + <![CDATA[VersionNT >= 600 AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="iis700FastCGISetPHP_FCGI_MAX_REQUESTSCmd" After="iis700FastCGISetRequestTimeout"> <![CDATA[VersionNT >= 600 AND &iis4FastCGI = 3]]> </Custom> <Custom Action="iis700FastCGISetPHP_FCGI_MAX_REQUESTS" After="iis700FastCGISetPHP_FCGI_MAX_REQUESTSCmd"> @@ -801,7 +868,19 @@ <Custom Action="fcgiconfigJSFastCGISetInstanceMaxRequests" After="fcgiconfigJSFastCGISetInstanceMaxRequestsCmd"> <![CDATA[(VersionNT = 502 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> </Custom> - <Custom Action="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSCmd" After="fcgiconfigJSFastCGISetInstanceMaxRequests"> + <Custom Action="fcgiconfigJSFastCGISetActivityTimeoutCmd" After="fcgiconfigJSFastCGISetInstanceMaxRequests"> + <![CDATA[(VersionNT = 502 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="fcgiconfigJSFastCGISetActivityTimeout" After="fcgiconfigJSFastCGISetActivityTimeoutCmd"> + <![CDATA[(VersionNT = 502 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="fcgiconfigJSFastCGISetRequestTimeoutCmd" After="fcgiconfigJSFastCGISetActivityTimeout"> + <![CDATA[(VersionNT = 502 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="fcgiconfigJSFastCGISetRequestTimeout" After="fcgiconfigJSFastCGISetRequestTimeoutCmd"> + <![CDATA[(VersionNT = 502 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSCmd" After="fcgiconfigJSFastCGISetRequestTimeout"> <![CDATA[(VersionNT = 502 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> </Custom> <Custom Action="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTS" After="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSCmd"> @@ -819,7 +898,19 @@ <Custom Action="fcgiconfigJSFastCGISetInstanceMaxRequestsXP" After="fcgiconfigJSFastCGISetInstanceMaxRequestsCmdXP"> <![CDATA[(VersionNT = 501 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> </Custom> - <Custom Action="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSCmdXP" After="fcgiconfigJSFastCGISetInstanceMaxRequestsXP"> + <Custom Action="fcgiconfigJSFastCGISetActivityTimeoutCmdXP" After="fcgiconfigJSFastCGISetInstanceMaxRequestsXP"> + <![CDATA[(VersionNT = 501 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="fcgiconfigJSFastCGISetActivityTimeoutXP" After="fcgiconfigJSFastCGISetActivityTimeoutCmdXP"> + <![CDATA[(VersionNT = 501 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="fcgiconfigJSFastCGISetRequestTimeoutCmdXP" After="fcgiconfigJSFastCGISetActivityTimeoutXP"> + <![CDATA[(VersionNT = 501 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="fcgiconfigJSFastCGISetRequestTimeoutXP" After="fcgiconfigJSFastCGISetRequestTimeoutCmdXP"> + <![CDATA[(VersionNT = 501 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSCmdXP" After="fcgiconfigJSFastCGISetRequestTimeoutXP"> <![CDATA[(VersionNT = 501 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> </Custom> <Custom Action="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSXP" After="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSCmdXP"> http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase52NTS.wxs?r1=1.19&r2=1.20&diff_format=u Index: win-installer/PHPInstallerBase52NTS.wxs diff -u win-installer/PHPInstallerBase52NTS.wxs:1.19 win-installer/PHPInstallerBase52NTS.wxs:1.20 --- win-installer/PHPInstallerBase52NTS.wxs:1.19 Wed May 27 19:40:57 2009 +++ win-installer/PHPInstallerBase52NTS.wxs Mon Jun 8 21:02:56 2009 @@ -384,6 +384,7 @@ <ComponentRef Id="phpcgiEXE"/> <ComponentRef Id="cgiforceredirect"/> <ComponentRef Id="fastcgiimpersonate"/> + <ComponentRef Id="maxexecutiontime" /> <ComponentRef Id="iis4FastCGIregistry"/> </Feature> <Feature AllowAdvertise="no" @@ -448,6 +449,24 @@ Return="ignore" Execute="deferred" Impersonate="no" /> + <CustomAction Id="iis700FastCGISetActivityTimeoutCmd" + Property="iis700FastCGISetActivityTimeout" + Value=""[WindowsFolder]system32\inetsrv\APPCMD.EXE" SET CONFIG -section:system.webServer/fastCGI "/[\[]fullPath='[INSTALLDIR]php-cgi.exe'[\]].activityTimeout:300" /commit:apphost" /> + <CustomAction Id="iis700FastCGISetActivityTimeout" + BinaryKey="WixCA" + DllEntry="CAQuietExec" + Return="ignore" + Execute="deferred" + Impersonate="no" /> + <CustomAction Id="iis700FastCGISetRequestTimeoutCmd" + Property="iis700FastCGISetRequestTimeout" + Value=""[WindowsFolder]system32\inetsrv\APPCMD.EXE" SET CONFIG -section:system.webServer/fastCGI "/[\[]fullPath='[INSTALLDIR]php-cgi.exe'[\]].requestTimeout:300" /commit:apphost" /> + <CustomAction Id="iis700FastCGISetRequestTimeout" + BinaryKey="WixCA" + DllEntry="CAQuietExec" + Return="ignore" + Execute="deferred" + Impersonate="no" /> <CustomAction Id="iis700FastCGISetPHP_FCGI_MAX_REQUESTSCmd" Property="iis700FastCGISetPHP_FCGI_MAX_REQUESTS" Value=""[WindowsFolder]system32\inetsrv\APPCMD.EXE" SET CONFIG -section:system.webServer/fastCGI /+"[\[]fullPath='[INSTALLDIR]php-cgi.exe'[\]].environmentVariables.[\[]name='PHP_FCGI_MAX_REQUESTS',value='10000'[\]]" /commit:apphost" /> @@ -535,7 +554,43 @@ DllEntry="CAQuietExec" Return="ignore" Execute="deferred" - Impersonate="no" /> + Impersonate="no" /> + <CustomAction Id="fcgiconfigJSFastCGISetActivityTimeoutCmd" + Property="fcgiconfigJSFastCGISetActivityTimeout" + Value=""\\localhost\admin$\system32\cscript.exe" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -ActivityTimeout:300" /> + <CustomAction Id="fcgiconfigJSFastCGISetActivityTimeout" + BinaryKey="WixCA" + DllEntry="CAQuietExec" + Return="ignore" + Execute="deferred" + Impersonate="no" /> + <CustomAction Id="fcgiconfigJSFastCGISetActivityTimeoutCmdXP" + Property="fcgiconfigJSFastCGISetActivityTimeoutXP" + Value=""cscript" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -ActivityTimeout:300" /> + <CustomAction Id="fcgiconfigJSFastCGISetActivityTimeoutXP" + BinaryKey="WixCA" + DllEntry="CAQuietExec" + Return="ignore" + Execute="deferred" + Impersonate="no" /> + <CustomAction Id="fcgiconfigJSFastCGISetRequestTimeoutCmd" + Property="fcgiconfigJSFastCGISetRequestTimeout" + Value=""\\localhost\admin$\system32\cscript.exe" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -RequestTimeout:300" /> + <CustomAction Id="fcgiconfigJSFastCGISetRequestTimeout" + BinaryKey="WixCA" + DllEntry="CAQuietExec" + Return="ignore" + Execute="deferred" + Impersonate="no" /> + <CustomAction Id="fcgiconfigJSFastCGISetRequestTimeoutCmdXP" + Property="fcgiconfigJSFastCGISetRequestTimeoutXP" + Value=""cscript" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -RequestTimeout:300" /> + <CustomAction Id="fcgiconfigJSFastCGISetRequestTimeoutXP" + BinaryKey="WixCA" + DllEntry="CAQuietExec" + Return="ignore" + Execute="deferred" + Impersonate="no" /> <CustomAction Id="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSCmd" Property="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTS" Value=""\\localhost\admin$\system32\cscript.exe" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -EnvironmentVars:PHP_FCGI_MAX_REQUESTS:10000,PHPRC:"[INSTALLDIR]"" /> @@ -594,7 +649,19 @@ <Custom Action="iis700FastCGISetInstanceMaxRequests" After="iis700FastCGISetInstanceMaxRequestsCmd"> <![CDATA[VersionNT >= 600 AND &iis4FastCGI = 3]]> </Custom> - <Custom Action="iis700FastCGISetPHP_FCGI_MAX_REQUESTSCmd" After="iis700FastCGISetInstanceMaxRequests"> + <Custom Action="iis700FastCGISetActivityTimeoutCmd" After="iis700FastCGISetInstanceMaxRequests"> + <![CDATA[VersionNT >= 600 AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="iis700FastCGISetActivityTimeout" After="iis700FastCGISetActivityTimeoutCmd"> + <![CDATA[VersionNT >= 600 AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="iis700FastCGISetRequestTimeoutCmd" After="iis700FastCGISetActivityTimeout"> + <![CDATA[VersionNT >= 600 AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="iis700FastCGISetRequestTimeout" After="iis700FastCGISetRequestTimeoutCmd"> + <![CDATA[VersionNT >= 600 AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="iis700FastCGISetPHP_FCGI_MAX_REQUESTSCmd" After="iis700FastCGISetRequestTimeout"> <![CDATA[VersionNT >= 600 AND &iis4FastCGI = 3]]> </Custom> <Custom Action="iis700FastCGISetPHP_FCGI_MAX_REQUESTS" After="iis700FastCGISetPHP_FCGI_MAX_REQUESTSCmd"> @@ -642,7 +709,19 @@ <Custom Action="fcgiconfigJSFastCGISetInstanceMaxRequests" After="fcgiconfigJSFastCGISetInstanceMaxRequestsCmd"> <![CDATA[(VersionNT = 502 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> </Custom> - <Custom Action="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSCmd" After="fcgiconfigJSFastCGISetInstanceMaxRequests"> + <Custom Action="fcgiconfigJSFastCGISetActivityTimeoutCmd" After="fcgiconfigJSFastCGISetInstanceMaxRequests"> + <![CDATA[(VersionNT = 502 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="fcgiconfigJSFastCGISetActivityTimeout" After="fcgiconfigJSFastCGISetActivityTimeoutCmd"> + <![CDATA[(VersionNT = 502 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="fcgiconfigJSFastCGISetRequestTimeoutCmd" After="fcgiconfigJSFastCGISetActivityTimeout"> + <![CDATA[(VersionNT = 502 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="fcgiconfigJSFastCGISetRequestTimeout" After="fcgiconfigJSFastCGISetRequestTimeoutCmd"> + <![CDATA[(VersionNT = 502 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSCmd" After="fcgiconfigJSFastCGISetRequestTimeout"> <![CDATA[(VersionNT = 502 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> </Custom> <Custom Action="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTS" After="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSCmd"> @@ -663,7 +742,19 @@ <Custom Action="fcgiconfigJSFastCGISetInstanceMaxRequestsXP" After="fcgiconfigJSFastCGISetInstanceMaxRequestsCmdXP"> <![CDATA[(VersionNT = 501 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> </Custom> - <Custom Action="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSCmdXP" After="fcgiconfigJSFastCGISetInstanceMaxRequestsXP"> + <Custom Action="fcgiconfigJSFastCGISetActivityTimeoutCmdXP" After="fcgiconfigJSFastCGISetInstanceMaxRequestsXP"> + <![CDATA[(VersionNT = 501 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="fcgiconfigJSFastCGISetActivityTimeoutXP" After="fcgiconfigJSFastCGISetActivityTimeoutCmdXP"> + <![CDATA[(VersionNT = 501 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="fcgiconfigJSFastCGISetRequestTimeoutCmdXP" After="fcgiconfigJSFastCGISetActivityTimeoutXP"> + <![CDATA[(VersionNT = 501 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="fcgiconfigJSFastCGISetRequestTimeoutXP" After="fcgiconfigJSFastCGISetRequestTimeoutCmdXP"> + <![CDATA[(VersionNT = 501 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSCmdXP" After="fcgiconfigJSFastCGISetRequestTimeoutXP"> <![CDATA[(VersionNT = 501 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> </Custom> <Custom Action="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSXP" After="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSCmdXP"> http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase53.wxs?r1=1.22&r2=1.23&diff_format=u Index: win-installer/PHPInstallerBase53.wxs diff -u win-installer/PHPInstallerBase53.wxs:1.22 win-installer/PHPInstallerBase53.wxs:1.23 --- win-installer/PHPInstallerBase53.wxs:1.22 Wed May 27 19:40:57 2009 +++ win-installer/PHPInstallerBase53.wxs Mon Jun 8 21:02:56 2009 @@ -413,6 +413,7 @@ <ComponentRef Id="phpcgiEXE"/> <ComponentRef Id="cgiforceredirect"/> <ComponentRef Id="fastcgiimpersonate"/> + <ComponentRef Id="maxexecutiontime" /> <ComponentRef Id="iis4FastCGIregistry"/> </Feature> <Feature AllowAdvertise="no" @@ -523,6 +524,24 @@ Return="ignore" Execute="deferred" Impersonate="no" /> + <CustomAction Id="iis700FastCGISetActivityTimeoutCmd" + Property="iis700FastCGISetActivityTimeout" + Value=""[WindowsFolder]system32\inetsrv\APPCMD.EXE" SET CONFIG -section:system.webServer/fastCGI "/[\[]fullPath='[INSTALLDIR]php-cgi.exe'[\]].activityTimeout:300" /commit:apphost" /> + <CustomAction Id="iis700FastCGISetActivityTimeout" + BinaryKey="WixCA" + DllEntry="CAQuietExec" + Return="ignore" + Execute="deferred" + Impersonate="no" /> + <CustomAction Id="iis700FastCGISetRequestTimeoutCmd" + Property="iis700FastCGISetRequestTimeout" + Value=""[WindowsFolder]system32\inetsrv\APPCMD.EXE" SET CONFIG -section:system.webServer/fastCGI "/[\[]fullPath='[INSTALLDIR]php-cgi.exe'[\]].requestTimeout:300" /commit:apphost" /> + <CustomAction Id="iis700FastCGISetRequestTimeout" + BinaryKey="WixCA" + DllEntry="CAQuietExec" + Return="ignore" + Execute="deferred" + Impersonate="no" /> <CustomAction Id="iis700FastCGISetPHP_FCGI_MAX_REQUESTSCmd" Property="iis700FastCGISetPHP_FCGI_MAX_REQUESTS" Value=""[WindowsFolder]system32\inetsrv\APPCMD.EXE" SET CONFIG -section:system.webServer/fastCGI /+"[\[]fullPath='[INSTALLDIR]php-cgi.exe'[\]].environmentVariables.[\[]name='PHP_FCGI_MAX_REQUESTS',value='10000'[\]]" /commit:apphost" /> @@ -610,7 +629,43 @@ DllEntry="CAQuietExec" Return="ignore" Execute="deferred" - Impersonate="no" /> + Impersonate="no" /> + <CustomAction Id="fcgiconfigJSFastCGISetActivityTimeoutCmd" + Property="fcgiconfigJSFastCGISetActivityTimeout" + Value=""\\localhost\admin$\system32\cscript.exe" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -ActivityTimeout:300" /> + <CustomAction Id="fcgiconfigJSFastCGISetActivityTimeout" + BinaryKey="WixCA" + DllEntry="CAQuietExec" + Return="ignore" + Execute="deferred" + Impersonate="no" /> + <CustomAction Id="fcgiconfigJSFastCGISetActivityTimeoutCmdXP" + Property="fcgiconfigJSFastCGISetActivityTimeoutXP" + Value=""cscript" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -ActivityTimeout:300" /> + <CustomAction Id="fcgiconfigJSFastCGISetActivityTimeoutXP" + BinaryKey="WixCA" + DllEntry="CAQuietExec" + Return="ignore" + Execute="deferred" + Impersonate="no" /> + <CustomAction Id="fcgiconfigJSFastCGISetRequestTimeoutCmd" + Property="fcgiconfigJSFastCGISetRequestTimeout" + Value=""\\localhost\admin$\system32\cscript.exe" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -RequestTimeout:300" /> + <CustomAction Id="fcgiconfigJSFastCGISetRequestTimeout" + BinaryKey="WixCA" + DllEntry="CAQuietExec" + Return="ignore" + Execute="deferred" + Impersonate="no" /> + <CustomAction Id="fcgiconfigJSFastCGISetRequestTimeoutCmdXP" + Property="fcgiconfigJSFastCGISetRequestTimeoutXP" + Value=""cscript" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -RequestTimeout:300" /> + <CustomAction Id="fcgiconfigJSFastCGISetRequestTimeoutXP" + BinaryKey="WixCA" + DllEntry="CAQuietExec" + Return="ignore" + Execute="deferred" + Impersonate="no" /> <CustomAction Id="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSCmd" Property="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTS" Value=""\\localhost\admin$\system32\cscript.exe" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -EnvironmentVars:PHP_FCGI_MAX_REQUESTS:10000,PHPRC:"[INSTALLDIR]"" /> @@ -695,7 +750,19 @@ <Custom Action="iis700FastCGISetInstanceMaxRequests" After="iis700FastCGISetInstanceMaxRequestsCmd"> <![CDATA[VersionNT >= 600 AND &iis4FastCGI = 3]]> </Custom> - <Custom Action="iis700FastCGISetPHP_FCGI_MAX_REQUESTSCmd" After="iis700FastCGISetInstanceMaxRequests"> + <Custom Action="iis700FastCGISetActivityTimeoutCmd" After="iis700FastCGISetInstanceMaxRequests"> + <![CDATA[VersionNT >= 600 AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="iis700FastCGISetActivityTimeout" After="iis700FastCGISetActivityTimeoutCmd"> + <![CDATA[VersionNT >= 600 AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="iis700FastCGISetRequestTimeoutCmd" After="iis700FastCGISetActivityTimeout"> + <![CDATA[VersionNT >= 600 AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="iis700FastCGISetRequestTimeout" After="iis700FastCGISetRequestTimeoutCmd"> + <![CDATA[VersionNT >= 600 AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="iis700FastCGISetPHP_FCGI_MAX_REQUESTSCmd" After="iis700FastCGISetRequestTimeout"> <![CDATA[VersionNT >= 600 AND &iis4FastCGI = 3]]> </Custom> <Custom Action="iis700FastCGISetPHP_FCGI_MAX_REQUESTS" After="iis700FastCGISetPHP_FCGI_MAX_REQUESTSCmd"> @@ -743,7 +810,19 @@ <Custom Action="fcgiconfigJSFastCGISetInstanceMaxRequests" After="fcgiconfigJSFastCGISetInstanceMaxRequestsCmd"> <![CDATA[(VersionNT = 502 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> </Custom> - <Custom Action="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSCmd" After="fcgiconfigJSFastCGISetInstanceMaxRequests"> + <Custom Action="fcgiconfigJSFastCGISetActivityTimeoutCmd" After="fcgiconfigJSFastCGISetInstanceMaxRequests"> + <![CDATA[(VersionNT = 502 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="fcgiconfigJSFastCGISetActivityTimeout" After="fcgiconfigJSFastCGISetActivityTimeoutCmd"> + <![CDATA[(VersionNT = 502 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="fcgiconfigJSFastCGISetRequestTimeoutCmd" After="fcgiconfigJSFastCGISetActivityTimeout"> + <![CDATA[(VersionNT = 502 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="fcgiconfigJSFastCGISetRequestTimeout" After="fcgiconfigJSFastCGISetRequestTimeoutCmd"> + <![CDATA[(VersionNT = 502 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSCmd" After="fcgiconfigJSFastCGISetRequestTimeout"> <![CDATA[(VersionNT = 502 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> </Custom> <Custom Action="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTS" After="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSCmd"> @@ -761,7 +840,19 @@ <Custom Action="fcgiconfigJSFastCGISetInstanceMaxRequestsXP" After="fcgiconfigJSFastCGISetInstanceMaxRequestsCmdXP"> <![CDATA[(VersionNT = 501 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> </Custom> - <Custom Action="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSCmdXP" After="fcgiconfigJSFastCGISetInstanceMaxRequestsXP"> + <Custom Action="fcgiconfigJSFastCGISetActivityTimeoutCmdXP" After="fcgiconfigJSFastCGISetInstanceMaxRequestsXP"> + <![CDATA[(VersionNT = 501 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="fcgiconfigJSFastCGISetActivityTimeoutXP" After="fcgiconfigJSFastCGISetActivityTimeoutCmdXP"> + <![CDATA[(VersionNT = 501 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="fcgiconfigJSFastCGISetRequestTimeoutCmdXP" After="fcgiconfigJSFastCGISetActivityTimeoutXP"> + <![CDATA[(VersionNT = 501 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="fcgiconfigJSFastCGISetRequestTimeoutXP" After="fcgiconfigJSFastCGISetRequestTimeoutCmdXP"> + <![CDATA[(VersionNT = 501 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSCmdXP" After="fcgiconfigJSFastCGISetRequestTimeoutXP"> <![CDATA[(VersionNT = 501 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> </Custom> <Custom Action="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSXP" After="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSCmdXP"> http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase53NTS.wxs?r1=1.19&r2=1.20&diff_format=u Index: win-installer/PHPInstallerBase53NTS.wxs diff -u win-installer/PHPInstallerBase53NTS.wxs:1.19 win-installer/PHPInstallerBase53NTS.wxs:1.20 --- win-installer/PHPInstallerBase53NTS.wxs:1.19 Wed May 27 19:40:57 2009 +++ win-installer/PHPInstallerBase53NTS.wxs Mon Jun 8 21:02:56 2009 @@ -363,6 +363,7 @@ <ComponentRef Id="phpcgiEXE"/> <ComponentRef Id="cgiforceredirect"/> <ComponentRef Id="fastcgiimpersonate"/> + <ComponentRef Id="maxexecutiontime" /> <ComponentRef Id="iis4FastCGIregistry"/> </Feature> <Feature AllowAdvertise="no" @@ -419,6 +420,24 @@ Return="ignore" Execute="deferred" Impersonate="no" /> + <CustomAction Id="iis700FastCGISetActivityTimeoutCmd" + Property="iis700FastCGISetActivityTimeout" + Value=""[WindowsFolder]system32\inetsrv\APPCMD.EXE" SET CONFIG -section:system.webServer/fastCGI "/[\[]fullPath='[INSTALLDIR]php-cgi.exe'[\]].activityTimeout:300" /commit:apphost" /> + <CustomAction Id="iis700FastCGISetActivityTimeout" + BinaryKey="WixCA" + DllEntry="CAQuietExec" + Return="ignore" + Execute="deferred" + Impersonate="no" /> + <CustomAction Id="iis700FastCGISetRequestTimeoutCmd" + Property="iis700FastCGISetRequestTimeout" + Value=""[WindowsFolder]system32\inetsrv\APPCMD.EXE" SET CONFIG -section:system.webServer/fastCGI "/[\[]fullPath='[INSTALLDIR]php-cgi.exe'[\]].requestTimeout:300" /commit:apphost" /> + <CustomAction Id="iis700FastCGISetRequestTimeout" + BinaryKey="WixCA" + DllEntry="CAQuietExec" + Return="ignore" + Execute="deferred" + Impersonate="no" /> <CustomAction Id="iis700FastCGISetPHP_FCGI_MAX_REQUESTSCmd" Property="iis700FastCGISetPHP_FCGI_MAX_REQUESTS" Value=""[WindowsFolder]system32\inetsrv\APPCMD.EXE" SET CONFIG -section:system.webServer/fastCGI /+"[\[]fullPath='[INSTALLDIR]php-cgi.exe'[\]].environmentVariables.[\[]name='PHP_FCGI_MAX_REQUESTS',value='10000'[\]]" /commit:apphost" /> @@ -507,6 +526,42 @@ Return="ignore" Execute="deferred" Impersonate="no" /> + <CustomAction Id="fcgiconfigJSFastCGISetActivityTimeoutCmd" + Property="fcgiconfigJSFastCGISetActivityTimeout" + Value=""\\localhost\admin$\system32\cscript.exe" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -ActivityTimeout:300" /> + <CustomAction Id="fcgiconfigJSFastCGISetActivityTimeout" + BinaryKey="WixCA" + DllEntry="CAQuietExec" + Return="ignore" + Execute="deferred" + Impersonate="no" /> + <CustomAction Id="fcgiconfigJSFastCGISetActivityTimeoutCmdXP" + Property="fcgiconfigJSFastCGISetActivityTimeoutXP" + Value=""cscript" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -ActivityTimeout:300" /> + <CustomAction Id="fcgiconfigJSFastCGISetActivityTimeoutXP" + BinaryKey="WixCA" + DllEntry="CAQuietExec" + Return="ignore" + Execute="deferred" + Impersonate="no" /> + <CustomAction Id="fcgiconfigJSFastCGISetRequestTimeoutCmd" + Property="fcgiconfigJSFastCGISetRequestTimeout" + Value=""\\localhost\admin$\system32\cscript.exe" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -RequestTimeout:300" /> + <CustomAction Id="fcgiconfigJSFastCGISetRequestTimeout" + BinaryKey="WixCA" + DllEntry="CAQuietExec" + Return="ignore" + Execute="deferred" + Impersonate="no" /> + <CustomAction Id="fcgiconfigJSFastCGISetRequestTimeoutCmdXP" + Property="fcgiconfigJSFastCGISetRequestTimeoutXP" + Value=""cscript" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -RequestTimeout:300" /> + <CustomAction Id="fcgiconfigJSFastCGISetRequestTimeoutXP" + BinaryKey="WixCA" + DllEntry="CAQuietExec" + Return="ignore" + Execute="deferred" + Impersonate="no" /> <CustomAction Id="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSCmd" Property="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTS" Value=""\\localhost\admin$\system32\cscript.exe" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -EnvironmentVars:PHP_FCGI_MAX_REQUESTS:10000,PHPRC:"[INSTALLDIR]"" /> @@ -565,7 +620,19 @@ <Custom Action="iis700FastCGISetInstanceMaxRequests" After="iis700FastCGISetInstanceMaxRequestsCmd"> <![CDATA[VersionNT >= 600 AND &iis4FastCGI = 3]]> </Custom> - <Custom Action="iis700FastCGISetPHP_FCGI_MAX_REQUESTSCmd" After="iis700FastCGISetInstanceMaxRequests"> + <Custom Action="iis700FastCGISetActivityTimeoutCmd" After="iis700FastCGISetInstanceMaxRequests"> + <![CDATA[VersionNT >= 600 AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="iis700FastCGISetActivityTimeout" After="iis700FastCGISetActivityTimeoutCmd"> + <![CDATA[VersionNT >= 600 AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="iis700FastCGISetRequestTimeoutCmd" After="iis700FastCGISetActivityTimeout"> + <![CDATA[VersionNT >= 600 AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="iis700FastCGISetRequestTimeout" After="iis700FastCGISetRequestTimeoutCmd"> + <![CDATA[VersionNT >= 600 AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="iis700FastCGISetPHP_FCGI_MAX_REQUESTSCmd" After="iis700FastCGISetRequestTimeout"> <![CDATA[VersionNT >= 600 AND &iis4FastCGI = 3]]> </Custom> <Custom Action="iis700FastCGISetPHP_FCGI_MAX_REQUESTS" After="iis700FastCGISetPHP_FCGI_MAX_REQUESTSCmd"> @@ -613,7 +680,19 @@ <Custom Action="fcgiconfigJSFastCGISetInstanceMaxRequests" After="fcgiconfigJSFastCGISetInstanceMaxRequestsCmd"> <![CDATA[(VersionNT = 502 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> </Custom> - <Custom Action="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSCmd" After="fcgiconfigJSFastCGISetInstanceMaxRequests"> + <Custom Action="fcgiconfigJSFastCGISetActivityTimeoutCmd" After="fcgiconfigJSFastCGISetInstanceMaxRequests"> + <![CDATA[(VersionNT = 502 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="fcgiconfigJSFastCGISetActivityTimeout" After="fcgiconfigJSFastCGISetActivityTimeoutCmd"> + <![CDATA[(VersionNT = 502 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="fcgiconfigJSFastCGISetRequestTimeoutCmd" After="fcgiconfigJSFastCGISetActivityTimeout"> + <![CDATA[(VersionNT = 502 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="fcgiconfigJSFastCGISetRequestTimeout" After="fcgiconfigJSFastCGISetRequestTimeoutCmd"> + <![CDATA[(VersionNT = 502 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSCmd" After="fcgiconfigJSFastCGISetRequestTimeout"> <![CDATA[(VersionNT = 502 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> </Custom> <Custom Action="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTS" After="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSCmd"> @@ -634,7 +713,19 @@ <Custom Action="fcgiconfigJSFastCGISetInstanceMaxRequestsXP" After="fcgiconfigJSFastCGISetInstanceMaxRequestsCmdXP"> <![CDATA[(VersionNT = 501 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> </Custom> - <Custom Action="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSCmdXP" After="fcgiconfigJSFastCGISetInstanceMaxRequestsXP"> + <Custom Action="fcgiconfigJSFastCGISetActivityTimeoutCmdXP" After="fcgiconfigJSFastCGISetInstanceMaxRequestsXP"> + <![CDATA[(VersionNT = 501 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="fcgiconfigJSFastCGISetActivityTimeoutXP" After="fcgiconfigJSFastCGISetActivityTimeoutCmdXP"> + <![CDATA[(VersionNT = 501 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="fcgiconfigJSFastCGISetRequestTimeoutCmdXP" After="fcgiconfigJSFastCGISetActivityTimeoutXP"> + <![CDATA[(VersionNT = 501 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="fcgiconfigJSFastCGISetRequestTimeoutXP" After="fcgiconfigJSFastCGISetRequestTimeoutCmdXP"> + <![CDATA[(VersionNT = 501 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSCmdXP" After="fcgiconfigJSFastCGISetRequestTimeoutXP"> <![CDATA[(VersionNT = 501 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> </Custom> <Custom Action="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSXP" After="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSCmdXP"> http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase60.wxs?r1=1.35&r2=1.36&diff_format=u Index: win-installer/PHPInstallerBase60.wxs diff -u win-installer/PHPInstallerBase60.wxs:1.35 win-installer/PHPInstallerBase60.wxs:1.36 --- win-installer/PHPInstallerBase60.wxs:1.35 Wed May 27 19:40:57 2009 +++ win-installer/PHPInstallerBase60.wxs Mon Jun 8 21:02:56 2009 @@ -413,6 +413,7 @@ <ComponentRef Id="phpcgiEXE"/> <ComponentRef Id="cgiforceredirect"/> <ComponentRef Id="fastcgiimpersonate"/> + <ComponentRef Id="maxexecutiontime" /> <ComponentRef Id="iis4FastCGIregistry"/> </Feature> <Feature AllowAdvertise="no" @@ -523,6 +524,24 @@ Return="ignore" Execute="deferred" Impersonate="no" /> + <CustomAction Id="iis700FastCGISetActivityTimeoutCmd" + Property="iis700FastCGISetActivityTimeout" + Value=""[WindowsFolder]system32\inetsrv\APPCMD.EXE" SET CONFIG -section:system.webServer/fastCGI "/[\[]fullPath='[INSTALLDIR]php-cgi.exe'[\]].activityTimeout:300" /commit:apphost" /> + <CustomAction Id="iis700FastCGISetActivityTimeout" + BinaryKey="WixCA" + DllEntry="CAQuietExec" + Return="ignore" + Execute="deferred" + Impersonate="no" /> + <CustomAction Id="iis700FastCGISetRequestTimeoutCmd" + Property="iis700FastCGISetRequestTimeout" + Value=""[WindowsFolder]system32\inetsrv\APPCMD.EXE" SET CONFIG -section:system.webServer/fastCGI "/[\[]fullPath='[INSTALLDIR]php-cgi.exe'[\]].requestTimeout:300" /commit:apphost" /> + <CustomAction Id="iis700FastCGISetRequestTimeout" + BinaryKey="WixCA" + DllEntry="CAQuietExec" + Return="ignore" + Execute="deferred" + Impersonate="no" /> <CustomAction Id="iis700FastCGISetPHP_FCGI_MAX_REQUESTSCmd" Property="iis700FastCGISetPHP_FCGI_MAX_REQUESTS" Value=""[WindowsFolder]system32\inetsrv\APPCMD.EXE" SET CONFIG -section:system.webServer/fastCGI /+"[\[]fullPath='[INSTALLDIR]php-cgi.exe'[\]].environmentVariables.[\[]name='PHP_FCGI_MAX_REQUESTS',value='10000'[\]]" /commit:apphost" /> @@ -611,6 +630,42 @@ Return="ignore" Execute="deferred" Impersonate="no" /> + <CustomAction Id="fcgiconfigJSFastCGISetActivityTimeoutCmd" + Property="fcgiconfigJSFastCGISetActivityTimeout" + Value=""\\localhost\admin$\system32\cscript.exe" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -ActivityTimeout:300" /> + <CustomAction Id="fcgiconfigJSFastCGISetActivityTimeout" + BinaryKey="WixCA" + DllEntry="CAQuietExec" + Return="ignore" + Execute="deferred" + Impersonate="no" /> + <CustomAction Id="fcgiconfigJSFastCGISetActivityTimeoutCmdXP" + Property="fcgiconfigJSFastCGISetActivityTimeoutXP" + Value=""cscript" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -ActivityTimeout:300" /> + <CustomAction Id="fcgiconfigJSFastCGISetActivityTimeoutXP" + BinaryKey="WixCA" + DllEntry="CAQuietExec" + Return="ignore" + Execute="deferred" + Impersonate="no" /> + <CustomAction Id="fcgiconfigJSFastCGISetRequestTimeoutCmd" + Property="fcgiconfigJSFastCGISetRequestTimeout" + Value=""\\localhost\admin$\system32\cscript.exe" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -RequestTimeout:300" /> + <CustomAction Id="fcgiconfigJSFastCGISetRequestTimeout" + BinaryKey="WixCA" + DllEntry="CAQuietExec" + Return="ignore" + Execute="deferred" + Impersonate="no" /> + <CustomAction Id="fcgiconfigJSFastCGISetRequestTimeoutCmdXP" + Property="fcgiconfigJSFastCGISetRequestTimeoutXP" + Value=""cscript" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -RequestTimeout:300" /> + <CustomAction Id="fcgiconfigJSFastCGISetRequestTimeoutXP" + BinaryKey="WixCA" + DllEntry="CAQuietExec" + Return="ignore" + Execute="deferred" + Impersonate="no" /> <CustomAction Id="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSCmd" Property="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTS" Value=""\\localhost\admin$\system32\cscript.exe" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -EnvironmentVars:PHP_FCGI_MAX_REQUESTS:10000,PHPRC:"[INSTALLDIR]"" /> @@ -695,7 +750,19 @@ <Custom Action="iis700FastCGISetInstanceMaxRequests" After="iis700FastCGISetInstanceMaxRequestsCmd"> <![CDATA[VersionNT >= 600 AND &iis4FastCGI = 3]]> </Custom> - <Custom Action="iis700FastCGISetPHP_FCGI_MAX_REQUESTSCmd" After="iis700FastCGISetInstanceMaxRequests"> + <Custom Action="iis700FastCGISetActivityTimeoutCmd" After="iis700FastCGISetInstanceMaxRequests"> + <![CDATA[VersionNT >= 600 AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="iis700FastCGISetActivityTimeout" After="iis700FastCGISetActivityTimeoutCmd"> + <![CDATA[VersionNT >= 600 AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="iis700FastCGISetRequestTimeoutCmd" After="iis700FastCGISetActivityTimeout"> + <![CDATA[VersionNT >= 600 AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="iis700FastCGISetRequestTimeout" After="iis700FastCGISetRequestTimeoutCmd"> + <![CDATA[VersionNT >= 600 AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="iis700FastCGISetPHP_FCGI_MAX_REQUESTSCmd" After="iis700FastCGISetRequestTimeout"> <![CDATA[VersionNT >= 600 AND &iis4FastCGI = 3]]> </Custom> <Custom Action="iis700FastCGISetPHP_FCGI_MAX_REQUESTS" After="iis700FastCGISetPHP_FCGI_MAX_REQUESTSCmd"> @@ -743,7 +810,19 @@ <Custom Action="fcgiconfigJSFastCGISetInstanceMaxRequests" After="fcgiconfigJSFastCGISetInstanceMaxRequestsCmd"> <![CDATA[(VersionNT = 502 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> </Custom> - <Custom Action="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSCmd" After="fcgiconfigJSFastCGISetInstanceMaxRequests"> + <Custom Action="fcgiconfigJSFastCGISetActivityTimeoutCmd" After="fcgiconfigJSFastCGISetInstanceMaxRequests"> + <![CDATA[(VersionNT = 502 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="fcgiconfigJSFastCGISetActivityTimeout" After="fcgiconfigJSFastCGISetActivityTimeoutCmd"> + <![CDATA[(VersionNT = 502 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="fcgiconfigJSFastCGISetRequestTimeoutCmd" After="fcgiconfigJSFastCGISetActivityTimeout"> + <![CDATA[(VersionNT = 502 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="fcgiconfigJSFastCGISetRequestTimeout" After="fcgiconfigJSFastCGISetRequestTimeoutCmd"> + <![CDATA[(VersionNT = 502 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSCmd" After="fcgiconfigJSFastCGISetRequestTimeout"> <![CDATA[(VersionNT = 502 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> </Custom> <Custom Action="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTS" After="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSCmd"> @@ -761,7 +840,19 @@ <Custom Action="fcgiconfigJSFastCGISetInstanceMaxRequestsXP" After="fcgiconfigJSFastCGISetInstanceMaxRequestsCmdXP"> <![CDATA[(VersionNT = 501 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> </Custom> - <Custom Action="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSCmdXP" After="fcgiconfigJSFastCGISetInstanceMaxRequestsXP"> + <Custom Action="fcgiconfigJSFastCGISetActivityTimeoutCmdXP" After="fcgiconfigJSFastCGISetInstanceMaxRequestsXP"> + <![CDATA[(VersionNT = 501 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="fcgiconfigJSFastCGISetActivityTimeoutXP" After="fcgiconfigJSFastCGISetActivityTimeoutCmdXP"> + <![CDATA[(VersionNT = 501 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="fcgiconfigJSFastCGISetRequestTimeoutCmdXP" After="fcgiconfigJSFastCGISetActivityTimeoutXP"> + <![CDATA[(VersionNT = 501 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="fcgiconfigJSFastCGISetRequestTimeoutXP" After="fcgiconfigJSFastCGISetRequestTimeoutCmdXP"> + <![CDATA[(VersionNT = 501 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSCmdXP" After="fcgiconfigJSFastCGISetRequestTimeoutXP"> <![CDATA[(VersionNT = 501 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> </Custom> <Custom Action="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSXP" After="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSCmdXP"> http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase60NTS.wxs?r1=1.19&r2=1.20&diff_format=u Index: win-installer/PHPInstallerBase60NTS.wxs diff -u win-installer/PHPInstallerBase60NTS.wxs:1.19 win-installer/PHPInstallerBase60NTS.wxs:1.20 --- win-installer/PHPInstallerBase60NTS.wxs:1.19 Wed May 27 19:40:57 2009 +++ win-installer/PHPInstallerBase60NTS.wxs Mon Jun 8 21:02:56 2009 @@ -363,6 +363,7 @@ <ComponentRef Id="phpcgiEXE"/> <ComponentRef Id="cgiforceredirect"/> <ComponentRef Id="fastcgiimpersonate"/> + <ComponentRef Id="maxexecutiontime" /> <ComponentRef Id="iis4FastCGIregistry"/> </Feature> <Feature AllowAdvertise="no" @@ -419,6 +420,24 @@ Return="ignore" Execute="deferred" Impersonate="no" /> + <CustomAction Id="iis700FastCGISetActivityTimeoutCmd" + Property="iis700FastCGISetActivityTimeout" + Value=""[WindowsFolder]system32\inetsrv\APPCMD.EXE" SET CONFIG -section:system.webServer/fastCGI "/[\[]fullPath='[INSTALLDIR]php-cgi.exe'[\]].activityTimeout:300" /commit:apphost" /> + <CustomAction Id="iis700FastCGISetActivityTimeout" + BinaryKey="WixCA" + DllEntry="CAQuietExec" + Return="ignore" + Execute="deferred" + Impersonate="no" /> + <CustomAction Id="iis700FastCGISetRequestTimeoutCmd" + Property="iis700FastCGISetRequestTimeout" + Value=""[WindowsFolder]system32\inetsrv\APPCMD.EXE" SET CONFIG -section:system.webServer/fastCGI "/[\[]fullPath='[INSTALLDIR]php-cgi.exe'[\]].requestTimeout:300" /commit:apphost" /> + <CustomAction Id="iis700FastCGISetRequestTimeout" + BinaryKey="WixCA" + DllEntry="CAQuietExec" + Return="ignore" + Execute="deferred" + Impersonate="no" /> <CustomAction Id="iis700FastCGISetPHP_FCGI_MAX_REQUESTSCmd" Property="iis700FastCGISetPHP_FCGI_MAX_REQUESTS" Value=""[WindowsFolder]system32\inetsrv\APPCMD.EXE" SET CONFIG -section:system.webServer/fastCGI /+"[\[]fullPath='[INSTALLDIR]php-cgi.exe'[\]].environmentVariables.[\[]name='PHP_FCGI_MAX_REQUESTS',value='10000'[\]]" /commit:apphost" /> @@ -507,6 +526,42 @@ Return="ignore" Execute="deferred" Impersonate="no" /> + <CustomAction Id="fcgiconfigJSFastCGISetActivityTimeoutCmd" + Property="fcgiconfigJSFastCGISetActivityTimeout" + Value=""\\localhost\admin$\system32\cscript.exe" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -ActivityTimeout:300" /> + <CustomAction Id="fcgiconfigJSFastCGISetActivityTimeout" + BinaryKey="WixCA" + DllEntry="CAQuietExec" + Return="ignore" + Execute="deferred" + Impersonate="no" /> + <CustomAction Id="fcgiconfigJSFastCGISetActivityTimeoutCmdXP" + Property="fcgiconfigJSFastCGISetActivityTimeoutXP" + Value=""cscript" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -ActivityTimeout:300" /> + <CustomAction Id="fcgiconfigJSFastCGISetActivityTimeoutXP" + BinaryKey="WixCA" + DllEntry="CAQuietExec" + Return="ignore" + Execute="deferred" + Impersonate="no" /> + <CustomAction Id="fcgiconfigJSFastCGISetRequestTimeoutCmd" + Property="fcgiconfigJSFastCGISetRequestTimeout" + Value=""\\localhost\admin$\system32\cscript.exe" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -RequestTimeout:300" /> + <CustomAction Id="fcgiconfigJSFastCGISetRequestTimeout" + BinaryKey="WixCA" + DllEntry="CAQuietExec" + Return="ignore" + Execute="deferred" + Impersonate="no" /> + <CustomAction Id="fcgiconfigJSFastCGISetRequestTimeoutCmdXP" + Property="fcgiconfigJSFastCGISetRequestTimeoutXP" + Value=""cscript" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -RequestTimeout:300" /> + <CustomAction Id="fcgiconfigJSFastCGISetRequestTimeoutXP" + BinaryKey="WixCA" + DllEntry="CAQuietExec" + Return="ignore" + Execute="deferred" + Impersonate="no" /> <CustomAction Id="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSCmd" Property="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTS" Value=""\\localhost\admin$\system32\cscript.exe" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -EnvironmentVars:PHP_FCGI_MAX_REQUESTS:10000,PHPRC:"[INSTALLDIR]"" /> @@ -565,7 +620,19 @@ <Custom Action="iis700FastCGISetInstanceMaxRequests" After="iis700FastCGISetInstanceMaxRequestsCmd"> <![CDATA[VersionNT >= 600 AND &iis4FastCGI = 3]]> </Custom> - <Custom Action="iis700FastCGISetPHP_FCGI_MAX_REQUESTSCmd" After="iis700FastCGISetInstanceMaxRequests"> + <Custom Action="iis700FastCGISetActivityTimeoutCmd" After="iis700FastCGISetInstanceMaxRequests"> + <![CDATA[VersionNT >= 600 AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="iis700FastCGISetActivityTimeout" After="iis700FastCGISetActivityTimeoutCmd"> + <![CDATA[VersionNT >= 600 AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="iis700FastCGISetRequestTimeoutCmd" After="iis700FastCGISetActivityTimeout"> + <![CDATA[VersionNT >= 600 AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="iis700FastCGISetRequestTimeout" After="iis700FastCGISetRequestTimeoutCmd"> + <![CDATA[VersionNT >= 600 AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="iis700FastCGISetPHP_FCGI_MAX_REQUESTSCmd" After="iis700FastCGISetRequestTimeout"> <![CDATA[VersionNT >= 600 AND &iis4FastCGI = 3]]> </Custom> <Custom Action="iis700FastCGISetPHP_FCGI_MAX_REQUESTS" After="iis700FastCGISetPHP_FCGI_MAX_REQUESTSCmd"> @@ -613,7 +680,19 @@ <Custom Action="fcgiconfigJSFastCGISetInstanceMaxRequests" After="fcgiconfigJSFastCGISetInstanceMaxRequestsCmd"> <![CDATA[(VersionNT = 502 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> </Custom> - <Custom Action="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSCmd" After="fcgiconfigJSFastCGISetInstanceMaxRequests"> + <Custom Action="fcgiconfigJSFastCGISetActivityTimeoutCmd" After="fcgiconfigJSFastCGISetInstanceMaxRequests"> + <![CDATA[(VersionNT = 502 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="fcgiconfigJSFastCGISetActivityTimeout" After="fcgiconfigJSFastCGISetActivityTimeoutCmd"> + <![CDATA[(VersionNT = 502 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="fcgiconfigJSFastCGISetRequestTimeoutCmd" After="fcgiconfigJSFastCGISetActivityTimeout"> + <![CDATA[(VersionNT = 502 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="fcgiconfigJSFastCGISetRequestTimeout" After="fcgiconfigJSFastCGISetRequestTimeoutCmd"> + <![CDATA[(VersionNT = 502 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSCmd" After="fcgiconfigJSFastCGISetRequestTimeout"> <![CDATA[(VersionNT = 502 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> </Custom> <Custom Action="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTS" After="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSCmd"> @@ -634,7 +713,19 @@ <Custom Action="fcgiconfigJSFastCGISetInstanceMaxRequestsXP" After="fcgiconfigJSFastCGISetInstanceMaxRequestsCmdXP"> <![CDATA[(VersionNT = 501 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> </Custom> - <Custom Action="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSCmdXP" After="fcgiconfigJSFastCGISetInstanceMaxRequestsXP"> + <Custom Action="fcgiconfigJSFastCGISetActivityTimeoutCmdXP" After="fcgiconfigJSFastCGISetInstanceMaxRequestsXP"> + <![CDATA[(VersionNT = 501 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="fcgiconfigJSFastCGISetActivityTimeoutXP" After="fcgiconfigJSFastCGISetActivityTimeoutCmdXP"> + <![CDATA[(VersionNT = 501 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="fcgiconfigJSFastCGISetRequestTimeoutCmdXP" After="fcgiconfigJSFastCGISetActivityTimeoutXP"> + <![CDATA[(VersionNT = 501 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="fcgiconfigJSFastCGISetRequestTimeoutXP" After="fcgiconfigJSFastCGISetRequestTimeoutCmdXP"> + <![CDATA[(VersionNT = 501 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> + </Custom> + <Custom Action="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSCmdXP" After="fcgiconfigJSFastCGISetRequestTimeoutXP"> <![CDATA[(VersionNT = 501 AND ServicePackLevel >= 2) AND &iis4FastCGI = 3]]> </Custom> <Custom Action="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSXP" After="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSCmdXP"> http://cvs.php.net/viewvc.cgi/win-installer/WebServerConfig52.wxs?r1=1.5&r2=1.6&diff_format=u Index: win-installer/WebServerConfig52.wxs diff -u win-installer/WebServerConfig52.wxs:1.5 win-installer/WebServerConfig52.wxs:1.6 --- win-installer/WebServerConfig52.wxs:1.5 Tue Feb 17 16:44:59 2009 +++ win-installer/WebServerConfig52.wxs Mon Jun 8 21:02:56 2009 @@ -37,13 +37,14 @@ Section="PHP" Value="1" /> </Component> <Component Id="fastcgiimpersonate" DiskId="1" Guid="61290EEB-616B-4434-8283-D7BDC7008D25"> - <IniFile Id="fastcgiimpersonateINI" - Action="addLine" - Key="fastcgi.impersonate" - Directory="INSTALLDIR" - Name="php.ini" - Section="PHP" - Value="1"/> + <IniFile Id="fastcgiimpersonateINI" Action="addLine" + Key="fastcgi.impersonate" Directory="INSTALLDIR" Name="php.ini" + Section="PHP" Value="1"/> + </Component> + <Component Id="maxexecutiontime" DiskId="1" Guid="5C6D1771-0D27-42C3-946B-3E0E138CF5DA"> + <IniFile Id="maxexecutiontimeINI" Action="addLine" + Key="max_execution_time" Directory="INSTALLDIR" Name="php.ini" + Section="PHP" Value="300"/> </Component> <Component Id="iis3CGI" DiskId="1" Guid="20842834-47E2-483C-AE09-B4E90C12E314"> <Registry Id="iis3RegScriptMap" http://cvs.php.net/viewvc.cgi/win-installer/WebServerConfig52NTS.wxs?r1=1.3&r2=1.4&diff_format=u Index: win-installer/WebServerConfig52NTS.wxs diff -u win-installer/WebServerConfig52NTS.wxs:1.3 win-installer/WebServerConfig52NTS.wxs:1.4 --- win-installer/WebServerConfig52NTS.wxs:1.3 Tue Feb 17 16:44:59 2009 +++ win-installer/WebServerConfig52NTS.wxs Mon Jun 8 21:02:56 2009 @@ -8,13 +8,14 @@ Section="PHP" Value="0" /> </Component> <Component Id="fastcgiimpersonate" DiskId="1" Guid="61290EEB-616B-4434-8283-D7BDC7008D25"> - <IniFile Id="fastcgiimpersonateINI" - Action="addLine" - Key="fastcgi.impersonate" - Directory="INSTALLDIR" - Name="php.ini" - Section="PHP" - Value="1"/> + <IniFile Id="fastcgiimpersonateINI" Action="addLine" + Key="fastcgi.impersonate" Directory="INSTALLDIR" Name="php.ini" + Section="PHP" Value="1"/> + </Component> + <Component Id="maxexecutiontime" DiskId="1" Guid="5C6D1771-0D27-42C3-946B-3E0E138CF5DA"> + <IniFile Id="maxexecutiontimeINI" Action="addLine" + Key="max_execution_time" Directory="INSTALLDIR" Name="php.ini" + Section="PHP" Value="300"/> </Component> <Component Id="iis4FastCGIregistry" DiskId="1" http://cvs.php.net/viewvc.cgi/win-installer/WebServerConfig53.wxs?r1=1.6&r2=1.7&diff_format=u Index: win-installer/WebServerConfig53.wxs diff -u win-installer/WebServerConfig53.wxs:1.6 win-installer/WebServerConfig53.wxs:1.7 --- win-installer/WebServerConfig53.wxs:1.6 Sat Mar 21 01:58:33 2009 +++ win-installer/WebServerConfig53.wxs Mon Jun 8 21:02:56 2009 @@ -25,13 +25,14 @@ Section="PHP" Value="1" /> </Component> <Component Id="fastcgiimpersonate" DiskId="1" Guid="61290EEB-616B-4434-8283-D7BDC7008D25"> - <IniFile Id="fastcgiimpersonateINI" - Action="addLine" - Key="fastcgi.impersonate" - Directory="INSTALLDIR" - Name="php.ini" - Section="PHP" - Value="1"/> + <IniFile Id="fastcgiimpersonateINI" Action="addLine" + Key="fastcgi.impersonate" Directory="INSTALLDIR" Name="php.ini" + Section="PHP" Value="1"/> + </Component> + <Component Id="maxexecutiontime" DiskId="1" Guid="5C6D1771-0D27-42C3-946B-3E0E138CF5DA"> + <IniFile Id="maxexecutiontimeINI" Action="addLine" + Key="max_execution_time" Directory="INSTALLDIR" Name="php.ini" + Section="PHP" Value="300"/> </Component> <Component Id="iis3CGI" DiskId="1" Guid="20842834-47E2-483C-AE09-B4E90C12E314"> <Registry Id="iis3RegScriptMap" http://cvs.php.net/viewvc.cgi/win-installer/WebServerConfig53NTS.wxs?r1=1.3&r2=1.4&diff_format=u Index: win-installer/WebServerConfig53NTS.wxs diff -u win-installer/WebServerConfig53NTS.wxs:1.3 win-installer/WebServerConfig53NTS.wxs:1.4 --- win-installer/WebServerConfig53NTS.wxs:1.3 Tue Feb 17 16:44:59 2009 +++ win-installer/WebServerConfig53NTS.wxs Mon Jun 8 21:02:56 2009 @@ -8,13 +8,14 @@ Section="PHP" Value="0" /> </Component> <Component Id="fastcgiimpersonate" DiskId="1" Guid="61290EEB-616B-4434-8283-D7BDC7008D25"> - <IniFile Id="fastcgiimpersonateINI" - Action="addLine" - Key="fastcgi.impersonate" - Directory="INSTALLDIR" - Name="php.ini" - Section="PHP" - Value="1"/> + <IniFile Id="fastcgiimpersonateINI" Action="addLine" + Key="fastcgi.impersonate" Directory="INSTALLDIR" Name="php.ini" + Section="PHP" Value="1"/> + </Component> + <Component Id="maxexecutiontime" DiskId="1" Guid="5C6D1771-0D27-42C3-946B-3E0E138CF5DA"> + <IniFile Id="maxexecutiontimeINI" Action="addLine" + Key="max_execution_time" Directory="INSTALLDIR" Name="php.ini" + Section="PHP" Value="300"/> </Component> <Component Id="iis4FastCGIregistry" DiskId="1" http://cvs.php.net/viewvc.cgi/win-installer/WebServerConfig60.wxs?r1=1.8&r2=1.9&diff_format=u Index: win-installer/WebServerConfig60.wxs diff -u win-installer/WebServerConfig60.wxs:1.8 win-installer/WebServerConfig60.wxs:1.9 --- win-installer/WebServerConfig60.wxs:1.8 Sat Mar 21 01:58:33 2009 +++ win-installer/WebServerConfig60.wxs Mon Jun 8 21:02:56 2009 @@ -25,13 +25,14 @@ Section="PHP" Value="1" /> </Component> <Component Id="fastcgiimpersonate" DiskId="1" Guid="61290EEB-616B-4434-8283-D7BDC7008D25"> - <IniFile Id="fastcgiimpersonateINI" - Action="addLine" - Key="fastcgi.impersonate" - Directory="INSTALLDIR" - Name="php.ini" - Section="PHP" - Value="1"/> + <IniFile Id="fastcgiimpersonateINI" Action="addLine" + Key="fastcgi.impersonate" Directory="INSTALLDIR" Name="php.ini" + Section="PHP" Value="1"/> + </Component> + <Component Id="maxexecutiontime" DiskId="1" Guid="5C6D1771-0D27-42C3-946B-3E0E138CF5DA"> + <IniFile Id="maxexecutiontimeINI" Action="addLine" + Key="max_execution_time" Directory="INSTALLDIR" Name="php.ini" + Section="PHP" Value="300"/> </Component> <Component Id="iis3CGI" DiskId="1" Guid="20842834-47E2-483C-AE09-B4E90C12E314"> <Registry Id="iis3RegScriptMap" http://cvs.php.net/viewvc.cgi/win-installer/WebServerConfig60NTS.wxs?r1=1.3&r2=1.4&diff_format=u Index: win-installer/WebServerConfig60NTS.wxs diff -u win-installer/WebServerConfig60NTS.wxs:1.3 win-installer/WebServerConfig60NTS.wxs:1.4 --- win-installer/WebServerConfig60NTS.wxs:1.3 Tue Feb 17 16:44:59 2009 +++ win-installer/WebServerConfig60NTS.wxs Mon Jun 8 21:02:56 2009 @@ -8,13 +8,14 @@ Section="PHP" Value="0" /> </Component> <Component Id="fastcgiimpersonate" DiskId="1" Guid="61290EEB-616B-4434-8283-D7BDC7008D25"> - <IniFile Id="fastcgiimpersonateINI" - Action="addLine" - Key="fastcgi.impersonate" - Directory="INSTALLDIR" - Name="php.ini" - Section="PHP" - Value="1"/> + <IniFile Id="fastcgiimpersonateINI" Action="addLine" + Key="fastcgi.impersonate" Directory="INSTALLDIR" Name="php.ini" + Section="PHP" Value="1"/> + </Component> + <Component Id="maxexecutiontime" DiskId="1" Guid="5C6D1771-0D27-42C3-946B-3E0E138CF5DA"> + <IniFile Id="maxexecutiontimeINI" Action="addLine" + Key="max_execution_time" Directory="INSTALLDIR" Name="php.ini" + Section="PHP" Value="300"/> </Component> <Component Id="iis4FastCGIregistry" DiskId="1"