jmertic         Thu Jan 29 18:30:33 2009 UTC

  Modified files:              
    /win-installer      PHPInstallerBase52.wxs PHPInstallerBase52NTS.wxs 
                        PHPInstallerBase53.wxs PHPInstallerBase53NTS.wxs 
                        PHPInstallerBase60.wxs PHPInstallerBase60NTS.wxs 
                        PHPInstallerScripts52.vbs PHPInstallerScripts60.vbs 
  Log:
  Applied fixed contributed from Ruslan Yakushev <rusl...@microsoft.com>:
  
  - The parameters passed to custom action for creating the scripts should be 
in quotes.
  - The VBScript code to get the short path to the fastcgi executable was 
failing on XP unless a separate file object was created.
  
http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase52.wxs?r1=1.36&r2=1.37&diff_format=u
Index: win-installer/PHPInstallerBase52.wxs
diff -u win-installer/PHPInstallerBase52.wxs:1.36 
win-installer/PHPInstallerBase52.wxs:1.37
--- win-installer/PHPInstallerBase52.wxs:1.36   Tue Jan 27 14:28:19 2009
+++ win-installer/PHPInstallerBase52.wxs        Thu Jan 29 18:30:32 2009
@@ -638,7 +638,7 @@
       Impersonate="no" />
     <CustomAction Id="fcgiconfigJSFastCGICmd"
       Property="fcgiconfigJSFastCGI"
-      Value="cscript &quot;[WindowsFolder]system32\inetsrv\fcgiconfig.js&quot; 
-add -section:&quot;PHP&quot; -extension:php 
-path:&quot;[INSTALLDIR]php-cgi.exe&quot;" />
+      Value="&quot;cscript&quot; 
&quot;[WindowsFolder]system32\inetsrv\fcgiconfig.js&quot; -add 
-section:&quot;PHP&quot; -extension:php 
-path:&quot;[INSTALLDIR]php-cgi.exe&quot;" />
     <CustomAction Id="fcgiconfigJSFastCGI" 
       BinaryKey="WixCA"
       DllEntry="CAQuietExec" 
@@ -647,7 +647,7 @@
       Impersonate="no" />
     <CustomAction Id="fcgiconfigJSFastCGISetInstanceMaxRequestsCmd"
       Property="fcgiconfigJSFastCGISetInstanceMaxRequests"
-      Value="cscript &quot;[WindowsFolder]system32\inetsrv\fcgiconfig.js&quot; 
-set -section:&quot;PHP&quot; -InstanceMaxRequests:10000" />
+      Value="&quot;cscript&quot; 
&quot;[WindowsFolder]system32\inetsrv\fcgiconfig.js&quot; -set 
-section:&quot;PHP&quot; -InstanceMaxRequests:10000" />
     <CustomAction Id="fcgiconfigJSFastCGISetInstanceMaxRequests" 
       BinaryKey="WixCA" 
       DllEntry="CAQuietExec" 
@@ -656,7 +656,7 @@
       Impersonate="no" />
     <CustomAction Id="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSCmd"
       Property="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTS"
-      Value="cscript &quot;[WindowsFolder]system32\inetsrv\fcgiconfig.js&quot; 
-set -section:&quot;PHP&quot; 
-EnvironmentVars:PHP_FCGI_MAX_REQUESTS:10000,PHPRC:&quot;[INSTALLDIR]&quot;" />
+      Value="&quot;cscript&quot; 
&quot;[WindowsFolder]system32\inetsrv\fcgiconfig.js&quot; -set 
-section:&quot;PHP&quot; 
-EnvironmentVars:PHP_FCGI_MAX_REQUESTS:10000,PHPRC:&quot;[INSTALLDIR]&quot;" />
     <CustomAction Id="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTS" 
       BinaryKey="WixCA" 
       DllEntry="CAQuietExec" 
@@ -665,7 +665,7 @@
       Impersonate="no" />
     <CustomAction Id="fcgiconfigJSFastCGIremoveCmd"
       Property="fcgiconfigJSFastCGIremove"
-      Value="cscript &quot;[WindowsFolder]system32\inetsrv\fcgiconfig.js&quot; 
-remove -section:&quot;PHP&quot;" />
+      Value="&quot;cscript&quot; 
&quot;[WindowsFolder]system32\inetsrv\fcgiconfig.js&quot; -remove 
-section:&quot;PHP&quot;" />
     <CustomAction Id="fcgiconfigJSFastCGIremove" 
       BinaryKey="WixCA" 
       DllEntry="CAQuietExec" 
