Merge "Fix various mistakes in PHPDoc comments"

[lhc/web/wiklou.git] / includes / specials / SpecialRunJobs.php

diff --git a/includes/specials/SpecialRunJobs.php b/includes/specials/SpecialRunJobs.php
index 8cf9367..4217553 100644 (file)
--- a/includes/specials/SpecialRunJobs.php
+++ b/includes/specials/SpecialRunJobs.php
@@ -38,14 +38,14 @@ class SpecialRunJobs extends UnlistedSpecialPage {
                $this->getOutput()->disable();
 
                if ( wfReadOnly() ) {
-                       header( "HTTP/1.0 423 Locked" );
+                       // HTTP 423 Locked
+                       HttpStatus::header( 423 );
                        print 'Wiki is in read-only mode';
 
                        return;
                } elseif ( !$this->getRequest()->wasPosted() ) {
-                       header( "HTTP/1.0 400 Bad Request" );
+                       HttpStatus::header( 400 );
                        print 'Request must be POSTed';
-
                        return;
                }
 
@@ -55,9 +55,8 @@ class SpecialRunJobs extends UnlistedSpecialPage {
                $params = array_intersect_key( $this->getRequest()->getValues(), $required + $optional );
                $missing = array_diff_key( $required, $params );
                if ( count( $missing ) ) {
-                       header( "HTTP/1.0 400 Bad Request" );
+                       HttpStatus::header( 400 );
                        print 'Missing parameters: ' . implode( ', ', array_keys( $missing ) );
-
                        return;
                }
 
@@ -69,9 +68,8 @@ class SpecialRunJobs extends UnlistedSpecialPage {
                $verified = is_string( $providedSignature )
                        && hash_equals( $correctSignature, $providedSignature );
                if ( !$verified || $params['sigexpiry'] < time() ) {
-                       header( "HTTP/1.0 400 Bad Request" );
+                       HttpStatus::header( 400 );
                        print 'Invalid or stale signature provided';
-
                        return;
                }
 
@@ -83,10 +81,18 @@ class SpecialRunJobs extends UnlistedSpecialPage {
                        // but it needs to know when it is safe to disconnect. Until this
                        // reaches ignore_user_abort(), it is not safe as the jobs won't run.
                        ignore_user_abort( true ); // jobs may take a bit of time
-                       header( "HTTP/1.0 202 Accepted" );
+                       // HTTP 202 Accepted
+                       HttpStatus::header( 202 );
                        ob_flush();
                        flush();
                        // Once the client receives this response, it can disconnect
+                       set_error_handler( function ( $errno, $errstr ) {
+                               if ( strpos( $errstr, 'Cannot modify header information' ) !== false ) {
+                                       return true; // bug T115413
+                               }
+                               // Delegate unhandled errors to the default handlers
+                               return false;
+                       } );
                }
 
                // Do all of the specified tasks...