Changeset 13149

Timestamp:

02/14/2010 10:41:07 AM (16 years ago)

Author:

dd32

Message:

Disable Redirection on HEAD requests. See #10624

File:

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

trunk/wp-includes/http.php

@@ -749 +749 @@
 
         // If location is found, then assume redirect and redirect to location.
-        if ( isset($arrHeaders['headers']['location']) ) {
+        if ( 'HEAD' != $r['method'] && isset($arrHeaders['headers']['location']) ) {
             if ( $r['redirection']-- > 0 ) {
                 return $this->request($arrHeaders['headers']['location'], $r);
@@ -916 +916 @@
             return false;
 
+        if ( isset($args['method']) && 'HEAD' == $args['method'] ) //This transport cannot make a HEAD request
+            return false;
+
         $use = true;
-
         //PHP does not verify SSL certs, We can only make a request via this transports if SSL Verification is turned off.
         $is_ssl = isset($args['ssl']) && $args['ssl'];
@@ -1011 +1013 @@
                 'protocol_version' => (float) $r['httpversion'],
                 'header' => $strHeaders,
+                'ignore_errors' => true, // Return non-200 requests. 
                 'timeout' => $r['timeout'],
                 'ssl' => array(
@@ -1030 +1033 @@
         }
 
-        if ( ! is_null($r['body']) && ! empty($r['body'] ) )
+        if ( 'HEAD' == $r['method'] ) // Disable redirects for HEAD requests
+            $arrContext['http']['max_redirects'] = 1;
+
+        if ( ! empty($r['body'] ) )
             $arrContext['http']['content'] = $r['body'];
 
@@ -1040 +1046 @@
             $handle = fopen($url, 'r', false, $context);
 
-        if ( ! $handle)
+        if ( ! $handle )
             return new WP_Error('http_request_failed', sprintf(__('Could not open handle for fopen() to %s'), $url));
 
@@ -1191 +1197 @@
         );
 
+        if ( HTTP_METH_HEAD == $r['method'] )
+            $options['redirect'] = 0; // Assumption: Docs seem to suggest that this means do not follow. Untested.
+
         // The HTTP extensions offers really easy proxy support.
         $proxy = new WP_HTTP_Proxy();
@@ -1359 +1368 @@
 
         // The option doesn't work with safe mode or when open_basedir is set.
-        if ( !ini_get('safe_mode') && !ini_get('open_basedir') )
+        // Disable HEAD when making HEAD requests.
+        if ( !ini_get('safe_mode') && !ini_get('open_basedir') && 'HEAD' != $r['method'] )
             curl_setopt( $handle, CURLOPT_FOLLOWLOCATION, true );