From e25c45e2e3c8e6465fcd7edefd24156bd7b11a11 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Gerg=C5=91=20Tisza?= <tgr.huwiki@gmail.com>
Date: Thu, 6 Jun 2019 16:21:21 +0200
Subject: [PATCH] Log headers sent errors more usefully in thumb.php

Bug: T225197
Change-Id: Ifcb02b3d5794061f27c005b32164ac014f926357
---
 thumb.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/thumb.php b/thumb.php
index 43dd5d472f..cf9bd2cdfe 100644
--- a/thumb.php
+++ b/thumb.php
@@ -409,6 +409,8 @@ function wfProxyThumbnailRequest( $img, $thumbName ) {
 	// Send request to proxied service
 	$status = $req->execute();
 
+	MediaWiki\HeaderCallback::warnIfHeadersSent();
+
 	// Simply serve the response from the proxied service as-is
 	header( 'HTTP/1.1 ' . $req->getStatus() );
 
@@ -634,6 +636,8 @@ function wfThumbErrorText( $status, $msgText ) {
 function wfThumbError( $status, $msgHtml, $msgText = null, $context = [] ) {
 	global $wgShowHostnames;
 
+	MediaWiki\HeaderCallback::warnIfHeadersSent();
+
 	header( 'Cache-Control: no-cache' );
 	header( 'Content-Type: text/html; charset=utf-8' );
 	if ( $status == 400 || $status == 404 || $status == 429 ) {
-- 
2.20.1