Changeset 24767 for trunk/wp-includes/class-http.php

Timestamp:

07/22/2013 06:55:05 PM (11 years ago)

Author:

nacin

Message:

Rename limit-response-size to limit_response_size. see #23472.

File:

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

trunk/wp-includes/class-http.php

@@ -98 +98 @@
             'stream' => false,
             'filename' => null,
-            'limit-response-size' => null,
+            'limit_response_size' => null,
         );
 
@@ -745 +745 @@
         $keep_reading = true;
         $block_size = 4096;
-        if ( isset( $r['limit-response-size'] ) )
-            $block_size = min( $block_size, $r['limit-response-size'] );
+        if ( isset( $r['limit_response_size'] ) )
+            $block_size = min( $block_size, $r['limit_response_size'] );
 
         // If streaming to a file setup the file handle
@@ -771 +771 @@
                 }
 
-                if ( isset( $r['limit-response-size'] ) && ( $bytes_written + strlen( $block ) ) > $r['limit-response-size'] )
-                    $block = substr( $block, 0, ( $r['limit-response-size'] - $bytes_written ) );
+                if ( isset( $r['limit_response_size'] ) && ( $bytes_written + strlen( $block ) ) > $r['limit_response_size'] )
+                    $block = substr( $block, 0, ( $r['limit_response_size'] - $bytes_written ) );
 
                 $bytes_written += fwrite( $stream_handle, $block );
 
-                $keep_reading = !isset( $r['limit-response-size'] ) || $bytes_written < $r['limit-response-size'];
+                $keep_reading = !isset( $r['limit_response_size'] ) || $bytes_written < $r['limit_response_size'];
             }
 
@@ -790 +790 @@
                     $bodyStarted = true;
                 }
-                $keep_reading = ( ! $bodyStarted || !isset( $r['limit-response-size'] ) || strlen( $strResponse ) < ( $header_length + $r['limit-response-size'] ) );
+                $keep_reading = ( ! $bodyStarted || !isset( $r['limit_response_size'] ) || strlen( $strResponse ) < ( $header_length + $r['limit_response_size'] ) );
             }
 
@@ -821 +821 @@
             $process['body'] = WP_Http_Encoding::decompress( $process['body'] );
 
-        if ( isset( $r['limit-response-size'] ) && strlen( $process['body'] ) > $r['limit-response-size'] )
-            $process['body'] = substr( $process['body'], 0, $r['limit-response-size'] );
+        if ( isset( $r['limit_response_size'] ) && strlen( $process['body'] ) > $r['limit_response_size'] )
+            $process['body'] = substr( $process['body'], 0, $r['limit_response_size'] );
 
         return array( 'headers' => $arrHeaders['headers'], 'body' => $process['body'], 'response' => $arrHeaders['response'], 'cookies' => $arrHeaders['cookies'], 'filename' => $r['filename'] );
@@ -968 +968 @@
         }
 
-        $max_bytes = isset( $r['limit-response-size'] ) ? intval( $r['limit-response-size'] ) : -1;
+        $max_bytes = isset( $r['limit_response_size'] ) ? intval( $r['limit_response_size'] ) : -1;
         if ( $r['stream'] ) {
             if ( ! WP_DEBUG )
@@ -1183 +1183 @@
         curl_setopt( $handle, CURLOPT_HEADER, false );
 
-        if ( isset( $r['limit-response-size'] ) )
-            $this->max_body_length = intval( $r['limit-response-size'] );
+        if ( isset( $r['limit_response_size'] ) )
+            $this->max_body_length = intval( $r['limit_response_size'] );
         else
             $this->max_body_length = false;
@@ -1848 +1848 @@
         elseif ( $args['stream'] ) // disable when streaming to file
             $compression_enabled = false;
-        elseif ( isset( $args['limit-response-size'] ) ) // If only partial content is being requested, we won't be able to decompress it
+        elseif ( isset( $args['limit_response_size'] ) ) // If only partial content is being requested, we won't be able to decompress it
             $compression_enabled = false;