aboutsummaryrefslogtreecommitdiffstats
path: root/include/network.php
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2011-11-18 21:56:17 -0800
committerfriendica <info@friendica.com>2011-11-18 21:56:17 -0800
commit0d77ca1caa784a5fb7e809e896101c82a7ec552f (patch)
tree13cfc7dde6b2761de0d9144972ba4eeb3b88a492 /include/network.php
parentd53db63d41d2f253c9aff806d9830167c9dd7a8d (diff)
parent32f17e7e24d52bed1b5a5d8ed01d101522b26a9f (diff)
downloadvolse-hubzilla-0d77ca1caa784a5fb7e809e896101c82a7ec552f.tar.gz
volse-hubzilla-0d77ca1caa784a5fb7e809e896101c82a7ec552f.tar.bz2
volse-hubzilla-0d77ca1caa784a5fb7e809e896101c82a7ec552f.zip
Merge branch 'pull'
Diffstat (limited to 'include/network.php')
-rw-r--r--include/network.php10
1 files changed, 9 insertions, 1 deletions
diff --git a/include/network.php b/include/network.php
index a9ee3f0a5..e89eb94da 100644
--- a/include/network.php
+++ b/include/network.php
@@ -5,7 +5,7 @@
// results.
if(! function_exists('fetch_url')) {
-function fetch_url($url,$binary = false, &$redirects = 0, $timeout = 0) {
+function fetch_url($url,$binary = false, &$redirects = 0, $timeout = 0, $accept_content=Null) {
$a = get_app();
@@ -14,9 +14,17 @@ function fetch_url($url,$binary = false, &$redirects = 0, $timeout = 0) {
return false;
@curl_setopt($ch, CURLOPT_HEADER, true);
+
+ if (!is_null($accept_content)){
+ curl_setopt($ch,CURLOPT_HTTPHEADER, array (
+ "Accept: "+$accept_content
+ ));
+ }
+
@curl_setopt($ch, CURLOPT_RETURNTRANSFER,true);
@curl_setopt($ch, CURLOPT_USERAGENT, "Friendika");
+
if(intval($timeout)) {
@curl_setopt($ch, CURLOPT_TIMEOUT, $timeout);
}