[PHP-CVS] cvs: php-src /ext/standard/tests/streams stream_resolve_include_path.phpt

2008-12-20 Thread Lars Strojny
lstrojnySat Dec 20 16:23:38 2008 UTC

  Added files: 
/php-src/ext/standard/tests/streams 
stream_resolve_include_path.phpt 
  Log:
  Adding test for stream_resolve_include_path()
  
  

http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/streams/stream_resolve_include_path.phpt?view=markuprev=1.1
Index: php-src/ext/standard/tests/streams/stream_resolve_include_path.phpt
+++ php-src/ext/standard/tests/streams/stream_resolve_include_path.phpt
--TEST--
stream_resolve_include_path(string path[, stream context])
--FILE--
?php
$include_path = __DIR__ . '/test_path';
$include_path_nested = $include_path . '/nested';

$include_path_file = $include_path . DIRECTORY_SEPARATOR . 'file';
$include_path_nested_file = $include_path_nested . DIRECTORY_SEPARATOR . 'file';

mkdir($include_path);
mkdir($include_path_nested);

file_put_contents($include_path_file, 'include_path');
file_put_contents($include_path_nested_file, 'include_path');

var_dump(stream_resolve_include_path());

set_include_path($include_path . PATH_SEPARATOR . $include_path_nested);
var_dump(stream_resolve_include_path('file-does-not-exist'));

set_include_path($include_path . PATH_SEPARATOR . $include_path_nested);
var_dump(stream_resolve_include_path('file'));
set_include_path($include_path_nested . PATH_SEPARATOR . $include_path);
var_dump(stream_resolve_include_path('file'));

unlink($include_path_nested_file);
rmdir($include_path_nested);
unlink($include_path_file);
rmdir($include_path);
--EXPECTF--
Warning: stream_resolve_include_path() expects at least 1 parameter, 0 given in 
%s on line %d
NULL
bool(false)
%unicode|string%(%d) %s/test_path/file
%unicode|string%(%d) %s/test_path/nested/file



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



[PHP-CVS] [TESTING] - svn: php/php-src/branches/PHP_5_3/

2008-12-20 Thread svn
svnread Sat, 20 Dec 2008 18:32:03 +

Changed paths:
U   php/php-src/branches/PHP_5_3/stub.c

Log:
TEST COMMIT

Modified: php/php-src/branches/PHP_5_3/stub.c
===
--- php/php-src/branches/PHP_5_3/stub.c 2008-12-20 05:48:27 UTC (rev 217529)
+++ php/php-src/branches/PHP_5_3/stub.c 2008-12-20 18:32:03 UTC (rev 217530)
@@ -1,9 +1,3 @@
-dfgint main(int testc, char **testv)
-dfg
-dsfgdkfjg
-sdf
-dfg
-
-ggg
+int main(int testc, char **testv)
 :w
 :


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



[PHP-CVS] [TESTING] - svn: php/php-src/branches/PHP_5_3/

2008-12-20 Thread svn
svnread Sat, 20 Dec 2008 18:42:04 +

Changed paths:
U   php/php-src/branches/PHP_5_3/stub.c

Log:
TEST COMMIT

Modified: php/php-src/branches/PHP_5_3/stub.c
===
--- php/php-src/branches/PHP_5_3/stub.c 2008-12-20 18:32:03 UTC (rev 217530)
+++ php/php-src/branches/PHP_5_3/stub.c 2008-12-20 18:42:04 UTC (rev 217531)
@@ -1,3 +1,5 @@
 int main(int testc, char **testv)
+{
+}
 :w
 :


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



[PHP-CVS] [TESTING] - svn: php/php-src/branches/PHP_5_3/

2008-12-20 Thread svn
svnread Sat, 20 Dec 2008 18:42:33 +

Changed paths:
U   php/php-src/branches/PHP_5_3/stub.c

Log:
TEST COMMIT

