]> granicus.if.org Git - php/commit
projects / php / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commit9cc9d32e6a1236cd55ab3bb1bf660932d3721f18
tree5cc85398f10944b90cb9ad57e2e7d958f91ee3dftree | snapshot
parent168a5bb6dfe7de976e2372d3c5d8773f3bf03727commit | diff
parentf4b9b20b354c059d7246a250953e73365558f5e6commit | diff
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
sapi/cli/php_cli.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.