summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRenato Botelho <renato@netgate.com>2017-07-05 13:27:43 -0300
committerRenato Botelho <renato@netgate.com>2017-07-05 13:27:51 -0300
commit6cc74faa449b3983daa82bd84250e8a3c0289e5e (patch)
treec6b8265b75a11fff64f8cdcbc677a1b23169d706
parent2bf67a6fe9e507e442f6894c78726047cf2d552a (diff)
downloadpfsense-6cc74faa449b3983daa82bd84250e8a3c0289e5e.zip
pfsense-6cc74faa449b3983daa82bd84250e8a3c0289e5e.tar.gz
Remove extra spaces from User Agent
-rw-r--r--src/etc/inc/pfsense-utils.inc4
-rw-r--r--src/etc/inc/pkg-utils.inc2
-rw-r--r--src/usr/local/www/crash_reporter.php2
3 files changed, 4 insertions, 4 deletions
diff --git a/src/etc/inc/pfsense-utils.inc b/src/etc/inc/pfsense-utils.inc
index 2ec4e7e..2be1720 100644
--- a/src/etc/inc/pfsense-utils.inc
+++ b/src/etc/inc/pfsense-utils.inc
@@ -1948,7 +1948,7 @@ function download_file($url, $destination, $verify_ssl = true, $connect_timeout
curl_setopt($ch, CURLOPT_HEADER, false);
curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
if (!isset($config['system']['do_not_send_uniqueid'])) {
- curl_setopt($ch, CURLOPT_USERAGENT, $g['product_name'] . '/' . $g['product_version'] . ' : ' . system_get_uniqueid());
+ curl_setopt($ch, CURLOPT_USERAGENT, $g['product_name'] . '/' . $g['product_version'] . ':' . system_get_uniqueid());
} else {
curl_setopt($ch, CURLOPT_USERAGENT, $g['product_name'] . '/' . $g['product_version']);
}
@@ -2004,7 +2004,7 @@ function download_file_with_progress_bar($url, $destination, $verify_ssl = true,
curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, $connect_timeout);
curl_setopt($ch, CURLOPT_TIMEOUT, $timeout);
if (!isset($config['system']['do_not_send_uniqueid'])) {
- curl_setopt($ch, CURLOPT_USERAGENT, $g['product_name'] . '/' . $g['product_version'] . ' : ' . system_get_uniqueid());
+ curl_setopt($ch, CURLOPT_USERAGENT, $g['product_name'] . '/' . $g['product_version'] . ':' . system_get_uniqueid());
} else {
curl_setopt($ch, CURLOPT_USERAGENT, $g['product_name'] . '/' . $g['product_version']);
}
diff --git a/src/etc/inc/pkg-utils.inc b/src/etc/inc/pkg-utils.inc
index b88082f..e342d94 100644
--- a/src/etc/inc/pkg-utils.inc
+++ b/src/etc/inc/pkg-utils.inc
@@ -79,7 +79,7 @@ function pkg_env($extra_env = array()) {
$user_agent = $g['product_name'] . '/' . $g['product_version'];
if (!isset($config['system']['do_not_send_uniqueid'])) {
- $user_agent .= ' : ' . system_get_uniqueid();
+ $user_agent .= ':' . system_get_uniqueid();
}
$pkg_env_vars = array(
diff --git a/src/usr/local/www/crash_reporter.php b/src/usr/local/www/crash_reporter.php
index 9d474ce..a79a0a7 100644
--- a/src/usr/local/www/crash_reporter.php
+++ b/src/usr/local/www/crash_reporter.php
@@ -48,7 +48,7 @@ function upload_crash_report($files) {
curl_setopt($ch, CURLOPT_SAFE_UPLOAD, false);
curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
if (!isset($config['system']['do_not_send_uniqueid'])) {
- curl_setopt($ch, CURLOPT_USERAGENT, $g['product_name'] . '/' . $g['product_version'] . ' : ' . system_get_uniqueid());
+ curl_setopt($ch, CURLOPT_USERAGENT, $g['product_name'] . '/' . $g['product_version'] . ':' . system_get_uniqueid());
} else {
curl_setopt($ch, CURLOPT_USERAGENT, $g['product_name'] . '/' . $g['product_version']);
}
OpenPOWER on IntegriCloud