jmertic         Mon Nov 10 16:44:10 2008 UTC

  Modified files:              
    /win-installer      PHPInstallerBase52.wxs PHPInstallerBase52NTS.wxs 
                        PHPInstallerBase53.wxs PHPInstallerBase53NTS.wxs 
                        PHPInstallerBase60.wxs PHPInstallerBase60NTS.wxs 
  Log:
  Fixed problems with detecting IIS FastCGI being available on Windows 2003 
Server and Windows Server 2008 x64.
  
http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase52.wxs?r1=1.28&r2=1.29&diff_format=u
Index: win-installer/PHPInstallerBase52.wxs
diff -u win-installer/PHPInstallerBase52.wxs:1.28 
win-installer/PHPInstallerBase52.wxs:1.29
--- win-installer/PHPInstallerBase52.wxs:1.28   Mon Oct 20 15:01:28 2008
+++ win-installer/PHPInstallerBase52.wxs        Mon Nov 10 16:44:10 2008
@@ -76,9 +76,9 @@
          <RegistrySearch 
         Id="fastcgi60Registry" 
         Root="HKLM" 
-        Key="SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall" 
+        
Key="SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{E136BB09-1BB2-49A0-9FF3-5C25564D3819}"
 
         Type="raw"
-        Name="{E136BB09-1BB2-49A0-9FF3-5C25564D3819}"/>
+        Name="Version"/>
        </Property>
        <Property Id="FASTCGI70MODULEINSTALLED">
          <RegistrySearch 
@@ -86,7 +86,8 @@
         Root="HKLM" 
         Key="SOFTWARE\Microsoft\InetStp\Components" 
         Type="raw"
-        Name="FastCgi"/>
+        Name="FastCgi"
+        Win64="yes"/>
        </Property>
        <CustomAction Id='CheckFASTCGIINSTALLED' Property='FASTCGIINSTALLED' 
Value='1' />
        <CustomAction Id='CheckFASTCGINOTINSTALLED' Property='FASTCGIINSTALLED' 
Value='0' />
http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase52NTS.wxs?r1=1.5&r2=1.6&diff_format=u
Index: win-installer/PHPInstallerBase52NTS.wxs
diff -u win-installer/PHPInstallerBase52NTS.wxs:1.5 
win-installer/PHPInstallerBase52NTS.wxs:1.6
--- win-installer/PHPInstallerBase52NTS.wxs:1.5 Fri Sep 12 16:03:32 2008
+++ win-installer/PHPInstallerBase52NTS.wxs     Mon Nov 10 16:44:10 2008
@@ -56,9 +56,9 @@
          <RegistrySearch 
         Id="fastcgi60Registry" 
         Root="HKLM" 
-        Key="SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall" 
+        
Key="SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{E136BB09-1BB2-49A0-9FF3-5C25564D3819}"
 
         Type="raw"
-        Name="{E136BB09-1BB2-49A0-9FF3-5C25564D3819}"/>
+        Name="Version"/>
        </Property>
        <Property Id="FASTCGI70MODULEINSTALLED">
          <RegistrySearch 
@@ -66,7 +66,8 @@
         Root="HKLM" 
         Key="SOFTWARE\Microsoft\InetStp\Components" 
         Type="raw"
-        Name="FastCgi"/>
+        Name="FastCgi"
+        Win64="yes"/>
        </Property>
        <CustomAction Id='CheckFASTCGIINSTALLED' Property='FASTCGIINSTALLED' 
Value='1' />
        <CustomAction Id='CheckFASTCGINOTINSTALLED' Property='FASTCGIINSTALLED' 
Value='0' />
http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase53.wxs?r1=1.4&r2=1.5&diff_format=u
Index: win-installer/PHPInstallerBase53.wxs
diff -u win-installer/PHPInstallerBase53.wxs:1.4 
win-installer/PHPInstallerBase53.wxs:1.5
--- win-installer/PHPInstallerBase53.wxs:1.4    Mon Oct 13 09:57:01 2008
+++ win-installer/PHPInstallerBase53.wxs        Mon Nov 10 16:44:10 2008
@@ -76,9 +76,9 @@
          <RegistrySearch 
         Id="fastcgi60Registry" 
         Root="HKLM" 
-        Key="SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall" 
+        
Key="SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{E136BB09-1BB2-49A0-9FF3-5C25564D3819}"
 
         Type="raw"
-        Name="{E136BB09-1BB2-49A0-9FF3-5C25564D3819}"/>
+        Name="Version"/>
        </Property>
        <Property Id="FASTCGI70MODULEINSTALLED">
          <RegistrySearch 
@@ -86,7 +86,8 @@
         Root="HKLM" 
         Key="SOFTWARE\Microsoft\InetStp\Components" 
         Type="raw"
-        Name="FastCgi"/>
+        Name="FastCgi"
+        Win64="yes"/>
        </Property>
        <CustomAction Id='CheckFASTCGIINSTALLED' Property='FASTCGIINSTALLED' 
