From 0f1f046488472e86bb6a7d1c4f33dd1cec901fda Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Wed, 22 Feb 2017 09:14:21 +0100 Subject: [PATCH 1/4] Wrap long line MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michal Čihař --- libraries/error_report.lib.php | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/libraries/error_report.lib.php b/libraries/error_report.lib.php index 006ec1f012..c5cdc87802 100644 --- a/libraries/error_report.lib.php +++ b/libraries/error_report.lib.php @@ -178,8 +178,13 @@ function PMA_sanitizeUrl($url) */ function PMA_sendErrorReport($report) { - $data_string = json_encode($report); - $response = PMA\libraries\Util::httpRequest(SUBMISSION_URL, "POST", false, $data_string, "Content-Type: application/json\r\n"); + $response = PMA\libraries\Util::httpRequest( + SUBMISSION_URL, + "POST", + false, + json_encode($report), + "Content-Type: application/json\r\n" + ); return $response; } From 1d08dd281b43852f57be59ff76aa548623996705 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Wed, 22 Feb 2017 09:21:58 +0100 Subject: [PATCH 2/4] Pass correct headers to httpRequest MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michal Čihař --- libraries/error_report.lib.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/error_report.lib.php b/libraries/error_report.lib.php index c5cdc87802..807520b108 100644 --- a/libraries/error_report.lib.php +++ b/libraries/error_report.lib.php @@ -183,7 +183,7 @@ function PMA_sendErrorReport($report) "POST", false, json_encode($report), - "Content-Type: application/json\r\n" + "Content-Type: application/json" ); return $response; } From cddbb01a2b1f36e1e878970d1a9929e53cc64d16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Wed, 22 Feb 2017 09:48:12 +0100 Subject: [PATCH 3/4] Do not ask CURL to return headers when we're sending one MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michal Čihař --- libraries/Util.php | 1 - 1 file changed, 1 deletion(-) diff --git a/libraries/Util.php b/libraries/Util.php index b24a5c083b..64eda190a4 100644 --- a/libraries/Util.php +++ b/libraries/Util.php @@ -4779,7 +4779,6 @@ class Util } if ($header) { curl_setopt($curl_handle, CURLOPT_HTTPHEADER, array($header)); - curl_setopt($curl_handle, CURLOPT_HEADER, true); } if ($method == "POST") { From 8ea5ea351b82169906f1176508837811b7ec5bcd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Wed, 22 Feb 2017 09:50:52 +0100 Subject: [PATCH 4/4] Document bugfix MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michal Čihař --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index 77246db03d..8afd63c029 100644 --- a/ChangeLog +++ b/ChangeLog @@ -85,6 +85,7 @@ phpMyAdmin - ChangeLog - issue #13021 Show phpMyAdmin errors even with error_reporting set to 0 - issue #13020 Removed warning about client and server versions mismatch - issue Hide comments on table Structure tab when no comment is set +- issue Fixed submission of error reports 4.6.6 (2017-01-23) - issue #12759 Fix Notice regarding 'Undefined index: old_usergroup'