jmertic Tue Feb 17 16:44:59 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:
Applied fixed contributed from Ruslan Yakushev <[email protected]>:
- Set the fastcgi.impersonate = 1 in php.ini when installing the IIS/FastCGI
sapi.
http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase52.wxs?r1=1.39&r2=1.40&diff_format=u
Index: win-installer/PHPInstallerBase52.wxs
diff -u win-installer/PHPInstallerBase52.wxs:1.39
win-installer/PHPInstallerBase52.wxs:1.40
--- win-installer/PHPInstallerBase52.wxs:1.39 Wed Feb 4 18:43:59 2009
+++ win-installer/PHPInstallerBase52.wxs Tue Feb 17 16:44:59 2009
@@ -467,6 +467,7 @@
Level="1">
<ComponentRef Id="phpcgiEXE"/>
<ComponentRef Id="cgiforceredirect"/>
+ <ComponentRef Id="fastcgiimpersonate"/>
<ComponentRef Id="iis4FastCGIregistry"/>
</Feature>
<Feature AllowAdvertise="no"
http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase52NTS.wxs?r1=1.15&r2=1.16&diff_format=u
Index: win-installer/PHPInstallerBase52NTS.wxs
diff -u win-installer/PHPInstallerBase52NTS.wxs:1.15
win-installer/PHPInstallerBase52NTS.wxs:1.16
--- win-installer/PHPInstallerBase52NTS.wxs:1.15 Wed Feb 4 18:43:59 2009
+++ win-installer/PHPInstallerBase52NTS.wxs Tue Feb 17 16:44:59 2009
@@ -397,6 +397,7 @@
Level="1">
<ComponentRef Id="phpcgiEXE"/>
<ComponentRef Id="cgiforceredirect"/>
+ <ComponentRef Id="fastcgiimpersonate"/>
<ComponentRef Id="iis4FastCGIregistry"/>
</Feature>
<Feature AllowAdvertise="no"
http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase53.wxs?r1=1.15&r2=1.16&diff_format=u
Index: win-installer/PHPInstallerBase53.wxs
diff -u win-installer/PHPInstallerBase53.wxs:1.15
win-installer/PHPInstallerBase53.wxs:1.16
--- win-installer/PHPInstallerBase53.wxs:1.15 Wed Feb 4 18:43:59 2009
+++ win-installer/PHPInstallerBase53.wxs Tue Feb 17 16:44:59 2009
@@ -446,6 +446,7 @@
Level="1">
<ComponentRef Id="phpcgiEXE"/>
<ComponentRef Id="cgiforceredirect"/>
+ <ComponentRef Id="fastcgiimpersonate"/>
<ComponentRef Id="iis4FastCGIregistry"/>
</Feature>
<Feature AllowAdvertise="no"
http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase53NTS.wxs?r1=1.14&r2=1.15&diff_format=u
Index: win-installer/PHPInstallerBase53NTS.wxs
diff -u win-installer/PHPInstallerBase53NTS.wxs:1.14
win-installer/PHPInstallerBase53NTS.wxs:1.15
--- win-installer/PHPInstallerBase53NTS.wxs:1.14 Wed Feb 4 18:43:59 2009
+++ win-installer/PHPInstallerBase53NTS.wxs Tue Feb 17 16:44:59 2009
@@ -376,6 +376,7 @@
Level="1">
<ComponentRef Id="phpcgiEXE"/>
<ComponentRef Id="cgiforceredirect"/>
+ <ComponentRef Id="fastcgiimpersonate"/>
<ComponentRef Id="iis4FastCGIregistry"/>
</Feature>
<Feature AllowAdvertise="no"
http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase60.wxs?r1=1.29&r2=1.30&diff_format=u
Index: win-installer/PHPInstallerBase60.wxs
diff -u win-installer/PHPInstallerBase60.wxs:1.29
win-installer/PHPInstallerBase60.wxs:1.30
--- win-installer/PHPInstallerBase60.wxs:1.29 Wed Feb 4 18:43:59 2009
+++ win-installer/PHPInstallerBase60.wxs Tue Feb 17 16:44:59 2009
@@ -446,6 +446,7 @@
Level="1">
<ComponentRef Id="phpcgiEXE"/>
<ComponentRef Id="cgiforceredirect"/>
+ <ComponentRef Id="fastcgiimpersonate"/>
<ComponentRef Id="iis4FastCGIregistry"/>
</Feature>
<Feature AllowAdvertise="no"
http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase60NTS.wxs?r1=1.15&r2=1.16&diff_format=u
Index: win-installer/PHPInstallerBase60NTS.wxs
diff -u win-installer/PHPInstallerBase60NTS.wxs:1.15
win-installer/PHPInstallerBase60NTS.wxs:1.16
--- win-installer/PHPInstallerBase60NTS.wxs:1.15 Wed Feb 4 18:43:59 2009
+++ win-installer/PHPInstallerBase60NTS.wxs Tue Feb 17 16:44:59 2009
@@ -376,6 +376,7 @@
Level="1">
<ComponentRef Id="phpcgiEXE"/>
<ComponentRef Id="cgiforceredirect"/>
+ <ComponentRef Id="fastcgiimpersonate"/>
<ComponentRef Id="iis4FastCGIregistry"/>
</Feature>
<Feature AllowAdvertise="no"
http://cvs.php.net/viewvc.cgi/win-installer/WebServerConfig52.wxs?r1=1.4&r2=1.5&diff_format=u
Index: win-installer/WebServerConfig52.wxs
diff -u win-installer/WebServerConfig52.wxs:1.4
win-installer/WebServerConfig52.wxs:1.5
--- win-installer/WebServerConfig52.wxs:1.4 Fri Sep 28 16:47:43 2007
+++ win-installer/WebServerConfig52.wxs Tue Feb 17 16:44:59 2009
@@ -36,6 +36,15 @@
Key="cgi.fix_pathinfo" Directory="INSTALLDIR" Name="php.ini"
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"/>
+ </Component>
<Component Id="iis3CGI" DiskId="1"
Guid="20842834-47E2-483C-AE09-B4E90C12E314">
<Registry Id="iis3RegScriptMap"
Root="HKLM"
http://cvs.php.net/viewvc.cgi/win-installer/WebServerConfig52NTS.wxs?r1=1.2&r2=1.3&diff_format=u
Index: win-installer/WebServerConfig52NTS.wxs
diff -u win-installer/WebServerConfig52NTS.wxs:1.2
win-installer/WebServerConfig52NTS.wxs:1.3
--- win-installer/WebServerConfig52NTS.wxs:1.2 Thu Sep 11 19:14:57 2008
+++ win-installer/WebServerConfig52NTS.wxs Tue Feb 17 16:44:59 2009
@@ -7,6 +7,15 @@
Key="cgi.force_redirect" Directory="INSTALLDIR" Name="php.ini"
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"/>
+ </Component>
<Component Id="iis4FastCGIregistry"
DiskId="1"
Guid="36F5E036-6DDF-11DC-8314-0800200C9A66">
http://cvs.php.net/viewvc.cgi/win-installer/WebServerConfig53.wxs?r1=1.3&r2=1.4&diff_format=u
Index: win-installer/WebServerConfig53.wxs
diff -u win-installer/WebServerConfig53.wxs:1.3
win-installer/WebServerConfig53.wxs:1.4
--- win-installer/WebServerConfig53.wxs:1.3 Sun Dec 21 04:11:21 2008
+++ win-installer/WebServerConfig53.wxs Tue Feb 17 16:44:59 2009
@@ -33,6 +33,15 @@
Key="cgi.fix_pathinfo" Directory="INSTALLDIR" Name="php.ini"
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"/>
+ </Component>
<Component Id="iis3CGI" DiskId="1"
Guid="20842834-47E2-483C-AE09-B4E90C12E314">
<Registry Id="iis3RegScriptMap"
Root="HKLM"
http://cvs.php.net/viewvc.cgi/win-installer/WebServerConfig53NTS.wxs?r1=1.2&r2=1.3&diff_format=u
Index: win-installer/WebServerConfig53NTS.wxs
diff -u win-installer/WebServerConfig53NTS.wxs:1.2
win-installer/WebServerConfig53NTS.wxs:1.3
--- win-installer/WebServerConfig53NTS.wxs:1.2 Thu Sep 11 19:14:57 2008
+++ win-installer/WebServerConfig53NTS.wxs Tue Feb 17 16:44:59 2009
@@ -7,6 +7,15 @@
Key="cgi.force_redirect" Directory="INSTALLDIR" Name="php.ini"
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"/>
+ </Component>
<Component Id="iis4FastCGIregistry"
DiskId="1"
Guid="36F5E036-6DDF-11DC-8314-0800200C9A66">
http://cvs.php.net/viewvc.cgi/win-installer/WebServerConfig60.wxs?r1=1.5&r2=1.6&diff_format=u
Index: win-installer/WebServerConfig60.wxs
diff -u win-installer/WebServerConfig60.wxs:1.5
win-installer/WebServerConfig60.wxs:1.6
--- win-installer/WebServerConfig60.wxs:1.5 Wed Sep 10 20:37:27 2008
+++ win-installer/WebServerConfig60.wxs Tue Feb 17 16:44:59 2009
@@ -33,6 +33,15 @@
Key="cgi.fix_pathinfo" Directory="INSTALLDIR" Name="php.ini"
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"/>
+ </Component>
<Component Id="iis3CGI" DiskId="1"
Guid="20842834-47E2-483C-AE09-B4E90C12E314">
<Registry Id="iis3RegScriptMap"
Root="HKLM"
http://cvs.php.net/viewvc.cgi/win-installer/WebServerConfig60NTS.wxs?r1=1.2&r2=1.3&diff_format=u
Index: win-installer/WebServerConfig60NTS.wxs
diff -u win-installer/WebServerConfig60NTS.wxs:1.2
win-installer/WebServerConfig60NTS.wxs:1.3
--- win-installer/WebServerConfig60NTS.wxs:1.2 Thu Sep 11 19:14:57 2008
+++ win-installer/WebServerConfig60NTS.wxs Tue Feb 17 16:44:59 2009
@@ -7,6 +7,15 @@
Key="cgi.force_redirect" Directory="INSTALLDIR" Name="php.ini"
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"/>
+ </Component>
<Component Id="iis4FastCGIregistry"
DiskId="1"
Guid="36F5E036-6DDF-11DC-8314-0800200C9A66">
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php