Changeset 10579

Timestamp:

02/15/2009 08:56:54 PM (18 years ago)

Author:

ryan

Message:

discover_pingback_server_uri optimizations. Props DD32. fixes #8816

File:

• trunk/wp-includes/comment.php (modified) (2 diffs)

trunk/wp-includes/comment.php

@@ -1255 +1255 @@
                 return false;
 
-        $response = wp_remote_get( $url, array( 'timeout' => 2, 'httpversion' => '1.1' ) );
+        //Do not search for a pingback server on our own uploads
+        $uploads_dir = wp_upload_dir();
+        if ( 0 === strpos($url, $uploads_dir['baseurl']) )
+                return false;
+
+        $response = wp_remote_head( $url, array( 'timeout' => 2, 'httpversion' => '1.0' ) );
 
         if ( is_wp_error( $response ) )
@@ -1265 +1270 @@
         // Not an (x)html, sgml, or xml page, no use going further.
         if ( isset( $response['headers']['content-type'] ) && preg_match('#(image|audio|video|model)/#is', $response['headers']['content-type']) )
+                return false;
+
+        // Now do a GET since we're going to look in the html headers (and we're sure its not a binary file)
+        $response = wp_remote_get( $url, array( 'timeout' => 2, 'httpversion' => '1.0' ) );
+
+        if ( is_wp_error( $response ) )
                 return false;