221406 2021-02-04 07:58:56 -0800 Some privateClickMeasurement might output the information in different order depending on platform 2021-02-10 01:43:13 -0800 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 cgarcia webkit-unassigned katherine_cheney mcatanzaro webkit-bug-importer oldest_to_newest 1725623 0 cgarcia 2021-02-04 07:58:56 -0800 The script conversionReport.php iterates the HTTP headers to show the information, but the headers 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. 1725624 1 419283 cgarcia 2021-02-04 08:01:51 -0800 Created attachment 419283 Patch 1725699 2 419283 katherine_cheney 2021-02-04 10:43:05 -0800 Comment on attachment 419283 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=419283&action=review > LayoutTests/ChangeLog:8 > + The script conversionReport.php iterates the HTTP headers to show the information, but the headers order can be nit: header's order > LayoutTests/http/tests/privateClickMeasurement/resources/conversionReport.php:8 > +if (array_key_exists("HTTP_HOST", $httpHeaders)) { Could you do something like “if ($value = $httpHeaders[“HTTP_HOST”]) or will that not work in php? It would turn 2 lines into 1, and only require one lookup. Ditto for all the rest. 1725959 3 419283 cgarcia 2021-02-05 00:15:38 -0800 Comment on attachment 419283 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=419283&action=review >> LayoutTests/ChangeLog:8 >> + The script conversionReport.php iterates the HTTP headers to show the information, but the headers order can be > > nit: header's order Ok. >> LayoutTests/http/tests/privateClickMeasurement/resources/conversionReport.php:8 >> +if (array_key_exists("HTTP_HOST", $httpHeaders)) { > > Could you do something like “if ($value = $httpHeaders[“HTTP_HOST”]) or will that not work in php? It would turn 2 lines into 1, and only require one lookup. Ditto for all the rest. I don't know php, so I'll just try that 1726019 4 419393 cgarcia 2021-02-05 05:14:18 -0800 Created attachment 419393 Patch 1727475 5 cgarcia 2021-02-10 01:42:20 -0800 Committed r272642: <https://trac.webkit.org/changeset/272642> 1727476 6 webkit-bug-importer 2021-02-10 01:43:13 -0800 <rdar://problem/74180943> 419283 2021-02-04 08:01:51 -0800 2021-02-05 05:14:18 -0800 Patch wtest-conversion-report.diff text/plain 3111 cgarcia ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBmZDZjMjNiODUyOTkuLmIwNzA3ZWJkZTRhMSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVz dHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBA CisyMDIxLTAyLTA0ICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4K KworICAgICAgICBTb21lIHByaXZhdGVDbGlja01lYXN1cmVtZW50IG1pZ2h0IG91dHB1dCB0aGUg aW5mb3JtYXRpb24gaW4gZGlmZmVyZW50IG9yZGVyIGRlcGVuZGluZyBvbiBwbGF0Zm9ybQorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjIxNDA2CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhlIHNjcmlwdCBj b252ZXJzaW9uUmVwb3J0LnBocCBpdGVyYXRlcyB0aGUgSFRUUCBoZWFkZXJzIHRvIHNob3cgdGhl IGluZm9ybWF0aW9uLCBidXQgdGhlIGhlYWRlcnMgb3JkZXIgY2FuIGJlCisgICAgICAgIGRpZmZl cmVudCBmb3IgZGlmZmVyZW50IHBsYXRmb3Jtcy4gV2UgY291bGQganVzdCBjaGVjayBldmVyeSB2 YWx1ZSB3ZSB3YW50IHRvIHNob3cgdG8gbWFrZSBzdXJlIHdlIGFsd2F5cworICAgICAgICBwcm92 aWRlIHRoZW0gaW4gdGhlIHNhbWUgb3JkZXIuCisKKyAgICAgICAgKiBodHRwL3Rlc3RzL3ByaXZh dGVDbGlja01lYXN1cmVtZW50L3Jlc291cmNlcy9jb252ZXJzaW9uUmVwb3J0LnBocDoKKwogMjAy MS0wMi0wMSAgTGF1cm8gTW91cmEgIDxsbW91cmFAaWdhbGlhLmNvbT4KIAogICAgICAgICBbR0xJ Ql0gR2FyZGVuaW5nIGNyYXNoZXMgY29tbW9uIHRvIGJvdGggZ2xpYiBwb3J0cwpkaWZmIC0tZ2l0 IGEvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9wcml2YXRlQ2xpY2tNZWFzdXJlbWVudC9yZXNvdXJj ZXMvY29udmVyc2lvblJlcG9ydC5waHAgYi9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL3ByaXZhdGVD bGlja01lYXN1cmVtZW50L3Jlc291cmNlcy9jb252ZXJzaW9uUmVwb3J0LnBocAppbmRleCBkNWFm YjQ0NTc5NWEuLjcwZDQxOWUwOTBiYiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaHR0cC90ZXN0 cy9wcml2YXRlQ2xpY2tNZWFzdXJlbWVudC9yZXNvdXJjZXMvY29udmVyc2lvblJlcG9ydC5waHAK KysrIGIvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9wcml2YXRlQ2xpY2tNZWFzdXJlbWVudC9yZXNv dXJjZXMvY29udmVyc2lvblJlcG9ydC5waHAKQEAgLTQsMjMgKzQsMzMgQEAgcmVxdWlyZV9vbmNl ICdjb252ZXJzaW9uRmlsZVBhdGgucGhwJzsKICRjb252ZXJzaW9uRmlsZSA9IGZvcGVuKCRjb252 ZXJzaW9uRmlsZVBhdGggLiAiLnRtcCIsICd3Jyk7CiAkaHR0cEhlYWRlcnMgPSAkX1NFUlZFUjsK ICRjb29raWVzRm91bmQgPSBmYWxzZTsKLWZvcmVhY2ggKCRodHRwSGVhZGVycyBhcyAkbmFtZSA9 PiAkdmFsdWUpIHsKLSAgICBpZiAoJG5hbWUgPT09ICJIVFRQX0hPU1QiKSB7Ci0gICAgICAgIGZ3 cml0ZSgkY29udmVyc2lvbkZpbGUsICIkbmFtZTogJHZhbHVlXG4iKTsKLSAgICB9IGVsc2UgaWYg KCRuYW1lID09PSAiUkVRVUVTVF9VUkkiKSB7Ci0gICAgICAgICRwb3NpdGlvbk9mTm9uY2UgPSBz dHJwb3MoJHZhbHVlLCAiP25vbmNlPSIpOwotICAgICAgICBpZiAoJHBvc2l0aW9uT2ZOb25jZSA9 PT0gZmFsc2UpCi0gICAgICAgICAgICAkb3V0cHV0VVJMID0gJHZhbHVlOwotICAgICAgICBlbHNl Ci0gICAgICAgICAgICAkb3V0cHV0VVJMID0gc3Vic3RyKCR2YWx1ZSwgMCwgJHBvc2l0aW9uT2ZO b25jZSk7Ci0gICAgICAgIGZ3cml0ZSgkY29udmVyc2lvbkZpbGUsICIkbmFtZTogJG91dHB1dFVS TFxuIik7Ci0gICAgfSBlbHNlIGlmICgkbmFtZSA9PT0gIkhUVFBfQ09PS0lFIikgewotICAgICAg ICBmd3JpdGUoJGNvbnZlcnNpb25GaWxlLCAiQ29va2llcyBpbiBhdHRyaWJ1dGlvbiByZXF1ZXN0 OiAkdmFsdWVcbiIpOwotICAgICAgICAkY29va2llc0ZvdW5kID0gdHJ1ZTsKLSAgICB9IGVsc2Ug aWYgKCRuYW1lID09PSAiQ09OVEVOVF9UWVBFIikgewotICAgICAgICBmd3JpdGUoJGNvbnZlcnNp b25GaWxlLCAiQ29udGVudCB0eXBlOiAkdmFsdWVcbiIpOwotICAgIH0KKworaWYgKGFycmF5X2tl eV9leGlzdHMoIkhUVFBfSE9TVCIsICRodHRwSGVhZGVycykpIHsKKyAgICAkdmFsdWUgPSAkaHR0 cEhlYWRlcnNbIkhUVFBfSE9TVCJdOworICAgIGZ3cml0ZSgkY29udmVyc2lvbkZpbGUsICJIVFRQ X0hPU1Q6ICR2YWx1ZVxuIik7Cit9CisKK2lmIChhcnJheV9rZXlfZXhpc3RzKCJIVFRQX0NPT0tJ RSIsICRodHRwSGVhZGVycykpIHsKKyAgICAkdmFsdWUgPSAkaHR0cEhlYWRlcnNbIkhUVFBfQ09P S0lFIl07CisgICAgZndyaXRlKCRjb252ZXJzaW9uRmlsZSwgIkNvb2tpZXMgaW4gYXR0cmlidXRp b24gcmVxdWVzdDogJHZhbHVlXG4iKTsKKyAgICAkY29va2llc0ZvdW5kID0gdHJ1ZTsKK30KKwor aWYgKGFycmF5X2tleV9leGlzdHMoIkNPTlRFTlRfVFlQRSIsICRodHRwSGVhZGVycykpIHsKKyAg ICAkdmFsdWUgPSAkaHR0cEhlYWRlcnNbIkNPTlRFTlRfVFlQRSJdOworICAgIGZ3cml0ZSgkY29u dmVyc2lvbkZpbGUsICJDb250ZW50IHR5cGU6ICR2YWx1ZVxuIik7Cit9CisKK2lmIChhcnJheV9r ZXlfZXhpc3RzKCJSRVFVRVNUX1VSSSIsICRodHRwSGVhZGVycykpIHsKKyAgICAkdmFsdWUgPSAk aHR0cEhlYWRlcnNbIlJFUVVFU1RfVVJJIl07CisgICAgJHBvc2l0aW9uT2ZOb25jZSA9IHN0cnBv cygkdmFsdWUsICI/bm9uY2U9Iik7CisgICAgaWYgKCRwb3NpdGlvbk9mTm9uY2UgPT09IGZhbHNl KQorICAgICAgICAkb3V0cHV0VVJMID0gJHZhbHVlOworICAgIGVsc2UKKyAgICAgICAgJG91dHB1 dFVSTCA9IHN1YnN0cigkdmFsdWUsIDAsICRwb3NpdGlvbk9mTm9uY2UpOworICAgIGZ3cml0ZSgk Y29udmVyc2lvbkZpbGUsICJSRVFVRVNUX1VSSTogJG91dHB1dFVSTFxuIik7CiB9CisKIGlmICgh JGNvb2tpZXNGb3VuZCkgewogICAgIGZ3cml0ZSgkY29udmVyc2lvbkZpbGUsICJObyBjb29raWVz IGluIGF0dHJpYnV0aW9uIHJlcXVlc3QuXG4iKTsKIH0K 419393 2021-02-05 05:14:18 -0800 2021-02-09 11:19:20 -0800 Patch wk-conversion-report.diff text/plain 2944 cgarcia ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBmZDZjMjNiODUyOTkuLjM5YzNiZmU3MWI3ZiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVz dHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBA CisyMDIxLTAyLTA0ICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4K KworICAgICAgICBTb21lIHByaXZhdGVDbGlja01lYXN1cmVtZW50IG1pZ2h0IG91dHB1dCB0aGUg aW5mb3JtYXRpb24gaW4gZGlmZmVyZW50IG9yZGVyIGRlcGVuZGluZyBvbiBwbGF0Zm9ybQorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjIxNDA2CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhlIHNjcmlwdCBj b252ZXJzaW9uUmVwb3J0LnBocCBpdGVyYXRlcyB0aGUgSFRUUCBoZWFkZXJzIHRvIHNob3cgdGhl IGluZm9ybWF0aW9uLCBidXQgaGVhZGVyJ3Mgb3JkZXIgY2FuIGJlCisgICAgICAgIGRpZmZlcmVu dCBmb3IgZGlmZmVyZW50IHBsYXRmb3Jtcy4gV2UgY291bGQganVzdCBjaGVjayBldmVyeSB2YWx1 ZSB3ZSB3YW50IHRvIHNob3cgdG8gbWFrZSBzdXJlIHdlIGFsd2F5cworICAgICAgICBwcm92aWRl IHRoZW0gaW4gdGhlIHNhbWUgb3JkZXIuCisKKyAgICAgICAgKiBodHRwL3Rlc3RzL3ByaXZhdGVD bGlja01lYXN1cmVtZW50L3Jlc291cmNlcy9jb252ZXJzaW9uUmVwb3J0LnBocDoKKwogMjAyMS0w Mi0wMSAgTGF1cm8gTW91cmEgIDxsbW91cmFAaWdhbGlhLmNvbT4KIAogICAgICAgICBbR0xJQl0g R2FyZGVuaW5nIGNyYXNoZXMgY29tbW9uIHRvIGJvdGggZ2xpYiBwb3J0cwpkaWZmIC0tZ2l0IGEv TGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9wcml2YXRlQ2xpY2tNZWFzdXJlbWVudC9yZXNvdXJjZXMv Y29udmVyc2lvblJlcG9ydC5waHAgYi9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL3ByaXZhdGVDbGlj a01lYXN1cmVtZW50L3Jlc291cmNlcy9jb252ZXJzaW9uUmVwb3J0LnBocAppbmRleCBkNWFmYjQ0 NTc5NWEuLjZmODg0ODEzZDZiMyAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9w cml2YXRlQ2xpY2tNZWFzdXJlbWVudC9yZXNvdXJjZXMvY29udmVyc2lvblJlcG9ydC5waHAKKysr IGIvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9wcml2YXRlQ2xpY2tNZWFzdXJlbWVudC9yZXNvdXJj ZXMvY29udmVyc2lvblJlcG9ydC5waHAKQEAgLTQsMjMgKzQsMzAgQEAgcmVxdWlyZV9vbmNlICdj b252ZXJzaW9uRmlsZVBhdGgucGhwJzsKICRjb252ZXJzaW9uRmlsZSA9IGZvcGVuKCRjb252ZXJz aW9uRmlsZVBhdGggLiAiLnRtcCIsICd3Jyk7CiAkaHR0cEhlYWRlcnMgPSAkX1NFUlZFUjsKICRj b29raWVzRm91bmQgPSBmYWxzZTsKLWZvcmVhY2ggKCRodHRwSGVhZGVycyBhcyAkbmFtZSA9PiAk dmFsdWUpIHsKLSAgICBpZiAoJG5hbWUgPT09ICJIVFRQX0hPU1QiKSB7Ci0gICAgICAgIGZ3cml0 ZSgkY29udmVyc2lvbkZpbGUsICIkbmFtZTogJHZhbHVlXG4iKTsKLSAgICB9IGVsc2UgaWYgKCRu YW1lID09PSAiUkVRVUVTVF9VUkkiKSB7Ci0gICAgICAgICRwb3NpdGlvbk9mTm9uY2UgPSBzdHJw b3MoJHZhbHVlLCAiP25vbmNlPSIpOwotICAgICAgICBpZiAoJHBvc2l0aW9uT2ZOb25jZSA9PT0g ZmFsc2UpCi0gICAgICAgICAgICAkb3V0cHV0VVJMID0gJHZhbHVlOwotICAgICAgICBlbHNlCi0g ICAgICAgICAgICAkb3V0cHV0VVJMID0gc3Vic3RyKCR2YWx1ZSwgMCwgJHBvc2l0aW9uT2ZOb25j ZSk7Ci0gICAgICAgIGZ3cml0ZSgkY29udmVyc2lvbkZpbGUsICIkbmFtZTogJG91dHB1dFVSTFxu Iik7Ci0gICAgfSBlbHNlIGlmICgkbmFtZSA9PT0gIkhUVFBfQ09PS0lFIikgewotICAgICAgICBm d3JpdGUoJGNvbnZlcnNpb25GaWxlLCAiQ29va2llcyBpbiBhdHRyaWJ1dGlvbiByZXF1ZXN0OiAk dmFsdWVcbiIpOwotICAgICAgICAkY29va2llc0ZvdW5kID0gdHJ1ZTsKLSAgICB9IGVsc2UgaWYg KCRuYW1lID09PSAiQ09OVEVOVF9UWVBFIikgewotICAgICAgICBmd3JpdGUoJGNvbnZlcnNpb25G aWxlLCAiQ29udGVudCB0eXBlOiAkdmFsdWVcbiIpOwotICAgIH0KKworaWYgKCR2YWx1ZSA9ICRo dHRwSGVhZGVyc1siSFRUUF9IT1NUIl0pIHsKKyAgICBmd3JpdGUoJGNvbnZlcnNpb25GaWxlLCAi SFRUUF9IT1NUOiAkdmFsdWVcbiIpOworfQorCitpZiAoJHZhbHVlID0gJGh0dHBIZWFkZXJzWyJI VFRQX0NPT0tJRSJdKSB7CisgICAgZndyaXRlKCRjb252ZXJzaW9uRmlsZSwgIkNvb2tpZXMgaW4g YXR0cmlidXRpb24gcmVxdWVzdDogJHZhbHVlXG4iKTsKKyAgICAkY29va2llc0ZvdW5kID0gdHJ1 ZTsKK30KKworaWYgKCR2YWx1ZSA9ICRodHRwSGVhZGVyc1siQ09OVEVOVF9UWVBFIl0pIHsKKyAg ICBmd3JpdGUoJGNvbnZlcnNpb25GaWxlLCAiQ29udGVudCB0eXBlOiAkdmFsdWVcbiIpOworfQor CitpZiAoJHZhbHVlID0gJGh0dHBIZWFkZXJzWyJSRVFVRVNUX1VSSSJdKSB7CisgICAgJHZhbHVl ID0gJGh0dHBIZWFkZXJzWyJSRVFVRVNUX1VSSSJdOworICAgICRwb3NpdGlvbk9mTm9uY2UgPSBz dHJwb3MoJHZhbHVlLCAiP25vbmNlPSIpOworICAgIGlmICgkcG9zaXRpb25PZk5vbmNlID09PSBm YWxzZSkKKyAgICAgICAgJG91dHB1dFVSTCA9ICR2YWx1ZTsKKyAgICBlbHNlCisgICAgICAgICRv dXRwdXRVUkwgPSBzdWJzdHIoJHZhbHVlLCAwLCAkcG9zaXRpb25PZk5vbmNlKTsKKyAgICBmd3Jp dGUoJGNvbnZlcnNpb25GaWxlLCAiUkVRVUVTVF9VUkk6ICRvdXRwdXRVUkxcbiIpOwogfQorCiBp ZiAoISRjb29raWVzRm91bmQpIHsKICAgICBmd3JpdGUoJGNvbnZlcnNpb25GaWxlLCAiTm8gY29v a2llcyBpbiBhdHRyaWJ1dGlvbiByZXF1ZXN0LlxuIik7CiB9Cg==