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

always use a user-agent constant 

Some providers block connections with missing user-agents. Also
user-agents are useful for analyzing requests. I've added a USER_AGENT
constant that is used in cURL and in file_get_contents.
remotes/origin/fix-10825
cbhp 2014-09-03 18:00:05 +07:00
parent 969b41c1c9
commit c00450b2c7
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
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();
@ -1281,7 +1283,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'));
}
@ -1303,7 +1305,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, "ownCloud Server Crawler");
curl_setopt($rcurl, CURLOPT_USERAGENT, self::USER_AGENT);
do {
curl_setopt($rcurl, CURLOPT_URL, $newURL);
$header = curl_exec($rcurl);
@ -1338,7 +1340,7 @@ class OC_Util {
if (OC_Config::getValue('proxy', '') != '') {
$contextArray = array(
'http' => array(
'header' => "User-Agent: ownCloud Server Crawler\r\n",
'header' => 'User-Agent: ' . self::USER_AGENT . "\r\n",
'timeout' => 10,
'proxy' => OC_Config::getValue('proxy')
)
@ -1346,7 +1348,7 @@ class OC_Util {
} else {
$contextArray = array(
'http' => array(
'header' => "User-Agent: ownCloud Server Crawler\r\n",
'header' => 'User-Agent: ' . self::USER_AGENT . "\r\n",
'timeout' => 10
)
);