Modified: php/php-src/branches/PHP_5_3/stub.c
===
--- php/php-src/branches/PHP_5_3/stub.c 2008-12-20 18:42:04 UTC (rev 217531)
+++ php/php-src/branches/PHP_5_3/stub.c 2008-12-20 18:42:33 UTC (rev 217532)
@@ -1,5 +1,3 @@
 int main(int testc, char **testv)
 {
 }
-:w
-:


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



[PHP-CVS] [TESTING] - svn: php/php-src/branches/PHP_5_3/

2008-12-20 Thread svn
gwynne  Sat, 20 Dec 2008 18:56:07 +

Changed paths:
U   php/php-src/branches/PHP_5_3/stub.c

Log:
TEST COMMIT now...

Modified: php/php-src/branches/PHP_5_3/stub.c
===
--- php/php-src/branches/PHP_5_3/stub.c 2008-12-20 18:42:33 UTC (rev 217532)
+++ php/php-src/branches/PHP_5_3/stub.c 2008-12-20 18:56:07 UTC (rev 217533)
@@ -1,3 +1,5 @@
 int main(int testc, char **testv)
 {
+   printf(Stupid.\n);
+   return 0;
 }


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



[PHP-CVS] [TESTING] - svn: phpdoc/en/trunk/security/

2008-12-20 Thread Philip Olson
philip  Sat, 20 Dec 2008 19:22:48 +

Changed paths:
U   phpdoc/en/trunk/security/magicquotes.xml

Log:
Testing SVN


Modified: phpdoc/en/trunk/security/magicquotes.xml
===
--- phpdoc/en/trunk/security/magicquotes.xml2008-12-20 18:56:07 UTC (rev 
217533)
+++ phpdoc/en/trunk/security/magicquotes.xml2008-12-20 19:22:48 UTC (rev 
217534)
@@ -4,6 +4,9 @@
titleMagic Quotes/title
warn.deprecated.feature-5-3-0.removed-6-0-0;
para
+TURN THEM OFF!!!
+   /para
+   para
 Magic Quotes is a process that automagically escapes incoming data to the
 PHP script. It's preferred to code with magic quotes off and to instead
 escape the data at runtime, as needed.


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



[PHP-CVS] [TESTING] - svn: phpdoc/en/trunk/security/

2008-12-20 Thread Philip Olson
philip  Sat, 20 Dec 2008 19:28:46 +

Changed paths:
U   phpdoc/en/trunk/security/magicquotes.xml

Log:
Testing SVN email redirect


Modified: phpdoc/en/trunk/security/magicquotes.xml
===
--- phpdoc/en/trunk/security/magicquotes.xml2008-12-20 19:22:48 UTC (rev 
217534)
+++ phpdoc/en/trunk/security/magicquotes.xml2008-12-20 19:28:46 UTC (rev 
217535)
@@ -4,7 +4,7 @@
titleMagic Quotes/title
warn.deprecated.feature-5-3-0.removed-6-0-0;
para
-TURN THEM OFF!!!
+TURN THEM OFF!!! Seriously, they are not good.
/para
para
 Magic Quotes is a process that automagically escapes incoming data to the


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



[PHP-CVS] [TESTING] - svn: php/php-src/branches/PHP_5_3/ext/wddx/

2008-12-20 Thread Mark Karpeles
magicaltux  Sat, 20 Dec 2008 19:48:36 +

Changed paths:
A   php/php-src/branches/PHP_5_3/ext/wddx/test.txt

Log:
# - I should be able to commit this

Added: php/php-src/branches/PHP_5_3/ext/wddx/test.txt
===
--- php/php-src/branches/PHP_5_3/ext/wddx/test.txt  
(rev 0)
+++ php/php-src/branches/PHP_5_3/ext/wddx/test.txt  2008-12-20 19:48:36 UTC 
(rev 217538)
@@ -0,0 +1 @@
+Testing new SVN


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



[PHP-CVS] cvs: win-installer / GenPHPInstaller.wxs.php policy_9_0_Microsoft_VC90_CRT_x86.msm policy_9_0_Microsoft_VC90_CRT_x86_x64.msm

