gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed scenario where error reports may not be sent correctly to error report server

Browse Source
This commit is contained in:
Mohamed Ashraf 2013-06-29 13:36:36 +02:00
parent 6f84aa5af4
commit 96f038f285
1 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
error_report.php
View File

@ -128,15 +128,15 @@ function get_report_data($json_encode = true) {
function send_error_report($report) {
$data_string = json_encode($report);
if (ini_get('allow_url_fopen')) {
$context = array(
'method' => 'POST',
'header' => 'Content-type: application/json',
'content' => $data_string
);
if (strlen($cfg['VersionCheckProxyUrl'])) {
$context = array(
'method' => 'POST',
'header' => 'Content-type: application/json',
'content' => $data_string,
'http' => array(
'proxy' => $cfg['VersionCheckProxyUrl'],
'request_fulluri' => true
)
$context['http'] = array(
'proxy' => $cfg['VersionCheckProxyUrl'],
'request_fulluri' => true
);
if (strlen($cfg['VersionCheckProxyUser'])) {
$auth = base64_encode(
@ -144,14 +144,12 @@ function send_error_report($report) {
);
$context['http']['header'] = 'Proxy-Authorization: Basic ' . $auth;
}
$response = file_get_contents(
$submission_url,
false,
stream_context_create($context)
);
} else {
$response = file_get_contents($file);
}
$response = file_get_contents(
$submission_url,
false,
stream_context_create($context)
);
} else if (function_exists('curl_init')) {
$curl_handle = curl_init($submission_url);
if (strlen($cfg['VersionCheckProxyUrl'])) {