http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase52NTS.wxs?r1=1.12&r2=1.13&diff_format=u
Index: win-installer/PHPInstallerBase52NTS.wxs
diff -u win-installer/PHPInstallerBase52NTS.wxs:1.12 
win-installer/PHPInstallerBase52NTS.wxs:1.13
--- win-installer/PHPInstallerBase52NTS.wxs:1.12        Tue Jan 27 14:28:19 2009
+++ win-installer/PHPInstallerBase52NTS.wxs     Thu Jan 29 18:30:33 2009
@@ -507,7 +507,7 @@
       Impersonate="no" />
     <CustomAction Id="fcgiconfigJSFastCGICmd"
       Property="fcgiconfigJSFastCGI"
-      Value="cscript &quot;[WindowsFolder]system32\inetsrv\fcgiconfig.js&quot; 
-add -section:&quot;PHP&quot; -extension:php 
-path:&quot;[INSTALLDIR]php-cgi.exe&quot;" />
+      Value="&quot;cscript&quot; 
&quot;[WindowsFolder]system32\inetsrv\fcgiconfig.js&quot; -add 
-section:&quot;PHP&quot; -extension:php 
-path:&quot;[INSTALLDIR]php-cgi.exe&quot;" />
     <CustomAction Id="fcgiconfigJSFastCGI" 
       BinaryKey="WixCA"
       DllEntry="CAQuietExec" 
@@ -516,7 +516,7 @@
       Impersonate="no" />
     <CustomAction Id="fcgiconfigJSFastCGISetInstanceMaxRequestsCmd"
       Property="fcgiconfigJSFastCGISetInstanceMaxRequests"
-      Value="cscript &quot;[WindowsFolder]system32\inetsrv\fcgiconfig.js&quot; 
-set -section:&quot;PHP&quot; -InstanceMaxRequests:10000" />
+      Value="&quot;cscript&quot; 
&quot;[WindowsFolder]system32\inetsrv\fcgiconfig.js&quot; -set 
-section:&quot;PHP&quot; -InstanceMaxRequests:10000" />
     <CustomAction Id="fcgiconfigJSFastCGISetInstanceMaxRequests" 
       BinaryKey="WixCA" 
       DllEntry="CAQuietExec" 
@@ -525,7 +525,7 @@
       Impersonate="no" />
     <CustomAction Id="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSCmd"
       Property="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTS"
-      Value="cscript &quot;[WindowsFolder]system32\inetsrv\fcgiconfig.js&quot; 
-set -section:&quot;PHP&quot; 
-EnvironmentVars:PHP_FCGI_MAX_REQUESTS:10000,PHPRC:&quot;[INSTALLDIR]&quot;" />
+      Value="&quot;cscript&quot; 
&quot;[WindowsFolder]system32\inetsrv\fcgiconfig.js&quot; -set 
-section:&quot;PHP&quot; 
-EnvironmentVars:PHP_FCGI_MAX_REQUESTS:10000,PHPRC:&quot;[INSTALLDIR]&quot;" />
     <CustomAction Id="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTS" 
       BinaryKey="WixCA" 
       DllEntry="CAQuietExec" 
@@ -534,7 +534,7 @@
       Impersonate="no" />
     <CustomAction Id="fcgiconfigJSFastCGIremoveCmd"
       Property="fcgiconfigJSFastCGIremove"
-      Value="cscript &quot;[WindowsFolder]system32\inetsrv\fcgiconfig.js&quot; 
-remove -section:&quot;PHP&quot;" />
+      Value="&quot;cscript&quot; 
&quot;[WindowsFolder]system32\inetsrv\fcgiconfig.js&quot; -remove 
-section:&quot;PHP&quot;" />
     <CustomAction Id="fcgiconfigJSFastCGIremove" 
       BinaryKey="WixCA" 
       DllEntry="CAQuietExec" 
http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase53.wxs?r1=1.12&r2=1.13&diff_format=u
Index: win-installer/PHPInstallerBase53.wxs
diff -u win-installer/PHPInstallerBase53.wxs:1.12 
win-installer/PHPInstallerBase53.wxs:1.13
--- win-installer/PHPInstallerBase53.wxs:1.12   Tue Jan 27 14:28:19 2009
+++ win-installer/PHPInstallerBase53.wxs        Thu Jan 29 18:30:33 2009
@@ -609,7 +609,7 @@
       Impersonate="no" />
     <CustomAction Id="fcgiconfigJSFastCGICmd"
       Property="fcgiconfigJSFastCGI"
