- Reverted r296062 and r296065

4 files changed, 70 insertions, 66 deletions

diff --git a/sapi/apache/libpre.c b/sapi/apache/libpre.c
index ec2b57b174..2b89307e5d 100644
--- a/sapi/apache/libpre.c
+++ b/sapi/apache/libpre.c
@@ -33,7 +33,7 @@
 
 
 #ifdef __GNUC__
-#include <string.h> /* memset */
+#include <string.h>        /* memset */
 extern char _edata, _end ; /* end of DATA (start of BSS), end of BSS */
 #endif
 
@@ -41,15 +41,15 @@ int _lib_start()
 {
 /*	printf("Inside _lib_start\n");*/
 #ifdef __GNUC__
-	memset (&_edata, 0, &_end - &_edata);
+    memset (&_edata, 0, &_end - &_edata);
 #endif
-	return 0;
+    return 0;
 }
 
 int _lib_stop()
 {
 /*	printf("Inside _lib_stop\n");*/
-	return 0;
+    return 0;
 }
 
 #endif	/* NETWARE */
diff --git a/sapi/apache/mod_php5.c b/sapi/apache/mod_php5.c
index 815fd48f6f..9711e3fa70 100644
--- a/sapi/apache/mod_php5.c
+++ b/sapi/apache/mod_php5.c
@@ -95,7 +95,7 @@ static void php_save_umask(void)
 static int sapi_apache_ub_write(const char *str, uint str_length TSRMLS_DC)
 {
 	int ret=0;
-
+		
 	if (SG(server_context)) {
 		ret = rwrite(str, str_length, (request_rec *) SG(server_context));
 	}
@@ -137,7 +137,7 @@ static int sapi_apache_read_post(char *buffer, uint count_bytes TSRMLS_DC)
 	if (!SG(read_post_bytes) && !ap_should_client_block(r)) {
 		return total_read_bytes;
 	}
-
+ 
 	handler = signal(SIGPIPE, SIG_IGN);
 	while (total_read_bytes<count_bytes) {
 		hard_timeout("Read POST information", r); /* start timeout timer */
@@ -148,7 +148,7 @@ static int sapi_apache_read_post(char *buffer, uint count_bytes TSRMLS_DC)
 		}
 		total_read_bytes += read_bytes;
 	}
-	signal(SIGPIPE, handler);
+	signal(SIGPIPE, handler);	
 	return total_read_bytes;
 }
 /* }}} */
@@ -332,15 +332,15 @@ static void php_apache_request_shutdown(void *dummy)
 {
 	TSRMLS_FETCH();
 
-	php_output_set_status(PHP_OUTPUT_DISABLED TSRMLS_CC);
+	php_output_set_status(0 TSRMLS_CC);
 	if (AP(in_request)) {
 		AP(in_request) = 0;
 		php_request_shutdown(dummy);
 	}
-	SG(server_context) = NULL;
-	/*
-	* The server context (request) is NOT invalid by the time
-	* run_cleanups() is called
+	SG(server_context) = NULL; 
+	/* 
+	* The server context (request) is NOT invalid by the time 
+	* run_cleanups() is called 
 	*/
 }
 /* }}} */