2008-12-20 Thread John Mertic
jmertic Sun Dec 21 03:43:07 2008 UTC

  Added files: 
/win-installer  policy_9_0_Microsoft_VC90_CRT_x86.msm 
policy_9_0_Microsoft_VC90_CRT_x86_x64.msm 

  Modified files:  
/win-installer  GenPHPInstaller.wxs.php 
  Log:
  Add the policy msm files to the installer. Should make the VC9 runtime be 
automatically installed if not present if needed.
  http://cvs.php.net/viewvc.cgi/win-installer/GenPHPInstaller.wxs.php?r1=1.10r2=1.11diff_format=u
Index: win-installer/GenPHPInstaller.wxs.php
diff -u win-installer/GenPHPInstaller.wxs.php:1.10 
win-installer/GenPHPInstaller.wxs.php:1.11
--- win-installer/GenPHPInstaller.wxs.php:1.10  Wed Dec  3 21:18:29 2008
+++ win-installer/GenPHPInstaller.wxs.php   Sun Dec 21 03:43:07 2008
@@ -25,20 +25,20 @@

$Merge-setAttribute('SourceFile',Microsoft_VC90_CRT_{$includemsm}.msm);
$Merge-setAttribute('DiskId','1');
$Merge-setAttribute('Language','0');
-   
+   $Merge = $PHPInstallerBaseWXS-createElement('Merge');
+   $Merge = $TargetDir-appendChild($Merge);
+   $Merge-setAttribute('Id','VCRedist_policy');
+   
$Merge-setAttribute('SourceFile',policy_9_0_Microsoft_VC90_CRT_{$includemsm}.msm);
+   $Merge-setAttribute('DiskId','1');
+   $Merge-setAttribute('Language','0');
+
$MainFeature = 
$PHPInstallerBaseWXS-getElementsByTagName('Feature')-item(0);
-   $Feature = $PHPInstallerBaseWXS-createElement('Feature');
-   $Feature = $MainFeature-appendChild($Feature);
-   $Feature-setAttribute('Id','VCRedistFeature');
-   $Feature-setAttribute('Title','Visual C++ 9.0 Runtime');
-   $Feature-setAttribute('AllowAdvertise','no');
-   $Feature-setAttribute('Display','hidden');
-   $Feature-setAttribute('Level','1');
-$Feature-setAttribute('InstallDefault','source');
-   
$MergeRef = $PHPInstallerBaseWXS-createElement('MergeRef');
-   $MergeRef = $Feature-appendChild($MergeRef);
+   $MergeRef = $MainFeature-appendChild($MergeRef);
$MergeRef-setAttribute('Id','VCRedist');
+$MergeRef = $PHPInstallerBaseWXS-createElement('MergeRef');
+   $MergeRef = $MainFeature-appendChild($MergeRef);
+   $MergeRef-setAttribute('Id','VCRedist_policy');
 }
 
 $PHPInstallerBaseWXS-save(PHPInstaller$version.wxs);

http://cvs.php.net/viewvc.cgi/win-installer/policy_9_0_Microsoft_VC90_CRT_x86.msm?view=markuprev=1.1
Index: win-installer/policy_9_0_Microsoft_VC90_CRT_x86.msm
+++ win-installer/policy_9_0_Microsoft_VC90_CRT_x86.msm
ÐÏࡱá



¥³¯ZÓ1Øfr
Ýy'¥e²Sqfþܝ 
}iÊü9Ø¤W¡²ÄùgGô#–J’¥½™üŒ¸|óZÑ´ÀºµØùeÝ53eMÅSŽu'›º7ÕÔeì÷¾IàhÙ¨GĈ„]­Ôk3³’I'þ(^Ît...@ö_¿ñ:çP¯¼?bê׬}¡¨¦¦É ÁêПÀùW¼y¢Iþx¹i“ùá¦fúöõ
«”0ÕüÖvMÑãúª½›Ñ)òåG=†×ÙÄT5ZtD0ϽÝ{ãÐÝó]—HþžÁë=ÇÊ+ÞÆ^¿?qá3ÿÎmR
*m{k¯ùyø™;ôLÖeGߍŠ°„k¦¾¯Ïbs”ð6½ß[課¿\Qæ¸ÝGŒ°¦;хÝ‚¢±îhtí‰ÓTÚÛÌýJ˸xڗ:üF?9-k÷®ÖÂx7LVg´•¢”«·ñ¡A•^›«ó×D}'dO
   ÌÝã}Ë=C
