From: Stanislav Malyshev <stas@php.net>
Date: Mon, 15 Jul 2013 00:01:43 +0000 (-0700)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.1~27
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9cc9d32e6a1236cd55ab3bb1bf660932d3721f18;p=php

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
---

9cc9d32e6a1236cd55ab3bb1bf660932d3721f18