jani Thu, 11 Mar 2010 11:23:38 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=296065
Log: - Fix conflict Changed paths: U php/php-src/branches/PHP_5_3/main/main.c Modified: php/php-src/branches/PHP_5_3/main/main.c =================================================================== --- php/php-src/branches/PHP_5_3/main/main.c 2010-03-11 10:32:17 UTC (rev 296064) +++ php/php-src/branches/PHP_5_3/main/main.c 2010-03-11 11:23:38 UTC (rev 296065) @@ -1088,19 +1088,7 @@ 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 {
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php