sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10790 from cbhp/master 

added missing User-Agents
remotes/origin/fix-10825
Lukas Reschke 2014-09-03 22:40:12 +07:00
parent 16606f44d7 c00450b2c7
commit 8fec19a872
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/private/util.php
Unescape Escape View File

@ -5,6 +5,8 @@
*
*/
class OC_Util {
const USER_AGENT = 'ownCloud Server Crawler';
public static $scripts = array();
public static $styles = array();
public static $headers = array();
@ -1247,7 +1249,7 @@ class OC_Util {
curl_setopt($curl, CURLOPT_URL, $url);
curl_setopt($curl, CURLOPT_USERAGENT, "ownCloud Server Crawler");
curl_setopt($curl, CURLOPT_USERAGENT, self::USER_AGENT);
if (OC_Config::getValue('proxy', '') != '') {
curl_setopt($curl, CURLOPT_PROXY, OC_Config::getValue('proxy'));
}
@ -1269,6 +1271,7 @@ class OC_Util {
curl_setopt($rcurl, CURLOPT_NOBODY, true);
curl_setopt($rcurl, CURLOPT_FORBID_REUSE, false);
curl_setopt($rcurl, CURLOPT_RETURNTRANSFER, true);
curl_setopt($rcurl, CURLOPT_USERAGENT, self::USER_AGENT);
do {
curl_setopt($rcurl, CURLOPT_URL, $newURL);
$header = curl_exec($rcurl);
@ -1303,6 +1306,7 @@ class OC_Util {
if (OC_Config::getValue('proxy', '') != '') {
$contextArray = array(
'http' => array(
'header' => 'User-Agent: ' . self::USER_AGENT . "\r\n",
'timeout' => 10,
'proxy' => OC_Config::getValue('proxy')
)
@ -1310,6 +1314,7 @@ class OC_Util {
} else {
$contextArray = array(
'http' => array(
'header' => 'User-Agent: ' . self::USER_AGENT . "\r\n",
'timeout' => 10
)
);