иs4¯ÕåsIœjÅ\êöÃçØTrÉ:%³VJnØg,B.i÷AÃä¡‘ùy†þ¯XâýöÚ5Œ±è¬ çOá(òíA8b•`ìðŒ·ö?®ýiáé'€J݇n

³©æKÊug…qö7N|àPkÀά¼Tik+6Ž=Z‘ïÈ9x¸\gmÇÇ¢‚æŠ+¶’k)l¤ðÝLyRã¾e~aR•c¦yn°ÔhxþÒ‡qvJg냁¤ú‘º÷ÃÞ4_ÂtÅ_¿G¸¥Ñ!,Y8¨“Qº6
 K2¡§¬ŒßáðLf#ÑC^.Óí Î]b°Yu[q´¶uÞy|ù+z`ª5/ 
yØ#’À‚81•Ç©ì3I¨Z‚÷çÍû˜hÇJ™É«ZO?‘w3›Êä“Ô‚‹Å±Ü©|¶ñŽ½^máÁ1OÍÄ©™­%A¶ÚÝT£«Ò³h:â
©8
FÅÿÂe£³¾¿þωj…¿;šsÅGÐe¿VÀ‰æ^ñ±¶”þ~S/up®ñpw÷ÈÎúëós]q�...@ÿ§¬bãa·“h#ÀæŸú‚
kßÀb¦fGŸÄ§h4— 
¶‡D2+;%ÓՎÊãR^Öe•å{9_ÔÛ}Û£öã3¶G¶Ytãj0pàQ\Zڍ»ëIëë|Ÿml0š1zà¥ø4p...@z„›bˆs5lÛ}ӈׇ›¶‘lò®×
Õ+nš9†^»Æ¼â*1vÃi.{ƒÉöó7ØmºŒ*‰úՅ,N¬óä3H`þô`ò WmkÃB¼–82y8!¶ßãã…
7ÂOçjξÝÚü¹Å™˜,]åÍrs¼_²1‹bD0¬úž·džéì[$¿¨·½Ö8Óóùvr¸}-ðR³q‡Í(—_Òák¿š_©ØþãqùÇi臧
Ö/q™³ãOAùõ'FP~³0£y¾~ „F«¡1ª.
ʔ†z%~̈È~E™gøñNeç˜?€ŠCÎ1¼¹Å%f÷u‡ï-КQ9ø°])×U÷™yú®Ä]YÓ;––R¨êrÙ¶ÝÔ7ìê‰1ahRÿNڋ͇ÔÎԄüÆZñ(—ôlîxËȳ‚Lb¾Ãkߗýw}}N ¶³„E/tjoÍ�...@¾‰(]’µtq:m¦‘ÞAªÞ6z|`’x¡¹Iyì³ÚõÅeVzºÁ¦V5zñqb3Iè.ʾLËÚÅöLYÂ*£]ë$ԔôUj”^‘N*aÓòuÙû‰bùT
 éyÑUƒ±ŒÜ¶Mï;lí¯ohn–z£žTÓdjîàh;q9N4{ºMð¦‰1Lþý5]ƒ`?_d ‘
