209853 2020-04-01 04:49:16 -0700 Remove FrameLoader::addExtraFieldsToMainResourceRequest 2020-04-02 00:44:14 -0700 1 1 1 Unclassified WebKit New Bugs Safari Technology Preview Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 rbuis rbuis cdumez darin ews-watchlist japhet webkit-bug-importer oldest_to_newest 1636448 0 rbuis 2020-04-01 04:49:16 -0700 Remove FrameLoader::addExtraFieldsToMainResourceRequest since the call is not needed in DocumentLoader and can be inlined in FrameLoader. The call in DocumentLoader is no longer needed since adding the User-Agent header is decoupled from addExtraFields functionality and the User-Agent header will be added in CachedResourceLoader after any custom setting of the user agent (setCustomUserAgent API). 1636450 1 395158 rbuis 2020-04-01 04:58:36 -0700 Created attachment 395158 Patch 1636453 2 395159 rbuis 2020-04-01 05:35:58 -0700 Created attachment 395159 Patch 1636475 3 395164 rbuis 2020-04-01 07:25:43 -0700 Created attachment 395164 Patch 1636543 4 395164 darin 2020-04-01 09:54:10 -0700 Comment on attachment 395164 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=395164&action=review Code is fine, comments not so good > Source/WebCore/loader/DocumentLoader.cpp:1822 > // Make sure we re-apply the user agent to the Document's ResourceRequest upon reload in case the embedding > // application has changed it. The code below *clears* the user agent. The comment says "make sure we re-apply the user agent". Could you reword it to clarify what it means or remove it? Why is it valuable to clear the user agent here? If CachedResourceLoader is going to add it, why do we need to touch it at all here? Do we need to clear it because CachedResourceLoader only overwrites it and doesn’t clear it? Is it valuable to clear it to save memory or something? > Source/WebCore/loader/FrameLoader.cpp:1525 > + // FIXME: Using m_loadType seems wrong for some callers. > + // If we are only preparing to load the main resource, that is previous load's load type! The wording of this comment no longer makes sense. It said "some callers" and that meant "some callers of the addExtraFieldsToMainResourceRequest function". Need to rewrite the comment to make logical sense. I like keeping it, but needs rewording. 1636554 5 395182 rbuis 2020-04-01 10:09:26 -0700 Created attachment 395182 Patch 1636818 6 ews-feeder 2020-04-02 00:43:19 -0700 Committed r259379: <https://trac.webkit.org/changeset/259379> All reviewed patches have been landed. Closing bug and clearing flags on attachment 395182. 1636819 7 webkit-bug-importer 2020-04-02 00:44:14 -0700 <rdar://problem/61195938> 395158 2020-04-01 04:58:36 -0700 2020-04-01 05:35:53 -0700 Patch bug-209853-20200401135835.patch text/plain 4434 rbuis U3VidmVyc2lvbiBSZXZpc2lvbjogMjU5MzM2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjI3NmI5NjEzMjZiZmJi ZDE0MDAwOWE2OTY4NDczZmVhZDlkN2VkYy4uYmQ3OWRmMmEzZGM5YTc1NjI0ZjI2OTIzN2FiMjM1 NzMyZmY5MzA5MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDIwLTA0LTAxICBSb2Ig QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgUmVtb3ZlIEZyYW1lTG9hZGVyOjph ZGRFeHRyYUZpZWxkc1RvTWFpblJlc291cmNlUmVxdWVzdAorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjA5ODUzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUmVtb3ZlIEZyYW1lTG9hZGVyOjphZGRFeHRyYUZp ZWxkc1RvTWFpblJlc291cmNlUmVxdWVzdCBzaW5jZSB0aGUgY2FsbCBpcworICAgICAgICBub3Qg bmVlZGVkIGluIERvY3VtZW50TG9hZGVyIGFuZCBjYW4gYmUgaW5saW5lZCBpbiBGcmFtZUxvYWRl ci4gVGhlIGNhbGwKKyAgICAgICAgaW4gRG9jdW1lbnRMb2FkZXIgaXMgbm8gbG9uZ2VyIG5lZWRl ZCBzaW5jZSBhZGRpbmcgdGhlIFVzZXItQWdlbnQgaGVhZGVyCisgICAgICAgIGlzIGRlY291cGxl ZCBmcm9tIGFkZEV4dHJhRmllbGRzIGZ1bmN0aW9uYWxpdHkgYW5kIHRoZSBVc2VyLUFnZW50IGhl YWRlcgorICAgICAgICB3aWxsIGJlIGFkZGVkIGluIENhY2hlZFJlc291cmNlTG9hZGVyIGFmdGVy IGFueSBjdXN0b20gc2V0dGluZyBvZiB0aGUKKyAgICAgICAgdXNlciBhZ2VudCAoc2V0Q3VzdG9t VXNlckFnZW50IEFQSSkuCisKKyAgICAgICAgVGVzdDogaHR0cC90ZXN0cy9uYXZpZ2F0aW9uL3Vz ZXJhZ2VudC1yZWxvYWQucGhwCisKKyAgICAgICAgKiBsb2FkZXIvRG9jdW1lbnRMb2FkZXIuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6RG9jdW1lbnRMb2FkZXI6OnN0YXJ0TG9hZGluZ01haW5SZXNv dXJjZSk6CisgICAgICAgICogbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OkZyYW1lTG9hZGVyOjpsb2FkKToKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lTG9hZGVyOjph ZGRFeHRyYUZpZWxkc1RvTWFpblJlc291cmNlUmVxdWVzdCk6IERlbGV0ZWQuCisgICAgICAgICog bG9hZGVyL0ZyYW1lTG9hZGVyLmg6CisKIDIwMjAtMDMtMzEgIFNpbW9uIEZyYXNlciAgPHNpbW9u LmZyYXNlckBhcHBsZS5jb20+CiAKICAgICAgICAgTWFrZSBGcmFtZVZpZXcgYW5kIEZyYW1lIFRl eHRTdHJlYW0tbG9nZ2FibGUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9Eb2N1 bWVudExvYWRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRG9jdW1lbnRMb2FkZXIuY3Bw CmluZGV4IGRlY2Q3ZDdkZWU3OGViZDcwNmFkMjRjYTU1MDhjZWZkN2I2YTk1NjYuLmQ3MmJiM2U4 MzJkNGExN2Q2YTg2ZGEzYmNmMTUyZDcyZTJiOGI5ZWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL2xvYWRlci9Eb2N1bWVudExvYWRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVy L0RvY3VtZW50TG9hZGVyLmNwcApAQCAtMTgxOCwxMSArMTgxOCw2IEBAIHZvaWQgRG9jdW1lbnRM b2FkZXI6OnN0YXJ0TG9hZGluZ01haW5SZXNvdXJjZSgpCiAgICAgbV9jb250ZW50RmlsdGVyID0g IW1fc3Vic3RpdHV0ZURhdGEuaXNWYWxpZCgpID8gQ29udGVudEZpbHRlcjo6Y3JlYXRlKCp0aGlz KSA6IG51bGxwdHI7CiAjZW5kaWYKIAotICAgIC8vIE1ha2Ugc3VyZSB3ZSByZS1hcHBseSB0aGUg dXNlciBhZ2VudCB0byB0aGUgRG9jdW1lbnQncyBSZXNvdXJjZVJlcXVlc3QgdXBvbiByZWxvYWQg aW4gY2FzZSB0aGUgZW1iZWRkaW5nCi0gICAgLy8gYXBwbGljYXRpb24gaGFzIGNoYW5nZWQgaXQu Ci0gICAgbV9yZXF1ZXN0LmNsZWFySFRUUFVzZXJBZ2VudCgpOwotICAgIGZyYW1lTG9hZGVyKCkt PmFkZEV4dHJhRmllbGRzVG9NYWluUmVzb3VyY2VSZXF1ZXN0KG1fcmVxdWVzdCk7Ci0KICAgICBB U1NFUlQodGltaW5nKCkuc3RhcnRUaW1lKCkpOwogICAgIEFTU0VSVCh0aW1pbmcoKS5mZXRjaFN0 YXJ0KCkpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIu Y3BwIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcAppbmRleCA1NjgyN2Zm ZWRmZmYzZGRkYWVkMjA0NzQ4YjQwZDVkYjg1ODViYjcxLi45NDJkNDNhNmJmMzUwMDVlZWQ5MDky MjMxMWVlZTE2YjFhNjlmNjRjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJh bWVMb2FkZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5jcHAK QEAgLTE1MjEsNyArMTUyMSw5IEBAIHZvaWQgRnJhbWVMb2FkZXI6OmxvYWQoRG9jdW1lbnRMb2Fk ZXImIG5ld0RvY3VtZW50TG9hZGVyKQogICAgIEZSQU1FTE9BREVSX1JFTEVBU0VfTE9HX0lGX0FM TE9XRUQoUmVzb3VyY2VMb2FkaW5nLCAibG9hZCAoRG9jdW1lbnRMb2FkZXIpOiBmcmFtZSBsb2Fk IHN0YXJ0ZWQiKTsKIAogICAgIFJlc291cmNlUmVxdWVzdCYgciA9IG5ld0RvY3VtZW50TG9hZGVy LnJlcXVlc3QoKTsKLSAgICBhZGRFeHRyYUZpZWxkc1RvTWFpblJlc291cmNlUmVxdWVzdChyKTsK KyAgICAvLyBGSVhNRTogVXNpbmcgbV9sb2FkVHlwZSBzZWVtcyB3cm9uZyBmb3Igc29tZSBjYWxs ZXJzLgorICAgIC8vIElmIHdlIGFyZSBvbmx5IHByZXBhcmluZyB0byBsb2FkIHRoZSBtYWluIHJl c291cmNlLCB0aGF0IGlzIHByZXZpb3VzIGxvYWQncyBsb2FkIHR5cGUhCisgICAgYWRkRXh0cmFG aWVsZHNUb1JlcXVlc3QociwgbV9sb2FkVHlwZSwgZmFsc2UpOwogICAgIEZyYW1lTG9hZFR5cGUg dHlwZTsKIAogICAgIGlmIChzaG91bGRUcmVhdFVSTEFzU2FtZUFzQ3VycmVudChuZXdEb2N1bWVu dExvYWRlci5vcmlnaW5hbFJlcXVlc3QoKS51cmwoKSkpIHsKQEAgLTI4NzQsMTkgKzI4NzYsMTIg QEAgdm9pZCBGcmFtZUxvYWRlcjo6ZGV0YWNoVmlld3NBbmREb2N1bWVudExvYWRlcigpCiAgICAg c2V0RG9jdW1lbnRMb2FkZXIobnVsbHB0cik7CiAgICAgbV9jbGllbnQtPmRldGFjaGVkRnJvbVBh cmVudDMoKTsKIH0KLSAgICAKKwogdm9pZCBGcmFtZUxvYWRlcjo6YWRkRXh0cmFGaWVsZHNUb1N1 YnJlc291cmNlUmVxdWVzdChSZXNvdXJjZVJlcXVlc3QmIHJlcXVlc3QpCiB7CiAgICAgYWRkRXh0 cmFGaWVsZHNUb1JlcXVlc3QocmVxdWVzdCwgbV9sb2FkVHlwZSwgZmFsc2UpOwogfQogCi12b2lk IEZyYW1lTG9hZGVyOjphZGRFeHRyYUZpZWxkc1RvTWFpblJlc291cmNlUmVxdWVzdChSZXNvdXJj ZVJlcXVlc3QmIHJlcXVlc3QpCi17Ci0gICAgLy8gRklYTUU6IFVzaW5nIG1fbG9hZFR5cGUgc2Vl bXMgd3JvbmcgZm9yIHNvbWUgY2FsbGVycy4KLSAgICAvLyBJZiB3ZSBhcmUgb25seSBwcmVwYXJp bmcgdG8gbG9hZCB0aGUgbWFpbiByZXNvdXJjZSwgdGhhdCBpcyBwcmV2aW91cyBsb2FkJ3MgbG9h ZCB0eXBlIQotICAgIGFkZEV4dHJhRmllbGRzVG9SZXF1ZXN0KHJlcXVlc3QsIG1fbG9hZFR5cGUs IHRydWUpOwotfQotCiBSZXNvdXJjZVJlcXVlc3RDYWNoZVBvbGljeSBGcmFtZUxvYWRlcjo6ZGVm YXVsdFJlcXVlc3RDYWNoaW5nUG9saWN5KGNvbnN0IFJlc291cmNlUmVxdWVzdCYgcmVxdWVzdCwg RnJhbWVMb2FkVHlwZSBsb2FkVHlwZSwgYm9vbCBpc01haW5SZXNvdXJjZSkKIHsKICAgICBpZiAo bV9vdmVycmlkZUNhY2hlUG9saWN5Rm9yVGVzdGluZykKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL2xvYWRlci9GcmFtZUxvYWRlci5oIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9h ZGVyLmgKaW5kZXggMjViNzk1OTcyMzYyYjIyNDVmOGNjYzUyMDcxNGRlYzQ0ZDMzMmZkYS4uMGU2 NDhjYzZlYTcwMGU4NzhhMTRjOWJjMzdhNWYyMTc1MTcxZTM3OSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVy L0ZyYW1lTG9hZGVyLmgKQEAgLTIyMiw3ICsyMjIsNiBAQCBwdWJsaWM6CiAgICAgdm9pZCBkZXRh Y2hWaWV3c0FuZERvY3VtZW50TG9hZGVyKCk7CiAKICAgICB2b2lkIGFkZEV4dHJhRmllbGRzVG9T dWJyZXNvdXJjZVJlcXVlc3QoUmVzb3VyY2VSZXF1ZXN0Jik7Ci0gICAgdm9pZCBhZGRFeHRyYUZp ZWxkc1RvTWFpblJlc291cmNlUmVxdWVzdChSZXNvdXJjZVJlcXVlc3QmKTsKICAgICAKICAgICBz dGF0aWMgdm9pZCBhZGRTYW1lU2l0ZUluZm9Ub1JlcXVlc3RJZk5lZWRlZChSZXNvdXJjZVJlcXVl c3QmLCBjb25zdCBEb2N1bWVudCogaW5pdGlhdG9yID0gbnVsbHB0cik7CiAK 395159 2020-04-01 05:35:58 -0700 2020-04-01 07:25:40 -0700 Patch bug-209853-20200401143557.patch text/plain 4328 rbuis U3VidmVyc2lvbiBSZXZpc2lvbjogMjU5MzM2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjI3NmI5NjEzMjZiZmJi ZDE0MDAwOWE2OTY4NDczZmVhZDlkN2VkYy4uYmQ3OWRmMmEzZGM5YTc1NjI0ZjI2OTIzN2FiMjM1 NzMyZmY5MzA5MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDIwLTA0LTAxICBSb2Ig QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgUmVtb3ZlIEZyYW1lTG9hZGVyOjph ZGRFeHRyYUZpZWxkc1RvTWFpblJlc291cmNlUmVxdWVzdAorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjA5ODUzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUmVtb3ZlIEZyYW1lTG9hZGVyOjphZGRFeHRyYUZp ZWxkc1RvTWFpblJlc291cmNlUmVxdWVzdCBzaW5jZSB0aGUgY2FsbCBpcworICAgICAgICBub3Qg bmVlZGVkIGluIERvY3VtZW50TG9hZGVyIGFuZCBjYW4gYmUgaW5saW5lZCBpbiBGcmFtZUxvYWRl ci4gVGhlIGNhbGwKKyAgICAgICAgaW4gRG9jdW1lbnRMb2FkZXIgaXMgbm8gbG9uZ2VyIG5lZWRl ZCBzaW5jZSBhZGRpbmcgdGhlIFVzZXItQWdlbnQgaGVhZGVyCisgICAgICAgIGlzIGRlY291cGxl ZCBmcm9tIGFkZEV4dHJhRmllbGRzIGZ1bmN0aW9uYWxpdHkgYW5kIHRoZSBVc2VyLUFnZW50IGhl YWRlcgorICAgICAgICB3aWxsIGJlIGFkZGVkIGluIENhY2hlZFJlc291cmNlTG9hZGVyIGFmdGVy IGFueSBjdXN0b20gc2V0dGluZyBvZiB0aGUKKyAgICAgICAgdXNlciBhZ2VudCAoc2V0Q3VzdG9t VXNlckFnZW50IEFQSSkuCisKKyAgICAgICAgVGVzdDogaHR0cC90ZXN0cy9uYXZpZ2F0aW9uL3Vz ZXJhZ2VudC1yZWxvYWQucGhwCisKKyAgICAgICAgKiBsb2FkZXIvRG9jdW1lbnRMb2FkZXIuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6RG9jdW1lbnRMb2FkZXI6OnN0YXJ0TG9hZGluZ01haW5SZXNv dXJjZSk6CisgICAgICAgICogbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OkZyYW1lTG9hZGVyOjpsb2FkKToKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lTG9hZGVyOjph ZGRFeHRyYUZpZWxkc1RvTWFpblJlc291cmNlUmVxdWVzdCk6IERlbGV0ZWQuCisgICAgICAgICog bG9hZGVyL0ZyYW1lTG9hZGVyLmg6CisKIDIwMjAtMDMtMzEgIFNpbW9uIEZyYXNlciAgPHNpbW9u LmZyYXNlckBhcHBsZS5jb20+CiAKICAgICAgICAgTWFrZSBGcmFtZVZpZXcgYW5kIEZyYW1lIFRl eHRTdHJlYW0tbG9nZ2FibGUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9Eb2N1 bWVudExvYWRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRG9jdW1lbnRMb2FkZXIuY3Bw CmluZGV4IGRlY2Q3ZDdkZWU3OGViZDcwNmFkMjRjYTU1MDhjZWZkN2I2YTk1NjYuLmYyYjYxZTI1 NGUxZDQ2YWJlMWY1ZTc3NjRiZjI0OWYwYjZjYmMyZTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL2xvYWRlci9Eb2N1bWVudExvYWRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVy L0RvY3VtZW50TG9hZGVyLmNwcApAQCAtMTgyMSw3ICsxODIxLDYgQEAgdm9pZCBEb2N1bWVudExv YWRlcjo6c3RhcnRMb2FkaW5nTWFpblJlc291cmNlKCkKICAgICAvLyBNYWtlIHN1cmUgd2UgcmUt YXBwbHkgdGhlIHVzZXIgYWdlbnQgdG8gdGhlIERvY3VtZW50J3MgUmVzb3VyY2VSZXF1ZXN0IHVw b24gcmVsb2FkIGluIGNhc2UgdGhlIGVtYmVkZGluZwogICAgIC8vIGFwcGxpY2F0aW9uIGhhcyBj aGFuZ2VkIGl0LgogICAgIG1fcmVxdWVzdC5jbGVhckhUVFBVc2VyQWdlbnQoKTsKLSAgICBmcmFt ZUxvYWRlcigpLT5hZGRFeHRyYUZpZWxkc1RvTWFpblJlc291cmNlUmVxdWVzdChtX3JlcXVlc3Qp OwogCiAgICAgQVNTRVJUKHRpbWluZygpLnN0YXJ0VGltZSgpKTsKICAgICBBU1NFUlQodGltaW5n KCkuZmV0Y2hTdGFydCgpKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFt ZUxvYWRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3BwCmluZGV4 IDU2ODI3ZmZlZGZmZjNkZGRhZWQyMDQ3NDhiNDBkNWRiODU4NWJiNzEuLjk0MmQ0M2E2YmYzNTAw NWVlZDkwOTIyMzExZWVlMTZiMWE2OWY2NGMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xv YWRlci9GcmFtZUxvYWRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9h ZGVyLmNwcApAQCAtMTUyMSw3ICsxNTIxLDkgQEAgdm9pZCBGcmFtZUxvYWRlcjo6bG9hZChEb2N1 bWVudExvYWRlciYgbmV3RG9jdW1lbnRMb2FkZXIpCiAgICAgRlJBTUVMT0FERVJfUkVMRUFTRV9M T0dfSUZfQUxMT1dFRChSZXNvdXJjZUxvYWRpbmcsICJsb2FkIChEb2N1bWVudExvYWRlcik6IGZy YW1lIGxvYWQgc3RhcnRlZCIpOwogCiAgICAgUmVzb3VyY2VSZXF1ZXN0JiByID0gbmV3RG9jdW1l bnRMb2FkZXIucmVxdWVzdCgpOwotICAgIGFkZEV4dHJhRmllbGRzVG9NYWluUmVzb3VyY2VSZXF1 ZXN0KHIpOworICAgIC8vIEZJWE1FOiBVc2luZyBtX2xvYWRUeXBlIHNlZW1zIHdyb25nIGZvciBz b21lIGNhbGxlcnMuCisgICAgLy8gSWYgd2UgYXJlIG9ubHkgcHJlcGFyaW5nIHRvIGxvYWQgdGhl IG1haW4gcmVzb3VyY2UsIHRoYXQgaXMgcHJldmlvdXMgbG9hZCdzIGxvYWQgdHlwZSEKKyAgICBh ZGRFeHRyYUZpZWxkc1RvUmVxdWVzdChyLCBtX2xvYWRUeXBlLCBmYWxzZSk7CiAgICAgRnJhbWVM b2FkVHlwZSB0eXBlOwogCiAgICAgaWYgKHNob3VsZFRyZWF0VVJMQXNTYW1lQXNDdXJyZW50KG5l d0RvY3VtZW50TG9hZGVyLm9yaWdpbmFsUmVxdWVzdCgpLnVybCgpKSkgewpAQCAtMjg3NCwxOSAr Mjg3NiwxMiBAQCB2b2lkIEZyYW1lTG9hZGVyOjpkZXRhY2hWaWV3c0FuZERvY3VtZW50TG9hZGVy KCkKICAgICBzZXREb2N1bWVudExvYWRlcihudWxscHRyKTsKICAgICBtX2NsaWVudC0+ZGV0YWNo ZWRGcm9tUGFyZW50MygpOwogfQotICAgIAorCiB2b2lkIEZyYW1lTG9hZGVyOjphZGRFeHRyYUZp ZWxkc1RvU3VicmVzb3VyY2VSZXF1ZXN0KFJlc291cmNlUmVxdWVzdCYgcmVxdWVzdCkKIHsKICAg ICBhZGRFeHRyYUZpZWxkc1RvUmVxdWVzdChyZXF1ZXN0LCBtX2xvYWRUeXBlLCBmYWxzZSk7CiB9 CiAKLXZvaWQgRnJhbWVMb2FkZXI6OmFkZEV4dHJhRmllbGRzVG9NYWluUmVzb3VyY2VSZXF1ZXN0 KFJlc291cmNlUmVxdWVzdCYgcmVxdWVzdCkKLXsKLSAgICAvLyBGSVhNRTogVXNpbmcgbV9sb2Fk VHlwZSBzZWVtcyB3cm9uZyBmb3Igc29tZSBjYWxsZXJzLgotICAgIC8vIElmIHdlIGFyZSBvbmx5 IHByZXBhcmluZyB0byBsb2FkIHRoZSBtYWluIHJlc291cmNlLCB0aGF0IGlzIHByZXZpb3VzIGxv YWQncyBsb2FkIHR5cGUhCi0gICAgYWRkRXh0cmFGaWVsZHNUb1JlcXVlc3QocmVxdWVzdCwgbV9s b2FkVHlwZSwgdHJ1ZSk7Ci19Ci0KIFJlc291cmNlUmVxdWVzdENhY2hlUG9saWN5IEZyYW1lTG9h ZGVyOjpkZWZhdWx0UmVxdWVzdENhY2hpbmdQb2xpY3koY29uc3QgUmVzb3VyY2VSZXF1ZXN0JiBy ZXF1ZXN0LCBGcmFtZUxvYWRUeXBlIGxvYWRUeXBlLCBib29sIGlzTWFpblJlc291cmNlKQogewog ICAgIGlmIChtX292ZXJyaWRlQ2FjaGVQb2xpY3lGb3JUZXN0aW5nKQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmggYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIv RnJhbWVMb2FkZXIuaAppbmRleCAyNWI3OTU5NzIzNjJiMjI0NWY4Y2NjNTIwNzE0ZGVjNDRkMzMy ZmRhLi4wZTY0OGNjNmVhNzAwZTg3OGExNGM5YmMzN2E1ZjIxNzUxNzFlMzc5IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9sb2FkZXIvRnJhbWVMb2FkZXIuaApAQCAtMjIyLDcgKzIyMiw2IEBAIHB1YmxpYzoKICAgICB2 b2lkIGRldGFjaFZpZXdzQW5kRG9jdW1lbnRMb2FkZXIoKTsKIAogICAgIHZvaWQgYWRkRXh0cmFG aWVsZHNUb1N1YnJlc291cmNlUmVxdWVzdChSZXNvdXJjZVJlcXVlc3QmKTsKLSAgICB2b2lkIGFk ZEV4dHJhRmllbGRzVG9NYWluUmVzb3VyY2VSZXF1ZXN0KFJlc291cmNlUmVxdWVzdCYpOwogICAg IAogICAgIHN0YXRpYyB2b2lkIGFkZFNhbWVTaXRlSW5mb1RvUmVxdWVzdElmTmVlZGVkKFJlc291 cmNlUmVxdWVzdCYsIGNvbnN0IERvY3VtZW50KiBpbml0aWF0b3IgPSBudWxscHRyKTsKIAo= 395164 2020-04-01 07:25:43 -0700 2020-04-01 10:09:23 -0700 Patch bug-209853-20200401162542.patch text/plain 4324 rbuis U3VidmVyc2lvbiBSZXZpc2lvbjogMjU5MzQyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDAxYmU3NmI1MGQyMTgy ZjlhYjcwNTg3YTE1ODEyNzgwZmEzMjJlYS4uOGI2NzQ4ZThjNjQ3MTM2NjUxY2E4Mzk2NTA0ODFh YzE0NWZiM2ExNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDIwLTA0LTAxICBSb2Ig QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgUmVtb3ZlIEZyYW1lTG9hZGVyOjph ZGRFeHRyYUZpZWxkc1RvTWFpblJlc291cmNlUmVxdWVzdAorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjA5ODUzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUmVtb3ZlIEZyYW1lTG9hZGVyOjphZGRFeHRyYUZp ZWxkc1RvTWFpblJlc291cmNlUmVxdWVzdCBzaW5jZSB0aGUgY2FsbCBpcworICAgICAgICBub3Qg bmVlZGVkIGluIERvY3VtZW50TG9hZGVyIGFuZCBjYW4gYmUgaW5saW5lZCBpbiBGcmFtZUxvYWRl ci4gVGhlIGNhbGwKKyAgICAgICAgaW4gRG9jdW1lbnRMb2FkZXIgaXMgbm8gbG9uZ2VyIG5lZWRl ZCBzaW5jZSBhZGRpbmcgdGhlIFVzZXItQWdlbnQgaGVhZGVyCisgICAgICAgIGlzIGRlY291cGxl ZCBmcm9tIGFkZEV4dHJhRmllbGRzIGZ1bmN0aW9uYWxpdHkgYW5kIHRoZSBVc2VyLUFnZW50IGhl YWRlcgorICAgICAgICB3aWxsIGJlIGFkZGVkIGluIENhY2hlZFJlc291cmNlTG9hZGVyIGFmdGVy IGFueSBjdXN0b20gc2V0dGluZyBvZiB0aGUKKyAgICAgICAgdXNlciBhZ2VudCAoc2V0Q3VzdG9t VXNlckFnZW50IEFQSSkuCisKKyAgICAgICAgVGVzdDogaHR0cC90ZXN0cy9uYXZpZ2F0aW9uL3Vz ZXJhZ2VudC1yZWxvYWQucGhwCisKKyAgICAgICAgKiBsb2FkZXIvRG9jdW1lbnRMb2FkZXIuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6RG9jdW1lbnRMb2FkZXI6OnN0YXJ0TG9hZGluZ01haW5SZXNv dXJjZSk6CisgICAgICAgICogbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OkZyYW1lTG9hZGVyOjpsb2FkKToKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lTG9hZGVyOjph ZGRFeHRyYUZpZWxkc1RvTWFpblJlc291cmNlUmVxdWVzdCk6IERlbGV0ZWQuCisgICAgICAgICog bG9hZGVyL0ZyYW1lTG9hZGVyLmg6CisKIDIwMjAtMDQtMDEgIHlvdWVubiBmYWJsZXQgIDx5b3Vl bm5AYXBwbGUuY29tPgogCiAgICAgICAgIFN1cHBvcnQgcmVzb2x1dGlvbiBvZiBJUHY2IFNUVU4v VFVSTiBhZGRyZXNzZXMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9Eb2N1bWVu dExvYWRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRG9jdW1lbnRMb2FkZXIuY3BwCmlu ZGV4IGRlY2Q3ZDdkZWU3OGViZDcwNmFkMjRjYTU1MDhjZWZkN2I2YTk1NjYuLmYyYjYxZTI1NGUx ZDQ2YWJlMWY1ZTc3NjRiZjI0OWYwYjZjYmMyZTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L2xvYWRlci9Eb2N1bWVudExvYWRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL0Rv Y3VtZW50TG9hZGVyLmNwcApAQCAtMTgyMSw3ICsxODIxLDYgQEAgdm9pZCBEb2N1bWVudExvYWRl cjo6c3RhcnRMb2FkaW5nTWFpblJlc291cmNlKCkKICAgICAvLyBNYWtlIHN1cmUgd2UgcmUtYXBw bHkgdGhlIHVzZXIgYWdlbnQgdG8gdGhlIERvY3VtZW50J3MgUmVzb3VyY2VSZXF1ZXN0IHVwb24g cmVsb2FkIGluIGNhc2UgdGhlIGVtYmVkZGluZwogICAgIC8vIGFwcGxpY2F0aW9uIGhhcyBjaGFu Z2VkIGl0LgogICAgIG1fcmVxdWVzdC5jbGVhckhUVFBVc2VyQWdlbnQoKTsKLSAgICBmcmFtZUxv YWRlcigpLT5hZGRFeHRyYUZpZWxkc1RvTWFpblJlc291cmNlUmVxdWVzdChtX3JlcXVlc3QpOwog CiAgICAgQVNTRVJUKHRpbWluZygpLnN0YXJ0VGltZSgpKTsKICAgICBBU1NFUlQodGltaW5nKCku ZmV0Y2hTdGFydCgpKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxv YWRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3BwCmluZGV4IDU2 ODI3ZmZlZGZmZjNkZGRhZWQyMDQ3NDhiNDBkNWRiODU4NWJiNzEuLjg1NDE1YTMxOGI5MWJhYjQz MWVmZjEyZmU2NTI2OTkzNTlhOWE2MGQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRl ci9GcmFtZUxvYWRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVy LmNwcApAQCAtMTUyMSw3ICsxNTIxLDkgQEAgdm9pZCBGcmFtZUxvYWRlcjo6bG9hZChEb2N1bWVu dExvYWRlciYgbmV3RG9jdW1lbnRMb2FkZXIpCiAgICAgRlJBTUVMT0FERVJfUkVMRUFTRV9MT0df SUZfQUxMT1dFRChSZXNvdXJjZUxvYWRpbmcsICJsb2FkIChEb2N1bWVudExvYWRlcik6IGZyYW1l IGxvYWQgc3RhcnRlZCIpOwogCiAgICAgUmVzb3VyY2VSZXF1ZXN0JiByID0gbmV3RG9jdW1lbnRM b2FkZXIucmVxdWVzdCgpOwotICAgIGFkZEV4dHJhRmllbGRzVG9NYWluUmVzb3VyY2VSZXF1ZXN0 KHIpOworICAgIC8vIEZJWE1FOiBVc2luZyBtX2xvYWRUeXBlIHNlZW1zIHdyb25nIGZvciBzb21l IGNhbGxlcnMuCisgICAgLy8gSWYgd2UgYXJlIG9ubHkgcHJlcGFyaW5nIHRvIGxvYWQgdGhlIG1h aW4gcmVzb3VyY2UsIHRoYXQgaXMgcHJldmlvdXMgbG9hZCdzIGxvYWQgdHlwZSEKKyAgICBhZGRF eHRyYUZpZWxkc1RvUmVxdWVzdChyLCBtX2xvYWRUeXBlLCB0cnVlKTsKICAgICBGcmFtZUxvYWRU eXBlIHR5cGU7CiAKICAgICBpZiAoc2hvdWxkVHJlYXRVUkxBc1NhbWVBc0N1cnJlbnQobmV3RG9j dW1lbnRMb2FkZXIub3JpZ2luYWxSZXF1ZXN0KCkudXJsKCkpKSB7CkBAIC0yODc0LDE5ICsyODc2 LDEyIEBAIHZvaWQgRnJhbWVMb2FkZXI6OmRldGFjaFZpZXdzQW5kRG9jdW1lbnRMb2FkZXIoKQog ICAgIHNldERvY3VtZW50TG9hZGVyKG51bGxwdHIpOwogICAgIG1fY2xpZW50LT5kZXRhY2hlZEZy b21QYXJlbnQzKCk7CiB9Ci0gICAgCisKIHZvaWQgRnJhbWVMb2FkZXI6OmFkZEV4dHJhRmllbGRz VG9TdWJyZXNvdXJjZVJlcXVlc3QoUmVzb3VyY2VSZXF1ZXN0JiByZXF1ZXN0KQogewogICAgIGFk ZEV4dHJhRmllbGRzVG9SZXF1ZXN0KHJlcXVlc3QsIG1fbG9hZFR5cGUsIGZhbHNlKTsKIH0KIAot dm9pZCBGcmFtZUxvYWRlcjo6YWRkRXh0cmFGaWVsZHNUb01haW5SZXNvdXJjZVJlcXVlc3QoUmVz b3VyY2VSZXF1ZXN0JiByZXF1ZXN0KQotewotICAgIC8vIEZJWE1FOiBVc2luZyBtX2xvYWRUeXBl IHNlZW1zIHdyb25nIGZvciBzb21lIGNhbGxlcnMuCi0gICAgLy8gSWYgd2UgYXJlIG9ubHkgcHJl cGFyaW5nIHRvIGxvYWQgdGhlIG1haW4gcmVzb3VyY2UsIHRoYXQgaXMgcHJldmlvdXMgbG9hZCdz IGxvYWQgdHlwZSEKLSAgICBhZGRFeHRyYUZpZWxkc1RvUmVxdWVzdChyZXF1ZXN0LCBtX2xvYWRU eXBlLCB0cnVlKTsKLX0KLQogUmVzb3VyY2VSZXF1ZXN0Q2FjaGVQb2xpY3kgRnJhbWVMb2FkZXI6 OmRlZmF1bHRSZXF1ZXN0Q2FjaGluZ1BvbGljeShjb25zdCBSZXNvdXJjZVJlcXVlc3QmIHJlcXVl c3QsIEZyYW1lTG9hZFR5cGUgbG9hZFR5cGUsIGJvb2wgaXNNYWluUmVzb3VyY2UpCiB7CiAgICAg aWYgKG1fb3ZlcnJpZGVDYWNoZVBvbGljeUZvclRlc3RpbmcpCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuaCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFt ZUxvYWRlci5oCmluZGV4IDI1Yjc5NTk3MjM2MmIyMjQ1ZjhjY2M1MjA3MTRkZWM0NGQzMzJmZGEu LjBlNjQ4Y2M2ZWE3MDBlODc4YTE0YzliYzM3YTVmMjE3NTE3MWUzNzkgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xv YWRlci9GcmFtZUxvYWRlci5oCkBAIC0yMjIsNyArMjIyLDYgQEAgcHVibGljOgogICAgIHZvaWQg ZGV0YWNoVmlld3NBbmREb2N1bWVudExvYWRlcigpOwogCiAgICAgdm9pZCBhZGRFeHRyYUZpZWxk c1RvU3VicmVzb3VyY2VSZXF1ZXN0KFJlc291cmNlUmVxdWVzdCYpOwotICAgIHZvaWQgYWRkRXh0 cmFGaWVsZHNUb01haW5SZXNvdXJjZVJlcXVlc3QoUmVzb3VyY2VSZXF1ZXN0Jik7CiAgICAgCiAg ICAgc3RhdGljIHZvaWQgYWRkU2FtZVNpdGVJbmZvVG9SZXF1ZXN0SWZOZWVkZWQoUmVzb3VyY2VS ZXF1ZXN0JiwgY29uc3QgRG9jdW1lbnQqIGluaXRpYXRvciA9IG51bGxwdHIpOwogCg== 395182 2020-04-01 10:09:26 -0700 2020-04-02 00:43:20 -0700 Patch bug-209853-20200401190925.patch text/plain 4454 rbuis U3VidmVyc2lvbiBSZXZpc2lvbjogMjU5MzQyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDAxYmU3NmI1MGQyMTgy ZjlhYjcwNTg3YTE1ODEyNzgwZmEzMjJlYS4uNGU2OGRhZmZkYTQ4MzI4OTg4NGE0ZjVhMThiZTYw YTcxYWVkZjM2NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDIwLTA0LTAxICBSb2Ig QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgUmVtb3ZlIEZyYW1lTG9hZGVyOjph ZGRFeHRyYUZpZWxkc1RvTWFpblJlc291cmNlUmVxdWVzdAorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjA5ODUzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkg RGFyaW4gQWRsZXIuCisKKyAgICAgICAgUmVtb3ZlIEZyYW1lTG9hZGVyOjphZGRFeHRyYUZpZWxk c1RvTWFpblJlc291cmNlUmVxdWVzdCBzaW5jZSB0aGUgY2FsbCBpcworICAgICAgICBub3QgbmVl ZGVkIGluIERvY3VtZW50TG9hZGVyIGFuZCBjYW4gYmUgaW5saW5lZCBpbiBGcmFtZUxvYWRlci4g VGhlIGNhbGwKKyAgICAgICAgaW4gRG9jdW1lbnRMb2FkZXIgaXMgbm8gbG9uZ2VyIG5lZWRlZCBz aW5jZSBhZGRpbmcgdGhlIFVzZXItQWdlbnQgaGVhZGVyCisgICAgICAgIGlzIGRlY291cGxlZCBm cm9tIGFkZEV4dHJhRmllbGRzIGZ1bmN0aW9uYWxpdHkgYW5kIHRoZSBVc2VyLUFnZW50IGhlYWRl cgorICAgICAgICB3aWxsIGJlIGFkZGVkIGluIENhY2hlZFJlc291cmNlTG9hZGVyIGFmdGVyIGFu eSBjdXN0b20gc2V0dGluZyBvZiB0aGUKKyAgICAgICAgdXNlciBhZ2VudCAoc2V0Q3VzdG9tVXNl ckFnZW50IEFQSSkuCisKKyAgICAgICAgVGVzdDogaHR0cC90ZXN0cy9uYXZpZ2F0aW9uL3VzZXJh Z2VudC1yZWxvYWQucGhwCisKKyAgICAgICAgKiBsb2FkZXIvRG9jdW1lbnRMb2FkZXIuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6RG9jdW1lbnRMb2FkZXI6OnN0YXJ0TG9hZGluZ01haW5SZXNvdXJj ZSk6CisgICAgICAgICogbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OkZyYW1lTG9hZGVyOjpsb2FkKToKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lTG9hZGVyOjphZGRF eHRyYUZpZWxkc1RvTWFpblJlc291cmNlUmVxdWVzdCk6IERlbGV0ZWQuCisgICAgICAgICogbG9h ZGVyL0ZyYW1lTG9hZGVyLmg6CisKIDIwMjAtMDQtMDEgIHlvdWVubiBmYWJsZXQgIDx5b3Vlbm5A YXBwbGUuY29tPgogCiAgICAgICAgIFN1cHBvcnQgcmVzb2x1dGlvbiBvZiBJUHY2IFNUVU4vVFVS TiBhZGRyZXNzZXMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9Eb2N1bWVudExv YWRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRG9jdW1lbnRMb2FkZXIuY3BwCmluZGV4 IGRlY2Q3ZDdkZWU3OGViZDcwNmFkMjRjYTU1MDhjZWZkN2I2YTk1NjYuLjc5NjUxM2MyMGM3MDFj ZDg1MTFlNzJjMGI1YzY0NjYxMjM5MmYyMWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xv YWRlci9Eb2N1bWVudExvYWRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL0RvY3Vt ZW50TG9hZGVyLmNwcApAQCAtMTgxOSw5ICsxODE5LDggQEAgdm9pZCBEb2N1bWVudExvYWRlcjo6 c3RhcnRMb2FkaW5nTWFpblJlc291cmNlKCkKICNlbmRpZgogCiAgICAgLy8gTWFrZSBzdXJlIHdl IHJlLWFwcGx5IHRoZSB1c2VyIGFnZW50IHRvIHRoZSBEb2N1bWVudCdzIFJlc291cmNlUmVxdWVz dCB1cG9uIHJlbG9hZCBpbiBjYXNlIHRoZSBlbWJlZGRpbmcKLSAgICAvLyBhcHBsaWNhdGlvbiBo YXMgY2hhbmdlZCBpdC4KKyAgICAvLyBhcHBsaWNhdGlvbiBoYXMgY2hhbmdlZCBpdCwgYnkgY2xl YXJpbmcgdGhlIHByZXZpb3VzIHVzZXIgYWdlbnQgdmFsdWUgaGVyZSBhbmQgYXBwbHlpbmcgdGhl IG5ldyB2YWx1ZSBpbiBDYWNoZWRSZXNvdXJjZUxvYWRlci4KICAgICBtX3JlcXVlc3QuY2xlYXJI VFRQVXNlckFnZW50KCk7Ci0gICAgZnJhbWVMb2FkZXIoKS0+YWRkRXh0cmFGaWVsZHNUb01haW5S ZXNvdXJjZVJlcXVlc3QobV9yZXF1ZXN0KTsKIAogICAgIEFTU0VSVCh0aW1pbmcoKS5zdGFydFRp bWUoKSk7CiAgICAgQVNTRVJUKHRpbWluZygpLmZldGNoU3RhcnQoKSk7CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvbG9h ZGVyL0ZyYW1lTG9hZGVyLmNwcAppbmRleCA1NjgyN2ZmZWRmZmYzZGRkYWVkMjA0NzQ4YjQwZDVk Yjg1ODViYjcxLi5jOTRjOTE0MzJkNjdjZTI2MzA0YWE3NDhjYTg3MTI4ZThmYzQ1YmJmIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5jcHAKQEAgLTE1MjEsNyArMTUyMSw5IEBAIHZv aWQgRnJhbWVMb2FkZXI6OmxvYWQoRG9jdW1lbnRMb2FkZXImIG5ld0RvY3VtZW50TG9hZGVyKQog ICAgIEZSQU1FTE9BREVSX1JFTEVBU0VfTE9HX0lGX0FMTE9XRUQoUmVzb3VyY2VMb2FkaW5nLCAi bG9hZCAoRG9jdW1lbnRMb2FkZXIpOiBmcmFtZSBsb2FkIHN0YXJ0ZWQiKTsKIAogICAgIFJlc291 cmNlUmVxdWVzdCYgciA9IG5ld0RvY3VtZW50TG9hZGVyLnJlcXVlc3QoKTsKLSAgICBhZGRFeHRy YUZpZWxkc1RvTWFpblJlc291cmNlUmVxdWVzdChyKTsKKyAgICAvLyBGSVhNRTogVXNpbmcgbV9s b2FkVHlwZSBzZWVtcyB3cm9uZyBoZXJlLgorICAgIC8vIElmIHdlIGFyZSBvbmx5IHByZXBhcmlu ZyB0byBsb2FkIHRoZSBtYWluIHJlc291cmNlLCB0aGF0IGlzIHByZXZpb3VzIGxvYWQncyBsb2Fk IHR5cGUhCisgICAgYWRkRXh0cmFGaWVsZHNUb1JlcXVlc3QociwgbV9sb2FkVHlwZSwgdHJ1ZSk7 CiAgICAgRnJhbWVMb2FkVHlwZSB0eXBlOwogCiAgICAgaWYgKHNob3VsZFRyZWF0VVJMQXNTYW1l QXNDdXJyZW50KG5ld0RvY3VtZW50TG9hZGVyLm9yaWdpbmFsUmVxdWVzdCgpLnVybCgpKSkgewpA QCAtMjg3NCwxOSArMjg3NiwxMiBAQCB2b2lkIEZyYW1lTG9hZGVyOjpkZXRhY2hWaWV3c0FuZERv Y3VtZW50TG9hZGVyKCkKICAgICBzZXREb2N1bWVudExvYWRlcihudWxscHRyKTsKICAgICBtX2Ns aWVudC0+ZGV0YWNoZWRGcm9tUGFyZW50MygpOwogfQotICAgIAorCiB2b2lkIEZyYW1lTG9hZGVy OjphZGRFeHRyYUZpZWxkc1RvU3VicmVzb3VyY2VSZXF1ZXN0KFJlc291cmNlUmVxdWVzdCYgcmVx dWVzdCkKIHsKICAgICBhZGRFeHRyYUZpZWxkc1RvUmVxdWVzdChyZXF1ZXN0LCBtX2xvYWRUeXBl LCBmYWxzZSk7CiB9CiAKLXZvaWQgRnJhbWVMb2FkZXI6OmFkZEV4dHJhRmllbGRzVG9NYWluUmVz b3VyY2VSZXF1ZXN0KFJlc291cmNlUmVxdWVzdCYgcmVxdWVzdCkKLXsKLSAgICAvLyBGSVhNRTog VXNpbmcgbV9sb2FkVHlwZSBzZWVtcyB3cm9uZyBmb3Igc29tZSBjYWxsZXJzLgotICAgIC8vIElm IHdlIGFyZSBvbmx5IHByZXBhcmluZyB0byBsb2FkIHRoZSBtYWluIHJlc291cmNlLCB0aGF0IGlz IHByZXZpb3VzIGxvYWQncyBsb2FkIHR5cGUhCi0gICAgYWRkRXh0cmFGaWVsZHNUb1JlcXVlc3Qo cmVxdWVzdCwgbV9sb2FkVHlwZSwgdHJ1ZSk7Ci19Ci0KIFJlc291cmNlUmVxdWVzdENhY2hlUG9s aWN5IEZyYW1lTG9hZGVyOjpkZWZhdWx0UmVxdWVzdENhY2hpbmdQb2xpY3koY29uc3QgUmVzb3Vy Y2VSZXF1ZXN0JiByZXF1ZXN0LCBGcmFtZUxvYWRUeXBlIGxvYWRUeXBlLCBib29sIGlzTWFpblJl c291cmNlKQogewogICAgIGlmIChtX292ZXJyaWRlQ2FjaGVQb2xpY3lGb3JUZXN0aW5nKQpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmggYi9Tb3VyY2UvV2Vi Q29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuaAppbmRleCAyNWI3OTU5NzIzNjJiMjI0NWY4Y2NjNTIw NzE0ZGVjNDRkMzMyZmRhLi4wZTY0OGNjNmVhNzAwZTg3OGExNGM5YmMzN2E1ZjIxNzUxNzFlMzc5 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuaAorKysgYi9T b3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuaApAQCAtMjIyLDcgKzIyMiw2IEBAIHB1 YmxpYzoKICAgICB2b2lkIGRldGFjaFZpZXdzQW5kRG9jdW1lbnRMb2FkZXIoKTsKIAogICAgIHZv aWQgYWRkRXh0cmFGaWVsZHNUb1N1YnJlc291cmNlUmVxdWVzdChSZXNvdXJjZVJlcXVlc3QmKTsK LSAgICB2b2lkIGFkZEV4dHJhRmllbGRzVG9NYWluUmVzb3VyY2VSZXF1ZXN0KFJlc291cmNlUmVx dWVzdCYpOwogICAgIAogICAgIHN0YXRpYyB2b2lkIGFkZFNhbWVTaXRlSW5mb1RvUmVxdWVzdElm TmVlZGVkKFJlc291cmNlUmVxdWVzdCYsIGNvbnN0IERvY3VtZW50KiBpbml0aWF0b3IgPSBudWxs cHRyKTsKIAo=