fix #1008: safe mode raises warning

fix register_argc_argv in pear.bat

diff --git a/pear/scripts/pear.bat b/pear/scripts/pear.bat
index f8a69299f92648526d529cd348a11158054c1e0a..21605eee9796f4b3dc779a607d00f111edec818d 100755 (executable)
--- a/pear/scripts/pear.bat
+++ b/pear/scripts/pear.bat
@@ -16,7 +16,7 @@ REM ----------------------------------------------------------------------
 REM  Authors:     Alexander Merz (alexmerz@php.net)\r
 REM ----------------------------------------------------------------------\r
 REM\r
-REM  $Id: pear.bat,v 1.18 2004/01/08 17:33:14 sniper Exp $\r
+REM  Last updated 3/13/2004 ($Id$ is not replaced if the file is binary)\r
 \r
 REM change this lines to match the paths of your system\r
 REM -------------------\r
@@ -64,6 +64,6 @@ ECHO The current value is:
 ECHO %PHP_PEAR_PHP_BIN%\r
 GOTO END\r
 :RUN\r
-"%PHP_PEAR_PHP_BIN%" -C -d output_buffering=1 -d include_path="%PHP_PEAR_INSTALL_DIR%" -f "%PHP_PEAR_INSTALL_DIR%\pearcmd.php" -- %1 %2 %3 %4 %5 %6 %7 %8 %9\r
+"%PHP_PEAR_PHP_BIN%" -C -d output_buffering=1 -d register_argc_argv=On -d include_path="%PHP_PEAR_INSTALL_DIR%" -f "%PHP_PEAR_INSTALL_DIR%\pearcmd.php" -- %1 %2 %3 %4 %5 %6 %7 %8 %9\r
 :END\r
 @ECHO ON\r

diff --git a/pear/scripts/pearcmd.php b/pear/scripts/pearcmd.php
index e1d1cb15bf5e737042fb319a7d479592d83f6b9d..fcf6a6501be992f88073542f4c4e6fae18f90426 100644 (file)
--- a/pear/scripts/pearcmd.php
+++ b/pear/scripts/pearcmd.php
@@ -28,7 +28,9 @@ if ('@include_path@' != '@'.'include_path'.'@') {
     ini_set('include_path', '@include_path@');
 }
 ini_set('allow_url_fopen', true);
-set_time_limit(0);
+if (!ini_get('safe_mode')) {
+    set_time_limit(0);
+}
 ob_implicit_flush(true);
 ini_set('track_errors', true);
 ini_set('html_errors', false);