Merge "Correct recent schema changes for MSSQL, Oracle"

[lhc/web/wiklou.git] / includes / http / Http.php

diff --git a/includes/http/Http.php b/includes/http/Http.php
index c10b312..c0005c5 100644 (file)
--- a/includes/http/Http.php
+++ b/includes/http/Http.php
@@ -33,7 +33,7 @@ class Http {
         * @param string $method HTTP method. Usually GET/POST
         * @param string $url Full URL to act on. If protocol-relative, will be expanded to an http:// URL
         * @param array $options Options to pass to MWHttpRequest object.
-        *      Possible keys for the array:
+        *      Possible keys for the array:
         *    - timeout             Timeout length in seconds
         *    - connectTimeout      Timeout for connection, in seconds (curl only)
         *    - postData            An array of key-value pairs or a url-encoded form data
@@ -168,6 +168,7 @@ class Http {
        /**
         * Get a configured MultiHttpClient
         * @param array $options
+        * @return MultiHttpClient
         */
        public static function createMultiClient( $options = [] ) {
                global $wgHTTPConnectTimeout, $wgHTTPTimeout, $wgHTTPProxy;