Use the new state functions

@- If header information is sent after output has already been sent, the warning
@  message will now state the filename and line number at which the first output
@  was made (Zeev)

1 files changed, 9 insertions, 1 deletions

diff --git a/main/SAPI.c b/main/SAPI.c
index 30d0db76b1..2da12e5b83 100644
--- a/main/SAPI.c
+++ b/main/SAPI.c
@@ -229,7 +229,15 @@ SAPI_API int sapi_add_header(char *header_line, uint header_line_len)
 	SLS_FETCH();
 
 	if (SG(headers_sent)) {
-		sapi_module.sapi_error(E_WARNING, "Cannot add header information - headers already sent");
+		char *output_start_filename = php_get_output_start_filename();
+		int output_start_lineno = php_get_output_start_lineno();
+
+		if (output_start_filename) {
+			sapi_module.sapi_error(E_WARNING, "Cannot add header information - headers already sent by (output started at %s:%d)",
+				output_start_filename, output_start_lineno);
+		} else {
+			sapi_module.sapi_error(E_WARNING, "Cannot add header information - headers already sent");
+		}
 		efree(header_line);
 		return FAILURE;
 	}