-      Value="cscript &quot;[WindowsFolder]system32\inetsrv\fcgiconfig.js&quot; 
-add -section:&quot;PHP&quot; -extension:php 
-path:&quot;[INSTALLDIR]php-cgi.exe&quot;" />
+      Value="&quot;cscript&quot; 
&quot;[WindowsFolder]system32\inetsrv\fcgiconfig.js&quot; -add 
-section:&quot;PHP&quot; -extension:php 
-path:&quot;[INSTALLDIR]php-cgi.exe&quot;" />
     <CustomAction Id="fcgiconfigJSFastCGI" 
       BinaryKey="WixCA"
       DllEntry="CAQuietExec" 
@@ -618,7 +618,7 @@
       Impersonate="no" />
     <CustomAction Id="fcgiconfigJSFastCGISetInstanceMaxRequestsCmd"
       Property="fcgiconfigJSFastCGISetInstanceMaxRequests"
-      Value="cscript &quot;[WindowsFolder]system32\inetsrv\fcgiconfig.js&quot; 
-set -section:&quot;PHP&quot; -InstanceMaxRequests:10000" />
+      Value="&quot;cscript&quot; 
&quot;[WindowsFolder]system32\inetsrv\fcgiconfig.js&quot; -set 
-section:&quot;PHP&quot; -InstanceMaxRequests:10000" />
     <CustomAction Id="fcgiconfigJSFastCGISetInstanceMaxRequests" 
       BinaryKey="WixCA" 
       DllEntry="CAQuietExec" 
@@ -627,7 +627,7 @@
       Impersonate="no" />
     <CustomAction Id="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSCmd"
       Property="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTS"
-      Value="cscript &quot;[WindowsFolder]system32\inetsrv\fcgiconfig.js&quot; 
-set -section:&quot;PHP&quot; 
-EnvironmentVars:PHP_FCGI_MAX_REQUESTS:10000,PHPRC:&quot;[INSTALLDIR]&quot;" />
+      Value="&quot;cscript&quot; 
&quot;[WindowsFolder]system32\inetsrv\fcgiconfig.js&quot; -set 
-section:&quot;PHP&quot; 
-EnvironmentVars:PHP_FCGI_MAX_REQUESTS:10000,PHPRC:&quot;[INSTALLDIR]&quot;" />
     <CustomAction Id="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTS" 
       BinaryKey="WixCA" 
       DllEntry="CAQuietExec" 
@@ -636,7 +636,7 @@
       Impersonate="no" />
     <CustomAction Id="fcgiconfigJSFastCGIremoveCmd"
       Property="fcgiconfigJSFastCGIremove"
-      Value="cscript &quot;[WindowsFolder]system32\inetsrv\fcgiconfig.js&quot; 
-remove -section:&quot;PHP&quot;" />
+      Value="&quot;cscript&quot; 
&quot;[WindowsFolder]system32\inetsrv\fcgiconfig.js&quot; -remove 
-section:&quot;PHP&quot;" />
     <CustomAction Id="fcgiconfigJSFastCGIremove" 
       BinaryKey="WixCA" 
       DllEntry="CAQuietExec" 
http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase53NTS.wxs?r1=1.11&r2=1.12&diff_format=u
Index: win-installer/PHPInstallerBase53NTS.wxs
diff -u win-installer/PHPInstallerBase53NTS.wxs:1.11 
win-installer/PHPInstallerBase53NTS.wxs:1.12
--- win-installer/PHPInstallerBase53NTS.wxs:1.11        Tue Jan 27 14:28:19 2009
+++ win-installer/PHPInstallerBase53NTS.wxs     Thu Jan 29 18:30:33 2009
@@ -476,7 +476,7 @@
       Impersonate="no" />
     <CustomAction Id="fcgiconfigJSFastCGICmd"
       Property="fcgiconfigJSFastCGI"
-      Value="cscript &quot;[WindowsFolder]system32\inetsrv\fcgiconfig.js&quot; 
-add -section:&quot;PHP&quot; -extension:php 
-path:&quot;[INSTALLDIR]php-cgi.exe&quot;" />
+      Value="&quot;cscript&quot; 
&quot;[WindowsFolder]system32\inetsrv\fcgiconfig.js&quot; -add 
-section:&quot;PHP&quot; -extension:php 
-path:&quot;[INSTALLDIR]php-cgi.exe&quot;" />
     <CustomAction Id="fcgiconfigJSFastCGI" 
       BinaryKey="WixCA"
       DllEntry="CAQuietExec" 
