subject:"\[PHP\-CVS\] cvs\: win\-installer \/ PHPInstallerBase52.wxs PHPInstallerBase52NTS.wxs PHPInstallerBase53.wxs PHPInstallerBase53NTS.wxs PHPInstallerBase60.wxs PHPInstallerBase60NTS.wxs"

[PHP-CVS] cvs: win-installer / PHPInstallerBase52.wxs PHPInstallerBase52NTS.wxs PHPInstallerBase53.wxs PHPInstallerBase53NTS.wxs PHPInstallerBase60.wxs PHPInstallerBase60NTS.wxs

2009-05-27 Thread John Mertic

jmertic Wed May 27 13:12:02 2009 UTC

  Modified files:  
/win-installer  PHPInstallerBase52.wxs PHPInstallerBase52NTS.wxs 
PHPInstallerBase53.wxs PHPInstallerBase53NTS.wxs 
PHPInstallerBase60.wxs PHPInstallerBase60NTS.wxs 
  Log:
  Install the PHP CLI exe always, removing the ability for a user to not select 
it.
  http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase52.wxs?r1=1.41r2=1.42diff_format=u
Index: win-installer/PHPInstallerBase52.wxs
diff -u win-installer/PHPInstallerBase52.wxs:1.41 
win-installer/PHPInstallerBase52.wxs:1.42
--- win-installer/PHPInstallerBase52.wxs:1.41   Fri Feb 20 15:48:15 2009
+++ win-installer/PHPInstallerBase52.wxsWed May 27 13:12:01 2009
@@ -358,23 +358,10 @@
   ComponentRef Id=phprecommendedINI/
   ComponentRef Id=win2003eventlog/
   ComponentRef Id=PHPRegistry/
-
-  Feature AllowAdvertise=no 
-Id=MainProgram 
-Title=$(loc.FeatureMainProgramTitle) 
-Description=$(loc.FeatureMainProgramDescription) 
-TypicalDefault=install 
-Level=1
-ComponentRef Id=php5tsDLL/
-ComponentRef Id=php5tsLIB/
-ComponentRef Id=php5embedLIB/
-Feature AllowAdvertise=no 
-  Id=MainExecutable 
-  Title=$(loc.FeatureMainExecutableTitle) 
-  Description=$(loc.FeatureMainExecutableDescription) 
-  Level=1
-  ComponentRef Id=phpEXE/
-/Feature
+  ComponentRef Id=php5tsDLL/
+  ComponentRef Id=php5tsLIB/
+  ComponentRef Id=php5embedLIB/
+  ComponentRef Id=phpEXE/
 Feature AllowAdvertise=no 
   Id=ScriptExecutable 
   Title=$(loc.FeatureScriptExecutableTitle) 
http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase52NTS.wxs?r1=1.17r2=1.18diff_format=u
Index: win-installer/PHPInstallerBase52NTS.wxs
diff -u win-installer/PHPInstallerBase52NTS.wxs:1.17 
win-installer/PHPInstallerBase52NTS.wxs:1.18
--- win-installer/PHPInstallerBase52NTS.wxs:1.17Fri Feb 20 15:48:15 2009
+++ win-installer/PHPInstallerBase52NTS.wxs Wed May 27 13:12:01 2009
@@ -336,23 +336,10 @@
   ComponentRef Id=phprecommendedINI/
   ComponentRef Id=win2003eventlog/
   ComponentRef Id=PHPRegistry/
-
-  Feature AllowAdvertise=no 
-Id=MainProgram 
-Title=$(loc.FeatureMainProgramTitle) 
-Description=$(loc.FeatureMainProgramDescription) 
-TypicalDefault=install 
-Level=1
-ComponentRef Id=php5DLL/
-ComponentRef Id=php5LIB/
-ComponentRef Id=php5embedLIB/
-Feature AllowAdvertise=no 
-  Id=MainExecutable 
-  Title=$(loc.FeatureMainExecutableTitle) 
-  Description=$(loc.FeatureMainExecutableDescription) 
-  Level=1
-  ComponentRef Id=phpEXE/
-/Feature
+  ComponentRef Id=php5DLL/
+  ComponentRef Id=php5LIB/
+  ComponentRef Id=php5embedLIB/
+  ComponentRef Id=phpEXE/
 Feature AllowAdvertise=no 
   Id=ScriptExecutable 
   Title=$(loc.FeatureScriptExecutableTitle) 
http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase53.wxs?r1=1.20r2=1.21diff_format=u
Index: win-installer/PHPInstallerBase53.wxs
diff -u win-installer/PHPInstallerBase53.wxs:1.20 
win-installer/PHPInstallerBase53.wxs:1.21
--- win-installer/PHPInstallerBase53.wxs:1.20   Thu May 21 02:41:06 2009
+++ win-installer/PHPInstallerBase53.wxsWed May 27 13:12:01 2009
@@ -337,23 +337,10 @@
   ComponentRef Id=phprecommendedINI/
   ComponentRef Id=win2003eventlog/
   ComponentRef Id=PHPRegistry/
-
-  Feature AllowAdvertise=no 
-Id=MainProgram 
-Title=$(loc.FeatureMainProgramTitle) 
-Description=$(loc.FeatureMainProgramDescription) 
-TypicalDefault=install 
-Level=1
-ComponentRef Id=php5tsDLL/
-ComponentRef Id=php5tsLIB/
-ComponentRef Id=php5embedLIB/
-Feature AllowAdvertise=no 
-  Id=MainExecutable 
-  Title=$(loc.FeatureMainExecutableTitle) 
-  Description=$(loc.FeatureMainExecutableDescription) 
-  Level=1
-  ComponentRef Id=phpEXE/
-/Feature
+  ComponentRef Id=php5tsDLL/
+  ComponentRef Id=php5tsLIB/
+  ComponentRef Id=php5embedLIB/
+  ComponentRef Id=phpEXE/
 Feature AllowAdvertise=no 
   Id=ScriptExecutable 
   Title=$(loc.FeatureScriptExecutableTitle) 
http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase53NTS.wxs?r1=1.17r2=1.18diff_format=u
Index: win-installer/PHPInstallerBase53NTS.wxs
diff -u win-installer/PHPInstallerBase53NTS.wxs:1.17 
win-installer/PHPInstallerBase53NTS.wxs:1.18
--- win-installer/PHPInstallerBase53NTS.wxs:1.17Thu May 21 02:41:06 2009
+++ win-installer/PHPInstallerBase53NTS.wxs Wed May 27 13:12:01 2009
@@ -315,23 +315,10 @@
   ComponentRef Id=phprecommendedINI/
   ComponentRef Id=win2003eventlog/

