From 20d5ed9326d17966938a8e428df0c880179c3dc7 Mon Sep 17 00:00:00 2001 From: "Mark A. Hershberger" Date: Sat, 4 Jun 2011 02:59:10 +0000 Subject: [PATCH] =?utf8?q?follow=20up=20r89278=20=E2=80=94=20remove=20FTP?= =?utf8?q?=20support.?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- includes/HttpFunctions.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/includes/HttpFunctions.php b/includes/HttpFunctions.php index 75dbbdf37c..bac062fd5c 100644 --- a/includes/HttpFunctions.php +++ b/includes/HttpFunctions.php @@ -126,14 +126,13 @@ class Http { * and php support. * * @fixme this is wildly inaccurate and fails to actually check most stuff - * @fixme do we actually intend to have FTP support here? Does it work consistently? * * @param $uri Mixed: URI to check for validity * @returns Boolean */ public static function isValidURI( $uri ) { return preg_match( - '/^(f|ht)tps?:\/\/[^\/\s]\S*$/D', + '/^https?:\/\/[^\/\s]\S*$/D', $uri ); } @@ -717,7 +716,6 @@ class PhpHttpRequest extends MWHttpRequest { } if ( $this->parsedUrl['scheme'] != 'http' && - $this->parsedUrl['scheme'] != 'ftp' && $this->parsedUrl['scheme'] != 'https' ) { $this->status->fatal( 'http-invalid-scheme', $this->parsedUrl['scheme'] ); } -- 2.20.1