201279 2019-08-28 20:22:34 -0700 Remove HAVE_CFNETWORK_WITH_IGNORE_HSTS conditional 2019-08-30 13:26:31 -0700 1 1 1 Unclassified WebKit WebKit Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=200694 InRadar P2 Normal --- 1 krollin achristensen achristensen benjamin cdumez cmarcelo commit-queue darin dbates ews-watchlist webkit-bug-importer oldest_to_newest 1566071 0 krollin 2019-08-28 20:22:34 -0700 HAVE_CFNETWORK_WITH_IGNORE_HSTS is always True, so remove the conditional tests, keeping the True branches and removing the False branches. 1566072 1 webkit-bug-importer 2019-08-28 20:22:48 -0700 <rdar://problem/54821189> 1566217 2 377581 achristensen 2019-08-29 07:32:46 -0700 Created attachment 377581 Patch 1566781 3 377581 achristensen 2019-08-30 13:26:26 -0700 Comment on attachment 377581 Patch http://trac.webkit.org/r249342 377581 2019-08-29 07:32:46 -0700 2019-08-30 13:26:26 -0700 Patch bug-201279-20190829073245.patch text/plain 7462 achristensen U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ5MTAzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IGQ0YjhkZDEyZGM0NzZlODllY2MyYmJk Nzc3OWU1OTFmMWZmYzg2MzcuLjJlZWYzYTk5ZGQ0OTFhODFmMGYwNGM5NmUwMDY5NjE5MTA2Mjlh YWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTIgQEAKKzIwMTktMDgtMjkgIEFsZXggQ2hyaXN0ZW5zZW4gIDxh Y2hyaXN0ZW5zZW5Ad2Via2l0Lm9yZz4KKworICAgICAgICBSZW1vdmUgSEFWRV9DRk5FVFdPUktf V0lUSF9JR05PUkVfSFNUUyBjb25kaXRpb25hbAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjAxMjc5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgKiB3dGYvUGxhdGZvcm0uaDoKKwogMjAxOS0wOC0yNSAgRnVq aWkgSGlyb25vcmkgIDxIaXJvbm9yaS5GdWppaUBzb255LmNvbT4KIAogICAgICAgICBSZWdyZXNz aW9uKHIyNDg1MzMpIEFzc2VydGlvbiBoaXQgaW4gaXNNYWluVGhyZWFkKCkgZm9yIHNvbWUgY2xp ZW50cyB1c2luZyBXVEYgYmVjYXVzZSB0aGUgbWFpbiB0aHJlYWQgaXMgbm90IGluaXRpYWxpemVk CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cKaW5kZXggNjQ2NjdiMTVmMjZiZmE4NmRiNWYyMDFlYTlmZmQ1NzExZjM1MGQyMy4u Zjc2MWRkMzEzNTZmNDMxNWU3MDcxNzgxOTUxMWRmNWVjMzM3YzE5YyAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAt MSwzICsxLDE2IEBACisyMDE5LTA4LTI5ICBBbGV4IENocmlzdGVuc2VuICA8YWNocmlzdGVuc2Vu QHdlYmtpdC5vcmc+CisKKyAgICAgICAgUmVtb3ZlIEhBVkVfQ0ZORVRXT1JLX1dJVEhfSUdOT1JF X0hTVFMgY29uZGl0aW9uYWwKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTIwMTI3OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIE5vIG5ldyB0ZXN0cyAoT09QUyEpLgorCisgICAgICAgICogcGxhdGZvcm0vbmV0 d29yay9tYWMvV2ViQ29yZVVSTFJlc3BvbnNlLm1tOgorICAgICAgICAoV2ViQ29yZTo6c3ludGhl c2l6ZVJlZGlyZWN0UmVzcG9uc2VJZk5lY2Vzc2FyeSk6CisgICAgICAgIChXZWJDb3JlOjpzY2hl bWVXYXNVcGdyYWRlZER1ZVRvRHluYW1pY0hTVFMpOiBEZWxldGVkLgorCiAyMDE5LTA4LTI2ICBZ b3Vlbm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KIAogICAgICAgICBNZXNzYWdlUG9ydCBz aG91bGQgYmUgV2Vha1B0ckZhY3RvcnlJbml0aWFsaXphdGlvbjo6RWFnZXIKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKaW5kZXgg ZTY0MjUxMmE3YzBjNGQ1MDFkZWViZTBhMDhiODY2NmJhYTg3ODU3NC4uMzZkZjIwZTVmYzA0NWE2 MTc1ZjM3YjYzNDVjN2M0MzYzYzNkNTA2MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9DaGFu Z2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNiBAQAorMjAx OS0wOC0yOSAgQWxleCBDaHJpc3RlbnNlbiAgPGFjaHJpc3RlbnNlbkB3ZWJraXQub3JnPgorCisg ICAgICAgIFJlbW92ZSBIQVZFX0NGTkVUV09SS19XSVRIX0lHTk9SRV9IU1RTIGNvbmRpdGlvbmFs CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDEyNzkK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIE5ldHdv cmtQcm9jZXNzL2NvY29hL05ldHdvcmtTZXNzaW9uQ29jb2EubW06CisgICAgICAgIChpZ25vcmVI U1RTKToKKyAgICAgICAgKHVwZGF0ZUlnbm9yZVN0cmljdFRyYW5zcG9ydFNlY3VyaXR5U2V0dGlu Z0lmTmVjZXNzYXJ5KToKKyAgICAgICAgKC1bV0tOZXR3b3JrU2Vzc2lvbkRlbGVnYXRlIFVSTFNl c3Npb246dGFzazp3aWxsUGVyZm9ybUhUVFBSZWRpcmVjdGlvbjpuZXdSZXF1ZXN0OmNvbXBsZXRp b25IYW5kbGVyOl0pOgorICAgICAgICAoLVtXS05ldHdvcmtTZXNzaW9uRGVsZWdhdGUgVVJMU2Vz c2lvbjp0YXNrOl9zY2hlbWVVcGdyYWRlZDpjb21wbGV0aW9uSGFuZGxlcjpdKToKKwogMjAxOS0w OC0yNiAgUnVzc2VsbCBFcHN0ZWluICA8cmVwc3RlaW5AYXBwbGUuY29tPgogCiAgICAgICAgIFVu cmV2aWV3ZWQsIHJvbGxpbmcgb3V0IHIyNDg5NjEuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL3d0 Zi9QbGF0Zm9ybS5oIGIvU291cmNlL1dURi93dGYvUGxhdGZvcm0uaAppbmRleCAwZTZmYWFhOGIx M2RjMWUwOTI3Njk4YTQ1MDFlYzRjOTBiMDdlYTk5Li41MDg3MzZjNTkwMWQyNjIzMjdmMDAwMDkw ODc1OTEwZGJlOWFmYTAyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV1RGL3d0Zi9QbGF0Zm9ybS5oCisr KyBiL1NvdXJjZS9XVEYvd3RmL1BsYXRmb3JtLmgKQEAgLTE0MzUsMTAgKzE0MzUsNiBAQAogI2Vu ZGlmCiAjZW5kaWYKIAotI2lmIFBMQVRGT1JNKE1BQykgfHwgUExBVEZPUk0oSU9TX0ZBTUlMWSkK LSNkZWZpbmUgSEFWRV9DRk5FVFdPUktfV0lUSF9JR05PUkVfSFNUUyAxCi0jZW5kaWYKLQogI2lm IFBMQVRGT1JNKE1BQykgfHwgUExBVEZPUk0oSU9TX0ZBTUlMWSkKICNkZWZpbmUgSEFWRV9DRk5F VFdPUktfV0lUSF9BVVRPX0FEREVEX0hUVFBfSEVBREVSX1NVUFBSRVNTSU9OX1NVUFBPUlQgMQog LyogRklYTUU6IERvZXMgdGhpcyB3b3JrLCBhbmQgaXMgdGhpcyBuZWVkZWQgb24gb3RoZXIgaU9T IGZhbWlseSBwbGF0Zm9ybXM/ICovCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9uZXR3b3JrL21hYy9XZWJDb3JlVVJMUmVzcG9uc2UubW0gYi9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9uZXR3b3JrL21hYy9XZWJDb3JlVVJMUmVzcG9uc2UubW0KaW5kZXggNTQ4NjQ0MGQ3Mzg5 NGFjMTQyOTcwMGJhZjQ5YTE3NzU3ODhkOWRiZC4uMzJlMTA3MzJhMzcwZWMyOTcwMDRjNGQ4NzFm N2U0YWNkNTU0MmZiZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29y ay9tYWMvV2ViQ29yZVVSTFJlc3BvbnNlLm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L25ldHdvcmsvbWFjL1dlYkNvcmVVUkxSZXNwb25zZS5tbQpAQCAtMzMwLDIyICszMzAsMTIgQEAg dm9pZCBhZGp1c3RNSU1FVHlwZUlmTmVjZXNzYXJ5KENGVVJMUmVzcG9uc2VSZWYgY2ZSZXNwb25z ZSwgYm9vbCBpc01haW5SZXNvdXJjZUwKIH0KICNlbmRpZgogCi1zdGF0aWMgYm9vbCBzY2hlbWVX YXNVcGdyYWRlZER1ZVRvRHluYW1pY0hTVFMoTlNVUkxSZXF1ZXN0ICpyZXF1ZXN0KQotewotI2lm IEhBVkUoQ0ZORVRXT1JLX1dJVEhfSUdOT1JFX0hTVFMpCi0gICAgcmV0dXJuIFtyZXF1ZXN0IF9z Y2hlbWVXYXNVcGdyYWRlZER1ZVRvRHluYW1pY0hTVFNdOwotI2Vsc2UKLSAgICBVTlVTRURfUEFS QU0ocmVxdWVzdCk7Ci0gICAgcmV0dXJuIGZhbHNlOwotI2VuZGlmCi19Ci0KIE5TVVJMUmVzcG9u c2UgKnN5bnRoZXNpemVSZWRpcmVjdFJlc3BvbnNlSWZOZWNlc3NhcnkoTlNVUkxSZXF1ZXN0ICpj dXJyZW50UmVxdWVzdCwgTlNVUkxSZXF1ZXN0ICpuZXdSZXF1ZXN0LCBOU1VSTFJlc3BvbnNlICpy ZWRpcmVjdFJlc3BvbnNlKQogewogICAgIGlmIChyZWRpcmVjdFJlc3BvbnNlKQogICAgICAgICBy ZXR1cm4gcmVkaXJlY3RSZXNwb25zZTsKIAotICAgIGlmIChbW1tuZXdSZXF1ZXN0IFVSTF0gc2No ZW1lXSBpc0VxdWFsVG9TdHJpbmc6W1tjdXJyZW50UmVxdWVzdCBVUkxdIHNjaGVtZV1dICYmICFz Y2hlbWVXYXNVcGdyYWRlZER1ZVRvRHluYW1pY0hTVFMobmV3UmVxdWVzdCkpCisgICAgaWYgKFtb W25ld1JlcXVlc3QgVVJMXSBzY2hlbWVdIGlzRXF1YWxUb1N0cmluZzpbW2N1cnJlbnRSZXF1ZXN0 IFVSTF0gc2NoZW1lXV0gJiYgIVtuZXdSZXF1ZXN0IF9zY2hlbWVXYXNVcGdyYWRlZER1ZVRvRHlu YW1pY0hTVFNdKQogICAgICAgICByZXR1cm4gbmlsOwogCiAgICAgcmV0dXJuIFtbUmVzb3VyY2VS ZXNwb25zZTo6c3ludGhldGljUmVkaXJlY3RSZXNwb25zZShVUkwoW2N1cnJlbnRSZXF1ZXN0IFVS TF0pLCBVUkwoW25ld1JlcXVlc3QgVVJMXSkpLm5zVVJMUmVzcG9uc2UoKSByZXRhaW5dIGF1dG9y ZWxlYXNlXTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvY29jb2Ev TmV0d29ya1Nlc3Npb25Db2NvYS5tbSBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvY29j b2EvTmV0d29ya1Nlc3Npb25Db2NvYS5tbQppbmRleCA5NWZiNzgzYTQ1OWExMTUzN2JkMDE1MjVh ODVjYTc2YTJlMDc0OGE2Li44NDQzZjhiNjg3ZTJkOWE1NjNmNjMxYjc1ZTA2MmRlMjJiMDIyNTRi IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL2NvY29hL05ldHdvcmtT ZXNzaW9uQ29jb2EubW0KKysrIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jb2NvYS9O ZXR3b3JrU2Vzc2lvbkNvY29hLm1tCkBAIC0zOTksNyArMzk5LDcgQEAgc3RhdGljIFN0cmluZyBz dHJpbmdGb3JTU0xDaXBoZXIoU1NMQ2lwaGVyU3VpdGUgY2lwaGVyKQogICAgIGNvbXBsZXRpb25I YW5kbGVyKFdlYkNvcmU6OmNyZWF0ZUhUVFBCb2R5TlNJbnB1dFN0cmVhbSgqYm9keSkuZ2V0KCkp OwogfQogCi0jaWYgSEFWRShDRk5FVFdPUktfV0lUSF9JR05PUkVfSFNUUykgJiYgRU5BQkxFKFJF U09VUkNFX0xPQURfU1RBVElTVElDUykKKyNpZiBFTkFCTEUoUkVTT1VSQ0VfTE9BRF9TVEFUSVNU SUNTKQogc3RhdGljIE5TVVJMUmVxdWVzdCogZG93bmdyYWRlUmVxdWVzdChOU1VSTFJlcXVlc3Qg KnJlcXVlc3QpCiB7CiAgICAgTlNNdXRhYmxlVVJMUmVxdWVzdCAqbnNNdXRhYmxlUmVxdWVzdCA9 IFtbcmVxdWVzdCBtdXRhYmxlQ29weV0gYXV0b3JlbGVhc2VdOwpAQCAtNDIyLDcgKzQyMiw2IEBA IHN0YXRpYyBib29sIHNjaGVtZVdhc1VwZ3JhZGVkRHVlVG9EeW5hbWljSFNUUyhOU1VSTFJlcXVl c3QgKnJlcXVlc3QpCiB9CiAjZW5kaWYKIAotI2lmIEhBVkUoQ0ZORVRXT1JLX1dJVEhfSUdOT1JF X0hTVFMpCiBzdGF0aWMgdm9pZCBzZXRJZ25vcmVIU1RTKE5TTXV0YWJsZVVSTFJlcXVlc3QgKnJl cXVlc3QsIGJvb2wgaWdub3JlSFNUUykKIHsKICAgICBpZiAoW3JlcXVlc3QgcmVzcG9uZHNUb1Nl bGVjdG9yOkBzZWxlY3Rvcihfc2V0SWdub3JlSFNUUzopXSkKQEAgLTQzNCwxMSArNDMzLDkgQEAg c3RhdGljIGJvb2wgaWdub3JlSFNUUyhOU1VSTFJlcXVlc3QgKnJlcXVlc3QpCiAgICAgcmV0dXJu IFtyZXF1ZXN0IHJlc3BvbmRzVG9TZWxlY3RvcjpAc2VsZWN0b3IoX2lnbm9yZUhTVFMpXQogICAg ICAgICAmJiBbcmVxdWVzdCBfaWdub3JlSFNUU107CiB9Ci0jZW5kaWYKIAogc3RhdGljIE5TVVJM UmVxdWVzdCogdXBkYXRlSWdub3JlU3RyaWN0VHJhbnNwb3J0U2VjdXJpdHlTZXR0aW5nSWZOZWNl c3NhcnkoTlNVUkxSZXF1ZXN0ICpyZXF1ZXN0LCBib29sIHNob3VsZElnbm9yZUhTVFMpCiB7Ci0j aWYgSEFWRShDRk5FVFdPUktfV0lUSF9JR05PUkVfSFNUUykKICAgICBpZiAoW3JlcXVlc3QuVVJM LnNjaGVtZSBpc0VxdWFsVG9TdHJpbmc6QCJodHRwcyJdICYmIHNob3VsZElnbm9yZUhTVFMgJiYg aWdub3JlSFNUUyhyZXF1ZXN0KSkgewogICAgICAgICAvLyBUaGUgcmVxdWVzdCB3YXMgdXBncmFk ZWQgZm9yIHNvbWUgb3RoZXIgcmVhc29uIHRoYW4gSFNUUy4KICAgICAgICAgLy8gRG9uJ3QgaWdu b3JlIEhTVFMgdG8gYXZvaWQgdGhlIHJpc2sgb2YgYW5vdGhlciBkb3duZ3JhZGUuCkBAIC00NTIs OSArNDQ5LDYgQEAgc3RhdGljIE5TVVJMUmVxdWVzdCogdXBkYXRlSWdub3JlU3RyaWN0VHJhbnNw b3J0U2VjdXJpdHlTZXR0aW5nSWZOZWNlc3NhcnkoTlNVUkwKICAgICAgICAgc2V0SWdub3JlSFNU Uyhuc011dGFibGVSZXF1ZXN0LCBzaG91bGRJZ25vcmVIU1RTKTsKICAgICAgICAgcmV0dXJuIG5z TXV0YWJsZVJlcXVlc3Q7CiAgICAgfQotI2Vsc2UKLSAgICBVTlVTRURfUEFSQU0oc2hvdWxkSWdu b3JlSFNUUyk7Ci0jZW5kaWYKIAogICAgIHJldHVybiByZXF1ZXN0OwogfQpAQCAtNDY4LDcgKzQ2 Miw3IEBAIHN0YXRpYyBOU1VSTFJlcXVlc3QqIHVwZGF0ZUlnbm9yZVN0cmljdFRyYW5zcG9ydFNl Y3VyaXR5U2V0dGluZ0lmTmVjZXNzYXJ5KE5TVVJMCiAgICAgICAgIGF1dG8gY29tcGxldGlvbkhh bmRsZXJDb3B5ID0gQmxvY2tfY29weShjb21wbGV0aW9uSGFuZGxlcik7CiAKICAgICAgICAgYm9v bCBzaG91bGRJZ25vcmVIU1RTID0gZmFsc2U7Ci0jaWYgSEFWRShDRk5FVFdPUktfV0lUSF9JR05P UkVfSFNUUykgJiYgRU5BQkxFKFJFU09VUkNFX0xPQURfU1RBVElTVElDUykgICAgICAgIAorI2lm IEVOQUJMRShSRVNPVVJDRV9MT0FEX1NUQVRJU1RJQ1MpCiAgICAgICAgIHNob3VsZElnbm9yZUhT VFMgPSBzY2hlbWVXYXNVcGdyYWRlZER1ZVRvRHluYW1pY0hTVFMocmVxdWVzdCkgJiYgX3Nlc3Np b24tPm5ldHdvcmtQcm9jZXNzKCkuc3RvcmFnZVNlc3Npb24oX3Nlc3Npb24tPnNlc3Npb25JRCgp KS0+c2hvdWxkQmxvY2tDb29raWVzKHJlcXVlc3QsIG5ldHdvcmtEYXRhVGFzay0+ZnJhbWVJRCgp LCBuZXR3b3JrRGF0YVRhc2stPnBhZ2VJRCgpKTsKICAgICAgICAgaWYgKHNob3VsZElnbm9yZUhT VFMpIHsKICAgICAgICAgICAgIHJlcXVlc3QgPSBkb3duZ3JhZGVSZXF1ZXN0KHJlcXVlc3QpOwpA QCAtNTAxLDcgKzQ5NSw3IEBAIHN0YXRpYyBOU1VSTFJlcXVlc3QqIHVwZGF0ZUlnbm9yZVN0cmlj dFRyYW5zcG9ydFNlY3VyaXR5U2V0dGluZ0lmTmVjZXNzYXJ5KE5TVVJMCiAKICAgICBpZiAoYXV0 byogbmV0d29ya0RhdGFUYXNrID0gW3NlbGYgZXhpc3RpbmdUYXNrOnRhc2tdKSB7CiAgICAgICAg IGJvb2wgc2hvdWxkSWdub3JlSFNUUyA9IGZhbHNlOwotI2lmIEhBVkUoQ0ZORVRXT1JLX1dJVEhf SUdOT1JFX0hTVFMpICYmIEVOQUJMRShSRVNPVVJDRV9MT0FEX1NUQVRJU1RJQ1MpCisjaWYgRU5B QkxFKFJFU09VUkNFX0xPQURfU1RBVElTVElDUykKICAgICAgICAgc2hvdWxkSWdub3JlSFNUUyA9 IHNjaGVtZVdhc1VwZ3JhZGVkRHVlVG9EeW5hbWljSFNUUyhyZXF1ZXN0KSAmJiBfc2Vzc2lvbi0+ bmV0d29ya1Byb2Nlc3MoKS5zdG9yYWdlU2Vzc2lvbihfc2Vzc2lvbi0+c2Vzc2lvbklEKCkpLT5z aG91bGRCbG9ja0Nvb2tpZXMocmVxdWVzdCwgbmV0d29ya0RhdGFUYXNrLT5mcmFtZUlEKCksIG5l dHdvcmtEYXRhVGFzay0+cGFnZUlEKCkpOwogICAgICAgICBpZiAoc2hvdWxkSWdub3JlSFNUUykg ewogICAgICAgICAgICAgcmVxdWVzdCA9IGRvd25ncmFkZVJlcXVlc3QocmVxdWVzdCk7Cg==