Parse command line ini directives passed using -d before -i, to ensure

correct settings output.

sapi/cli/php_cli.c

@@ -641,10 +641,21 @@ int main(int argc, char *argv[])
 			exit_status=1;
 			goto out_err;
 		}
-	
+
+		/* here is the place for hard coded defaults which cannot be overwritten in the ini file */
+		INI_HARDCODED("register_argc_argv", "1");
+		INI_HARDCODED("html_errors", "0");
+		INI_HARDCODED("implicit_flush", "1");
+		INI_HARDCODED("output_buffering", "0");
+		INI_HARDCODED("max_execution_time", "0");
+
 		while ((c = php_getopt(argc, argv, OPTIONS, &optarg, &optind, 0)) != -1) {
 			switch (c) {
 
+			case 'd': /* define ini entries on command line */
+				define_command_line_ini_entry(optarg);
+				break;
+
 			case 'h': /* help & quit */
 			case '?':
 				php_output_startup();
@@ -696,12 +707,6 @@ int main(int argc, char *argv[])
 
 		/* Set some CLI defaults */
 		SG(options) |= SAPI_OPTION_NO_CHDIR;
-		/* here is the place for hard coded defaults which cannot be overwritten in the ini file */
-		INI_HARDCODED("register_argc_argv", "1");
-		INI_HARDCODED("html_errors", "0");
-		INI_HARDCODED("implicit_flush", "1");
-		INI_HARDCODED("output_buffering", "0");
-		INI_HARDCODED("max_execution_time", "0");
 
 		optind = orig_optind;
 		optarg = orig_optarg;
@@ -717,9 +722,6 @@ int main(int argc, char *argv[])
 			case 'C': /* don't chdir to the script directory */
 				/* This is default so NOP */
 				break;
-			case 'd': /* define ini entries on command line */
-				define_command_line_ini_entry(optarg);
-				break;
 
 			case 'e': /* enable extended info output */
 				CG(extended_info) = 1;