cvs: pearweb /public_html go-pear

cellog          Mon Apr  4 01:14:15 2005 EDT

  Modified files:              
    /pearweb/public_html        go-pear 
  Log:
  no such thing as $phpsapiname, use $php_sapi_name
  
http://cvs.php.net/diff.php/pearweb/public_html/go-pear?r1=1.75&r2=1.76&ty=u
Index: pearweb/public_html/go-pear
diff -u pearweb/public_html/go-pear:1.75 pearweb/public_html/go-pear:1.76
--- pearweb/public_html/go-pear:1.75    Wed Feb 23 13:58:40 2005
+++ pearweb/public_html/go-pear Mon Apr  4 01:14:08 2005
@@ -18,7 +18,7 @@
 # |          Pierre-Alain Joye <pajoye@xxxxxxxxxx>                       |
 # |          Greg Beaver <cellog@xxxxxxx>                                |
 # +----------------------------------------------------------------------+
-# $Id: go-pear,v 1.75 2005/02/23 18:58:40 cellog Exp $
+# $Id: go-pear,v 1.76 2005/04/04 05:14:08 cellog Exp $
 #
 # Automatically download all the files needed to run the "pear" command
 # (the PEAR package installer).  Requires PHP 4.1.0 or newer.
@@ -498,7 +498,8 @@
 }
 
 foreach ($config_vars as $n => $var) {
-    foreach ($config_vars as $m => $var2) {
+    for ($m = 1; $m <= count($config_vars); $m++) {
+        $var2 = $config_vars[$m];
         $$var = str_replace('$'.$var2, $$var2, $$var);
     }
 }
@@ -2168,9 +2169,9 @@
  */
 function win32DetectPHPSAPI()
 {
-    global $php_bin,$phpsapiname;
+    global $php_bin,$php_sapi_name;
     if (WEBINSTALLER) {
-        return $phpsapiname;
+        return $php_sapi_name;
     }
     if($php_bin!=''){
         exec($php_bin.' -v', $res);