cvs: php4(PHP_4_2_0) / NEWS /sapi/cgi config.m4 /sapi/cli EXPERIMENTAL README config.m4 php_cli.c

edink Mon Mar 25 12:02:31 2002 EDT Added files: (Branch: PHP_4_2_0) /php4/sapi/cli EXPERIMENTAL Modified files: /php4 NEWS /php4/sapi/cgi config.m4 /php4/sapi/cli README config.m4 php_cli.c Log: Hidden the existance of CLI SAPI by: - removing the NEWS entry - removing cli from make install chain - marking it EXPERIMENTAL - reverting installed name of cgi from php-cgi to php Marged max_execution_time override from head. # I really hope that people who found cli to be "inconsistent" and # "unstable" will find time to help rectify those problems. Index: php4/NEWS diff -u php4/NEWS:1.885.2.11 php4/NEWS:1.885.2.12 --- php4/NEWS:1.885.2.11 Sat Mar 23 13:40:59 2002 +++ php4/NEWS Mon Mar 25 12:02:27 2002 @@ -4,12 +4,6 @@ - ATTENTION!! register_globals defaults to 'off' now !!! - Modified the mysql extension to disable 'LOAD LOCAL' when safe mode is enabled. (Jason) -- Added CLI (command line interface) sapi which is more suitable for writing - shell scripts. Some of the differences to CGI sapi are: no HTTP headers, - plain text error messages, does not change working directory, have a new -r - option which executes a piece of PHP code directly from the commmand line, etc. - "make install" will install CLI SAPI version of php in {PREFIX}/bin/php while - CGI is renamed and installed as {PREFIX}/bin/php-cgi. (Edin) - Fixed HTTP file upload support to handle big files better. (Jani) - Major modifications to the Sockets Extension and its API (Jason): . Fixed numerous bugs. Index: php4/sapi/cgi/config.m4 diff -u php4/sapi/cgi/config.m4:1.12 php4/sapi/cgi/config.m4:1.12.2.1 --- php4/sapi/cgi/config.m4:1.12 Thu Feb 28 06:48:39 2002 +++ php4/sapi/cgi/config.m4 Mon Mar 25 12:02:28 2002 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.12 2002/02/28 11:48:39 edink Exp $ +dnl $Id: config.m4,v 1.12.2.1 2002/03/25 17:02:28 edink Exp $ dnl AC_DEFUN(PHP_TEST_WRITE_STDOUT,[ @@ -64,7 +64,7 @@ fi if test "$PHP_SAPI" = "cgi" ; then - INSTALL_IT="\$(INSTALL) -m 0755 $SAPI_PROGRAM \$(INSTALL_ROOT)\$(bindir)/php-cgi" + INSTALL_IT="\$(INSTALL) -m 0755 $SAPI_PROGRAM \$(INSTALL_ROOT)\$(bindir)/php" fi AC_MSG_CHECKING(for fhttpd module support) Index: php4/sapi/cli/README diff -u php4/sapi/cli/README:1.1 php4/sapi/cli/README:1.1.2.1 --- php4/sapi/cli/README:1.1 Thu Feb 14 11:44:13 2002 +++ php4/sapi/cli/README Mon Mar 25 12:02:30 2002 @@ -13,3 +13,6 @@ * Plain text error message * $argc and $argv registered irrespective of register_globals * implicit_flush always on +* -r option which allows execution of PHP code directly from + the command line (e.g. php -r 'echo md5("test");' ) +* max_execution_time is set to unlimited, overriding php.ini setting. Index: php4/sapi/cli/config.m4 diff -u php4/sapi/cli/config.m4:1.3 php4/sapi/cli/config.m4:1.3.2.1 --- php4/sapi/cli/config.m4:1.3 Thu Jan 24 12:55:13 2002 +++ php4/sapi/cli/config.m4 Mon Mar 25 12:02:30 2002 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.3 2002/01/24 17:55:13 edink Exp $ +dnl $Id: config.m4,v 1.3.2.1 2002/03/25 17:02:30 edink Exp $ dnl AC_MSG_CHECKING(for CLI build) @@ -16,9 +16,7 @@ [PHP_SAPI_CLI=yes] ) -if test "$PHP_SAPI_CLI" != "no"; then - INSTALL_IT="$INSTALL_IT; \$(INSTALL) -m 0755 sapi/cli/php \$(INSTALL_ROOT)\$(bindir)/php" -else +if test "$PHP_SAPI_CLI" = "no"; then PHP_DISABLE_CLI fi Index: php4/sapi/cli/php_cli.c diff -u php4/sapi/cli/php_cli.c:1.7.2.1 php4/sapi/cli/php_cli.c:1.7.2.2 --- php4/sapi/cli/php_cli.c:1.7.2.1 Wed Mar 13 14:49:35 2002 +++ php4/sapi/cli/php_cli.c Mon Mar 25 12:02:30 2002 @@ -396,6 +396,7 @@ SG(options) |= SAPI_OPTION_NO_CHDIR; zend_alter_ini_entry("html_errors", 12, "0", 1, PHP_INI_SYSTEM, PHP_INI_STAGE_ACTIVATE); zend_alter_ini_entry("implicit_flush", 15, "1", 1, PHP_INI_SYSTEM, PHP_INI_STAGE_ACTIVATE); + zend_alter_ini_entry("max_execution_time", 19, "0", 1, PHP_INI_SYSTEM, PHP_INI_STAGE_ACTIVATE); while ((c = ap_php_getopt(argc, argv, OPTSTRING)) != -1) { switch (c) {