169989 2017-03-22 19:04:08 -0700 Clean RTCPeerConnection.idl after bug 169978 2017-03-23 14:07:47 -0700 1 1 1 Unclassified WebKit WebCore Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 169978 1 youennf youennf achristensen commit-queue eric.carlson jonlee oldest_to_newest 1290321 0 youennf 2017-03-22 19:04:08 -0700 We can further align with the spec without implementation changes 1290322 1 305156 youennf 2017-03-22 19:06:18 -0700 Created attachment 305156 Patch 1290460 2 305200 youennf 2017-03-23 09:17:58 -0700 Created attachment 305200 Patch 1290594 3 305200 commit-queue 2017-03-23 14:07:43 -0700 Comment on attachment 305200 Patch Clearing flags on attachment: 305200 Committed r214317: <http://trac.webkit.org/changeset/214317> 1290595 4 commit-queue 2017-03-23 14:07:47 -0700 All reviewed patches have been landed. Closing bug. 305156 2017-03-22 19:06:18 -0700 2017-03-23 09:17:56 -0700 Patch bug-169989-20170322190618.patch text/plain 3512 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjE0MjUwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTY0Yjk3YmJhNjg2Y2I2 ODNlNDViYzliNjAxOTRiZThmMGY0OTMwOS4uY2JjZDg0ZDRjMGQzYTNlYzQ4NGJkNTUzY2NiYTEx ZGJiYjM3OTg4MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDE0IEBACiAyMDE3LTAzLTIyICBZb3Vl bm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KIAorICAgICAgICBDbGVhbiBSVENQZWVyQ29u bmVjdGlvbi5pZGwgYWZ0ZXIgYnVnIDE2OTk3OAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTY5OTg5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgKiBNb2R1bGVzL21lZGlhc3RyZWFtL1JUQ1BlZXJDb25uZWN0 aW9uLmlkbDogTm8gY2hhbmdlIG9mIGJlaGF2aW9yLgorCisyMDE3LTAzLTIyICBZb3Vlbm4gRmFi bGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KKwogICAgICAgICBTdXBwb3J0IFJUQ1BlZXJDb25uZWN0 aW9uU3RhdGUKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTE2OTk3OAogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFt L1JUQ1BlZXJDb25uZWN0aW9uLmlkbCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJl YW0vUlRDUGVlckNvbm5lY3Rpb24uaWRsCmluZGV4IDI0ODE3NDQ2OTIwZDI0NmNkYzgwMGIxYTE3 ZTM1ZmNlZjY2MTg1ZmQuLjYxYmFlMmM1OGZlZGMxNmY3ZGVkMTc2ZGE0ODgwNDU5OTFhMmMxMWQg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vUlRDUGVlckNv bm5lY3Rpb24uaWRsCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vUlRD UGVlckNvbm5lY3Rpb24uaWRsCkBAIC02NSw4ICs2NSw3IEBAIHR5cGVkZWYgUlRDUnRwVHJhbnNj ZWl2ZXJEaXJlY3Rpb24gUnRwVHJhbnNjZWl2ZXJEaXJlY3Rpb247CiAgICAgRXhwb3J0TWFjcm89 V0VCQ09SRV9FWFBPUlQsCiAgICAgSlNCdWlsdGluQ29uc3RydWN0b3IKIF0gaW50ZXJmYWNlIFJU Q1BlZXJDb25uZWN0aW9uIDogRXZlbnRUYXJnZXQgewotICAgIC8vIEZJWE1FIDE2OTY0NDogdXBk YXRlIENvbnN0cnVjdG9yIHRvIHRha2Ugb3B0aW9uYWwgUlRDQ29uZmlndXJhdGlvbgotICAgIC8v IFByaXZhdGUgaW5pdGlhbGl6ZXIKKyAgICAvLyBKUyBidWlsdC1pbiBjb25zdHJ1Y3RvciBoYW5k bGVzIHRoZSBvcHRpb25hbCBSVENDb25maWd1cmF0aW9uCiAgICAgW1ByaXZhdGVJZGVudGlmaWVy LCBDYWxsV2l0aD1Eb2N1bWVudCwgTWF5VGhyb3dFeGNlcHRpb25dIHZvaWQgaW5pdGlhbGl6ZVdp dGgoUlRDQ29uZmlndXJhdGlvbiBjb25maWd1cmF0aW9uKTsKIAogCkBAIC03NiwyNCArNzUsMTYg QEAgdHlwZWRlZiBSVENSdHBUcmFuc2NlaXZlckRpcmVjdGlvbiBSdHBUcmFuc2NlaXZlckRpcmVj dGlvbjsKICAgICBbSlNCdWlsdGluXSBQcm9taXNlPFJUQ1Nlc3Npb25EZXNjcmlwdGlvbkluaXQ+ IGNyZWF0ZUFuc3dlcihvcHRpb25hbCBSVENBbnN3ZXJPcHRpb25zIGFuc3dlck9wdGlvbnMpOwog CiAgICAgW0pTQnVpbHRpbl0gUHJvbWlzZTx2b2lkPiBzZXRMb2NhbERlc2NyaXB0aW9uKFJUQ1Nl c3Npb25EZXNjcmlwdGlvbkluaXQgZGVzY3JpcHRpb24pOwotICAgIC8vIEZJWE1FIDE2OTY0NDog Y2hhbmdlIHRvIG51bGxhYmxlCi0gICAgcmVhZG9ubHkgYXR0cmlidXRlIFJUQ1Nlc3Npb25EZXNj cmlwdGlvbiBsb2NhbERlc2NyaXB0aW9uOwotICAgIC8vIEZJWE1FIDE2OTY0NDogY2hhbmdlIHRv IG51bGxhYmxlCi0gICAgcmVhZG9ubHkgYXR0cmlidXRlIFJUQ1Nlc3Npb25EZXNjcmlwdGlvbiBj dXJyZW50TG9jYWxEZXNjcmlwdGlvbjsKLSAgICAvLyBGSVhNRSAxNjk2NDQ6IGNoYW5nZSB0byBu dWxsYWJsZQotICAgIHJlYWRvbmx5IGF0dHJpYnV0ZSBSVENTZXNzaW9uRGVzY3JpcHRpb24gcGVu ZGluZ0xvY2FsRGVzY3JpcHRpb247Ci0KLSAgICAvLyBGSVhNRSAxNjk2NDQ6IGNoYW5nZSB0byBS VENTZXNzaW9uRGVzY3JpcHRpb25Jbml0Ci0gICAgW0pTQnVpbHRpbl0gUHJvbWlzZTx2b2lkPiBz ZXRSZW1vdGVEZXNjcmlwdGlvbihSVENTZXNzaW9uRGVzY3JpcHRpb24gZGVzY3JpcHRpb24pOwot ICAgIC8vIEZJWE1FIDE2OTY0NDogY2hhbmdlIHRvIG51bGxhYmxlCi0gICAgcmVhZG9ubHkgYXR0 cmlidXRlIFJUQ1Nlc3Npb25EZXNjcmlwdGlvbiByZW1vdGVEZXNjcmlwdGlvbjsKLSAgICAvLyBG SVhNRSAxNjk2NDQ6IGNoYW5nZSB0byBudWxsYWJsZQotICAgIHJlYWRvbmx5IGF0dHJpYnV0ZSBS VENTZXNzaW9uRGVzY3JpcHRpb24gY3VycmVudFJlbW90ZURlc2NyaXB0aW9uOwotICAgIC8vIEZJ WE1FIDE2OTY0NDogY2hhbmdlIHRvIG51bGxhYmxlCi0gICAgcmVhZG9ubHkgYXR0cmlidXRlIFJU Q1Nlc3Npb25EZXNjcmlwdGlvbiBwZW5kaW5nUmVtb3RlRGVzY3JpcHRpb247Ci0KLSAgICAvLyBG SVhNRSAxNjk2NDQ6IHVwZGF0ZSBwYXJhbWV0ZXIgdG8gKFJUQ0ljZUNhbmRpZGF0ZUluaXQgb3Ig UlRDSWNlQ2FuZGlkYXRlKQotICAgIFtKU0J1aWx0aW5dIFByb21pc2U8dm9pZD4gYWRkSWNlQ2Fu ZGlkYXRlKFJUQ0ljZUNhbmRpZGF0ZSBjYW5kaWRhdGUpOworICAgIHJlYWRvbmx5IGF0dHJpYnV0 ZSBSVENTZXNzaW9uRGVzY3JpcHRpb24/IGxvY2FsRGVzY3JpcHRpb247CisgICAgcmVhZG9ubHkg YXR0cmlidXRlIFJUQ1Nlc3Npb25EZXNjcmlwdGlvbj8gY3VycmVudExvY2FsRGVzY3JpcHRpb247 CisgICAgcmVhZG9ubHkgYXR0cmlidXRlIFJUQ1Nlc3Npb25EZXNjcmlwdGlvbj8gcGVuZGluZ0xv Y2FsRGVzY3JpcHRpb247CisKKyAgICBbSlNCdWlsdGluXSBQcm9taXNlPHZvaWQ+IHNldFJlbW90 ZURlc2NyaXB0aW9uKFJUQ1Nlc3Npb25EZXNjcmlwdGlvbkluaXQgZGVzY3JpcHRpb24pOworICAg IHJlYWRvbmx5IGF0dHJpYnV0ZSBSVENTZXNzaW9uRGVzY3JpcHRpb24/IHJlbW90ZURlc2NyaXB0 aW9uOworICAgIHJlYWRvbmx5IGF0dHJpYnV0ZSBSVENTZXNzaW9uRGVzY3JpcHRpb24/IGN1cnJl bnRSZW1vdGVEZXNjcmlwdGlvbjsKKyAgICByZWFkb25seSBhdHRyaWJ1dGUgUlRDU2Vzc2lvbkRl c2NyaXB0aW9uPyBwZW5kaW5nUmVtb3RlRGVzY3JpcHRpb247CisKKyAgICBbSlNCdWlsdGluXSBQ cm9taXNlPHZvaWQ+IGFkZEljZUNhbmRpZGF0ZSgoUlRDSWNlQ2FuZGlkYXRlSW5pdCBvciBSVENJ Y2VDYW5kaWRhdGUpIGNhbmRpZGF0ZSk7CiAKICAgICByZWFkb25seSBhdHRyaWJ1dGUgUlRDU2ln bmFsaW5nU3RhdGUgc2lnbmFsaW5nU3RhdGU7CiAgICAgcmVhZG9ubHkgYXR0cmlidXRlIFJUQ0lj ZUdhdGhlcmluZ1N0YXRlIGljZUdhdGhlcmluZ1N0YXRlOwo= 305200 2017-03-23 09:17:58 -0700 2017-03-23 14:07:43 -0700 Patch bug-169989-20170323091758.patch text/plain 13967 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjE0MjUwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTY0Yjk3YmJhNjg2Y2I2 ODNlNDViYzliNjAxOTRiZThmMGY0OTMwOS4uMjhjOWZlYTkwZGFkODFlNmRmYWE2NDFjZDBlNDAz NTBjMjEyYzk4OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDE3LTAzLTIzICBZb3Vl bm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KKworICAgICAgICBDbGVhbiBSVENQZWVyQ29u bmVjdGlvbi5pZGwgYWZ0ZXIgYnVnIDE2OTk3OAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTY5OTg5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgTm8gY2hhbmdlIG9mIGJlaGF2aW9yLgorICAgICAgICBNb3Zp bmcgYWRkVHJhbnNjZWl2ZXIgdG8gb3ZlcmxvYWRlZCBtZXRob2QgdG8gdW5pb24gdHlwZSB0byBt YXRjaCBzcGVjLgorICAgICAgICBSZWZhY3RvcmluZyBSVENSdHBTZW5kZXIgdG8gdGFrZSBhIFN0 cmluZyYmLgorCisgICAgICAgICogTW9kdWxlcy9tZWRpYXN0cmVhbS9NZWRpYUVuZHBvaW50UGVl ckNvbm5lY3Rpb24uY3BwOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFFbmRwb2ludFBlZXJDb25u ZWN0aW9uOjpzZXRSZW1vdGVEZXNjcmlwdGlvblRhc2spOgorICAgICAgICAqIE1vZHVsZXMvbWVk aWFzdHJlYW0vUlRDUGVlckNvbm5lY3Rpb24uY3BwOgorICAgICAgICAoV2ViQ29yZTo6UlRDUGVl ckNvbm5lY3Rpb246OmFkZFRyYW5zY2VpdmVyKToKKyAgICAgICAgKFdlYkNvcmU6OlJUQ1BlZXJD b25uZWN0aW9uOjpjb21wbGV0ZUFkZFRyYW5zY2VpdmVyKToKKyAgICAgICAgKiBNb2R1bGVzL21l ZGlhc3RyZWFtL1JUQ1BlZXJDb25uZWN0aW9uLmg6CisgICAgICAgICogTW9kdWxlcy9tZWRpYXN0 cmVhbS9SVENQZWVyQ29ubmVjdGlvbi5pZGw6IENvc21ldGljIGNoYW5nZXMgZXhjZXB0IGZvciBh ZGRUcmFuc2NlaXZlci4KKyAgICAgICAgKiBNb2R1bGVzL21lZGlhc3RyZWFtL1JUQ1J0cFNlbmRl ci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSVENSdHBTZW5kZXI6OmNyZWF0ZSk6CisgICAgICAg IChXZWJDb3JlOjpSVENSdHBTZW5kZXI6OlJUQ1J0cFNlbmRlcik6CisgICAgICAgICogTW9kdWxl cy9tZWRpYXN0cmVhbS9SVENSdHBTZW5kZXIuaDoKKwogMjAxNy0wMy0yMiAgWW91ZW5uIEZhYmxl dCAgPHlvdWVubkBhcHBsZS5jb20+CiAKICAgICAgICAgU3VwcG9ydCBSVENQZWVyQ29ubmVjdGlv blN0YXRlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL01l ZGlhRW5kcG9pbnRQZWVyQ29ubmVjdGlvbi5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21l ZGlhc3RyZWFtL01lZGlhRW5kcG9pbnRQZWVyQ29ubmVjdGlvbi5jcHAKaW5kZXggODE2OGVlZDU4 ZmVmNTdmZTk5ZjQ1M2Y3NzY5Y2UwNTVmMmY3ODcyMy4uZDc1MDk1MDM5YTE0YmY3MGVhMWI5OGI1 MWIzYjI3ODJlZDRhMGI4OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRp YXN0cmVhbS9NZWRpYUVuZHBvaW50UGVlckNvbm5lY3Rpb24uY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vTWVkaWFFbmRwb2ludFBlZXJDb25uZWN0aW9uLmNwcApA QCAtNTAwLDcgKzUwMCw3IEBAIHZvaWQgTWVkaWFFbmRwb2ludFBlZXJDb25uZWN0aW9uOjpzZXRS ZW1vdGVEZXNjcmlwdGlvblRhc2soUmVmUHRyPFJUQ1Nlc3Npb25EZXNjCiAgICAgICAgICAgICB9 CiAKICAgICAgICAgICAgIGlmICghdHJhbnNjZWl2ZXIpIHsKLSAgICAgICAgICAgICAgICBhdXRv IHNlbmRlciA9IFJUQ1J0cFNlbmRlcjo6Y3JlYXRlKG1lZGlhRGVzY3JpcHRpb24udHlwZSwgVmVj dG9yPFN0cmluZz4oKSwgbV9wZWVyQ29ubmVjdGlvbi5zZW5kZXJDbGllbnQoKSk7CisgICAgICAg ICAgICAgICAgYXV0byBzZW5kZXIgPSBSVENSdHBTZW5kZXI6OmNyZWF0ZShTdHJpbmcobWVkaWFE ZXNjcmlwdGlvbi50eXBlKSwgVmVjdG9yPFN0cmluZz4oKSwgbV9wZWVyQ29ubmVjdGlvbi5zZW5k ZXJDbGllbnQoKSk7CiAgICAgICAgICAgICAgICAgYXV0byByZWNlaXZlciA9IGNyZWF0ZVJlY2Vp dmVyKG1lZGlhRGVzY3JpcHRpb24ubWlkLCBtZWRpYURlc2NyaXB0aW9uLnR5cGUsIG1lZGlhRGVz Y3JpcHRpb24ubWVkaWFTdHJlYW1UcmFja0lkKTsKIAogICAgICAgICAgICAgICAgIGF1dG8gbmV3 VHJhbnNjZWl2ZXIgPSBSVENSdHBUcmFuc2NlaXZlcjo6Y3JlYXRlKFdURk1vdmUoc2VuZGVyKSwg V1RGTW92ZShyZWNlaXZlcikpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9t ZWRpYXN0cmVhbS9SVENQZWVyQ29ubmVjdGlvbi5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVz L21lZGlhc3RyZWFtL1JUQ1BlZXJDb25uZWN0aW9uLmNwcAppbmRleCAwNmY5ODg5MjdjOWM3MzY5 Njk2ZGVhYzRlZWJkYjM3M2Q4YjNiNGVkLi4xMmVmMTI3ODYzZDhhZjc4ZTBmYzY2Mjk0MzFjN2Y0 ZTFlZGJiOGUxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFt L1JUQ1BlZXJDb25uZWN0aW9uLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlh c3RyZWFtL1JUQ1BlZXJDb25uZWN0aW9uLmNwcApAQCAtMTcxLDUwICsxNzEsMzcgQEAgRXhjZXB0 aW9uT3I8dm9pZD4gUlRDUGVlckNvbm5lY3Rpb246OnJlbW92ZVRyYWNrKFJUQ1J0cFNlbmRlciYg c2VuZGVyKQogICAgIHJldHVybiB7IH07CiB9CiAKLUV4Y2VwdGlvbk9yPFJlZjxSVENSdHBUcmFu c2NlaXZlcj4+IFJUQ1BlZXJDb25uZWN0aW9uOjphZGRUcmFuc2NlaXZlcihSZWY8TWVkaWFTdHJl YW1UcmFjaz4mJiB0cmFjaywgY29uc3QgUlRDUnRwVHJhbnNjZWl2ZXJJbml0JiBpbml0KQorRXhj ZXB0aW9uT3I8UmVmPFJUQ1J0cFRyYW5zY2VpdmVyPj4gUlRDUGVlckNvbm5lY3Rpb246OmFkZFRy YW5zY2VpdmVyKEFkZFRyYW5zY2VpdmVyVHJhY2tPcktpbmQmJiB3aXRoVHJhY2ssIGNvbnN0IFJU Q1J0cFRyYW5zY2VpdmVySW5pdCYgaW5pdCkKIHsKLSAgICBpZiAobV9zaWduYWxpbmdTdGF0ZSA9 PSBSVENTaWduYWxpbmdTdGF0ZTo6Q2xvc2VkKQotICAgICAgICByZXR1cm4gRXhjZXB0aW9uIHsg SU5WQUxJRF9TVEFURV9FUlIgfTsKKyAgICBpZiAoV1RGOjpob2xkc19hbHRlcm5hdGl2ZTxTdHJp bmc+KHdpdGhUcmFjaykpIHsKKyAgICAgICAgY29uc3QgU3RyaW5nJiBraW5kID0gV1RGOjpnZXQ8 U3RyaW5nPih3aXRoVHJhY2spOworICAgICAgICBpZiAoa2luZCAhPSAiYXVkaW8iICYmIGtpbmQg IT0gInZpZGVvIikKKyAgICAgICAgICAgIHJldHVybiBFeGNlcHRpb24geyBUeXBlRXJyb3IgfTsK IAotICAgIFN0cmluZyB0cmFuc2NlaXZlck1pZCA9IFJUQ1J0cFRyYW5zY2VpdmVyOjpnZXROZXh0 TWlkKCk7Ci0gICAgY29uc3QgU3RyaW5nJiB0cmFja0tpbmQgPSB0cmFjay0+a2luZCgpOworICAg ICAgICBhdXRvIHNlbmRlciA9IFJUQ1J0cFNlbmRlcjo6Y3JlYXRlKFN0cmluZyhraW5kKSwgVmVj dG9yPFN0cmluZz4oKSwgKnRoaXMpOworICAgICAgICByZXR1cm4gY29tcGxldGVBZGRUcmFuc2Nl aXZlcihXVEZNb3ZlKHNlbmRlciksIGluaXQsIGNyZWF0ZUNhbm9uaWNhbFVVSURTdHJpbmcoKSwg a2luZCk7CisgICAgfQorCisgICAgUmVmPE1lZGlhU3RyZWFtVHJhY2s+IHRyYWNrID0gV1RGOjpn ZXQ8UmVmUHRyPE1lZGlhU3RyZWFtVHJhY2s+Pih3aXRoVHJhY2spLnJlbGVhc2VOb25OdWxsKCk7 CiAgICAgY29uc3QgU3RyaW5nJiB0cmFja0lkID0gdHJhY2stPmlkKCk7CisgICAgY29uc3QgU3Ry aW5nJiB0cmFja0tpbmQgPSB0cmFjay0+a2luZCgpOwogCiAgICAgYXV0byBzZW5kZXIgPSBSVENS dHBTZW5kZXI6OmNyZWF0ZShXVEZNb3ZlKHRyYWNrKSwgVmVjdG9yPFN0cmluZz4oKSwgKnRoaXMp OwotICAgIGF1dG8gcmVjZWl2ZXIgPSBtX2JhY2tlbmQtPmNyZWF0ZVJlY2VpdmVyKHRyYW5zY2Vp dmVyTWlkLCB0cmFja0tpbmQsIHRyYWNrSWQpOwotICAgIGF1dG8gdHJhbnNjZWl2ZXIgPSBSVENS dHBUcmFuc2NlaXZlcjo6Y3JlYXRlKFdURk1vdmUoc2VuZGVyKSwgV1RGTW92ZShyZWNlaXZlcikp OwotICAgIHRyYW5zY2VpdmVyLT5zZXRQcm92aXNpb25hbE1pZCh0cmFuc2NlaXZlck1pZCk7Ci0K LSAgICBjb21wbGV0ZUFkZFRyYW5zY2VpdmVyKHRyYW5zY2VpdmVyLCBpbml0KTsKLSAgICByZXR1 cm4gV1RGTW92ZSh0cmFuc2NlaXZlcik7CisgICAgcmV0dXJuIGNvbXBsZXRlQWRkVHJhbnNjZWl2 ZXIoV1RGTW92ZShzZW5kZXIpLCBpbml0LCB0cmFja0lkLCB0cmFja0tpbmQpOwogfQogCi1FeGNl cHRpb25PcjxSZWY8UlRDUnRwVHJhbnNjZWl2ZXI+PiBSVENQZWVyQ29ubmVjdGlvbjo6YWRkVHJh bnNjZWl2ZXIoY29uc3QgU3RyaW5nJiBraW5kLCBjb25zdCBSVENSdHBUcmFuc2NlaXZlckluaXQm IGluaXQpCitSZWY8UlRDUnRwVHJhbnNjZWl2ZXI+IFJUQ1BlZXJDb25uZWN0aW9uOjpjb21wbGV0 ZUFkZFRyYW5zY2VpdmVyKFJlZjxSVENSdHBTZW5kZXI+JiYgc2VuZGVyLCBjb25zdCBSVENSdHBU cmFuc2NlaXZlckluaXQmIGluaXQsIGNvbnN0IFN0cmluZyYgdHJhY2tJZCwgY29uc3QgU3RyaW5n JiB0cmFja0tpbmQpCiB7Ci0gICAgaWYgKG1fc2lnbmFsaW5nU3RhdGUgPT0gUlRDU2lnbmFsaW5n U3RhdGU6OkNsb3NlZCkKLSAgICAgICAgcmV0dXJuIEV4Y2VwdGlvbiB7IElOVkFMSURfU1RBVEVf RVJSIH07Ci0KLSAgICBpZiAoa2luZCAhPSAiYXVkaW8iICYmIGtpbmQgIT0gInZpZGVvIikKLSAg ICAgICAgcmV0dXJuIEV4Y2VwdGlvbiB7IFR5cGVFcnJvciB9OwotCiAgICAgU3RyaW5nIHRyYW5z Y2VpdmVyTWlkID0gUlRDUnRwVHJhbnNjZWl2ZXI6OmdldE5leHRNaWQoKTsKLSAgICBTdHJpbmcg dHJhY2tJZCA9IGNyZWF0ZUNhbm9uaWNhbFVVSURTdHJpbmcoKTsKKyAgICBhdXRvIHRyYW5zY2Vp dmVyID0gUlRDUnRwVHJhbnNjZWl2ZXI6OmNyZWF0ZShXVEZNb3ZlKHNlbmRlciksIG1fYmFja2Vu ZC0+Y3JlYXRlUmVjZWl2ZXIodHJhbnNjZWl2ZXJNaWQsIHRyYWNrS2luZCwgdHJhY2tJZCkpOwog Ci0gICAgYXV0byBzZW5kZXIgPSBSVENSdHBTZW5kZXI6OmNyZWF0ZShraW5kLCBWZWN0b3I8U3Ry aW5nPigpLCAqdGhpcyk7Ci0gICAgYXV0byByZWNlaXZlciA9IG1fYmFja2VuZC0+Y3JlYXRlUmVj ZWl2ZXIodHJhbnNjZWl2ZXJNaWQsIGtpbmQsIHRyYWNrSWQpOwotICAgIGF1dG8gdHJhbnNjZWl2 ZXIgPSBSVENSdHBUcmFuc2NlaXZlcjo6Y3JlYXRlKFdURk1vdmUoc2VuZGVyKSwgV1RGTW92ZShy ZWNlaXZlcikpOwogICAgIHRyYW5zY2VpdmVyLT5zZXRQcm92aXNpb25hbE1pZCh0cmFuc2NlaXZl ck1pZCk7CisgICAgdHJhbnNjZWl2ZXItPnNldERpcmVjdGlvbihpbml0LmRpcmVjdGlvbik7CiAK LSAgICBjb21wbGV0ZUFkZFRyYW5zY2VpdmVyKHRyYW5zY2VpdmVyLCBpbml0KTsKLSAgICByZXR1 cm4gV1RGTW92ZSh0cmFuc2NlaXZlcik7Ci19Ci0KLXZvaWQgUlRDUGVlckNvbm5lY3Rpb246OmNv bXBsZXRlQWRkVHJhbnNjZWl2ZXIoUlRDUnRwVHJhbnNjZWl2ZXImIHRyYW5zY2VpdmVyLCBjb25z dCBSVENSdHBUcmFuc2NlaXZlckluaXQmIGluaXQpCi17Ci0gICAgdHJhbnNjZWl2ZXIuc2V0RGly ZWN0aW9uKGluaXQuZGlyZWN0aW9uKTsKLQotICAgIG1fdHJhbnNjZWl2ZXJTZXQtPmFwcGVuZCh0 cmFuc2NlaXZlcik7CisgICAgbV90cmFuc2NlaXZlclNldC0+YXBwZW5kKHRyYW5zY2VpdmVyLmNv cHlSZWYoKSk7CiAgICAgbV9iYWNrZW5kLT5tYXJrQXNOZWVkaW5nTmVnb3RpYXRpb24oKTsKKwor ICAgIHJldHVybiB0cmFuc2NlaXZlcjsKIH0KIAogdm9pZCBSVENQZWVyQ29ubmVjdGlvbjo6cXVl dWVkQ3JlYXRlT2ZmZXIoUlRDT2ZmZXJPcHRpb25zJiYgb3B0aW9ucywgU2Vzc2lvbkRlc2NyaXB0 aW9uUHJvbWlzZSYmIHByb21pc2UpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVz L21lZGlhc3RyZWFtL1JUQ1BlZXJDb25uZWN0aW9uLmggYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVz L21lZGlhc3RyZWFtL1JUQ1BlZXJDb25uZWN0aW9uLmgKaW5kZXggODYzNzYzZmFiODYyMWMzN2Yx NTdkNzUzNmM2ZjA2NGM0ZGQ3ZDU3Zi4uNzhkMWEwNDdhYzc4MzgwNWExOWZjOGNmNGE1Mzk1ODZm NWY0NzA4NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9S VENQZWVyQ29ubmVjdGlvbi5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJl YW0vUlRDUGVlckNvbm5lY3Rpb24uaApAQCAtMTA0LDggKzEwNCw4IEBAIHB1YmxpYzoKICAgICBF eGNlcHRpb25PcjxSZWY8UlRDUnRwU2VuZGVyPj4gYWRkVHJhY2soUmVmPE1lZGlhU3RyZWFtVHJh Y2s+JiYsIGNvbnN0IFZlY3RvcjxzdGQ6OnJlZmVyZW5jZV93cmFwcGVyPE1lZGlhU3RyZWFtPj4m KTsKICAgICBFeGNlcHRpb25Pcjx2b2lkPiByZW1vdmVUcmFjayhSVENSdHBTZW5kZXImKTsKIAot ICAgIEV4Y2VwdGlvbk9yPFJlZjxSVENSdHBUcmFuc2NlaXZlcj4+IGFkZFRyYW5zY2VpdmVyKFJl ZjxNZWRpYVN0cmVhbVRyYWNrPiYmLCBjb25zdCBSVENSdHBUcmFuc2NlaXZlckluaXQmKTsKLSAg ICBFeGNlcHRpb25PcjxSZWY8UlRDUnRwVHJhbnNjZWl2ZXI+PiBhZGRUcmFuc2NlaXZlcihjb25z dCBTdHJpbmcmIGtpbmQsIGNvbnN0IFJUQ1J0cFRyYW5zY2VpdmVySW5pdCYpOworICAgIHVzaW5n IEFkZFRyYW5zY2VpdmVyVHJhY2tPcktpbmQgPSBWYXJpYW50PFJlZlB0cjxNZWRpYVN0cmVhbVRy YWNrPiwgU3RyaW5nPjsKKyAgICBFeGNlcHRpb25PcjxSZWY8UlRDUnRwVHJhbnNjZWl2ZXI+PiBh ZGRUcmFuc2NlaXZlcihBZGRUcmFuc2NlaXZlclRyYWNrT3JLaW5kJiYsIGNvbnN0IFJUQ1J0cFRy YW5zY2VpdmVySW5pdCYpOwogCiAgICAgLy8gNi4xIFBlZXItdG8tcGVlciBkYXRhIEFQSQogICAg IEV4Y2VwdGlvbk9yPFJlZjxSVENEYXRhQ2hhbm5lbD4+IGNyZWF0ZURhdGFDaGFubmVsKFNjcmlw dEV4ZWN1dGlvbkNvbnRleHQmLCBTdHJpbmcmJiwgUlRDRGF0YUNoYW5uZWxJbml0JiYpOwpAQCAt MTQzLDcgKzE0Myw3IEBAIHB1YmxpYzoKIHByaXZhdGU6CiAgICAgUlRDUGVlckNvbm5lY3Rpb24o U2NyaXB0RXhlY3V0aW9uQ29udGV4dCYpOwogCi0gICAgdm9pZCBjb21wbGV0ZUFkZFRyYW5zY2Vp dmVyKFJUQ1J0cFRyYW5zY2VpdmVyJiwgY29uc3QgUlRDUnRwVHJhbnNjZWl2ZXJJbml0Jik7Cisg ICAgUmVmPFJUQ1J0cFRyYW5zY2VpdmVyPiBjb21wbGV0ZUFkZFRyYW5zY2VpdmVyKFJlZjxSVENS dHBTZW5kZXI+JiYsIGNvbnN0IFJUQ1J0cFRyYW5zY2VpdmVySW5pdCYsIGNvbnN0IFN0cmluZyYg dHJhY2tJZCwgY29uc3QgU3RyaW5nJiB0cmFja0tpbmQpOwogCiAgICAgUlRDQ29udHJvbGxlciYg cnRjQ29udHJvbGxlcigpOwogICAgIHZvaWQgcmVnaXN0ZXJUb0NvbnRyb2xsZXIoKTsKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vUlRDUGVlckNvbm5lY3Rp b24uaWRsIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9SVENQZWVyQ29ubmVj dGlvbi5pZGwKaW5kZXggMjQ4MTc0NDY5MjBkMjQ2Y2RjODAwYjFhMTdlMzVmY2VmNjYxODVmZC4u MDkxNDA3ZDQzYmNjNDU1OWZjMzA0YTkyMWJlOTlhMTc4YzA2Y2RjNSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9SVENQZWVyQ29ubmVjdGlvbi5pZGwKKysr IGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9SVENQZWVyQ29ubmVjdGlvbi5p ZGwKQEAgLTY1LDggKzY1LDcgQEAgdHlwZWRlZiBSVENSdHBUcmFuc2NlaXZlckRpcmVjdGlvbiBS dHBUcmFuc2NlaXZlckRpcmVjdGlvbjsKICAgICBFeHBvcnRNYWNybz1XRUJDT1JFX0VYUE9SVCwK ICAgICBKU0J1aWx0aW5Db25zdHJ1Y3RvcgogXSBpbnRlcmZhY2UgUlRDUGVlckNvbm5lY3Rpb24g OiBFdmVudFRhcmdldCB7Ci0gICAgLy8gRklYTUUgMTY5NjQ0OiB1cGRhdGUgQ29uc3RydWN0b3Ig dG8gdGFrZSBvcHRpb25hbCBSVENDb25maWd1cmF0aW9uCi0gICAgLy8gUHJpdmF0ZSBpbml0aWFs aXplcgorICAgIC8vIEpTIGJ1aWx0LWluIGNvbnN0cnVjdG9yIGhhbmRsZXMgdGhlIG9wdGlvbmFs IFJUQ0NvbmZpZ3VyYXRpb24KICAgICBbUHJpdmF0ZUlkZW50aWZpZXIsIENhbGxXaXRoPURvY3Vt ZW50LCBNYXlUaHJvd0V4Y2VwdGlvbl0gdm9pZCBpbml0aWFsaXplV2l0aChSVENDb25maWd1cmF0 aW9uIGNvbmZpZ3VyYXRpb24pOwogCiAKQEAgLTc2LDI0ICs3NSwxNiBAQCB0eXBlZGVmIFJUQ1J0 cFRyYW5zY2VpdmVyRGlyZWN0aW9uIFJ0cFRyYW5zY2VpdmVyRGlyZWN0aW9uOwogICAgIFtKU0J1 aWx0aW5dIFByb21pc2U8UlRDU2Vzc2lvbkRlc2NyaXB0aW9uSW5pdD4gY3JlYXRlQW5zd2VyKG9w dGlvbmFsIFJUQ0Fuc3dlck9wdGlvbnMgYW5zd2VyT3B0aW9ucyk7CiAKICAgICBbSlNCdWlsdGlu XSBQcm9taXNlPHZvaWQ+IHNldExvY2FsRGVzY3JpcHRpb24oUlRDU2Vzc2lvbkRlc2NyaXB0aW9u SW5pdCBkZXNjcmlwdGlvbik7Ci0gICAgLy8gRklYTUUgMTY5NjQ0OiBjaGFuZ2UgdG8gbnVsbGFi bGUKLSAgICByZWFkb25seSBhdHRyaWJ1dGUgUlRDU2Vzc2lvbkRlc2NyaXB0aW9uIGxvY2FsRGVz Y3JpcHRpb247Ci0gICAgLy8gRklYTUUgMTY5NjQ0OiBjaGFuZ2UgdG8gbnVsbGFibGUKLSAgICBy ZWFkb25seSBhdHRyaWJ1dGUgUlRDU2Vzc2lvbkRlc2NyaXB0aW9uIGN1cnJlbnRMb2NhbERlc2Ny aXB0aW9uOwotICAgIC8vIEZJWE1FIDE2OTY0NDogY2hhbmdlIHRvIG51bGxhYmxlCi0gICAgcmVh ZG9ubHkgYXR0cmlidXRlIFJUQ1Nlc3Npb25EZXNjcmlwdGlvbiBwZW5kaW5nTG9jYWxEZXNjcmlw dGlvbjsKLQotICAgIC8vIEZJWE1FIDE2OTY0NDogY2hhbmdlIHRvIFJUQ1Nlc3Npb25EZXNjcmlw dGlvbkluaXQKLSAgICBbSlNCdWlsdGluXSBQcm9taXNlPHZvaWQ+IHNldFJlbW90ZURlc2NyaXB0 aW9uKFJUQ1Nlc3Npb25EZXNjcmlwdGlvbiBkZXNjcmlwdGlvbik7Ci0gICAgLy8gRklYTUUgMTY5 NjQ0OiBjaGFuZ2UgdG8gbnVsbGFibGUKLSAgICByZWFkb25seSBhdHRyaWJ1dGUgUlRDU2Vzc2lv bkRlc2NyaXB0aW9uIHJlbW90ZURlc2NyaXB0aW9uOwotICAgIC8vIEZJWE1FIDE2OTY0NDogY2hh bmdlIHRvIG51bGxhYmxlCi0gICAgcmVhZG9ubHkgYXR0cmlidXRlIFJUQ1Nlc3Npb25EZXNjcmlw dGlvbiBjdXJyZW50UmVtb3RlRGVzY3JpcHRpb247Ci0gICAgLy8gRklYTUUgMTY5NjQ0OiBjaGFu Z2UgdG8gbnVsbGFibGUKLSAgICByZWFkb25seSBhdHRyaWJ1dGUgUlRDU2Vzc2lvbkRlc2NyaXB0 aW9uIHBlbmRpbmdSZW1vdGVEZXNjcmlwdGlvbjsKLQotICAgIC8vIEZJWE1FIDE2OTY0NDogdXBk YXRlIHBhcmFtZXRlciB0byAoUlRDSWNlQ2FuZGlkYXRlSW5pdCBvciBSVENJY2VDYW5kaWRhdGUp Ci0gICAgW0pTQnVpbHRpbl0gUHJvbWlzZTx2b2lkPiBhZGRJY2VDYW5kaWRhdGUoUlRDSWNlQ2Fu ZGlkYXRlIGNhbmRpZGF0ZSk7CisgICAgcmVhZG9ubHkgYXR0cmlidXRlIFJUQ1Nlc3Npb25EZXNj cmlwdGlvbj8gbG9jYWxEZXNjcmlwdGlvbjsKKyAgICByZWFkb25seSBhdHRyaWJ1dGUgUlRDU2Vz c2lvbkRlc2NyaXB0aW9uPyBjdXJyZW50TG9jYWxEZXNjcmlwdGlvbjsKKyAgICByZWFkb25seSBh dHRyaWJ1dGUgUlRDU2Vzc2lvbkRlc2NyaXB0aW9uPyBwZW5kaW5nTG9jYWxEZXNjcmlwdGlvbjsK KworICAgIFtKU0J1aWx0aW5dIFByb21pc2U8dm9pZD4gc2V0UmVtb3RlRGVzY3JpcHRpb24oUlRD U2Vzc2lvbkRlc2NyaXB0aW9uSW5pdCBkZXNjcmlwdGlvbik7CisgICAgcmVhZG9ubHkgYXR0cmli dXRlIFJUQ1Nlc3Npb25EZXNjcmlwdGlvbj8gcmVtb3RlRGVzY3JpcHRpb247CisgICAgcmVhZG9u bHkgYXR0cmlidXRlIFJUQ1Nlc3Npb25EZXNjcmlwdGlvbj8gY3VycmVudFJlbW90ZURlc2NyaXB0 aW9uOworICAgIHJlYWRvbmx5IGF0dHJpYnV0ZSBSVENTZXNzaW9uRGVzY3JpcHRpb24/IHBlbmRp bmdSZW1vdGVEZXNjcmlwdGlvbjsKKworICAgIFtKU0J1aWx0aW5dIFByb21pc2U8dm9pZD4gYWRk SWNlQ2FuZGlkYXRlKChSVENJY2VDYW5kaWRhdGVJbml0IG9yIFJUQ0ljZUNhbmRpZGF0ZSkgY2Fu ZGlkYXRlKTsKIAogICAgIHJlYWRvbmx5IGF0dHJpYnV0ZSBSVENTaWduYWxpbmdTdGF0ZSBzaWdu YWxpbmdTdGF0ZTsKICAgICByZWFkb25seSBhdHRyaWJ1dGUgUlRDSWNlR2F0aGVyaW5nU3RhdGUg aWNlR2F0aGVyaW5nU3RhdGU7CkBAIC0xMzYsOCArMTI3LDcgQEAgdHlwZWRlZiBSVENSdHBUcmFu c2NlaXZlckRpcmVjdGlvbiBSdHBUcmFuc2NlaXZlckRpcmVjdGlvbjsKICAgICBbUHJpdmF0ZUlk ZW50aWZpZXIsIFB1YmxpY0lkZW50aWZpZXIsIE1heVRocm93RXhjZXB0aW9uXSBSVENSdHBTZW5k ZXIgYWRkVHJhY2soTWVkaWFTdHJlYW1UcmFjayB0cmFjaywgTWVkaWFTdHJlYW0uLi4gc3RyZWFt cyk7CiAgICAgW1ByaXZhdGVJZGVudGlmaWVyLCBQdWJsaWNJZGVudGlmaWVyLCBNYXlUaHJvd0V4 Y2VwdGlvbl0gdm9pZCByZW1vdmVUcmFjayhSVENSdHBTZW5kZXIgc2VuZGVyKTsKIAotICAgIFtN YXlUaHJvd0V4Y2VwdGlvbl0gUlRDUnRwVHJhbnNjZWl2ZXIgYWRkVHJhbnNjZWl2ZXIoTWVkaWFT dHJlYW1UcmFjayB0cmFjaywgb3B0aW9uYWwgUlRDUnRwVHJhbnNjZWl2ZXJJbml0IGluaXQpOwot ICAgIFtNYXlUaHJvd0V4Y2VwdGlvbl0gUlRDUnRwVHJhbnNjZWl2ZXIgYWRkVHJhbnNjZWl2ZXIo RE9NU3RyaW5nIGtpbmQsIG9wdGlvbmFsIFJUQ1J0cFRyYW5zY2VpdmVySW5pdCBpbml0KTsKKyAg ICBbTWF5VGhyb3dFeGNlcHRpb25dIFJUQ1J0cFRyYW5zY2VpdmVyIGFkZFRyYW5zY2VpdmVyKChN ZWRpYVN0cmVhbVRyYWNrIG9yIERPTVN0cmluZykgdHJhY2ssIG9wdGlvbmFsIFJUQ1J0cFRyYW5z Y2VpdmVySW5pdCBpbml0KTsKIAogICAgIGF0dHJpYnV0ZSBFdmVudEhhbmRsZXIgb250cmFjazsK IApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9SVENSdHBT ZW5kZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9SVENSdHBTZW5k ZXIuY3BwCmluZGV4IDk2ODA1NDNjZDk3MzA0ZTYyZmY0MGRlOTQ4Nzk3ZTJmODhmYTExOWEuLjMz YjE0MTdiYmNhMjJiY2JjMTNhODBmZWMxMWRkNDZhZWE2MDkxYmQgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vUlRDUnRwU2VuZGVyLmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL1JUQ1J0cFNlbmRlci5jcHAKQEAgLTM5LDE5 ICszOSwxOSBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKIFJlZjxSVENSdHBTZW5kZXI+IFJUQ1J0 cFNlbmRlcjo6Y3JlYXRlKFJlZjxNZWRpYVN0cmVhbVRyYWNrPiYmIHRyYWNrLCBWZWN0b3I8U3Ry aW5nPiYmIG1lZGlhU3RyZWFtSWRzLCBSVENSdHBTZW5kZXJDbGllbnQmIGNsaWVudCkKIHsKLSAg ICBhdXRvIHNlbmRlciA9IGFkb3B0UmVmKCpuZXcgUlRDUnRwU2VuZGVyKHRyYWNrLT5raW5kKCks IFdURk1vdmUobWVkaWFTdHJlYW1JZHMpLCBjbGllbnQpKTsKKyAgICBhdXRvIHNlbmRlciA9IGFk b3B0UmVmKCpuZXcgUlRDUnRwU2VuZGVyKFN0cmluZyh0cmFjay0+a2luZCgpKSwgV1RGTW92ZSht ZWRpYVN0cmVhbUlkcyksIGNsaWVudCkpOwogICAgIHNlbmRlci0+c2V0VHJhY2soV1RGTW92ZSh0 cmFjaykpOwogICAgIHJldHVybiBzZW5kZXI7CiB9CiAKLVJlZjxSVENSdHBTZW5kZXI+IFJUQ1J0 cFNlbmRlcjo6Y3JlYXRlKGNvbnN0IFN0cmluZyYgdHJhY2tLaW5kLCBWZWN0b3I8U3RyaW5nPiYm IG1lZGlhU3RyZWFtSWRzLCBSVENSdHBTZW5kZXJDbGllbnQmIGNsaWVudCkKK1JlZjxSVENSdHBT ZW5kZXI+IFJUQ1J0cFNlbmRlcjo6Y3JlYXRlKFN0cmluZyYmIHRyYWNrS2luZCwgVmVjdG9yPFN0 cmluZz4mJiBtZWRpYVN0cmVhbUlkcywgUlRDUnRwU2VuZGVyQ2xpZW50JiBjbGllbnQpCiB7Ci0g ICAgcmV0dXJuIGFkb3B0UmVmKCpuZXcgUlRDUnRwU2VuZGVyKHRyYWNrS2luZCwgV1RGTW92ZSht ZWRpYVN0cmVhbUlkcyksIGNsaWVudCkpOworICAgIHJldHVybiBhZG9wdFJlZigqbmV3IFJUQ1J0 cFNlbmRlcihXVEZNb3ZlKHRyYWNrS2luZCksIFdURk1vdmUobWVkaWFTdHJlYW1JZHMpLCBjbGll bnQpKTsKIH0KIAotUlRDUnRwU2VuZGVyOjpSVENSdHBTZW5kZXIoY29uc3QgU3RyaW5nJiB0cmFj a0tpbmQsIFZlY3RvcjxTdHJpbmc+JiYgbWVkaWFTdHJlYW1JZHMsIFJUQ1J0cFNlbmRlckNsaWVu dCYgY2xpZW50KQorUlRDUnRwU2VuZGVyOjpSVENSdHBTZW5kZXIoU3RyaW5nJiYgdHJhY2tLaW5k LCBWZWN0b3I8U3RyaW5nPiYmIG1lZGlhU3RyZWFtSWRzLCBSVENSdHBTZW5kZXJDbGllbnQmIGNs aWVudCkKICAgICA6IFJUQ1J0cFNlbmRlclJlY2VpdmVyQmFzZSgpCi0gICAgLCBtX3RyYWNrS2lu ZCh0cmFja0tpbmQpCisgICAgLCBtX3RyYWNrS2luZChXVEZNb3ZlKHRyYWNrS2luZCkpCiAgICAg LCBtX21lZGlhU3RyZWFtSWRzKFdURk1vdmUobWVkaWFTdHJlYW1JZHMpKQogICAgICwgbV9jbGll bnQoJmNsaWVudCkKIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFz dHJlYW0vUlRDUnRwU2VuZGVyLmggYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFt L1JUQ1J0cFNlbmRlci5oCmluZGV4IDViMDMyZDczYjRhN2VhNjA1YjUzZGU1OTJiMGQxMDU0MWY2 NWNiNWUuLjkyYWFiZDY1NWQ1NGNjMTg1YjdmNjczYTNkNjU3MmViNmY3YTM3NTEgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vUlRDUnRwU2VuZGVyLmgKKysr IGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9SVENSdHBTZW5kZXIuaApAQCAt NDcsNyArNDcsNyBAQCBwdWJsaWM6CiBjbGFzcyBSVENSdHBTZW5kZXIgOiBwdWJsaWMgUlRDUnRw U2VuZGVyUmVjZWl2ZXJCYXNlIHsKIHB1YmxpYzoKICAgICBzdGF0aWMgUmVmPFJUQ1J0cFNlbmRl cj4gY3JlYXRlKFJlZjxNZWRpYVN0cmVhbVRyYWNrPiYmLCBWZWN0b3I8U3RyaW5nPiYmIG1lZGlh U3RyZWFtSWRzLCBSVENSdHBTZW5kZXJDbGllbnQmKTsKLSAgICBzdGF0aWMgUmVmPFJUQ1J0cFNl bmRlcj4gY3JlYXRlKGNvbnN0IFN0cmluZyYgdHJhY2tLaW5kLCBWZWN0b3I8U3RyaW5nPiYmIG1l ZGlhU3RyZWFtSWRzLCBSVENSdHBTZW5kZXJDbGllbnQmKTsKKyAgICBzdGF0aWMgUmVmPFJUQ1J0 cFNlbmRlcj4gY3JlYXRlKFN0cmluZyYmIHRyYWNrS2luZCwgVmVjdG9yPFN0cmluZz4mJiBtZWRp YVN0cmVhbUlkcywgUlRDUnRwU2VuZGVyQ2xpZW50Jik7CiAKICAgICBjb25zdCBTdHJpbmcmIHRy YWNrSWQoKSBjb25zdCB7IHJldHVybiBtX3RyYWNrSWQ7IH0KICAgICBjb25zdCBTdHJpbmcmIHRy YWNrS2luZCgpIGNvbnN0IHsgcmV0dXJuIG1fdHJhY2tLaW5kOyB9CkBAIC02Miw3ICs2Miw3IEBA IHB1YmxpYzoKICAgICBFeGNlcHRpb25Pcjx2b2lkPiByZXBsYWNlVHJhY2soUmVmPE1lZGlhU3Ry ZWFtVHJhY2s+JiYsIERPTVByb21pc2U8dm9pZD4mJik7CiAKIHByaXZhdGU6Ci0gICAgUlRDUnRw U2VuZGVyKGNvbnN0IFN0cmluZyYgdHJhY2tLaW5kLCBWZWN0b3I8U3RyaW5nPiYmIG1lZGlhU3Ry ZWFtSWRzLCBSVENSdHBTZW5kZXJDbGllbnQmKTsKKyAgICBSVENSdHBTZW5kZXIoU3RyaW5nJiYg dHJhY2tLaW5kLCBWZWN0b3I8U3RyaW5nPiYmIG1lZGlhU3RyZWFtSWRzLCBSVENSdHBTZW5kZXJD bGllbnQmKTsKIAogICAgIFN0cmluZyBtX3RyYWNrSWQ7CiAgICAgU3RyaW5nIG1fdHJhY2tLaW5k Owo=