@@ -349,7 +349,7 @@ static void php_apache_request_shutdown(void *dummy)
  */
 static int php_apache_sapi_activate(TSRMLS_D)
 {
-	request_rec *r = (request_rec *) SG(server_context);
+	request_rec *r = (request_rec *) SG(server_context); 
 
 	/*
 	 * For the Apache module version, this bit of code registers a cleanup
@@ -357,7 +357,7 @@ static int php_apache_sapi_activate(TSRMLS_D)
 	 * We need this because at any point in our code we can be interrupted
 	 * and that may happen before we have had time to free our memory.
 	 * The php_request_shutdown function needs to free all outstanding allocated
-	 * memory.
+	 * memory.  
 	 */
 	block_alarms();
 	register_cleanup(r->pool, NULL, php_apache_request_shutdown, php_request_shutdown_for_exec);
@@ -401,7 +401,7 @@ static int sapi_apache_get_fd(int *nfd TSRMLS_DC)
 	int fd;
 
 	fd = r->connection->client->fd;
-
+	
 	if (fd >= 0) {
 		if (nfd) *nfd = fd;
 		return SUCCESS;
@@ -416,9 +416,9 @@ static int sapi_apache_get_fd(int *nfd TSRMLS_DC)
 static int sapi_apache_force_http_10(TSRMLS_D)
 {
 	request_rec *r = SG(server_context);
-
+	
 	r->proto_num = HTTP_VERSION(1,0);
-
+	
 	return SUCCESS;
 }
 /* }}} */
@@ -464,7 +464,7 @@ static void sapi_apache_child_terminate(TSRMLS_D)
 static sapi_module_struct apache_sapi_module = {
 	"apache",						/* name */
 	"Apache",						/* pretty name */
-
+									
 	php_apache_startup,				/* startup */
 	php_module_shutdown_wrapper,	/* shutdown */
 
@@ -579,8 +579,8 @@ static int php_apache_alter_ini_entries(php_per_dir_entry *per_dir_entry TSRMLS_
  */
 static char *php_apache_get_default_mimetype(request_rec *r TSRMLS_DC)
 {
+	
 	char *mimetype;
-
 	if (SG(default_mimetype) || SG(default_charset)) {
 		/* Assume output will be of the default MIME type.  Individual
 		   scripts may change this later. */
@@ -628,7 +628,7 @@ static int send_php(request_rec *r, int display_source_mode, char *filename)
 		if (per_dir_conf) {
 			zend_hash_apply((HashTable *) per_dir_conf, (apply_func_t) php_apache_alter_ini_entries TSRMLS_CC);
 		}
-
+		
 		/* If PHP parser engine has been turned off with an "engine off"
 		 * directive, then decline to handle this request
 		 */
@@ -696,8 +696,9 @@ static int send_parsed_php(request_rec * r)
 {
 	int result = send_php(r, 0, NULL);
 	TSRMLS_FETCH();
-
-	ap_table_setn(r->notes, "mod_php_memory_usage", ap_psprintf(r->pool, "%lu", zend_memory_peak_usage(1 TSRMLS_CC)));
+ 
+	ap_table_setn(r->notes, "mod_php_memory_usage",
+		ap_psprintf(r->pool, "%lu", zend_memory_peak_usage(1 TSRMLS_CC)));
 
 	return result;
 }
@@ -859,7 +860,7 @@ static CONST_PREFIX char *php_apache_flag_handler_ex(cmd_parms *cmd, HashTable *
 		bool_val[0] = '0';
 	}
 	bool_val[1] = 0;
-
+	
 	return php_apache_value_handler_ex(cmd, conf, arg1, bool_val, mode);
 }
 /* }}} */
@@ -925,7 +926,7 @@ static void apache_php_module_shutdown_wrapper(void)
 
 #if MODULE_MAGIC_NUMBER >= 19970728
 	/* This function is only called on server exit if the apache API
-	 * child_exit handler exists, so shutdown globally
+	 * child_exit handler exists, so shutdown globally 
 	 */
 	sapi_shutdown();
 #endif
diff --git a/sapi/apache/php_apache.c b/sapi/apache/php_apache.c
index e2055ccb48..8faa6f34f0 100644
--- a/sapi/apache/php_apache.c
+++ b/sapi/apache/php_apache.c
@@ -93,6 +93,8 @@ ZEND_END_ARG_INFO()
 ZEND_BEGIN_ARG_INFO(arginfo_apache_reset_timeout, 0)
 ZEND_END_ARG_INFO()
 
+
+
 const zend_function_entry apache_functions[] = {
 	PHP_FE(virtual,									arginfo_apache_virtual)
 	PHP_FE(apache_request_headers,					arginfo_apache_request_headers)
@@ -108,6 +110,7 @@ const zend_function_entry apache_functions[] = {
 	{NULL, NULL, NULL}
 };
 
+
 PHP_INI_BEGIN()
 	STD_PHP_INI_ENTRY("xbithack",			"0",				PHP_INI_ALL,		OnUpdateLong,		xbithack, php_apache_info_struct, php_apache_info)
 	STD_PHP_INI_ENTRY("engine",				"1",				PHP_INI_ALL,		OnUpdateLong,		engine, php_apache_info_struct, php_apache_info)
@@ -115,11 +118,14 @@ PHP_INI_BEGIN()
 	STD_PHP_INI_ENTRY("child_terminate",	"0",				PHP_INI_ALL,		OnUpdateLong,		terminate_child, php_apache_info_struct, php_apache_info)
 PHP_INI_END()
 
+
+
 static void php_apache_globals_ctor(php_apache_info_struct *apache_globals TSRMLS_DC)
 {
 	apache_globals->in_request = 0;
 }
 
+
 static PHP_MINIT_FUNCTION(apache)
 {
 #ifdef ZTS
@@ -131,6 +137,7 @@ static PHP_MINIT_FUNCTION(apache)
 	return SUCCESS;
 }
 
+
 static PHP_MSHUTDOWN_FUNCTION(apache)
 {
 	UNREGISTER_INI_ENTRIES();
@@ -139,13 +146,13 @@ static PHP_MSHUTDOWN_FUNCTION(apache)
 
 zend_module_entry apache_module_entry = {
 	STANDARD_MODULE_HEADER,
-	"apache",
-	apache_functions,
-	PHP_MINIT(apache),
-	PHP_MSHUTDOWN(apache),
-	NULL,
-	NULL,
-	PHP_MINFO(apache),
+	"apache", 
+	apache_functions, 
+	PHP_MINIT(apache), 
+	PHP_MSHUTDOWN(apache), 
+	NULL, 
+	NULL, 
+	PHP_MINFO(apache), 
 	NO_VERSION_YET,
 	STANDARD_MODULE_PROPERTIES
 };
@@ -171,6 +178,7 @@ PHP_MINFO_FUNCTION(apache)
 
 	serv = ((request_rec *) SG(server_context))->server;
 
+
 	php_info_print_table_start();
 
 #ifdef PHP_WIN32
@@ -188,7 +196,7 @@ PHP_MINFO_FUNCTION(apache)
 
 	if (apv && *apv) {
 		php_info_print_table_row(2, "Apache Version", apv);
-	}
+	} 
 
 #ifdef APACHE_RELEASE
 	snprintf(output_buf, sizeof(output_buf), "%d", APACHE_RELEASE);
@@ -214,7 +222,7 @@ PHP_MINFO_FUNCTION(apache)
 	php_info_print_table_row(2, "Server Root", server_root);
 
 	strcpy(modulenames, "");
-	for (modp = top_module; modp; modp = modp->next) {
+	for(modp = top_module; modp; modp = modp->next) {
 		strlcpy(name, modp->name, sizeof(name));
 		if ((p = strrchr(name, '.'))) {
 			*p='\0'; /* Cut off ugly .c extensions on module names */
@@ -240,14 +248,14 @@ PHP_MINFO_FUNCTION(apache)
 		r = ((request_rec *) SG(server_context));
 		arr = table_elts(r->subprocess_env);
 		elts = (table_entry *)arr->elts;
-
+		
 		SECTION("Apache Environment");
-		php_info_print_table_start();
+		php_info_print_table_start();	
 		php_info_print_table_header(2, "Variable", "Value");
 		for (i=0; i < arr->nelts; i++) {
 			php_info_print_table_row(2, elts[i].key, elts[i].val);
 		}
-		php_info_print_table_end();
+		php_info_print_table_end();	
 	}
 
 	{
@@ -255,7 +263,7 @@ PHP_MINFO_FUNCTION(apache)
 		table_entry *env;
 		int i;
 		request_rec *r;
-
+		
 		r = ((request_rec *) SG(server_context));
 		SECTION("HTTP Headers Information");
 		php_info_print_table_start();
@@ -271,7 +279,7 @@ PHP_MINFO_FUNCTION(apache)
 		php_info_print_table_colspan_header(2, "HTTP Response Headers");
 		env_arr = table_elts(r->headers_out);
 		env = (table_entry *)env_arr->elts;
-		for (i = 0; i < env_arr->nelts; ++i) {
+		for(i = 0; i < env_arr->nelts; ++i) {
 			if (env[i].key) {
 				php_info_print_table_row(2, env[i].key, env[i].val);
 			}
@@ -345,37 +353,34 @@ PHP_FUNCTION(virtual)
 	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &filename, &filename_len) == FAILURE) {
 		return;
 	}
-
+	
 	if (!(rr = sub_req_lookup_uri (filename, ((request_rec *) SG(server_context))))) {
 		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to include '%s' - URI lookup failed", filename);
-		if (rr) {
+		if (rr)
 			destroy_sub_req (rr);
-		}
 		RETURN_FALSE;
 	}
 
 	if (rr->status != 200) {
 		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to include '%s' - error finding URI", filename);
-		if (rr) {
+		if (rr)
 			destroy_sub_req (rr);
-		}
 		RETURN_FALSE;
 	}
 
-	php_output_end_all(TSRMLS_C);
+	php_end_ob_buffers(1 TSRMLS_CC);
 	php_header(TSRMLS_C);
 
 	if (run_sub_req(rr)) {
 		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to include '%s' - request execution failed", filename);
-		if (rr) {
+		if (rr)
 			destroy_sub_req (rr);
-		}
 		RETURN_FALSE;
 	}
 
-	if (rr) {
+	if (rr)
 		destroy_sub_req (rr);
-	}
+
 	RETURN_TRUE;
 }
 /* }}} */
@@ -404,7 +409,7 @@ PHP_FUNCTION(apache_request_headers)
 		if (add_assoc_string(return_value, tenv[i].key, (tenv[i].val==NULL) ? "" : tenv[i].val, 1)==FAILURE) {
 			RETURN_FALSE;
 		}
-	}
+    }
 }
 /* }}} */
 
@@ -441,10 +446,8 @@ PHP_FUNCTION(apache_setenv)
 		return;
 	}
 
-	while (top) {
-		if (r->prev) {
-			r = r->prev;
-		}
+	while(top) {
+		if(r->prev) r = r->prev;
 		else break;
 	}
 
@@ -477,16 +480,16 @@ PHP_FUNCTION(apache_lookup_uri)
 		add_property_string(return_value,"the_request", rr->the_request, 1);
 	}
 	if (rr->status_line) {
-		add_property_string(return_value,"status_line", (char *)rr->status_line, 1);
+		add_property_string(return_value,"status_line", (char *)rr->status_line, 1);		
 	}
 	if (rr->method) {
-		add_property_string(return_value,"method", (char *)rr->method, 1);
+		add_property_string(return_value,"method", (char *)rr->method, 1);		
 	}
 	if (rr->content_type) {
 		add_property_string(return_value,"content_type", (char *)rr->content_type, 1);
 	}
 	if (rr->handler) {
-		add_property_string(return_value,"handler", (char *)rr->handler, 1);
+		add_property_string(return_value,"handler", (char *)rr->handler, 1);		
 	}
 	if (rr->uri) {
 		add_property_string(return_value,"uri", rr->uri, 1);
@@ -516,11 +519,11 @@ PHP_FUNCTION(apache_lookup_uri)
 	if (rr->unparsed_uri) {
 		add_property_string(return_value,"unparsed_uri", rr->unparsed_uri, 1);
 	}
-	if (rr->mtime) {
+	if(rr->mtime) {
 		add_property_long(return_value,"mtime", rr->mtime);
 	}
 #endif
-	if (rr->request_time) {
+	if(rr->request_time) {
 		add_property_long(return_value,"request_time", rr->request_time);
 	}
 
@@ -543,7 +546,7 @@ PHP_FUNCTION(apache_exec_uri)
 		return;
 	}
 
-	if (!(rr = ap_sub_req_lookup_uri(filename, ((request_rec *) SG(server_context))))) {
+	if(!(rr = ap_sub_req_lookup_uri(filename, ((request_rec *) SG(server_context))))) {
 		php_error_docref(NULL TSRMLS_CC, E_WARNING, "URI lookup failed", filename);
 		RETURN_FALSE;
 	}
@@ -573,16 +576,16 @@ PHP_FUNCTION(apache_get_modules)
 {
 	int n;
 	char *p;
-
+	
 	array_init(return_value);
-
+	
 	for (n = 0; ap_loaded_modules[n]; ++n) {
 		char *s = (char *) ap_loaded_modules[n]->name;
 		if ((p = strchr(s, '.'))) {
 			add_next_index_stringl(return_value, s, (p - s), 1);
 		} else {
 			add_next_index_string(return_value, s, 1);
-		}
+		}	
 	}
 }
 /* }}} */
diff --git a/sapi/apache/sapi_apache.c b/sapi/apache/sapi_apache.c
index 1d58c0b5db..895463b2e7 100644
--- a/sapi/apache/sapi_apache.c
+++ b/sapi/apache/sapi_apache.c
@@ -27,7 +27,7 @@
  */
 int apache_php_module_main(request_rec *r, int display_source_mode TSRMLS_DC)
 {
-	int retval = OK;
+	int retval = OK;	
 	zend_file_handle file_handle;
 
 	if (php_request_startup(TSRMLS_C) == FAILURE) {
@@ -35,7 +35,7 @@ int apache_php_module_main(request_rec *r, int display_source_mode TSRMLS_DC)
 	}
 	/* sending a file handle to another dll is not working
 	   so let zend open it. */
-
+	
 	if (display_source_mode) {
 		zend_syntax_highlighter_ini syntax_highlighter_ini;
 
@@ -54,11 +54,11 @@ int apache_php_module_main(request_rec *r, int display_source_mode TSRMLS_DC)
 	}
 
 	AP(in_request) = 0;
-
+	
 	zend_try {
 		php_request_shutdown(NULL);
 	} zend_end_try();
-
+	
 	return retval;
 }
 /* }}} */