svn: /pear/pear-core/trunk/scripts/ pear.bat pear.sh peardev.bat peardev.sh pecl.bat pecl.sh
[email protected] (Helgi Þormar Þorbjörnsson) Sat, 19 Mar 2011 17:58:28 +0000
| Newsgroups | php.pear.cvs,php.pear.core |
|---|---|
| Message-ID | <[email protected]> |
dufuz Sat, 19 Mar 2011 17:58:28 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=309436
Log:
Fixed Bug #18364: date.timezone errors for sh/bat files when TZ is not set in php.ini [dufuz]
# Port from branch PEAR-1.9.3
Bug: http://pear.php.net/bugs/18364 (unknown)
Changed paths:
U pear/pear-core/trunk/scripts/pear.bat
U pear/pear-core/trunk/scripts/pear.sh
U pear/pear-core/trunk/scripts/peardev.bat
U pear/pear-core/trunk/scripts/peardev.sh
U pear/pear-core/trunk/scripts/pecl.bat
U pear/pear-core/trunk/scripts/pecl.sh
Modified: pear/pear-core/trunk/scripts/pear.bat
===================================================================
--- pear/pear-core/trunk/scripts/pear.bat 2011-03-19 17:57:53 UTC (rev 309435)
+++ pear/pear-core/trunk/scripts/pear.bat 2011-03-19 17:58:28 UTC (rev 309436)
@@ -106,6 +106,6 @@
ECHO %PHP_PEAR_PHP_BIN%
GOTO END
:RUN
-"%PHP_PEAR_PHP_BIN%" -C -d output_buffering=1 -d safe_mode=0 -d open_basedir="" -d auto_prepend_file="" -d auto_append_file="" -d variables_order=EGPCS -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
+"%PHP_PEAR_PHP_BIN%" -C -d date.timezone=UTC -d output_buffering=1 -d safe_mode=0 -d open_basedir="" -d auto_prepend_file="" -d auto_append_file="" -d variables_order=EGPCS -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
\ No newline at end of file
Modified: pear/pear-core/trunk/scripts/pear.sh
===================================================================
--- pear/pear-core/trunk/scripts/pear.sh 2011-03-19 17:57:53 UTC (rev 309435)
+++ pear/pear-core/trunk/scripts/pear.sh 2011-03-19 17:58:28 UTC (rev 309436)
@@ -5,7 +5,7 @@
PHP="$PHP_PEAR_PHP_BIN"
else
if test "@php_bin@" = '@'php_bin'@'; then
- PHP=php
+ PHP=php
else
PHP="@php_bin@"
fi
@@ -18,11 +18,11 @@
else
if test "@php_dir@" = '@'php_dir'@'; then
INCDIR=`dirname $0`
- INCARG=""
+ INCARG=""
else
INCDIR="@php_dir@"
INCARG="-d include_path=@php_dir@"
fi
fi
-exec $PHP -C -q $INCARG -d output_buffering=1 -d variables_order=EGPCS -d open_basedir="" -d safe_mode=0 -d register_argc_argv="On" -d auto_prepend_file="" -d auto_append_file="" $INCDIR/pearcmd.php "$@"
+exec $PHP -C -q $INCARG -d date.timezone=UTC -d output_buffering=1 -d variables_order=EGPCS -d open_basedir="" -d safe_mode=0 -d register_argc_argv="On" -d auto_prepend_file="" -d auto_append_file="" $INCDIR/pearcmd.php "$@"
Modified: pear/pear-core/trunk/scripts/peardev.bat
===================================================================
--- pear/pear-core/trunk/scripts/peardev.bat 2011-03-19 17:57:53 UTC (rev 309435)
+++ pear/pear-core/trunk/scripts/peardev.bat 2011-03-19 17:58:28 UTC (rev 309436)
@@ -110,6 +110,6 @@
ECHO %PHP_PEAR_PHP_BIN%
GOTO END
:RUN
-"%PHP_PEAR_PHP_BIN%" -C -d memory_limit="-1" -d safe_mode=0 -d register_argc_argv="On" -d auto_prepend_file="" -d auto_append_file="" -d variables_order=EGPCS -d open_basedir="" -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 date.timezone=UTC -d memory_limit="-1" -d safe_mode=0 -d register_argc_argv="On" -d auto_prepend_file="" -d auto_append_file="" -d variables_order=EGPCS -d open_basedir="" -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
:END
@ECHO ON
\ No newline at end of file
Modified: pear/pear-core/trunk/scripts/peardev.sh
===================================================================
--- pear/pear-core/trunk/scripts/peardev.sh 2011-03-19 17:57:53 UTC (rev 309435)
+++ pear/pear-core/trunk/scripts/peardev.sh 2011-03-19 17:58:28 UTC (rev 309436)
@@ -5,7 +5,7 @@
PHP="$PHP_PEAR_PHP_BIN"
else
if test "@php_bin@" = '@'php_bin'@'; then
- PHP=php
+ PHP=php
else
PHP="@php_bin@"
fi
@@ -18,11 +18,11 @@
else
if test "@php_dir@" = '@'php_dir'@'; then
INCDIR=`dirname $0`
- INCARG=""
+ INCARG=""
else
INCDIR="@php_dir@"
INCARG="-d include_path=@php_dir@"
fi
fi
-exec $PHP -d memory_limit="-1" -C -q $INCARG -d output_buffering=1 -d open_basedir="" -d safe_mode=0 -d register_argc_argv="On" -d auto_prepend_file="" -d variables_order=EGPCS -d auto_append_file="" $INCDIR/pearcmd.php "$@"
+exec $PHP -d date.timezone=UTC -d memory_limit="-1" -C -q $INCARG -d output_buffering=1 -d open_basedir="" -d safe_mode=0 -d register_argc_argv="On" -d auto_prepend_file="" -d variables_order=EGPCS -d auto_append_file="" $INCDIR/pearcmd.php "$@"
Modified: pear/pear-core/trunk/scripts/pecl.bat
===================================================================
--- pear/pear-core/trunk/scripts/pecl.bat 2011-03-19 17:57:53 UTC (rev 309435)
+++ pear/pear-core/trunk/scripts/pecl.bat 2011-03-19 17:58:28 UTC (rev 309436)
@@ -110,6 +110,6 @@
ECHO %PHP_PEAR_PHP_BIN%
GOTO END
:RUN
-"%PHP_PEAR_PHP_BIN%" -C -n -d output_buffering=1 -d safe_mode=0 -d "include_path='%PHP_PEAR_INSTALL_DIR%'" -d register_argc_argv="On" -d variables_order=EGPCS -f "%PHP_PEAR_INSTALL_DIR%\peclcmd.php" -- %1 %2 %3 %4 %5 %6 %7 %8 %9
+"%PHP_PEAR_PHP_BIN%" -C -n -d date.timezone=UTC -d output_buffering=1 -d safe_mode=0 -d "include_path='%PHP_PEAR_INSTALL_DIR%'" -d register_argc_argv="On" -d variables_order=EGPCS -f "%PHP_PEAR_INSTALL_DIR%\peclcmd.php" -- %1 %2 %3 %4 %5 %6 %7 %8 %9
:END
@ECHO ON
\ No newline at end of file
Modified: pear/pear-core/trunk/scripts/pecl.sh
===================================================================
--- pear/pear-core/trunk/scripts/pecl.sh 2011-03-19 17:57:53 UTC (rev 309435)
+++ pear/pear-core/trunk/scripts/pecl.sh 2011-03-19 17:58:28 UTC (rev 309436)
@@ -5,7 +5,7 @@
PHP="$PHP_PEAR_PHP_BIN"
else
if test "@php_bin@" = '@'php_bin'@'; then
- PHP=php
+ PHP=php
else
PHP="@php_bin@"
fi
@@ -18,11 +18,11 @@
else
if test "@php_dir@" = '@'php_dir'@'; then
INCDIR=`dirname $0`
- INCARG=""
+ INCARG=""
else
INCDIR="@php_dir@"
INCARG="-d include_path=@php_dir@"
fi
fi
-exec $PHP -C -n -q $INCARG -d output_buffering=1 -d variables_order=EGPCS -d safe_mode=0 -d register_argc_argv="On" $INCDIR/peclcmd.php "$@"
+exec $PHP -C -n -q $INCARG -d date.timezone=UTC -d output_buffering=1 -d variables_order=EGPCS -d safe_mode=0 -d register_argc_argv="On" $INCDIR/peclcmd.php "$@"