diff options
| author | Stanislav Malyshev <stas@php.net> | 2013-07-14 17:01:43 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2013-07-14 17:01:43 -0700 |
| commit | 9cc9d32e6a1236cd55ab3bb1bf660932d3721f18 (patch) | |
| tree | 5cc85398f10944b90cb9ad57e2e7d958f91ee3df /sapi/cli/php_cli.c | |
| parent | 168a5bb6dfe7de976e2372d3c5d8773f3bf03727 (diff) | |
| parent | f4b9b20b354c059d7246a250953e73365558f5e6 (diff) | |
| download | php-git-9cc9d32e6a1236cd55ab3bb1bf660932d3721f18.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
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.c | 3 |
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); } /* }}} */ |