diff options
| author | Stanley Sufficool <ssufficool@php.net> | 2013-09-26 19:52:01 -0700 |
|---|---|---|
| committer | Stanley Sufficool <ssufficool@php.net> | 2013-09-26 19:52:01 -0700 |
| commit | 9aa904c375cd50a6e8a345f3c053e80a6617a377 (patch) | |
| tree | 2ffe61739fa2e38048edbced922ab9b414e450e4 /sapi/cli/php_cli.c | |
| parent | 67c03eac620993e0c323658ab5cd6bff4616cbfb (diff) | |
| parent | 30e0442c549bd20288ca8754daa0cdf24d98f055 (diff) | |
| download | php-git-9aa904c375cd50a6e8a345f3c053e80a6617a377.tar.gz | |
Merge branch 'PHP-5.4' of https://git.php.net/push/php-src into PHP-5.4
* 'PHP-5.4' of https://git.php.net/push/php-src: (140 commits)
Copy dba_*() keys before converting to string.
Fix the broken sh syntax in ext/imap/config.m4.
Revert "EmptyIterator now implements Countable; fixes bug 60577"
RFC 6598 reserved ip range starts at 100.64.0.0
fix a very rare case of use of uninitialized value combined with a memleak
NEWS for added reserved ip addresses according to RFC 6598
Add RFC 6598 IPs to reserved addresses
NEWS for #60577
NEWS for bug #64441
Fix bug #64441 (FILTER_VALIDATE_URL rejects fully qualified domain names)
EmptyIterator now implements Countable; fixes bug 60577
News for bugfix #64157
Bug 64157 Changed error message to make sense
Tinker with the wording of the short_open_tag description.
Handle CLI server request headers case insensitively.
5.4.21 now
Typo....
Add a XFAIL test for #64896
Fixed Bug #65564 stack-buffer-overflow in DateTimeZone stuff caught by AddressSanitizer
Fixed bug #60598 (cli/apache sapi segfault on objects manipulation)
...
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 c01f3705b5..aa300ce88d 100644 --- a/sapi/cli/php_cli.c +++ b/sapi/cli/php_cli.c @@ -498,6 +498,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" @@ -539,7 +540,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); } /* }}} */ |