Iv÷ƒt¿K(,
D}såˆÃ‚(œƒÔ÷î`À Aõô @ P¨†T‚7‰F$ÐöR¡º‚µ4 
Û^T£1ā²›Èpʓ …WÅcÝÑD´Q/¥²ì¢џH†Ü#„0Äï2Íð‹ïËêÿ¾)_Ûð3Çÿy¡‹ãIdÆèCÉN¢B5 
‘_ÇzÊ:-¨üCAŽ?ë6}]•Ÿ6ó»z¹7tUÜ¿ÿ:6öÂmC.Ç79êgÓmÈÌWÔöÉÔÚyê¥[µ*†«’þÿ

®Onò±{W×Ď  •¹ñ~M9~Ç8ߐö„äöC—#n?ävêEqPƒ

ñß[‡£@;  K`ä¶1ä–:ä”!Ô
-Šý^xõ
՝F¢Ñ’à:†...@ø»ÝŽb¡!÷Ò¼)t-”âÂj�...@
5H‹2~Í­™ÃЉzÙ¼þՋüÖ¤úOí¸Q¤õ+ü¾ËDš5e•osùÊòò?8ˆÍK6w¯ž¶+ã0¬ŸéBsϼ|¹lgk'íîÖ¾¸~B¢Ùď+ˆn釟Œf*Ûse Éi‚¸ù®Cy“ÿґîwlÉá•i·/j*ýúÛù ÑÀ ÝÇ ¡Sãà°!ÿyuŸµýê#Ä¿7F4¹¨j‘·ˆqá+8ò?ìr00¹/¶õœ?¿vü±½Ù9Sáo*üM…¿©ð'*¸tËß©ÀºÈ÷ÄfÉõô½ú¯w3â¿
PÞka D
Ùã«cÿÈ1iPòwÇDWÚ=ˆH{’ªiƒ3üK*T„ìïÞQjŒ=¯V„î›—UßTÿq]Ö]ã=o;Lƾ¹ÛÒ?“¿¹¥g³¯ŠŒ±ît§YEÄÞãÚÉÜ6·e§r^pI¯ë0”YÀ§·‰Ÿ=f¾.ý~©ŠÔMså0Jïj
Ãx...@­ÂŒ§Ž2³´¸ÞìÜ5_X|æǪ«„ú¼kNTLlRÉTej~›Ö9›X¡õñVà, 7sg^/êFܸ/¶
À`Kf  ځâ7bB°UüA à¿ýòdß-«[#T¾áÈÉ0ó 
PÅ­HeÆì»x)Ü\nêA-Ïy=mÃÞÒ¸Ï-Sƒ-/[^?!ÝæΛ†ãî´Ä·ÎÙ·6f×:RÞŒ
€‰M]b•œÙ\©û$Šö¿?P”ˆMÒ;éS£åיpYúóÐËnûфÚÅ 

[PHP-CVS] cvs: win-installer / build.bat

2008-12-20 Thread John Mertic
jmertic Sun Dec 21 03:43:46 2008 UTC

  Modified files:  
/win-installer  build.bat 
  Log:
  Clean up the order of things in the build file.
  
http://cvs.php.net/viewvc.cgi/win-installer/build.bat?r1=1.15r2=1.16diff_format=u
Index: win-installer/build.bat
diff -u win-installer/build.bat:1.15 win-installer/build.bat:1.16
--- win-installer/build.bat:1.15Fri Dec 19 20:26:13 2008
+++ win-installer/build.bat Sun Dec 21 03:43:46 2008
@@ -4,9 +4,6 @@
 set phpver=%phpver:~0,3%
 set phpver=%phpver:.=%
 
-echo Building ExtensionsFeatures.wxs
-copy ExtensionsFeatures%phpver%.wxs ExtensionsFeatures.wxs
-
 set suffix=
 set extrants=
 set extrasnaps=
@@ -43,6 +40,9 @@
 :build
 set msiname=php-%1-%extrants%win32-%buildtype%-installer%extrasnaps%.msi
 
+echo Building ExtensionsFeatures.wxs
+copy ExtensionsFeatures%phpver%.wxs ExtensionsFeatures.wxs
+
 echo Building ExtensionsComponents.wxs
 Files\php.exe -n GenExtensionsComponents.wxs.php %phpver%
 



-- 
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 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