com php-src: Merge branch 'PHP-5.4' into PHP-5.5: sapi/cli/php _cli.c
| From: | Stanislav Malyshev | Date: | Mon, 15 Jul 2013 00:01:43 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.4' into PHP-5.5: sapi/cli/php _cli.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-72642@lists.php.net to get a copy of this message | ||
Commit: 9cc9d32e6a1236cd55ab3bb1bf660932d3721f18
Author: Stanislav Malyshev <stas@php.net> Sun, 14 Jul 2013 17:01:43 -0700
Parents: 168a5bb6dfe7de976e2372d3c5d8773f3bf03727 f4b9b20b354c059d7246a250953e73365558f5e6
Branches: PHP-5.5 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=9cc9d32e6a1236cd55ab3bb1bf660932d3721f18
Log:
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
Bugs:
https://bugs.php.net/65219
Changed paths:
MM sapi/cli/php_cli.c
Diff: