]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 168a5bb f4b9b20)
Merge branch 'PHP-5.4' into PHP-5.5
authorStanislav Malyshev <stas@php.net>
Mon, 15 Jul 2013 00:01:43 +0000 (17:01 -0700)
committerStanislav Malyshev <stas@php.net>
Mon, 15 Jul 2013 00:01:43 +0000 (17:01 -0700)
* 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

1  2 
sapi/cli/php_cli.c patch | diff1 | diff2 | blob | history

diff --cc sapi/cli/php_cli.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.