Value='1' />
        <CustomAction Id='CheckFASTCGINOTINSTALLED' Property='FASTCGIINSTALLED' 
Value='0' />
http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase53NTS.wxs?r1=1.4&r2=1.5&diff_format=u
Index: win-installer/PHPInstallerBase53NTS.wxs
diff -u win-installer/PHPInstallerBase53NTS.wxs:1.4 
win-installer/PHPInstallerBase53NTS.wxs:1.5
--- win-installer/PHPInstallerBase53NTS.wxs:1.4 Fri Sep 12 16:03:32 2008
+++ win-installer/PHPInstallerBase53NTS.wxs     Mon Nov 10 16:44:10 2008
@@ -56,9 +56,9 @@
          <RegistrySearch 
         Id="fastcgi60Registry" 
         Root="HKLM" 
-        Key="SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall" 
+        
Key="SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{E136BB09-1BB2-49A0-9FF3-5C25564D3819}"
 
         Type="raw"
-        Name="{E136BB09-1BB2-49A0-9FF3-5C25564D3819}"/>
+        Name="Version"/>
        </Property>
        <Property Id="FASTCGI70MODULEINSTALLED">
          <RegistrySearch 
@@ -66,7 +66,8 @@
         Root="HKLM" 
         Key="SOFTWARE\Microsoft\InetStp\Components" 
         Type="raw"
-        Name="FastCgi"/>
+        Name="FastCgi"
+        Win64="yes"/>
        </Property>
        <CustomAction Id='CheckFASTCGIINSTALLED' Property='FASTCGIINSTALLED' 
Value='1' />
        <CustomAction Id='CheckFASTCGINOTINSTALLED' Property='FASTCGIINSTALLED' 
Value='0' />
http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase60.wxs?r1=1.19&r2=1.20&diff_format=u
Index: win-installer/PHPInstallerBase60.wxs
diff -u win-installer/PHPInstallerBase60.wxs:1.19 
win-installer/PHPInstallerBase60.wxs:1.20
--- win-installer/PHPInstallerBase60.wxs:1.19   Fri Sep 12 16:03:32 2008
+++ win-installer/PHPInstallerBase60.wxs        Mon Nov 10 16:44:10 2008
@@ -76,9 +76,9 @@
          <RegistrySearch 
         Id="fastcgi60Registry" 
         Root="HKLM" 
-        Key="SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall" 
+        
Key="SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{E136BB09-1BB2-49A0-9FF3-5C25564D3819}"
 
         Type="raw"
-        Name="{E136BB09-1BB2-49A0-9FF3-5C25564D3819}"/>
+        Name="Version"/>
        </Property>
        <Property Id="FASTCGI70MODULEINSTALLED">
          <RegistrySearch 
@@ -86,7 +86,8 @@
         Root="HKLM" 
         Key="SOFTWARE\Microsoft\InetStp\Components" 
         Type="raw"
-        Name="FastCgi"/>
+        Name="FastCgi"
+        Win64="yes"/>
        </Property>
        <CustomAction Id='CheckFASTCGIINSTALLED' Property='FASTCGIINSTALLED' 
Value='1' />
        <CustomAction Id='CheckFASTCGINOTINSTALLED' Property='FASTCGIINSTALLED' 
Value='0' />
http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase60NTS.wxs?r1=1.5&r2=1.6&diff_format=u
Index: win-installer/PHPInstallerBase60NTS.wxs
diff -u win-installer/PHPInstallerBase60NTS.wxs:1.5 
win-installer/PHPInstallerBase60NTS.wxs:1.6
--- win-installer/PHPInstallerBase60NTS.wxs:1.5 Fri Sep 12 16:03:32 2008
+++ win-installer/PHPInstallerBase60NTS.wxs     Mon Nov 10 16:44:10 2008
@@ -56,9 +56,9 @@
          <RegistrySearch 
         Id="fastcgi60Registry" 
         Root="HKLM" 
-        Key="SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall" 
+        
Key="SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{E136BB09-1BB2-49A0-9FF3-5C25564D3819}"
 
         Type="raw"
-        Name="{E136BB09-1BB2-49A0-9FF3-5C25564D3819}"/>
+        Name="Version"/>
        </Property>
        <Property Id="FASTCGI70MODULEINSTALLED">
          <RegistrySearch 
@@ -66,7 +66,8 @@
         Root="HKLM" 
         Key="SOFTWARE\Microsoft\InetStp\Components" 
         Type="raw"
-        Name="FastCgi"/>
+        Name="FastCgi"
+        Win64="yes"/>
        </Property>
        <CustomAction Id='CheckFASTCGIINSTALLED' Property='FASTCGIINSTALLED' 
Value='1' />
        <CustomAction Id='CheckFASTCGINOTINSTALLED' Property='FASTCGIINSTALLED' 
Value='0' />



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

Reply via email to