From 9d2ebacba4fcdf3ec4a8475b4947e7ba03cca727 Mon Sep 17 00:00:00 2001
From: Timo Tijhof <krinklemail@gmail.com>
Date: Sat, 13 Jul 2019 02:08:30 +0100
Subject: [PATCH] Setup: Remove $wgDebugPrintHttpHeaders option

This is always true and has been for years. I don't know of any
reason why someone would want to disable it, as the information
is only ever logged when the debug log is enabled, at which point
why not?

Bug: T189966
Change-Id: I17b9f564a61a0f76f2fc8c0006dc13997857829a
---
 RELEASE-NOTES-1.34           |  3 +++
 includes/DefaultSettings.php |  5 -----
 includes/Setup.php           | 10 +++-------
 3 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/RELEASE-NOTES-1.34 b/RELEASE-NOTES-1.34
index be24b50c62..9794c32292 100644
--- a/RELEASE-NOTES-1.34
+++ b/RELEASE-NOTES-1.34
@@ -58,6 +58,9 @@ For notes on 1.33.x and older releases, see HISTORY.
 * $wgWikiDiff2MovedParagraphDetectionCutoff — If you still want a custom change
   size threshold, please specify in php.ini, using the configuration variable
   wikidiff2.moved_paragraph_detection_cutoff.
+* $wgDebugPrintHttpHeaders - The default of including HTTP headers in the
+  debug log channel is no longer configurable. The debug log itself remains
+  configurable via $wgDebugLogFile.
 
 === New user-facing features in 1.34 ===
 * Special:Mute has been added as a quick way for users to block unwanted emails
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 0886f3860a..e75d9c2c3e 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -6330,11 +6330,6 @@ $wgShowDebug = false;
  */
 $wgDebugTimestamps = false;
 
-/**
- * Print HTTP headers for every request in the debug information.
- */
-$wgDebugPrintHttpHeaders = true;
-
 /**
  * Show the contents of $wgHooks in Special:Version
  */
diff --git a/includes/Setup.php b/includes/Setup.php
index df53c9976a..d6f390a1aa 100644
--- a/includes/Setup.php
+++ b/includes/Setup.php
@@ -820,13 +820,9 @@ if ( $wgCommandLineMode ) {
 	}
 } else {
 	$debug = "\n\nStart request {$wgRequest->getMethod()} {$wgRequest->getRequestURL()}\n";
-
-	if ( $wgDebugPrintHttpHeaders ) {
-		$debug .= "HTTP HEADERS:\n";
-
-		foreach ( $wgRequest->getAllHeaders() as $name => $value ) {
-			$debug .= "$name: $value\n";
-		}
+	$debug .= "HTTP HEADERS:\n";
+	foreach ( $wgRequest->getAllHeaders() as $name => $value ) {
+		$debug .= "$name: $value\n";
 	}
 	wfDebug( $debug );
 }
-- 
2.20.1