@@ -485,7 +485,7 @@
       Impersonate="no" />
     <CustomAction Id="fcgiconfigJSFastCGISetInstanceMaxRequestsCmd"
       Property="fcgiconfigJSFastCGISetInstanceMaxRequests"
-      Value="cscript &quot;[WindowsFolder]system32\inetsrv\fcgiconfig.js&quot; 
-set -section:&quot;PHP&quot; -InstanceMaxRequests:10000" />
+      Value="&quot;cscript&quot; 
&quot;[WindowsFolder]system32\inetsrv\fcgiconfig.js&quot; -set 
-section:&quot;PHP&quot; -InstanceMaxRequests:10000" />
     <CustomAction Id="fcgiconfigJSFastCGISetInstanceMaxRequests" 
       BinaryKey="WixCA" 
       DllEntry="CAQuietExec" 
@@ -494,7 +494,7 @@
       Impersonate="no" />
     <CustomAction Id="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSCmd"
       Property="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTS"
-      Value="cscript &quot;[WindowsFolder]system32\inetsrv\fcgiconfig.js&quot; 
-set -section:&quot;PHP&quot; 
-EnvironmentVars:PHP_FCGI_MAX_REQUESTS:10000,PHPRC:&quot;[INSTALLDIR]&quot;" />
+      Value="&quot;cscript&quot; 
&quot;[WindowsFolder]system32\inetsrv\fcgiconfig.js&quot; -set 
-section:&quot;PHP&quot; 
-EnvironmentVars:PHP_FCGI_MAX_REQUESTS:10000,PHPRC:&quot;[INSTALLDIR]&quot;" />
     <CustomAction Id="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTS" 
       BinaryKey="WixCA" 
       DllEntry="CAQuietExec" 
@@ -503,7 +503,7 @@
       Impersonate="no" />
     <CustomAction Id="fcgiconfigJSFastCGIremoveCmd"
       Property="fcgiconfigJSFastCGIremove"
-      Value="cscript &quot;[WindowsFolder]system32\inetsrv\fcgiconfig.js&quot; 
-remove -section:&quot;PHP&quot;" />
+      Value="&quot;cscript&quot; 
&quot;[WindowsFolder]system32\inetsrv\fcgiconfig.js&quot; -remove 
-section:&quot;PHP&quot;" />
     <CustomAction Id="fcgiconfigJSFastCGIremove" 
       BinaryKey="WixCA" 
       DllEntry="CAQuietExec" 
http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase60.wxs?r1=1.26&r2=1.27&diff_format=u
Index: win-installer/PHPInstallerBase60.wxs
diff -u win-installer/PHPInstallerBase60.wxs:1.26 
win-installer/PHPInstallerBase60.wxs:1.27
--- win-installer/PHPInstallerBase60.wxs:1.26   Tue Jan 27 14:28:19 2009
+++ win-installer/PHPInstallerBase60.wxs        Thu Jan 29 18:30:33 2009
@@ -609,7 +609,7 @@
       Impersonate="no" />
     <CustomAction Id="fcgiconfigJSFastCGICmd"
       Property="fcgiconfigJSFastCGI"
-      Value="cscript &quot;[WindowsFolder]system32\inetsrv\fcgiconfig.js&quot; 
-add -section:&quot;PHP&quot; -extension:php 
-path:&quot;[INSTALLDIR]php-cgi.exe&quot;" />
+      Value="&quot;cscript&quot; 
&quot;[WindowsFolder]system32\inetsrv\fcgiconfig.js&quot; -add 
-section:&quot;PHP&quot; -extension:php 
-path:&quot;[INSTALLDIR]php-cgi.exe&quot;" />
     <CustomAction Id="fcgiconfigJSFastCGI" 
       BinaryKey="WixCA"
       DllEntry="CAQuietExec" 
@@ -618,7 +618,7 @@
       Impersonate="no" />
     <CustomAction Id="fcgiconfigJSFastCGISetInstanceMaxRequestsCmd"
       Property="fcgiconfigJSFastCGISetInstanceMaxRequests"
-      Value="cscript &quot;[WindowsFolder]system32\inetsrv\fcgiconfig.js&quot; 
-set -section:&quot;PHP&quot; -InstanceMaxRequests:10000" />
+      Value="&quot;cscript&quot; 
&quot;[WindowsFolder]system32\inetsrv\fcgiconfig.js&quot; -set 
-section:&quot;PHP&quot; -InstanceMaxRequests:10000" />
     <CustomAction Id="fcgiconfigJSFastCGISetInstanceMaxRequests" 
       BinaryKey="WixCA" 
       DllEntry="CAQuietExec" 
