Implemented -n switch to skip parsing ini at startup as suggested by Wez.

#The switch 'n' was planned to be used for beautifying....delete n to make
#clear these functions do not have a switch yet.

2 files changed, 28 insertions, 3 deletions

diff --git a/sapi/cgi/cgi_main.c b/sapi/cgi/cgi_main.c
index bd8e46bddf..068205a9c4 100644
--- a/sapi/cgi/cgi_main.c
+++ b/sapi/cgi/cgi_main.c
@@ -406,6 +406,7 @@ static void php_cgi_usage(char *argv0)
 #endif
 			   "  -C               Do not chdir to the script's directory\n"
 			   "  -c <path>|<file> Look for php.ini file in this directory\n"
+			   "  -n               No php.ini file will be used\n"
 			   "  -d foo[=bar]     Define INI entry foo with value 'bar'\n"
 			   "  -e               Generate extended information for debugger/profiler\n"
 			   "  -f <file>        Parse <file>.  Implies `-q'\n"
@@ -617,6 +618,9 @@ int main(int argc, char *argv[])
 				case 'c':
 					cgi_sapi_module.php_ini_path_override = strdup(ap_php_optarg);
 					break;
+				case 'n':
+					cgi_sapi_module.php_ini_ignore = 1;
+					break;
 			}
 
 		}
@@ -884,6 +888,17 @@ consult the installation file that came with this distribution, or visit \n\
 				free(SG(request_info).argv0);
 				SG(request_info).argv0 = NULL;
 			}
+
+			if (cgi_sapi_module.php_ini_path_override && cgi_sapi_module.php_ini_ignore) {
+				no_headers = 1;  
+				php_output_startup();
+				php_output_activate(TSRMLS_C);
+				SG(headers_sent) = 1;
+				php_printf("You cannot use both -n and -c switch. Use -h for help.\n");
+				php_end_ob_buffers(1 TSRMLS_CC);
+				exit(1);
+			}
+		
 			while ((c = ap_php_getopt(argc, argv, OPTSTRING)) != -1) {
 				switch (c) {
 					
@@ -960,7 +975,7 @@ consult the installation file that came with this distribution, or visit \n\
 					break;
 
 #if 0 /* not yet operational, see also below ... */
-  				case 'n': /* generate indented source mode*/ 
+  				case '': /* generate indented source mode*/ 
 						behavior=PHP_MODE_INDENT;
 						break;
 #endif
diff --git a/sapi/cli/php_cli.c b/sapi/cli/php_cli.c
index c986ee3dc7..a34ca225dc 100644
--- a/sapi/cli/php_cli.c
+++ b/sapi/cli/php_cli.c
@@ -264,6 +264,7 @@ static void php_cli_usage(char *argv0)
 	            "       %s [options] [-- args...]\n"
 				"  -a               Run interactively\n"
 				"  -c <path>|<file> Look for php.ini file in this directory\n"
+				"  -n               No php.ini file will be used\n"
 				"  -d foo[=bar]     Define INI entry foo with value 'bar'\n"
 				"  -e               Generate extended information for debugger/profiler\n"
 				"  -f <file>        Parse <file>.\n"
@@ -423,8 +424,10 @@ int main(int argc, char *argv[])
 		case 'c':
 			cli_sapi_module.php_ini_path_override = strdup(ap_php_optarg);
 			break;
+		case 'n':
+			cli_sapi_module.php_ini_ignore = 1;
+			break;
 		}
-
 	}
 	ap_php_optind = orig_optind;
 	ap_php_optarg = orig_optarg;
@@ -479,6 +482,13 @@ int main(int argc, char *argv[])
 
 		zend_uv.html_errors = 0; /* tell the engine we're in non-html mode */
 
+		if (cli_sapi_module.php_ini_path_override && cli_sapi_module.php_ini_ignore) {
+			SG(headers_sent) = 1;
+			SG(request_info).no_headers = 1;
+			PUTS("You cannot use both -n and -c switch. Use -h for help.\n");
+			exit(1);
+		}
+	
 		while ((c = ap_php_getopt(argc, argv, OPTSTRING)) != -1) {
 			switch (c) {
 
@@ -561,7 +571,7 @@ int main(int argc, char *argv[])
 			break;
 
 #if 0 /* not yet operational, see also below ... */
-			case 'n': /* generate indented source mode*/
+			case '': /* generate indented source mode*/
 				if (behavior == PHP_MODE_CLI_DIRECT) {
 					param_error = "Source indenting only works for files.\n";
 					break;