[PHP-CVS] cvs: win-installer / PHPInstallerBase52.wxs PHPInstallerBase52NTS.wxs PHPInstallerBase53.wxs PHPInstallerBase53NTS.wxs PHPInstallerBase60.wxs PHPInstallerBase60NTS.wxs

2009-05-27 Thread John Mertic

jmertic Wed May 27 19:40:57 2009 UTC

  Modified files:  
/win-installer  PHPInstallerBase52.wxs PHPInstallerBase52NTS.wxs 
PHPInstallerBase53.wxs PHPInstallerBase53NTS.wxs 
PHPInstallerBase60.wxs PHPInstallerBase60NTS.wxs 
  Log:
  Fixed removing an end tag from earlier checkin.
  
http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase52.wxs?r1=1.42r2=1.43diff_format=u
Index: win-installer/PHPInstallerBase52.wxs
diff -u win-installer/PHPInstallerBase52.wxs:1.42 
win-installer/PHPInstallerBase52.wxs:1.43
--- win-installer/PHPInstallerBase52.wxs:1.42   Wed May 27 13:12:01 2009
+++ win-installer/PHPInstallerBase52.wxsWed May 27 19:40:57 2009
@@ -376,7 +376,6 @@
 ComponentRef Id=RegisterPHPFilesREG/
   /Feature
 /Feature
-  /Feature
 
   FeatureRef Id=Extensions/
   
http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase52NTS.wxs?r1=1.18r2=1.19diff_format=u
Index: win-installer/PHPInstallerBase52NTS.wxs
diff -u win-installer/PHPInstallerBase52NTS.wxs:1.18 
win-installer/PHPInstallerBase52NTS.wxs:1.19
--- win-installer/PHPInstallerBase52NTS.wxs:1.18Wed May 27 13:12:01 2009
+++ win-installer/PHPInstallerBase52NTS.wxs Wed May 27 19:40:57 2009
@@ -354,7 +354,6 @@
 ComponentRef Id=RegisterPHPFilesREG/
   /Feature
 /Feature
-  /Feature
 
   FeatureRef Id=Extensions/
   
http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase53.wxs?r1=1.21r2=1.22diff_format=u
Index: win-installer/PHPInstallerBase53.wxs
diff -u win-installer/PHPInstallerBase53.wxs:1.21 
win-installer/PHPInstallerBase53.wxs:1.22
--- win-installer/PHPInstallerBase53.wxs:1.21   Wed May 27 13:12:01 2009
+++ win-installer/PHPInstallerBase53.wxsWed May 27 19:40:57 2009
@@ -355,7 +355,6 @@
 ComponentRef Id=RegisterPHPFilesREG/
   /Feature
 /Feature
-  /Feature
 
   FeatureRef Id=Extensions/
   
http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase53NTS.wxs?r1=1.18r2=1.19diff_format=u
Index: win-installer/PHPInstallerBase53NTS.wxs
diff -u win-installer/PHPInstallerBase53NTS.wxs:1.18 
win-installer/PHPInstallerBase53NTS.wxs:1.19
--- win-installer/PHPInstallerBase53NTS.wxs:1.18Wed May 27 13:12:01 2009
+++ win-installer/PHPInstallerBase53NTS.wxs Wed May 27 19:40:57 2009
@@ -333,7 +333,6 @@
 ComponentRef Id=RegisterPHPFilesREG/
   /Feature
 /Feature
-  /Feature
 
   FeatureRef Id=Extensions/
   
http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase60.wxs?r1=1.34r2=1.35diff_format=u
Index: win-installer/PHPInstallerBase60.wxs
diff -u win-installer/PHPInstallerBase60.wxs:1.34 
win-installer/PHPInstallerBase60.wxs:1.35
--- win-installer/PHPInstallerBase60.wxs:1.34   Wed May 27 13:12:01 2009
+++ win-installer/PHPInstallerBase60.wxsWed May 27 19:40:57 2009
@@ -355,7 +355,6 @@
 ComponentRef Id=RegisterPHPFilesREG/
   /Feature
 /Feature
-  /Feature
 
   FeatureRef Id=Extensions/
   
http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase60NTS.wxs?r1=1.18r2=1.19diff_format=u
Index: win-installer/PHPInstallerBase60NTS.wxs
diff -u win-installer/PHPInstallerBase60NTS.wxs:1.18 
win-installer/PHPInstallerBase60NTS.wxs:1.19
--- win-installer/PHPInstallerBase60NTS.wxs:1.18Wed May 27 13:12:02 2009
+++ win-installer/PHPInstallerBase60NTS.wxs Wed May 27 19:40:57 2009
@@ -333,7 +333,6 @@
 ComponentRef Id=RegisterPHPFilesREG/
   /Feature
 /Feature
-  /Feature
 
   FeatureRef Id=Extensions/
   



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

[PHP-CVS] cvs: win-installer / PHPInstallerBase52.wxs PHPInstallerBase52NTS.wxs PHPInstallerBase53.wxs PHPInstallerBase53NTS.wxs PHPInstallerBase60.wxs PHPInstallerBase60NTS.wxs WebServerConfig52.wxs

2009-02-17 Thread John Mertic

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 rusl...@microsoft.com:
  
  - 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.39r2=1.40diff_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.wxsTue 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.15r2=1.16diff_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.15Wed 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.15r2=1.16diff_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.wxsTue 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.14r2=1.15diff_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.14Wed 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.29r2=1.30diff_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.wxsTue 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.15r2=1.16diff_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.15Wed 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.4r2=1.5diff_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

[PHP-CVS] cvs: win-installer / PHPInstallerBase52.wxs PHPInstallerBase52NTS.wxs PHPInstallerBase53.wxs PHPInstallerBase53NTS.wxs PHPInstallerBase60.wxs PHPInstallerBase60NTS.wxs PHPInstallerScripts52.

2009-01-29 Thread John Mertic

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.36r2=1.37diff_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.wxsThu Jan 29 18:30:32 2009
@@ -638,7 +638,7 @@
   Impersonate=no /
 CustomAction Id=fcgiconfigJSFastCGICmd
   Property=fcgiconfigJSFastCGI
-  Value=cscript quot;[WindowsFolder]system32\inetsrv\fcgiconfig.jsquot; 
-add -section:quot;PHPquot; -extension:php 
-path:quot;[INSTALLDIR]php-cgi.exequot; /
+  Value=quot;cscriptquot; 
quot;[WindowsFolder]system32\inetsrv\fcgiconfig.jsquot; -add 
-section:quot;PHPquot; -extension:php 
-path:quot;[INSTALLDIR]php-cgi.exequot; /
 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.jsquot; 
