Fixed delays during access to external urls (e.g. exchange rate services).

diff --git a/includes/remote_url.inc b/includes/remote_url.inc
index 4cb88e12d1fbfb91d4e97caee58b1a67599b6144..5c6790aee3f0bc6b03779daf8eecb6cceb0a8e6c 100644 (file)
--- a/includes/remote_url.inc
+++ b/includes/remote_url.inc
@@ -57,20 +57,12 @@ function url_get_contents($url, $timeout=10)
                        "Accept: */*\r\n" .
                        "Accept-Language: en-us,en;q=0.5\r\n" .
                        "Accept-Charset: ISO-8859-1,utf-8;q=0.7,*;q=0.7\r\n" .
-                       "Keep-Alive: 300\r\n" .
-                       "Connection: keep-alive\r\n" .
+                       "Connection: close\r\n" .
                        "Referer: http://$host\r\n\r\n");
 
                // retrieve the response from the remote server
-               $unblocked=0;
 
-               while ($line = fread($fp, 4096)) {
-                       $response .= $line;
-                       if (strpos($host,'localhost') !== false && !$unblocked++)
-                               stream_set_blocking($fp, 0); // just after connection switch to nonblocking mode
-                       usleep(10);
-               }
-               fclose( $fp );
+               $response = stream_get_contents($fp);
 
                if (!strpos($response, "200 OK\r\n"))
                        return null;