r88492 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r88491‎ | r88492 | r88493 >
Date:21:42, 20 May 2011
Author:platonides
Status:ok (Comments)
Tags:
Comment:
Do not block the installer (through an unhandled exception) when we can't connect to ourself.
Modified paths:
  • /trunk/phase3/includes/installer/Installer.php (modified) (history)

Diff [purge]

Index: trunk/phase3/includes/installer/Installer.php
@@ -1150,7 +1150,13 @@
11511151 break;
11521152 }
11531153
1154 - $text = Http::get( $url . $file, array( 'timeout' => 3 ) );
 1154+ try {
 1155+ $text = Http::get( $url . $file, array( 'timeout' => 3 ) );
 1156+ }
 1157+ catch( MWException $e ) {
 1158+ // Http::get throws with allow_url_fopen = false and no curl extension.
 1159+ $text = null;
 1160+ }
11551161 unlink( $dir . $file );
11561162
11571163 if ( $text == 'exec' ) {

Sign-offs

UserFlagDate
Hasharinspected09:15, 6 June 2011

Follow-up revisions

RevisionCommit summaryAuthorDate
r896771.17: MFT r88492, r88870, r88871, r89003, r89108, r89114, r89115, r89129, r89...catrope19:14, 7 June 2011
r90258MFT r87586, r87840, r88085, r88118, r88124, r88492, r88498tstarling04:46, 17 June 2011

Comments

#Comment by Platonides (talk | contribs)   21:46, 20 May 2011

Since r65085.

Status & tagging log