-set -section:quot;PHPquot; -InstanceMaxRequests:1 /
+  Value=quot;cscriptquot; 
quot;[WindowsFolder]system32\inetsrv\fcgiconfig.jsquot; -set 
-section:quot;PHPquot; -InstanceMaxRequests:1 /
 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.jsquot; 
-set -section:quot;PHPquot; 
-EnvironmentVars:PHP_FCGI_MAX_REQUESTS:1,PHPRC:quot;[INSTALLDIR]quot; /
+  Value=quot;cscriptquot; 
quot;[WindowsFolder]system32\inetsrv\fcgiconfig.jsquot; -set 
-section:quot;PHPquot; 
-EnvironmentVars:PHP_FCGI_MAX_REQUESTS:1,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.jsquot; 
-remove -section:quot;PHPquot; /
+  Value=quot;cscriptquot; 
quot;[WindowsFolder]system32\inetsrv\fcgiconfig.jsquot; -remove 
-section:quot;PHPquot; /
 CustomAction Id=fcgiconfigJSFastCGIremove 
   BinaryKey=WixCA 
   DllEntry=CAQuietExec 
http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase52NTS.wxs?r1=1.12r2=1.13diff_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.12Tue 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.jsquot; 
-add -section:quot;PHPquot; -extension:php 
-path:quot;[INSTALLDIR]php-cgi.exequot; /
+  Value=quot;cscriptquot; 
quot;[WindowsFolder]system32\inetsrv\fcgiconfig.jsquot; -add 
-section:quot;PHPquot; -extension:php 
-path:quot;[INSTALLDIR]php-cgi.exequot; /
 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.jsquot; 
-set -section:quot;PHPquot; -InstanceMaxRequests:1 /
+  Value=quot;cscriptquot; 
quot;[WindowsFolder]system32\inetsrv\fcgiconfig.jsquot; -set 
-section:quot;PHPquot; -InstanceMaxRequests:1 /
 CustomAction Id=fcgiconfigJSFastCGISetInstanceMaxRequests 
   BinaryKey=WixCA 
   DllEntry=CAQuietExec 
@@ -525,7 +525,7 @@
   Impersonate=no /
 CustomAction Id=fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSCmd

[PHP-CVS] cvs: win-installer / PHPInstallerBase52.wxs PHPInstallerBase52NTS.wxs PHPInstallerBase53.wxs PHPInstallerBase53NTS.wxs PHPInstallerBase60.wxs PHPInstallerBase60NTS.wxs

2009-01-29 Thread John Mertic

jmertic Thu Jan 29 19:03:30 2009 UTC

  Modified files:  
/win-installer  PHPInstallerBase52.wxs PHPInstallerBase52NTS.wxs 
PHPInstallerBase53.wxs PHPInstallerBase53NTS.wxs 
PHPInstallerBase60.wxs PHPInstallerBase60NTS.wxs 
  Log:
  Add Binary tag for the wixca.dll file.
  
http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase52.wxs?r1=1.37r2=1.38diff_format=u
Index: win-installer/PHPInstallerBase52.wxs
diff -u win-installer/PHPInstallerBase52.wxs:1.37 
win-installer/PHPInstallerBase52.wxs:1.38
--- win-installer/PHPInstallerBase52.wxs:1.37   Thu Jan 29 18:30:32 2009
+++ win-installer/PHPInstallerBase52.wxsThu Jan 29 19:03:27 2009
@@ -547,7 +547,8 @@
 /Feature
 
 Binary Id=PHPInstallerScripts SourceFile=PHPInstallerScripts52.vbs / 
-
+Binary Id=WixCA src=Wix\wixca.dll/
+
 CustomAction Id=netserveCGIInterpretersaddCmd
   Property=netserveCGIInterpretersadd
   Value=quot;[%ProgramFiles]NetServe Web Server\config.exe /add 
CGIInterpreters php^|[INSTALLDIR]php-cgi.exe'] /
http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase52NTS.wxs?r1=1.13r2=1.14diff_format=u
Index: win-installer/PHPInstallerBase52NTS.wxs
diff -u win-installer/PHPInstallerBase52NTS.wxs:1.13 
win-installer/PHPInstallerBase52NTS.wxs:1.14
--- win-installer/PHPInstallerBase52NTS.wxs:1.13Thu Jan 29 18:30:33 2009
+++ win-installer/PHPInstallerBase52NTS.wxs Thu Jan 29 19:03:28 2009
@@ -443,7 +443,8 @@
 /Feature
 
 Binary Id=PHPInstallerScripts SourceFile=PHPInstallerScripts52.vbs / 
-
+Binary Id=WixCA src=Wix\wixca.dll/
+
 CustomAction Id=iis700FastCGIaddCmd
   Property=iis700FastCGIadd
   Value=quot;[WindowsFolder]system32\inetsrv\APPCMD.EXEquot; SET CONFIG 
-section:system.webServer/fastCGI 
/+quot;[\[]fullPath='[INSTALLDIR]php-cgi.exe'[\]]quot; /
http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase53.wxs?r1=1.13r2=1.14diff_format=u
Index: win-installer/PHPInstallerBase53.wxs
diff -u win-installer/PHPInstallerBase53.wxs:1.13 
win-installer/PHPInstallerBase53.wxs:1.14
--- win-installer/PHPInstallerBase53.wxs:1.13   Thu Jan 29 18:30:33 2009
+++ win-installer/PHPInstallerBase53.wxsThu Jan 29 19:03:29 2009
@@ -518,7 +518,8 @@
 /Feature
 
 Binary Id=PHPInstallerScripts SourceFile=PHPInstallerScripts52.vbs / 
-
+Binary Id=WixCA src=Wix\wixca.dll/
+
 CustomAction Id=netserveCGIInterpretersaddCmd
   Property=netserveCGIInterpretersadd
   Value=quot;[%ProgramFiles]NetServe Web Server\config.exe /add 
CGIInterpreters php^|[INSTALLDIR]php-cgi.exe'] /
http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase53NTS.wxs?r1=1.12r2=1.13diff_format=u
Index: win-installer/PHPInstallerBase53NTS.wxs
diff -u win-installer/PHPInstallerBase53NTS.wxs:1.12 
win-installer/PHPInstallerBase53NTS.wxs:1.13
--- win-installer/PHPInstallerBase53NTS.wxs:1.12Thu Jan 29 18:30:33 2009
+++ win-installer/PHPInstallerBase53NTS.wxs Thu Jan 29 19:03:29 2009
@@ -412,7 +412,8 @@
 /Feature
 
 Binary Id=PHPInstallerScripts SourceFile=PHPInstallerScripts52.vbs / 
