Changeset 272642 in webkit

Timestamp:

Feb 10, 2021, 1:42:11 AM (6 years ago)

Author:

Carlos Garcia Campos

Message:

Some privateClickMeasurement might output the information in different order depending on platform
​https://bugs.webkit.org/show_bug.cgi?id=221406

Reviewed by Michael Catanzaro.

The script conversionReport.php iterates the HTTP headers to show the information, but header's order can be
different for different platforms. We could just check every value we want to show to make sure we always
provide them in the same order.

• http/tests/privateClickMeasurement/resources/conversionReport.php:

Location:

trunk/LayoutTests

Files:

• ChangeLog (modified) (1 diff)
• http/tests/privateClickMeasurement/resources/conversionReport.php (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2021-02-10  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        Some privateClickMeasurement might output the information in different order depending on platform
+        https://bugs.webkit.org/show_bug.cgi?id=221406
+
+        Reviewed by Michael Catanzaro.
+
+        The script conversionReport.php iterates the HTTP headers to show the information, but header's order can be
+        different for different platforms. We could just check every value we want to show to make sure we always
+        provide them in the same order.
+
+        * http/tests/privateClickMeasurement/resources/conversionReport.php:
+
 2021-02-10  Rob Buis  <rbuis@igalia.com>
 

trunk/LayoutTests/http/tests/privateClickMeasurement/resources/conversionReport.php

@@ -5 +5 @@
 $httpHeaders = $_SERVER;
 $cookiesFound = false;
-foreach ($httpHeaders as $name => $value) {
-    if ($name === "HTTP_HOST") {
-        fwrite($conversionFile, "$name: $value\n");
-    } else if ($name === "REQUEST_URI") {
-        $positionOfNonce = strpos($value, "?nonce=");
-        if ($positionOfNonce === false)
-            $outputURL = $value;
-        else
-            $outputURL = substr($value, 0, $positionOfNonce);
-        fwrite($conversionFile, "$name: $outputURL\n");
-    } else if ($name === "HTTP_COOKIE") {
-        fwrite($conversionFile, "Cookies in attribution request: $value\n");
-        $cookiesFound = true;
-    } else if ($name === "CONTENT_TYPE") {
-        fwrite($conversionFile, "Content type: $value\n");
-    }
+
+if ($value = $httpHeaders["HTTP_HOST"]) {
+    fwrite($conversionFile, "HTTP_HOST: $value\n");
 }
+
+if ($value = $httpHeaders["HTTP_COOKIE"]) {
+    fwrite($conversionFile, "Cookies in attribution request: $value\n");
+    $cookiesFound = true;
+}
+
+if ($value = $httpHeaders["CONTENT_TYPE"]) {
+    fwrite($conversionFile, "Content type: $value\n");
+}
+
+if ($value = $httpHeaders["REQUEST_URI"]) {
+    $value = $httpHeaders["REQUEST_URI"];
+    $positionOfNonce = strpos($value, "?nonce=");
+    if ($positionOfNonce === false)
+        $outputURL = $value;
+    else
+        $outputURL = substr($value, 0, $positionOfNonce);
+    fwrite($conversionFile, "REQUEST_URI: $outputURL\n");
+}
+
 if (!$cookiesFound) {
     fwrite($conversionFile, "No cookies in attribution request.\n");