Wordpress 3.5

[autoinstalls/wordpress.git] / wp-includes / class-http.php

diff --git a/wp-includes/class-http.php b/wp-includes/class-http.php
index 31a13ea6d1ae040aaef4ceb86fa34c0876b884a4..b50909fd9f991a13267ea7c6d6be51ea6baee1a9 100644 (file)
--- a/wp-includes/class-http.php
+++ b/wp-includes/class-http.php
@@ -169,21 +169,17 @@ class WP_Http {
                if ( WP_Http_Encoding::is_available() )
                        $r['headers']['Accept-Encoding'] = WP_Http_Encoding::accept_encoding();
 
                if ( WP_Http_Encoding::is_available() )
                        $r['headers']['Accept-Encoding'] = WP_Http_Encoding::accept_encoding();
 

-               if ( empty($r['body']) ) {
-                       $r['body'] = null;
-                       // Some servers fail when sending content without the content-length header being set.
-                       // Also, to fix another bug, we only send when doing POST and PUT and the content-length
-                       // header isn't already set.
-                       if ( ($r['method'] == 'POST' || $r['method'] == 'PUT') && ! isset( $r['headers']['Content-Length'] ) )
-                               $r['headers']['Content-Length'] = 0;
-               } else {
+               if ( ( ! is_null( $r['body'] ) && '' != $r['body'] ) || 'POST' == $r['method'] || 'PUT' == $r['method'] ) {

                        if ( is_array( $r['body'] ) || is_object( $r['body'] ) ) {
                                $r['body'] = http_build_query( $r['body'], null, '&' );
                        if ( is_array( $r['body'] ) || is_object( $r['body'] ) ) {
                                $r['body'] = http_build_query( $r['body'], null, '&' );

+

                                if ( ! isset( $r['headers']['Content-Type'] ) )
                                        $r['headers']['Content-Type'] = 'application/x-www-form-urlencoded; charset=' . get_option( 'blog_charset' );
                                if ( ! isset( $r['headers']['Content-Type'] ) )
                                        $r['headers']['Content-Type'] = 'application/x-www-form-urlencoded; charset=' . get_option( 'blog_charset' );

-                               $r['headers']['Content-Length'] = strlen( $r['body'] );

                        }
 
                        }
 

+                       if ( '' === $r['body'] )
+                               $r['body'] = null;
+

                        if ( ! isset( $r['headers']['Content-Length'] ) && ! isset( $r['headers']['content-length'] ) )
                                $r['headers']['Content-Length'] = strlen( $r['body'] );
                }
                        if ( ! isset( $r['headers']['Content-Length'] ) && ! isset( $r['headers']['content-length'] ) )
                                $r['headers']['Content-Length'] = strlen( $r['body'] );
                }


@@ -200,7 +196,7 @@ class WP_Http {
         * @param array $args Request arguments
         * @param string $url URL to Request
         *
         * @param array $args Request arguments
         * @param string $url URL to Request
         *

-        * @return string|false Class name for the first transport that claims to support the request. False if no transport claims to support the request.
+        * @return string|bool Class name for the first transport that claims to support the request. False if no transport claims to support the request.

         */
        public function _get_first_available_transport( $args, $url = null ) {
                $request_order = array( 'curl', 'streams', 'fsockopen' );
         */
        public function _get_first_available_transport( $args, $url = null ) {
                $request_order = array( 'curl', 'streams', 'fsockopen' );


@@ -382,18 +378,18 @@ class WP_Http {
 
                        list($key, $value) = explode(':', $tempheader, 2);
 
 
                        list($key, $value) = explode(':', $tempheader, 2);
 

-                       if ( !empty( $value ) ) {
-                               $key = strtolower( $key );
-                               if ( isset( $newheaders[$key] ) ) {
-                                       if ( !is_array($newheaders[$key]) )
-                                               $newheaders[$key] = array($newheaders[$key]);
-                                       $newheaders[$key][] = trim( $value );
-                               } else {
-                                       $newheaders[$key] = trim( $value );
-                               }
-                               if ( 'set-cookie' == $key )
-                                       $cookies[] = new WP_Http_Cookie( $value );
+                       $key = strtolower( $key );
+                       $value = trim( $value );
+
+                       if ( isset( $newheaders[ $key ] ) ) {
+                               if ( ! is_array( $newheaders[ $key ] ) )
+                                       $newheaders[$key] = array( $newheaders[ $key ] );
+                               $newheaders[ $key ][] = $value;
+                       } else {
+                               $newheaders[ $key ] = $value;

                        }
                        }

+                       if ( 'set-cookie' == $key )
+                               $cookies[] = new WP_Http_Cookie( $value );

                }
 
                return array('response' => $response, 'headers' => $newheaders, 'cookies' => $cookies);
                }
 
                return array('response' => $response, 'headers' => $newheaders, 'cookies' => $cookies);


@@ -429,6 +425,8 @@ class WP_Http {
         * Based off the HTTP http_encoding_dechunk function. Does not support UTF-8. Does not support
         * returning footer headers. Shouldn't be too difficult to support it though.
         *
         * Based off the HTTP http_encoding_dechunk function. Does not support UTF-8. Does not support
         * returning footer headers. Shouldn't be too difficult to support it though.
         *

+        * @link http://tools.ietf.org/html/rfc2616#section-19.4.6 Process for chunked decoding.
+        *

         * @todo Add support for footer chunked headers.
         * @access public
         * @since 2.7.0
         * @todo Add support for footer chunked headers.
         * @access public
         * @since 2.7.0


@@ -806,7 +804,7 @@ class WP_Http_Fsockopen {
                if ( ! function_exists( 'fsockopen' ) )
                        return false;
 
                if ( ! function_exists( 'fsockopen' ) )
                        return false;
 

-               if ( false !== ($option = get_option( 'disable_fsockopen' )) && time()-$option < 43200 ) // 12 hours
+               if ( false !== ( $option = get_option( 'disable_fsockopen' ) ) && time() - $option < 12 * HOUR_IN_SECONDS )

                        return false;
 
                $is_ssl = isset( $args['ssl'] ) && $args['ssl'];
                        return false;
 
                $is_ssl = isset( $args['ssl'] ) && $args['ssl'];


@@ -912,7 +910,7 @@ class WP_Http_Streams {
                                $arrContext['http']['header'] .= $proxy->authentication_header() . "\r\n";
                }
 
                                $arrContext['http']['header'] .= $proxy->authentication_header() . "\r\n";
                }
 

-               if ( ! empty($r['body'] ) )
+               if ( ! is_null( $r['body'] ) )

                        $arrContext['http']['content'] = $r['body'];
 
                $context = stream_context_create($arrContext);
                        $arrContext['http']['content'] = $r['body'];
 
                $context = stream_context_create($arrContext);


@@ -1105,13 +1103,13 @@ class WP_Http_Curl {
                                break;
                        default:
                                curl_setopt( $handle, CURLOPT_CUSTOMREQUEST, $r['method'] );
                                break;
                        default:
                                curl_setopt( $handle, CURLOPT_CUSTOMREQUEST, $r['method'] );

-                               if ( ! empty( $r['body'] ) )
+                               if ( ! is_null( $r['body'] ) )

                                        curl_setopt( $handle, CURLOPT_POSTFIELDS, $r['body'] );
                                break;
                }
 
                if ( true === $r['blocking'] )
                                        curl_setopt( $handle, CURLOPT_POSTFIELDS, $r['body'] );
                                break;
                }
 
                if ( true === $r['blocking'] )

-                       curl_setopt( $handle, CURLOPT_HEADERFUNCTION, array( &$this, 'stream_headers' ) );
+                       curl_setopt( $handle, CURLOPT_HEADERFUNCTION, array( $this, 'stream_headers' ) );

 
                curl_setopt( $handle, CURLOPT_HEADER, false );
 
 
                curl_setopt( $handle, CURLOPT_HEADER, false );
 


@@ -1392,6 +1390,10 @@ class WP_HTTP_Proxy {
 
                $home = parse_url( get_option('siteurl') );
 
 
                $home = parse_url( get_option('siteurl') );
 

+               $result = apply_filters( 'pre_http_send_through_proxy', null, $uri, $check, $home );
+               if ( ! is_null( $result ) )
+                       return $result;
+

                if ( $check['host'] == 'localhost' || $check['host'] == $home['host'] )
                        return false;
 
                if ( $check['host'] == 'localhost' || $check['host'] == $home['host'] )
                        return false;
 


@@ -1546,7 +1548,7 @@ class WP_Http_Cookie {
         */
        function test( $url ) {
                // Expires - if expired then nothing else matters
         */
        function test( $url ) {
                // Expires - if expired then nothing else matters

-               if ( time() > $this->expires )
+               if ( isset( $this->expires ) && time() > $this->expires )

                        return false;
 
                // Get details on the URL we're thinking about sending to
                        return false;
 
                // Get details on the URL we're thinking about sending to


@@ -1586,7 +1588,7 @@ class WP_Http_Cookie {
         * @return string Header encoded cookie name and value.
         */
        function getHeaderValue() {
         * @return string Header encoded cookie name and value.
         */
        function getHeaderValue() {

-               if ( empty( $this->name ) || empty( $this->value ) )
+               if ( ! isset( $this->name ) || ! isset( $this->value ) )

                        return '';
 
                return $this->name . '=' . apply_filters( 'wp_http_cookie_value', $this->value, $this->name );
                        return '';
 
                return $this->name . '=' . apply_filters( 'wp_http_cookie_value', $this->value, $this->name );


@@ -1673,7 +1675,7 @@ class WP_Http_Encoding {
        /**
         * Decompression of deflated string while staying compatible with the majority of servers.
         *
        /**
         * Decompression of deflated string while staying compatible with the majority of servers.
         *

-        * Certain Servers will return deflated data with headers which PHP's gziniflate()
+        * Certain Servers will return deflated data with headers which PHP's gzinflate()

         * function cannot handle out of the box. The following function has been created from
         * various snippets on the gzinflate() PHP documentation.
         *
         * function cannot handle out of the box. The following function has been created from
         * various snippets on the gzinflate() PHP documentation.
         *