Merge "Remove redundant CURLOPT_SAFE_UPLOAD line from MultiHttpClient"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 5 Sep 2019 16:22:06 +0000 (16:22 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Thu, 5 Sep 2019 16:22:06 +0000 (16:22 +0000)
includes/libs/http/MultiHttpClient.php

index 2e3aa70..0f11059 100644 (file)
@@ -358,10 +358,6 @@ class MultiHttpClient implements LoggerAwareInterface {
                        );
                } elseif ( $req['method'] === 'POST' ) {
                        curl_setopt( $ch, CURLOPT_POST, 1 );
-                       // Don't interpret POST parameters starting with '@' as file uploads, because this
-                       // makes it impossible to POST plain values starting with '@' (and causes security
-                       // issues potentially exposing the contents of local files).
-                       curl_setopt( $ch, CURLOPT_SAFE_UPLOAD, true );
                        curl_setopt( $ch, CURLOPT_POSTFIELDS, $req['body'] );
                } else {
                        if ( is_resource( $req['body'] ) || $req['body'] !== '' ) {