-
+Binary Id=WixCA src=Wix\wixca.dll/
+
 CustomAction Id=iis700FastCGIaddCmd
   Property=iis700FastCGIadd
   Value=quot;[WindowsFolder]system32\inetsrv\APPCMD.EXEquot; SET CONFIG 
-section:system.webServer/fastCGI 
/+quot;[\[]fullPath='[INSTALLDIR]php-cgi.exe'[\]]quot; /
http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase60.wxs?r1=1.27r2=1.28diff_format=u
Index: win-installer/PHPInstallerBase60.wxs
diff -u win-installer/PHPInstallerBase60.wxs:1.27 
win-installer/PHPInstallerBase60.wxs:1.28
--- win-installer/PHPInstallerBase60.wxs:1.27   Thu Jan 29 18:30:33 2009
+++ win-installer/PHPInstallerBase60.wxsThu Jan 29 19:03:29 2009
@@ -518,7 +518,8 @@
 /Feature
 
 Binary Id=PHPInstallerScripts SourceFile=PHPInstallerScripts60.vbs / 
-
+Binary Id=WixCA src=Wix\wixca.dll/
+
 CustomAction Id=netserveCGIInterpretersaddCmd
   Property=netserveCGIInterpretersadd
   Value=quot;[%ProgramFiles]NetServe Web Server\config.exe /add 
CGIInterpreters php^|[INSTALLDIR]php-cgi.exe'] /
http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase60NTS.wxs?r1=1.13r2=1.14diff_format=u
Index: win-installer/PHPInstallerBase60NTS.wxs
diff -u win-installer/PHPInstallerBase60NTS.wxs:1.13 
win-installer/PHPInstallerBase60NTS.wxs:1.14
--- win-installer/PHPInstallerBase60NTS.wxs:1.13Thu Jan 29 18:30:33 2009
+++ win-installer/PHPInstallerBase60NTS.wxs Thu Jan 29 19:03:29 2009
@@ -412,7 +412,8 @@
 /Feature
 
 Binary Id=PHPInstallerScripts SourceFile=PHPInstallerScripts52.vbs / 
-
+Binary Id=WixCA src=Wix\wixca.dll/
+
 CustomAction Id=iis700FastCGIaddCmd
   Property=iis700FastCGIadd
   Value=quot;[WindowsFolder]system32\inetsrv\APPCMD.EXEquot; SET CONFIG 
-section:system.webServer/fastCGI

[PHP-CVS] cvs: win-installer / PHPInstallerBase52.wxs PHPInstallerBase52NTS.wxs PHPInstallerBase53.wxs PHPInstallerBase53NTS.wxs PHPInstallerBase60.wxs PHPInstallerBase60NTS.wxs WebServerConfig53.wxs

2008-12-20 Thread John Mertic

jmertic Sun Dec 21 04:11:21 2008 UTC

  Modified files:  
/win-installer  PHPInstallerBase52.wxs PHPInstallerBase52NTS.wxs 
PHPInstallerBase53.wxs PHPInstallerBase53NTS.wxs 
PHPInstallerBase60.wxs PHPInstallerBase60NTS.wxs 
WebServerConfig53.wxs 
  Log:
  Add automatic setting of PHPRC, instanceMaxRequests, and 
PHP_FCGI_MAX_REQUESTS variables for IIS FastCGI.
  
  Don't disable the apache13 components; only the VC9 builds are currently 
broken.
  http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase52.wxs?r1=1.32r2=1.33diff_format=u
Index: win-installer/PHPInstallerBase52.wxs
diff -u win-installer/PHPInstallerBase52.wxs:1.32 
win-installer/PHPInstallerBase52.wxs:1.33
--- win-installer/PHPInstallerBase52.wxs:1.32   Tue Dec 16 21:12:25 2008
+++ win-installer/PHPInstallerBase52.wxsSun Dec 21 04:11:21 2008
@@ -584,6 +584,24 @@
  Execute=deferred
  Impersonate=no
   Directory=INSTALLDIR/
+CustomAction Id=iis700FastCGISetPHPRC 
+  ExeCommand=quot;[WindowsFolder]system32\inetsrv\APPCMD.EXEquot; SET 
CONFIG /section:system.webServer/fastCGI 
/+quot;[fullPath='[INSTALLDIR]php-cgi.exe'].environmentVariables.[name='PHPRC',value='[INSTALLDIR]']quot;
 /commit:apphost 
+  Return=ignore 
+ Execute=deferred
+ Impersonate=no
+  Directory=INSTALLDIR/
+CustomAction Id=iis700FastCGISetInstanceMaxRequests 
+  ExeCommand=quot;[WindowsFolder]system32\inetsrv\APPCMD.EXEquot; SET 
CONFIG /section:system.webServer/fastCGI 
/+quot;[fullPath='[INSTALLDIR]php-cgi.exe'].instanceMaxRequests:1 
/commit:apphost 
+  Return=ignore 
+ Execute=deferred
+ Impersonate=no
+  Directory=INSTALLDIR/
+CustomAction Id=iis700FastCGISetPHP_FCGI_MAX_REQUESTS 
+  ExeCommand=quot;[WindowsFolder]system32\inetsrv\APPCMD.EXEquot; SET 
CONFIG /section:system.webServer/fastCGI 
/+quot;[fullPath='[INSTALLDIR]php-cgi.exe'].environmentVariables.[name='PHP_FCGI_MAX_REQUESTS',value='1']
 /commit:apphost 
+  Return=ignore 
+ Execute=deferred
+ Impersonate=no
+  Directory=INSTALLDIR/
 CustomAction Id=iis700ISAPI 
   ExeCommand=quot;[WindowsFolder]System32\inetsrv\APPCMD.EXEquot; SET 
