From: Jani Taskinen <jani@php.net>
Date: Thu, 11 Mar 2010 11:23:38 +0000 (+0000)
Subject: - Fix conflict
X-Git-Tag: php-5.4.0alpha1~202
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b4e12967568457eea53b6195804f5e274052d06c;p=php

- Fix conflict
---

diff --git a/main/main.c b/main/main.c
index 77dbfe6b89..8227396be9 100644
--- a/main/main.c
+++ b/main/main.c
@@ -1088,19 +1088,7 @@ static void php_error_cb(int type, const char *error_filename, const uint error_
 			php_log_err(log_buffer TSRMLS_CC);
 			efree(log_buffer);
 		}
-<<<<<<< .mine
 		if (PG(display_errors) && ((module_initialized && !PG(during_request_startup)) || (PG(display_startup_errors)))) {
-=======
-
-		if (PG(display_errors)
-			&& ((module_initialized && !PG(during_request_startup))
-				|| (PG(display_startup_errors) 
-					&& (OG(php_body_write)==php_default_output_func || OG(php_body_write)==php_ub_body_write_no_header || OG(php_body_write)==php_ub_body_write)
-					)
-				)
-			) {
-
->>>>>>> .r294302
 			if (PG(xmlrpc_errors)) {
 				php_printf("<?xml version=\"1.0\"?><methodResponse><fault><value><struct><member><name>faultCode</name><value><int>%ld</int></value></member><member><name>faultString</name><value><string>%s:%s in %s on line %d</string></value></member></struct></value></fault></methodResponse>", PG(xmlrpc_error_number), error_type_str, buffer, error_filename, error_lineno);
 			} else {