Index: Drupal_Apache_Solr_Service.php
===================================================================
RCS file: /cvs/drupal/contributions/modules/apachesolr/Drupal_Apache_Solr_Service.php,v
retrieving revision 1.8
diff -u -r1.8 Drupal_Apache_Solr_Service.php
--- Drupal_Apache_Solr_Service.php	21 Jun 2010 19:29:41 -0000	1.8
+++ Drupal_Apache_Solr_Service.php	12 Aug 2010 13:47:13 -0000
@@ -299,15 +299,16 @@
   }
 
   protected function _makeHttpRequest($url, $method = 'GET', $headers = array(), $content = '', $timeout = FALSE) {
-    // Set a response timeout
-    if ($timeout) {
-      $default_socket_timeout = ini_set('default_socket_timeout', $timeout);
-    }
-    $result = drupal_http_request($url, $headers, $method, $content);
-    // Restore the response timeout
-    if ($timeout) {
-      ini_set('default_socket_timeout', $default_socket_timeout);
+    $requestOptions = array(
+      'headers' => $headers,
+      'method' => $method,
+      'data' => $content
+    );
+    //Set timeout
+    if($timeout){
+      $requestOptions['timeout'] = $timeout;
     }
+    $result = drupal_http_request($url, $requestOptions);
 
     // This will no longer be needed after http://drupal.org/node/345591 is committed
     $responses = array(