Merge branch 'QA_4_6'

ChangeLog

@@ -23,6 +23,7 @@ phpMyAdmin - ChangeLog
 4.6.4 (not yet released)
 - issue        Include X-Robots-Tag header in responses
 - issue        Enfornce numeric field length when creating table
+- issue        Fixed invalid Content-Length in some HTTP responses
 
 4.6.3 (2016-06-23)
 - issue #12249 Fixed cookie path on Windows

libraries/DisplayResults.php

@@ -5263,7 +5263,7 @@ class DisplayResults
 
         if (isset($content)) {
 
-            $size = mb_strlen($content, '8bit');
+            $size = strlen($content);
             $display_size = Util::formatByteDown($size, 3, 1);
             $result .= ' - ' . $display_size[0] . ' ' . $display_size[1];
 

libraries/Linter.php

@@ -38,7 +38,7 @@ class Linter
             $str = new UtfString($str);
         }
 
-        // The reason for using the '8bit' parameter is that the length
+        // The reason for using the strlen is that the length
         // required is the length in bytes, not characters.
         //
         // Given the following string: `????+`, where `?` represents a
@@ -51,7 +51,7 @@ class Linter
         // (which is actually a new line) aren't going to be processed at
         // all.
         $len = ($str instanceof UtfString) ?
-            $str->length() : mb_strlen($len, '8bit');
+            $str->length() : strlen($len);
 
         $lines = array(0);
         for ($i = 0; $i < $len; ++$i) {

libraries/PDF.php

@@ -141,7 +141,7 @@ class PDF extends TCPDF
         PMA_downloadHeader(
             $filename,
             'application/pdf',
-            mb_strlen($pdfData)
+            strlen($pdfData)
         );
         echo $pdfData;
     }

libraries/plugins/auth/AuthenticationCookie.php

@@ -687,7 +687,7 @@ class AuthenticationCookie extends AuthenticationPlugin
                 true
             );
         }
-        if (mb_strlen($this->_cookie_iv, '8bit') < $this->getIVSize()) {
+        if (strlen($this->_cookie_iv) < $this->getIVSize()) {
                 $this->createIV();
         }
 

libraries/plugins/schema/dia/Dia.php

@@ -181,7 +181,7 @@ class Dia extends XMLWriter
         PMA_downloadHeader(
             $fileName,
             'application/x-dia-diagram',
-            mb_strlen($output)
+            strlen($output)
         );
         print $output;
     }

libraries/plugins/schema/eps/Eps.php

@@ -270,7 +270,7 @@ class Eps
         PMA_downloadHeader(
             $fileName,
             'image/x-eps',
-            mb_strlen($output)
+            strlen($output)
         );
         print $output;
     }

libraries/plugins/schema/svg/Svg.php

@@ -193,7 +193,7 @@ class Svg extends XMLWriter
         PMA_downloadHeader(
             $fileName,
             'image/svg+xml',
-            mb_strlen($output)
+            strlen($output)
         );
         print $output;
     }

libraries/tracking.lib.php

@@ -1202,7 +1202,7 @@ function PMA_exportAsFileDownload($entries)
     PMA_downloadHeader(
         $filename,
         'text/x-sql',
-        mb_strlen($dump)
+        strlen($dump)
     );
     echo $dump;
 

tbl_get_field.php

@@ -52,6 +52,6 @@ if ($result === false) {
 PMA_downloadHeader(
     $table . '-' .  $_GET['transform_key'] . '.bin',
     PMA_detectMIME($result),
-    mb_strlen($result, '8bit')
+    strlen($result)
 );
 echo $result;