181434 2018-01-09 05:24:59 -0800 Add Service Worker CSP persistency 2018-01-10 02:16:46 -0800 1 1 1 Unclassified WebKit Service Workers WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 181385 1 youennf youennf achristensen beidson cdumez commit-queue dbates ews-watchlist jberlin mkwst webkit-bug-importer oldest_to_newest 1387213 0 youennf 2018-01-09 05:24:59 -0800 Add Service Worker CSP persistency 1387215 1 330815 youennf 2018-01-09 05:28:47 -0800 Created attachment 330815 Splitted patch from 181385 1387216 2 youennf 2018-01-09 05:32:09 -0800 Before landing this patch, we might want a good story about how we migrate from one schema version to another. We could store somewhere the version of the schema and if not the same as the expected one, wipe out the persistent data. 1387242 3 330820 youennf 2018-01-09 07:02:43 -0800 Created attachment 330820 Patch 1387243 4 youennf 2018-01-09 07:05:23 -0800 rdar://problem/36365833 1387246 5 webkit-bug-importer 2018-01-09 07:05:45 -0800 <rdar://problem/36375167> 1387584 6 330820 commit-queue 2018-01-10 02:16:44 -0800 Comment on attachment 330820 Patch Clearing flags on attachment: 330820 Committed r226705: <https://trac.webkit.org/changeset/226705> 1387585 7 commit-queue 2018-01-10 02:16:46 -0800 All reviewed patches have been landed. Closing bug. 330815 2018-01-09 05:28:47 -0800 2018-01-09 07:02:38 -0800 Splitted patch from 181385 bug-181434-20180109142845.patch text/plain 6601 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjI2NjIzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMmNjYzliYWYwZWVjYjI3 ZjFiNTNiMDdhOGQ3OGFjNTFlMTJjMzZlMC4uZGM0YzU4ZmI5NTI3NzJlMDkzMTRiZTJjMDcwM2Vk Y2U2M2Y4ZmEwNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDE4LTAxLTA5ICBZb3Vl bm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KKworICAgICAgICBBZGQgU2VydmljZSBXb3Jr ZXIgQ1NQIHBlcnNpc3RlbmN5CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xODE0MzQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBDb3ZlcmVkIGJ5IG1hbnVhbCB0ZXN0aW5nLgorICAgICAgICBGdXJ0aGVyIHdv cmsgb24gc2VydmljZSB3b3JrZXIgdGVzdCBpbmZyYXN0cnVjdHVyZSBzaG91bGQgYWxsb3cgYXV0 b21hdGluZyBzdWNoIHRlc3RzLgorCisgICAgICAgICogd29ya2Vycy9zZXJ2aWNlL3NlcnZlci9S ZWdpc3RyYXRpb25EYXRhYmFzZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjp2MVJlY29yZHNUYWJs ZVNjaGVtYSk6CisgICAgICAgIChXZWJDb3JlOjpSZWdpc3RyYXRpb25EYXRhYmFzZTo6b3BlblNR TGl0ZURhdGFiYXNlKToKKyAgICAgICAgKFdlYkNvcmU6OlJlZ2lzdHJhdGlvbkRhdGFiYXNlOjpk b1B1c2hDaGFuZ2VzKToKKyAgICAgICAgKFdlYkNvcmU6OlJlZ2lzdHJhdGlvbkRhdGFiYXNlOjpp bXBvcnRSZWNvcmRzKToKKwogMjAxOC0wMS0wOSAgWW91ZW5uIEZhYmxldCAgPHlvdWVubkBhcHBs ZS5jb20+CiAKICAgICAgICAgQWRkIENTUCBzdXBwb3J0IHRvIHNlcnZpY2Ugd29ya2VycwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvd29ya2Vycy9zZXJ2aWNlL3NlcnZlci9SZWdpc3RyYXRp b25EYXRhYmFzZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS93b3JrZXJzL3NlcnZpY2Uvc2VydmVyL1Jl Z2lzdHJhdGlvbkRhdGFiYXNlLmNwcAppbmRleCA1ZThjMjQ4NzYxMDBjOWMwMDU2N2Y1YTBmODA5 MjBhYWYxMTVlNmUyLi4zYzQzOGM5ZjZlNTFmYTBjMmFkYWQ4N2YyYWRkOGU0N2ZkMGU5OTMyIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS93b3JrZXJzL3NlcnZpY2Uvc2VydmVyL1JlZ2lzdHJh dGlvbkRhdGFiYXNlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS93b3JrZXJzL3NlcnZpY2Uvc2Vy dmVyL1JlZ2lzdHJhdGlvbkRhdGFiYXNlLmNwcApAQCAtNDAsMTIgKzQwLDE1IEBACiAjaW5jbHVk ZSA8d3RmL01haW5UaHJlYWQuaD4KICNpbmNsdWRlIDx3dGYvTmV2ZXJEZXN0cm95ZWQuaD4KICNp bmNsdWRlIDx3dGYvU2NvcGUuaD4KKyNpbmNsdWRlIDx3dGYvcGVyc2lzdGVuY2UvUGVyc2lzdGVu dENvZGVycy5oPgorI2luY2x1ZGUgPHd0Zi9wZXJzaXN0ZW5jZS9QZXJzaXN0ZW50RGVjb2Rlci5o PgorI2luY2x1ZGUgPHd0Zi9wZXJzaXN0ZW5jZS9QZXJzaXN0ZW50RW5jb2Rlci5oPgogCiBuYW1l c3BhY2UgV2ViQ29yZSB7CiAKIHN0YXRpYyBjb25zdCBTdHJpbmcgdjFSZWNvcmRzVGFibGVTY2hl bWEoY29uc3QgU3RyaW5nJiB0YWJsZU5hbWUpCiB7Ci0gICAgcmV0dXJuIG1ha2VTdHJpbmcoIkNS RUFURSBUQUJMRSAiLCB0YWJsZU5hbWUsICIgKGtleSBURVhUIE5PVCBOVUxMIE9OIENPTkZMSUNU IEZBSUwgVU5JUVVFIE9OIENPTkZMSUNUIFJFUExBQ0UsIG9yaWdpbiBURVhUIE5PVCBOVUxMIE9O IENPTkZMSUNUIEZBSUwsIHNjb3BlVVJMIFRFWFQgTk9UIE5VTEwgT04gQ09ORkxJQ1QgRkFJTCwg dG9wT3JpZ2luIFRFWFQgTk9UIE5VTEwgT04gQ09ORkxJQ1QgRkFJTCwgbGFzdFVwZGF0ZUNoZWNr VGltZSBET1VCTEUgTk9UIE5VTEwgT04gQ09ORkxJQ1QgRkFJTCwgdXBkYXRlVmlhQ2FjaGUgVEVY VCBOT1QgTlVMTCBPTiBDT05GTElDVCBGQUlMLCBzY3JpcHRVUkwgVEVYVCBOT1QgTlVMTCBPTiBD T05GTElDVCBGQUlMLCBzY3JpcHQgVEVYVCBOT1QgTlVMTCBPTiBDT05GTElDVCBGQUlMLCB3b3Jr ZXJUeXBlIFRFWFQgTk9UIE5VTEwgT04gQ09ORkxJQ1QgRkFJTCkiKTsKKyAgICByZXR1cm4gbWFr ZVN0cmluZygiQ1JFQVRFIFRBQkxFICIsIHRhYmxlTmFtZSwgIiAoa2V5IFRFWFQgTk9UIE5VTEwg T04gQ09ORkxJQ1QgRkFJTCBVTklRVUUgT04gQ09ORkxJQ1QgUkVQTEFDRSwgb3JpZ2luIFRFWFQg Tk9UIE5VTEwgT04gQ09ORkxJQ1QgRkFJTCwgc2NvcGVVUkwgVEVYVCBOT1QgTlVMTCBPTiBDT05G TElDVCBGQUlMLCB0b3BPcmlnaW4gVEVYVCBOT1QgTlVMTCBPTiBDT05GTElDVCBGQUlMLCBsYXN0 VXBkYXRlQ2hlY2tUaW1lIERPVUJMRSBOT1QgTlVMTCBPTiBDT05GTElDVCBGQUlMLCB1cGRhdGVW aWFDYWNoZSBURVhUIE5PVCBOVUxMIE9OIENPTkZMSUNUIEZBSUwsIHNjcmlwdFVSTCBURVhUIE5P VCBOVUxMIE9OIENPTkZMSUNUIEZBSUwsIHNjcmlwdCBURVhUIE5PVCBOVUxMIE9OIENPTkZMSUNU IEZBSUwsIHdvcmtlclR5cGUgVEVYVCBOT1QgTlVMTCBPTiBDT05GTElDVCBGQUlMLCBjb250ZW50 U2VjdXJpdHlQb2xpY3kgQkxPQiBOT1QgTlVMTCBPTiBDT05GTElDVCBGQUlMKSIpOwogfQogCiBz dGF0aWMgY29uc3QgU3RyaW5nIHYxUmVjb3Jkc1RhYmxlU2NoZW1hKCkKQEAgLTExOCw3ICsxMjEs NyBAQCB2b2lkIFJlZ2lzdHJhdGlvbkRhdGFiYXNlOjpvcGVuU1FMaXRlRGF0YWJhc2UoY29uc3Qg U3RyaW5nJiBmdWxsRmlsZW5hbWUpCiAgICAgZXJyb3JNZXNzYWdlID0gaW1wb3J0UmVjb3Jkcygp OwogICAgIGlmICghZXJyb3JNZXNzYWdlLmlzTnVsbCgpKQogICAgICAgICByZXR1cm47Ci0gICAg CisKICAgICBzY29wZUV4aXQucmVsZWFzZSgpOwogfQogCkBAIC0yNTgsNyArMjYxLDcgQEAgdm9p ZCBSZWdpc3RyYXRpb25EYXRhYmFzZTo6ZG9QdXNoQ2hhbmdlcyhWZWN0b3I8U2VydmljZVdvcmtl ckNvbnRleHREYXRhPiYmIGRhdGEKICAgICBTUUxpdGVUcmFuc2FjdGlvbiB0cmFuc2FjdGlvbigq bV9kYXRhYmFzZSk7CiAgICAgdHJhbnNhY3Rpb24uYmVnaW4oKTsKIAotICAgIFNRTGl0ZVN0YXRl bWVudCBzcWwoKm1fZGF0YWJhc2UsIEFTQ0lJTGl0ZXJhbCgiSU5TRVJUIElOVE8gUmVjb3JkcyBW QUxVRVMgKD8sID8sID8sID8sID8sID8sID8sID8sID8pIikpOworICAgIFNRTGl0ZVN0YXRlbWVu dCBzcWwoKm1fZGF0YWJhc2UsIEFTQ0lJTGl0ZXJhbCgiSU5TRVJUIElOVE8gUmVjb3JkcyBWQUxV RVMgKD8sID8sID8sID8sID8sID8sID8sID8sID8sID8pIikpOwogICAgIGlmIChzcWwucHJlcGFy ZSgpICE9IFNRTElURV9PSykgewogICAgICAgICBSRUxFQVNFX0xPR19FUlJPUihTZXJ2aWNlV29y a2VyLCAiRmFpbGVkIHRvIHByZXBhcmUgc3RhdGVtZW50IHRvIHN0b3JlIHJlZ2lzdHJhdGlvbiBk YXRhIGludG8gcmVjb3JkcyB0YWJsZSAoJWkpIC0gJXMiLCBtX2RhdGFiYXNlLT5sYXN0RXJyb3Io KSwgbV9kYXRhYmFzZS0+bGFzdEVycm9yTXNnKCkpOwogICAgICAgICByZXR1cm47CkBAIC0yNzcs NiArMjgwLDkgQEAgdm9pZCBSZWdpc3RyYXRpb25EYXRhYmFzZTo6ZG9QdXNoQ2hhbmdlcyhWZWN0 b3I8U2VydmljZVdvcmtlckNvbnRleHREYXRhPiYmIGRhdGEKICAgICAgICAgICAgIGNvbnRpbnVl OwogICAgICAgICB9CiAKKyAgICAgICAgV1RGOjpQZXJzaXN0ZW5jZTo6RW5jb2RlciBlbmNvZGVy OworICAgICAgICBkYXRhLmNvbnRlbnRTZWN1cml0eVBvbGljeS5lbmNvZGUoZW5jb2Rlcik7CisK ICAgICAgICAgaWYgKHNxbC5iaW5kVGV4dCgxLCBkYXRhLnJlZ2lzdHJhdGlvbi5rZXkudG9EYXRh YmFzZUtleSgpKSAhPSBTUUxJVEVfT0sKICAgICAgICAgICAgIHx8IHNxbC5iaW5kVGV4dCgyLCBk YXRhLnJlZ2lzdHJhdGlvbi5zY29wZVVSTC5wcm90b2NvbEhvc3RBbmRQb3J0KCkpICE9IFNRTElU RV9PSwogICAgICAgICAgICAgfHwgc3FsLmJpbmRUZXh0KDMsIGRhdGEucmVnaXN0cmF0aW9uLnNj b3BlVVJMLnBhdGgoKSkgIT0gU1FMSVRFX09LCkBAIC0yODYsNiArMjkyLDcgQEAgdm9pZCBSZWdp c3RyYXRpb25EYXRhYmFzZTo6ZG9QdXNoQ2hhbmdlcyhWZWN0b3I8U2VydmljZVdvcmtlckNvbnRl eHREYXRhPiYmIGRhdGEKICAgICAgICAgICAgIHx8IHNxbC5iaW5kVGV4dCg3LCBkYXRhLnNjcmlw dFVSTC5zdHJpbmcoKSkgIT0gU1FMSVRFX09LCiAgICAgICAgICAgICB8fCBzcWwuYmluZFRleHQo OCwgZGF0YS5zY3JpcHQpICE9IFNRTElURV9PSwogICAgICAgICAgICAgfHwgc3FsLmJpbmRUZXh0 KDksIHdvcmtlclR5cGVUb1N0cmluZyhkYXRhLndvcmtlclR5cGUpKSAhPSBTUUxJVEVfT0sKKyAg ICAgICAgICAgIHx8IHNxbC5iaW5kQmxvYigxMCwgZW5jb2Rlci5idWZmZXIoKSwgZW5jb2Rlci5i dWZmZXJTaXplKCkpICE9IFNRTElURV9PSwogICAgICAgICAgICAgfHwgc3FsLnN0ZXAoKSAhPSBT UUxJVEVfRE9ORSkgewogICAgICAgICAgICAgUkVMRUFTRV9MT0dfRVJST1IoU2VydmljZVdvcmtl ciwgIkZhaWxlZCB0byBzdG9yZSByZWdpc3RyYXRpb24gZGF0YSBpbnRvIHJlY29yZHMgdGFibGUg KCVpKSAtICVzIiwgbV9kYXRhYmFzZS0+bGFzdEVycm9yKCksIG1fZGF0YWJhc2UtPmxhc3RFcnJv ck1zZygpKTsKICAgICAgICAgICAgIHJldHVybjsKQEAgLTMxOCw2ICszMjUsMTMgQEAgU3RyaW5n IFJlZ2lzdHJhdGlvbkRhdGFiYXNlOjppbXBvcnRSZWNvcmRzKCkKICAgICAgICAgYXV0byBzY3Jp cHQgPSBzcWwuZ2V0Q29sdW1uVGV4dCg3KTsKICAgICAgICAgYXV0byB3b3JrZXJUeXBlID0gc3Ry aW5nVG9Xb3JrZXJUeXBlKHNxbC5nZXRDb2x1bW5UZXh0KDgpKTsKIAorICAgICAgICBWZWN0b3I8 dWludDhfdD4gY29udGVudFNlY3VyaXR5UG9saWN5RGF0YTsKKyAgICAgICAgc3FsLmdldENvbHVt bkJsb2JBc1ZlY3Rvcig5LCBjb250ZW50U2VjdXJpdHlQb2xpY3lEYXRhKTsKKyAgICAgICAgV1RG OjpQZXJzaXN0ZW5jZTo6RGVjb2RlciBkZWNvZGVyKGNvbnRlbnRTZWN1cml0eVBvbGljeURhdGEu ZGF0YSgpLCBjb250ZW50U2VjdXJpdHlQb2xpY3lEYXRhLnNpemUoKSk7CisgICAgICAgIENvbnRl bnRTZWN1cml0eVBvbGljeVJlc3BvbnNlSGVhZGVycyBjb250ZW50U2VjdXJpdHlQb2xpY3k7Cisg ICAgICAgIGlmIChjb250ZW50U2VjdXJpdHlQb2xpY3lEYXRhLnNpemUoKSAmJiAhQ29udGVudFNl Y3VyaXR5UG9saWN5UmVzcG9uc2VIZWFkZXJzOjpkZWNvZGUoZGVjb2RlciwgY29udGVudFNlY3Vy aXR5UG9saWN5KSkKKyAgICAgICAgICAgIGNvbnRpbnVlOworCiAgICAgICAgIC8vIFZhbGlkYXRl IHRoZSBpbnB1dCBmb3IgdGhpcyByZWdpc3RyYXRpb24uCiAgICAgICAgIC8vIElmIGFueSBwYXJ0 IG9mIHRoaXMgaW5wdXQgaXMgaW52YWxpZCwgbGV0J3Mgc2tpcCB0aGlzIHJlZ2lzdHJhdGlvbi4K ICAgICAgICAgLy8gRklYTUU6IFNob3VsZCB3ZSByZXR1cm4gYW4gZXJyb3Igc2tpcHBpbmcgKmFs bCogcmVnaXN0cmF0aW9ucz8KQEAgLTMyOCw3ICszNDIsNyBAQCBTdHJpbmcgUmVnaXN0cmF0aW9u RGF0YWJhc2U6OmltcG9ydFJlY29yZHMoKQogICAgICAgICBhdXRvIHJlZ2lzdHJhdGlvbklkZW50 aWZpZXIgPSBnZW5lcmF0ZU9iamVjdElkZW50aWZpZXI8U2VydmljZVdvcmtlclJlZ2lzdHJhdGlv bklkZW50aWZpZXJUeXBlPigpOwogICAgICAgICBhdXRvIHNlcnZpY2VXb3JrZXJEYXRhID0gU2Vy dmljZVdvcmtlckRhdGEgeyB3b3JrZXJJZGVudGlmaWVyLCBzY3JpcHRVUkwsIFNlcnZpY2VXb3Jr ZXJTdGF0ZTo6QWN0aXZhdGVkLCAqd29ya2VyVHlwZSwgcmVnaXN0cmF0aW9uSWRlbnRpZmllciB9 OwogICAgICAgICBhdXRvIHJlZ2lzdHJhdGlvbiA9IFNlcnZpY2VXb3JrZXJSZWdpc3RyYXRpb25E YXRhIHsgV1RGTW92ZSgqa2V5KSwgcmVnaXN0cmF0aW9uSWRlbnRpZmllciwgVVJMKG9yaWdpblVS TCwgc2NvcGVQYXRoKSwgKnVwZGF0ZVZpYUNhY2hlLCBsYXN0VXBkYXRlQ2hlY2tUaW1lLCBzdGQ6 Om51bGxvcHQsIHN0ZDo6bnVsbG9wdCwgV1RGTW92ZShzZXJ2aWNlV29ya2VyRGF0YSkgfTsKLSAg ICAgICAgYXV0byBjb250ZXh0RGF0YSA9IFNlcnZpY2VXb3JrZXJDb250ZXh0RGF0YSB7IHN0ZDo6 bnVsbG9wdCwgV1RGTW92ZShyZWdpc3RyYXRpb24pLCB3b3JrZXJJZGVudGlmaWVyLCBXVEZNb3Zl KHNjcmlwdCksIHsgfSwgV1RGTW92ZShzY3JpcHRVUkwpLCAqd29ya2VyVHlwZSwgdHJ1ZSB9Owor ICAgICAgICBhdXRvIGNvbnRleHREYXRhID0gU2VydmljZVdvcmtlckNvbnRleHREYXRhIHsgc3Rk OjpudWxsb3B0LCBXVEZNb3ZlKHJlZ2lzdHJhdGlvbiksIHdvcmtlcklkZW50aWZpZXIsIFdURk1v dmUoc2NyaXB0KSwgV1RGTW92ZShjb250ZW50U2VjdXJpdHlQb2xpY3kpLCBXVEZNb3ZlKHNjcmlw dFVSTCksICp3b3JrZXJUeXBlLCB0cnVlIH07CiAKICAgICAgICAgcG9zdFRhc2tSZXBseShjcmVh dGVDcm9zc1RocmVhZFRhc2soKnRoaXMsICZSZWdpc3RyYXRpb25EYXRhYmFzZTo6YWRkUmVnaXN0 cmF0aW9uVG9TdG9yZSwgV1RGTW92ZShjb250ZXh0RGF0YSkpKTsKICAgICB9Cg== 330820 2018-01-09 07:02:43 -0800 2018-01-10 02:16:44 -0800 Patch bug-181434-20180109160241.patch text/plain 7237 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjI2NjIzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMmNjYzliYWYwZWVjYjI3 ZjFiNTNiMDdhOGQ3OGFjNTFlMTJjMzZlMC4uY2Q1NTg3MGJkZGFjMTJlZWUzZGQ3NWE4NTNiZjQ1 NWJhYzc2ZTQxZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDE4LTAxLTA5ICBZb3Vl bm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KKworICAgICAgICBBZGQgU2VydmljZSBXb3Jr ZXIgQ1NQIHBlcnNpc3RlbmN5CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xODE0MzQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBDb3ZlcmVkIGJ5IG1hbnVhbCB0ZXN0aW5nLgorICAgICAgICBGdXR1cmUgd29y ayBvbiBzZXJ2aWNlIHdvcmtlciB0ZXN0IGluZnJhc3RydWN0dXJlIHNob3VsZCBhbGxvdyBhdXRv bWF0aW5nIHN1Y2ggdGVzdHMuCisKKyAgICAgICAgQWRkIHN1cHBvcnQgZm9yIHNlcnZpY2Ugd29y a2VyIENTUCBkYXRhIHBlcnNpc3RlbmN5LgorICAgICAgICBBZGQgYSB2ZXJzaW9uIHBhcmFtZXRl ciB0byBpbmNyZW1lbnQgZWFjaCB0aW1lIHRoZSBzY2hlbWEgaXMgY2hhbmdpbmcuCisgICAgICAg IFRoaXMgYWxsb3dzIHRoZSBzYW1lIHN0b3JlIHRvIGJlIHVzZWQgYnkgbXVsdGlwbGUgV2ViS2l0 cy4KKworICAgICAgICAqIHdvcmtlcnMvc2VydmljZS9zZXJ2ZXIvUmVnaXN0cmF0aW9uRGF0YWJh c2UuY3BwOgorICAgICAgICAoV2ViQ29yZTo6djFSZWNvcmRzVGFibGVTY2hlbWEpOgorICAgICAg ICAoV2ViQ29yZTo6UmVnaXN0cmF0aW9uRGF0YWJhc2U6Om9wZW5TUUxpdGVEYXRhYmFzZSk6Cisg ICAgICAgIChXZWJDb3JlOjpSZWdpc3RyYXRpb25EYXRhYmFzZTo6ZG9QdXNoQ2hhbmdlcyk6Cisg ICAgICAgIChXZWJDb3JlOjpSZWdpc3RyYXRpb25EYXRhYmFzZTo6aW1wb3J0UmVjb3Jkcyk6CisK IDIwMTgtMDEtMDkgIFlvdWVubiBGYWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgogCiAgICAgICAg IEFkZCBDU1Agc3VwcG9ydCB0byBzZXJ2aWNlIHdvcmtlcnMKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL3dvcmtlcnMvc2VydmljZS9zZXJ2ZXIvUmVnaXN0cmF0aW9uRGF0YWJhc2UuY3BwIGIv U291cmNlL1dlYkNvcmUvd29ya2Vycy9zZXJ2aWNlL3NlcnZlci9SZWdpc3RyYXRpb25EYXRhYmFz ZS5jcHAKaW5kZXggNWU4YzI0ODc2MTAwYzljMDA1NjdmNWEwZjgwOTIwYWFmMTE1ZTZlMi4uM2Nk ZWNhNzYzYWFiZTJlNjNjZTNlMTk0Yjc3NmRlNjA3YTA2MThiOCAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvd29ya2Vycy9zZXJ2aWNlL3NlcnZlci9SZWdpc3RyYXRpb25EYXRhYmFzZS5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvd29ya2Vycy9zZXJ2aWNlL3NlcnZlci9SZWdpc3RyYXRpb25E YXRhYmFzZS5jcHAKQEAgLTQwLDEyICs0MCwxNyBAQAogI2luY2x1ZGUgPHd0Zi9NYWluVGhyZWFk Lmg+CiAjaW5jbHVkZSA8d3RmL05ldmVyRGVzdHJveWVkLmg+CiAjaW5jbHVkZSA8d3RmL1Njb3Bl Lmg+CisjaW5jbHVkZSA8d3RmL3BlcnNpc3RlbmNlL1BlcnNpc3RlbnRDb2RlcnMuaD4KKyNpbmNs dWRlIDx3dGYvcGVyc2lzdGVuY2UvUGVyc2lzdGVudERlY29kZXIuaD4KKyNpbmNsdWRlIDx3dGYv cGVyc2lzdGVuY2UvUGVyc2lzdGVudEVuY29kZXIuaD4KIAogbmFtZXNwYWNlIFdlYkNvcmUgewog CitzdGF0aWMgY29uc3QgaW50IHNjaGVtYVZlcnNpb24gPSAxOworCiBzdGF0aWMgY29uc3QgU3Ry aW5nIHYxUmVjb3Jkc1RhYmxlU2NoZW1hKGNvbnN0IFN0cmluZyYgdGFibGVOYW1lKQogewotICAg IHJldHVybiBtYWtlU3RyaW5nKCJDUkVBVEUgVEFCTEUgIiwgdGFibGVOYW1lLCAiIChrZXkgVEVY VCBOT1QgTlVMTCBPTiBDT05GTElDVCBGQUlMIFVOSVFVRSBPTiBDT05GTElDVCBSRVBMQUNFLCBv cmlnaW4gVEVYVCBOT1QgTlVMTCBPTiBDT05GTElDVCBGQUlMLCBzY29wZVVSTCBURVhUIE5PVCBO VUxMIE9OIENPTkZMSUNUIEZBSUwsIHRvcE9yaWdpbiBURVhUIE5PVCBOVUxMIE9OIENPTkZMSUNU IEZBSUwsIGxhc3RVcGRhdGVDaGVja1RpbWUgRE9VQkxFIE5PVCBOVUxMIE9OIENPTkZMSUNUIEZB SUwsIHVwZGF0ZVZpYUNhY2hlIFRFWFQgTk9UIE5VTEwgT04gQ09ORkxJQ1QgRkFJTCwgc2NyaXB0 VVJMIFRFWFQgTk9UIE5VTEwgT04gQ09ORkxJQ1QgRkFJTCwgc2NyaXB0IFRFWFQgTk9UIE5VTEwg T04gQ09ORkxJQ1QgRkFJTCwgd29ya2VyVHlwZSBURVhUIE5PVCBOVUxMIE9OIENPTkZMSUNUIEZB SUwpIik7CisgICAgcmV0dXJuIG1ha2VTdHJpbmcoIkNSRUFURSBUQUJMRSAiLCB0YWJsZU5hbWUs ICIgKGtleSBURVhUIE5PVCBOVUxMIE9OIENPTkZMSUNUIEZBSUwgVU5JUVVFIE9OIENPTkZMSUNU IFJFUExBQ0UsIG9yaWdpbiBURVhUIE5PVCBOVUxMIE9OIENPTkZMSUNUIEZBSUwsIHNjb3BlVVJM IFRFWFQgTk9UIE5VTEwgT04gQ09ORkxJQ1QgRkFJTCwgdG9wT3JpZ2luIFRFWFQgTk9UIE5VTEwg T04gQ09ORkxJQ1QgRkFJTCwgbGFzdFVwZGF0ZUNoZWNrVGltZSBET1VCTEUgTk9UIE5VTEwgT04g Q09ORkxJQ1QgRkFJTCwgdXBkYXRlVmlhQ2FjaGUgVEVYVCBOT1QgTlVMTCBPTiBDT05GTElDVCBG QUlMLCBzY3JpcHRVUkwgVEVYVCBOT1QgTlVMTCBPTiBDT05GTElDVCBGQUlMLCBzY3JpcHQgVEVY VCBOT1QgTlVMTCBPTiBDT05GTElDVCBGQUlMLCB3b3JrZXJUeXBlIFRFWFQgTk9UIE5VTEwgT04g Q09ORkxJQ1QgRkFJTCwgY29udGVudFNlY3VyaXR5UG9saWN5IEJMT0IgTk9UIE5VTEwgT04gQ09O RkxJQ1QgRkFJTCkiKTsKIH0KIAogc3RhdGljIGNvbnN0IFN0cmluZyB2MVJlY29yZHNUYWJsZVNj aGVtYSgpCkBAIC02NSw3ICs3MCw3IEBAIHN0YXRpYyBjb25zdCBTdHJpbmcgdjFSZWNvcmRzVGFi bGVTY2hlbWFBbHRlcm5hdGUoKQogc3RhdGljIGNvbnN0IFN0cmluZyYgZGF0YWJhc2VGaWxlbmFt ZSgpCiB7CiAgICAgQVNTRVJUKGlzTWFpblRocmVhZCgpKTsKLSAgICBzdGF0aWMgTmV2ZXJEZXN0 cm95ZWQ8U3RyaW5nPiBmaWxlbmFtZSA9ICJTZXJ2aWNlV29ya2VyUmVnaXN0cmF0aW9ucy5zcWxp dGUzIjsKKyAgICBzdGF0aWMgTmV2ZXJEZXN0cm95ZWQ8U3RyaW5nPiBmaWxlbmFtZSA9IG1ha2VT dHJpbmcoIlNlcnZpY2VXb3JrZXJSZWdpc3RyYXRpb25zLSIsIFN0cmluZzo6bnVtYmVyKHNjaGVt YVZlcnNpb24pLCAiLnNxbGl0ZTMiKTsKICAgICByZXR1cm4gZmlsZW5hbWU7CiB9CiAKQEAgLTEx OCw3ICsxMjMsNyBAQCB2b2lkIFJlZ2lzdHJhdGlvbkRhdGFiYXNlOjpvcGVuU1FMaXRlRGF0YWJh c2UoY29uc3QgU3RyaW5nJiBmdWxsRmlsZW5hbWUpCiAgICAgZXJyb3JNZXNzYWdlID0gaW1wb3J0 UmVjb3JkcygpOwogICAgIGlmICghZXJyb3JNZXNzYWdlLmlzTnVsbCgpKQogICAgICAgICByZXR1 cm47Ci0gICAgCisKICAgICBzY29wZUV4aXQucmVsZWFzZSgpOwogfQogCkBAIC0yNTgsNyArMjYz LDcgQEAgdm9pZCBSZWdpc3RyYXRpb25EYXRhYmFzZTo6ZG9QdXNoQ2hhbmdlcyhWZWN0b3I8U2Vy dmljZVdvcmtlckNvbnRleHREYXRhPiYmIGRhdGEKICAgICBTUUxpdGVUcmFuc2FjdGlvbiB0cmFu c2FjdGlvbigqbV9kYXRhYmFzZSk7CiAgICAgdHJhbnNhY3Rpb24uYmVnaW4oKTsKIAotICAgIFNR TGl0ZVN0YXRlbWVudCBzcWwoKm1fZGF0YWJhc2UsIEFTQ0lJTGl0ZXJhbCgiSU5TRVJUIElOVE8g UmVjb3JkcyBWQUxVRVMgKD8sID8sID8sID8sID8sID8sID8sID8sID8pIikpOworICAgIFNRTGl0 ZVN0YXRlbWVudCBzcWwoKm1fZGF0YWJhc2UsIEFTQ0lJTGl0ZXJhbCgiSU5TRVJUIElOVE8gUmVj b3JkcyBWQUxVRVMgKD8sID8sID8sID8sID8sID8sID8sID8sID8sID8pIikpOwogICAgIGlmIChz cWwucHJlcGFyZSgpICE9IFNRTElURV9PSykgewogICAgICAgICBSRUxFQVNFX0xPR19FUlJPUihT ZXJ2aWNlV29ya2VyLCAiRmFpbGVkIHRvIHByZXBhcmUgc3RhdGVtZW50IHRvIHN0b3JlIHJlZ2lz dHJhdGlvbiBkYXRhIGludG8gcmVjb3JkcyB0YWJsZSAoJWkpIC0gJXMiLCBtX2RhdGFiYXNlLT5s YXN0RXJyb3IoKSwgbV9kYXRhYmFzZS0+bGFzdEVycm9yTXNnKCkpOwogICAgICAgICByZXR1cm47 CkBAIC0yNzcsNiArMjgyLDkgQEAgdm9pZCBSZWdpc3RyYXRpb25EYXRhYmFzZTo6ZG9QdXNoQ2hh bmdlcyhWZWN0b3I8U2VydmljZVdvcmtlckNvbnRleHREYXRhPiYmIGRhdGEKICAgICAgICAgICAg IGNvbnRpbnVlOwogICAgICAgICB9CiAKKyAgICAgICAgV1RGOjpQZXJzaXN0ZW5jZTo6RW5jb2Rl ciBlbmNvZGVyOworICAgICAgICBkYXRhLmNvbnRlbnRTZWN1cml0eVBvbGljeS5lbmNvZGUoZW5j b2Rlcik7CisKICAgICAgICAgaWYgKHNxbC5iaW5kVGV4dCgxLCBkYXRhLnJlZ2lzdHJhdGlvbi5r ZXkudG9EYXRhYmFzZUtleSgpKSAhPSBTUUxJVEVfT0sKICAgICAgICAgICAgIHx8IHNxbC5iaW5k VGV4dCgyLCBkYXRhLnJlZ2lzdHJhdGlvbi5zY29wZVVSTC5wcm90b2NvbEhvc3RBbmRQb3J0KCkp ICE9IFNRTElURV9PSwogICAgICAgICAgICAgfHwgc3FsLmJpbmRUZXh0KDMsIGRhdGEucmVnaXN0 cmF0aW9uLnNjb3BlVVJMLnBhdGgoKSkgIT0gU1FMSVRFX09LCkBAIC0yODYsNiArMjk0LDcgQEAg dm9pZCBSZWdpc3RyYXRpb25EYXRhYmFzZTo6ZG9QdXNoQ2hhbmdlcyhWZWN0b3I8U2VydmljZVdv cmtlckNvbnRleHREYXRhPiYmIGRhdGEKICAgICAgICAgICAgIHx8IHNxbC5iaW5kVGV4dCg3LCBk YXRhLnNjcmlwdFVSTC5zdHJpbmcoKSkgIT0gU1FMSVRFX09LCiAgICAgICAgICAgICB8fCBzcWwu YmluZFRleHQoOCwgZGF0YS5zY3JpcHQpICE9IFNRTElURV9PSwogICAgICAgICAgICAgfHwgc3Fs LmJpbmRUZXh0KDksIHdvcmtlclR5cGVUb1N0cmluZyhkYXRhLndvcmtlclR5cGUpKSAhPSBTUUxJ VEVfT0sKKyAgICAgICAgICAgIHx8IHNxbC5iaW5kQmxvYigxMCwgZW5jb2Rlci5idWZmZXIoKSwg ZW5jb2Rlci5idWZmZXJTaXplKCkpICE9IFNRTElURV9PSwogICAgICAgICAgICAgfHwgc3FsLnN0 ZXAoKSAhPSBTUUxJVEVfRE9ORSkgewogICAgICAgICAgICAgUkVMRUFTRV9MT0dfRVJST1IoU2Vy dmljZVdvcmtlciwgIkZhaWxlZCB0byBzdG9yZSByZWdpc3RyYXRpb24gZGF0YSBpbnRvIHJlY29y ZHMgdGFibGUgKCVpKSAtICVzIiwgbV9kYXRhYmFzZS0+bGFzdEVycm9yKCksIG1fZGF0YWJhc2Ut Pmxhc3RFcnJvck1zZygpKTsKICAgICAgICAgICAgIHJldHVybjsKQEAgLTMxOCw2ICszMjcsMTMg QEAgU3RyaW5nIFJlZ2lzdHJhdGlvbkRhdGFiYXNlOjppbXBvcnRSZWNvcmRzKCkKICAgICAgICAg YXV0byBzY3JpcHQgPSBzcWwuZ2V0Q29sdW1uVGV4dCg3KTsKICAgICAgICAgYXV0byB3b3JrZXJU eXBlID0gc3RyaW5nVG9Xb3JrZXJUeXBlKHNxbC5nZXRDb2x1bW5UZXh0KDgpKTsKIAorICAgICAg ICBWZWN0b3I8dWludDhfdD4gY29udGVudFNlY3VyaXR5UG9saWN5RGF0YTsKKyAgICAgICAgc3Fs LmdldENvbHVtbkJsb2JBc1ZlY3Rvcig5LCBjb250ZW50U2VjdXJpdHlQb2xpY3lEYXRhKTsKKyAg ICAgICAgV1RGOjpQZXJzaXN0ZW5jZTo6RGVjb2RlciBkZWNvZGVyKGNvbnRlbnRTZWN1cml0eVBv bGljeURhdGEuZGF0YSgpLCBjb250ZW50U2VjdXJpdHlQb2xpY3lEYXRhLnNpemUoKSk7CisgICAg ICAgIENvbnRlbnRTZWN1cml0eVBvbGljeVJlc3BvbnNlSGVhZGVycyBjb250ZW50U2VjdXJpdHlQ b2xpY3k7CisgICAgICAgIGlmIChjb250ZW50U2VjdXJpdHlQb2xpY3lEYXRhLnNpemUoKSAmJiAh Q29udGVudFNlY3VyaXR5UG9saWN5UmVzcG9uc2VIZWFkZXJzOjpkZWNvZGUoZGVjb2RlciwgY29u dGVudFNlY3VyaXR5UG9saWN5KSkKKyAgICAgICAgICAgIGNvbnRpbnVlOworCiAgICAgICAgIC8v IFZhbGlkYXRlIHRoZSBpbnB1dCBmb3IgdGhpcyByZWdpc3RyYXRpb24uCiAgICAgICAgIC8vIElm IGFueSBwYXJ0IG9mIHRoaXMgaW5wdXQgaXMgaW52YWxpZCwgbGV0J3Mgc2tpcCB0aGlzIHJlZ2lz dHJhdGlvbi4KICAgICAgICAgLy8gRklYTUU6IFNob3VsZCB3ZSByZXR1cm4gYW4gZXJyb3Igc2tp cHBpbmcgKmFsbCogcmVnaXN0cmF0aW9ucz8KQEAgLTMyOCw3ICszNDQsNyBAQCBTdHJpbmcgUmVn aXN0cmF0aW9uRGF0YWJhc2U6OmltcG9ydFJlY29yZHMoKQogICAgICAgICBhdXRvIHJlZ2lzdHJh dGlvbklkZW50aWZpZXIgPSBnZW5lcmF0ZU9iamVjdElkZW50aWZpZXI8U2VydmljZVdvcmtlclJl Z2lzdHJhdGlvbklkZW50aWZpZXJUeXBlPigpOwogICAgICAgICBhdXRvIHNlcnZpY2VXb3JrZXJE YXRhID0gU2VydmljZVdvcmtlckRhdGEgeyB3b3JrZXJJZGVudGlmaWVyLCBzY3JpcHRVUkwsIFNl cnZpY2VXb3JrZXJTdGF0ZTo6QWN0aXZhdGVkLCAqd29ya2VyVHlwZSwgcmVnaXN0cmF0aW9uSWRl bnRpZmllciB9OwogICAgICAgICBhdXRvIHJlZ2lzdHJhdGlvbiA9IFNlcnZpY2VXb3JrZXJSZWdp c3RyYXRpb25EYXRhIHsgV1RGTW92ZSgqa2V5KSwgcmVnaXN0cmF0aW9uSWRlbnRpZmllciwgVVJM KG9yaWdpblVSTCwgc2NvcGVQYXRoKSwgKnVwZGF0ZVZpYUNhY2hlLCBsYXN0VXBkYXRlQ2hlY2tU aW1lLCBzdGQ6Om51bGxvcHQsIHN0ZDo6bnVsbG9wdCwgV1RGTW92ZShzZXJ2aWNlV29ya2VyRGF0 YSkgfTsKLSAgICAgICAgYXV0byBjb250ZXh0RGF0YSA9IFNlcnZpY2VXb3JrZXJDb250ZXh0RGF0 YSB7IHN0ZDo6bnVsbG9wdCwgV1RGTW92ZShyZWdpc3RyYXRpb24pLCB3b3JrZXJJZGVudGlmaWVy LCBXVEZNb3ZlKHNjcmlwdCksIHsgfSwgV1RGTW92ZShzY3JpcHRVUkwpLCAqd29ya2VyVHlwZSwg dHJ1ZSB9OworICAgICAgICBhdXRvIGNvbnRleHREYXRhID0gU2VydmljZVdvcmtlckNvbnRleHRE YXRhIHsgc3RkOjpudWxsb3B0LCBXVEZNb3ZlKHJlZ2lzdHJhdGlvbiksIHdvcmtlcklkZW50aWZp ZXIsIFdURk1vdmUoc2NyaXB0KSwgV1RGTW92ZShjb250ZW50U2VjdXJpdHlQb2xpY3kpLCBXVEZN b3ZlKHNjcmlwdFVSTCksICp3b3JrZXJUeXBlLCB0cnVlIH07CiAKICAgICAgICAgcG9zdFRhc2tS ZXBseShjcmVhdGVDcm9zc1RocmVhZFRhc2soKnRoaXMsICZSZWdpc3RyYXRpb25EYXRhYmFzZTo6 YWRkUmVnaXN0cmF0aW9uVG9TdG9yZSwgV1RGTW92ZShjb250ZXh0RGF0YSkpKTsKICAgICB9Cg==