CONFIG -section:handlers 
quot;-+[name='PHP-ISAPI',path='*.php',verb='GET,HEAD,POST',modules='IsapiModule',scriptProcessor='[INSTALLDIR]php5isapi.dll'quot;
 
   Return=ignore 
@@ -656,8 +674,26 @@
   Execute=deferred
  Impersonate=no
   Directory=INSTALLDIR/
+CustomAction Id=fcgiconfigJSFastCGISetPHPRC 
+  ExeCommand=cscript 
quot;[WindowsFolder]system32\inetsrv\fcgiconfig.jsquot; -set 
-section:quot;PHPquot; -EnvironmentVars:PHPRC:quot;[INSTALLDIR]quot;
+  Return=ignore 
+  Execute=deferred
+ Impersonate=no
+  Directory=INSTALLDIR/
+CustomAction Id=fcgiconfigJSFastCGISetInstanceMaxRequests 
+  ExeCommand=cscript 
quot;[WindowsFolder]system32\inetsrv\fcgiconfig.jsquot; -set 
-section:quot;PHPquot; -InstanceMaxRequests:1
+  Return=ignore 
+  Execute=deferred
+ Impersonate=no
+  Directory=INSTALLDIR/
+CustomAction Id=fcgiconfigJSFastCGISetPHP_FCGI_MAX_REQUESTS 
+  ExeCommand=cscript 
quot;[WindowsFolder]system32\inetsrv\fcgiconfig.jsquot; -set 
-section:quot;PHPquot; -EnvironmentVars:PHP_FCGI_MAX_REQUESTS:1
+  Return=ignore 
+  Execute=deferred
+ Impersonate=no
+  Directory=INSTALLDIR/
 CustomAction Id=fcgiconfigJSFastCGIremove 
-  ExeCommand=cscript 
quot;[WindowsFolder]system32\inetsrv\fcgiconfig.jsquot; -remove 
-section:quot;PHPquot;Ã
+  ExeCommand=cscript 
quot;[WindowsFolder]system32\inetsrv\fcgiconfig.jsquot; -remove 
-section:quot;PHPquot;
   Return=ignore 
   Execute=deferred
  Impersonate=no
@@ -695,6 +731,15 @@
   Custom Action=iis700FastCGI After=InstallInitialize
 ![CDATA[VersionNT = 600 AND iis4FastCGI = 3]]
   /Custom
+  Custom Action=iis700FastCGISetPHPRC After=InstallInitialize
+![CDATA[VersionNT = 600 AND iis4FastCGI = 3]]
+  /Custom
+  Custom Action=iis700FastCGISetInstanceMaxRequests 
After=InstallInitialize
+![CDATA[VersionNT = 600 AND iis4FastCGI = 3]]
+  /Custom
+  Custom Action=iis700FastCGISetPHPRC After=InstallInitialize
+![CDATA[VersionNT = 600 AND iis4FastCGI = 3]]
+  /Custom
   Custom Action=iis700CGI After=InstallInitialize
 ![CDATA[VersionNT = 600 AND iis4CGI = 3]]
   /Custom
@@ -734,6 +779,15 @@
   Custom Action=fcgiconfigJSFastCGI After=InstallInitialize
 ![CDATA[((VersionNT = 501 AND ServicePackLevel = 2) OR (VersionNT = 
502 AND ServicePackLevel = 2)) AND iis4FastCGI = 3]]
   /Custom
+  Custom Action=fcgiconfigJSFastCGISetPHPRC After=InstallInitialize
+![CDATA[((VersionNT = 501 AND ServicePackLevel = 2) OR (VersionNT = 
502 AND ServicePackLevel = 2)) AND iis4FastCGI

[PHP-CVS] cvs: win-installer / PHPInstallerBase52.wxs PHPInstallerBase52NTS.wxs PHPInstallerBase53.wxs PHPInstallerBase53NTS.wxs PHPInstallerBase60.wxs PHPInstallerBase60NTS.wxs

2008-12-20 Thread John Mertic

jmertic Sun Dec 21 04:21:13 2008 UTC

  Modified files:  
/win-installer  PHPInstallerBase52.wxs PHPInstallerBase52NTS.wxs 
PHPInstallerBase53.wxs PHPInstallerBase53NTS.wxs 
PHPInstallerBase60.wxs PHPInstallerBase60NTS.wxs 
  Log:
  Fix typo in earlier commit.
  
http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase52.wxs?r1=1.33r2=1.34diff_format=u
Index: win-installer/PHPInstallerBase52.wxs
diff -u win-installer/PHPInstallerBase52.wxs:1.33 
win-installer/PHPInstallerBase52.wxs:1.34
--- win-installer/PHPInstallerBase52.wxs:1.33   Sun Dec 21 04:11:21 2008
+++ win-installer/PHPInstallerBase52.wxsSun Dec 21 04:21:13 2008
@@ -737,7 +737,7 @@
   Custom Action=iis700FastCGISetInstanceMaxRequests 
After=InstallInitialize
 ![CDATA[VersionNT = 600 AND iis4FastCGI = 3]]
   /Custom
-  Custom Action=iis700FastCGISetPHPRC After=InstallInitialize
+  Custom Action=iis700FastCGISetPHP_FCGI_MAX_REQUESTS 
After=InstallInitialize
 ![CDATA[VersionNT = 600 AND iis4FastCGI = 3]]
   /Custom
   Custom Action=iis700CGI After=InstallInitialize
http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase52NTS.wxs?r1=1.9r2=1.10diff_format=u
Index: win-installer/PHPInstallerBase52NTS.wxs
diff -u win-installer/PHPInstallerBase52NTS.wxs:1.9 
win-installer/PHPInstallerBase52NTS.wxs:1.10
--- win-installer/PHPInstallerBase52NTS.wxs:1.9 Sun Dec 21 04:11:21 2008
+++ win-installer/PHPInstallerBase52NTS.wxs Sun Dec 21 04:21:13 2008
@@ -539,7 +539,7 @@
   Custom Action=iis700FastCGISetInstanceMaxRequests 
After=InstallInitialize
 ![CDATA[VersionNT = 600 AND iis4FastCGI = 3]]
   /Custom
-  Custom Action=iis700FastCGISetPHPRC After=InstallInitialize
+  Custom Action=iis700FastCGISetPHP_FCGI_MAX_REQUESTS 
After=InstallInitialize
 ![CDATA[VersionNT = 600 AND iis4FastCGI = 3]]
   /Custom
   Custom Action=iis700FastCGIremove After=InstallInitialize
http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase53.wxs?r1=1.9r2=1.10diff_format=u
Index: win-installer/PHPInstallerBase53.wxs
diff -u win-installer/PHPInstallerBase53.wxs:1.9 
win-installer/PHPInstallerBase53.wxs:1.10
--- win-installer/PHPInstallerBase53.wxs:1.9Sun Dec 21 04:11:21 2008
+++ win-installer/PHPInstallerBase53.wxsSun Dec 21 04:21:13 2008
@@ -708,7 +708,7 @@
   Custom Action=iis700FastCGISetInstanceMaxRequests 
After=InstallInitialize
 ![CDATA[VersionNT = 600 AND iis4FastCGI = 3]]
   /Custom
-  Custom Action=iis700FastCGISetPHPRC After=InstallInitialize
+  Custom Action=iis700FastCGISetPHP_FCGI_MAX_REQUESTS 
After=InstallInitialize
 ![CDATA[VersionNT = 600 AND iis4FastCGI = 3]]
   /Custom
   Custom Action=iis700CGI After=InstallInitialize
http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase53NTS.wxs?r1=1.8r2=1.9diff_format=u
Index: win-installer/PHPInstallerBase53NTS.wxs
diff -u win-installer/PHPInstallerBase53NTS.wxs:1.8 
win-installer/PHPInstallerBase53NTS.wxs:1.9
--- win-installer/PHPInstallerBase53NTS.wxs:1.8 Sun Dec 21 04:11:21 2008
+++ win-installer/PHPInstallerBase53NTS.wxs Sun Dec 21 04:21:13 2008
@@ -510,7 +510,7 @@
   Custom Action=iis700FastCGISetInstanceMaxRequests 
After=InstallInitialize
 ![CDATA[VersionNT = 600 AND iis4FastCGI = 3]]
   /Custom
-  Custom Action=iis700FastCGISetPHPRC After=InstallInitialize
+  Custom Action=iis700FastCGISetPHP_FCGI_MAX_REQUESTS 
After=InstallInitialize
 ![CDATA[VersionNT = 600 AND iis4FastCGI = 3]]
   /Custom
   Custom Action=iis700FastCGIremove After=InstallInitialize
http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase60.wxs?r1=1.23r2=1.24diff_format=u
Index: win-installer/PHPInstallerBase60.wxs
diff -u win-installer/PHPInstallerBase60.wxs:1.23 
win-installer/PHPInstallerBase60.wxs:1.24
--- win-installer/PHPInstallerBase60.wxs:1.23   Sun Dec 21 04:11:21 2008
+++ win-installer/PHPInstallerBase60.wxsSun Dec 21 04:21:13 2008
@@ -708,7 +708,7 @@
   Custom Action=iis700FastCGISetInstanceMaxRequests 
After=InstallInitialize
 ![CDATA[VersionNT = 600 AND iis4FastCGI = 3]]
   /Custom
-  Custom Action=iis700FastCGISetPHPRC After=InstallInitialize
+  Custom Action=iis700FastCGISetPHP_FCGI_MAX_REQUESTS 
After=InstallInitialize
 ![CDATA[VersionNT = 600 AND iis4FastCGI = 3]]
   /Custom
   Custom Action=iis700CGI After=InstallInitialize
http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase60NTS.wxs?r1=1.9r2=1.10diff_format=u
Index: win-installer/PHPInstallerBase60NTS.wxs
diff -u win-installer/PHPInstallerBase60NTS.wxs:1.9 
win-installer/PHPInstallerBase60NTS.wxs:1.10
--- win-installer/PHPInstallerBase60NTS.wxs:1.9 Sun Dec 21 04:11:21 2008
+++ win-installer/PHPInstallerBase60NTS.wxs Sun Dec 21 04:21:13 2008
@@ -510,7 +510,7 @@
   Custom Action=iis700FastCGISetInstanceMaxRequests 
After=InstallInitialize

[PHP-CVS] cvs: win-installer / PHPInstallerBase52.wxs PHPInstallerBase52NTS.wxs PHPInstallerBase53.wxs PHPInstallerBase53NTS.wxs PHPInstallerBase60.wxs PHPInstallerBase60NTS.wxs

2008-12-16 Thread John Mertic

jmertic Tue Dec 16 21:12:25 2008 UTC

  Modified files:  
/win-installer  PHPInstallerBase52.wxs PHPInstallerBase52NTS.wxs 
PHPInstallerBase53.wxs PHPInstallerBase53NTS.wxs 
PHPInstallerBase60.wxs PHPInstallerBase60NTS.wxs 
  Log:
  Sync up the setttings for the CustomActions amongst the various PHP installer 
versions. Fixes Bug 46826.
  http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase52.wxs?r1=1.31r2=1.32diff_format=u
Index: win-installer/PHPInstallerBase52.wxs
diff -u win-installer/PHPInstallerBase52.wxs:1.31 
win-installer/PHPInstallerBase52.wxs:1.32
--- win-installer/PHPInstallerBase52.wxs:1.31   Fri Dec  5 12:33:13 2008
+++ win-installer/PHPInstallerBase52.wxsTue Dec 16 21:12:25 2008
@@ -118,7 +118,7 @@
 Custom Action=AssignAPACHEDIR After=CostInitializeNOT 
APACHEDIR/Custom
 Custom Action=AssignAPACHEDIR2 
After=CostInitializeAPACHEREGDIR/Custom
 /InstallUISequence
-
+
 Property Id=WEBSERVERPICKER
   RegistrySearch Id=webservertype 
 Root=HKLM 
@@ -337,7 +337,7 @@
 LongName=Programs
 Directory Id=ProgramMenuDir 
   Name=PHP5 
-  LongName=PHP 5 /
+  LongName=PHP 5/
   /Directory
   Directory Id=usrdirectory Name=usr
   Directory Id=mibsdirectory Name=mibs /
@@ -737,16 +737,16 @@
   Custom Action=fcgiconfigJSFastCGIremove After=InstallInitialize
 ![CDATA[((VersionNT = 501 AND ServicePackLevel = 2) OR (VersionNT = 
502 AND ServicePackLevel = 2)) AND iis4FastCGI = 2]]
   /Custom
-  Custom Action=unconfigIIS4 After=InstallInitialize
+  Custom Action=unconfigIIS4 After=InstallValidate
 ![CDATA[VersionNT  600 AND (iis4ISAPI = 2 OR iis4CGI = 2 OR 
iis4FastCGI = 2)]]
   /Custom
-  Custom Action=configIIS4 After=InstallInitialize
+  Custom Action=configIIS4 After=InstallFinalize
 ![CDATA[VersionNT  600 AND (iis4ISAPI = 3 OR iis4CGI = 3 OR 
iis4FastCGI = 3)]]
   /Custom
-  Custom Action=unconfigApache After=InstallInitialize
+  Custom Action=unconfigApache After=InstallValidate
 ![CDATA[apache13 = 2 OR apache20 = 2 OR apache22 = 2 OR apacheCGI 
= 2]]
   /Custom
-  Custom Action=configApache After=InstallInitialize
+  Custom Action=configApache After=InstallFinalize
 ![CDATA[apache13 = 3 OR apache20 = 3 OR apache22 = 3 OR apacheCGI 
= 3]]
   /Custom
   RemoveExistingProducts After=InstallValidate /
http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase52NTS.wxs?r1=1.7r2=1.8diff_format=u
Index: win-installer/PHPInstallerBase52NTS.wxs
diff -u win-installer/PHPInstallerBase52NTS.wxs:1.7 
win-installer/PHPInstallerBase52NTS.wxs:1.8
--- win-installer/PHPInstallerBase52NTS.wxs:1.7 Mon Nov 10 19:13:10 2008
+++ win-installer/PHPInstallerBase52NTS.wxs Tue Dec 16 21:12:25 2008
@@ -317,7 +317,6 @@
   Name=PHP5 
   LongName=PHP 5/
   /Directory
-  
   Directory Id=usrdirectory Name=usr
   Directory Id=mibsdirectory Name=mibs /
   /Directory
@@ -497,10 +496,10 @@
   Custom Action=iis700FastCGIremove After=InstallInitialize
 ![CDATA[VersionNT = 600 AND iis4FastCGI = 2]]
   /Custom
-  Custom Action=fcgiconfigJSFastCGI After=InstallFinalize
+  Custom Action=fcgiconfigJSFastCGI After=InstallInitialize
 ![CDATA[((VersionNT = 501 AND ServicePackLevel = 2) OR (VersionNT = 
502 AND ServicePackLevel = 2)) AND iis4FastCGI = 3]]
   /Custom
-  Custom Action=fcgiconfigJSFastCGIremove After=InstallFinalize
+  Custom Action=fcgiconfigJSFastCGIremove After=InstallInitialize
 ![CDATA[((VersionNT = 501 AND ServicePackLevel = 2) OR (VersionNT = 
502 AND ServicePackLevel = 2)) AND iis4FastCGI = 2]]
   /Custom
   Custom Action=unconfigIIS4 After=InstallValidate
http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase53.wxs?r1=1.7r2=1.8diff_format=u
Index: win-installer/PHPInstallerBase53.wxs
diff -u win-installer/PHPInstallerBase53.wxs:1.7 
win-installer/PHPInstallerBase53.wxs:1.8
--- win-installer/PHPInstallerBase53.wxs:1.7Fri Dec  5 12:33:13 2008
+++ win-installer/PHPInstallerBase53.wxsTue Dec 16 21:12:25 2008
@@ -118,7 +118,7 @@
 Custom Action=AssignAPACHEDIR After=CostInitializeNOT 
APACHEDIR/Custom
 Custom Action=AssignAPACHEDIR2 
After=CostInitializeAPACHEREGDIR/Custom
 /InstallUISequence
-
+
 Property Id=WEBSERVERPICKER
   RegistrySearch Id=webservertype 
 Root=HKLM 
@@ -319,7 +319,7 @@
 LongName=Programs
 Directory Id=ProgramMenuDir 
   Name=PHP5 
-  LongName=PHP 5 /
+  LongName=PHP 5/
   /Directory
 /Directory
 Feature AllowAdvertise=no 
@@ -384,10 +384,8 @@
   Title=$(loc.Featureapache13Title) 
   Description=$(loc.Featureapache13Description) 
   Level=10
-!--
   ComponentRef Id=php5apacheDLL/

[PHP-CVS] cvs: win-installer / PHPInstallerBase52.wxs PHPInstallerBase52NTS.wxs PHPInstallerBase53.wxs PHPInstallerBase53NTS.wxs PHPInstallerBase60.wxs PHPInstallerBase60NTS.wxs

2008-11-10 Thread John Mertic

jmertic Mon Nov 10 19:13:10 2008 UTC

  Modified files:  
/win-installer  PHPInstallerBase52.wxs PHPInstallerBase52NTS.wxs 
PHPInstallerBase53.wxs PHPInstallerBase53NTS.wxs 
PHPInstallerBase60.wxs PHPInstallerBase60NTS.wxs 
  Log:
  Set the Win64 attribute when doing RegistrySearches.
  http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase52.wxs?r1=1.29r2=1.30diff_format=u
Index: win-installer/PHPInstallerBase52.wxs
diff -u win-installer/PHPInstallerBase52.wxs:1.29 
win-installer/PHPInstallerBase52.wxs:1.30
--- win-installer/PHPInstallerBase52.wxs:1.29   Mon Nov 10 16:44:10 2008
+++ win-installer/PHPInstallerBase52.wxsMon Nov 10 19:13:10 2008
@@ -58,7 +58,8 @@
 Root=HKLM 
 Key=Software\iMatrix\Installed Components\Xitami 
 Type=raw 
-Name=Directory/
+Name=Directory
+Win64=yes/
 /Property
 
 Property Id=SAMBARDIR
@@ -66,7 +67,8 @@
 Root=HKLM 
 Key=SOFTWARE\Sambar Technologies\Sambar Server 
 Type=directory 
-Name=Installation Dir
+Name=Installation Dir
+Win64=yes
 DirectorySearch Id=sambarConfigDir 
   Path=config/
   /RegistrySearch
@@ -78,7 +80,8 @@
 Root=HKLM 
 
Key=SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{E136BB09-1BB2-49A0-9FF3-5C25564D3819}
 
 Type=raw
-Name=Version/
+Name=Version
+Win64=yes/
/Property
Property Id=FASTCGI70MODULEINSTALLED
  RegistrySearch 
@@ -105,7 +108,8 @@
 Root=HKLM 
 Key=Software\PHP 
 Type=raw 
-Name=ApacheDir/
+Name=ApacheDir
+Win64=yes/
 /Property
 
 CustomAction Id='AssignAPACHEDIR' Property='APACHEDIR' 
Value='[%ProgramFiles]' /
@@ -120,7 +124,8 @@
 Root=HKLM 
 Key=Software\PHP 
 Type=raw 
-Name=WebServerType/
+Name=WebServerType
+Win64=yes/
 /Property
 
 Directory Id=TARGETDIR Name=SourceDir
@@ -548,14 +553,20 @@
 CustomAction Id=netserveCGIInterpretersadd 
   ExeCommand=quot;[%ProgramFiles]NetServe Web Server\config.exe /add 
CGIInterpreters php^|[INSTALLDIR]php-cgi.exe'] 
   Return=ignore 
+  Execute=deferred
+ Impersonate=no
   Directory=INSTALLDIR/
 CustomAction Id=netserveCustomCGIVariablesadd 
   ExeCommand=quot;[%ProgramFiles]NetServe Web Server\config.exe /add 
CustomCGIVariables REDIRECT_STATUS^|200'] 
   Return=ignore 
+  Execute=deferred
+ Impersonate=no
   Directory=INSTALLDIR/
 CustomAction Id=netserveCGIInterpretersremove 
   ExeCommand=quot;[%ProgramFiles]NetServe Web Server\config.exe /del 
CGIInterpreters php^|[INSTALLDIR]php-cgi.exe'] 
   Return=ignore 
+  Execute=deferred
+ Impersonate=no
   Directory=INSTALLDIR/
 CustomAction Id=iis700FastCGIadd 
   ExeCommand=quot;[WindowsFolder]system32\inetsrv\APPCMD.EXEquot; SET 
CONFIG -section:system.webServer/fastCGI 
/+quot;[\[]fullPath='[INSTALLDIR]php-cgi.exe'[\]]quot; 
@@ -566,6 +577,8 @@
 CustomAction Id=iis700CGI 
   ExeCommand=quot;[WindowsFolder]System32\inetsrv\APPCMD.EXEquot; SET 
CONFIG -section:handlers 
quot;-+[name='PHP-CGI',path='*.php',verb='GET,HEAD,POST',modules='CgiModule',scriptProcessor='[INSTALLDIR]php-cgi.exe'quot;
 
   Return=ignore 
+  Execute=deferred
+ Impersonate=no
   Directory=INSTALLDIR/
 CustomAction Id=iis700FastCGI 
   ExeCommand=quot;[WindowsFolder]system32\inetsrv\APPCMD.EXEquot; SET 
CONFIG /section:system.webServer/handlers 
/+quot;[\[]name='PHP_via_FastCGI',path='*.php',verb='*',modules='FastCgiModule',scriptProcessor='[INSTALLDIR]php-cgi.exe',resourceType='Either'[\]]quot;
 
@@ -576,18 +589,26 @@
 CustomAction Id=iis700ISAPI 
   ExeCommand=quot;[WindowsFolder]System32\inetsrv\APPCMD.EXEquot; SET 
CONFIG -section:handlers 
quot;-+[name='PHP-ISAPI',path='*.php',verb='GET,HEAD,POST',modules='IsapiModule',scriptProcessor='[INSTALLDIR]php5isapi.dll'quot;
 
   Return=ignore 
+  Execute=deferred
+ Impersonate=no
   Directory=INSTALLDIR/
 CustomAction Id=iis700RCGI 
   ExeCommand=quot;[WindowsFolder]System32\inetsrv\APPCMD.EXEquot; SET 
CONFIG -section:isapiCgiRestriction 
quot;-+[path='[INSTALLDIR]php-cgi.exe',allowed='true',groupId='PHP',description='PHP']quot;
 
   Return=ignore 
+  Execute=deferred
+ Impersonate=no
   Directory=INSTALLDIR/
 CustomAction Id=iis700RISAPI 
   ExeCommand=quot;[WindowsFolder]System32\inetsrv\APPCMD.EXEquot; SET 
CONFIG -section:isapiCgiRestriction 
quot;-+[path='[INSTALLDIR]php5isapi.dll',allowed='true',groupId='PHP',description='PHP']quot;
 
   Return=ignore 
+  Execute=deferred
+ Impersonate=no
   Directory=INSTALLDIR/
 CustomAction Id=iis700CGIremove 
   ExeCommand=quot;[WindowsFolder]System32\inetsrv\APPCMD.EXEquot; SET

[PHP-CVS] cvs: win-installer / PHPInstallerBase52.wxs PHPInstallerBase52NTS.wxs PHPInstallerBase53.wxs PHPInstallerBase53NTS.wxs PHPInstallerBase60.wxs PHPInstallerBase60NTS.wxs

2008-11-10 Thread John Mertic

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.28r2=1.29diff_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.wxsMon 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.5r2=1.6diff_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.4r2=1.5diff_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.4Mon Oct 13 09:57:01 2008
+++ win-installer/PHPInstallerBase53.wxsMon 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.4r2=1.5diff_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
-

[PHP-CVS] cvs: win-installer / PHPInstallerBase52.wxs PHPInstallerBase52NTS.wxs PHPInstallerBase53.wxs PHPInstallerBase53NTS.wxs PHPInstallerBase60.wxs PHPInstallerBase60NTS.wxs

[PHP-CVS] cvs: win-installer / PHPInstallerBase52.wxs PHPInstallerBase52NTS.wxs PHPInstallerBase53.wxs PHPInstallerBase53NTS.wxs PHPInstallerBase60.wxs PHPInstallerBase60NTS.wxs

[PHP-CVS] cvs: win-installer / PHPInstallerBase52.wxs PHPInstallerBase52NTS.wxs PHPInstallerBase53.wxs PHPInstallerBase53NTS.wxs PHPInstallerBase60.wxs PHPInstallerBase60NTS.wxs WebServerConfig52.wxs

[PHP-CVS] cvs: win-installer / PHPInstallerBase52.wxs PHPInstallerBase52NTS.wxs PHPInstallerBase53.wxs PHPInstallerBase53NTS.wxs PHPInstallerBase60.wxs PHPInstallerBase60NTS.wxs PHPInstallerScripts52.

[PHP-CVS] cvs: win-installer / PHPInstallerBase52.wxs PHPInstallerBase52NTS.wxs PHPInstallerBase53.wxs PHPInstallerBase53NTS.wxs PHPInstallerBase60.wxs PHPInstallerBase60NTS.wxs

[PHP-CVS] cvs: win-installer / PHPInstallerBase52.wxs PHPInstallerBase52NTS.wxs PHPInstallerBase53.wxs PHPInstallerBase53NTS.wxs PHPInstallerBase60.wxs PHPInstallerBase60NTS.wxs WebServerConfig53.wxs

[PHP-CVS] cvs: win-installer / PHPInstallerBase52.wxs PHPInstallerBase52NTS.wxs PHPInstallerBase53.wxs PHPInstallerBase53NTS.wxs PHPInstallerBase60.wxs PHPInstallerBase60NTS.wxs

[PHP-CVS] cvs: win-installer / PHPInstallerBase52.wxs PHPInstallerBase52NTS.wxs PHPInstallerBase53.wxs PHPInstallerBase53NTS.wxs PHPInstallerBase60.wxs PHPInstallerBase60NTS.wxs

[PHP-CVS] cvs: win-installer / PHPInstallerBase52.wxs PHPInstallerBase52NTS.wxs PHPInstallerBase53.wxs PHPInstallerBase53NTS.wxs PHPInstallerBase60.wxs PHPInstallerBase60NTS.wxs

[PHP-CVS] cvs: win-installer / PHPInstallerBase52.wxs PHPInstallerBase52NTS.wxs PHPInstallerBase53.wxs PHPInstallerBase53NTS.wxs PHPInstallerBase60.wxs PHPInstallerBase60NTS.wxs

10 matches

Site Navigation

Mail list logo

Footer information