Changeset 2581

Timestamp:

05/03/2005 07:52:11 AM (21 years ago)

Author:

matt

Message:

Use CURL if available, possible fix for ​http://mosquito.wordpress.org/view.php?id=1166

Location:

trunk

Files:

• wp-admin/upgrade-schema.php (modified) (1 diff)
• wp-includes/functions.php (modified) (1 diff)
• xmlrpc.php (modified) (2 diffs)

trunk/wp-admin/upgrade-schema.php

@@ -216 +216 @@
     add_option('rss_language', 'en');
     add_option('html_type', 'text/html');
+    // 1.5.1
+    add_option('use_trackback', 0);
 
     // Delete unused options

trunk/wp-includes/functions.php

@@ -1859 +1859 @@
 }
 
+function wp_remote_fopen( $uri ) {
+    if ( function_exists('curl_init') ) {
+        $handle = curl_init();
+        curl_setopt ($handle, CURLOPT_URL, $uri);
+        curl_setopt ($handle, CURLOPT_CONNECTTIMEOUT, 1);
+        curl_setopt ($handle, CURLOPT_RETURNTRANSFER, 1);
+        $buffer = curl_exec($handle);
+        curl_close($handle);
+        return $buffer;
+    } else {
+        $fp = fopen( $uri, 'r' );
+        if ( !$fp )
+            return false;
+        $linea = '';
+        while( $remote_read = fread($fp, 4096) )
+            $linea .= $remote_read;
+        return $linea;
+    }   
+}
+
 ?>

trunk/xmlrpc.php

@@ -1163 +1163 @@
 
         // Let's check the remote site
-        $fp = @fopen($pagelinkedfrom, 'r');
-        if (!$fp) {
-            // The source URI does not exist
+        $linea = wp_remote_fopen( $pagelinkedfrom );
+        if ( !$linea )
             return new IXR_Error(16, 'The source URI does not exist.');
-        }
-
-        $puntero = 4096;
-        while($remote_read = fread($fp, $puntero)) {
-            $linea .= $remote_read;
-        }
 
         // Work around bug in strip_tags():
@@ -1180 +1173 @@
         // I don't think we need this? -- emc3
         //$linea = preg_replace('#&([^amp\;])#is', '&$1', $linea);
-        if (empty($matchtitle)) {
+        if ( empty($matchtitle) ) {
             preg_match('|<title>([^<]*?)</title>|is', $linea, $matchtitle);
         }