Merge branch 'PHP-7.0' into PHP-7.1

bwoebi · bwoebi · commit 7e2146293bb4 · 2016-12-21T02:42:38.000+01:00
diff --git a/sapi/phpdbg/phpdbg.c b/sapi/phpdbg/phpdbg.c
@@ -1605,7 +1605,7 @@ int main(int argc, char **argv) /* {{{ */
 	quit_immediately = phpdbg_startup_run > 1;
 
 	/* set exec if present on command line */
-	if (!read_from_stdin && argc > php_optind && (strcmp(argv[php_optind-1], "--") != SUCCESS)) {
+	if (!read_from_stdin && argc > php_optind) {
 		if (!exec && strlen(argv[php_optind])) {
 			exec = strdup(argv[php_optind]);
 		}

Original file line number	Diff line number	Diff line change
`@@ -1605,7 +1605,7 @@ int main(int argc, char *argv) / {{{ */`
`1605`	`1605`	`quit_immediately = phpdbg_startup_run > 1;`
`1606`	`1606`
`1607`	`1607`	`/* set exec if present on command line */`
`1608`		`- if (!read_from_stdin && argc > php_optind && (strcmp(argv[php_optind-1], "--") != SUCCESS)) {`
	`1608`	`+ if (!read_from_stdin && argc > php_optind) {`
`1609`	`1609`	`if (!exec && strlen(argv[php_optind])) {`
`1610`	`1610`	`exec = strdup(argv[php_optind]);`
`1611`	`1611`	`}`