jmertic Thu, 16 Jul 2009 18:47:14 +0000
URL: http://svn.php.net/viewvc?view=revision&revision=284197
Changed paths:
U php/win-installer/trunk/PHPInstallerBase52.wxs
U php/win-installer/trunk/PHPInstallerBase52NTS.wxs
U php/win-installer/trunk/PHPInstallerBase53.wxs
U php/win-installer/trunk/PHPInstallerBase53NTS.wxs
U php/win-installer/trunk/PHPInstallerBase60.wxs
U php/win-installer/trunk/PHPInstallerBase60NTS.wxs
U php/win-installer/trunk/WebServerConfig52.wxs
U php/win-installer/trunk/WebServerConfig52NTS.wxs
U php/win-installer/trunk/WebServerConfig53.wxs
U php/win-installer/trunk/WebServerConfig53NTS.wxs
U php/win-installer/trunk/WebServerConfig60.wxs
U php/win-installer/trunk/WebServerConfig60NTS.wxs
Log:
- Move the ActivityTimeout and RequestTimeout for IIS/FastCGI to 600 seconds
-
Set fastcgi.logging to 0 for IIS/FastCGI installs
- Turn on log_errors and write
all errors to the %TEMP%/php-errors.log file.
Modified: php/win-installer/trunk/PHPInstallerBase52.wxs
===================================================================
--- php/win-installer/trunk/PHPInstallerBase52.wxs 2009-07-16 16:11:50 UTC (rev 284196)
+++ php/win-installer/trunk/PHPInstallerBase52.wxs 2009-07-16 18:47:14 UTC (rev 284197)
@@ -294,6 +294,16 @@
Value="7"/>
<Condition>VersionNT = 502</Condition>
</Component>
+ <Component Id="errorlog"
+ DiskId="1"
+ Guid="C90F9100-7234-11DE-8A39-0800200C9A66">
+ <IniFile Id="logerrorsINI" Action="addLine"
+ Key="log_errors" Directory="INSTALLDIR" Name="php.ini"
+ Section="PHP" Value="On" />
+ <IniFile Id="errorlogINI" Action="addLine"
+ Key="error_log" Directory="INSTALLDIR" Name="php.ini"
+ Section="PHP" Value="[TempFolder]\php-errors.log" />
+ </Component>
<Component Id="php5tsDLL"
DiskId="1"
Guid="14A95C34-564F-4BF9-BFC7-0DAA48A96BA2">
@@ -371,6 +381,7 @@
<ComponentRef Id="php5tsLIB"/>
<ComponentRef Id="php5embedLIB"/>
<ComponentRef Id="phpEXE"/>
+ <ComponentRef Id="errorlog"/>
<Feature AllowAdvertise="no"
Id="ScriptExecutable"
Title="$(loc.FeatureScriptExecutableTitle)"
@@ -463,6 +474,7 @@
<ComponentRef Id="phpcgiEXE"/>
<ComponentRef Id="cgiforceredirect"/>
<ComponentRef Id="fastcgiimpersonate"/>
+ <ComponentRef Id="fastcgilogging"/>
<ComponentRef Id="maxexecutiontime" />
<ComponentRef Id="iis4FastCGIregistry"/>
</Feature>
@@ -593,7 +605,7 @@
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" />
+ Value=""[WindowsFolder]system32\inetsrv\APPCMD.EXE" SET CONFIG -section:system.webServer/fastCGI "/[\[]fullPath='[INSTALLDIR]php-cgi.exe'[\]].activityTimeout:600" /commit:apphost" />
<CustomAction Id="iis700FastCGISetActivityTimeout"
BinaryKey="WixCA"
DllEntry="CAQuietExec"
@@ -602,7 +614,7 @@
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" />
+ Value=""[WindowsFolder]system32\inetsrv\APPCMD.EXE" SET CONFIG -section:system.webServer/fastCGI "/[\[]fullPath='[INSTALLDIR]php-cgi.exe'[\]].requestTimeout:600" /commit:apphost" />
<CustomAction Id="iis700FastCGISetRequestTimeout"
BinaryKey="WixCA"
DllEntry="CAQuietExec"
@@ -699,7 +711,7 @@
Impersonate="no" />
<CustomAction Id="fcgiconfigJSFastCGISetActivityTimeoutCmd"
Property="fcgiconfigJSFastCGISetActivityTimeout"
- Value=""\\localhost\admin$\system32\cscript.exe" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -ActivityTimeout:300" />
+ Value=""\\localhost\admin$\system32\cscript.exe" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -ActivityTimeout:600" />
<CustomAction Id="fcgiconfigJSFastCGISetActivityTimeout"
BinaryKey="WixCA"
DllEntry="CAQuietExec"
@@ -708,7 +720,7 @@
Impersonate="no" />
<CustomAction Id="fcgiconfigJSFastCGISetActivityTimeoutCmdXP"
Property="fcgiconfigJSFastCGISetActivityTimeoutXP"
- Value=""cscript" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -ActivityTimeout:300" />
+ Value=""cscript" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -ActivityTimeout:600" />
<CustomAction Id="fcgiconfigJSFastCGISetActivityTimeoutXP"
BinaryKey="WixCA"
DllEntry="CAQuietExec"
@@ -717,7 +729,7 @@
Impersonate="no" />
<CustomAction Id="fcgiconfigJSFastCGISetRequestTimeoutCmd"
Property="fcgiconfigJSFastCGISetRequestTimeout"
- Value=""\\localhost\admin$\system32\cscript.exe" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -RequestTimeout:300" />
+ Value=""\\localhost\admin$\system32\cscript.exe" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -RequestTimeout:600" />
<CustomAction Id="fcgiconfigJSFastCGISetRequestTimeout"
BinaryKey="WixCA"
DllEntry="CAQuietExec"
@@ -726,7 +738,7 @@
Impersonate="no" />
<CustomAction Id="fcgiconfigJSFastCGISetRequestTimeoutCmdXP"
Property="fcgiconfigJSFastCGISetRequestTimeoutXP"
- Value=""cscript" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -RequestTimeout:300" />
+ Value=""cscript" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -RequestTimeout:600" />
<CustomAction Id="fcgiconfigJSFastCGISetRequestTimeoutXP"
BinaryKey="WixCA"
DllEntry="CAQuietExec"
Modified: php/win-installer/trunk/PHPInstallerBase52NTS.wxs
===================================================================
--- php/win-installer/trunk/PHPInstallerBase52NTS.wxs 2009-07-16 16:11:50 UTC (rev 284196)
+++ php/win-installer/trunk/PHPInstallerBase52NTS.wxs 2009-07-16 18:47:14 UTC (rev 284197)
@@ -272,6 +272,16 @@
Value="7"/>
<Condition>VersionNT = 502</Condition>
</Component>
+ <Component Id="errorlog"
+ DiskId="1"
+ Guid="C90F9100-7234-11DE-8A39-0800200C9A66">
+ <IniFile Id="logerrorsINI" Action="addLine"
+ Key="log_errors" Directory="INSTALLDIR" Name="php.ini"
+ Section="PHP" Value="On" />
+ <IniFile Id="errorlogINI" Action="addLine"
+ Key="error_log" Directory="INSTALLDIR" Name="php.ini"
+ Section="PHP" Value="[TempFolder]\php-errors.log" />
+ </Component>
<Component Id="php5DLL"
DiskId="1"
Guid="14A95C34-564F-4BF9-BFC7-0DAA48A96BA2">
@@ -349,6 +359,7 @@
<ComponentRef Id="php5LIB"/>
<ComponentRef Id="php5embedLIB"/>
<ComponentRef Id="phpEXE"/>
+ <ComponentRef Id="errorlog"/>
<Feature AllowAdvertise="no"
Id="ScriptExecutable"
Title="$(loc.FeatureScriptExecutableTitle)"
@@ -393,6 +404,7 @@
<ComponentRef Id="phpcgiEXE"/>
<ComponentRef Id="cgiforceredirect"/>
<ComponentRef Id="fastcgiimpersonate"/>
+ <ComponentRef Id="fastcgilogging"/>
<ComponentRef Id="maxexecutiontime" />
<ComponentRef Id="iis4FastCGIregistry"/>
</Feature>
@@ -460,7 +472,7 @@
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" />
+ Value=""[WindowsFolder]system32\inetsrv\APPCMD.EXE" SET CONFIG -section:system.webServer/fastCGI "/[\[]fullPath='[INSTALLDIR]php-cgi.exe'[\]].activityTimeout:600" /commit:apphost" />
<CustomAction Id="iis700FastCGISetActivityTimeout"
BinaryKey="WixCA"
DllEntry="CAQuietExec"
@@ -469,7 +481,7 @@
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" />
+ Value=""[WindowsFolder]system32\inetsrv\APPCMD.EXE" SET CONFIG -section:system.webServer/fastCGI "/[\[]fullPath='[INSTALLDIR]php-cgi.exe'[\]].requestTimeout:600" /commit:apphost" />
<CustomAction Id="iis700FastCGISetRequestTimeout"
BinaryKey="WixCA"
DllEntry="CAQuietExec"
@@ -566,7 +578,7 @@
Impersonate="no" />
<CustomAction Id="fcgiconfigJSFastCGISetActivityTimeoutCmd"
Property="fcgiconfigJSFastCGISetActivityTimeout"
- Value=""\\localhost\admin$\system32\cscript.exe" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -ActivityTimeout:300" />
+ Value=""\\localhost\admin$\system32\cscript.exe" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -ActivityTimeout:600" />
<CustomAction Id="fcgiconfigJSFastCGISetActivityTimeout"
BinaryKey="WixCA"
DllEntry="CAQuietExec"
@@ -575,7 +587,7 @@
Impersonate="no" />
<CustomAction Id="fcgiconfigJSFastCGISetActivityTimeoutCmdXP"
Property="fcgiconfigJSFastCGISetActivityTimeoutXP"
- Value=""cscript" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -ActivityTimeout:300" />
+ Value=""cscript" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -ActivityTimeout:600" />
<CustomAction Id="fcgiconfigJSFastCGISetActivityTimeoutXP"
BinaryKey="WixCA"
DllEntry="CAQuietExec"
@@ -584,7 +596,7 @@
Impersonate="no" />
<CustomAction Id="fcgiconfigJSFastCGISetRequestTimeoutCmd"
Property="fcgiconfigJSFastCGISetRequestTimeout"
- Value=""\\localhost\admin$\system32\cscript.exe" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -RequestTimeout:300" />
+ Value=""\\localhost\admin$\system32\cscript.exe" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -RequestTimeout:600" />
<CustomAction Id="fcgiconfigJSFastCGISetRequestTimeout"
BinaryKey="WixCA"
DllEntry="CAQuietExec"
@@ -593,7 +605,7 @@
Impersonate="no" />
<CustomAction Id="fcgiconfigJSFastCGISetRequestTimeoutCmdXP"
Property="fcgiconfigJSFastCGISetRequestTimeoutXP"
- Value=""cscript" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -RequestTimeout:300" />
+ Value=""cscript" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -RequestTimeout:600" />
<CustomAction Id="fcgiconfigJSFastCGISetRequestTimeoutXP"
BinaryKey="WixCA"
DllEntry="CAQuietExec"
Modified: php/win-installer/trunk/PHPInstallerBase53.wxs
===================================================================
--- php/win-installer/trunk/PHPInstallerBase53.wxs 2009-07-16 16:11:50 UTC (rev 284196)
+++ php/win-installer/trunk/PHPInstallerBase53.wxs 2009-07-16 18:47:14 UTC (rev 284197)
@@ -287,6 +287,16 @@
Value="7"/>
<Condition>VersionNT = 502</Condition>
</Component>
+ <Component Id="errorlog"
+ DiskId="1"
+ Guid="C90F9100-7234-11DE-8A39-0800200C9A66">
+ <IniFile Id="logerrorsINI" Action="addLine"
+ Key="log_errors" Directory="INSTALLDIR" Name="php.ini"
+ Section="PHP" Value="On" />
+ <IniFile Id="errorlogINI" Action="addLine"
+ Key="error_log" Directory="INSTALLDIR" Name="php.ini"
+ Section="PHP" Value="[TempFolder]\php-errors.log" />
+ </Component>
<Component Id="php5tsDLL"
DiskId="1"
Guid="14A95C34-564F-4BF9-BFC7-0DAA48A96BA2">
@@ -366,6 +376,7 @@
<ComponentRef Id="php5tsLIB"/>
<ComponentRef Id="php5embedLIB"/>
<ComponentRef Id="phpEXE"/>
+ <ComponentRef Id="errorlog"/>
<ComponentRef Id="pharcommandPHAR"/>
<ComponentRef Id="pharBAT"/>
<Feature AllowAdvertise="no"
@@ -440,6 +451,7 @@
<ComponentRef Id="phpcgiEXE"/>
<ComponentRef Id="cgiforceredirect"/>
<ComponentRef Id="fastcgiimpersonate"/>
+ <ComponentRef Id="fastcgilogging"/>
<ComponentRef Id="maxexecutiontime" />
<ComponentRef Id="iis4FastCGIregistry"/>
</Feature>
@@ -553,7 +565,7 @@
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" />
+ Value=""[WindowsFolder]system32\inetsrv\APPCMD.EXE" SET CONFIG -section:system.webServer/fastCGI "/[\[]fullPath='[INSTALLDIR]php-cgi.exe'[\]].activityTimeout:600" /commit:apphost" />
<CustomAction Id="iis700FastCGISetActivityTimeout"
BinaryKey="WixCA"
DllEntry="CAQuietExec"
@@ -562,7 +574,7 @@
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" />
+ Value=""[WindowsFolder]system32\inetsrv\APPCMD.EXE" SET CONFIG -section:system.webServer/fastCGI "/[\[]fullPath='[INSTALLDIR]php-cgi.exe'[\]].requestTimeout:600" /commit:apphost" />
<CustomAction Id="iis700FastCGISetRequestTimeout"
BinaryKey="WixCA"
DllEntry="CAQuietExec"
@@ -659,7 +671,7 @@
Impersonate="no" />
<CustomAction Id="fcgiconfigJSFastCGISetActivityTimeoutCmd"
Property="fcgiconfigJSFastCGISetActivityTimeout"
- Value=""\\localhost\admin$\system32\cscript.exe" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -ActivityTimeout:300" />
+ Value=""\\localhost\admin$\system32\cscript.exe" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -ActivityTimeout:600" />
<CustomAction Id="fcgiconfigJSFastCGISetActivityTimeout"
BinaryKey="WixCA"
DllEntry="CAQuietExec"
@@ -668,7 +680,7 @@
Impersonate="no" />
<CustomAction Id="fcgiconfigJSFastCGISetActivityTimeoutCmdXP"
Property="fcgiconfigJSFastCGISetActivityTimeoutXP"
- Value=""cscript" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -ActivityTimeout:300" />
+ Value=""cscript" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -ActivityTimeout:600" />
<CustomAction Id="fcgiconfigJSFastCGISetActivityTimeoutXP"
BinaryKey="WixCA"
DllEntry="CAQuietExec"
@@ -677,7 +689,7 @@
Impersonate="no" />
<CustomAction Id="fcgiconfigJSFastCGISetRequestTimeoutCmd"
Property="fcgiconfigJSFastCGISetRequestTimeout"
- Value=""\\localhost\admin$\system32\cscript.exe" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -RequestTimeout:300" />
+ Value=""\\localhost\admin$\system32\cscript.exe" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -RequestTimeout:600" />
<CustomAction Id="fcgiconfigJSFastCGISetRequestTimeout"
BinaryKey="WixCA"
DllEntry="CAQuietExec"
@@ -686,7 +698,7 @@
Impersonate="no" />
<CustomAction Id="fcgiconfigJSFastCGISetRequestTimeoutCmdXP"
Property="fcgiconfigJSFastCGISetRequestTimeoutXP"
- Value=""cscript" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -RequestTimeout:300" />
+ Value=""cscript" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -RequestTimeout:600" />
<CustomAction Id="fcgiconfigJSFastCGISetRequestTimeoutXP"
BinaryKey="WixCA"
DllEntry="CAQuietExec"
Modified: php/win-installer/trunk/PHPInstallerBase53NTS.wxs
===================================================================
--- php/win-installer/trunk/PHPInstallerBase53NTS.wxs 2009-07-16 16:11:50 UTC (rev 284196)
+++ php/win-installer/trunk/PHPInstallerBase53NTS.wxs 2009-07-16 18:47:14 UTC (rev 284197)
@@ -265,6 +265,16 @@
Value="7"/>
<Condition>VersionNT = 502</Condition>
</Component>
+ <Component Id="errorlog"
+ DiskId="1"
+ Guid="C90F9100-7234-11DE-8A39-0800200C9A66">
+ <IniFile Id="logerrorsINI" Action="addLine"
+ Key="log_errors" Directory="INSTALLDIR" Name="php.ini"
+ Section="PHP" Value="On" />
+ <IniFile Id="errorlogINI" Action="addLine"
+ Key="error_log" Directory="INSTALLDIR" Name="php.ini"
+ Section="PHP" Value="[TempFolder]\php-errors.log" />
+ </Component>
<Component Id="php5DLL"
DiskId="1"
Guid="14A95C34-564F-4BF9-BFC7-0DAA48A96BA2">
@@ -344,6 +354,7 @@
<ComponentRef Id="php5LIB"/>
<ComponentRef Id="php5embedLIB"/>
<ComponentRef Id="phpEXE"/>
+ <ComponentRef Id="errorlog"/>
<ComponentRef Id="pharcommandPHAR"/>
<ComponentRef Id="pharBAT"/>
<Feature AllowAdvertise="no"
@@ -384,6 +395,7 @@
<ComponentRef Id="phpcgiEXE"/>
<ComponentRef Id="cgiforceredirect"/>
<ComponentRef Id="fastcgiimpersonate"/>
+ <ComponentRef Id="fastcgilogging"/>
<ComponentRef Id="maxexecutiontime" />
<ComponentRef Id="iis4FastCGIregistry"/>
</Feature>
@@ -443,7 +455,7 @@
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" />
+ Value=""[WindowsFolder]system32\inetsrv\APPCMD.EXE" SET CONFIG -section:system.webServer/fastCGI "/[\[]fullPath='[INSTALLDIR]php-cgi.exe'[\]].activityTimeout:600" /commit:apphost" />
<CustomAction Id="iis700FastCGISetActivityTimeout"
BinaryKey="WixCA"
DllEntry="CAQuietExec"
@@ -452,7 +464,7 @@
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" />
+ Value=""[WindowsFolder]system32\inetsrv\APPCMD.EXE" SET CONFIG -section:system.webServer/fastCGI "/[\[]fullPath='[INSTALLDIR]php-cgi.exe'[\]].requestTimeout:600" /commit:apphost" />
<CustomAction Id="iis700FastCGISetRequestTimeout"
BinaryKey="WixCA"
DllEntry="CAQuietExec"
@@ -549,7 +561,7 @@
Impersonate="no" />
<CustomAction Id="fcgiconfigJSFastCGISetActivityTimeoutCmd"
Property="fcgiconfigJSFastCGISetActivityTimeout"
- Value=""\\localhost\admin$\system32\cscript.exe" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -ActivityTimeout:300" />
+ Value=""\\localhost\admin$\system32\cscript.exe" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -ActivityTimeout:600" />
<CustomAction Id="fcgiconfigJSFastCGISetActivityTimeout"
BinaryKey="WixCA"
DllEntry="CAQuietExec"
@@ -558,7 +570,7 @@
Impersonate="no" />
<CustomAction Id="fcgiconfigJSFastCGISetActivityTimeoutCmdXP"
Property="fcgiconfigJSFastCGISetActivityTimeoutXP"
- Value=""cscript" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -ActivityTimeout:300" />
+ Value=""cscript" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -ActivityTimeout:600" />
<CustomAction Id="fcgiconfigJSFastCGISetActivityTimeoutXP"
BinaryKey="WixCA"
DllEntry="CAQuietExec"
@@ -567,7 +579,7 @@
Impersonate="no" />
<CustomAction Id="fcgiconfigJSFastCGISetRequestTimeoutCmd"
Property="fcgiconfigJSFastCGISetRequestTimeout"
- Value=""\\localhost\admin$\system32\cscript.exe" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -RequestTimeout:300" />
+ Value=""\\localhost\admin$\system32\cscript.exe" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -RequestTimeout:600" />
<CustomAction Id="fcgiconfigJSFastCGISetRequestTimeout"
BinaryKey="WixCA"
DllEntry="CAQuietExec"
@@ -576,7 +588,7 @@
Impersonate="no" />
<CustomAction Id="fcgiconfigJSFastCGISetRequestTimeoutCmdXP"
Property="fcgiconfigJSFastCGISetRequestTimeoutXP"
- Value=""cscript" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -RequestTimeout:300" />
+ Value=""cscript" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -RequestTimeout:600" />
<CustomAction Id="fcgiconfigJSFastCGISetRequestTimeoutXP"
BinaryKey="WixCA"
DllEntry="CAQuietExec"
Modified: php/win-installer/trunk/PHPInstallerBase60.wxs
===================================================================
--- php/win-installer/trunk/PHPInstallerBase60.wxs 2009-07-16 16:11:50 UTC (rev 284196)
+++ php/win-installer/trunk/PHPInstallerBase60.wxs 2009-07-16 18:47:14 UTC (rev 284197)
@@ -287,6 +287,16 @@
Value="7"/>
<Condition>VersionNT = 502</Condition>
</Component>
+ <Component Id="errorlog"
+ DiskId="1"
+ Guid="C90F9100-7234-11DE-8A39-0800200C9A66">
+ <IniFile Id="logerrorsINI" Action="addLine"
+ Key="log_errors" Directory="INSTALLDIR" Name="php.ini"
+ Section="PHP" Value="On" />
+ <IniFile Id="errorlogINI" Action="addLine"
+ Key="error_log" Directory="INSTALLDIR" Name="php.ini"
+ Section="PHP" Value="[TempFolder]\php-errors.log" />
+ </Component>
<Component Id="php6tsDLL"
DiskId="1"
Guid="14A95C34-564F-4BF9-BFC7-0DAA48A96BA2">
@@ -366,6 +376,7 @@
<ComponentRef Id="php6tsLIB"/>
<ComponentRef Id="php6embedLIB"/>
<ComponentRef Id="phpEXE"/>
+ <ComponentRef Id="errorlog"/>
<ComponentRef Id="pharcommandPHAR"/>
<ComponentRef Id="pharBAT"/>
<Feature AllowAdvertise="no"
@@ -440,6 +451,7 @@
<ComponentRef Id="phpcgiEXE"/>
<ComponentRef Id="cgiforceredirect"/>
<ComponentRef Id="fastcgiimpersonate"/>
+ <ComponentRef Id="fastcgilogging"/>
<ComponentRef Id="maxexecutiontime" />
<ComponentRef Id="iis4FastCGIregistry"/>
</Feature>
@@ -553,7 +565,7 @@
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" />
+ Value=""[WindowsFolder]system32\inetsrv\APPCMD.EXE" SET CONFIG -section:system.webServer/fastCGI "/[\[]fullPath='[INSTALLDIR]php-cgi.exe'[\]].activityTimeout:600" /commit:apphost" />
<CustomAction Id="iis700FastCGISetActivityTimeout"
BinaryKey="WixCA"
DllEntry="CAQuietExec"
@@ -562,7 +574,7 @@
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" />
+ Value=""[WindowsFolder]system32\inetsrv\APPCMD.EXE" SET CONFIG -section:system.webServer/fastCGI "/[\[]fullPath='[INSTALLDIR]php-cgi.exe'[\]].requestTimeout:600" /commit:apphost" />
<CustomAction Id="iis700FastCGISetRequestTimeout"
BinaryKey="WixCA"
DllEntry="CAQuietExec"
@@ -659,7 +671,7 @@
Impersonate="no" />
<CustomAction Id="fcgiconfigJSFastCGISetActivityTimeoutCmd"
Property="fcgiconfigJSFastCGISetActivityTimeout"
- Value=""\\localhost\admin$\system32\cscript.exe" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -ActivityTimeout:300" />
+ Value=""\\localhost\admin$\system32\cscript.exe" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -ActivityTimeout:600" />
<CustomAction Id="fcgiconfigJSFastCGISetActivityTimeout"
BinaryKey="WixCA"
DllEntry="CAQuietExec"
@@ -668,7 +680,7 @@
Impersonate="no" />
<CustomAction Id="fcgiconfigJSFastCGISetActivityTimeoutCmdXP"
Property="fcgiconfigJSFastCGISetActivityTimeoutXP"
- Value=""cscript" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -ActivityTimeout:300" />
+ Value=""cscript" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -ActivityTimeout:600" />
<CustomAction Id="fcgiconfigJSFastCGISetActivityTimeoutXP"
BinaryKey="WixCA"
DllEntry="CAQuietExec"
@@ -677,7 +689,7 @@
Impersonate="no" />
<CustomAction Id="fcgiconfigJSFastCGISetRequestTimeoutCmd"
Property="fcgiconfigJSFastCGISetRequestTimeout"
- Value=""\\localhost\admin$\system32\cscript.exe" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -RequestTimeout:300" />
+ Value=""\\localhost\admin$\system32\cscript.exe" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -RequestTimeout:600" />
<CustomAction Id="fcgiconfigJSFastCGISetRequestTimeout"
BinaryKey="WixCA"
DllEntry="CAQuietExec"
@@ -686,7 +698,7 @@
Impersonate="no" />
<CustomAction Id="fcgiconfigJSFastCGISetRequestTimeoutCmdXP"
Property="fcgiconfigJSFastCGISetRequestTimeoutXP"
- Value=""cscript" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -RequestTimeout:300" />
+ Value=""cscript" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -RequestTimeout:600" />
<CustomAction Id="fcgiconfigJSFastCGISetRequestTimeoutXP"
BinaryKey="WixCA"
DllEntry="CAQuietExec"
Modified: php/win-installer/trunk/PHPInstallerBase60NTS.wxs
===================================================================
--- php/win-installer/trunk/PHPInstallerBase60NTS.wxs 2009-07-16 16:11:50 UTC (rev 284196)
+++ php/win-installer/trunk/PHPInstallerBase60NTS.wxs 2009-07-16 18:47:14 UTC (rev 284197)
@@ -265,7 +265,17 @@
Value="7"/>
<Condition>VersionNT = 502</Condition>
</Component>
- <Component Id="php6DLL"
+ <Component Id="errorlog"
+ DiskId="1"
+ Guid="C90F9100-7234-11DE-8A39-0800200C9A66">
+ <IniFile Id="logerrorsINI" Action="addLine"
+ Key="log_errors" Directory="INSTALLDIR" Name="php.ini"
+ Section="PHP" Value="On" />
+ <IniFile Id="errorlogINI" Action="addLine"
+ Key="error_log" Directory="INSTALLDIR" Name="php.ini"
+ Section="PHP" Value="[TempFolder]\php-errors.log" />
+ </Component>
+ <Component Id="php6DLL"
DiskId="1"
Guid="14A95C34-564F-4BF9-BFC7-0DAA48A96BA2">
<File Id="file25"
@@ -344,6 +354,7 @@
<ComponentRef Id="php6LIB"/>
<ComponentRef Id="php6embedLIB"/>
<ComponentRef Id="phpEXE"/>
+ <ComponentRef Id="errorlog"/>
<ComponentRef Id="pharcommandPHAR"/>
<ComponentRef Id="pharBAT"/>
<Feature AllowAdvertise="no"
@@ -390,10 +401,11 @@
<ComponentRef Id="phpcgiEXE"/>
<ComponentRef Id="cgiforceredirect"/>
<ComponentRef Id="fastcgiimpersonate"/>
+ <ComponentRef Id="fastcgilogging"/>
<ComponentRef Id="maxexecutiontime" />
<ComponentRef Id="iis4FastCGIregistry"/>
</Feature>
- <Feature AllowAdvertise="no"
+ <Feature AllowAdvertise="no"
Id="cgi"
Title="$(loc.FeaturecgiTitle)"
Description="$(loc.FeaturecgiDescription)"
@@ -449,7 +461,7 @@
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" />
+ Value=""[WindowsFolder]system32\inetsrv\APPCMD.EXE" SET CONFIG -section:system.webServer/fastCGI "/[\[]fullPath='[INSTALLDIR]php-cgi.exe'[\]].activityTimeout:600" /commit:apphost" />
<CustomAction Id="iis700FastCGISetActivityTimeout"
BinaryKey="WixCA"
DllEntry="CAQuietExec"
@@ -458,7 +470,7 @@
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" />
+ Value=""[WindowsFolder]system32\inetsrv\APPCMD.EXE" SET CONFIG -section:system.webServer/fastCGI "/[\[]fullPath='[INSTALLDIR]php-cgi.exe'[\]].requestTimeout:600" /commit:apphost" />
<CustomAction Id="iis700FastCGISetRequestTimeout"
BinaryKey="WixCA"
DllEntry="CAQuietExec"
@@ -555,7 +567,7 @@
Impersonate="no" />
<CustomAction Id="fcgiconfigJSFastCGISetActivityTimeoutCmd"
Property="fcgiconfigJSFastCGISetActivityTimeout"
- Value=""\\localhost\admin$\system32\cscript.exe" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -ActivityTimeout:300" />
+ Value=""\\localhost\admin$\system32\cscript.exe" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -ActivityTimeout:600" />
<CustomAction Id="fcgiconfigJSFastCGISetActivityTimeout"
BinaryKey="WixCA"
DllEntry="CAQuietExec"
@@ -564,7 +576,7 @@
Impersonate="no" />
<CustomAction Id="fcgiconfigJSFastCGISetActivityTimeoutCmdXP"
Property="fcgiconfigJSFastCGISetActivityTimeoutXP"
- Value=""cscript" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -ActivityTimeout:300" />
+ Value=""cscript" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -ActivityTimeout:600" />
<CustomAction Id="fcgiconfigJSFastCGISetActivityTimeoutXP"
BinaryKey="WixCA"
DllEntry="CAQuietExec"
@@ -573,7 +585,7 @@
Impersonate="no" />
<CustomAction Id="fcgiconfigJSFastCGISetRequestTimeoutCmd"
Property="fcgiconfigJSFastCGISetRequestTimeout"
- Value=""\\localhost\admin$\system32\cscript.exe" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -RequestTimeout:300" />
+ Value=""\\localhost\admin$\system32\cscript.exe" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -RequestTimeout:600" />
<CustomAction Id="fcgiconfigJSFastCGISetRequestTimeout"
BinaryKey="WixCA"
DllEntry="CAQuietExec"
@@ -582,7 +594,7 @@
Impersonate="no" />
<CustomAction Id="fcgiconfigJSFastCGISetRequestTimeoutCmdXP"
Property="fcgiconfigJSFastCGISetRequestTimeoutXP"
- Value=""cscript" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -RequestTimeout:300" />
+ Value=""cscript" "[WindowsFolder]system32\inetsrv\fcgiconfig.js" -set -section:"PHP" -RequestTimeout:600" />
<CustomAction Id="fcgiconfigJSFastCGISetRequestTimeoutXP"
BinaryKey="WixCA"
DllEntry="CAQuietExec"
Modified: php/win-installer/trunk/WebServerConfig52.wxs
===================================================================
--- php/win-installer/trunk/WebServerConfig52.wxs 2009-07-16 16:11:50 UTC (rev 284196)
+++ php/win-installer/trunk/WebServerConfig52.wxs 2009-07-16 18:47:14 UTC (rev 284197)
@@ -41,10 +41,15 @@
Key="fastcgi.impersonate" Directory="INSTALLDIR" Name="php.ini"
Section="PHP" Value="1"/>
</Component>
+ <Component Id="fastcgilogging" DiskId="1" Guid="218C8790-7233-11DE-8A39-0800200C9A66">
+ <IniFile Id="fastcgiloggingINI" Action="addLine"
+ Key="fastcgi.logging" Directory="INSTALLDIR" Name="php.ini"
+ Section="PHP" Value="0"/>
+ </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"/>
+ Section="PHP" Value="600"/>
</Component>
<Component Id="iis3CGI" DiskId="1" Guid="20842834-47E2-483C-AE09-B4E90C12E314">
<Registry Id="iis3RegScriptMap"
Modified: php/win-installer/trunk/WebServerConfig52NTS.wxs
===================================================================
--- php/win-installer/trunk/WebServerConfig52NTS.wxs 2009-07-16 16:11:50 UTC (rev 284196)
+++ php/win-installer/trunk/WebServerConfig52NTS.wxs 2009-07-16 18:47:14 UTC (rev 284197)
@@ -12,10 +12,15 @@
Key="fastcgi.impersonate" Directory="INSTALLDIR" Name="php.ini"
Section="PHP" Value="1"/>
</Component>
+ <Component Id="fastcgilogging" DiskId="1" Guid="218C8790-7233-11DE-8A39-0800200C9A66">
+ <IniFile Id="fastcgiloggingINI" Action="addLine"
+ Key="fastcgi.logging" Directory="INSTALLDIR" Name="php.ini"
+ Section="PHP" Value="0"/>
+ </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"/>
+ Section="PHP" Value="600"/>
</Component>
<Component Id="iis4FastCGIregistry"
DiskId="1"
Modified: php/win-installer/trunk/WebServerConfig53.wxs
===================================================================
--- php/win-installer/trunk/WebServerConfig53.wxs 2009-07-16 16:11:50 UTC (rev 284196)
+++ php/win-installer/trunk/WebServerConfig53.wxs 2009-07-16 18:47:14 UTC (rev 284197)
@@ -29,10 +29,15 @@
Key="fastcgi.impersonate" Directory="INSTALLDIR" Name="php.ini"
Section="PHP" Value="1"/>
</Component>
+ <Component Id="fastcgilogging" DiskId="1" Guid="218C8790-7233-11DE-8A39-0800200C9A66">
+ <IniFile Id="fastcgiloggingINI" Action="addLine"
+ Key="fastcgi.logging" Directory="INSTALLDIR" Name="php.ini"
+ Section="PHP" Value="0"/>
+ </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"/>
+ Section="PHP" Value="600"/>
</Component>
<Component Id="iis3CGI" DiskId="1" Guid="20842834-47E2-483C-AE09-B4E90C12E314">
<Registry Id="iis3RegScriptMap"
Modified: php/win-installer/trunk/WebServerConfig53NTS.wxs
===================================================================
--- php/win-installer/trunk/WebServerConfig53NTS.wxs 2009-07-16 16:11:50 UTC (rev 284196)
+++ php/win-installer/trunk/WebServerConfig53NTS.wxs 2009-07-16 18:47:14 UTC (rev 284197)
@@ -12,10 +12,15 @@
Key="fastcgi.impersonate" Directory="INSTALLDIR" Name="php.ini"
Section="PHP" Value="1"/>
</Component>
+ <Component Id="fastcgilogging" DiskId="1" Guid="218C8790-7233-11DE-8A39-0800200C9A66">
+ <IniFile Id="fastcgiloggingINI" Action="addLine"
+ Key="fastcgi.logging" Directory="INSTALLDIR" Name="php.ini"
+ Section="PHP" Value="0"/>
+ </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"/>
+ Section="PHP" Value="600"/>
</Component>
<Component Id="iis4FastCGIregistry"
DiskId="1"
Modified: php/win-installer/trunk/WebServerConfig60.wxs
===================================================================
--- php/win-installer/trunk/WebServerConfig60.wxs 2009-07-16 16:11:50 UTC (rev 284196)
+++ php/win-installer/trunk/WebServerConfig60.wxs 2009-07-16 18:47:14 UTC (rev 284197)
@@ -29,10 +29,15 @@
Key="fastcgi.impersonate" Directory="INSTALLDIR" Name="php.ini"
Section="PHP" Value="1"/>
</Component>
+ <Component Id="fastcgilogging" DiskId="1" Guid="218C8790-7233-11DE-8A39-0800200C9A66">
+ <IniFile Id="fastcgiloggingINI" Action="addLine"
+ Key="fastcgi.logging" Directory="INSTALLDIR" Name="php.ini"
+ Section="PHP" Value="0"/>
+ </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"/>
+ Section="PHP" Value="600"/>
</Component>
<Component Id="iis3CGI" DiskId="1" Guid="20842834-47E2-483C-AE09-B4E90C12E314">
<Registry Id="iis3RegScriptMap"
Modified: php/win-installer/trunk/WebServerConfig60NTS.wxs
===================================================================
--- php/win-installer/trunk/WebServerConfig60NTS.wxs 2009-07-16 16:11:50 UTC (rev 284196)
+++ php/win-installer/trunk/WebServerConfig60NTS.wxs 2009-07-16 18:47:14 UTC (rev 284197)
@@ -12,10 +12,15 @@
Key="fastcgi.impersonate" Directory="INSTALLDIR" Name="php.ini"
Section="PHP" Value="1"/>
</Component>
+ <Component Id="fastcgilogging" DiskId="1" Guid="218C8790-7233-11DE-8A39-0800200C9A66">
+ <IniFile Id="fastcgiloggingINI" Action="addLine"
+ Key="fastcgi.logging" Directory="INSTALLDIR" Name="php.ini"
+ Section="PHP" Value="0"/>
+ </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"/>
+ Section="PHP" Value="600"/>
</Component>
<Component Id="iis4FastCGIregistry"
DiskId="1"
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
