summaryrefslogtreecommitdiff
path: root/sapi/cli/php_cli.c
diff options
context:
space:
mode:
authorStanislav Malyshev <stas@php.net>2013-07-14 17:07:33 -0700
committerStanislav Malyshev <stas@php.net>2013-07-14 17:07:33 -0700
commit50f15bb9219422a0a7e4d86cc03e5d10ed330d85 (patch)
tree86406164e208b1329225db2cd9560ecf0b4362b7 /sapi/cli/php_cli.c
parent14b67ed6da932de92dc4e3a520a7a2cd8981dbe8 (diff)
parent07ab23655a993fa8810def7ac9a5097058e1770f (diff)
downloadphp-git-50f15bb9219422a0a7e4d86cc03e5d10ed330d85.tar.gz
Merge branch 'PHP-5.5'
* PHP-5.5: add news for bug #65219 Add built-in web server to invocation list Terminology: change embedded web server to built-in web server to align with cli usage Align -B and -E parameter names with cli usage (begin_code and end_code) Fix Bug #65219 DBSETLDBNAME should be called before login to set DBNAME in login record
Diffstat (limited to 'sapi/cli/php_cli.c')
-rw-r--r--sapi/cli/php_cli.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/sapi/cli/php_cli.c b/sapi/cli/php_cli.c
index 729052334d..9f3fc4b5b7 100644
--- a/sapi/cli/php_cli.c
+++ b/sapi/cli/php_cli.c
@@ -503,6 +503,7 @@ static void php_cli_usage(char *argv0)
" %s [options] -r <code> [--] [args...]\n"
" %s [options] [-B <begin_code>] -R <code> [-E <end_code>] [--] [args...]\n"
" %s [options] [-B <begin_code>] -F <file> [-E <end_code>] [--] [args...]\n"
+ " %s [options] -S <addr>:<port> [-t docroot]\n"
" %s [options] -- [args...]\n"
" %s [options] -a\n"
"\n"
@@ -544,7 +545,7 @@ static void php_cli_usage(char *argv0)
" --rz <name> Show information about Zend extension <name>.\n"
" --ri <name> Show configuration for extension <name>.\n"
"\n"
- , prog, prog, prog, prog, prog, prog);
+ , prog, prog, prog, prog, prog, prog, prog);
}
/* }}} */