Changeset 25348

Timestamp:

09/11/2013 08:12:24 AM (11 years ago)

Author:

dd32

Message:

Switch WP_HTTP over to using the mbstring.func_overload helper functions. This change moves the check from within the Streaming-handling function to wrap the individual request, this fixes it for both cURL and Streams and any future changes to the transports which use strlen() on binary data. See #25259 See #16057

File:

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

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

@@ -167 +167 @@
         WP_Http::buildCookieHeader( $r );
 
+        // Avoid issues where mbstring.func_overload is enabled
+        mbstring_binary_safe_encoding();
+
         if ( ! isset( $r['headers']['Accept-Encoding'] ) ) {
             if ( $encoding = WP_Http_Encoding::accept_encoding( $url, $r ) )
@@ -188 +191 @@
 
         $response = $this->_dispatch_request( $url, $r );
+
+        reset_mbstring_encoding();
+
         if ( is_wp_error( $response ) )
             return $response;
@@ -1320 +1326 @@
      */
     private function stream_body( $handle, $data ) {
-        if ( function_exists( 'ini_get' ) && ( ini_get( 'mbstring.func_overload' ) & 2 ) && function_exists( 'mb_internal_encoding' ) ) {
-            $mb_encoding = mb_internal_encoding();
-            mb_internal_encoding( 'ISO-8859-1' );
-        }
-
         $data_length = strlen( $data );
 
@@ -1336 +1337 @@
             $bytes_written = $data_length;
         }
-
-        if ( isset( $mb_encoding ) )
-            mb_internal_encoding( $mb_encoding );
 
         // Upon event of this function returning less than strlen( $data ) curl will error with CURLE_WRITE_ERROR