181591 2018-01-12 06:48:06 -0800 WebProcess should pass the registration identifier and not the worker identifier for fetch events 2018-01-12 11:44:18 -0800 1 1 1 Unclassified WebKit Service Workers WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 youennf youennf cdumez commit-queue dbates ews-watchlist japhet webkit-bug-importer oldest_to_newest 1388789 0 youennf 2018-01-12 06:48:06 -0800 Currently, the web process is passing a service worker identifier. But the storage process may actually make this service worker redundant if updating it. In such a case the WebProcess active service worker This happens for instance when a service worker that does not control any client yet is being updated and shortly after a client is starting to be controlled. Registration identifier stays valid so it is best to use that one instead and compute the serviceWorkerIdentifier in the StorageProcess. 1388790 1 331199 youennf 2018-01-12 06:55:28 -0800 Created attachment 331199 Patch 1388882 2 331199 commit-queue 2018-01-12 11:43:40 -0800 Comment on attachment 331199 Patch Clearing flags on attachment: 331199 Committed r226904: <https://trac.webkit.org/changeset/226904> 1388883 3 commit-queue 2018-01-12 11:43:42 -0800 All reviewed patches have been landed. Closing bug. 1388884 4 webkit-bug-importer 2018-01-12 11:44:18 -0800 <rdar://problem/36477786> 331199 2018-01-12 06:55:28 -0800 2018-01-12 11:43:40 -0800 Patch bug-181591-20180112155526.patch text/plain 28388 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjI2Nzk0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNGU2N2E3YWY4MGVkNGEz NDY4NDU5YzMwMDgwOTlmMjFhYjc5YmFiMy4uODYzMTlkYjc0OTdjMDE0YmNmNTY1ZmIwMDU5M2E0 NDE0YjIxNDYwYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM1IEBACisyMDE4LTAxLTEyICBZb3Vl bm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KKworICAgICAgICBXZWJQcm9jZXNzIHNob3Vs ZCBwYXNzIHRoZSByZWdpc3RyYXRpb24gaWRlbnRpZmllciBhbmQgbm90IHRoZSB3b3JrZXIgaWRl bnRpZmllciBmb3IgZmV0Y2ggZXZlbnRzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0xODE1OTEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBUZXN0OiBodHRwL3dwdC9zZXJ2aWNlLXdvcmtlcnMvdXBkYXRlLXNl cnZpY2Utd29ya2VyLmh0dHBzLmh0bWwKKworICAgICAgICBTdG9yZSBzZXJ2aWNlIHdvcmtlciBy ZWdpc3RyYXRpb24gaWRlbnRpZmllciBpbiBSZXNvdXJjZUxvYWRlck9wdGlvbnMgaW5zdGVhZCBv ZiBzZXJ2aWNlIHdvcmtlciBpZGVudGlmaWVyLgorCisgICAgICAgICogbG9hZGVyL0RvY3VtZW50 VGhyZWFkYWJsZUxvYWRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpEb2N1bWVudFRocmVhZGFi bGVMb2FkZXI6OkRvY3VtZW50VGhyZWFkYWJsZUxvYWRlcik6CisgICAgICAgIChXZWJDb3JlOjpE b2N1bWVudFRocmVhZGFibGVMb2FkZXI6Om1ha2VDcm9zc09yaWdpbkFjY2Vzc1JlcXVlc3QpOgor ICAgICAgICAqIGxvYWRlci9SZXNvdXJjZUxvYWRlck9wdGlvbnMuaDoKKyAgICAgICAgKiBsb2Fk ZXIvV29ya2VyVGhyZWFkYWJsZUxvYWRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpXb3JrZXJU aHJlYWRhYmxlTG9hZGVyOjpNYWluVGhyZWFkQnJpZGdlOjpNYWluVGhyZWFkQnJpZGdlKToKKyAg ICAgICAgKiBsb2FkZXIvY2FjaGUvQ2FjaGVkUmVzb3VyY2VMb2FkZXIuY3BwOgorICAgICAgICAo V2ViQ29yZTo6Q2FjaGVkUmVzb3VyY2VMb2FkZXI6OnByZXBhcmVGZXRjaCk6CisgICAgICAgIChX ZWJDb3JlOjpDYWNoZWRSZXNvdXJjZUxvYWRlcjo6ZGV0ZXJtaW5lUmV2YWxpZGF0aW9uUG9saWN5 IGNvbnN0KToKKyAgICAgICAgKiBsb2FkZXIvY2FjaGUvQ2FjaGVkUmVzb3VyY2VSZXF1ZXN0LmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OkNhY2hlZFJlc291cmNlUmVxdWVzdDo6c2V0U2VsZWN0ZWRT ZXJ2aWNlV29ya2VyUmVnaXN0cmF0aW9uSWRlbnRpZmllcklmTmVlZGVkKToKKyAgICAgICAgKFdl YkNvcmU6OkNhY2hlZFJlc291cmNlUmVxdWVzdDo6c2V0TmF2aWdhdGlvblNlcnZpY2VXb3JrZXJS ZWdpc3RyYXRpb25EYXRhKToKKyAgICAgICAgKFdlYkNvcmU6OkNhY2hlZFJlc291cmNlUmVxdWVz dDo6c2V0U2VsZWN0ZWRTZXJ2aWNlV29ya2VySWRlbnRpZmllcklmTmVlZGVkKTogRGVsZXRlZC4K KyAgICAgICAgKiBsb2FkZXIvY2FjaGUvQ2FjaGVkUmVzb3VyY2VSZXF1ZXN0Lmg6CisgICAgICAg ICogd29ya2Vycy9Xb3JrZXJTY3JpcHRMb2FkZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6V29y a2VyU2NyaXB0TG9hZGVyOjpsb2FkU3luY2hyb25vdXNseSk6CisgICAgICAgIChXZWJDb3JlOjpX b3JrZXJTY3JpcHRMb2FkZXI6OmxvYWRBc3luY2hyb25vdXNseSk6CisgICAgICAgICogd29ya2Vy cy9zZXJ2aWNlL3NlcnZlci9TV1NlcnZlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTV1NlcnZl cjo6YWN0aXZlV29ya2VyRnJvbVJlZ2lzdHJhdGlvbklEKToKKyAgICAgICAgKiB3b3JrZXJzL3Nl cnZpY2Uvc2VydmVyL1NXU2VydmVyLmg6CisKIDIwMTgtMDEtMTEgIFlvdWVubiBGYWJsZXQgIDx5 b3Vlbm5AYXBwbGUuY29tPgogCiAgICAgICAgIEZvcm1EYXRhRWxlbWVudDo6bGVuZ3RoSW5CeXRl cyBzaG91bGQgdXNlIFRocmVhZGFibGVCbG9iUmVnaXN0cnkKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKaW5kZXggMTYzZmIzYTkz YjNjNTdlNTZjNmQ5NjcyMDQ5NjU5Yjc2N2ZkZGE2Mi4uMmI1ODhkOTU1ZDIzYWUyYjM1MDUxMzc4 OGUwMTc1ZDEzZTcyMTNhMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKKysr IGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyNCBAQAorMjAxOC0wMS0xMiAg WW91ZW5uIEZhYmxldCAgPHlvdWVubkBhcHBsZS5jb20+CisKKyAgICAgICAgV2ViUHJvY2VzcyBz aG91bGQgcGFzcyB0aGUgcmVnaXN0cmF0aW9uIGlkZW50aWZpZXIgYW5kIG5vdCB0aGUgd29ya2Vy IGlkZW50aWZpZXIgZm9yIGZldGNoIGV2ZW50cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTgxNTkxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgVXNlIHNlcnZpY2Ugd29ya2VyIHJlZ2lzdHJhdGlvbiBpZGVu dGlmaWVyIHRvIGNvbXB1dGUgdGhlIGFjdGl2ZSBzZXJ2aWNlIHdvcmtlciBpZGVudGlmaWVyIHJl c3BvbnNpYmxlIHRvIGhhbmRsZSB0aGUgZmV0Y2ggZXZlbnQuCisKKyAgICAgICAgKiBTdG9yYWdl UHJvY2Vzcy9TZXJ2aWNlV29ya2VyL1dlYlNXU2VydmVyQ29ubmVjdGlvbi5jcHA6CisgICAgICAg IChXZWJLaXQ6OldlYlNXU2VydmVyQ29ubmVjdGlvbjo6c3RhcnRGZXRjaCk6CisgICAgICAgICog U3RvcmFnZVByb2Nlc3MvU2VydmljZVdvcmtlci9XZWJTV1NlcnZlckNvbm5lY3Rpb24uaDoKKyAg ICAgICAgKiBTdG9yYWdlUHJvY2Vzcy9TZXJ2aWNlV29ya2VyL1dlYlNXU2VydmVyQ29ubmVjdGlv bi5tZXNzYWdlcy5pbjoKKyAgICAgICAgKiBXZWJQcm9jZXNzL1N0b3JhZ2UvU2VydmljZVdvcmtl ckNsaWVudEZldGNoLmNwcDoKKyAgICAgICAgKFdlYktpdDo6U2VydmljZVdvcmtlckNsaWVudEZl dGNoOjpzdGFydCk6CisgICAgICAgICogV2ViUHJvY2Vzcy9TdG9yYWdlL1dlYlNXQ2xpZW50Q29u bmVjdGlvbi5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlNXQ2xpZW50Q29ubmVjdGlvbjo6c3Rh cnRGZXRjaCk6CisgICAgICAgICogV2ViUHJvY2Vzcy9TdG9yYWdlL1dlYlNXQ2xpZW50Q29ubmVj dGlvbi5oOgorICAgICAgICAqIFdlYlByb2Nlc3MvU3RvcmFnZS9XZWJTZXJ2aWNlV29ya2VyUHJv dmlkZXIuY3BwOgorICAgICAgICAoV2ViS2l0OjpzaG91bGRIYW5kbGVGZXRjaCk6CisKIDIwMTgt MDEtMTEgIFlvdWVubiBGYWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgogCiAgICAgICAgIEFTU0VS VElPTiBGQUlMRUQ6IG1fcHRyIHVuZGVyIFdlYktpdDo6Q2FjaGVTdG9yYWdlOjpDYWNoZXM6Ondy aXRlUmVjb3JkCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRG9jdW1lbnRUaHJl YWRhYmxlTG9hZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9Eb2N1bWVudFRocmVhZGFi bGVMb2FkZXIuY3BwCmluZGV4IDM0NWJkYjViNmNiYWI0ZWRiYTBhNjZjODE5ZDNhYjRjYmU0MWRk NTQuLjQ3MjhkYTZhM2RmNzAyM2RjYmZhMGRkMDA5NWM2MTg0NDNjNDM3MGUgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2xvYWRlci9Eb2N1bWVudFRocmVhZGFibGVMb2FkZXIuY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL2xvYWRlci9Eb2N1bWVudFRocmVhZGFibGVMb2FkZXIuY3BwCkBAIC0x MjAsNyArMTIwLDcgQEAgRG9jdW1lbnRUaHJlYWRhYmxlTG9hZGVyOjpEb2N1bWVudFRocmVhZGFi bGVMb2FkZXIoRG9jdW1lbnQmIGRvY3VtZW50LCBUaHJlYWRhYmwKICAgICAgICAgbV9vcmlnaW5h bEhlYWRlcnMgPSByZXF1ZXN0Lmh0dHBIZWFkZXJGaWVsZHMoKTsKIAogI2lmIEVOQUJMRShTRVJW SUNFX1dPUktFUikKLSAgICBpZiAobV9vcHRpb25zLnNlcnZpY2VXb3JrZXJzTW9kZSA9PSBTZXJ2 aWNlV29ya2Vyc01vZGU6OkFsbCAmJiBtX2FzeW5jICYmIChtX29wdGlvbnMuc2VydmljZVdvcmtl cklkZW50aWZpZXIgfHwgZG9jdW1lbnQuYWN0aXZlU2VydmljZVdvcmtlcigpKSkKKyAgICBpZiAo bV9vcHRpb25zLnNlcnZpY2VXb3JrZXJzTW9kZSA9PSBTZXJ2aWNlV29ya2Vyc01vZGU6OkFsbCAm JiBtX2FzeW5jICYmIChtX29wdGlvbnMuc2VydmljZVdvcmtlclJlZ2lzdHJhdGlvbklkZW50aWZp ZXIgfHwgZG9jdW1lbnQuYWN0aXZlU2VydmljZVdvcmtlcigpKSkKICAgICAgICAgbV9vcHRpb25z Lmh0dHBIZWFkZXJzVG9LZWVwID0gaHR0cEhlYWRlcnNUb0tlZXBGcm9tQ2xlYW5pbmcocmVxdWVz dC5odHRwSGVhZGVyRmllbGRzKCkpOwogI2VuZGlmCiAKQEAgLTE1NSw3ICsxNTUsNyBAQCB2b2lk IERvY3VtZW50VGhyZWFkYWJsZUxvYWRlcjo6bWFrZUNyb3NzT3JpZ2luQWNjZXNzUmVxdWVzdChS ZXNvdXJjZVJlcXVlc3QmJiByZQogICAgIGVsc2UgewogI2lmIEVOQUJMRShTRVJWSUNFX1dPUktF UikKICAgICAgICAgaWYgKG1fb3B0aW9ucy5zZXJ2aWNlV29ya2Vyc01vZGUgPT0gU2VydmljZVdv cmtlcnNNb2RlOjpBbGwgJiYgbV9hc3luYykgewotICAgICAgICAgICAgaWYgKG1fb3B0aW9ucy5z ZXJ2aWNlV29ya2VySWRlbnRpZmllciB8fCBkb2N1bWVudCgpLmFjdGl2ZVNlcnZpY2VXb3JrZXIo KSkgeworICAgICAgICAgICAgaWYgKG1fb3B0aW9ucy5zZXJ2aWNlV29ya2VyUmVnaXN0cmF0aW9u SWRlbnRpZmllciB8fCBkb2N1bWVudCgpLmFjdGl2ZVNlcnZpY2VXb3JrZXIoKSkgewogICAgICAg ICAgICAgICAgIEFTU0VSVCghbV9ieXBhc3NpbmdQcmVmbGlnaHRGb3JTZXJ2aWNlV29ya2VyUmVx dWVzdCk7CiAgICAgICAgICAgICAgICAgbV9ieXBhc3NpbmdQcmVmbGlnaHRGb3JTZXJ2aWNlV29y a2VyUmVxdWVzdCA9IFdURk1vdmUocmVxdWVzdCk7CiAgICAgICAgICAgICAgICAgbV9vcHRpb25z LnNlcnZpY2VXb3JrZXJzTW9kZSA9IFNlcnZpY2VXb3JrZXJzTW9kZTo6T25seTsKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9SZXNvdXJjZUxvYWRlck9wdGlvbnMuaCBiL1NvdXJj ZS9XZWJDb3JlL2xvYWRlci9SZXNvdXJjZUxvYWRlck9wdGlvbnMuaAppbmRleCBhNTA0MzlhYWUy MWRkNmE1ODliNDIxMDYyYjUzMDc0ZDdlYzA0Nzk0Li4xOGJmZGY3Y2JhZWNmZGE4ZTYwNzI2N2M2 N2FmYTNhOWM1MDJlYWUzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvUmVzb3Vy Y2VMb2FkZXJPcHRpb25zLmgKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL1Jlc291cmNlTG9h ZGVyT3B0aW9ucy5oCkBAIC0zMiw3ICszMiw3IEBACiAKICNpbmNsdWRlICJGZXRjaE9wdGlvbnMu aCIKICNpbmNsdWRlICJIVFRQSGVhZGVyTmFtZXMuaCIKLSNpbmNsdWRlICJTZXJ2aWNlV29ya2Vy SWRlbnRpZmllci5oIgorI2luY2x1ZGUgIlNlcnZpY2VXb3JrZXJUeXBlcy5oIgogI2luY2x1ZGUg IlN0b3JlZENyZWRlbnRpYWxzUG9saWN5LmgiCiAjaW5jbHVkZSA8d3RmL0hhc2hTZXQuaD4KICNp bmNsdWRlIDx3dGYvVmVjdG9yLmg+CkBAIC0xNDEsNyArMTQxLDcgQEAgc3RydWN0IFJlc291cmNl TG9hZGVyT3B0aW9ucyA6IHB1YmxpYyBGZXRjaE9wdGlvbnMgewogICAgIEluaXRpYXRvckNvbnRl eHQgaW5pdGlhdG9yQ29udGV4dCB7IEluaXRpYXRvckNvbnRleHQ6OkRvY3VtZW50IH07CiAgICAg U2VydmljZVdvcmtlcnNNb2RlIHNlcnZpY2VXb3JrZXJzTW9kZSB7IFNlcnZpY2VXb3JrZXJzTW9k ZTo6QWxsIH07CiAjaWYgRU5BQkxFKFNFUlZJQ0VfV09SS0VSKQotICAgIHN0ZDo6b3B0aW9uYWw8 U2VydmljZVdvcmtlcklkZW50aWZpZXI+IHNlcnZpY2VXb3JrZXJJZGVudGlmaWVyOworICAgIHN0 ZDo6b3B0aW9uYWw8U2VydmljZVdvcmtlclJlZ2lzdHJhdGlvbklkZW50aWZpZXI+IHNlcnZpY2VX b3JrZXJSZWdpc3RyYXRpb25JZGVudGlmaWVyOwogICAgIC8vIFdlYktpdCBsb2FkaW5nIGNvZGUg aXMgYWRkaW5nIHNvbWUgSFRUUCBoZWFkZXJzIGJldHdlZW4gdGhlIGFwcGxpY2F0aW9uIGFuZCB0 aGUgdGltZSBzZXJ2aWNlIHdvcmtlciBpbnRlcmNlcHRzIHRoZSBmZXRjaC4KICAgICAvLyBXZSBr ZWVwIGEgbGlzdCBvZiB0aGVzZSBoZWFkZXJzIHNvIHRoYXQgd2Ugb25seSByZW1vdmUgdGhlIG9u ZXMgdGhhdCBhcmUgc2V0IGJ5IHRoZSBsb2FkaW5nIGNvZGUgYW5kIG5vdCBieSB0aGUgYXBwbGlj YXRpb24uCiAgICAgLy8gRklYTUU6IFJlbW92ZSB0aGlzIHdoZW4gc2VydmljZSB3b3JrZXIgZmV0 Y2ggaW50ZXJjZXB0aW9uIGhhcHBlbnMgYmVmb3JlIHRoZSBzZXR0aW5nIG9mIHRoZXNlIGhlYWRl cnMgaW4gdGhlIGxvYWRpbmcgY29kZS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRl ci9Xb3JrZXJUaHJlYWRhYmxlTG9hZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9Xb3Jr ZXJUaHJlYWRhYmxlTG9hZGVyLmNwcAppbmRleCBiMjllZTMyYzg0ZTVlNDIyNWNhZWQ5MDFhMDZi OTUxMzFiYWZhMDYwLi5kNmY1ZGM5M2FlY2M2NWIzMjkzZDc1ODMxNTA4MzkwNTllMjExMzMyIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvV29ya2VyVGhyZWFkYWJsZUxvYWRlci5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL1dvcmtlclRocmVhZGFibGVMb2FkZXIuY3Bw CkBAIC0xMjksNyArMTI5LDcgQEAgV29ya2VyVGhyZWFkYWJsZUxvYWRlcjo6TWFpblRocmVhZEJy aWRnZTo6TWFpblRocmVhZEJyaWRnZShUaHJlYWRhYmxlTG9hZGVyQ2xpZW4KICNpZiBFTkFCTEUo U0VSVklDRV9XT1JLRVIpCiAgICAgb3B0aW9uc0NvcHktPm9wdGlvbnMuc2VydmljZVdvcmtlcnNN b2RlID0gZ2xvYmFsU2NvcGUuaXNTZXJ2aWNlV29ya2VyR2xvYmFsU2NvcGUoKSA/IFNlcnZpY2VX b3JrZXJzTW9kZTo6Tm9uZSA6IFNlcnZpY2VXb3JrZXJzTW9kZTo6QWxsOwogICAgIGlmIChhdXRv KiBhY3RpdmVTZXJ2aWNlV29ya2VyID0gZ2xvYmFsU2NvcGUuYWN0aXZlU2VydmljZVdvcmtlcigp KQotICAgICAgICBvcHRpb25zQ29weS0+b3B0aW9ucy5zZXJ2aWNlV29ya2VySWRlbnRpZmllciA9 IGFjdGl2ZVNlcnZpY2VXb3JrZXItPmlkZW50aWZpZXIoKTsKKyAgICAgICAgb3B0aW9uc0NvcHkt Pm9wdGlvbnMuc2VydmljZVdvcmtlclJlZ2lzdHJhdGlvbklkZW50aWZpZXIgPSBhY3RpdmVTZXJ2 aWNlV29ya2VyLT5yZWdpc3RyYXRpb25JZGVudGlmaWVyKCk7CiAjZW5kaWYKIAogICAgIEluc3Bl Y3Rvckluc3RydW1lbnRhdGlvbjo6d2lsbFNlbmRSZXF1ZXN0KGdsb2JhbFNjb3BlLCBtX3dvcmtl clJlcXVlc3RJZGVudGlmaWVyLCByZXF1ZXN0KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L2xvYWRlci9jYWNoZS9DYWNoZWRSZXNvdXJjZUxvYWRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9s b2FkZXIvY2FjaGUvQ2FjaGVkUmVzb3VyY2VMb2FkZXIuY3BwCmluZGV4IGFjMDg2ZGFkYjY5ZmQ3 NmNhZDYxN2IxZGU4OGM0M2U5NWZlZjkxNjEuLmNlM2I5MTU1OWJhMTdmOWVjZjc3MTBiMGNhMzg5 MDMwMzAyMzI5NTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9DYWNo ZWRSZXNvdXJjZUxvYWRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hlL0Nh Y2hlZFJlc291cmNlTG9hZGVyLmNwcApAQCAtNzIzLDcgKzcyMyw3IEBAIHZvaWQgQ2FjaGVkUmVz b3VyY2VMb2FkZXI6OnByZXBhcmVGZXRjaChDYWNoZWRSZXNvdXJjZTo6VHlwZSB0eXBlLCBDYWNo ZWRSZXNvdXJjCiAjaWYgRU5BQkxFKFNFUlZJQ0VfV09SS0VSKQogICAgICAgICByZXF1ZXN0LnNl dENsaWVudElkZW50aWZpZXJJZk5lZWRlZChkb2N1bWVudC0+aWRlbnRpZmllcigpKTsKICAgICAg ICAgaWYgKGF1dG8qIGFjdGl2ZVNlcnZpY2VXb3JrZXIgPSBkb2N1bWVudC0+YWN0aXZlU2Vydmlj ZVdvcmtlcigpKQotICAgICAgICAgICAgcmVxdWVzdC5zZXRTZWxlY3RlZFNlcnZpY2VXb3JrZXJJ ZGVudGlmaWVySWZOZWVkZWQoYWN0aXZlU2VydmljZVdvcmtlci0+aWRlbnRpZmllcigpKTsKKyAg ICAgICAgICAgIHJlcXVlc3Quc2V0U2VsZWN0ZWRTZXJ2aWNlV29ya2VyUmVnaXN0cmF0aW9uSWRl bnRpZmllcklmTmVlZGVkKGFjdGl2ZVNlcnZpY2VXb3JrZXItPnJlZ2lzdHJhdGlvbklkZW50aWZp ZXIoKSk7CiAjZW5kaWYKICAgICB9CiAKQEAgLTEwMjgsNyArMTAyOCw3IEBAIENhY2hlZFJlc291 cmNlTG9hZGVyOjpSZXZhbGlkYXRpb25Qb2xpY3kgQ2FjaGVkUmVzb3VyY2VMb2FkZXI6OmRldGVy bWluZVJldmFsaWRhCiAKICNpZiBFTkFCTEUoU0VSVklDRV9XT1JLRVIpCiAgICAgLy8gRklYTUU6 IFdlIHNob3VsZCB2YWxpZGF0ZS9zcGVjaWZ5IHRoaXMgYmVoYXZpb3IuCi0gICAgaWYgKGNhY2hl ZFJlc291cmNlUmVxdWVzdC5vcHRpb25zKCkuc2VydmljZVdvcmtlcklkZW50aWZpZXIgIT0gZXhp c3RpbmdSZXNvdXJjZS0+b3B0aW9ucygpLnNlcnZpY2VXb3JrZXJJZGVudGlmaWVyKSB7CisgICAg aWYgKGNhY2hlZFJlc291cmNlUmVxdWVzdC5vcHRpb25zKCkuc2VydmljZVdvcmtlclJlZ2lzdHJh dGlvbklkZW50aWZpZXIgIT0gZXhpc3RpbmdSZXNvdXJjZS0+b3B0aW9ucygpLnNlcnZpY2VXb3Jr ZXJSZWdpc3RyYXRpb25JZGVudGlmaWVyKSB7CiAgICAgICAgIExPRyhSZXNvdXJjZUxvYWRpbmcs ICJDYWNoZWRSZXNvdXJjZUxvYWRlcjo6ZGV0ZXJtaW5lUmV2YWxpZGF0aW9uUG9saWN5IHJlbG9h ZGluZyBiZWNhdXNlIHNlbGVjdGVkIHNlcnZpY2Ugd29ya2VyIGRpZmZlcnMiKTsKICAgICAgICAg cmV0dXJuIFJlbG9hZDsKICAgICB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIv Y2FjaGUvQ2FjaGVkUmVzb3VyY2VSZXF1ZXN0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9j YWNoZS9DYWNoZWRSZXNvdXJjZVJlcXVlc3QuY3BwCmluZGV4IDk1ZTY2OGM3NzRjMjFlYWVmZTQz NzU5ZjJlYTA1ZjQ1Zjc2NDI1YjEuLjFlM2YwNDRlNWQ2ZTUwYjQyZDEwZWNmNTZiZDI2MGM1ZGJi MWQ0MDAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9DYWNoZWRSZXNv dXJjZVJlcXVlc3QuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9DYWNoZWRS ZXNvdXJjZVJlcXVlc3QuY3BwCkBAIC0yODIsNyArMjgyLDcgQEAgdm9pZCBDYWNoZWRSZXNvdXJj ZVJlcXVlc3Q6OnNldENsaWVudElkZW50aWZpZXJJZk5lZWRlZChEb2N1bWVudElkZW50aWZpZXIg Y2xpZW4KICAgICAgICAgbV9vcHRpb25zLmNsaWVudElkZW50aWZpZXIgPSBjbGllbnRJZGVudGlm aWVyOwogfQogCi12b2lkIENhY2hlZFJlc291cmNlUmVxdWVzdDo6c2V0U2VsZWN0ZWRTZXJ2aWNl V29ya2VySWRlbnRpZmllcklmTmVlZGVkKFNlcnZpY2VXb3JrZXJJZGVudGlmaWVyIGlkZW50aWZp ZXIpCit2b2lkIENhY2hlZFJlc291cmNlUmVxdWVzdDo6c2V0U2VsZWN0ZWRTZXJ2aWNlV29ya2Vy UmVnaXN0cmF0aW9uSWRlbnRpZmllcklmTmVlZGVkKFNlcnZpY2VXb3JrZXJSZWdpc3RyYXRpb25J ZGVudGlmaWVyIGlkZW50aWZpZXIpCiB7CiAgICAgaWYgKGlzTm9uU3VicmVzb3VyY2VSZXF1ZXN0 KG1fb3B0aW9ucy5kZXN0aW5hdGlvbikpCiAgICAgICAgIHJldHVybjsKQEAgLTI5MSwxMCArMjkx LDEwIEBAIHZvaWQgQ2FjaGVkUmVzb3VyY2VSZXF1ZXN0OjpzZXRTZWxlY3RlZFNlcnZpY2VXb3Jr ZXJJZGVudGlmaWVySWZOZWVkZWQoU2VydmljZVdvCiAKICAgICBpZiAobV9vcHRpb25zLnNlcnZp Y2VXb3JrZXJzTW9kZSA9PSBTZXJ2aWNlV29ya2Vyc01vZGU6Ok5vbmUpCiAgICAgICAgIHJldHVy bjsKLSAgICBpZiAobV9vcHRpb25zLnNlcnZpY2VXb3JrZXJJZGVudGlmaWVyKQorICAgIGlmICht X29wdGlvbnMuc2VydmljZVdvcmtlclJlZ2lzdHJhdGlvbklkZW50aWZpZXIpCiAgICAgICAgIHJl dHVybjsKIAotICAgIG1fb3B0aW9ucy5zZXJ2aWNlV29ya2VySWRlbnRpZmllciA9IGlkZW50aWZp ZXI7CisgICAgbV9vcHRpb25zLnNlcnZpY2VXb3JrZXJSZWdpc3RyYXRpb25JZGVudGlmaWVyID0g aWRlbnRpZmllcjsKIH0KIAogdm9pZCBDYWNoZWRSZXNvdXJjZVJlcXVlc3Q6OnNldE5hdmlnYXRp b25TZXJ2aWNlV29ya2VyUmVnaXN0cmF0aW9uRGF0YShjb25zdCBzdGQ6Om9wdGlvbmFsPFNlcnZp Y2VXb3JrZXJSZWdpc3RyYXRpb25EYXRhPiYgZGF0YSkKQEAgLTMwMyw3ICszMDMsNyBAQCB2b2lk IENhY2hlZFJlc291cmNlUmVxdWVzdDo6c2V0TmF2aWdhdGlvblNlcnZpY2VXb3JrZXJSZWdpc3Ry YXRpb25EYXRhKGNvbnN0IHN0ZAogICAgICAgICBtX29wdGlvbnMuc2VydmljZVdvcmtlcnNNb2Rl ID0gU2VydmljZVdvcmtlcnNNb2RlOjpOb25lOwogICAgICAgICByZXR1cm47CiAgICAgfQotICAg IG1fb3B0aW9ucy5zZXJ2aWNlV29ya2VySWRlbnRpZmllciA9IGRhdGEtPmFjdGl2ZVdvcmtlci0+ aWRlbnRpZmllcjsKKyAgICBtX29wdGlvbnMuc2VydmljZVdvcmtlclJlZ2lzdHJhdGlvbklkZW50 aWZpZXIgPSBkYXRhLT5pZGVudGlmaWVyOwogfQogI2VuZGlmCiAKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9DYWNoZWRSZXNvdXJjZVJlcXVlc3QuaCBiL1NvdXJjZS9X ZWJDb3JlL2xvYWRlci9jYWNoZS9DYWNoZWRSZXNvdXJjZVJlcXVlc3QuaAppbmRleCAxMjJhMjhh M2JkOWQyOTViZWE1M2NkM2NjMjFmNGEyMzk5NGM5ZjI5Li45MGU5NmMyMDQ2Y2U2ZGE4YjhmZTgw NWU0NzAyYmZkMmEzZTE0Mjk3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2Fj aGUvQ2FjaGVkUmVzb3VyY2VSZXF1ZXN0LmgKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL2Nh Y2hlL0NhY2hlZFJlc291cmNlUmVxdWVzdC5oCkBAIC0xMDAsNyArMTAwLDcgQEAgcHVibGljOgog CiAjaWYgRU5BQkxFKFNFUlZJQ0VfV09SS0VSKQogICAgIHZvaWQgc2V0Q2xpZW50SWRlbnRpZmll cklmTmVlZGVkKERvY3VtZW50SWRlbnRpZmllcik7Ci0gICAgdm9pZCBzZXRTZWxlY3RlZFNlcnZp Y2VXb3JrZXJJZGVudGlmaWVySWZOZWVkZWQoU2VydmljZVdvcmtlcklkZW50aWZpZXIpOworICAg IHZvaWQgc2V0U2VsZWN0ZWRTZXJ2aWNlV29ya2VyUmVnaXN0cmF0aW9uSWRlbnRpZmllcklmTmVl ZGVkKFNlcnZpY2VXb3JrZXJSZWdpc3RyYXRpb25JZGVudGlmaWVyKTsKICAgICB2b2lkIHNldE5h dmlnYXRpb25TZXJ2aWNlV29ya2VyUmVnaXN0cmF0aW9uRGF0YShjb25zdCBzdGQ6Om9wdGlvbmFs PFNlcnZpY2VXb3JrZXJSZWdpc3RyYXRpb25EYXRhPiYpOwogI2VuZGlmCiAKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL3dvcmtlcnMvV29ya2VyU2NyaXB0TG9hZGVyLmNwcCBiL1NvdXJjZS9X ZWJDb3JlL3dvcmtlcnMvV29ya2VyU2NyaXB0TG9hZGVyLmNwcAppbmRleCBkZTg4NDIzYWQzZTE4 YjllZDQyY2RlNmM2MTUzZGYwOGQ5MGYxOTg4Li4xZTE4OGJmZDU2ZDAwNDliZTFiOTUwYTkyZTk2 N2NiNTcyODhkNWQwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS93b3JrZXJzL1dvcmtlclNj cmlwdExvYWRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvd29ya2Vycy9Xb3JrZXJTY3JpcHRM b2FkZXIuY3BwCkBAIC02OCw3ICs2OCw3IEBAIHZvaWQgV29ya2VyU2NyaXB0TG9hZGVyOjpsb2Fk U3luY2hyb25vdXNseShTY3JpcHRFeGVjdXRpb25Db250ZXh0KiBzY3JpcHRFeGVjdXRpCiAjaWYg RU5BQkxFKFNFUlZJQ0VfV09SS0VSKQogICAgIG9wdGlvbnMuc2VydmljZVdvcmtlcnNNb2RlID0g d29ya2VyR2xvYmFsU2NvcGUuaXNTZXJ2aWNlV29ya2VyR2xvYmFsU2NvcGUoKSA/IFNlcnZpY2VX b3JrZXJzTW9kZTo6Tm9uZSA6IFNlcnZpY2VXb3JrZXJzTW9kZTo6QWxsOwogICAgIGlmIChhdXRv KiBhY3RpdmVTZXJ2aWNlV29ya2VyID0gd29ya2VyR2xvYmFsU2NvcGUuYWN0aXZlU2VydmljZVdv cmtlcigpKQotICAgICAgICBvcHRpb25zLnNlcnZpY2VXb3JrZXJJZGVudGlmaWVyID0gYWN0aXZl U2VydmljZVdvcmtlci0+aWRlbnRpZmllcigpOworICAgICAgICBvcHRpb25zLnNlcnZpY2VXb3Jr ZXJSZWdpc3RyYXRpb25JZGVudGlmaWVyID0gYWN0aXZlU2VydmljZVdvcmtlci0+cmVnaXN0cmF0 aW9uSWRlbnRpZmllcigpOwogI2VuZGlmCiAgICAgV29ya2VyVGhyZWFkYWJsZUxvYWRlcjo6bG9h ZFJlc291cmNlU3luY2hyb25vdXNseSh3b3JrZXJHbG9iYWxTY29wZSwgV1RGTW92ZSgqcmVxdWVz dCksICp0aGlzLCBvcHRpb25zKTsKIH0KQEAgLTk4LDcgKzk4LDcgQEAgdm9pZCBXb3JrZXJTY3Jp cHRMb2FkZXI6OmxvYWRBc3luY2hyb25vdXNseShTY3JpcHRFeGVjdXRpb25Db250ZXh0JiBzY3Jp cHRFeGVjdXQKICNpZiBFTkFCTEUoU0VSVklDRV9XT1JLRVIpCiAgICAgb3B0aW9ucy5zZXJ2aWNl V29ya2Vyc01vZGUgPSBtX2NsaWVudC0+aXNTZXJ2aWNlV29ya2VyQ2xpZW50KCkgPyBTZXJ2aWNl V29ya2Vyc01vZGU6Ok5vbmUgOiBTZXJ2aWNlV29ya2Vyc01vZGU6OkFsbDsKICAgICBpZiAoYXV0 byogYWN0aXZlU2VydmljZVdvcmtlciA9IHNjcmlwdEV4ZWN1dGlvbkNvbnRleHQuYWN0aXZlU2Vy dmljZVdvcmtlcigpKQotICAgICAgICBvcHRpb25zLnNlcnZpY2VXb3JrZXJJZGVudGlmaWVyID0g YWN0aXZlU2VydmljZVdvcmtlci0+aWRlbnRpZmllcigpOworICAgICAgICBvcHRpb25zLnNlcnZp Y2VXb3JrZXJSZWdpc3RyYXRpb25JZGVudGlmaWVyID0gYWN0aXZlU2VydmljZVdvcmtlci0+cmVn aXN0cmF0aW9uSWRlbnRpZmllcigpOwogI2VuZGlmCiAgICAgLy8gRHVyaW5nIGNyZWF0ZSwgY2Fs bGJhY2tzIG1heSBoYXBwZW4gd2hpY2ggcmVtb3ZlIHRoZSBsYXN0IHJlZmVyZW5jZSB0byB0aGlz IG9iamVjdC4KICAgICBSZWY8V29ya2VyU2NyaXB0TG9hZGVyPiBwcm90ZWN0ZWRUaGlzKCp0aGlz KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3dvcmtlcnMvc2VydmljZS9zZXJ2ZXIvU1dT ZXJ2ZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvd29ya2Vycy9zZXJ2aWNlL3NlcnZlci9TV1NlcnZl ci5jcHAKaW5kZXggYTIyZTU5YTgwZTUwNmYzODAzM2MzYmQ1ZGMxYmMyZmE5Y2JiNGVjMC4uYTQz MGFjZmE5MDM2MmEwY2NjNDhkOWVlMzYwZDdmMzM0YTFmZGY5OSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvd29ya2Vycy9zZXJ2aWNlL3NlcnZlci9TV1NlcnZlci5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvd29ya2Vycy9zZXJ2aWNlL3NlcnZlci9TV1NlcnZlci5jcHAKQEAgLTEwMSw2ICsx MDEsMTIgQEAgc3RkOjpvcHRpb25hbDxTZXJ2aWNlV29ya2VyQ2xpZW50RGF0YT4gU1dTZXJ2ZXI6 OnNlcnZpY2VXb3JrZXJDbGllbnRCeUlEKGNvbnN0IFMKICAgICByZXR1cm4gaXRlcmF0b3ItPnZh bHVlOwogfQogCitTV1NlcnZlcldvcmtlciogU1dTZXJ2ZXI6OmFjdGl2ZVdvcmtlckZyb21SZWdp c3RyYXRpb25JRChTZXJ2aWNlV29ya2VyUmVnaXN0cmF0aW9uSWRlbnRpZmllciBpZGVudGlmaWVy KQoreworICAgIGF1dG8qIHJlZ2lzdHJhdGlvbiA9IG1fcmVnaXN0cmF0aW9uc0J5SUQuZ2V0KGlk ZW50aWZpZXIpOworICAgIHJldHVybiByZWdpc3RyYXRpb24gPyByZWdpc3RyYXRpb24tPmFjdGl2 ZVdvcmtlcigpIDogbnVsbHB0cjsKK30KKwogU1dTZXJ2ZXJSZWdpc3RyYXRpb24qIFNXU2VydmVy OjpnZXRSZWdpc3RyYXRpb24oY29uc3QgU2VydmljZVdvcmtlclJlZ2lzdHJhdGlvbktleSYgcmVn aXN0cmF0aW9uS2V5KQogewogICAgIHJldHVybiBtX3JlZ2lzdHJhdGlvbnMuZ2V0KHJlZ2lzdHJh dGlvbktleSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS93b3JrZXJzL3NlcnZpY2Uvc2Vy dmVyL1NXU2VydmVyLmggYi9Tb3VyY2UvV2ViQ29yZS93b3JrZXJzL3NlcnZpY2Uvc2VydmVyL1NX U2VydmVyLmgKaW5kZXggNjQ4M2VkMmM0YmJmY2YyMGNlZDY4Mzk0ZDRjYjFjYTBmNzA2Y2M3MC4u OGI5YWQxZTU3NjllOGIwY2VmY2Y4NWI3ZWNmNzIyZDlmOGEzOTdhNCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvd29ya2Vycy9zZXJ2aWNlL3NlcnZlci9TV1NlcnZlci5oCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3dvcmtlcnMvc2VydmljZS9zZXJ2ZXIvU1dTZXJ2ZXIuaApAQCAtMTQ4LDYgKzE0 OCw3IEBAIHB1YmxpYzoKIAogICAgIFdFQkNPUkVfRVhQT1JUIFNXU2VydmVyV29ya2VyKiB3b3Jr ZXJCeUlEKFNlcnZpY2VXb3JrZXJJZGVudGlmaWVyKSBjb25zdDsKICAgICBXRUJDT1JFX0VYUE9S VCBzdGQ6Om9wdGlvbmFsPFNlcnZpY2VXb3JrZXJDbGllbnREYXRhPiBzZXJ2aWNlV29ya2VyQ2xp ZW50QnlJRChjb25zdCBTZXJ2aWNlV29ya2VyQ2xpZW50SWRlbnRpZmllciYpIGNvbnN0OworICAg IFdFQkNPUkVfRVhQT1JUIFNXU2VydmVyV29ya2VyKiBhY3RpdmVXb3JrZXJGcm9tUmVnaXN0cmF0 aW9uSUQoU2VydmljZVdvcmtlclJlZ2lzdHJhdGlvbklkZW50aWZpZXIpOwogCiAgICAgV0VCQ09S RV9FWFBPUlQgdm9pZCBtYXJrQWxsV29ya2Vyc0FzVGVybWluYXRlZCgpOwogICAgIApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdC9TdG9yYWdlUHJvY2Vzcy9TZXJ2aWNlV29ya2VyL1dlYlNXU2Vy dmVyQ29ubmVjdGlvbi5jcHAgYi9Tb3VyY2UvV2ViS2l0L1N0b3JhZ2VQcm9jZXNzL1NlcnZpY2VX b3JrZXIvV2ViU1dTZXJ2ZXJDb25uZWN0aW9uLmNwcAppbmRleCA0NzIxOGQyZGZmMmIwZDRmMmE2 MzEyNGMwYzg5MjUxNDdlMTIxNzM3Li4xOGQ4NDFkNDZmYjM3MDhiYWRkZjNmZTIwMzBjMDkzYWUz OTE1Y2I4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1N0b3JhZ2VQcm9jZXNzL1NlcnZpY2VX b3JrZXIvV2ViU1dTZXJ2ZXJDb25uZWN0aW9uLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1N0b3Jh Z2VQcm9jZXNzL1NlcnZpY2VXb3JrZXIvV2ViU1dTZXJ2ZXJDb25uZWN0aW9uLmNwcApAQCAtMTI2 LDEzICsxMjYsMTQgQEAgdm9pZCBXZWJTV1NlcnZlckNvbm5lY3Rpb246OnVwZGF0ZVdvcmtlclN0 YXRlSW5DbGllbnQoU2VydmljZVdvcmtlcklkZW50aWZpZXIgd28KICAgICBzZW5kKE1lc3NhZ2Vz OjpXZWJTV0NsaWVudENvbm5lY3Rpb246OlVwZGF0ZVdvcmtlclN0YXRlKHdvcmtlciwgc3RhdGUp KTsKIH0KIAotdm9pZCBXZWJTV1NlcnZlckNvbm5lY3Rpb246OnN0YXJ0RmV0Y2godWludDY0X3Qg ZmV0Y2hJZGVudGlmaWVyLCBTZXJ2aWNlV29ya2VySWRlbnRpZmllciBzZXJ2aWNlV29ya2VySWRl bnRpZmllciwgUmVzb3VyY2VSZXF1ZXN0JiYgcmVxdWVzdCwgRmV0Y2hPcHRpb25zJiYgb3B0aW9u cywgSVBDOjpGb3JtRGF0YVJlZmVyZW5jZSYmIGZvcm1EYXRhLCBTdHJpbmcmJiByZWZlcnJlcikK K3ZvaWQgV2ViU1dTZXJ2ZXJDb25uZWN0aW9uOjpzdGFydEZldGNoKHVpbnQ2NF90IGZldGNoSWRl bnRpZmllciwgU2VydmljZVdvcmtlclJlZ2lzdHJhdGlvbklkZW50aWZpZXIgc2VydmljZVdvcmtl clJlZ2lzdHJhdGlvbklkZW50aWZpZXIsIFJlc291cmNlUmVxdWVzdCYmIHJlcXVlc3QsIEZldGNo T3B0aW9ucyYmIG9wdGlvbnMsIElQQzo6Rm9ybURhdGFSZWZlcmVuY2UmJiBmb3JtRGF0YSwgU3Ry aW5nJiYgcmVmZXJyZXIpCiB7Ci0gICAgYXV0byogd29ya2VyID0gc2VydmVyKCkud29ya2VyQnlJ RChzZXJ2aWNlV29ya2VySWRlbnRpZmllcik7CisgICAgYXV0byogd29ya2VyID0gc2VydmVyKCku YWN0aXZlV29ya2VyRnJvbVJlZ2lzdHJhdGlvbklEKHNlcnZpY2VXb3JrZXJSZWdpc3RyYXRpb25J ZGVudGlmaWVyKTsKICAgICBpZiAoIXdvcmtlcikgewogICAgICAgICBtX2NvbnRlbnRDb25uZWN0 aW9uLT5zZW5kKE1lc3NhZ2VzOjpTZXJ2aWNlV29ya2VyQ2xpZW50RmV0Y2g6OkRpZE5vdEhhbmRs ZSB7IH0sIGZldGNoSWRlbnRpZmllcik7CiAgICAgICAgIHJldHVybjsKICAgICB9CisgICAgYXV0 byBzZXJ2aWNlV29ya2VySWRlbnRpZmllciA9IHdvcmtlci0+aWRlbnRpZmllcigpOwogCiAgICAg YXV0byBydW5TZXJ2ZXJXb3JrZXJBbmRTdGFydEZldGNoID0gW3dlYWtUaGlzID0gbWFrZVdlYWtQ dHIodGhpcyksIHRoaXMsIGZldGNoSWRlbnRpZmllciwgc2VydmljZVdvcmtlcklkZW50aWZpZXIs IHJlcXVlc3QgPSBXVEZNb3ZlKHJlcXVlc3QpLCBvcHRpb25zID0gV1RGTW92ZShvcHRpb25zKSwg Zm9ybURhdGEgPSBXVEZNb3ZlKGZvcm1EYXRhKSwgcmVmZXJyZXIgPSBXVEZNb3ZlKHJlZmVycmVy KV0oYm9vbCBzdWNjZXNzKSBtdXRhYmxlIHsKICAgICAgICAgaWYgKCF3ZWFrVGhpcykKQEAgLTE1 NCwxMCArMTU1LDEyIEBAIHZvaWQgV2ViU1dTZXJ2ZXJDb25uZWN0aW9uOjpzdGFydEZldGNoKHVp bnQ2NF90IGZldGNoSWRlbnRpZmllciwgU2VydmljZVdvcmtlcklkCiAgICAgICAgIH0pOwogICAg IH07CiAKLSAgICBpZiAod29ya2VyLT5zdGF0ZSgpID09IFNlcnZpY2VXb3JrZXJTdGF0ZTo6QWN0 aXZhdGluZykKKyAgICBpZiAod29ya2VyLT5zdGF0ZSgpID09IFNlcnZpY2VXb3JrZXJTdGF0ZTo6 QWN0aXZhdGluZykgewogICAgICAgICB3b3JrZXItPndoZW5BY3RpdmF0ZWQoV1RGTW92ZShydW5T ZXJ2ZXJXb3JrZXJBbmRTdGFydEZldGNoKSk7Ci0gICAgZWxzZQotICAgICAgICBydW5TZXJ2ZXJX b3JrZXJBbmRTdGFydEZldGNoKHRydWUpOworICAgICAgICByZXR1cm47CisgICAgfQorICAgIEFT U0VSVCh3b3JrZXItPnN0YXRlKCkgPT0gU2VydmljZVdvcmtlclN0YXRlOjpBY3RpdmF0ZWQpOwor ICAgIHJ1blNlcnZlcldvcmtlckFuZFN0YXJ0RmV0Y2godHJ1ZSk7CiB9CiAKIHZvaWQgV2ViU1dT ZXJ2ZXJDb25uZWN0aW9uOjpwb3N0TWVzc2FnZVRvU2VydmljZVdvcmtlcihTZXJ2aWNlV29ya2Vy SWRlbnRpZmllciBkZXN0aW5hdGlvbklkZW50aWZpZXIsIElQQzo6RGF0YVJlZmVyZW5jZSYmIG1l c3NhZ2UsIGNvbnN0IFNlcnZpY2VXb3JrZXJPckNsaWVudElkZW50aWZpZXImIHNvdXJjZUlkZW50 aWZpZXIpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1N0b3JhZ2VQcm9jZXNzL1NlcnZpY2VX b3JrZXIvV2ViU1dTZXJ2ZXJDb25uZWN0aW9uLmggYi9Tb3VyY2UvV2ViS2l0L1N0b3JhZ2VQcm9j ZXNzL1NlcnZpY2VXb3JrZXIvV2ViU1dTZXJ2ZXJDb25uZWN0aW9uLmgKaW5kZXggZTI0NGNkYzkx NGUxOWZmZmEyNzA1MWMzMDA3ZGJlOTNiOTM3MjE5Zi4uNDk1ODQ1YmJlNjFjMjRiM2FmYTE4MjVj ZDI1NmY1ZTNlOTQxMDg3ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9TdG9yYWdlUHJvY2Vz cy9TZXJ2aWNlV29ya2VyL1dlYlNXU2VydmVyQ29ubmVjdGlvbi5oCisrKyBiL1NvdXJjZS9XZWJL aXQvU3RvcmFnZVByb2Nlc3MvU2VydmljZVdvcmtlci9XZWJTV1NlcnZlckNvbm5lY3Rpb24uaApA QCAtODMsNyArODMsNyBAQCBwcml2YXRlOgogICAgIHZvaWQgbm90aWZ5Q2xpZW50c09mQ29udHJv bGxlckNoYW5nZShjb25zdCBIYXNoU2V0PFdlYkNvcmU6OkRvY3VtZW50SWRlbnRpZmllcj4mIGNv bnRleHRJZGVudGlmaWVycywgY29uc3QgV2ViQ29yZTo6U2VydmljZVdvcmtlckRhdGEmIG5ld0Nv bnRyb2xsZXIpOwogICAgIHZvaWQgcmVnaXN0cmF0aW9uUmVhZHkodWludDY0X3QgcmVnaXN0cmF0 aW9uUmVhZHlSZXF1ZXN0SWRlbnRpZmllciwgV2ViQ29yZTo6U2VydmljZVdvcmtlclJlZ2lzdHJh dGlvbkRhdGEmJikgZmluYWw7CiAKLSAgICB2b2lkIHN0YXJ0RmV0Y2godWludDY0X3QgZmV0Y2hJ ZGVudGlmaWVyLCBXZWJDb3JlOjpTZXJ2aWNlV29ya2VySWRlbnRpZmllciwgV2ViQ29yZTo6UmVz b3VyY2VSZXF1ZXN0JiYsIFdlYkNvcmU6OkZldGNoT3B0aW9ucyYmLCBJUEM6OkZvcm1EYXRhUmVm ZXJlbmNlJiYsIFN0cmluZyYmIHJlZmVycmVyKTsKKyAgICB2b2lkIHN0YXJ0RmV0Y2godWludDY0 X3QgZmV0Y2hJZGVudGlmaWVyLCBXZWJDb3JlOjpTZXJ2aWNlV29ya2VyUmVnaXN0cmF0aW9uSWRl bnRpZmllciwgV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0JiYsIFdlYkNvcmU6OkZldGNoT3B0aW9u cyYmLCBJUEM6OkZvcm1EYXRhUmVmZXJlbmNlJiYsIFN0cmluZyYmIHJlZmVycmVyKTsKIAogICAg IHZvaWQgcG9zdE1lc3NhZ2VUb1NlcnZpY2VXb3JrZXIoV2ViQ29yZTo6U2VydmljZVdvcmtlcklk ZW50aWZpZXIgZGVzdGluYXRpb24sIElQQzo6RGF0YVJlZmVyZW5jZSYmIG1lc3NhZ2UsIGNvbnN0 IFdlYkNvcmU6OlNlcnZpY2VXb3JrZXJPckNsaWVudElkZW50aWZpZXImIHNvdXJjZSk7CiAKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvU3RvcmFnZVByb2Nlc3MvU2VydmljZVdvcmtlci9XZWJT V1NlcnZlckNvbm5lY3Rpb24ubWVzc2FnZXMuaW4gYi9Tb3VyY2UvV2ViS2l0L1N0b3JhZ2VQcm9j ZXNzL1NlcnZpY2VXb3JrZXIvV2ViU1dTZXJ2ZXJDb25uZWN0aW9uLm1lc3NhZ2VzLmluCmluZGV4 IDQ5M2E4ZjI5MDYyNzc0ODc4NTU2MGM2OGYyMDNjMjc1YjdjOWUzMzUuLmM3Y2JjMmVhNzg5NGY0 Y2EyMmZkYzkwMzZkODU3Mjg1MmNlYjIyYzUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvU3Rv cmFnZVByb2Nlc3MvU2VydmljZVdvcmtlci9XZWJTV1NlcnZlckNvbm5lY3Rpb24ubWVzc2FnZXMu aW4KKysrIGIvU291cmNlL1dlYktpdC9TdG9yYWdlUHJvY2Vzcy9TZXJ2aWNlV29ya2VyL1dlYlNX U2VydmVyQ29ubmVjdGlvbi5tZXNzYWdlcy5pbgpAQCAtMjksNyArMjksNyBAQCBtZXNzYWdlcyAt PiBXZWJTV1NlcnZlckNvbm5lY3Rpb24gewogICAgIEFkZFNlcnZpY2VXb3JrZXJSZWdpc3RyYXRp b25JblNlcnZlcihXZWJDb3JlOjpTZXJ2aWNlV29ya2VyUmVnaXN0cmF0aW9uSWRlbnRpZmllciBp ZGVudGlmaWVyKQogICAgIFJlbW92ZVNlcnZpY2VXb3JrZXJSZWdpc3RyYXRpb25JblNlcnZlcihX ZWJDb3JlOjpTZXJ2aWNlV29ya2VyUmVnaXN0cmF0aW9uSWRlbnRpZmllciBpZGVudGlmaWVyKQog Ci0gICAgU3RhcnRGZXRjaCh1aW50NjRfdCBpZGVudGlmaWVyLCBXZWJDb3JlOjpTZXJ2aWNlV29y a2VySWRlbnRpZmllciBzZXJ2aWNlV29ya2VySWRlbnRpZmllciwgV2ViQ29yZTo6UmVzb3VyY2VS ZXF1ZXN0IHJlcXVlc3QsIHN0cnVjdCBXZWJDb3JlOjpGZXRjaE9wdGlvbnMgb3B0aW9ucywgSVBD OjpGb3JtRGF0YVJlZmVyZW5jZSByZXF1ZXN0Qm9keSwgU3RyaW5nIHJlZmVycmVyKQorICAgIFN0 YXJ0RmV0Y2godWludDY0X3QgaWRlbnRpZmllciwgV2ViQ29yZTo6U2VydmljZVdvcmtlclJlZ2lz dHJhdGlvbklkZW50aWZpZXIgc2VydmljZVdvcmtlclJlZ2lzdHJhdGlvbklkZW50aWZpZXIsIFdl YkNvcmU6OlJlc291cmNlUmVxdWVzdCByZXF1ZXN0LCBzdHJ1Y3QgV2ViQ29yZTo6RmV0Y2hPcHRp b25zIG9wdGlvbnMsIElQQzo6Rm9ybURhdGFSZWZlcmVuY2UgcmVxdWVzdEJvZHksIFN0cmluZyBy ZWZlcnJlcikKIAogICAgIFBvc3RNZXNzYWdlVG9TZXJ2aWNlV29ya2VyKFdlYkNvcmU6OlNlcnZp Y2VXb3JrZXJJZGVudGlmaWVyIGRlc3RpbmF0aW9uLCBJUEM6OkRhdGFSZWZlcmVuY2UgbWVzc2Fn ZSwgV2ViQ29yZTo6U2VydmljZVdvcmtlck9yQ2xpZW50SWRlbnRpZmllciBzb3VyY2UpCiAKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9TdG9yYWdlL1NlcnZpY2VXb3JrZXJD bGllbnRGZXRjaC5jcHAgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvU3RvcmFnZS9TZXJ2aWNl V29ya2VyQ2xpZW50RmV0Y2guY3BwCmluZGV4IDgzYjJhZGUxMzY5YTZkMDI3OTYxMTBjMTAzNGU0 N2ZhM2Q0ODhkMTUuLjdlOGE0MDU1OGZhODk4YzZiYzdhZmRkMzExNGQ0ODk4OTlmNTJmODYgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9TdG9yYWdlL1NlcnZpY2VXb3JrZXJD bGllbnRGZXRjaC5jcHAKKysrIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1N0b3JhZ2UvU2Vy dmljZVdvcmtlckNsaWVudEZldGNoLmNwcApAQCAtNzIsNyArNzIsNyBAQCB2b2lkIFNlcnZpY2VX b3JrZXJDbGllbnRGZXRjaDo6c3RhcnQoKQogICAgIGNsZWFuSFRUUFJlcXVlc3RIZWFkZXJzRm9y QWNjZXNzQ29udHJvbChyZXF1ZXN0LCBvcHRpb25zLmh0dHBIZWFkZXJzVG9LZWVwKTsKIAogICAg IEFTU0VSVChvcHRpb25zLnNlcnZpY2VXb3JrZXJzTW9kZSAhPSBTZXJ2aWNlV29ya2Vyc01vZGU6 Ok5vbmUpOwotICAgIG1fY29ubmVjdGlvbi0+c3RhcnRGZXRjaChtX2xvYWRlci0+aWRlbnRpZmll cigpLCBvcHRpb25zLnNlcnZpY2VXb3JrZXJJZGVudGlmaWVyLnZhbHVlKCksIHJlcXVlc3QsIG9w dGlvbnMsIHJlZmVycmVyKTsKKyAgICBtX2Nvbm5lY3Rpb24tPnN0YXJ0RmV0Y2gobV9sb2FkZXIt PmlkZW50aWZpZXIoKSwgb3B0aW9ucy5zZXJ2aWNlV29ya2VyUmVnaXN0cmF0aW9uSWRlbnRpZmll ci52YWx1ZSgpLCByZXF1ZXN0LCBvcHRpb25zLCByZWZlcnJlcik7CiB9CiAKIC8vIGh0dHBzOi8v ZmV0Y2guc3BlYy53aGF0d2cub3JnLyNodHRwLWZldGNoIHN0ZXAgMy4zCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvU3RvcmFnZS9XZWJTV0NsaWVudENvbm5lY3Rpb24uY3Bw IGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1N0b3JhZ2UvV2ViU1dDbGllbnRDb25uZWN0aW9u LmNwcAppbmRleCBhOGI2MWI1MTBmOTE4MzFhZmI2MWY3MDlhYzdhOTI5ZDcwMjVkNzgzLi4yNTYx YWY3YWQ4OGQ1ZTkzMDU4OTI2YjgzYmZjNjUwNWIyZTUwY2ZjIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L1dlYlByb2Nlc3MvU3RvcmFnZS9XZWJTV0NsaWVudENvbm5lY3Rpb24uY3BwCisrKyBi L1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9TdG9yYWdlL1dlYlNXQ2xpZW50Q29ubmVjdGlvbi5j cHAKQEAgLTE5Miw5ICsxOTIsOSBAQCB2b2lkIFdlYlNXQ2xpZW50Q29ubmVjdGlvbjo6Z2V0UmVn aXN0cmF0aW9ucyhjb25zdCBTZWN1cml0eU9yaWdpbiYgdG9wT3JpZ2luLCBjbwogICAgIH0pOwog fQogCi12b2lkIFdlYlNXQ2xpZW50Q29ubmVjdGlvbjo6c3RhcnRGZXRjaCh1aW50NjRfdCBmZXRj aElkZW50aWZpZXIsIFdlYkNvcmU6OlNlcnZpY2VXb3JrZXJJZGVudGlmaWVyIHNlcnZpY2VXb3Jr ZXJJZGVudGlmaWVyLCBjb25zdCBXZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3QmIHJlcXVlc3QsIGNv bnN0IFdlYkNvcmU6OkZldGNoT3B0aW9ucyYgb3B0aW9ucywgY29uc3QgU3RyaW5nJiByZWZlcnJl cikKK3ZvaWQgV2ViU1dDbGllbnRDb25uZWN0aW9uOjpzdGFydEZldGNoKHVpbnQ2NF90IGZldGNo SWRlbnRpZmllciwgV2ViQ29yZTo6U2VydmljZVdvcmtlclJlZ2lzdHJhdGlvbklkZW50aWZpZXIg c2VydmljZVdvcmtlclJlZ2lzdHJhdGlvbklkZW50aWZpZXIsIGNvbnN0IFdlYkNvcmU6OlJlc291 cmNlUmVxdWVzdCYgcmVxdWVzdCwgY29uc3QgV2ViQ29yZTo6RmV0Y2hPcHRpb25zJiBvcHRpb25z LCBjb25zdCBTdHJpbmcmIHJlZmVycmVyKQogewotICAgIHNlbmQoTWVzc2FnZXM6OldlYlNXU2Vy dmVyQ29ubmVjdGlvbjo6U3RhcnRGZXRjaCB7IGZldGNoSWRlbnRpZmllciwgc2VydmljZVdvcmtl cklkZW50aWZpZXIsIHJlcXVlc3QsIG9wdGlvbnMsIElQQzo6Rm9ybURhdGFSZWZlcmVuY2UgeyBy ZXF1ZXN0Lmh0dHBCb2R5KCkgfSwgcmVmZXJyZXIgfSk7CisgICAgc2VuZChNZXNzYWdlczo6V2Vi U1dTZXJ2ZXJDb25uZWN0aW9uOjpTdGFydEZldGNoIHsgZmV0Y2hJZGVudGlmaWVyLCBzZXJ2aWNl V29ya2VyUmVnaXN0cmF0aW9uSWRlbnRpZmllciwgcmVxdWVzdCwgb3B0aW9ucywgSVBDOjpGb3Jt RGF0YVJlZmVyZW5jZSB7IHJlcXVlc3QuaHR0cEJvZHkoKSB9LCByZWZlcnJlciB9KTsKIH0KIAog dm9pZCBXZWJTV0NsaWVudENvbm5lY3Rpb246OnBvc3RNZXNzYWdlVG9TZXJ2aWNlV29ya2VyQ2xp ZW50KERvY3VtZW50SWRlbnRpZmllciBkZXN0aW5hdGlvbkNvbnRleHRJZGVudGlmaWVyLCBjb25z dCBJUEM6OkRhdGFSZWZlcmVuY2UmIG1lc3NhZ2UsIFNlcnZpY2VXb3JrZXJEYXRhJiYgc291cmNl LCBjb25zdCBTdHJpbmcmIHNvdXJjZU9yaWdpbikKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQv V2ViUHJvY2Vzcy9TdG9yYWdlL1dlYlNXQ2xpZW50Q29ubmVjdGlvbi5oIGIvU291cmNlL1dlYktp dC9XZWJQcm9jZXNzL1N0b3JhZ2UvV2ViU1dDbGllbnRDb25uZWN0aW9uLmgKaW5kZXggOGI2ZDk4 ZjkzZjFjM2IxNDU1MDFiZjI0ZGM3MDNiMWVlNTI2OGFmMi4uZmE5NTgxYmM2YTk2MTQ2ZDc3OGVj YmJiMWUzM2NhMWQ0M2NlYzBkNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNz L1N0b3JhZ2UvV2ViU1dDbGllbnRDb25uZWN0aW9uLmgKKysrIGIvU291cmNlL1dlYktpdC9XZWJQ cm9jZXNzL1N0b3JhZ2UvV2ViU1dDbGllbnRDb25uZWN0aW9uLmgKQEAgLTYwLDcgKzYwLDcgQEAg cHVibGljOgogICAgIHZvaWQgZGlkUmVjZWl2ZU1lc3NhZ2UoSVBDOjpDb25uZWN0aW9uJiwgSVBD OjpEZWNvZGVyJikgZmluYWw7CiAKICAgICBib29sIG1heUhhdmVTZXJ2aWNlV29ya2VyUmVnaXN0 ZXJlZEZvck9yaWdpbihjb25zdCBXZWJDb3JlOjpTZWN1cml0eU9yaWdpbiYpIGNvbnN0IGZpbmFs OwotICAgIHZvaWQgc3RhcnRGZXRjaCh1aW50NjRfdCBmZXRjaElkZW50aWZpZXIsIFdlYkNvcmU6 OlNlcnZpY2VXb3JrZXJJZGVudGlmaWVyLCBjb25zdCBXZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3Qm LCBjb25zdCBXZWJDb3JlOjpGZXRjaE9wdGlvbnMmLCBjb25zdCBTdHJpbmcmIHJlZmVycmVyKTsK KyAgICB2b2lkIHN0YXJ0RmV0Y2godWludDY0X3QgZmV0Y2hJZGVudGlmaWVyLCBXZWJDb3JlOjpT ZXJ2aWNlV29ya2VyUmVnaXN0cmF0aW9uSWRlbnRpZmllciwgY29uc3QgV2ViQ29yZTo6UmVzb3Vy Y2VSZXF1ZXN0JiwgY29uc3QgV2ViQ29yZTo6RmV0Y2hPcHRpb25zJiwgY29uc3QgU3RyaW5nJiBy ZWZlcnJlcik7CiAKICAgICB2b2lkIHBvc3RNZXNzYWdlVG9TZXJ2aWNlV29ya2VyQ2xpZW50KFdl YkNvcmU6OkRvY3VtZW50SWRlbnRpZmllciBkZXN0aW5hdGlvbkNvbnRleHRJZGVudGlmaWVyLCBj b25zdCBJUEM6OkRhdGFSZWZlcmVuY2UmIG1lc3NhZ2UsIFdlYkNvcmU6OlNlcnZpY2VXb3JrZXJE YXRhJiYgc291cmNlLCBjb25zdCBTdHJpbmcmIHNvdXJjZU9yaWdpbik7CiAKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9TdG9yYWdlL1dlYlNlcnZpY2VXb3JrZXJQcm92aWRl ci5jcHAgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvU3RvcmFnZS9XZWJTZXJ2aWNlV29ya2Vy UHJvdmlkZXIuY3BwCmluZGV4IGFmZjhjMmJiMTc4OGE2MGViNzI0NDNlMzI3NDM2NzEyMDJhNzQ5 OTYuLmQ2ODMxZWNiNDc0OGI3MjEzZjMwNmU5OWViOGQ4MmY5ODAyZWI0MDIgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9TdG9yYWdlL1dlYlNlcnZpY2VXb3JrZXJQcm92aWRl ci5jcHAKKysrIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1N0b3JhZ2UvV2ViU2VydmljZVdv cmtlclByb3ZpZGVyLmNwcApAQCAtNjcsNyArNjcsNyBAQCBzdGF0aWMgaW5saW5lIGJvb2wgc2hv dWxkSGFuZGxlRmV0Y2goY29uc3QgUmVzb3VyY2VMb2FkZXJPcHRpb25zJiBvcHRpb25zKQogICAg IGlmIChpc1BvdGVudGlhbE5hdmlnYXRpb25PclN1YnJlc291cmNlUmVxdWVzdChvcHRpb25zLmRl c3RpbmF0aW9uKSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCi0gICAgcmV0dXJuICEhb3B0aW9u cy5zZXJ2aWNlV29ya2VySWRlbnRpZmllcjsKKyAgICByZXR1cm4gISFvcHRpb25zLnNlcnZpY2VX b3JrZXJSZWdpc3RyYXRpb25JZGVudGlmaWVyOwogfQogCiB2b2lkIFdlYlNlcnZpY2VXb3JrZXJQ cm92aWRlcjo6aGFuZGxlRmV0Y2goUmVzb3VyY2VMb2FkZXImIGxvYWRlciwgQ2FjaGVkUmVzb3Vy Y2UqIHJlc291cmNlLCBQQUw6OlNlc3Npb25JRCBzZXNzaW9uSUQsIGJvb2wgc2hvdWxkQ2xlYXJS ZWZlcnJlck9uSFRUUFNUb0hUVFBSZWRpcmVjdCwgU2VydmljZVdvcmtlckNsaWVudEZldGNoOjpD YWxsYmFjayYmIGNhbGxiYWNrKQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIv TGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IDU1ZWQ5NmMyOGRhMjgzODZlMWE4NDg1MDgxNDZh Y2I2NTkzMGI4YmQuLmU1YTgzMTk1ZjllMTU3MWExZmRiOGU4ZTk0NTc4Y2IyYzQ3MDJmZWMgMTAw NjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKQEAgLTEsMyArMSwxNiBAQAorMjAxOC0wMS0xMiAgWW91ZW5uIEZhYmxldCAgPHlvdWVubkBh cHBsZS5jb20+CisKKyAgICAgICAgV2ViUHJvY2VzcyBzaG91bGQgcGFzcyB0aGUgcmVnaXN0cmF0 aW9uIGlkZW50aWZpZXIgYW5kIG5vdCB0aGUgd29ya2VyIGlkZW50aWZpZXIgZm9yIGZldGNoIGV2 ZW50cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTgx NTkxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBo dHRwL3dwdC9zZXJ2aWNlLXdvcmtlcnMvcmVzb3VyY2VzL2VtcHR5Lmh0bWw6IEFkZGVkLgorICAg ICAgICAqIGh0dHAvd3B0L3NlcnZpY2Utd29ya2Vycy91cGRhdGUtc2VydmljZS13b3JrZXIuaHR0 cHMtZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAgICAgKiBodHRwL3dwdC9zZXJ2aWNlLXdvcmtl cnMvdXBkYXRlLXNlcnZpY2Utd29ya2VyLmh0dHBzLmh0bWw6IEFkZGVkLgorICAgICAgICAqIGh0 dHAvd3B0L3NlcnZpY2Utd29ya2Vycy91cGRhdGUtd29ya2VyLnB5OiBBZGRlZC4KKyAgICAgICAg KG1haW4pOgorCiAyMDE4LTAxLTExICBZb3Vlbm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4K IAogICAgICAgICBSZWRpcmVjdGVkIGlmcmFtZSBsb2FkaW5nIHdpdGggUmVxdWVzdC5yZWRpcmVj dD1mb2xsb3cgc2hvdWxkIGZhaWwKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2h0dHAvd3B0L3Nl cnZpY2Utd29ya2Vycy9yZXNvdXJjZXMvZW1wdHkuaHRtbCBiL0xheW91dFRlc3RzL2h0dHAvd3B0 L3NlcnZpY2Utd29ya2Vycy9yZXNvdXJjZXMvZW1wdHkuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0 NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi43ODc5ZTFj ZTlmZDc3ZDRkOTAwNTQwMTM3MjVhZjUxMzdlOGVmMzFhCi0tLSAvZGV2L251bGwKKysrIGIvTGF5 b3V0VGVzdHMvaHR0cC93cHQvc2VydmljZS13b3JrZXJzL3Jlc291cmNlcy9lbXB0eS5odG1sCkBA IC0wLDAgKzEsNCBAQAorPGh0bWw+Cis8Ym9keT4KKzwvYm9keT4KKzwvaHRtbD4KZGlmZiAtLWdp dCBhL0xheW91dFRlc3RzL2h0dHAvd3B0L3NlcnZpY2Utd29ya2Vycy91cGRhdGUtc2VydmljZS13 b3JrZXIuaHR0cHMtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvaHR0cC93cHQvc2VydmljZS13 b3JrZXJzL3VwZGF0ZS1zZXJ2aWNlLXdvcmtlci5odHRwcy1leHBlY3RlZC50eHQKbmV3IGZpbGUg bW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MC4uZmIwZjVhZTY3NDJmZTY3ZGQ3ZWJjMDhlNjU1Yzc0NDkyNGRlMjFhNgotLS0gL2Rldi9udWxs CisrKyBiL0xheW91dFRlc3RzL2h0dHAvd3B0L3NlcnZpY2Utd29ya2Vycy91cGRhdGUtc2Vydmlj ZS13b3JrZXIuaHR0cHMtZXhwZWN0ZWQudHh0CkBAIC0wLDAgKzEsNCBAQAorCitQQVNTIFNldHVw IHdvcmtlciAKK1BBU1MgRW5zdXJlIGFsbCBmZXRjaGVzIGFyZSBpbnRlcmNlcHRlZCAKKwpkaWZm IC0tZ2l0IGEvTGF5b3V0VGVzdHMvaHR0cC93cHQvc2VydmljZS13b3JrZXJzL3VwZGF0ZS1zZXJ2 aWNlLXdvcmtlci5odHRwcy5odG1sIGIvTGF5b3V0VGVzdHMvaHR0cC93cHQvc2VydmljZS13b3Jr ZXJzL3VwZGF0ZS1zZXJ2aWNlLXdvcmtlci5odHRwcy5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0 CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjdkNTliMTQz NTQxMDAyZDI5YzVlMDliYWQ3NGRmNTkwNjUyNzcwYjIKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlv dXRUZXN0cy9odHRwL3dwdC9zZXJ2aWNlLXdvcmtlcnMvdXBkYXRlLXNlcnZpY2Utd29ya2VyLmh0 dHBzLmh0bWwKQEAgLTAsMCArMSw0NiBAQAorPGh0bWw+Cis8aGVhZD4KKzx0aXRsZT5TZXJ2aWNl IFdvcmtlciB1cGRhdGUgYW5kIGludGVyY2VwdGlvbjwvdGl0bGU+Cis8c2NyaXB0IHNyYz0iL3Jl c291cmNlcy90ZXN0aGFybmVzcy5qcyI+PC9zY3JpcHQ+Cis8c2NyaXB0IHNyYz0iL3Jlc291cmNl cy90ZXN0aGFybmVzc3JlcG9ydC5qcyI+PC9zY3JpcHQ+Cis8c2NyaXB0IHNyYz0iL3NlcnZpY2Ut d29ya2Vycy9zZXJ2aWNlLXdvcmtlci9yZXNvdXJjZXMvdGVzdC1oZWxwZXJzLnN1Yi5qcyI+PC9z Y3JpcHQ+Cis8L2hlYWQ+Cis8Ym9keT4KKzxzY3JpcHQ+Cit2YXIgcmVnaXN0cmF0aW9uOwordmFy IGlmcmFtZTsKK3Byb21pc2VfdGVzdChhc3luYyAodGVzdCkgPT4geworICAgIHJlZ2lzdHJhdGlv biA9IGF3YWl0IG5hdmlnYXRvci5zZXJ2aWNlV29ya2VyLmdldFJlZ2lzdHJhdGlvbigicmVzb3Vy Y2VzIik7CisgICAgaWYgKHJlZ2lzdHJhdGlvbikKKyAgICAgICAgYXdhaXQgcmVnaXN0cmF0aW9u LnVucmVnaXN0ZXIoKTsKKyAgICByZWdpc3RyYXRpb24gPSBhd2FpdCBuYXZpZ2F0b3Iuc2Vydmlj ZVdvcmtlci5yZWdpc3RlcigidXBkYXRlLXdvcmtlci5weSIsIHsgc2NvcGUgOiAicmVzb3VyY2Vz IiB9KTsKKyAgICBhY3RpdmVXb3JrZXIgPSByZWdpc3RyYXRpb24uYWN0aXZlOworICAgIGlmIChh Y3RpdmVXb3JrZXIpCisgICAgICAgIHJldHVybjsKKyAgICBhY3RpdmVXb3JrZXIgPSByZWdpc3Ry YXRpb24uaW5zdGFsbGluZzsKKyAgICBhd2FpdCBuZXcgUHJvbWlzZShyZXNvbHZlID0+IHsKKyAg ICAgICAgYWN0aXZlV29ya2VyLmFkZEV2ZW50TGlzdGVuZXIoJ3N0YXRlY2hhbmdlJywgKCkgPT4g eworICAgICAgICAgICAgaWYgKGFjdGl2ZVdvcmtlci5zdGF0ZSA9PT0gImFjdGl2YXRlZCIpCisg ICAgICAgICAgICAgICAgcmVzb2x2ZSgpOworICAgICAgICB9KTsKKyAgICB9KTsKK30sICJTZXR1 cCB3b3JrZXIiKTsKKworcHJvbWlzZV90ZXN0KGFzeW5jICh0ZXN0KSA9PiB7CisgICAgdmFyIHBy b21pc2VzID0gW107CisgICAgZm9yICh2YXIgY3B0ciA9IDA7IGNwdHIgPCAxMDsgY3B0cisrKSB7 CisgICAgICAgICBpZiAocmVnaXN0cmF0aW9uLmFjdGl2ZSkgeworICAgICAgICAgICAgcmVnaXN0 cmF0aW9uLnVwZGF0ZSgpOworICAgICAgICAgICAgdmFyIGlmcmFtZSA9IGF3YWl0IHdpdGhfaWZy YW1lKCJyZXNvdXJjZXMvZW1wdHkuaHRtbCIpOworICAgICAgICAgICAgYXdhaXQgaWZyYW1lLmNv bnRlbnRXaW5kb3cuZmV0Y2goIm1vdXNlIikudGhlbihhc3luYyAocmVzcG9uc2UpID0+IHsKKyAg ICAgICAgICAgICAgICBpZiAoYXdhaXQgcmVzcG9uc2UudGV4dCgpICE9PSAiY2F0IikKKyAgICAg ICAgICAgICAgICAgICAgcmV0dXJuIFByb21pc2UucmVqZWN0KCJub3QgY2F0Iik7CisgICAgICAg ICAgICB9KTsKKyAgICAgICAgICAgIGlmcmFtZS5yZW1vdmUoKTsKKyAgICAgICAgfQorICAgIH0K KyAgICBhd2FpdCBQcm9taXNlLmFsbChwcm9taXNlcyk7Cit9LCAiRW5zdXJlIGFsbCBmZXRjaGVz IGFyZSBpbnRlcmNlcHRlZCIpOworPC9zY3JpcHQ+Cis8L2JvZHk+Cis8L2h0bWw+CmRpZmYgLS1n aXQgYS9MYXlvdXRUZXN0cy9odHRwL3dwdC9zZXJ2aWNlLXdvcmtlcnMvdXBkYXRlLXdvcmtlci5w eSBiL0xheW91dFRlc3RzL2h0dHAvd3B0L3NlcnZpY2Utd29ya2Vycy91cGRhdGUtd29ya2VyLnB5 Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAuLjAzMTViZGU0ODA5MzIxZjVhOGRkZTUxMDRiNWVkYjEzYWU2OTE4OTQKLS0t IC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9odHRwL3dwdC9zZXJ2aWNlLXdvcmtlcnMvdXBk YXRlLXdvcmtlci5weQpAQCAtMCwwICsxLDE1IEBACitpbXBvcnQgdGltZQorCitzY3JpcHQgPSAn JycKKy8vIFRpbWUgc3RhbXA6ICVzCisvLyAoVGhpcyBlbnN1cmVzIHRoZSBzb3VyY2UgdGV4dCBp cyAqbm90KiBhIGJ5dGUtZm9yLWJ5dGUgbWF0Y2ggd2l0aCBhbnkKKy8vIHByZXZpb3VzbHktZmV0 Y2hlZCB2ZXJzaW9uIG9mIHRoaXMgc2NyaXB0LikKKworc2VsZi5hZGRFdmVudExpc3RlbmVyKCJm ZXRjaCIsIGFzeW5jIChldmVudCkgPT4geworICAgIGlmIChldmVudC5yZXF1ZXN0LnVybC5pbmRl eE9mKCJtb3VzZSIpICE9PSAtMSkKKyAgICAgICAgZXZlbnQucmVzcG9uZFdpdGgobmV3IFJlc3Bv bnNlKCJjYXQiKSk7Cit9KTsnJycKKworCitkZWYgbWFpbihyZXF1ZXN0LCByZXNwb25zZSk6Cisg IHJldHVybiBbKCdDb250ZW50LVR5cGUnLCAnYXBwbGljYXRpb24vamF2YXNjcmlwdCcpLCAoJ0Nh Y2hlLUNvbnRyb2wnLCAnbnAtY2FjaGUsIG5vLXN0b3JlJyldLCBzY3JpcHQgJSB0aW1lLnRpbWUo KQo=