Changeset 34123 for trunk/src/wp-includes/class-http.php

Timestamp:

09/14/2015 05:36:37 PM (10 years ago)

Author:

wonderboymusic

Message:

Fix the case-sensitivity of some HTTP class usage.

See #33413.

File:

• trunk/src/wp-includes/class-http.php (modified) (4 diffs)

trunk/src/wp-includes/class-http.php

@@ -305 +305 @@
          * @since 3.7.0
          *
-         * @param array  $value Array of HTTP transports to check. Default array contains
-         *                      'curl', and 'streams', in that order.
-         * @param array  $args  HTTP request arguments.
-         * @param string $url   The URL to request.
+         * @param array  $transports Array of HTTP transports to check. Default array contains
+         *                           'curl', and 'streams', in that order.
+         * @param array  $args       HTTP request arguments.
+         * @param string $url        The URL to request.
          */
-        $request_order = apply_filters( 'http_api_transports', array( 'curl', 'streams' ), $args, $url );
+        $transports = array( 'curl', 'streams' );
+        $request_order = apply_filters( 'http_api_transports', $transports, $args, $url );
 
         // Loop over each transport on each HTTP request looking for one which will serve this request's needs.
         foreach ( $request_order as $transport ) {
-            $class = 'WP_HTTP_' . $transport;
+            if ( in_array( $transport, $transports ) ) {
+                $transport = ucfirst( $transport );
+            }
+            $class = 'WP_Http_' . $transport;
 
             // Check to see if this transport is a possibility, calls the transport statically.
@@ -549 +553 @@
             foreach ( $r['cookies'] as $name => $value ) {
                 if ( ! is_object( $value ) )
-                    $r['cookies'][ $name ] = new WP_HTTP_Cookie( array( 'name' => $name, 'value' => $value ) );
+                    $r['cookies'][ $name ] = new WP_Http_Cookie( array( 'name' => $name, 'value' => $value ) );
             }
 
@@ -737 +741 @@
             return $maybe_relative_path;
 
-        if ( ! $url_parts = WP_HTTP::parse_url( $url ) ) {
+        if ( ! $url_parts = WP_Http::parse_url( $url ) ) {
             return $maybe_relative_path;
         }
 
-        if ( ! $relative_url_parts = WP_HTTP::parse_url( $maybe_relative_path ) ) {
+        if ( ! $relative_url_parts = WP_Http::parse_url( $maybe_relative_path ) ) {
             return $maybe_relative_path;
         }
@@ -825 +829 @@
             $redirect_location = array_pop( $redirect_location );
 
-        $redirect_location = WP_HTTP::make_absolute_url( $redirect_location, $url );
+        $redirect_location = WP_Http::make_absolute_url( $redirect_location, $url );
 
         // POST requests should not POST to a redirected location.