projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Partial (inventory related) include files cleanup.
[fa-stable.git]
/
includes
/
remote_url.inc
diff --git
a/includes/remote_url.inc
b/includes/remote_url.inc
index fb0c1348fa48c8dbad4bbd38b26729b22615a39c..0e53dbf466eab1cc32445cd9ca935f1d8c919504 100644
(file)
--- a/
includes/remote_url.inc
+++ b/
includes/remote_url.inc
@@
-19,6
+19,9
@@
function url_get_contents($url, $timeout=10)
// get the host name and url path
$parsedUrl = parse_url($url);
// get the host name and url path
$parsedUrl = parse_url($url);
+ if (@$parsedUrl['scheme'] == 'file')
+ return file_get_contents($parsedUrl['path']);
+
$host = $parsedUrl['host'];
if (isset($parsedUrl['path'])) {
$host = $parsedUrl['host'];
if (isset($parsedUrl['path'])) {
@@
-60,11
+63,13
@@
function url_get_contents($url, $timeout=10)
"Referer: http://$host\r\n\r\n");
// retrieve the response from the remote server
"Referer: http://$host\r\n\r\n");
// retrieve the response from the remote server
- $len =0;
+ $unblocked=0;
+
while ($line = fread($fp, 4096)) {
$response .= $line;
while ($line = fread($fp, 4096)) {
$response .= $line;
- if ($host=='localhost')
+ if ($host=='localhost'
&& !$unblocked++
)
stream_set_blocking($fp, 0); // just after connection switch to nonblocking mode
stream_set_blocking($fp, 0); // just after connection switch to nonblocking mode
+ usleep(10);
}
fclose( $fp );
}
fclose( $fp );
@@
-83,6
+88,8
@@
function url_get_contents($url, $timeout=10)
function url_copy($from, $to, $timeout=10)
{
$f = fopen($to, 'wb');
function url_copy($from, $to, $timeout=10)
{
$f = fopen($to, 'wb');
- fwrite($f, url_get_contents($from, $timeout));
+ if (!$f || !fwrite($f, url_get_contents($from, $timeout)))
+ return false;
fclose($f);
fclose($f);
+ return true;
}
}