196692 2019-04-08 08:51:38 -0700 Lazily construct Navigator serviceWorker 2019-04-08 13:53:43 -0700 1 1 1 Unclassified WebKit Service Workers WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=190060 InRadar P2 Normal --- 1 youennf youennf cdumez commit-queue ggaren webkit-bug-importer oldest_to_newest 1525191 0 youennf 2019-04-08 08:51:38 -0700 Lazily construct Navigator serviceWorker 1525196 1 366939 youennf 2019-04-08 09:02:27 -0700 Created attachment 366939 Patch 1525231 2 366939 ggaren 2019-04-08 10:26:28 -0700 Comment on attachment 366939 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=366939&action=review > Source/WebCore/page/NavigatorBase.cpp:150 > +ServiceWorkerContainer* NavigatorBase::serviceWorkerIfAny() I think we agreed, in WebKit style, to call functions like this "serviceWorkerIfExists". It's not my very favorite name, but I'd like us to follow the consensus style here. 1525244 3 366951 youennf 2019-04-08 10:36:06 -0700 Created attachment 366951 Patch 1525343 4 366951 commit-queue 2019-04-08 13:51:26 -0700 Comment on attachment 366951 Patch Clearing flags on attachment: 366951 Committed r244043: <https://trac.webkit.org/changeset/244043> 1525344 5 commit-queue 2019-04-08 13:51:28 -0700 All reviewed patches have been landed. Closing bug. 1525345 6 webkit-bug-importer 2019-04-08 13:53:43 -0700 <rdar://problem/49709802> 366939 2019-04-08 09:02:27 -0700 2019-04-08 10:36:04 -0700 Patch bug-196692-20190408090226.patch text/plain 5614 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjQzODcwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDRkN2YyZDI1MDg4MTk0 MTdmMmFmMDcyYmM4ODA3OGIzOTI4YTY2ZC4uOWNjZmQ1OWFhNjRiZjhlOTUxYjExMDU5YmVkMDQ5 OWU2NGFjZGIzNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDE5LTA0LTA4ICBZb3Vl bm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KKworICAgICAgICBMYXppbHkgY29uc3RydWN0 IE5hdmlnYXRvciBzZXJ2aWNlV29ya2VyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0xOTY2OTIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBNYWtlIE5hdmlnYXRvckJhc2UgYSBDb250ZXh0RGVzdHJ1Y3Rpb25P YnNlcnZlci4KKyAgICAgICAgVGhpcyBhbGxvd3MgdG8gZ2V0IHRoZSBuYXZpZ2F0b3Igc2NyaXB0 IGV4ZWN1dGlvbiBjb250ZXh0LgorICAgICAgICBVc2UgaXQgd2hlbiBjcmVhdGluZyB0aGUgbmF2 aWdhdG9yIFNlcnZpY2VXb3JrZXJDb250YWluZXIgb2JqZWN0LgorICAgICAgICBGb3IgR0MsIGlu dHJvZHVjZSBzZXJ2aWNlV29ya2VySWZBbnkgd2hpY2ggcmV0dXJucyB0aGUgY29udGFpbmVyIGlm IGNyZWF0ZWQuCisgICAgICAgIE5vIEpTIG9ic2VydmFibGUgY2hhbmdlIG9mIGJlaGF2aW9yLgor ICAgICAgICBDb3ZlcmVkIGJ5IGV4aXN0aW5nIHRlc3RzLgorCisgICAgICAgICogYmluZGluZ3Mv anMvSlNOYXZpZ2F0b3JDdXN0b20uY3BwOgorICAgICAgICAoV2ViQ29yZTo6SlNOYXZpZ2F0b3I6 OnZpc2l0QWRkaXRpb25hbENoaWxkcmVuKToKKyAgICAgICAgKiBiaW5kaW5ncy9qcy9KU1dvcmtl ck5hdmlnYXRvckN1c3RvbS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpKU1dvcmtlck5hdmlnYXRv cjo6dmlzaXRBZGRpdGlvbmFsQ2hpbGRyZW4pOgorICAgICAgICAqIHBhZ2UvTmF2aWdhdG9yQmFz ZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpOYXZpZ2F0b3JCYXNlOjpOYXZpZ2F0b3JCYXNlKToK KyAgICAgICAgKFdlYkNvcmU6Ok5hdmlnYXRvckJhc2U6OnNlcnZpY2VXb3JrZXJJZkFueSk6Cisg ICAgICAgIChXZWJDb3JlOjpOYXZpZ2F0b3JCYXNlOjpzZXJ2aWNlV29ya2VyKToKKyAgICAgICAg KiBwYWdlL05hdmlnYXRvckJhc2UuaDoKKwogMjAxOS0wNC0wNSAgWW91ZW5uIEZhYmxldCAgPHlv dWVubkBhcHBsZS5jb20+CiAKICAgICAgICAgUmVtb3ZlIElEQi1zcGVjaWZpYyBxdW90YQpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvSlNOYXZpZ2F0b3JDdXN0b20uY3Bw IGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvSlNOYXZpZ2F0b3JDdXN0b20uY3BwCmluZGV4 IDIxNjk5MDA0YWE3NTFlZGJiNDZmMTkwZDU3ZjQzMDhjMDQwODdmZGEuLjYzMjEzMzIyZTVkN2Nl ZTc3ZDFjMjE2N2U4OTQxYmMyNDkyODE2MDEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Jp bmRpbmdzL2pzL0pTTmF2aWdhdG9yQ3VzdG9tLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9iaW5k aW5ncy9qcy9KU05hdmlnYXRvckN1c3RvbS5jcHAKQEAgLTMxLDcgKzMxLDcgQEAgbmFtZXNwYWNl IFdlYkNvcmUgewogdm9pZCBKU05hdmlnYXRvcjo6dmlzaXRBZGRpdGlvbmFsQ2hpbGRyZW4oSlND OjpTbG90VmlzaXRvciYgdmlzaXRvcikKIHsKICNpZiBFTkFCTEUoU0VSVklDRV9XT1JLRVIpCi0g ICAgdmlzaXRvci5hZGRPcGFxdWVSb290KCZ3cmFwcGVkKCkuc2VydmljZVdvcmtlcigpKTsKKyAg ICB2aXNpdG9yLmFkZE9wYXF1ZVJvb3Qod3JhcHBlZCgpLnNlcnZpY2VXb3JrZXJJZkFueSgpKTsK ICNlbHNlCiAgICAgVU5VU0VEX1BBUkFNKHZpc2l0b3IpOwogI2VuZGlmCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU1dvcmtlck5hdmlnYXRvckN1c3RvbS5jcHAgYi9T b3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU1dvcmtlck5hdmlnYXRvckN1c3RvbS5jcHAKaW5k ZXggMGExMzYzYzIxNWE2NDE0MTgwMjMzMjcyYjBiZmYwNWZkMGMwZjZhNS4uZDJiY2IzOTAxYzMy YzUyZmJiNDJiOTRmZGQ4NWQwMWY0NzBiNDg4YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv YmluZGluZ3MvanMvSlNXb3JrZXJOYXZpZ2F0b3JDdXN0b20uY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL2JpbmRpbmdzL2pzL0pTV29ya2VyTmF2aWdhdG9yQ3VzdG9tLmNwcApAQCAtMzEsNyArMzEs NyBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiB2b2lkIEpTV29ya2VyTmF2aWdhdG9yOjp2aXNpdEFk ZGl0aW9uYWxDaGlsZHJlbihKU0M6OlNsb3RWaXNpdG9yJiB2aXNpdG9yKQogewogI2lmIEVOQUJM RShTRVJWSUNFX1dPUktFUikKLSAgICB2aXNpdG9yLmFkZE9wYXF1ZVJvb3QoJndyYXBwZWQoKS5z ZXJ2aWNlV29ya2VyKCkpOworICAgIHZpc2l0b3IuYWRkT3BhcXVlUm9vdCh3cmFwcGVkKCkuc2Vy dmljZVdvcmtlcklmQW55KCkpOwogI2Vsc2UKICAgICBVTlVTRURfUEFSQU0odmlzaXRvcik7CiAj ZW5kaWYKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvTmF2aWdhdG9yQmFzZS5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9wYWdlL05hdmlnYXRvckJhc2UuY3BwCmluZGV4IGRhODc5NGRiNGY2 MmU2NWNhOTNjNzM3MDRmNWU0MTE1ZTJmYzdmZTAuLjVlOGZiOTBlZmM4ZTExY2QzZDgxOGM3M2I2 MzdlYTc0ODM1MDg4NTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvTmF2aWdhdG9y QmFzZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9OYXZpZ2F0b3JCYXNlLmNwcApAQCAt MjgsNiArMjgsNyBAQAogI2luY2x1ZGUgIk5hdmlnYXRvckJhc2UuaCIKIAogI2luY2x1ZGUgIkRv Y3VtZW50LmgiCisjaW5jbHVkZSAiUnVudGltZUVuYWJsZWRGZWF0dXJlcy5oIgogI2luY2x1ZGUg IlNlcnZpY2VXb3JrZXJDb250YWluZXIuaCIKICNpbmNsdWRlIDxtdXRleD4KICNpbmNsdWRlIDx3 dGYvTGFuZ3VhZ2UuaD4KQEAgLTc3LDEzICs3OCw4IEBACiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAK IE5hdmlnYXRvckJhc2U6Ok5hdmlnYXRvckJhc2UoU2NyaXB0RXhlY3V0aW9uQ29udGV4dCogY29u dGV4dCkKLSNpZiBFTkFCTEUoU0VSVklDRV9XT1JLRVIpCi0gICAgOiBtX3NlcnZpY2VXb3JrZXJD b250YWluZXIobWFrZVVuaXF1ZVJlZjxTZXJ2aWNlV29ya2VyQ29udGFpbmVyPihjb250ZXh0LCAq dGhpcykpCi0jZW5kaWYKKyAgICA6IENvbnRleHREZXN0cnVjdGlvbk9ic2VydmVyKGNvbnRleHQp CiB7Ci0jaWYgIUVOQUJMRShTRVJWSUNFX1dPUktFUikKLSAgICBVTlVTRURfUEFSQU0oY29udGV4 dCk7Ci0jZW5kaWYKIH0KIAogTmF2aWdhdG9yQmFzZTo6fk5hdmlnYXRvckJhc2UoKSA9IGRlZmF1 bHQ7CkBAIC0xNTEsMTYgKzE0NywyNCBAQCBWZWN0b3I8U3RyaW5nPiBOYXZpZ2F0b3JCYXNlOjps YW5ndWFnZXMoKQogfQogCiAjaWYgRU5BQkxFKFNFUlZJQ0VfV09SS0VSKQorU2VydmljZVdvcmtl ckNvbnRhaW5lciogTmF2aWdhdG9yQmFzZTo6c2VydmljZVdvcmtlcklmQW55KCkKK3sKKyAgICBy ZXR1cm4gbV9zZXJ2aWNlV29ya2VyQ29udGFpbmVyLmdldCgpOworfQorCiBTZXJ2aWNlV29ya2Vy Q29udGFpbmVyJiBOYXZpZ2F0b3JCYXNlOjpzZXJ2aWNlV29ya2VyKCkKIHsKLSAgICByZXR1cm4g bV9zZXJ2aWNlV29ya2VyQ29udGFpbmVyOworICAgIEFTU0VSVChSdW50aW1lRW5hYmxlZEZlYXR1 cmVzOjpzaGFyZWRGZWF0dXJlcygpLnNlcnZpY2VXb3JrZXJFbmFibGVkKCkpOworICAgIGlmICgh bV9zZXJ2aWNlV29ya2VyQ29udGFpbmVyKQorICAgICAgICBtX3NlcnZpY2VXb3JrZXJDb250YWlu ZXIgPSBzdGQ6Om1ha2VfdW5pcXVlPFNlcnZpY2VXb3JrZXJDb250YWluZXI+KHNjcmlwdEV4ZWN1 dGlvbkNvbnRleHQoKSwgKnRoaXMpOworICAgIHJldHVybiAqbV9zZXJ2aWNlV29ya2VyQ29udGFp bmVyOwogfQogCiBFeGNlcHRpb25PcjxTZXJ2aWNlV29ya2VyQ29udGFpbmVyJj4gTmF2aWdhdG9y QmFzZTo6c2VydmljZVdvcmtlcihTY3JpcHRFeGVjdXRpb25Db250ZXh0JiBjb250ZXh0KQogewog ICAgIGlmIChpczxEb2N1bWVudD4oY29udGV4dCkgJiYgZG93bmNhc3Q8RG9jdW1lbnQ+KGNvbnRl eHQpLmlzU2FuZGJveGVkKFNhbmRib3hPcmlnaW4pKQogICAgICAgICByZXR1cm4gRXhjZXB0aW9u IHsgU2VjdXJpdHlFcnJvciwgIlNlcnZpY2UgV29ya2VyIGlzIGRpc2FibGVkIGJlY2F1c2UgdGhl IGNvbnRleHQgaXMgc2FuZGJveGVkIGFuZCBsYWNrcyB0aGUgJ2FsbG93LXNhbWUtb3JpZ2luJyBm bGFnIiB9OwotICAgIHJldHVybiBtX3NlcnZpY2VXb3JrZXJDb250YWluZXIuZ2V0KCk7CisgICAg cmV0dXJuIHNlcnZpY2VXb3JrZXIoKTsKIH0KICNlbmRpZgogCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9wYWdlL05hdmlnYXRvckJhc2UuaCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvTmF2aWdh dG9yQmFzZS5oCmluZGV4IDVhZjU4ODE4N2I2NDA3YThhZGMxZDQ0ODAyMzI2OGEwMDRhN2E0NGMu LmQ1ODliZjgyZDdjYmRmNjNhZjdiZGZiODEyMWEwZTdlZTY0YTRhY2QgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL3BhZ2UvTmF2aWdhdG9yQmFzZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Bh Z2UvTmF2aWdhdG9yQmFzZS5oCkBAIC0yNSw2ICsyNSw3IEBACiAKICNwcmFnbWEgb25jZQogCisj aW5jbHVkZSAiQ29udGV4dERlc3RydWN0aW9uT2JzZXJ2ZXIuaCIKICNpbmNsdWRlICJFeGNlcHRp b25Pci5oIgogI2luY2x1ZGUgPHd0Zi9Gb3J3YXJkLmg+CiAjaW5jbHVkZSA8d3RmL1JlZkNvdW50 ZWQuaD4KQEAgLTM2LDcgKzM3LDcgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogY2xhc3MgU2NyaXB0 RXhlY3V0aW9uQ29udGV4dDsKIGNsYXNzIFNlcnZpY2VXb3JrZXJDb250YWluZXI7CiAKLWNsYXNz IE5hdmlnYXRvckJhc2UgOiBwdWJsaWMgUmVmQ291bnRlZDxOYXZpZ2F0b3JCYXNlPiB7CitjbGFz cyBOYXZpZ2F0b3JCYXNlIDogcHVibGljIFJlZkNvdW50ZWQ8TmF2aWdhdG9yQmFzZT4sIHB1Ymxp YyBDb250ZXh0RGVzdHJ1Y3Rpb25PYnNlcnZlciB7CiBwdWJsaWM6CiAgICAgdmlydHVhbCB+TmF2 aWdhdG9yQmFzZSgpOwogCkBAIC02MSwxMSArNjIsMTIgQEAgcHJvdGVjdGVkOgogCiAjaWYgRU5B QkxFKFNFUlZJQ0VfV09SS0VSKQogcHVibGljOgorICAgIFNlcnZpY2VXb3JrZXJDb250YWluZXIq IHNlcnZpY2VXb3JrZXJJZkFueSgpOwogICAgIFNlcnZpY2VXb3JrZXJDb250YWluZXImIHNlcnZp Y2VXb3JrZXIoKTsKICAgICBFeGNlcHRpb25PcjxTZXJ2aWNlV29ya2VyQ29udGFpbmVyJj4gc2Vy dmljZVdvcmtlcihTY3JpcHRFeGVjdXRpb25Db250ZXh0Jik7CiAKIHByaXZhdGU6Ci0gICAgVW5p cXVlUmVmPFNlcnZpY2VXb3JrZXJDb250YWluZXI+IG1fc2VydmljZVdvcmtlckNvbnRhaW5lcjsK KyAgICBzdGQ6OnVuaXF1ZV9wdHI8U2VydmljZVdvcmtlckNvbnRhaW5lcj4gbV9zZXJ2aWNlV29y a2VyQ29udGFpbmVyOwogI2VuZGlmCiB9OwogCg== 366951 2019-04-08 10:36:06 -0700 2019-04-08 13:51:26 -0700 Patch bug-196692-20190408103605.patch text/plain 5666 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ0MDIxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYThjYTE4MGIzOGI4MjAz YWYwMTJkMGIzZDE3ODhmNWRkZTQ5Njc0Mi4uZjQ3OTY3ZDYwMzUwOWQ1YzcwYWU4MzQ4ZTZkYWQ4 ZGYyYTUzNzM1OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDE5LTA0LTA4ICBZb3Vl bm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KKworICAgICAgICBMYXppbHkgY29uc3RydWN0 IE5hdmlnYXRvciBzZXJ2aWNlV29ya2VyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0xOTY2OTIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBNYWtlIE5hdmlnYXRvckJhc2UgYSBDb250ZXh0RGVzdHJ1Y3Rpb25P YnNlcnZlci4KKyAgICAgICAgVGhpcyBhbGxvd3MgdG8gZ2V0IHRoZSBuYXZpZ2F0b3Igc2NyaXB0 IGV4ZWN1dGlvbiBjb250ZXh0LgorICAgICAgICBVc2UgaXQgd2hlbiBjcmVhdGluZyB0aGUgbmF2 aWdhdG9yIFNlcnZpY2VXb3JrZXJDb250YWluZXIgb2JqZWN0LgorICAgICAgICBGb3IgR0MsIGlu dHJvZHVjZSBzZXJ2aWNlV29ya2VySWZBbnkgd2hpY2ggcmV0dXJucyB0aGUgY29udGFpbmVyIGlm IGNyZWF0ZWQuCisgICAgICAgIE5vIEpTIG9ic2VydmFibGUgY2hhbmdlIG9mIGJlaGF2aW9yLgor ICAgICAgICBDb3ZlcmVkIGJ5IGV4aXN0aW5nIHRlc3RzLgorCisgICAgICAgICogYmluZGluZ3Mv anMvSlNOYXZpZ2F0b3JDdXN0b20uY3BwOgorICAgICAgICAoV2ViQ29yZTo6SlNOYXZpZ2F0b3I6 OnZpc2l0QWRkaXRpb25hbENoaWxkcmVuKToKKyAgICAgICAgKiBiaW5kaW5ncy9qcy9KU1dvcmtl ck5hdmlnYXRvckN1c3RvbS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpKU1dvcmtlck5hdmlnYXRv cjo6dmlzaXRBZGRpdGlvbmFsQ2hpbGRyZW4pOgorICAgICAgICAqIHBhZ2UvTmF2aWdhdG9yQmFz ZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpOYXZpZ2F0b3JCYXNlOjpOYXZpZ2F0b3JCYXNlKToK KyAgICAgICAgKFdlYkNvcmU6Ok5hdmlnYXRvckJhc2U6OnNlcnZpY2VXb3JrZXJJZkFueSk6Cisg ICAgICAgIChXZWJDb3JlOjpOYXZpZ2F0b3JCYXNlOjpzZXJ2aWNlV29ya2VyKToKKyAgICAgICAg KiBwYWdlL05hdmlnYXRvckJhc2UuaDoKKwogMjAxOS0wNC0wOCAgWW91ZW5uIEZhYmxldCAgPHlv dWVubkBhcHBsZS5jb20+CiAKICAgICAgICAgRGVsYXkgaW5pdGlhbGl6YXRpb24gb2YgcXVvdGEg dXNlcnMgdW50aWwgdGhlIGZpcnN0IHF1b3RhIHJlcXVlc3QKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL2JpbmRpbmdzL2pzL0pTTmF2aWdhdG9yQ3VzdG9tLmNwcCBiL1NvdXJjZS9XZWJDb3Jl L2JpbmRpbmdzL2pzL0pTTmF2aWdhdG9yQ3VzdG9tLmNwcAppbmRleCAyMTY5OTAwNGFhNzUxZWRi YjQ2ZjE5MGQ1N2Y0MzA4YzA0MDg3ZmRhLi5mM2NlZWU1MTc3ODhlNTEwMWQ4NzYwNDBlYzQ5ZGI4 MGMwMzlkMDg1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU05hdmln YXRvckN1c3RvbS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvSlNOYXZpZ2F0 b3JDdXN0b20uY3BwCkBAIC0zMSw3ICszMSw3IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKIHZvaWQg SlNOYXZpZ2F0b3I6OnZpc2l0QWRkaXRpb25hbENoaWxkcmVuKEpTQzo6U2xvdFZpc2l0b3ImIHZp c2l0b3IpCiB7CiAjaWYgRU5BQkxFKFNFUlZJQ0VfV09SS0VSKQotICAgIHZpc2l0b3IuYWRkT3Bh cXVlUm9vdCgmd3JhcHBlZCgpLnNlcnZpY2VXb3JrZXIoKSk7CisgICAgdmlzaXRvci5hZGRPcGFx dWVSb290KHdyYXBwZWQoKS5zZXJ2aWNlV29ya2VySWZFeGlzdHMoKSk7CiAjZWxzZQogICAgIFVO VVNFRF9QQVJBTSh2aXNpdG9yKTsKICNlbmRpZgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv YmluZGluZ3MvanMvSlNXb3JrZXJOYXZpZ2F0b3JDdXN0b20uY3BwIGIvU291cmNlL1dlYkNvcmUv YmluZGluZ3MvanMvSlNXb3JrZXJOYXZpZ2F0b3JDdXN0b20uY3BwCmluZGV4IDBhMTM2M2MyMTVh NjQxNDE4MDIzMzI3MmIwYmZmMDVmZDBjMGY2YTUuLmZjOTYzZTAyYmIyYmYxZjBjNzhmNTE3YTk1 YjBhODM2MGQwZjlhN2IgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0pT V29ya2VyTmF2aWdhdG9yQ3VzdG9tLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9q cy9KU1dvcmtlck5hdmlnYXRvckN1c3RvbS5jcHAKQEAgLTMxLDcgKzMxLDcgQEAgbmFtZXNwYWNl IFdlYkNvcmUgewogdm9pZCBKU1dvcmtlck5hdmlnYXRvcjo6dmlzaXRBZGRpdGlvbmFsQ2hpbGRy ZW4oSlNDOjpTbG90VmlzaXRvciYgdmlzaXRvcikKIHsKICNpZiBFTkFCTEUoU0VSVklDRV9XT1JL RVIpCi0gICAgdmlzaXRvci5hZGRPcGFxdWVSb290KCZ3cmFwcGVkKCkuc2VydmljZVdvcmtlcigp KTsKKyAgICB2aXNpdG9yLmFkZE9wYXF1ZVJvb3Qod3JhcHBlZCgpLnNlcnZpY2VXb3JrZXJJZkV4 aXN0cygpKTsKICNlbHNlCiAgICAgVU5VU0VEX1BBUkFNKHZpc2l0b3IpOwogI2VuZGlmCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL05hdmlnYXRvckJhc2UuY3BwIGIvU291cmNlL1dl YkNvcmUvcGFnZS9OYXZpZ2F0b3JCYXNlLmNwcAppbmRleCBkYTg3OTRkYjRmNjJlNjVjYTkzYzcz NzA0ZjVlNDExNWUyZmM3ZmUwLi5jMDEzNjg1NTc0OGU5MDQ1YTJkYjg0OGUyNGE5YTVlM2UyM2M4 MWI3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL05hdmlnYXRvckJhc2UuY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvTmF2aWdhdG9yQmFzZS5jcHAKQEAgLTI4LDYgKzI4LDcg QEAKICNpbmNsdWRlICJOYXZpZ2F0b3JCYXNlLmgiCiAKICNpbmNsdWRlICJEb2N1bWVudC5oIgor I2luY2x1ZGUgIlJ1bnRpbWVFbmFibGVkRmVhdHVyZXMuaCIKICNpbmNsdWRlICJTZXJ2aWNlV29y a2VyQ29udGFpbmVyLmgiCiAjaW5jbHVkZSA8bXV0ZXg+CiAjaW5jbHVkZSA8d3RmL0xhbmd1YWdl Lmg+CkBAIC03NywxMyArNzgsOCBAQAogbmFtZXNwYWNlIFdlYkNvcmUgewogCiBOYXZpZ2F0b3JC YXNlOjpOYXZpZ2F0b3JCYXNlKFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQqIGNvbnRleHQpCi0jaWYg RU5BQkxFKFNFUlZJQ0VfV09SS0VSKQotICAgIDogbV9zZXJ2aWNlV29ya2VyQ29udGFpbmVyKG1h a2VVbmlxdWVSZWY8U2VydmljZVdvcmtlckNvbnRhaW5lcj4oY29udGV4dCwgKnRoaXMpKQotI2Vu ZGlmCisgICAgOiBDb250ZXh0RGVzdHJ1Y3Rpb25PYnNlcnZlcihjb250ZXh0KQogewotI2lmICFF TkFCTEUoU0VSVklDRV9XT1JLRVIpCi0gICAgVU5VU0VEX1BBUkFNKGNvbnRleHQpOwotI2VuZGlm CiB9CiAKIE5hdmlnYXRvckJhc2U6On5OYXZpZ2F0b3JCYXNlKCkgPSBkZWZhdWx0OwpAQCAtMTUx LDE2ICsxNDcsMjQgQEAgVmVjdG9yPFN0cmluZz4gTmF2aWdhdG9yQmFzZTo6bGFuZ3VhZ2VzKCkK IH0KIAogI2lmIEVOQUJMRShTRVJWSUNFX1dPUktFUikKK1NlcnZpY2VXb3JrZXJDb250YWluZXIq IE5hdmlnYXRvckJhc2U6OnNlcnZpY2VXb3JrZXJJZkV4aXN0cygpCit7CisgICAgcmV0dXJuIG1f c2VydmljZVdvcmtlckNvbnRhaW5lci5nZXQoKTsKK30KKwogU2VydmljZVdvcmtlckNvbnRhaW5l ciYgTmF2aWdhdG9yQmFzZTo6c2VydmljZVdvcmtlcigpCiB7Ci0gICAgcmV0dXJuIG1fc2Vydmlj ZVdvcmtlckNvbnRhaW5lcjsKKyAgICBBU1NFUlQoUnVudGltZUVuYWJsZWRGZWF0dXJlczo6c2hh cmVkRmVhdHVyZXMoKS5zZXJ2aWNlV29ya2VyRW5hYmxlZCgpKTsKKyAgICBpZiAoIW1fc2Vydmlj ZVdvcmtlckNvbnRhaW5lcikKKyAgICAgICAgbV9zZXJ2aWNlV29ya2VyQ29udGFpbmVyID0gc3Rk OjptYWtlX3VuaXF1ZTxTZXJ2aWNlV29ya2VyQ29udGFpbmVyPihzY3JpcHRFeGVjdXRpb25Db250 ZXh0KCksICp0aGlzKTsKKyAgICByZXR1cm4gKm1fc2VydmljZVdvcmtlckNvbnRhaW5lcjsKIH0K IAogRXhjZXB0aW9uT3I8U2VydmljZVdvcmtlckNvbnRhaW5lciY+IE5hdmlnYXRvckJhc2U6OnNl cnZpY2VXb3JrZXIoU2NyaXB0RXhlY3V0aW9uQ29udGV4dCYgY29udGV4dCkKIHsKICAgICBpZiAo aXM8RG9jdW1lbnQ+KGNvbnRleHQpICYmIGRvd25jYXN0PERvY3VtZW50Pihjb250ZXh0KS5pc1Nh bmRib3hlZChTYW5kYm94T3JpZ2luKSkKICAgICAgICAgcmV0dXJuIEV4Y2VwdGlvbiB7IFNlY3Vy aXR5RXJyb3IsICJTZXJ2aWNlIFdvcmtlciBpcyBkaXNhYmxlZCBiZWNhdXNlIHRoZSBjb250ZXh0 IGlzIHNhbmRib3hlZCBhbmQgbGFja3MgdGhlICdhbGxvdy1zYW1lLW9yaWdpbicgZmxhZyIgfTsK LSAgICByZXR1cm4gbV9zZXJ2aWNlV29ya2VyQ29udGFpbmVyLmdldCgpOworICAgIHJldHVybiBz ZXJ2aWNlV29ya2VyKCk7CiB9CiAjZW5kaWYKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv cGFnZS9OYXZpZ2F0b3JCYXNlLmggYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL05hdmlnYXRvckJhc2Uu aAppbmRleCA1YWY1ODgxODdiNjQwN2E4YWRjMWQ0NDgwMjMyNjhhMDA0YTdhNDRjLi4xYTA2YzRl OGFkNTk0MDFmN2EwOGY5MDU0MmQxZWI5OTY3NjE4MWExIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9wYWdlL05hdmlnYXRvckJhc2UuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL05hdmln YXRvckJhc2UuaApAQCAtMjUsNiArMjUsNyBAQAogCiAjcHJhZ21hIG9uY2UKIAorI2luY2x1ZGUg IkNvbnRleHREZXN0cnVjdGlvbk9ic2VydmVyLmgiCiAjaW5jbHVkZSAiRXhjZXB0aW9uT3IuaCIK ICNpbmNsdWRlIDx3dGYvRm9yd2FyZC5oPgogI2luY2x1ZGUgPHd0Zi9SZWZDb3VudGVkLmg+CkBA IC0zNiw3ICszNyw3IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKIGNsYXNzIFNjcmlwdEV4ZWN1dGlv bkNvbnRleHQ7CiBjbGFzcyBTZXJ2aWNlV29ya2VyQ29udGFpbmVyOwogCi1jbGFzcyBOYXZpZ2F0 b3JCYXNlIDogcHVibGljIFJlZkNvdW50ZWQ8TmF2aWdhdG9yQmFzZT4geworY2xhc3MgTmF2aWdh dG9yQmFzZSA6IHB1YmxpYyBSZWZDb3VudGVkPE5hdmlnYXRvckJhc2U+LCBwdWJsaWMgQ29udGV4 dERlc3RydWN0aW9uT2JzZXJ2ZXIgewogcHVibGljOgogICAgIHZpcnR1YWwgfk5hdmlnYXRvckJh c2UoKTsKIApAQCAtNjEsMTEgKzYyLDEyIEBAIHByb3RlY3RlZDoKIAogI2lmIEVOQUJMRShTRVJW SUNFX1dPUktFUikKIHB1YmxpYzoKKyAgICBTZXJ2aWNlV29ya2VyQ29udGFpbmVyKiBzZXJ2aWNl V29ya2VySWZFeGlzdHMoKTsKICAgICBTZXJ2aWNlV29ya2VyQ29udGFpbmVyJiBzZXJ2aWNlV29y a2VyKCk7CiAgICAgRXhjZXB0aW9uT3I8U2VydmljZVdvcmtlckNvbnRhaW5lciY+IHNlcnZpY2VX b3JrZXIoU2NyaXB0RXhlY3V0aW9uQ29udGV4dCYpOwogCiBwcml2YXRlOgotICAgIFVuaXF1ZVJl ZjxTZXJ2aWNlV29ya2VyQ29udGFpbmVyPiBtX3NlcnZpY2VXb3JrZXJDb250YWluZXI7CisgICAg c3RkOjp1bmlxdWVfcHRyPFNlcnZpY2VXb3JrZXJDb250YWluZXI+IG1fc2VydmljZVdvcmtlckNv bnRhaW5lcjsKICNlbmRpZgogfTsKIAo=