Changeset 25044

Timestamp:

08/17/2013 12:33:39 AM (12 years ago)

Author:

dd32

Message:

WP_HTTP: Cookies: Fill the defaults for the Cookie object based on the current requested URL. Fixes #21182

File:

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

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

@@ -159 +159 @@
 
         if ( ! is_array( $r['headers'] ) ) {
-            $processedHeaders = WP_Http::processHeaders( $r['headers'] );
+            $processedHeaders = WP_Http::processHeaders( $r['headers'], $url );
             $r['headers'] = $processedHeaders['headers'];
         }
@@ -350 +350 @@
      *
      * @param string|array $headers
+     * @param string $url The URL that was requested
      * @return array Processed string headers. If duplicate headers are encountered,
      *                  Then a numbered array is returned as the value of that header-key.
      */
-    public static function processHeaders($headers) {
+    public static function processHeaders( $headers, $url ) {
         // split headers, one per array element
         if ( is_string($headers) ) {
@@ -401 +402 @@
             }
             if ( 'set-cookie' == $key )
-                $cookies[] = new WP_Http_Cookie( $value );
+                $cookies[] = new WP_Http_Cookie( $value, $url );
         }
 
@@ -858 +859 @@
             error_reporting($error_reporting);
 
-        $arrHeaders = WP_Http::processHeaders( $process['headers'] );
+        $arrHeaders = WP_Http::processHeaders( $process['headers'], $url );
 
         $response = array(
@@ -1052 +1053 @@
         $processedHeaders = array();
         if ( isset( $meta['wrapper_data']['headers'] ) )
-            $processedHeaders = WP_Http::processHeaders($meta['wrapper_data']['headers']);
+            $processedHeaders = WP_Http::processHeaders( $meta['wrapper_data']['headers'], $url );
         else
-            $processedHeaders = WP_Http::processHeaders($meta['wrapper_data']);
+            $processedHeaders = WP_Http::processHeaders( $meta['wrapper_data'], $url );
 
         $response = array(
@@ -1302 +1303 @@
 
         $theResponse = curl_exec( $handle );
-        $theHeaders = WP_Http::processHeaders( $this->headers );
+        $theHeaders = WP_Http::processHeaders( $this->headers, $url );
         $theBody = $this->body;
 
@@ -1668 +1669 @@
      * <li>Path (optional)</li>
      * <li>Domain (optional)</li>
+     * <li>Port (optional)</li>
      * </ol>
      *
@@ -1674 +1676 @@
      *
      * @param string|array $data Raw cookie data.
-     */
-    function __construct( $data ) {
+     * @param string $requested_url The URL which the cookie was set on, used for default 'domain' and 'port' values
+     */
+    function __construct( $data, $requested_url = '' ) {
+        $arrURL = @parse_url( $requested_url );
+        if ( isset( $arrURL['host'] ) )
+            $this->domain = $arrURL['host'];
+        $this->path = isset( $arrURL['path'] ) ? $arrURL['path'] : '/';
+        if (  '/' != substr( $this->path, -1 ) )
+            $this->path = dirname( $this->path ) . '/';
+
         if ( is_string( $data ) ) {
             // Assume it's a header string direct from a previous request
@@ -1704 +1714 @@
 
             // Set properties based directly on parameters
-            $this->name   = $data['name'];
-            $this->value  = isset( $data['value'] ) ? $data['value'] : '';
-            $this->path   = isset( $data['path'] ) ? $data['path'] : '';
-            $this->domain = isset( $data['domain'] ) ? $data['domain'] : '';
+            foreach ( array( 'name', 'value', 'path', 'domain', 'port' ) as $field ) {
+                if ( isset( $data[ $field ] ) )
+                    $this->$field = $data[ $field ];
+            }
 
             if ( isset( $data['expires'] ) )
@@ -1728 +1738 @@
      */
     function test( $url ) {
+        if ( is_null( $this->name ) )
+            return false;
+
         // Expires - if expired then nothing else matters
         if ( isset( $this->expires ) && time() > $this->expires )
@@ -1734 +1747 @@
         // Get details on the URL we're thinking about sending to
         $url = parse_url( $url );
-        $url['port'] = isset( $url['port'] ) ? $url['port'] : 80;
+        $url['port'] = isset( $url['port'] ) ? $url['port'] : ( 'https' == $url['scheme'] ? 443 : 80 );
         $url['path'] = isset( $url['path'] ) ? $url['path'] : '/';
 
         // Values to use for comparison against the URL
         $path   = isset( $this->path )   ? $this->path   : '/';
-        $port   = isset( $this->port )   ? $this->port   : 80;
+        $port   = isset( $this->port )   ? $this->port   : null;
         $domain = isset( $this->domain ) ? strtolower( $this->domain ) : strtolower( $url['host'] );
         if ( false === stripos( $domain, '.' ) )
@@ -1750 +1763 @@
 
         // Port - supports "port-lists" in the format: "80,8000,8080"
-        if ( !in_array( $url['port'], explode( ',', $port) ) )
+        if ( !empty( $port ) && !in_array( $url['port'], explode( ',', $port) ) )
             return false;