@@ -627,7 +627,7 @@
       Impersonate="no" />
     <CustomAction Id="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSCmd"
       Property="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTS"
-      Value="cscript &quot;[WindowsFolder]system32\inetsrv\fcgiconfig.js&quot; 
-set -section:&quot;PHP&quot; 
-EnvironmentVars:PHP_FCGI_MAX_REQUESTS:10000,PHPRC:&quot;[INSTALLDIR]&quot;" />
+      Value="&quot;cscript&quot; 
&quot;[WindowsFolder]system32\inetsrv\fcgiconfig.js&quot; -set 
-section:&quot;PHP&quot; 
-EnvironmentVars:PHP_FCGI_MAX_REQUESTS:10000,PHPRC:&quot;[INSTALLDIR]&quot;" />
     <CustomAction Id="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTS" 
       BinaryKey="WixCA" 
       DllEntry="CAQuietExec" 
@@ -636,7 +636,7 @@
       Impersonate="no" />
     <CustomAction Id="fcgiconfigJSFastCGIremoveCmd"
       Property="fcgiconfigJSFastCGIremove"
-      Value="cscript &quot;[WindowsFolder]system32\inetsrv\fcgiconfig.js&quot; 
-remove -section:&quot;PHP&quot;" />
+      Value="&quot;cscript&quot; 
&quot;[WindowsFolder]system32\inetsrv\fcgiconfig.js&quot; -remove 
-section:&quot;PHP&quot;" />
     <CustomAction Id="fcgiconfigJSFastCGIremove" 
       BinaryKey="WixCA" 
       DllEntry="CAQuietExec" 
http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase60NTS.wxs?r1=1.12&r2=1.13&diff_format=u
Index: win-installer/PHPInstallerBase60NTS.wxs
diff -u win-installer/PHPInstallerBase60NTS.wxs:1.12 
win-installer/PHPInstallerBase60NTS.wxs:1.13
--- win-installer/PHPInstallerBase60NTS.wxs:1.12        Tue Jan 27 14:28:19 2009
+++ win-installer/PHPInstallerBase60NTS.wxs     Thu Jan 29 18:30:33 2009
@@ -476,7 +476,7 @@
       Impersonate="no" />
     <CustomAction Id="fcgiconfigJSFastCGICmd"
       Property="fcgiconfigJSFastCGI"
-      Value="cscript &quot;[WindowsFolder]system32\inetsrv\fcgiconfig.js&quot; 
-add -section:&quot;PHP&quot; -extension:php 
-path:&quot;[INSTALLDIR]php-cgi.exe&quot;" />
+      Value="&quot;cscript&quot; 
&quot;[WindowsFolder]system32\inetsrv\fcgiconfig.js&quot; -add 
-section:&quot;PHP&quot; -extension:php 
-path:&quot;[INSTALLDIR]php-cgi.exe&quot;" />
     <CustomAction Id="fcgiconfigJSFastCGI" 
       BinaryKey="WixCA"
       DllEntry="CAQuietExec" 
@@ -485,7 +485,7 @@
       Impersonate="no" />
     <CustomAction Id="fcgiconfigJSFastCGISetInstanceMaxRequestsCmd"
       Property="fcgiconfigJSFastCGISetInstanceMaxRequests"
-      Value="cscript &quot;[WindowsFolder]system32\inetsrv\fcgiconfig.js&quot; 
-set -section:&quot;PHP&quot; -InstanceMaxRequests:10000" />
+      Value="&quot;cscript&quot; 
&quot;[WindowsFolder]system32\inetsrv\fcgiconfig.js&quot; -set 
-section:&quot;PHP&quot; -InstanceMaxRequests:10000" />
     <CustomAction Id="fcgiconfigJSFastCGISetInstanceMaxRequests" 
       BinaryKey="WixCA" 
       DllEntry="CAQuietExec" 
@@ -494,7 +494,7 @@
       Impersonate="no" />
     <CustomAction Id="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSCmd"
       Property="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTS"
