diff options
| author | Greg Beaver <cellog@php.net> | 2004-03-13 17:37:23 +0000 |
|---|---|---|
| committer | Greg Beaver <cellog@php.net> | 2004-03-13 17:37:23 +0000 |
| commit | e3c0e33f11293555a1bfcfe40a1759bb47038c1f (patch) | |
| tree | 5dd07ceac16acb88423a7eb78a1672da683baaf1 /pear/scripts | |
| parent | 4685a6687fbb6ddab59ce002fcdd494fdf6ebebc (diff) | |
| download | php-git-e3c0e33f11293555a1bfcfe40a1759bb47038c1f.tar.gz | |
fix #1008: safe mode raises warning
fix register_argc_argv in pear.bat
Diffstat (limited to 'pear/scripts')
| -rwxr-xr-x | pear/scripts/pear.bat | 4 | ||||
| -rw-r--r-- | pear/scripts/pearcmd.php | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/pear/scripts/pear.bat b/pear/scripts/pear.bat index f8a69299f9..21605eee97 100755 --- a/pear/scripts/pear.bat +++ b/pear/scripts/pear.bat @@ -16,7 +16,7 @@ REM ---------------------------------------------------------------------- REM Authors: Alexander Merz (alexmerz@php.net)
REM ----------------------------------------------------------------------
REM
-REM $Id: pear.bat,v 1.18 2004/01/08 17:33:14 sniper Exp $
+REM Last updated 3/13/2004 ($Id$ is not replaced if the file is binary)
REM change this lines to match the paths of your system
REM -------------------
@@ -64,6 +64,6 @@ ECHO The current value is: ECHO %PHP_PEAR_PHP_BIN%
GOTO END
:RUN
-"%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
+"%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
:END
@ECHO ON
diff --git a/pear/scripts/pearcmd.php b/pear/scripts/pearcmd.php index e1d1cb15bf..fcf6a6501b 100644 --- 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); |