227008 2021-06-14 20:05:04 -0700 [SOUP] Add Timing-Allow-Origin checks to NetworkDataTaskSoup 2021-06-18 01:05:35 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Linux RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=226678 InRadar, Soup P2 Normal --- 1 crzwdjk webkit-unassigned aperez bugs-noreply cgarcia dpino webkit-bug-importer oldest_to_newest 1769673 0 crzwdjk 2021-06-14 20:05:04 -0700 Bug 226678 moved Timing-Allow-Origin checks to the network process on cocoa but did not do so for soup. It also added a number of web platform tests for Timing-Allow-Origin that fail on Linux. NetworkDataTaskSoup::continueHTTPRedirection() needs to add the checks as mentioned in the FIXME comment in that method. 1770051 1 431508 crzwdjk 2021-06-15 18:37:06 -0700 Created attachment 431508 Patch 1770105 2 ews-feeder 2021-06-16 01:11:25 -0700 Committed r278924 (238855@main): <https://commits.webkit.org/238855@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 431508. 1770106 3 webkit-bug-importer 2021-06-16 01:12:18 -0700 <rdar://problem/79384792> 1770208 4 crzwdjk 2021-06-16 08:55:37 -0700 Reopening to track the fix. 1770558 5 431639 cgarcia 2021-06-17 02:18:29 -0700 Created attachment 431639 Patch 1770951 6 cgarcia 2021-06-18 01:05:35 -0700 Committed r279032 (238952@main): <https://commits.webkit.org/238952@main> 431508 2021-06-15 18:37:06 -0700 2021-06-16 01:11:25 -0700 Patch bug-227008-20210615213705.patch text/plain 2976 crzwdjk U3VidmVyc2lvbiBSZXZpc2lvbjogMjc4ODkxCmRpZmYgLS1naXQgTGF5b3V0VGVzdHMvQ2hhbmdl TG9nIExheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCAyMzk4YmFmN2MwZDRiMmQyNWE4ZTgwMGRi ZTk3Y2RhMjgyYzNlZjc5Li5hNzRlYWZmNWUzNjY4ODIyNDZjMTI1MGEzMGFhNjRkMDVjZTI5ZmQy IDEwMDY0NAotLS0gTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBMYXlvdXRUZXN0cy9DaGFuZ2VM b2cKQEAgLTEsMyArMSwxMCBAQAorMjAyMS0wNi0xNSAgQXJjYWR5IEdvbGRtaW50cy1PcmxvdiAg PGFnb2xkbWludHNAaWdhbGlhLmNvbT4KKworICAgICAgICBbR0xJQl0gVW5yZXZpZXdlZCB0ZXN0 IGdhcmRlbmluZywgYWRkIHNvbWUgbmV3IFRpbWluZy1BbGxvdy1PcmlnaW4gZmFpbHVyZXMKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyNzAwOAorCisg ICAgICAgICogcGxhdGZvcm0vZ2xpYi9UZXN0RXhwZWN0YXRpb25zOgorCiAyMDIxLTA2LTE1ICBD aHJpcyBMb3JkICA8Y2xvcmRAaWdhbGlhLmNvbT4KIAogICAgICAgICBTY3JvbGxiYXJzIGFyZSBu b3QgY2xpcHBlZCB0byBsYXllciBib3VuZHMgaW4gUmVuZGVyTGF5ZXJCYWNraW5nCmRpZmYgLS1n aXQgTGF5b3V0VGVzdHMvcGxhdGZvcm0vZ2xpYi9UZXN0RXhwZWN0YXRpb25zIExheW91dFRlc3Rz L3BsYXRmb3JtL2dsaWIvVGVzdEV4cGVjdGF0aW9ucwppbmRleCBjNGEwNmUzZGQ4MjYyZTc4YWRh NGE2OWQyOTliZWY4ZTg1NTg2MjcwLi5mODVlOWUzM2U1NDMwYWExNmVmZGI4YzU3Y2ZkYjc5Yjdl NmY4OGI1IDEwMDY0NAotLS0gTGF5b3V0VGVzdHMvcGxhdGZvcm0vZ2xpYi9UZXN0RXhwZWN0YXRp b25zCisrKyBMYXlvdXRUZXN0cy9wbGF0Zm9ybS9nbGliL1Rlc3RFeHBlY3RhdGlvbnMKQEAgLTg4 NCw2ICs4ODQsMjIgQEAgd2Via2l0Lm9yZy9iLzE4NTI1NCBodHRwL3Rlc3RzL3htbGh0dHByZXF1 ZXN0L3Jlc3BvbnNlLWFjY2Vzcy1vbi1lcnJvci5odG1sIFsgRHUKIHdlYmtpdC5vcmcvYi8xNzk0 NzUgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9mZXRjaC9hcGkvYmFzaWMvcmVxdWVz dC1oZWFkZXJzLWNhc2UuYW55Lmh0bWwgWyBGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8xNzk0NzUg aW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9mZXRjaC9hcGkvYmFzaWMvcmVxdWVzdC1o ZWFkZXJzLWNhc2UuYW55Lndvcmtlci5odG1sIFsgRmFpbHVyZSBdCiAKKyMgUmVsYXRlZCB0byBt b3ZpbmcgdG8gVGltaW5nLUFsbG93LU9yaWdpbiBjaGVja3MgaW50byB0aGUgbmV0d29yayBwcm9j ZXNzCit3ZWJraXQub3JnL2IvMjI3MDA4IGh0dHAvdGVzdHMvbWlzYy93ZWJ0aW1pbmctY3Jvc3Mt b3JpZ2luLWFuZC1iYWNrMS5odG1sIFsgRmFpbHVyZSBdCit3ZWJraXQub3JnL2IvMjI3MDA4IGh0 dHAvdGVzdHMvbWlzYy93ZWJ0aW1pbmctY3Jvc3Mtb3JpZ2luLXJlZGlyZWN0LnB5IFsgRmFpbHVy ZSBdCit3ZWJraXQub3JnL2IvMjI3MDA4IGh0dHAvd3B0L3Jlc291cmNlLXRpbWluZy9ydC1jb3Jz Lmh0bWwgWyBGYWlsdXJlIF0KK3dlYmtpdC5vcmcvYi8yMjcwMDggaHR0cC93cHQvcmVzb3VyY2Ut dGltaW5nL3J0LWNvcnMud29ya2VyLmh0bWwgWyBGYWlsdXJlIF0KK3dlYmtpdC5vcmcvYi8yMjcw MDggaHR0cC93cHQvcmVzb3VyY2UtdGltaW5nL3J0LXJldmFsaWRhdGUtcmVxdWVzdHMtMi5odG1s IFsgRmFpbHVyZSBdCit3ZWJraXQub3JnL2IvMjI3MDA4IGltcG9ydGVkL3czYy93ZWItcGxhdGZv cm0tdGVzdHMvcmVzb3VyY2UtdGltaW5nL1RBTy1jYXNlLWluc2Vuc2l0aXZlLW51bGwtb3BhcXVl LW9yaWdpbi5zdWIuaHRtbCBbIEZhaWx1cmUgXQord2Via2l0Lm9yZy9iLzIyNzAwOCBpbXBvcnRl ZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL3Jlc291cmNlLXRpbWluZy9UQU8tY3Jvc3NvcmlnaW4t cG9ydC5zdWIuaHRtbCBbIEZhaWx1cmUgXQord2Via2l0Lm9yZy9iLzIyNzAwOCBpbXBvcnRlZC93 M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL3Jlc291cmNlLXRpbWluZy9jcm9zcy1vcmlnaW4tcmVkaXJl Y3RzLmh0bWwgWyBGYWlsdXJlIF0KK3dlYmtpdC5vcmcvYi8yMjcwMDggaW1wb3J0ZWQvdzNjL3dl Yi1wbGF0Zm9ybS10ZXN0cy9yZXNvdXJjZS10aW1pbmcvcmVkaXJlY3RzLmh0bWwgWyBGYWlsdXJl IF0KK3dlYmtpdC5vcmcvYi8yMjcwMDggaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9y ZXNvdXJjZS10aW1pbmcvcmVzb3VyY2VfcmV1c2Uuc3ViLmh0bWwgWyBGYWlsdXJlIF0KK3dlYmtp dC5vcmcvYi8yMjcwMDggaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9yZXNvdXJjZS10 aW1pbmcvcmVzb3VyY2VfdGltaW5nX2NvbnRlbnRfbGVuZ3RoLmh0bWwgWyBGYWlsdXJlIF0KK3dl YmtpdC5vcmcvYi8yMjcwMDggaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9yZXNvdXJj ZS10aW1pbmcvc2FtZS1vcmlnaW4tZnJvbS1jcm9zcy1vcmlnaW4tcmVkaXJlY3QuaHRtbCBbIEZh aWx1cmUgXQord2Via2l0Lm9yZy9iLzIyNzAwOCBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRl c3RzL3NlcnZlci10aW1pbmcvY3Jvc3Nfb3JpZ2luLmh0bWwgWyBGYWlsdXJlIF0KK3dlYmtpdC5v cmcvYi8yMjcwMDggaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9zZXJ2aWNlLXdvcmtl cnMvc2VydmljZS13b3JrZXIvcmVzb3VyY2UtdGltaW5nLWNyb3NzLW9yaWdpbi5odHRwcy5odG1s IFsgRmFpbHVyZSBdCisKICMvLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8v Ly8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vCiAjIEVuZCBv ZiBTT1VQIGFuZCBOZXR3b3JraW5nLXJlbGF0ZWQgYnVncwogIy8vLy8vLy8vLy8vLy8vLy8vLy8v Ly8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8v Ly8vLy8vLy8vLy8K 431639 2021-06-17 02:18:29 -0700 2021-06-17 04:03:39 -0700 Patch wk2-soup-tao.diff text/plain 10868 cgarcia ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCA0NjQxNThkNmVlMWIuLjVlZmYwNjAxNTQyNSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVz dHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEzIEBA CisyMDIxLTA2LTE3ICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4K KworICAgICAgICBbU09VUF0gQWRkIFRpbWluZy1BbGxvdy1PcmlnaW4gY2hlY2tzIHRvIE5ldHdv cmtEYXRhVGFza1NvdXAKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTIyNzAwOAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNzkzODQ3OTI+CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9nbGli L1Rlc3RFeHBlY3RhdGlvbnM6CisKIDIwMjEtMDYtMTYgIENocmlzIER1bWV6ICA8Y2R1bWV6QGFw cGxlLmNvbT4KIAogICAgICAgICBEb2N1bWVudCdzIGV4ZWNDb21tYW5kKCkgLyBxdWVyeUNvbW1h bmQqKCkgc2hvdWxkIHRocm93IGFuIGV4Y2VwdGlvbiBvbiBub24tSFRNTC9YSFRNTCBkb2N1bWVu dHMKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3BsYXRmb3JtL2dsaWIvVGVzdEV4cGVjdGF0aW9u cyBiL0xheW91dFRlc3RzL3BsYXRmb3JtL2dsaWIvVGVzdEV4cGVjdGF0aW9ucwppbmRleCAxNjMx NDlmODBhY2EuLmJhZTE4MWU0NTk1ZSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0v Z2xpYi9UZXN0RXhwZWN0YXRpb25zCisrKyBiL0xheW91dFRlc3RzL3BsYXRmb3JtL2dsaWIvVGVz dEV4cGVjdGF0aW9ucwpAQCAtODg0LDIyICs4ODQsNiBAQCB3ZWJraXQub3JnL2IvMTg1MjU0IGh0 dHAvdGVzdHMveG1saHR0cHJlcXVlc3QvcmVzcG9uc2UtYWNjZXNzLW9uLWVycm9yLmh0bWwgWyBE dQogd2Via2l0Lm9yZy9iLzE3OTQ3NSBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Zl dGNoL2FwaS9iYXNpYy9yZXF1ZXN0LWhlYWRlcnMtY2FzZS5hbnkuaHRtbCBbIEZhaWx1cmUgXQog d2Via2l0Lm9yZy9iLzE3OTQ3NSBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2ZldGNo L2FwaS9iYXNpYy9yZXF1ZXN0LWhlYWRlcnMtY2FzZS5hbnkud29ya2VyLmh0bWwgWyBGYWlsdXJl IF0KIAotIyBSZWxhdGVkIHRvIG1vdmluZyB0byBUaW1pbmctQWxsb3ctT3JpZ2luIGNoZWNrcyBp bnRvIHRoZSBuZXR3b3JrIHByb2Nlc3MKLXdlYmtpdC5vcmcvYi8yMjcwMDggaHR0cC90ZXN0cy9t aXNjL3dlYnRpbWluZy1jcm9zcy1vcmlnaW4tYW5kLWJhY2sxLmh0bWwgWyBGYWlsdXJlIF0KLXdl YmtpdC5vcmcvYi8yMjcwMDggaHR0cC90ZXN0cy9taXNjL3dlYnRpbWluZy1jcm9zcy1vcmlnaW4t cmVkaXJlY3QucHkgWyBGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMjcwMDggaHR0cC93cHQvcmVz b3VyY2UtdGltaW5nL3J0LWNvcnMuaHRtbCBbIEZhaWx1cmUgXQotd2Via2l0Lm9yZy9iLzIyNzAw OCBodHRwL3dwdC9yZXNvdXJjZS10aW1pbmcvcnQtY29ycy53b3JrZXIuaHRtbCBbIEZhaWx1cmUg XQotd2Via2l0Lm9yZy9iLzIyNzAwOCBodHRwL3dwdC9yZXNvdXJjZS10aW1pbmcvcnQtcmV2YWxp ZGF0ZS1yZXF1ZXN0cy0yLmh0bWwgWyBGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMjcwMDggaW1w b3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9yZXNvdXJjZS10aW1pbmcvVEFPLWNhc2UtaW5z ZW5zaXRpdmUtbnVsbC1vcGFxdWUtb3JpZ2luLnN1Yi5odG1sIFsgRmFpbHVyZSBdCi13ZWJraXQu b3JnL2IvMjI3MDA4IGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvcmVzb3VyY2UtdGlt aW5nL1RBTy1jcm9zc29yaWdpbi1wb3J0LnN1Yi5odG1sIFsgRmFpbHVyZSBdCi13ZWJraXQub3Jn L2IvMjI3MDA4IGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvcmVzb3VyY2UtdGltaW5n L2Nyb3NzLW9yaWdpbi1yZWRpcmVjdHMuaHRtbCBbIEZhaWx1cmUgXQotd2Via2l0Lm9yZy9iLzIy NzAwOCBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL3Jlc291cmNlLXRpbWluZy9yZWRp cmVjdHMuaHRtbCBbIEZhaWx1cmUgXQotd2Via2l0Lm9yZy9iLzIyNzAwOCBpbXBvcnRlZC93M2Mv d2ViLXBsYXRmb3JtLXRlc3RzL3Jlc291cmNlLXRpbWluZy9yZXNvdXJjZV9yZXVzZS5zdWIuaHRt bCBbIEZhaWx1cmUgXQotd2Via2l0Lm9yZy9iLzIyNzAwOCBpbXBvcnRlZC93M2Mvd2ViLXBsYXRm b3JtLXRlc3RzL3Jlc291cmNlLXRpbWluZy9yZXNvdXJjZV90aW1pbmdfY29udGVudF9sZW5ndGgu aHRtbCBbIEZhaWx1cmUgXQotd2Via2l0Lm9yZy9iLzIyNzAwOCBpbXBvcnRlZC93M2Mvd2ViLXBs YXRmb3JtLXRlc3RzL3Jlc291cmNlLXRpbWluZy9zYW1lLW9yaWdpbi1mcm9tLWNyb3NzLW9yaWdp bi1yZWRpcmVjdC5odG1sIFsgRmFpbHVyZSBdCi13ZWJraXQub3JnL2IvMjI3MDA4IGltcG9ydGVk L3czYy93ZWItcGxhdGZvcm0tdGVzdHMvc2VydmVyLXRpbWluZy9jcm9zc19vcmlnaW4uaHRtbCBb IEZhaWx1cmUgXQotd2Via2l0Lm9yZy9iLzIyNzAwOCBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3Jt LXRlc3RzL3NlcnZpY2Utd29ya2Vycy9zZXJ2aWNlLXdvcmtlci9yZXNvdXJjZS10aW1pbmctY3Jv c3Mtb3JpZ2luLmh0dHBzLmh0bWwgWyBGYWlsdXJlIF0KLQogIy8vLy8vLy8vLy8vLy8vLy8vLy8v Ly8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8v Ly8vLy8vLy8vLy8KICMgRW5kIG9mIFNPVVAgYW5kIE5ldHdvcmtpbmctcmVsYXRlZCBidWdzCiAj Ly8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8v Ly8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dC9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwppbmRleCBiNzk0OTI1YjI3MDgu LmMwMDg3Yzg0Y2Q0MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKKysrIGIv U291cmNlL1dlYktpdC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMSBAQAorMjAyMS0wNi0xNyAgQ2Fy bG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CisKKyAgICAgICAgW1NPVVBd IEFkZCBUaW1pbmctQWxsb3ctT3JpZ2luIGNoZWNrcyB0byBOZXR3b3JrRGF0YVRhc2tTb3VwCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjcwMDgKKyAg ICAgICAgPHJkYXI6Ly9wcm9ibGVtLzc5Mzg0NzkyPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZCBtaXNzaW5nIFRBTyBjaGVja3MgdG8gU291cCBi YWNrZW5kLgorCisgICAgICAgICogTmV0d29ya1Byb2Nlc3MvTmV0d29ya0RhdGFUYXNrLmNwcDoK KyAgICAgICAgKFdlYktpdDo6TmV0d29ya0RhdGFUYXNrOjpjcmVhdGUpOgorICAgICAgICAqIE5l dHdvcmtQcm9jZXNzL3NvdXAvTmV0d29ya0RhdGFUYXNrU291cC5jcHA6CisgICAgICAgIChXZWJL aXQ6Ok5ldHdvcmtEYXRhVGFza1NvdXA6Ok5ldHdvcmtEYXRhVGFza1NvdXApOgorICAgICAgICAo V2ViS2l0OjpOZXR3b3JrRGF0YVRhc2tTb3VwOjpkaWRTZW5kUmVxdWVzdCk6CisgICAgICAgIChX ZWJLaXQ6Ok5ldHdvcmtEYXRhVGFza1NvdXA6OmNvbnRpbnVlSFRUUFJlZGlyZWN0aW9uKToKKyAg ICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9zb3VwL05ldHdvcmtEYXRhVGFza1NvdXAuaDoKKwogMjAy MS0wNi0xNiAgR2FycmV0dCBEYXZpZHNvbiAgPGdhcnJldHRfZGF2aWRzb25AYXBwbGUuY29tPgog CiAgICAgICAgIFBhc3NrZXlzIGRvbid0IHdvcmsgaW4gU2ltdWxhdG9yCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtEYXRhVGFzay5jcHAgYi9Tb3VyY2Uv V2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtEYXRhVGFzay5jcHAKaW5kZXggM2U5NjQ2YTFh NTg4Li41MjYyNzY3NjcwMmIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nl c3MvTmV0d29ya0RhdGFUYXNrLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNz L05ldHdvcmtEYXRhVGFzay5jcHAKQEAgLTU2LDcgKzU2LDcgQEAgUmVmPE5ldHdvcmtEYXRhVGFz az4gTmV0d29ya0RhdGFUYXNrOjpjcmVhdGUoTmV0d29ya1Nlc3Npb24mIHNlc3Npb24sIE5ldHdv cmtEYXQKICAgICByZXR1cm4gTmV0d29ya0RhdGFUYXNrQ29jb2E6OmNyZWF0ZShzZXNzaW9uLCBj bGllbnQsIHBhcmFtZXRlcnMpOwogI2VuZGlmCiAjaWYgVVNFKFNPVVApCi0gICAgcmV0dXJuIE5l dHdvcmtEYXRhVGFza1NvdXA6OmNyZWF0ZShzZXNzaW9uLCBjbGllbnQsIHBhcmFtZXRlcnMucmVx dWVzdCwgcGFyYW1ldGVycy53ZWJGcmFtZUlELCBwYXJhbWV0ZXJzLndlYlBhZ2VJRCwgcGFyYW1l dGVycy5zdG9yZWRDcmVkZW50aWFsc1BvbGljeSwgcGFyYW1ldGVycy5jb250ZW50U25pZmZpbmdQ b2xpY3ksIHBhcmFtZXRlcnMuY29udGVudEVuY29kaW5nU25pZmZpbmdQb2xpY3ksIHBhcmFtZXRl cnMuc2hvdWxkQ2xlYXJSZWZlcnJlck9uSFRUUFNUb0hUVFBSZWRpcmVjdCwgcGFyYW1ldGVycy5z aG91bGRQcmVjb25uZWN0T25seSwgcGFyYW1ldGVycy5pc01haW5GcmFtZU5hdmlnYXRpb24pOwor ICAgIHJldHVybiBOZXR3b3JrRGF0YVRhc2tTb3VwOjpjcmVhdGUoc2Vzc2lvbiwgY2xpZW50LCBw YXJhbWV0ZXJzKTsKICNlbmRpZgogI2lmIFVTRShDVVJMKQogICAgIHJldHVybiBOZXR3b3JrRGF0 YVRhc2tDdXJsOjpjcmVhdGUoc2Vzc2lvbiwgY2xpZW50LCBwYXJhbWV0ZXJzLnJlcXVlc3QsIHBh cmFtZXRlcnMud2ViRnJhbWVJRCwgcGFyYW1ldGVycy53ZWJQYWdlSUQsIHBhcmFtZXRlcnMuc3Rv cmVkQ3JlZGVudGlhbHNQb2xpY3ksIHBhcmFtZXRlcnMuY29udGVudFNuaWZmaW5nUG9saWN5LCBw YXJhbWV0ZXJzLmNvbnRlbnRFbmNvZGluZ1NuaWZmaW5nUG9saWN5LCBwYXJhbWV0ZXJzLnNob3Vs ZENsZWFyUmVmZXJyZXJPbkhUVFBTVG9IVFRQUmVkaXJlY3QsIHBhcmFtZXRlcnMuaXNNYWluRnJh bWVOYXZpZ2F0aW9uLCBwYXJhbWV0ZXJzLnNob3VsZFJlbGF4VGhpcmRQYXJ0eUNvb2tpZUJsb2Nr aW5nKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3Mvc291cC9OZXR3 b3JrRGF0YVRhc2tTb3VwLmNwcCBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3Mvc291cC9O ZXR3b3JrRGF0YVRhc2tTb3VwLmNwcAppbmRleCAzYTcxY2RjY2M2ODYuLmRiZGZlNzBjYTRmNSAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9zb3VwL05ldHdvcmtEYXRh VGFza1NvdXAuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3Mvc291cC9OZXR3 b3JrRGF0YVRhc2tTb3VwLmNwcApAQCAtNDUsNiArNDUsNyBAQAogI2luY2x1ZGUgPFdlYkNvcmUv U291cE5ldHdvcmtTZXNzaW9uLmg+CiAjaW5jbHVkZSA8V2ViQ29yZS9Tb3VwVmVyc2lvbmluZy5o PgogI2luY2x1ZGUgPFdlYkNvcmUvVGV4dEVuY29kaW5nLmg+CisjaW5jbHVkZSA8V2ViQ29yZS9U aW1pbmdBbGxvd09yaWdpbi5oPgogI2luY2x1ZGUgPHd0Zi9NYWluVGhyZWFkLmg+CiAjaW5jbHVk ZSA8d3RmL2dsaWIvUnVuTG9vcFNvdXJjZVByaW9yaXR5Lmg+CiAKQEAgLTUzLDE3ICs1NCwxOCBA QCB1c2luZyBuYW1lc3BhY2UgV2ViQ29yZTsKIAogc3RhdGljIGNvbnN0IHNpemVfdCBnRGVmYXVs dFJlYWRCdWZmZXJTaXplID0gODE5MjsKIAotTmV0d29ya0RhdGFUYXNrU291cDo6TmV0d29ya0Rh dGFUYXNrU291cChOZXR3b3JrU2Vzc2lvbiYgc2Vzc2lvbiwgTmV0d29ya0RhdGFUYXNrQ2xpZW50 JiBjbGllbnQsIGNvbnN0IFJlc291cmNlUmVxdWVzdCYgcmVxdWVzdFdpdGhDcmVkZW50aWFscywg RnJhbWVJZGVudGlmaWVyIGZyYW1lSUQsIFBhZ2VJZGVudGlmaWVyIHBhZ2VJRCwgU3RvcmVkQ3Jl ZGVudGlhbHNQb2xpY3kgc3RvcmVkQ3JlZGVudGlhbHNQb2xpY3ksIENvbnRlbnRTbmlmZmluZ1Bv bGljeSBzaG91bGRDb250ZW50U25pZmYsIFdlYkNvcmU6OkNvbnRlbnRFbmNvZGluZ1NuaWZmaW5n UG9saWN5LCBib29sIHNob3VsZENsZWFyUmVmZXJyZXJPbkhUVFBTVG9IVFRQUmVkaXJlY3QsIFBy ZWNvbm5lY3RPbmx5IHNob3VsZFByZWNvbm5lY3RPbmx5LCBib29sIGRhdGFUYXNrSXNGb3JNYWlu RnJhbWVOYXZpZ2F0aW9uKQotICAgIDogTmV0d29ya0RhdGFUYXNrKHNlc3Npb24sIGNsaWVudCwg cmVxdWVzdFdpdGhDcmVkZW50aWFscywgc3RvcmVkQ3JlZGVudGlhbHNQb2xpY3ksIHNob3VsZENs ZWFyUmVmZXJyZXJPbkhUVFBTVG9IVFRQUmVkaXJlY3QsIGRhdGFUYXNrSXNGb3JNYWluRnJhbWVO YXZpZ2F0aW9uKQotICAgICwgbV9mcmFtZUlEKGZyYW1lSUQpCi0gICAgLCBtX3BhZ2VJRChwYWdl SUQpCi0gICAgLCBtX3Nob3VsZENvbnRlbnRTbmlmZihzaG91bGRDb250ZW50U25pZmYpCi0gICAg LCBtX3Nob3VsZFByZWNvbm5lY3RPbmx5KHNob3VsZFByZWNvbm5lY3RPbmx5KQorTmV0d29ya0Rh dGFUYXNrU291cDo6TmV0d29ya0RhdGFUYXNrU291cChOZXR3b3JrU2Vzc2lvbiYgc2Vzc2lvbiwg TmV0d29ya0RhdGFUYXNrQ2xpZW50JiBjbGllbnQsIGNvbnN0IE5ldHdvcmtMb2FkUGFyYW1ldGVy cyYgcGFyYW1ldGVycykKKyAgICA6IE5ldHdvcmtEYXRhVGFzayhzZXNzaW9uLCBjbGllbnQsIHBh cmFtZXRlcnMucmVxdWVzdCwgcGFyYW1ldGVycy5zdG9yZWRDcmVkZW50aWFsc1BvbGljeSwgcGFy YW1ldGVycy5zaG91bGRDbGVhclJlZmVycmVyT25IVFRQU1RvSFRUUFJlZGlyZWN0LCBwYXJhbWV0 ZXJzLmlzTWFpbkZyYW1lTmF2aWdhdGlvbikKKyAgICAsIG1fZnJhbWVJRChwYXJhbWV0ZXJzLndl YkZyYW1lSUQpCisgICAgLCBtX3BhZ2VJRChwYXJhbWV0ZXJzLndlYlBhZ2VJRCkKKyAgICAsIG1f c2hvdWxkQ29udGVudFNuaWZmKHBhcmFtZXRlcnMuY29udGVudFNuaWZmaW5nUG9saWN5KQorICAg ICwgbV9zaG91bGRQcmVjb25uZWN0T25seShwYXJhbWV0ZXJzLnNob3VsZFByZWNvbm5lY3RPbmx5 KQorICAgICwgbV9zb3VyY2VPcmlnaW4ocGFyYW1ldGVycy5zb3VyY2VPcmlnaW4pCiAgICAgLCBt X3RpbWVvdXRTb3VyY2UoUnVuTG9vcDo6bWFpbigpLCB0aGlzLCAmTmV0d29ya0RhdGFUYXNrU291 cDo6dGltZW91dEZpcmVkKQogewogICAgIG1fc2Vzc2lvbi0+cmVnaXN0ZXJOZXR3b3JrRGF0YVRh c2soKnRoaXMpOwogCi0gICAgYXV0byByZXF1ZXN0ID0gcmVxdWVzdFdpdGhDcmVkZW50aWFsczsK KyAgICBhdXRvIHJlcXVlc3QgPSBwYXJhbWV0ZXJzLnJlcXVlc3Q7CiAgICAgaWYgKHJlcXVlc3Qu dXJsKCkucHJvdG9jb2xJc0luSFRUUEZhbWlseSgpKSB7CiAjaWYgVVNFKFNPVVAyKQogICAgICAg ICBtX25ldHdvcmtMb2FkTWV0cmljcy5mZXRjaFN0YXJ0ID0gTW9ub3RvbmljVGltZTo6bm93KCk7 CkBAIC00ODMsNiArNDg1LDEyIEBAIHZvaWQgTmV0d29ya0RhdGFUYXNrU291cDo6ZGlkU2VuZFJl cXVlc3QoR1JlZlB0cjxHSW5wdXRTdHJlYW0+JiYgaW5wdXRTdHJlYW0pCiAgICAgbV9uZXR3b3Jr TG9hZE1ldHJpY3MucmVzcG9uc2VTdGFydCA9IE1vbm90b25pY1RpbWU6Om5vdygpOwogI2VuZGlm CiAKKyAgICBpZiAoIW1fbmV0d29ya0xvYWRNZXRyaWNzLmZhaWxzVEFPQ2hlY2spIHsKKyAgICAg ICAgUmVmUHRyPFNlY3VyaXR5T3JpZ2luPiBvcmlnaW4gPSBpc1RvcExldmVsTmF2aWdhdGlvbigp ID8gU2VjdXJpdHlPcmlnaW46OmNyZWF0ZShmaXJzdFJlcXVlc3QoKS51cmwoKSkgOiBtX3NvdXJj ZU9yaWdpbjsKKyAgICAgICAgaWYgKG9yaWdpbikKKyAgICAgICAgICAgIG1fbmV0d29ya0xvYWRN ZXRyaWNzLmZhaWxzVEFPQ2hlY2sgPSAhcGFzc2VzVGltaW5nQWxsb3dPcmlnaW5DaGVjayhtX3Jl c3BvbnNlLCAqb3JpZ2luKTsKKyAgICB9CisKICAgICBkaXNwYXRjaERpZFJlY2VpdmVSZXNwb25z ZSgpOwogfQogCkBAIC04NjUsOCArODczLDYgQEAgdm9pZCBOZXR3b3JrRGF0YVRhc2tTb3VwOjpj b250aW51ZUhUVFBSZWRpcmVjdGlvbigpCiAgICAgcmVxdWVzdC5zZXRVUkwocmVkaXJlY3RlZFVS TCk7CiAKICAgICBtX25ldHdvcmtMb2FkTWV0cmljcy5oYXNDcm9zc09yaWdpblJlZGlyZWN0ID0g bV9uZXR3b3JrTG9hZE1ldHJpY3MuaGFzQ3Jvc3NPcmlnaW5SZWRpcmVjdCB8fCAhU2VjdXJpdHlP cmlnaW46OmNyZWF0ZShtX2N1cnJlbnRSZXF1ZXN0LnVybCgpKS0+Y2FuUmVxdWVzdChyZXF1ZXN0 LnVybCgpKTsKLSAgICAvLyBGSVhNRTogQWRkIFRBTyBjaGVja3MgaGVyZSBhbmQgd2hlbiByZWNl aXZpbmcgYSByZXNwb25zZS4KLSAgICAvLyBUaGlzIHdhcyBkb25lIG9uIENvY29hIHBsYXRmb3Jt cyBpbiBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI2Njc4CiAKICAg ICAvLyBDbGVhciB0aGUgdXNlciBhZ2VudCB0byBlbnN1cmUgYSBuZXcgb25lIGlzIGNvbXB1dGVk LgogICAgIGF1dG8gdXNlckFnZW50ID0gcmVxdWVzdC5odHRwVXNlckFnZW50KCk7CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL3NvdXAvTmV0d29ya0RhdGFUYXNrU291 cC5oIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9zb3VwL05ldHdvcmtEYXRhVGFza1Nv dXAuaAppbmRleCA4MGJhYzRiMjg5YzAuLjQyYjc3MzBkNWE4OSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9zb3VwL05ldHdvcmtEYXRhVGFza1NvdXAuaAorKysgYi9T b3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL3NvdXAvTmV0d29ya0RhdGFUYXNrU291cC5oCkBA IC00MSwxNSArNDEsMTUgQEAgbmFtZXNwYWNlIFdlYktpdCB7CiAKIGNsYXNzIE5ldHdvcmtEYXRh VGFza1NvdXAgZmluYWwgOiBwdWJsaWMgTmV0d29ya0RhdGFUYXNrIHsKIHB1YmxpYzoKLSAgICBz dGF0aWMgUmVmPE5ldHdvcmtEYXRhVGFzaz4gY3JlYXRlKE5ldHdvcmtTZXNzaW9uJiBzZXNzaW9u LCBOZXR3b3JrRGF0YVRhc2tDbGllbnQmIGNsaWVudCwgY29uc3QgV2ViQ29yZTo6UmVzb3VyY2VS ZXF1ZXN0JiByZXF1ZXN0LCBXZWJDb3JlOjpGcmFtZUlkZW50aWZpZXIgZnJhbWVJRCwgV2ViQ29y ZTo6UGFnZUlkZW50aWZpZXIgcGFnZUlELCBXZWJDb3JlOjpTdG9yZWRDcmVkZW50aWFsc1BvbGlj eSBzdG9yZWRDcmVkZW50aWFsc1BvbGljeSwgV2ViQ29yZTo6Q29udGVudFNuaWZmaW5nUG9saWN5 IHNob3VsZENvbnRlbnRTbmlmZiwgV2ViQ29yZTo6Q29udGVudEVuY29kaW5nU25pZmZpbmdQb2xp Y3kgc2hvdWxkQ29udGVudEVuY29kaW5nU25pZmYsIGJvb2wgc2hvdWxkQ2xlYXJSZWZlcnJlck9u SFRUUFNUb0hUVFBSZWRpcmVjdCwgUHJlY29ubmVjdE9ubHkgc2hvdWxkUHJlY29ubmVjdE9ubHks IGJvb2wgZGF0YVRhc2tJc0Zvck1haW5GcmFtZU5hdmlnYXRpb24pCisgICAgc3RhdGljIFJlZjxO ZXR3b3JrRGF0YVRhc2s+IGNyZWF0ZShOZXR3b3JrU2Vzc2lvbiYgc2Vzc2lvbiwgTmV0d29ya0Rh dGFUYXNrQ2xpZW50JiBjbGllbnQsIGNvbnN0IE5ldHdvcmtMb2FkUGFyYW1ldGVycyYgcGFyYW1l dGVycykKICAgICB7Ci0gICAgICAgIHJldHVybiBhZG9wdFJlZigqbmV3IE5ldHdvcmtEYXRhVGFz a1NvdXAoc2Vzc2lvbiwgY2xpZW50LCByZXF1ZXN0LCBmcmFtZUlELCBwYWdlSUQsIHN0b3JlZENy ZWRlbnRpYWxzUG9saWN5LCBzaG91bGRDb250ZW50U25pZmYsIHNob3VsZENvbnRlbnRFbmNvZGlu Z1NuaWZmLCBzaG91bGRDbGVhclJlZmVycmVyT25IVFRQU1RvSFRUUFJlZGlyZWN0LCBzaG91bGRQ cmVjb25uZWN0T25seSwgZGF0YVRhc2tJc0Zvck1haW5GcmFtZU5hdmlnYXRpb24pKTsKKyAgICAg ICAgcmV0dXJuIGFkb3B0UmVmKCpuZXcgTmV0d29ya0RhdGFUYXNrU291cChzZXNzaW9uLCBjbGll bnQsIHBhcmFtZXRlcnMpKTsKICAgICB9CiAKICAgICB+TmV0d29ya0RhdGFUYXNrU291cCgpOwog CiBwcml2YXRlOgotICAgIE5ldHdvcmtEYXRhVGFza1NvdXAoTmV0d29ya1Nlc3Npb24mLCBOZXR3 b3JrRGF0YVRhc2tDbGllbnQmLCBjb25zdCBXZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3QmLCBXZWJD b3JlOjpGcmFtZUlkZW50aWZpZXIsIFdlYkNvcmU6OlBhZ2VJZGVudGlmaWVyLCBXZWJDb3JlOjpT dG9yZWRDcmVkZW50aWFsc1BvbGljeSwgV2ViQ29yZTo6Q29udGVudFNuaWZmaW5nUG9saWN5LCBX ZWJDb3JlOjpDb250ZW50RW5jb2RpbmdTbmlmZmluZ1BvbGljeSwgYm9vbCBzaG91bGRDbGVhclJl ZmVycmVyT25IVFRQU1RvSFRUUFJlZGlyZWN0LCBQcmVjb25uZWN0T25seSBzaG91bGRQcmVjb25u ZWN0T25seSwgYm9vbCBkYXRhVGFza0lzRm9yTWFpbkZyYW1lTmF2aWdhdGlvbik7CisgICAgTmV0 d29ya0RhdGFUYXNrU291cChOZXR3b3JrU2Vzc2lvbiYsIE5ldHdvcmtEYXRhVGFza0NsaWVudCYs IGNvbnN0IE5ldHdvcmtMb2FkUGFyYW1ldGVycyYpOwogCiAgICAgdm9pZCBjYW5jZWwoKSBvdmVy cmlkZTsKICAgICB2b2lkIHJlc3VtZSgpIG92ZXJyaWRlOwpAQCAtMjAyLDYgKzIwMiw3IEBAIHBy aXZhdGU6CiAgICAgYm9vbCBtX2FsbG93T3ZlcndyaXRlRG93bmxvYWQgeyBmYWxzZSB9OwogICAg IFdlYkNvcmU6Ok5ldHdvcmtMb2FkTWV0cmljcyBtX25ldHdvcmtMb2FkTWV0cmljczsKICAgICBi b29sIG1faXNCbG9ja2luZ0Nvb2tpZXMgeyBmYWxzZSB9OworICAgIFJlZlB0cjxXZWJDb3JlOjpT ZWN1cml0eU9yaWdpbj4gbV9zb3VyY2VPcmlnaW47CiAgICAgUnVuTG9vcDo6VGltZXI8TmV0d29y a0RhdGFUYXNrU291cD4gbV90aW1lb3V0U291cmNlOwogfTsKIAo=