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

3 files changed, 19 insertions, 18 deletions

diff --git a/ext/pdo_dblib/dblib_driver.c b/ext/pdo_dblib/dblib_driver.c
index c54cd73d84..ff42514721 100644
--- a/ext/pdo_dblib/dblib_driver.c
+++ b/ext/pdo_dblib/dblib_driver.c
@@ -350,6 +350,12 @@ static int pdo_dblib_handle_factory(pdo_dbh_t *dbh, zval *driver_options TSRMLS_
 
 	DBSETLAPP(H->login, vars[1].optval);
 
+#ifdef DBSETLDBNAME
+	if (vars[3].optval) {
+		DBSETLDBNAME(H->login, vars[3].optval);
+	}
+#endif
+
 	H->link = dbopen(H->login, vars[2].optval);
 
 	if (!H->link) {
@@ -365,12 +371,6 @@ static int pdo_dblib_handle_factory(pdo_dbh_t *dbh, zval *driver_options TSRMLS_
 	/* allow double quoted indentifiers */
 	DBSETOPT(H->link, DBQUOTEDIDENT, "1");
 
-#ifdef DBSETLDBNAME
-	if (vars[3].optval) {
-		DBSETLDBNAME(H->login, vars[3].optval);
-	}
-#endif
-
 	ret = 1;
 	dbh->max_escaped_char_length = 2;
 	dbh->alloc_own_columns = 1;
diff --git a/sapi/cli/php.1.in b/sapi/cli/php.1.in
index 749baa8a6b..c113030d14 100644
--- a/sapi/cli/php.1.in
+++ b/sapi/cli/php.1.in
@@ -20,21 +20,21 @@ php-cgi \- PHP Common Gateway Interface 'CGI' command
 .LP
 .B php
 [options] [\-B 
-.IR code ] 
+.IR begin_code ]
 .B \-R 
 .IR code
 [\-E 
-.IR code ]
+.IR end_code ]
 [[\-\-]
 .IR args.\|.\|. ]
 .LP
 .B php
 [options] [\-B 
-.IR code ]
+.IR begin_code ]
 .B \-F 
 .IR file
 [\-E 
-.IR code ] 
+.IR end_code ]
 [[\-\-]
 .IR args.\|.\|. ]
 .LP
@@ -86,7 +86,7 @@ and therefore reading from
 .B STDIN 
 explicitly changes the next input line or skips input lines.
 .LP
-PHP also contains an embedded web server for application development purpose. By using the \-S option where
+PHP also contains an built-in web server for application development purpose. By using the \-S option where
 .B addr:port
 point to a local address and port PHP will listen to HTTP requests on that address and port and serve files from the current working directory or the
 .B docroot
@@ -237,9 +237,9 @@ without using script tags
 .B \-\-process\-begin \fIcode\fP
 .TP
 .PD 1
-.B \-B \fIcode\fP
+.B \-B \fIbegin_code\fP
 Run PHP 
-.IR code
+.IR begin_code
 before processing input lines
 .TP
 .PD 0
@@ -264,9 +264,9 @@ for every input line
 .B \-\-process\-end \fIcode\fP
 .TP
 .PD 1
-.B \-E \fIcode\fP
+.B \-E \fIend_code\fP
 Run PHP 
-.IR code
+.IR end_code
 after processing all input lines
 .TP
 .PD 0
@@ -281,14 +281,14 @@ Output HTML syntax highlighted source
 .TP
 .PD 1
 .B \-S \fIaddr:port\fP
-Start embedded Webserver on the given local address and port
+Start built-in web server on the given local address and port
 .TP
 .PD 0
 .B \-\-docroot \fIdocroot\fP
 .TP
 .PD 1
 .B \-t \fIdocroot\fP
-Specify the document root to be used by the embedded web server
+Specify the document root to be used by the built-in web server
 .TP
 .PD 0
 .B \-\-version
diff --git a/sapi/cli/php_cli.c b/sapi/cli/php_cli.c
index 729052334d..9f3fc4b5b7 100644
--- a/sapi/cli/php_cli.c
+++ b/sapi/cli/php_cli.c
@@ -503,6 +503,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"
@@ -544,7 +545,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);
 }
 /* }}} */