114464 2013-04-11 13:59:35 -0700 [Mac] WebSocket doesn't work with authenticating proxies 2013-04-11 14:41:40 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 ap ap oldest_to_newest 874146 0 ap 2013-04-11 13:59:35 -0700 WebSocket always crashes when an authenticating proxy is in use. <rdar://problem/10416316> 874154 1 197671 ap 2013-04-11 14:09:48 -0700 Created attachment 197671 proposed fix 874164 2 197671 buildbot 2013-04-11 14:28:21 -0700 Comment on attachment 197671 proposed fix Attachment 197671 did not pass win-ews (win): Output: http://webkit-queues.appspot.com/results/94008 874177 3 ap 2013-04-11 14:41:40 -0700 Committed <http://trac.webkit.org/changeset/148237>. 197671 2013-04-11 14:09:48 -0700 2013-04-11 14:28:21 -0700 proposed fix WSWithAuthenticatingProxy.txt text/plain 11582 ap SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE0ODIzMykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI4IEBACisyMDEzLTA0LTExICBBbGV4ZXkg UHJvc2t1cnlha292ICA8YXBAYXBwbGUuY29tPgorCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8x MDQxNjMxNj4gW01hY10gV2ViU29ja2V0IGRvZXNuJ3Qgd29yayB3aXRoIGF1dGhlbnRpY2F0aW5n IHByb3hpZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTExNDQ2NAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg ICogcGxhdGZvcm0vbWFjL1dlYkNvcmVTeXN0ZW1JbnRlcmZhY2UuaDoKKyAgICAgICAgKiBwbGF0 Zm9ybS9tYWMvV2ViQ29yZVN5c3RlbUludGVyZmFjZS5tbToKKyAgICAgICAgVXBkYXRlZCBmb3Ig bmV3IHdrQ29weUNPTk5FQ1RQcm94eVJlc3BvbnNlIHNpZ25hdHVyZS4KKworICAgICAgICAqIHBs YXRmb3JtL25ldHdvcmsvY2YvU29ja2V0U3RyZWFtSGFuZGxlQ0ZOZXQuY3BwOgorICAgICAgICAo V2ViQ29yZTo6U29ja2V0U3RyZWFtSGFuZGxlOjpleGVjdXRlUEFDRmlsZVVSTCk6IEZpeGVkIGEg dHlwbyBpbiBhIGNvbW1lbnQuCisgICAgICAgIChXZWJDb3JlOjpTb2NrZXRTdHJlYW1IYW5kbGU6 OmFkZENPTk5FQ1RDcmVkZW50aWFscyk6IERvbid0IGNyYXNoIGV2ZW4gaWYgdGhlIHJlc3QKKyAg ICAgICAgb2YgdGhlIGZpeCBkaWRuJ3Qgd29yayAod2hpY2ggd291bGQgYmUgdGhlIGNhc2Ugb24g c29tZSBPUyB2ZXJzaW9ucykuCisgICAgICAgIChXZWJDb3JlOjpTb2NrZXRTdHJlYW1IYW5kbGU6 OnJlYWRTdHJlYW1DYWxsYmFjayk6IFJlcGxhY2VkIG1vc3QgYnJlYWtzIHdpdGggcmV0dXJucywK KyAgICAgICAgYmVjYXVzZSBicmVha3Mgd2VyZSBjb25mdXNpbmcgaW4gc3VjaCBhIGh1Z2Ugc3dp dGNoLiBDaGFuZ2VkIG51bGwgcHJveHlSZXNwb25zZQorICAgICAgICB0byBub3QgYmUgdHJlYXRl ZCBhcyBhdXRoZW50aWNhdGlvbiBzdWNjZXNzLCBiZWNhdXNlIGl0J3Mgbm90LiBNZXJnZWQgdHdv IHBhcnRzCisgICAgICAgIG9mIFdhaXRpbmdGb3JDb25uZWN0IHN0YXRlIGhhbmRsaW5nIGZvciBj bGFyaXR5LgorICAgICAgICAoV2ViQ29yZTo6U29ja2V0U3RyZWFtSGFuZGxlOjp3cml0ZVN0cmVh bUNhbGxiYWNrKTogRG9uJ3QgYmxpbmRseSBhc3N1bWUgdGhhdCB3ZQorICAgICAgICBjYW4gc3Rh cnQgV2ViU29ja2V0IGhhbmRzaGFrZSBhZnRlciBrQ0ZTdHJlYW1FdmVudENhbkFjY2VwdEJ5dGVz LiBQZXJoYXBzIGl0J3MKKyAgICAgICAgbm90aGluZyBidXQgYSBmYWlsZWQgQ09OTkVDVCwgYW5k IGEgcmVhZCBjYWxsYmFjayBzdGlsbCBuZWVkcyB0byBzZW5kIGF1dGhlbnRpY2F0aW9uLgorICAg ICAgICBXaXRob3V0IHRoaXMsIGVzdGFibGlzaGluZyBjb25uZWN0aW9ucyB3YXMgZmxha3kuIEFk ZGVkIGEgY2hlY2sgZm9yIENsb3NlZCBzdGF0ZSwKKyAgICAgICAgbWF0Y2hpbmcgcmVhZCBjYWxs YmFjay4KKwogMjAxMy0wNC0xMSAgQ29tbWl0IFF1ZXVlICA8cm5pd2FAd2Via2l0Lm9yZz4KIAog ICAgICAgICBVbnJldmlld2VkLCByb2xsaW5nIG91dCByMTQ4MDM0LCByMTQ4MDUyLCByMTQ4MDk3 LCBhbmQKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9XZWJDb3JlU3lzdGVtSW50 ZXJmYWNlLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWFjL1dlYkNv cmVTeXN0ZW1JbnRlcmZhY2UuaAkocmV2aXNpb24gMTQ3NTY2KQorKysgU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vbWFjL1dlYkNvcmVTeXN0ZW1JbnRlcmZhY2UuaAkod29ya2luZyBjb3B5KQpAQCAt MjE0LDcgKzIxNCw3IEBAIGV4dGVybiB2b2lkICgqd2tTZXRIVFRQUGlwZWxpbmluZ1ByaW9yaXQK IGV4dGVybiB2b2lkICgqd2tTZXRIVFRQUGlwZWxpbmluZ01pbmltdW1GYXN0TGFuZVByaW9yaXR5 KShpbnQgcHJpb3JpdHkpOwogZXh0ZXJuIHZvaWQgKCp3a1NldENPTk5FQ1RQcm94eUZvclN0cmVh bSkoQ0ZSZWFkU3RyZWFtUmVmLCBDRlN0cmluZ1JlZiBwcm94eUhvc3QsIENGTnVtYmVyUmVmIHBy b3h5UG9ydCk7CiBleHRlcm4gdm9pZCAoKndrU2V0Q09OTkVDVFByb3h5QXV0aG9yaXphdGlvbkZv clN0cmVhbSkoQ0ZSZWFkU3RyZWFtUmVmLCBDRlN0cmluZ1JlZiBwcm94eUF1dGhvcml6YXRpb25T dHJpbmcpOwotZXh0ZXJuIENGSFRUUE1lc3NhZ2VSZWYgKCp3a0NvcHlDT05ORUNUUHJveHlSZXNw b25zZSkoQ0ZSZWFkU3RyZWFtUmVmLCBDRlVSTFJlZiByZXNwb25zZVVSTCk7CitleHRlcm4gQ0ZI VFRQTWVzc2FnZVJlZiAoKndrQ29weUNPTk5FQ1RQcm94eVJlc3BvbnNlKShDRlJlYWRTdHJlYW1S ZWYsIENGVVJMUmVmIHJlc3BvbnNlVVJMLCBDRlN0cmluZ1JlZiBwcm94eUhvc3QsIENGTnVtYmVy UmVmIHByb3h5UG9ydCk7CiAKIGV4dGVybiB2b2lkICgqd2tHZXRHbHlwaHNGb3JDaGFyYWN0ZXJz KShDR0ZvbnRSZWYsIGNvbnN0IFVuaUNoYXJbXSwgQ0dHbHlwaFtdLCBzaXplX3QpOwogZXh0ZXJu IGJvb2wgKCp3a0dldFZlcnRpY2FsR2x5cGhzRm9yQ2hhcmFjdGVycykoQ1RGb250UmVmLCBjb25z dCBVbmlDaGFyW10sIENHR2x5cGhbXSwgc2l6ZV90KTsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL21hYy9XZWJDb3JlU3lzdGVtSW50ZXJmYWNlLm1tCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9XZWJDb3JlU3lzdGVtSW50ZXJmYWNlLm1tCShyZXZpc2lv biAxNDc1NjYpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tYWMvV2ViQ29yZVN5c3RlbUlu dGVyZmFjZS5tbQkod29ya2luZyBjb3B5KQpAQCAtMTE3LDcgKzExNyw3IEBAIHZvaWQgKCp3a1Nl dEhUVFBQaXBlbGluaW5nUHJpb3JpdHkpKENGVVIKIHZvaWQgKCp3a1NldEhUVFBQaXBlbGluaW5n TWluaW11bUZhc3RMYW5lUHJpb3JpdHkpKGludCBwcmlvcml0eSk7CiB2b2lkICgqd2tTZXRDT05O RUNUUHJveHlGb3JTdHJlYW0pKENGUmVhZFN0cmVhbVJlZiwgQ0ZTdHJpbmdSZWYgcHJveHlIb3N0 LCBDRk51bWJlclJlZiBwcm94eVBvcnQpOwogdm9pZCAoKndrU2V0Q09OTkVDVFByb3h5QXV0aG9y aXphdGlvbkZvclN0cmVhbSkoQ0ZSZWFkU3RyZWFtUmVmLCBDRlN0cmluZ1JlZiBwcm94eUF1dGhv cml6YXRpb25TdHJpbmcpOwotQ0ZIVFRQTWVzc2FnZVJlZiAoKndrQ29weUNPTk5FQ1RQcm94eVJl c3BvbnNlKShDRlJlYWRTdHJlYW1SZWYsIENGVVJMUmVmIHJlc3BvbnNlVVJMKTsKK0NGSFRUUE1l c3NhZ2VSZWYgKCp3a0NvcHlDT05ORUNUUHJveHlSZXNwb25zZSkoQ0ZSZWFkU3RyZWFtUmVmLCBD RlVSTFJlZiByZXNwb25zZVVSTCwgQ0ZTdHJpbmdSZWYgcHJveHlIb3N0LCBDRk51bWJlclJlZiBw cm94eVBvcnQpOwogCiAjaWYgVVNFKENGTkVUV09SSykKIENGSFRUUENvb2tpZVN0b3JhZ2VSZWYg KCp3a0dldERlZmF1bHRIVFRQQ29va2llU3RvcmFnZSkoKTsKSW5kZXg6IFNvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL25ldHdvcmsvY2YvU29ja2V0U3RyZWFtSGFuZGxlQ0ZOZXQuY3BwCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY2YvU29ja2V0U3RyZWFtSGFu ZGxlQ0ZOZXQuY3BwCShyZXZpc2lvbiAxNDc1NjYpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9uZXR3b3JrL2NmL1NvY2tldFN0cmVhbUhhbmRsZUNGTmV0LmNwcAkod29ya2luZyBjb3B5KQpA QCAtMTUzLDcgKzE1Myw3IEBAIHZvaWQgU29ja2V0U3RyZWFtSGFuZGxlOjpwYWNFeGVjdXRpb25D YWwKIAogdm9pZCBTb2NrZXRTdHJlYW1IYW5kbGU6OmV4ZWN1dGVQQUNGaWxlVVJMKENGVVJMUmVm IHBhY0ZpbGVVUkwpCiB7Ci0gICAgLy8gQ0ZOZXR3b3JrIHJldHVybnMgYW4gZW1wdHkgcHJveHkg YXJyYXkgZm9yIFdlYlNjb2tldCBzY2hlbWVzLCBzbyB1c2UgbV9odHRwc1VSTC4KKyAgICAvLyBD Rk5ldHdvcmsgcmV0dXJucyBhbiBlbXB0eSBwcm94eSBhcnJheSBmb3IgV2ViU29ja2V0IHNjaGVt ZXMsIHNvIHVzZSBtX2h0dHBzVVJMLgogICAgIENGU3RyZWFtQ2xpZW50Q29udGV4dCBjbGllbnRD b250ZXh0ID0geyAwLCB0aGlzLCByZXRhaW5Tb2NrZXRTdHJlYW1IYW5kbGUsIHJlbGVhc2VTb2Nr ZXRTdHJlYW1IYW5kbGUsIGNvcHlQQUNFeGVjdXRpb25EZXNjcmlwdGlvbiB9OwogICAgIG1fcGFj UnVuTG9vcFNvdXJjZS5hZG9wdENGKENGTmV0d29ya0V4ZWN1dGVQcm94eUF1dG9Db25maWd1cmF0 aW9uVVJMKHBhY0ZpbGVVUkwsIG1faHR0cHNVUkwuZ2V0KCksIHBhY0V4ZWN1dGlvbkNhbGxiYWNr LCAmY2xpZW50Q29udGV4dCkpOwogI2lmIFBMQVRGT1JNKFdJTikKQEAgLTM2MSw2ICszNjEsMTMg QEAgdm9pZCBTb2NrZXRTdHJlYW1IYW5kbGU6OmFkZENPTk5FQ1RDcmVkZQogICAgIENGTnVtYmVy R2V0VmFsdWUobV9wcm94eVBvcnQuZ2V0KCksIGtDRk51bWJlckludFR5cGUsICZwb3J0KTsKICAg ICBSZXRhaW5QdHI8Q0ZTdHJpbmdSZWY+IG1ldGhvZENGKEFkb3B0Q0YsIENGSFRUUEF1dGhlbnRp Y2F0aW9uQ29weU1ldGhvZChhdXRoZW50aWNhdGlvbi5nZXQoKSkpOwogICAgIFJldGFpblB0cjxD RlN0cmluZ1JlZj4gcmVhbG1DRihBZG9wdENGLCBDRkhUVFBBdXRoZW50aWNhdGlvbkNvcHlSZWFs bShhdXRoZW50aWNhdGlvbi5nZXQoKSkpOworCisgICAgaWYgKCFtZXRob2RDRiB8fCAhcmVhbG1D RikgeworICAgICAgICAvLyBUaGlzIHNob3VsZG4ndCBoYXBwZW4sIGJ1dCBvbiBzb21lIE9TIHZl cnNpb25zIHdlIGdldCBpbmNvbXBsZXRlIGF1dGhlbnRpY2F0aW9uIGRhdGEsIHNlZSA8cmRhcjov L3Byb2JsZW0vMTA0MTYzMTY+LgorICAgICAgICBtX2NsaWVudC0+ZGlkRmFpbFNvY2tldFN0cmVh bSh0aGlzLCBTb2NrZXRTdHJlYW1FcnJvcigwLCBtX3VybC5zdHJpbmcoKSwgIldlYlNvY2tldCBw cm94eSBhdXRoZW50aWNhdGlvbiBjb3VsZG4ndCBiZSBoYW5kbGVkIikpOworICAgICAgICByZXR1 cm47CisgICAgfQorCiAgICAgUHJvdGVjdGlvblNwYWNlIHByb3RlY3Rpb25TcGFjZShTdHJpbmco bV9wcm94eUhvc3QuZ2V0KCkpLCBwb3J0LCBQcm90ZWN0aW9uU3BhY2VQcm94eUhUVFBTLCBTdHJp bmcocmVhbG1DRi5nZXQoKSksIGF1dGhlbnRpY2F0aW9uU2NoZW1lRnJvbUF1dGhlbnRpY2F0aW9u TWV0aG9kKG1ldGhvZENGLmdldCgpKSk7CiAgICAgU3RyaW5nIGxvZ2luOwogICAgIFN0cmluZyBw YXNzd29yZDsKQEAgLTQ0Nyw0MSArNDU0LDQxIEBAIHZvaWQgU29ja2V0U3RyZWFtSGFuZGxlOjpy ZWFkU3RyZWFtQ2FsbGIKIHsKICAgICBzd2l0Y2godHlwZSkgewogICAgIGNhc2Uga0NGU3RyZWFt RXZlbnROb25lOgotICAgICAgICBicmVhazsKKyAgICAgICAgcmV0dXJuOwogICAgIGNhc2Uga0NG U3RyZWFtRXZlbnRPcGVuQ29tcGxldGVkOgotICAgICAgICBicmVhazsKKyAgICAgICAgcmV0dXJu OwogICAgIGNhc2Uga0NGU3RyZWFtRXZlbnRIYXNCeXRlc0F2YWlsYWJsZTogeworICAgICAgICBp ZiAobV9jb25uZWN0aW5nU3Vic3RhdGUgPT0gV2FpdGluZ0ZvckNyZWRlbnRpYWxzKQorICAgICAg ICAgICAgcmV0dXJuOworCiAgICAgICAgIGlmIChtX2Nvbm5lY3RpbmdTdWJzdGF0ZSA9PSBXYWl0 aW5nRm9yQ29ubmVjdCkgewogICAgICAgICAgICAgaWYgKG1fY29ubmVjdGlvblR5cGUgPT0gQ09O TkVDVFByb3h5KSB7Ci0gICAgICAgICAgICAgICAgUmV0YWluUHRyPENGSFRUUE1lc3NhZ2VSZWY+ IHByb3h5UmVzcG9uc2UoQWRvcHRDRiwgd2tDb3B5Q09OTkVDVFByb3h5UmVzcG9uc2UobV9yZWFk U3RyZWFtLmdldCgpLCBtX2h0dHBzVVJMLmdldCgpKSk7Ci0gICAgICAgICAgICAgICAgaWYgKHBy b3h5UmVzcG9uc2UpIHsKLSAgICAgICAgICAgICAgICAgICAgQ0ZJbmRleCBwcm94eVJlc3BvbnNl Q29kZSA9IENGSFRUUE1lc3NhZ2VHZXRSZXNwb25zZVN0YXR1c0NvZGUocHJveHlSZXNwb25zZS5n ZXQoKSk7Ci0gICAgICAgICAgICAgICAgICAgIHN3aXRjaCAocHJveHlSZXNwb25zZUNvZGUpIHsK LSAgICAgICAgICAgICAgICAgICAgY2FzZSAyMDA6Ci0gICAgICAgICAgICAgICAgICAgICAgICAv LyBTdWNjZXNzZnVsIGNvbm5lY3Rpb24uCi0gICAgICAgICAgICAgICAgICAgICAgICBicmVhazsK LSAgICAgICAgICAgICAgICAgICAgY2FzZSA0MDc6Ci0gICAgICAgICAgICAgICAgICAgICAgICBh ZGRDT05ORUNUQ3JlZGVudGlhbHMocHJveHlSZXNwb25zZS5nZXQoKSk7Ci0gICAgICAgICAgICAg ICAgICAgICAgICByZXR1cm47Ci0gICAgICAgICAgICAgICAgICAgIGRlZmF1bHQ6Ci0gICAgICAg ICAgICAgICAgICAgICAgICBtX2NsaWVudC0+ZGlkRmFpbFNvY2tldFN0cmVhbSh0aGlzLCBTb2Nr ZXRTdHJlYW1FcnJvcihzdGF0aWNfY2FzdDxpbnQ+KHByb3h5UmVzcG9uc2VDb2RlKSwgbV91cmwu c3RyaW5nKCksICJQcm94eSBjb25uZWN0aW9uIGNvdWxkIG5vdCBiZSBlc3RhYmxpc2hlZCIpKTsK LSAgICAgICAgICAgICAgICAgICAgICAgIHBsYXRmb3JtQ2xvc2UoKTsKLSAgICAgICAgICAgICAg ICAgICAgICAgIHJldHVybjsKLSAgICAgICAgICAgICAgICAgICAgfQorICAgICAgICAgICAgICAg IFJldGFpblB0cjxDRkhUVFBNZXNzYWdlUmVmPiBwcm94eVJlc3BvbnNlKEFkb3B0Q0YsIHdrQ29w eUNPTk5FQ1RQcm94eVJlc3BvbnNlKG1fcmVhZFN0cmVhbS5nZXQoKSwgbV9odHRwc1VSTC5nZXQo KSwgbV9wcm94eUhvc3QuZ2V0KCksIG1fcHJveHlQb3J0LmdldCgpKSk7CisgICAgICAgICAgICAg ICAgaWYgKCFwcm94eVJlc3BvbnNlKQorICAgICAgICAgICAgICAgICAgICByZXR1cm47CisKKyAg ICAgICAgICAgICAgICBDRkluZGV4IHByb3h5UmVzcG9uc2VDb2RlID0gQ0ZIVFRQTWVzc2FnZUdl dFJlc3BvbnNlU3RhdHVzQ29kZShwcm94eVJlc3BvbnNlLmdldCgpKTsKKyAgICAgICAgICAgICAg ICBzd2l0Y2ggKHByb3h5UmVzcG9uc2VDb2RlKSB7CisgICAgICAgICAgICAgICAgY2FzZSAyMDA6 CisgICAgICAgICAgICAgICAgICAgIC8vIFN1Y2Nlc3NmdWwgY29ubmVjdGlvbi4KKyAgICAgICAg ICAgICAgICAgICAgYnJlYWs7CisgICAgICAgICAgICAgICAgY2FzZSA0MDc6CisgICAgICAgICAg ICAgICAgICAgIGFkZENPTk5FQ1RDcmVkZW50aWFscyhwcm94eVJlc3BvbnNlLmdldCgpKTsKKyAg ICAgICAgICAgICAgICAgICAgcmV0dXJuOworICAgICAgICAgICAgICAgIGRlZmF1bHQ6CisgICAg ICAgICAgICAgICAgICAgIG1fY2xpZW50LT5kaWRGYWlsU29ja2V0U3RyZWFtKHRoaXMsIFNvY2tl dFN0cmVhbUVycm9yKHN0YXRpY19jYXN0PGludD4ocHJveHlSZXNwb25zZUNvZGUpLCBtX3VybC5z dHJpbmcoKSwgIlByb3h5IGNvbm5lY3Rpb24gY291bGQgbm90IGJlIGVzdGFibGlzaGVkLCB1bmV4 cGVjdGVkIHJlc3BvbnNlIGNvZGUiKSk7CisgICAgICAgICAgICAgICAgICAgIHBsYXRmb3JtQ2xv c2UoKTsKKyAgICAgICAgICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICAgICAgICAgIH0KICAg ICAgICAgICAgIH0KLSAgICAgICAgfSBlbHNlIGlmIChtX2Nvbm5lY3RpbmdTdWJzdGF0ZSA9PSBX YWl0aW5nRm9yQ3JlZGVudGlhbHMpCi0gICAgICAgICAgICBicmVhazsKLQotICAgICAgICBpZiAo bV9jb25uZWN0aW5nU3Vic3RhdGUgPT0gV2FpdGluZ0ZvckNvbm5lY3QpIHsKICAgICAgICAgICAg IG1fY29ubmVjdGluZ1N1YnN0YXRlID0gQ29ubmVjdGVkOwogICAgICAgICAgICAgbV9zdGF0ZSA9 IE9wZW47CiAgICAgICAgICAgICBtX2NsaWVudC0+ZGlkT3BlblNvY2tldFN0cmVhbSh0aGlzKTsK LSAgICAgICAgICAgIGlmIChtX3N0YXRlID09IENsb3NlZCkKLSAgICAgICAgICAgICAgICBicmVh azsKLSAgICAgICAgICAgIC8vIEZhbGwgdGhyb3VnaC4KLSAgICAgICAgfSBlbHNlIGlmIChtX3N0 YXRlID09IENsb3NlZCkKLSAgICAgICAgICAgIGJyZWFrOworICAgICAgICB9CisKKyAgICAgICAg Ly8gTm90IGFuICJlbHNlIGlmIiwgd2UgY291bGQgaGF2ZSBtYWRlIGEgY2xpZW50IGNhbGwgYWJv dmUsIGFuZCBpdCBjb3VsZCBjbG9zZSB0aGUgY29ubmVjdGlvbi4KKyAgICAgICAgaWYgKG1fc3Rh dGUgPT0gQ2xvc2VkKQorICAgICAgICAgICAgcmV0dXJuOwogCiAgICAgICAgIEFTU0VSVChtX3N0 YXRlID09IE9wZW4pOwogICAgICAgICBBU1NFUlQobV9jb25uZWN0aW5nU3Vic3RhdGUgPT0gQ29u bmVjdGVkKTsKQEAgLTQ5NiwxOSArNTAzLDE5IEBAIHZvaWQgU29ja2V0U3RyZWFtSGFuZGxlOjpy ZWFkU3RyZWFtQ2FsbGIKIAogICAgICAgICBtX2NsaWVudC0+ZGlkUmVjZWl2ZVNvY2tldFN0cmVh bURhdGEodGhpcywgcmVpbnRlcnByZXRfY2FzdDxjb25zdCBjaGFyKj4ocHRyKSwgbGVuZ3RoKTsK IAotICAgICAgICBicmVhazsKKyAgICAgICAgcmV0dXJuOwogICAgIH0KICAgICBjYXNlIGtDRlN0 cmVhbUV2ZW50Q2FuQWNjZXB0Qnl0ZXM6CiAgICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwot ICAgICAgICBicmVhazsKKyAgICAgICAgcmV0dXJuOwogICAgIGNhc2Uga0NGU3RyZWFtRXZlbnRF cnJvck9jY3VycmVkOiB7CiAgICAgICAgIFJldGFpblB0cjxDRkVycm9yUmVmPiBlcnJvcihBZG9w dENGLCBDRlJlYWRTdHJlYW1Db3B5RXJyb3IobV9yZWFkU3RyZWFtLmdldCgpKSk7CiAgICAgICAg IHJlcG9ydEVycm9yVG9DbGllbnQoZXJyb3IuZ2V0KCkpOwotICAgICAgICBicmVhazsKKyAgICAg ICAgcmV0dXJuOwogICAgIH0KICAgICBjYXNlIGtDRlN0cmVhbUV2ZW50RW5kRW5jb3VudGVyZWQ6 CiAgICAgICAgIHBsYXRmb3JtQ2xvc2UoKTsKLSAgICAgICAgYnJlYWs7CisgICAgICAgIHJldHVy bjsKICAgICB9CiB9CiAKQEAgLTUxNiw0MSArNTIzLDU1IEBAIHZvaWQgU29ja2V0U3RyZWFtSGFu ZGxlOjp3cml0ZVN0cmVhbUNhbGwKIHsKICAgICBzd2l0Y2godHlwZSkgewogICAgIGNhc2Uga0NG U3RyZWFtRXZlbnROb25lOgotICAgICAgICBicmVhazsKKyAgICAgICAgcmV0dXJuOwogICAgIGNh c2Uga0NGU3RyZWFtRXZlbnRPcGVuQ29tcGxldGVkOgotICAgICAgICBicmVhazsKKyAgICAgICAg cmV0dXJuOwogICAgIGNhc2Uga0NGU3RyZWFtRXZlbnRIYXNCeXRlc0F2YWlsYWJsZToKICAgICAg ICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7Ci0gICAgICAgIGJyZWFrOworICAgICAgICByZXR1cm47 CiAgICAgY2FzZSBrQ0ZTdHJlYW1FdmVudENhbkFjY2VwdEJ5dGVzOiB7Ci0gICAgICAgIC8vIFBv c3NpYmx5LCBhIHNwdXJpb3VzIGV2ZW50IGZyb20gQ09OTkVDVCBoYW5kc2hha2UuCisgICAgICAg IC8vIENhbiBiZSBmYWxzZSBpZiByZWFkIHN0cmVhbSBjYWxsYmFjayBqdXN0IGRlY2lkZWQgdG8g cmV0cnkgYSBDT05ORUNUIHdpdGggY3JlZGVudGlhbHMuCiAgICAgICAgIGlmICghQ0ZXcml0ZVN0 cmVhbUNhbkFjY2VwdEJ5dGVzKG1fd3JpdGVTdHJlYW0uZ2V0KCkpKQogICAgICAgICAgICAgcmV0 dXJuOwogCiAgICAgICAgIGlmIChtX2Nvbm5lY3RpbmdTdWJzdGF0ZSA9PSBXYWl0aW5nRm9yQ3Jl ZGVudGlhbHMpCi0gICAgICAgICAgICBicmVhazsKKyAgICAgICAgICAgIHJldHVybjsKIAogICAg ICAgICBpZiAobV9jb25uZWN0aW5nU3Vic3RhdGUgPT0gV2FpdGluZ0ZvckNvbm5lY3QpIHsKKyAg ICAgICAgICAgIGlmIChtX2Nvbm5lY3Rpb25UeXBlID09IENPTk5FQ1RQcm94eSkgeworICAgICAg ICAgICAgICAgIFJldGFpblB0cjxDRkhUVFBNZXNzYWdlUmVmPiBwcm94eVJlc3BvbnNlKEFkb3B0 Q0YsIHdrQ29weUNPTk5FQ1RQcm94eVJlc3BvbnNlKG1fcmVhZFN0cmVhbS5nZXQoKSwgbV9odHRw c1VSTC5nZXQoKSwgbV9wcm94eUhvc3QuZ2V0KCksIG1fcHJveHlQb3J0LmdldCgpKSk7CisgICAg ICAgICAgICAgICAgaWYgKCFwcm94eVJlc3BvbnNlKQorICAgICAgICAgICAgICAgICAgICByZXR1 cm47CisKKyAgICAgICAgICAgICAgICAvLyBEb24ndCB3cml0ZSBhbnl0aGluZyB1bnRpbCByZWFk IHN0cmVhbSBjYWxsYmFjayBoYXMgZGVhbHQgd2l0aCBDT05ORUNUIGNyZWRlbnRpYWxzLgorICAg ICAgICAgICAgICAgIC8vIFRoZSBvcmRlciBvZiBjYWxsYmFja3MgaXMgbm90IGRlZmluZWQsIHNv IHRoaXMgY2FuIGJlIGNhbGxlZCBiZWZvcmUgcmVhZFN0cmVhbUNhbGxiYWNrJ3Mga0NGU3RyZWFt RXZlbnRIYXNCeXRlc0F2YWlsYWJsZS4KKyAgICAgICAgICAgICAgICBDRkluZGV4IHByb3h5UmVz cG9uc2VDb2RlID0gQ0ZIVFRQTWVzc2FnZUdldFJlc3BvbnNlU3RhdHVzQ29kZShwcm94eVJlc3Bv bnNlLmdldCgpKTsKKyAgICAgICAgICAgICAgICBpZiAocHJveHlSZXNwb25zZUNvZGUgIT0gMjAw KQorICAgICAgICAgICAgICAgICAgICByZXR1cm47CisgICAgICAgICAgICB9CiAgICAgICAgICAg ICBtX2Nvbm5lY3RpbmdTdWJzdGF0ZSA9IENvbm5lY3RlZDsKICAgICAgICAgICAgIG1fc3RhdGUg PSBPcGVuOwogICAgICAgICAgICAgbV9jbGllbnQtPmRpZE9wZW5Tb2NrZXRTdHJlYW0odGhpcyk7 Ci0gICAgICAgICAgICBicmVhazsKICAgICAgICAgfQogCisgICAgICAgIC8vIE5vdCBhbiAiZWxz ZSBpZiIsIHdlIGNvdWxkIGhhdmUgbWFkZSBhIGNsaWVudCBjYWxsIGFib3ZlLCBhbmQgaXQgY291 bGQgY2xvc2UgdGhlIGNvbm5lY3Rpb24uCisgICAgICAgIGlmIChtX3N0YXRlID09IENsb3NlZCkK KyAgICAgICAgICAgIHJldHVybjsKKwogICAgICAgICBBU1NFUlQobV9zdGF0ZSA9PSBPcGVuKTsK ICAgICAgICAgQVNTRVJUKG1fY29ubmVjdGluZ1N1YnN0YXRlID09IENvbm5lY3RlZCk7CiAKICAg ICAgICAgc2VuZFBlbmRpbmdEYXRhKCk7Ci0gICAgICAgIGJyZWFrOworICAgICAgICByZXR1cm47 CiAgICAgfQogICAgIGNhc2Uga0NGU3RyZWFtRXZlbnRFcnJvck9jY3VycmVkOiB7CiAgICAgICAg IFJldGFpblB0cjxDRkVycm9yUmVmPiBlcnJvcihBZG9wdENGLCBDRldyaXRlU3RyZWFtQ29weUVy cm9yKG1fd3JpdGVTdHJlYW0uZ2V0KCkpKTsKICAgICAgICAgcmVwb3J0RXJyb3JUb0NsaWVudChl cnJvci5nZXQoKSk7Ci0gICAgICAgIGJyZWFrOworICAgICAgICByZXR1cm47CiAgICAgfQogICAg IGNhc2Uga0NGU3RyZWFtRXZlbnRFbmRFbmNvdW50ZXJlZDoKICAgICAgICAgLy8gRklYTUU6IEN1 cnJlbnRseSwgd2UgaGFuZGxlIGNsb3NpbmcgaW4gcmVhZCBjYWxsYmFjaywgYnV0IHRoZXNlIGNh biBjb21lIGluZGVwZW5kZW50bHkgKGUuZy4gYSBzZXJ2ZXIgY2FuIHN0b3AgbGlzdGVuaW5nLCBi dXQga2VlcCBzZW5kaW5nIGRhdGEpLgotICAgICAgICBicmVhazsKKyAgICAgICAgcmV0dXJuOwog ICAgIH0KIH0KIAo=