From: Florian Schmidt <florian.schmidt.stargatewissen@gmail.com>
Date: Sun, 16 Apr 2017 19:26:13 +0000 (+0200)
Subject: Send 500 http status code, instead of 200, for DBConnectionErrors
X-Git-Tag: 1.31.0-rc.0~3440^2
X-Git-Url: http://git.cyclocoop.org/data/Luca_Pacioli_%28Gemaelde%29.jpeg?a=commitdiff_plain;h=2c1dc398be32fa7d07af0ee1c60a5e25720efa0e;p=lhc%2Fweb%2Fwiklou.git

Send 500 http status code, instead of 200, for DBConnectionErrors

Bug: T160875
Change-Id: I4c909457938a19358dfc4b2aec216b1a148df46c
---

diff --git a/includes/exception/MWExceptionRenderer.php b/includes/exception/MWExceptionRenderer.php
index a569bcd808..1412adb351 100644
--- a/includes/exception/MWExceptionRenderer.php
+++ b/includes/exception/MWExceptionRenderer.php
@@ -42,10 +42,10 @@ class MWExceptionRenderer {
 		} elseif ( self::isCommandLine() ) {
 			self::printError( self::getText( $e ) );
 		} elseif ( $mode === self::AS_PRETTY ) {
+			self::statusHeader( 500 );
 			if ( $e instanceof DBConnectionError ) {
 				self::reportOutageHTML( $e );
 			} else {
-				self::statusHeader( 500 );
 				self::header( "Content-Type: $wgMimeType; charset=utf-8" );
 				self::reportHTML( $e );
 			}