-      Value="cscript &quot;[WindowsFolder]system32\inetsrv\fcgiconfig.js&quot; 
-set -section:&quot;PHP&quot; 
-EnvironmentVars:PHP_FCGI_MAX_REQUESTS:10000,PHPRC:&quot;[INSTALLDIR]&quot;" />
+      Value="&quot;cscript&quot; 
&quot;[WindowsFolder]system32\inetsrv\fcgiconfig.js&quot; -set 
-section:&quot;PHP&quot; 
-EnvironmentVars:PHP_FCGI_MAX_REQUESTS:10000,PHPRC:&quot;[INSTALLDIR]&quot;" />
     <CustomAction Id="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTS" 
       BinaryKey="WixCA" 
       DllEntry="CAQuietExec" 
@@ -503,7 +503,7 @@
       Impersonate="no" />
     <CustomAction Id="fcgiconfigJSFastCGIremoveCmd"
       Property="fcgiconfigJSFastCGIremove"
-      Value="cscript &quot;[WindowsFolder]system32\inetsrv\fcgiconfig.js&quot; 
-remove -section:&quot;PHP&quot;" />
+      Value="&quot;cscript&quot; 
&quot;[WindowsFolder]system32\inetsrv\fcgiconfig.js&quot; -remove 
-section:&quot;PHP&quot;" />
     <CustomAction Id="fcgiconfigJSFastCGIremove" 
       BinaryKey="WixCA" 
       DllEntry="CAQuietExec" 
http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerScripts52.vbs?r1=1.9&r2=1.10&diff_format=u
Index: win-installer/PHPInstallerScripts52.vbs
diff -u win-installer/PHPInstallerScripts52.vbs:1.9 
win-installer/PHPInstallerScripts52.vbs:1.10
--- win-installer/PHPInstallerScripts52.vbs:1.9 Mon Dec 22 18:08:51 2008
+++ win-installer/PHPInstallerScripts52.vbs     Thu Jan 29 18:30:33 2009
@@ -172,14 +172,14 @@
     End If
     If ( Session.FeatureRequestState("iis4FastCGI") = 3 ) Then
         Set objShell = CreateObject("WScript.Shell")
-        Set colSystemEnvVars = objShell.Environment("System")
-        PHPExecutable = colSystemEnvVars("WINDIR") & 
"\system32\inetsrv\fcgiext.dll"
+        PHPExecutable = objShell.ExpandEnvironmentStrings("%WINDIR%") & 
"\system32\inetsrv\fcgiext.dll"
     End If
     
     If ( GetWindowsVersion < 5.2 ) Then
         'use short path syntax here
         Set objFSO = CreateObject("Scripting.FileSystemObject")
-        PHPExecutable = objFSO.GetFile(PHPExecutable).ShortPath
+        Set objFile = objFSO.GetFile(PHPExecutable)
+        PHPExecutable = objFile.ShortPath
     Else
         'use quotes and long name syntax
         PHPExecutable = """" & PHPExecutable & """"
http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerScripts60.vbs?r1=1.9&r2=1.10&diff_format=u
Index: win-installer/PHPInstallerScripts60.vbs
diff -u win-installer/PHPInstallerScripts60.vbs:1.9 
win-installer/PHPInstallerScripts60.vbs:1.10
--- win-installer/PHPInstallerScripts60.vbs:1.9 Mon Dec 22 18:08:52 2008
+++ win-installer/PHPInstallerScripts60.vbs     Thu Jan 29 18:30:33 2009
@@ -109,7 +109,7 @@
     If ( right(strApacheDir,1) <> "\" ) then 
         strApacheDir = strApacheDir & "\"
     End If
-    
+
     Set objFSO = CreateObject("Scripting.FileSystemObject")
     strFileName = strApacheDir & "httpd.conf"
     If objFSO.FileExists(strFileName) Then
@@ -172,14 +172,14 @@
     End If
     If ( Session.FeatureRequestState("iis4FastCGI") = 3 ) Then
         Set objShell = CreateObject("WScript.Shell")
-        Set colSystemEnvVars = objShell.Environment("System")
-        PHPExecutable = colSystemEnvVars("WINDIR") & 
"\system32\inetsrv\fcgiext.dll"
+        PHPExecutable = objShell.ExpandEnvironmentStrings("%WINDIR%") & 
"\system32\inetsrv\fcgiext.dll"
     End If
     
     If ( GetWindowsVersion < 5.2 ) Then
         'use short path syntax here
         Set objFSO = CreateObject("Scripting.FileSystemObject")
-        PHPExecutable = objFSO.GetFile(PHPExecutable).ShortPath
+        Set objFile = objFSO.GetFile(PHPExecutable)
+        PHPExecutable = objFile.ShortPath
     Else
         'use quotes and long name syntax
         PHPExecutable = """" & PHPExecutable & """"

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

Reply via email to