golem
/
twentyGOLEM
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert [11524]. curl has its problems, but so does everything else. see #9998 fixes #10104 for trunk 

git-svn-id: http://svn.automattic.com/wordpress/trunk@11630 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan 2009-06-23 19:18:27 +00:00
parent a64bd28ddb
commit 00c27d7e17
1 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
wp-includes/http.php
View File

@ -73,11 +73,11 @@ class WP_Http {
* Tests all of the objects and returns the object that passes. Also caches * Tests all of the objects and returns the object that passes. Also caches
* that object to be used later. * that object to be used later.
* *
* The order for the GET/HEAD requests are HTTP Extension, FSockopen Streams, * The order for the GET/HEAD requests are Streams, HTTP Extension, Fopen,
* Fopen, and finally cURL. Whilst Fsockopen has the highest overhead, Its * and finally Fsockopen. fsockopen() is used last, because it has the most
* used 2nd due to high compatibility with most hosts, The HTTP Extension is * overhead in its implementation. There isn't any real way around it, since
* tested first due to hosts which have it enabled, are likely to work * redirects have to be supported, much the same way the other transports
* correctly with it. * also handle redirects.
* *
* There are currently issues with "localhost" not resolving correctly with * There are currently issues with "localhost" not resolving correctly with
* DNS. This may cause an error "failed to open stream: A connection attempt * DNS. This may cause an error "failed to open stream: A connection attempt
@ -98,18 +98,18 @@ class WP_Http {
if ( true === WP_Http_ExtHttp::test($args) ) { if ( true === WP_Http_ExtHttp::test($args) ) {
$working_transport['exthttp'] = new WP_Http_ExtHttp(); $working_transport['exthttp'] = new WP_Http_ExtHttp();
$blocking_transport[] = &$working_transport['exthttp']; $blocking_transport[] = &$working_transport['exthttp'];
} else if ( true === WP_Http_Fsockopen::test($args) ) { } else if ( true === WP_Http_Curl::test($args) ) {
$working_transport['fsockopen'] = new WP_Http_Fsockopen(); $working_transport['curl'] = new WP_Http_Curl();
$blocking_transport[] = &$working_transport['fsockopen']; $blocking_transport[] = &$working_transport['curl'];
} else if ( true === WP_Http_Streams::test($args) ) { } else if ( true === WP_Http_Streams::test($args) ) {
$working_transport['streams'] = new WP_Http_Streams(); $working_transport['streams'] = new WP_Http_Streams();
$blocking_transport[] = &$working_transport['streams']; $blocking_transport[] = &$working_transport['streams'];
} else if ( true === WP_Http_Fopen::test($args) ) { } else if ( true === WP_Http_Fopen::test($args) ) {
$working_transport['fopen'] = new WP_Http_Fopen(); $working_transport['fopen'] = new WP_Http_Fopen();
$blocking_transport[] = &$working_transport['fopen']; $blocking_transport[] = &$working_transport['fopen'];
} else if ( true === WP_Http_Curl::test($args) ) { } else if ( true === WP_Http_Fsockopen::test($args) ) {
$working_transport['curl'] = new WP_Http_Curl(); $working_transport['fsockopen'] = new WP_Http_Fsockopen();
$blocking_transport[] = &$working_transport['curl']; $blocking_transport[] = &$working_transport['fsockopen'];
} }
foreach ( array('curl', 'streams', 'fopen', 'fsockopen', 'exthttp') as $transport ) { foreach ( array('curl', 'streams', 'fopen', 'fsockopen', 'exthttp') as $transport ) {
@ -149,15 +149,15 @@ class WP_Http {
if ( true === WP_Http_ExtHttp::test($args) ) { if ( true === WP_Http_ExtHttp::test($args) ) {
$working_transport['exthttp'] = new WP_Http_ExtHttp(); $working_transport['exthttp'] = new WP_Http_ExtHttp();
$blocking_transport[] = &$working_transport['exthttp']; $blocking_transport[] = &$working_transport['exthttp'];
} else if ( true === WP_Http_Fsockopen::test($args) ) {
$working_transport['fsockopen'] = new WP_Http_Fsockopen();
$blocking_transport[] = &$working_transport['fsockopen'];
} else if ( true === WP_Http_Streams::test($args) ) {
$working_transport['streams'] = new WP_Http_Streams();
$blocking_transport[] = &$working_transport['streams'];
} else if ( true === WP_Http_Curl::test($args) ) { } else if ( true === WP_Http_Curl::test($args) ) {
$working_transport['curl'] = new WP_Http_Curl(); $working_transport['curl'] = new WP_Http_Curl();
$blocking_transport[] = &$working_transport['curl']; $blocking_transport[] = &$working_transport['curl'];
} else if ( true === WP_Http_Streams::test($args) ) {
$working_transport['streams'] = new WP_Http_Streams();
$blocking_transport[] = &$working_transport['streams'];
} else if ( true === WP_Http_Fsockopen::test($args) ) {
$working_transport['fsockopen'] = new WP_Http_Fsockopen();
$blocking_transport[] = &$working_transport['fsockopen'];
} }
foreach ( array('curl', 'streams', 'fsockopen', 'exthttp') as $transport ) { foreach ( array('curl', 'streams', 'fsockopen', 'exthttp') as $transport ) {