220179 2020-12-27 08:13:02 -0800 Share meta refresh logic 2021-01-03 06:42:10 -0800 1 1 1 Unclassified WebKit New Bugs Other Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 rbuis rbuis cdumez darin esprehn+autocc ews-watchlist japhet kangil.han webkit-bug-importer oldest_to_newest 1716725 0 rbuis 2020-12-27 08:13:02 -0800 Share meta refresh logic between Document and FrameLoader. 1716726 1 416822 rbuis 2020-12-27 08:15:12 -0800 Created attachment 416822 Patch 1717022 2 416822 darin 2021-01-02 16:03:58 -0800 Comment on attachment 416822 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=416822&action=review > Source/WebCore/ChangeLog:8 > + Share meta refresh logic between Document and FrameLoader. This change is great; two copies seems silly! Bigger picture, long ago we tried to break apart Document and Frame so they wouldn’t be super-huge "god objects", something we got part way through and never finished. I worry that code moving from FrameLoader to Frame and Document starts to undo that. 1717036 3 416909 rbuis 2021-01-03 03:21:22 -0800 Created attachment 416909 Patch 1717037 4 ews-feeder 2021-01-03 05:48:15 -0800 Committed r271125: <https://trac.webkit.org/changeset/271125> All reviewed patches have been landed. Closing bug and clearing flags on attachment 416909. 1717038 5 webkit-bug-importer 2021-01-03 05:49:16 -0800 <rdar://problem/72776134> 1717039 6 416822 rbuis 2021-01-03 06:42:10 -0800 Comment on attachment 416822 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=416822&action=review >> Source/WebCore/ChangeLog:8 >> + Share meta refresh logic between Document and FrameLoader. > > This change is great; two copies seems silly! > > Bigger picture, long ago we tried to break apart Document and Frame so they wouldn’t be super-huge "god objects", something we got part way through and never finished. I worry that code moving from FrameLoader to Frame and Document starts to undo that. Thanks for that reminder! Based on that, I moved the new method to FrameLoader instead of Document. 416822 2020-12-27 08:15:12 -0800 2021-01-03 03:21:17 -0800 Patch bug-220179-20201227171511.patch text/plain 5093 rbuis U3VidmVyc2lvbiBSZXZpc2lvbjogMjcxMDkyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzg5ZjJiZTIxMmNjNmFk MTM0Y2E0N2M5MTBlNDJkOGVkMzUzYmJkNC4uZjAxZWFhZjMxNmMxMWIyM2ExODFlNTk1YmNlOGM4 YWFmMjczZTNjNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDIwLTEyLTI3ICBSb2Ig QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgU2hhcmUgbWV0YSByZWZyZXNoIGxv Z2ljCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjAx NzkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBTaGFy ZSBtZXRhIHJlZnJlc2ggbG9naWMgYmV0d2VlbiBEb2N1bWVudCBhbmQgRnJhbWVMb2FkZXIuCisK KyAgICAgICAgKiBkb20vRG9jdW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RG9jdW1lbnQ6 OnByb2Nlc3NIdHRwRXF1aXYpOgorICAgICAgICAoV2ViQ29yZTo6RG9jdW1lbnQ6OnNjaGVkdWxl UmVmcmVzaElmTmVlZGVkKToKKyAgICAgICAgKiBkb20vRG9jdW1lbnQuaDoKKyAgICAgICAgKiBs b2FkZXIvRnJhbWVMb2FkZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVMb2FkZXI6OnJl Y2VpdmVkRmlyc3REYXRhKToKKwogMjAyMC0xMi0yNiAgQWxleGV5IFNodmF5a2EgIDxzaHZhaWth bGVzaEBnbWFpbC5jb20+CiAKICAgICAgICAgW1dlYklETF0gUmVtb3ZlIFtDdXN0b21Ub1N0cmlu Z05hbWVdIGFuZCBMb2NhdGlvbi1zcGVjaWZpYyBleHRlbmRlZCBhdHRyaWJ1dGVzCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvZG9t L0RvY3VtZW50LmNwcAppbmRleCA4YjczZTM2ZDM1YmFjMWI1Yzg4NGE5MGU1M2VlZTAxMGU0YzJk MDlkLi5mY2VmYmZiMmZhZTEyMjQxN2Q2NWM0ZmNkYjc3MWYxM2RlOGYzMDY1IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Rv bS9Eb2N1bWVudC5jcHAKQEAgLTM2OTUsMjUgKzM2OTUsOSBAQCB2b2lkIERvY3VtZW50Ojpwcm9j ZXNzSHR0cEVxdWl2KGNvbnN0IFN0cmluZyYgZXF1aXYsIGNvbnN0IFN0cmluZyYgY29udGVudCwg Ym9vbAogICAgICAgICBzdHlsZVNjb3BlKCkuc2V0UHJlZmVycmVkU3R5bGVzaGVldFNldE5hbWUo Y29udGVudCk7CiAgICAgICAgIGJyZWFrOwogCi0gICAgY2FzZSBIVFRQSGVhZGVyTmFtZTo6UmVm cmVzaDogewotICAgICAgICBkb3VibGUgZGVsYXkgPSAwOwotICAgICAgICBTdHJpbmcgdXJsU3Ry aW5nOwotICAgICAgICBpZiAoZnJhbWUgJiYgcGFyc2VNZXRhSFRUUEVxdWl2UmVmcmVzaChjb250 ZW50LCBkZWxheSwgdXJsU3RyaW5nKSkgewotICAgICAgICAgICAgVVJMIGNvbXBsZXRlZFVSTDsK LSAgICAgICAgICAgIGlmICh1cmxTdHJpbmcuaXNFbXB0eSgpKQotICAgICAgICAgICAgICAgIGNv bXBsZXRlZFVSTCA9IG1fdXJsOwotICAgICAgICAgICAgZWxzZQotICAgICAgICAgICAgICAgIGNv bXBsZXRlZFVSTCA9IGNvbXBsZXRlVVJMKHVybFN0cmluZyk7Ci0gICAgICAgICAgICBpZiAoIWNv bXBsZXRlZFVSTC5wcm90b2NvbElzSmF2YVNjcmlwdCgpKQotICAgICAgICAgICAgICAgIGZyYW1l LT5uYXZpZ2F0aW9uU2NoZWR1bGVyKCkuc2NoZWR1bGVSZWRpcmVjdCgqdGhpcywgZGVsYXksIGNv bXBsZXRlZFVSTCk7Ci0gICAgICAgICAgICBlbHNlIHsKLSAgICAgICAgICAgICAgICBTdHJpbmcg bWVzc2FnZSA9ICJSZWZ1c2VkIHRvIHJlZnJlc2ggIiArIG1fdXJsLnN0cmluZ0NlbnRlckVsbGlw c2l6ZWRUb0xlbmd0aCgpICsgIiB0byBhIGphdmFzY3JpcHQ6IFVSTCI7Ci0gICAgICAgICAgICAg ICAgYWRkQ29uc29sZU1lc3NhZ2UoTWVzc2FnZVNvdXJjZTo6U2VjdXJpdHksIE1lc3NhZ2VMZXZl bDo6RXJyb3IsIG1lc3NhZ2UpOwotICAgICAgICAgICAgfQotICAgICAgICB9Ci0KKyAgICBjYXNl IEhUVFBIZWFkZXJOYW1lOjpSZWZyZXNoOgorICAgICAgICBzY2hlZHVsZVJlZnJlc2hJZk5lZWRl ZChjb250ZW50KTsKICAgICAgICAgYnJlYWs7Ci0gICAgfQogCiAgICAgY2FzZSBIVFRQSGVhZGVy TmFtZTo6U2V0Q29va2llOgogICAgICAgICBpZiAoaXNIVE1MRG9jdW1lbnQoKSkKQEAgLTM3NTAs NiArMzczNCwyMSBAQCB2b2lkIERvY3VtZW50Ojpwcm9jZXNzSHR0cEVxdWl2KGNvbnN0IFN0cmlu ZyYgZXF1aXYsIGNvbnN0IFN0cmluZyYgY29udGVudCwgYm9vbAogICAgIH0KIH0KIAordm9pZCBE b2N1bWVudDo6c2NoZWR1bGVSZWZyZXNoSWZOZWVkZWQoY29uc3QgU3RyaW5nJiBjb250ZW50KQor eworICAgIGRvdWJsZSBkZWxheSA9IDA7CisgICAgU3RyaW5nIHVybFN0cmluZzsKKyAgICBpZiAo ZnJhbWUoKSAmJiBwYXJzZU1ldGFIVFRQRXF1aXZSZWZyZXNoKGNvbnRlbnQsIGRlbGF5LCB1cmxT dHJpbmcpKSB7CisgICAgICAgIGF1dG8gY29tcGxldGVkVVJMID0gdXJsU3RyaW5nLmlzRW1wdHko KSA/IG1fdXJsIDogY29tcGxldGVVUkwodXJsU3RyaW5nKTsKKyAgICAgICAgaWYgKCFjb21wbGV0 ZWRVUkwucHJvdG9jb2xJc0phdmFTY3JpcHQoKSkKKyAgICAgICAgICAgIGZyYW1lKCktPm5hdmln YXRpb25TY2hlZHVsZXIoKS5zY2hlZHVsZVJlZGlyZWN0KCp0aGlzLCBkZWxheSwgY29tcGxldGVk VVJMKTsKKyAgICAgICAgZWxzZSB7CisgICAgICAgICAgICBTdHJpbmcgbWVzc2FnZSA9ICJSZWZ1 c2VkIHRvIHJlZnJlc2ggIiArIG1fdXJsLnN0cmluZ0NlbnRlckVsbGlwc2l6ZWRUb0xlbmd0aCgp ICsgIiB0byBhIGphdmFzY3JpcHQ6IFVSTCI7CisgICAgICAgICAgICBhZGRDb25zb2xlTWVzc2Fn ZShNZXNzYWdlU291cmNlOjpTZWN1cml0eSwgTWVzc2FnZUxldmVsOjpFcnJvciwgbWVzc2FnZSk7 CisgICAgICAgIH0KKyAgICB9Cit9CisKIHZvaWQgRG9jdW1lbnQ6OnByb2Nlc3NEaXNhYmxlZEFk YXB0YXRpb25zKGNvbnN0IFN0cmluZyYgZGlzYWJsZWRBZGFwdGF0aW9uc1N0cmluZykKIHsKICAg ICBhdXRvIGRpc2FibGVkQWRhcHRhdGlvbnMgPSBwYXJzZURpc2FibGVkQWRhcHRhdGlvbnMoZGlz YWJsZWRBZGFwdGF0aW9uc1N0cmluZyk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9kb20v RG9jdW1lbnQuaCBiL1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5oCmluZGV4IDk0NjRkN2Vh YTQ1OTQ4NTEwZmNhZjNlMzVmZjhlNzIyY2U3NWNjYzcuLmU1ZTEwYjZjODUwZTI4MjU2YzQ5MTg5 NjUwMzYxOTI4NTg4MTE0MmIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVu dC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5oCkBAIC04OTEsNiArODkxLDgg QEAgcHVibGljOgogICAgIC8vIHNwZWNpZmllZCBpbiBhbiBIVE1MIGZpbGUuCiAgICAgdm9pZCBw cm9jZXNzSHR0cEVxdWl2KGNvbnN0IFN0cmluZyYgZXF1aXYsIGNvbnN0IFN0cmluZyYgY29udGVu dCwgYm9vbCBpc0luRG9jdW1lbnRIZWFkKTsKIAorICAgIHZvaWQgc2NoZWR1bGVSZWZyZXNoSWZO ZWVkZWQoY29uc3QgU3RyaW5nJiBjb250ZW50KTsKKwogI2lmIFBMQVRGT1JNKElPU19GQU1JTFkp CiAgICAgdm9pZCBwcm9jZXNzRm9ybWF0RGV0ZWN0aW9uKGNvbnN0IFN0cmluZyYpOwogCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3BwIGIvU291cmNlL1dl YkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcAppbmRleCAyMTU4MjI3ODJjNGU1MDU3ODhkNTll OTk4YzE0MWVmNzExNGVkODEzLi4zZTI0OGFhMzkwZDZiN2EwZjAxMzM3M2ZiZjY1NmY4YzU0NGNm N2QzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5jcHAKQEAgLTcxMywxNyArNzEz LDcgQEAgdm9pZCBGcmFtZUxvYWRlcjo6cmVjZWl2ZWRGaXJzdERhdGEoKQogCiAgICAgTGlua0xv YWRlcjo6bG9hZExpbmtzRnJvbUhlYWRlcihkb2N1bWVudExvYWRlci5yZXNwb25zZSgpLmh0dHBI ZWFkZXJGaWVsZChIVFRQSGVhZGVyTmFtZTo6TGluayksIGRvY3VtZW50LnVybCgpLCBkb2N1bWVu dCwgTGlua0xvYWRlcjo6TWVkaWFBdHRyaWJ1dGVDaGVjazo6TWVkaWFBdHRyaWJ1dGVFbXB0eSk7 CiAKLSAgICBkb3VibGUgZGVsYXk7Ci0gICAgU3RyaW5nIHVybFN0cmluZzsKLSAgICBpZiAoIXBh cnNlTWV0YUhUVFBFcXVpdlJlZnJlc2goZG9jdW1lbnRMb2FkZXIucmVzcG9uc2UoKS5odHRwSGVh ZGVyRmllbGQoSFRUUEhlYWRlck5hbWU6OlJlZnJlc2gpLCBkZWxheSwgdXJsU3RyaW5nKSkKLSAg ICAgICAgcmV0dXJuOwotICAgIGF1dG8gY29tcGxldGVkVVJMID0gdXJsU3RyaW5nLmlzRW1wdHko KSA/IGRvY3VtZW50LnVybCgpIDogZG9jdW1lbnQuY29tcGxldGVVUkwodXJsU3RyaW5nKTsKLSAg ICBpZiAoIWNvbXBsZXRlZFVSTC5wcm90b2NvbElzSmF2YVNjcmlwdCgpKQotICAgICAgICBtX2Zy YW1lLm5hdmlnYXRpb25TY2hlZHVsZXIoKS5zY2hlZHVsZVJlZGlyZWN0KGRvY3VtZW50LCBkZWxh eSwgY29tcGxldGVkVVJMKTsKLSAgICBlbHNlIHsKLSAgICAgICAgYXV0byBtZXNzYWdlID0gIlJl ZnVzZWQgdG8gcmVmcmVzaCAiICsgZG9jdW1lbnQudXJsKCkuc3RyaW5nQ2VudGVyRWxsaXBzaXpl ZFRvTGVuZ3RoKCkgKyAiIHRvIGEgamF2YXNjcmlwdDogVVJMIjsKLSAgICAgICAgZG9jdW1lbnQu YWRkQ29uc29sZU1lc3NhZ2UoTWVzc2FnZVNvdXJjZTo6U2VjdXJpdHksIE1lc3NhZ2VMZXZlbDo6 RXJyb3IsIG1lc3NhZ2UpOwotICAgIH0KKyAgICBkb2N1bWVudC5zY2hlZHVsZVJlZnJlc2hJZk5l ZWRlZChkb2N1bWVudExvYWRlci5yZXNwb25zZSgpLmh0dHBIZWFkZXJGaWVsZChIVFRQSGVhZGVy TmFtZTo6UmVmcmVzaCkpOwogfQogCiB2b2lkIEZyYW1lTG9hZGVyOjpzZXRPdXRnb2luZ1JlZmVy cmVyKGNvbnN0IFVSTCYgdXJsKQo= 416909 2021-01-03 03:21:22 -0800 2021-01-03 05:48:15 -0800 Patch bug-220179-20210103122121.patch text/plain 5261 rbuis U3VidmVyc2lvbiBSZXZpc2lvbjogMjcxMTI0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTkwZDBlOGY1NGZjZWM2 ZGNkZTYzNGVkNDA2MTQyNjc3YTM5YWI1NS4uMDIxM2JhZTEzOTFmZjlmMjNmZjU1NjNjZTk5MGM0 NGY2OGVkYTBmNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDIxLTAxLTAzICBSb2Ig QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgU2hhcmUgbWV0YSByZWZyZXNoIGxv Z2ljCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjAx NzkKKworICAgICAgICBSZXZpZXdlZCBieSBEYXJpbiBBZGxlci4KKworICAgICAgICBTaGFyZSBt ZXRhIHJlZnJlc2ggbG9naWMgYmV0d2VlbiBEb2N1bWVudCBhbmQgRnJhbWVMb2FkZXIuCisKKyAg ICAgICAgKiBkb20vRG9jdW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RG9jdW1lbnQ6OnBy b2Nlc3NIdHRwRXF1aXYpOgorICAgICAgICAqIGxvYWRlci9GcmFtZUxvYWRlci5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpGcmFtZUxvYWRlcjo6cmVjZWl2ZWRGaXJzdERhdGEpOgorICAgICAgICAo V2ViQ29yZTo6RnJhbWVMb2FkZXI6OnNjaGVkdWxlUmVmcmVzaElmTmVlZGVkKToKKyAgICAgICAg KiBsb2FkZXIvRnJhbWVMb2FkZXIuaDoKKwogMjAyMS0wMS0wMiAgUm9iIEJ1aXMgIDxyYnVpc0Bp Z2FsaWEuY29tPgogCiAgICAgICAgIFJlbW92ZSBzb21lIEZyYW1lTG9hZGVyOjpjaGFuZ2VMb2Nh dGlvbiBwYXJhbWV0ZXJzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQu Y3BwIGIvU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcAppbmRleCA4YjczZTM2ZDM1YmFj MWI1Yzg4NGE5MGU1M2VlZTAxMGU0YzJkMDlkLi4xY2NkMGY3MDJlZWY5N2Y1MWUxMjNmYmI4MGFj ZDdjMTM4YzgyMDg3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5jcHAKQEAgLTM2OTUsMjUgKzM2OTUs MTAgQEAgdm9pZCBEb2N1bWVudDo6cHJvY2Vzc0h0dHBFcXVpdihjb25zdCBTdHJpbmcmIGVxdWl2 LCBjb25zdCBTdHJpbmcmIGNvbnRlbnQsIGJvb2wKICAgICAgICAgc3R5bGVTY29wZSgpLnNldFBy ZWZlcnJlZFN0eWxlc2hlZXRTZXROYW1lKGNvbnRlbnQpOwogICAgICAgICBicmVhazsKIAotICAg IGNhc2UgSFRUUEhlYWRlck5hbWU6OlJlZnJlc2g6IHsKLSAgICAgICAgZG91YmxlIGRlbGF5ID0g MDsKLSAgICAgICAgU3RyaW5nIHVybFN0cmluZzsKLSAgICAgICAgaWYgKGZyYW1lICYmIHBhcnNl TWV0YUhUVFBFcXVpdlJlZnJlc2goY29udGVudCwgZGVsYXksIHVybFN0cmluZykpIHsKLSAgICAg ICAgICAgIFVSTCBjb21wbGV0ZWRVUkw7Ci0gICAgICAgICAgICBpZiAodXJsU3RyaW5nLmlzRW1w dHkoKSkKLSAgICAgICAgICAgICAgICBjb21wbGV0ZWRVUkwgPSBtX3VybDsKLSAgICAgICAgICAg IGVsc2UKLSAgICAgICAgICAgICAgICBjb21wbGV0ZWRVUkwgPSBjb21wbGV0ZVVSTCh1cmxTdHJp bmcpOwotICAgICAgICAgICAgaWYgKCFjb21wbGV0ZWRVUkwucHJvdG9jb2xJc0phdmFTY3JpcHQo KSkKLSAgICAgICAgICAgICAgICBmcmFtZS0+bmF2aWdhdGlvblNjaGVkdWxlcigpLnNjaGVkdWxl UmVkaXJlY3QoKnRoaXMsIGRlbGF5LCBjb21wbGV0ZWRVUkwpOwotICAgICAgICAgICAgZWxzZSB7 Ci0gICAgICAgICAgICAgICAgU3RyaW5nIG1lc3NhZ2UgPSAiUmVmdXNlZCB0byByZWZyZXNoICIg KyBtX3VybC5zdHJpbmdDZW50ZXJFbGxpcHNpemVkVG9MZW5ndGgoKSArICIgdG8gYSBqYXZhc2Ny aXB0OiBVUkwiOwotICAgICAgICAgICAgICAgIGFkZENvbnNvbGVNZXNzYWdlKE1lc3NhZ2VTb3Vy Y2U6OlNlY3VyaXR5LCBNZXNzYWdlTGV2ZWw6OkVycm9yLCBtZXNzYWdlKTsKLSAgICAgICAgICAg IH0KLSAgICAgICAgfQotCisgICAgY2FzZSBIVFRQSGVhZGVyTmFtZTo6UmVmcmVzaDoKKyAgICAg ICAgaWYgKGZyYW1lKQorICAgICAgICAgICAgZnJhbWUtPmxvYWRlcigpLnNjaGVkdWxlUmVmcmVz aElmTmVlZGVkKCp0aGlzLCBjb250ZW50KTsKICAgICAgICAgYnJlYWs7Ci0gICAgfQogCiAgICAg Y2FzZSBIVFRQSGVhZGVyTmFtZTo6U2V0Q29va2llOgogICAgICAgICBpZiAoaXNIVE1MRG9jdW1l bnQoKSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3BwCmluZGV4IDM1YzVlMmQ5MGYz ODcyNTYwNGUxYjRiZDU2Y2YyY2Y4MTRjYWY4YTkuLjM5NTJjOTMzMjc4ZTE2MzY5NDA5MzkwYjFk YjgwZGVhOTQ5NWQ2MjQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxv YWRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcApAQCAt NzExLDE3ICs3MTEsNyBAQCB2b2lkIEZyYW1lTG9hZGVyOjpyZWNlaXZlZEZpcnN0RGF0YSgpCiAK ICAgICBMaW5rTG9hZGVyOjpsb2FkTGlua3NGcm9tSGVhZGVyKGRvY3VtZW50TG9hZGVyLnJlc3Bv bnNlKCkuaHR0cEhlYWRlckZpZWxkKEhUVFBIZWFkZXJOYW1lOjpMaW5rKSwgZG9jdW1lbnQudXJs KCksIGRvY3VtZW50LCBMaW5rTG9hZGVyOjpNZWRpYUF0dHJpYnV0ZUNoZWNrOjpNZWRpYUF0dHJp YnV0ZUVtcHR5KTsKIAotICAgIGRvdWJsZSBkZWxheTsKLSAgICBTdHJpbmcgdXJsU3RyaW5nOwot ICAgIGlmICghcGFyc2VNZXRhSFRUUEVxdWl2UmVmcmVzaChkb2N1bWVudExvYWRlci5yZXNwb25z ZSgpLmh0dHBIZWFkZXJGaWVsZChIVFRQSGVhZGVyTmFtZTo6UmVmcmVzaCksIGRlbGF5LCB1cmxT dHJpbmcpKQotICAgICAgICByZXR1cm47Ci0gICAgYXV0byBjb21wbGV0ZWRVUkwgPSB1cmxTdHJp bmcuaXNFbXB0eSgpID8gZG9jdW1lbnQudXJsKCkgOiBkb2N1bWVudC5jb21wbGV0ZVVSTCh1cmxT dHJpbmcpOwotICAgIGlmICghY29tcGxldGVkVVJMLnByb3RvY29sSXNKYXZhU2NyaXB0KCkpCi0g ICAgICAgIG1fZnJhbWUubmF2aWdhdGlvblNjaGVkdWxlcigpLnNjaGVkdWxlUmVkaXJlY3QoZG9j dW1lbnQsIGRlbGF5LCBjb21wbGV0ZWRVUkwpOwotICAgIGVsc2UgewotICAgICAgICBhdXRvIG1l c3NhZ2UgPSAiUmVmdXNlZCB0byByZWZyZXNoICIgKyBkb2N1bWVudC51cmwoKS5zdHJpbmdDZW50 ZXJFbGxpcHNpemVkVG9MZW5ndGgoKSArICIgdG8gYSBqYXZhc2NyaXB0OiBVUkwiOwotICAgICAg ICBkb2N1bWVudC5hZGRDb25zb2xlTWVzc2FnZShNZXNzYWdlU291cmNlOjpTZWN1cml0eSwgTWVz c2FnZUxldmVsOjpFcnJvciwgbWVzc2FnZSk7Ci0gICAgfQorICAgIHNjaGVkdWxlUmVmcmVzaElm TmVlZGVkKGRvY3VtZW50LCBkb2N1bWVudExvYWRlci5yZXNwb25zZSgpLmh0dHBIZWFkZXJGaWVs ZChIVFRQSGVhZGVyTmFtZTo6UmVmcmVzaCkpOwogfQogCiB2b2lkIEZyYW1lTG9hZGVyOjpzZXRP dXRnb2luZ1JlZmVycmVyKGNvbnN0IFVSTCYgdXJsKQpAQCAtMjk0OSw2ICsyOTM5LDIxIEBAIHZv aWQgRnJhbWVMb2FkZXI6OmFkZEV4dHJhRmllbGRzVG9SZXF1ZXN0KFJlc291cmNlUmVxdWVzdCYg cmVxdWVzdCwgSXNNYWluUmVzb3VyCiAgICAgfQogfQogCit2b2lkIEZyYW1lTG9hZGVyOjpzY2hl ZHVsZVJlZnJlc2hJZk5lZWRlZChEb2N1bWVudCYgZG9jdW1lbnQsIGNvbnN0IFN0cmluZyYgY29u dGVudCkKK3sKKyAgICBkb3VibGUgZGVsYXkgPSAwOworICAgIFN0cmluZyB1cmxTdHJpbmc7Cisg ICAgaWYgKHBhcnNlTWV0YUhUVFBFcXVpdlJlZnJlc2goY29udGVudCwgZGVsYXksIHVybFN0cmlu ZykpIHsKKyAgICAgICAgYXV0byBjb21wbGV0ZWRVUkwgPSB1cmxTdHJpbmcuaXNFbXB0eSgpID8g ZG9jdW1lbnQudXJsKCkgOiBkb2N1bWVudC5jb21wbGV0ZVVSTCh1cmxTdHJpbmcpOworICAgICAg ICBpZiAoIWNvbXBsZXRlZFVSTC5wcm90b2NvbElzSmF2YVNjcmlwdCgpKQorICAgICAgICAgICAg bV9mcmFtZS5uYXZpZ2F0aW9uU2NoZWR1bGVyKCkuc2NoZWR1bGVSZWRpcmVjdChkb2N1bWVudCwg ZGVsYXksIGNvbXBsZXRlZFVSTCk7CisgICAgICAgIGVsc2UgeworICAgICAgICAgICAgU3RyaW5n IG1lc3NhZ2UgPSAiUmVmdXNlZCB0byByZWZyZXNoICIgKyBkb2N1bWVudC51cmwoKS5zdHJpbmdD ZW50ZXJFbGxpcHNpemVkVG9MZW5ndGgoKSArICIgdG8gYSBqYXZhc2NyaXB0OiBVUkwiOworICAg ICAgICAgICAgZG9jdW1lbnQuYWRkQ29uc29sZU1lc3NhZ2UoTWVzc2FnZVNvdXJjZTo6U2VjdXJp dHksIE1lc3NhZ2VMZXZlbDo6RXJyb3IsIG1lc3NhZ2UpOworICAgICAgICB9CisgICAgfQorfQor CiB2b2lkIEZyYW1lTG9hZGVyOjphZGRIVFRQT3JpZ2luSWZOZWVkZWQoUmVzb3VyY2VSZXF1ZXN0 JiByZXF1ZXN0LCBjb25zdCBTdHJpbmcmIG9yaWdpbikKIHsKICAgICBpZiAoIXJlcXVlc3QuaHR0 cE9yaWdpbigpLmlzRW1wdHkoKSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9G cmFtZUxvYWRlci5oIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmgKaW5kZXgg OGE1MGEyYzU4YWQ1OWFjODY4OGI4ZGVkZDdhMzdkOTg4YmNkN2YwNS4uYTk0YTA1OWMxYmYwOTU0 Y2QwNTZlYzc0YjY3NzY4YmM4ZTc2YmEwOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbG9h ZGVyL0ZyYW1lTG9hZGVyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVy LmgKQEAgLTMyMSw2ICszMjEsOCBAQCBwdWJsaWM6CiAgICAgLy8gRm9yIHN1YnJlc291cmNlIHJl cXVlc3RzIHRoZSBGcmFtZUxvYWRUeXBlIHBhcmFtZXRlciBoYXMgbm8gZWZmZWN0IGFuZCBjYW4g YmUgc2tpcHBlZC4KICAgICB2b2lkIGFkZEV4dHJhRmllbGRzVG9SZXF1ZXN0KFJlc291cmNlUmVx dWVzdCYsIElzTWFpblJlc291cmNlLCBGcmFtZUxvYWRUeXBlID0gRnJhbWVMb2FkVHlwZTo6U3Rh bmRhcmQpOwogCisgICAgdm9pZCBzY2hlZHVsZVJlZnJlc2hJZk5lZWRlZChEb2N1bWVudCYsIGNv bnN0IFN0cmluZyYgY29udGVudCk7CisKIHByaXZhdGU6CiAgICAgZW51bSBGb3JtU3VibWlzc2lv bkNhY2hlTG9hZFBvbGljeSB7CiAgICAgICAgIE1heUF0dGVtcHRDYWNoZU9ubHlMb2FkRm9yRm9y bVN1Ym1pc3Npb25JdGVtLAo=