Changeset 10321

Timestamp:

01/06/2009 05:30:41 PM (18 years ago)

Author:

ryan

Message:

Fix URL checking and add phpdoc. Props jacobsantos. fixes #8787 for 2.7

File:

• branches/2.7/wp-includes/http.php (modified) (6 diffs)

branches/2.7/wp-includes/http.php

@@ -243 +243 @@
 
                 if ( is_null($r['body']) ) {
+                        // Some servers fail when sending content without the content-length
+                        // header being set.
                         $r['headers']['Content-Length'] = 0;
                         $transports = WP_Http::_getTransport($r);
@@ -640 +642 @@
                         return new WP_Error('http_request_failed', sprintf(__('Malformed URL: %s'), $url));
 
-                if ( 'http' != $arrURL['scheme'] || 'https' != $arrURL['scheme'] )
+                if ( 'http' != $arrURL['scheme'] && 'https' != $arrURL['scheme'] )
                         $url = str_replace($arrURL['scheme'], 'http', $url);
 
@@ -773 +775 @@
                 $context = stream_context_create($arrContext);
 
-                if ( !defined('WP_DEBUG') || ( defined('WP_DEBUG') && false === WP_DEBUG ) )
+                if ( ! defined('WP_DEBUG') || ( defined('WP_DEBUG') && false === WP_DEBUG ) )
                         $handle = @fopen($url, 'r', false, $context);
                 else
@@ -978 +980 @@
                 }
 
-                // If timeout is a float less than 1, round it up to 1.
+                // cURL extension will sometimes fail when the timeout is less than 1 as
+                // it may round down to 0, which gives it unlimited timeout.
                 if ( $r['timeout'] > 0 && $r['timeout'] < 1 )
                         $r['timeout'] = 1;
@@ -985 +988 @@
                 curl_setopt( $handle, CURLOPT_URL, $url);
 
+                // The cURL extension requires that the option be set for the HEAD to
+                // work properly.
                 if ( 'HEAD' === $r['method'] ) {
                         curl_setopt( $handle, CURLOPT_NOBODY, true );
@@ -1003 +1008 @@
                 curl_setopt( $handle, CURLOPT_MAXREDIRS, $r['redirection'] );
 
+                // The option doesn't work with safe mode or when open_basedir is set.
                 if ( !ini_get('safe_mode') && !ini_get('open_basedir') )
                         curl_setopt( $handle, CURLOPT_FOLLOWLOCATION, true );