64244 2011-07-10 12:26:39 -0700 WebSocket: Add useHixie76Protocol flag to WebSocketChannel and WebSocketHandshake 2011-07-10 19:04:50 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 50099 1 yutak yutak abarth ap tkent webkit.review.bot oldest_to_newest 434606 0 yutak 2011-07-10 12:26:39 -0700 This is the first step of bug 50099. 434609 1 100236 yutak 2011-07-10 12:40:21 -0700 Created attachment 100236 Patch 434631 2 100236 tkent 2011-07-10 18:22:34 -0700 Comment on attachment 100236 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=100236&action=review > Source/WebCore/websockets/WebSocketHandshake.cpp:162 > -WebSocketHandshake::WebSocketHandshake(const KURL& url, const String& protocol, ScriptExecutionContext* context) > +WebSocketHandshake::WebSocketHandshake(const KURL& url, const String& protocol, ScriptExecutionContext* context, bool useHixie76Protocol) We usually avoid a bool argument. But I think it's acceptable in this case because we have no callers with literal false/true. 434645 3 100236 webkit.review.bot 2011-07-10 19:04:45 -0700 Comment on attachment 100236 Patch Clearing flags on attachment: 100236 Committed r90704: <http://trac.webkit.org/changeset/90704> 434646 4 webkit.review.bot 2011-07-10 19:04:50 -0700 All reviewed patches have been landed. Closing bug. 100236 2011-07-10 12:40:21 -0700 2011-07-10 19:04:45 -0700 Patch bug-64244-20110711044019.patch text/plain 11629 yutak U3VidmVyc2lvbiBSZXZpc2lvbjogOTA2NjEKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA0YjE0ZjBiOWJkMzNjNmFh YTY4Yzg2ODAxN2IwNDdmYzg5ODNjZjA4Li42YWUxYTJlZmM5ODk1M2FmZDE3OGMzOWQ1N2ZkNDI4 ODM5MzhhMGNiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzQgQEAKKzIwMTEtMDctMTAgIFl1dGEg S2l0YW11cmEgIDx5dXRha0BjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgV2ViU29ja2V0OiBBZGQg dXNlSGl4aWU3NlByb3RvY29sIGZsYWcgdG8gV2ViU29ja2V0Q2hhbm5lbCBhbmQgV2ViU29ja2V0 SGFuZHNoYWtlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD02NDI0NAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IEdldCB0aGUgdmFsdWUgb2YgU2V0dGluZ3M6OnVzZUhpeGllNzZXZWJTb2NrZXRQcm90b2NvbCgp IGFuZCBzYXZlIGl0IGluCisgICAgICAgIFdlYlNvY2tldENoYW5uZWwgYW5kIFdlYlNvY2tldEhh bmRzaGFrZSBpbnN0YW5jZXMuIE9idGFpbmVkIGZsYWcgdmFsdWUKKyAgICAgICAgaXMgbm90IHVz ZWQgZm9yIG5vdy4KKworICAgICAgICBObyBiZWhhdmlvciBjaGFuZ2UsIHRodXMgbm8gbmV3IHRl c3RzLgorCisgICAgICAgICogd2Vic29ja2V0cy9XZWJTb2NrZXRDaGFubmVsLmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OldlYlNvY2tldENoYW5uZWw6OldlYlNvY2tldENoYW5uZWwpOgorICAgICAg ICBXZWJTb2NrZXRDaGFubmVsIGlzIGFsd2F5cyBjcmVhdGVkIGluIGNvbnRleHQgb2YgRG9jdW1l bnQgKHNlZQorICAgICAgICBUaHJlYWRhYmxlV2ViU29ja2V0Q2hhbm5lbDo6Y3JlYXRlKCkpLgor ICAgICAgICBCZWNhdXNlIG1fdXNlSGl4aWU3NlByb3RvY29sIG11c3QgYmUgcGFzc2VkIHRvIFdl YlNvY2tldEhhbmRzaGFrZQorICAgICAgICBjb25zdHJ1Y3RvciwgV2ViU29ja2V0SGFuZHNoYWtl IGluc3RhbmNlIGlzIGFsbG9jYXRlZCBkeW5hbWljYWxseQorICAgICAgICBhbmQgc3RvcmVkIGlu IE93blB0ci4KKyAgICAgICAgKFdlYkNvcmU6OldlYlNvY2tldENoYW5uZWw6OmNvbm5lY3QpOgor ICAgICAgICAoV2ViQ29yZTo6V2ViU29ja2V0Q2hhbm5lbDo6ZmFpbCk6CisgICAgICAgIChXZWJD b3JlOjpXZWJTb2NrZXRDaGFubmVsOjpkaXNjb25uZWN0KToKKyAgICAgICAgKFdlYkNvcmU6Oldl YlNvY2tldENoYW5uZWw6OmRpZE9wZW4pOgorICAgICAgICAoV2ViQ29yZTo6V2ViU29ja2V0Q2hh bm5lbDo6ZGlkRmFpbCk6CisgICAgICAgIChXZWJDb3JlOjpXZWJTb2NrZXRDaGFubmVsOjpwcm9j ZXNzQnVmZmVyKToKKyAgICAgICAgKiB3ZWJzb2NrZXRzL1dlYlNvY2tldENoYW5uZWwuaDoKKyAg ICAgICAgKiB3ZWJzb2NrZXRzL1dlYlNvY2tldEhhbmRzaGFrZS5jcHA6CisgICAgICAgIChXZWJD b3JlOjpXZWJTb2NrZXRIYW5kc2hha2U6OldlYlNvY2tldEhhbmRzaGFrZSk6CisgICAgICAgICog d2Vic29ja2V0cy9XZWJTb2NrZXRIYW5kc2hha2UuaDoKKwogMjAxMS0wNy0wOCAgTWlrZSBSZWVk ICA8cmVlZEBnb29nbGUuY29tPgogCiAgICAgICAgIHJlbW92ZSAoZW1wdHkpIGluZGlyZWN0aW9u IGJldHdlZW4gR3JhcGhpY3NDb250ZXh0UGxhdGZvcm1Qcml2YXRlIGFuZCBQbGF0Zm9ybUNvbnRl eHRTa2lhCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS93ZWJzb2NrZXRzL1dlYlNvY2tldENo YW5uZWwuY3BwIGIvU291cmNlL1dlYkNvcmUvd2Vic29ja2V0cy9XZWJTb2NrZXRDaGFubmVsLmNw cAppbmRleCA0Y2EyOWQ3NzI2NzRiMjNkYTkxMzExMTk0NWMzZTc2ZjA1NzVmNjI2Li42ZmIzMWFm MDNhZmNjMWNlYTAxNGVlYTdhMzhjMTFmZWM3ZjM2YTI5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS93ZWJzb2NrZXRzL1dlYlNvY2tldENoYW5uZWwuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L3dlYnNvY2tldHMvV2ViU29ja2V0Q2hhbm5lbC5jcHAKQEAgLTQyLDYgKzQyLDcgQEAKICNpbmNs dWRlICJQcm9ncmVzc1RyYWNrZXIuaCIKICNpbmNsdWRlICJTY3JpcHRDYWxsU3RhY2suaCIKICNp bmNsdWRlICJTY3JpcHRFeGVjdXRpb25Db250ZXh0LmgiCisjaW5jbHVkZSAiU2V0dGluZ3MuaCIK ICNpbmNsdWRlICJTb2NrZXRTdHJlYW1FcnJvci5oIgogI2luY2x1ZGUgIlNvY2tldFN0cmVhbUhh bmRsZS5oIgogI2luY2x1ZGUgIldlYlNvY2tldENoYW5uZWxDbGllbnQuaCIKQEAgLTYxLDcgKzYy LDYgQEAgY29uc3QgZG91YmxlIFRDUE1heGltdW1TZWdtZW50TGlmZXRpbWUgPSAyICogNjAuMDsK IFdlYlNvY2tldENoYW5uZWw6OldlYlNvY2tldENoYW5uZWwoU2NyaXB0RXhlY3V0aW9uQ29udGV4 dCogY29udGV4dCwgV2ViU29ja2V0Q2hhbm5lbENsaWVudCogY2xpZW50LCBjb25zdCBLVVJMJiB1 cmwsIGNvbnN0IFN0cmluZyYgcHJvdG9jb2wpCiAgICAgOiBtX2NvbnRleHQoY29udGV4dCkKICAg ICAsIG1fY2xpZW50KGNsaWVudCkKLSAgICAsIG1faGFuZHNoYWtlKHVybCwgcHJvdG9jb2wsIGNv bnRleHQpCiAgICAgLCBtX2J1ZmZlcigwKQogICAgICwgbV9idWZmZXJTaXplKDApCiAgICAgLCBt X3Jlc3VtZVRpbWVyKHRoaXMsICZXZWJTb2NrZXRDaGFubmVsOjpyZXN1bWVUaW1lckZpcmVkKQpA QCAtNzMsMTEgKzczLDE2IEBAIFdlYlNvY2tldENoYW5uZWw6OldlYlNvY2tldENoYW5uZWwoU2Ny aXB0RXhlY3V0aW9uQ29udGV4dCogY29udGV4dCwgV2ViU29ja2V0Q2hhCiAgICAgLCBtX3Nob3Vs ZERpc2NhcmRSZWNlaXZlZERhdGEoZmFsc2UpCiAgICAgLCBtX3VuaGFuZGxlZEJ1ZmZlcmVkQW1v dW50KDApCiAgICAgLCBtX2lkZW50aWZpZXIoMCkKKyAgICAsIG1fdXNlSGl4aWU3NlByb3RvY29s KHRydWUpCiB7Ci0gICAgaWYgKG1fY29udGV4dC0+aXNEb2N1bWVudCgpKQotICAgICAgICBpZiAo UGFnZSogcGFnZSA9IHN0YXRpY19jYXN0PERvY3VtZW50Kj4obV9jb250ZXh0KS0+cGFnZSgpKQot ICAgICAgICAgICAgbV9pZGVudGlmaWVyID0gcGFnZS0+cHJvZ3Jlc3MoKS0+Y3JlYXRlVW5pcXVl SWRlbnRpZmllcigpOwotCisgICAgQVNTRVJUKG1fY29udGV4dC0+aXNEb2N1bWVudCgpKTsKKyAg ICBEb2N1bWVudCogZG9jdW1lbnQgPSBzdGF0aWNfY2FzdDxEb2N1bWVudCo+KG1fY29udGV4dCk7 CisgICAgaWYgKFNldHRpbmdzKiBzZXR0aW5ncyA9IGRvY3VtZW50LT5zZXR0aW5ncygpKQorICAg ICAgICBtX3VzZUhpeGllNzZQcm90b2NvbCA9IHNldHRpbmdzLT51c2VIaXhpZTc2V2ViU29ja2V0 UHJvdG9jb2woKTsKKyAgICBtX2hhbmRzaGFrZSA9IGFkb3B0UHRyKG5ldyBXZWJTb2NrZXRIYW5k c2hha2UodXJsLCBwcm90b2NvbCwgY29udGV4dCwgbV91c2VIaXhpZTc2UHJvdG9jb2wpKTsKKwor ICAgIGlmIChQYWdlKiBwYWdlID0gZG9jdW1lbnQtPnBhZ2UoKSkKKyAgICAgICAgbV9pZGVudGlm aWVyID0gcGFnZS0+cHJvZ3Jlc3MoKS0+Y3JlYXRlVW5pcXVlSWRlbnRpZmllcigpOwogICAgIGlm IChtX2lkZW50aWZpZXIpCiAgICAgICAgIEluc3BlY3Rvckluc3RydW1lbnRhdGlvbjo6ZGlkQ3Jl YXRlV2ViU29ja2V0KG1fY29udGV4dCwgbV9pZGVudGlmaWVyLCB1cmwsIG1fY29udGV4dC0+dXJs KCkpOwogfQpAQCAtOTIsOSArOTcsOSBAQCB2b2lkIFdlYlNvY2tldENoYW5uZWw6OmNvbm5lY3Qo KQogICAgIExPRyhOZXR3b3JrLCAiV2ViU29ja2V0Q2hhbm5lbCAlcCBjb25uZWN0IiwgdGhpcyk7 CiAgICAgQVNTRVJUKCFtX2hhbmRsZSk7CiAgICAgQVNTRVJUKCFtX3N1c3BlbmRlZCk7Ci0gICAg bV9oYW5kc2hha2UucmVzZXQoKTsKKyAgICBtX2hhbmRzaGFrZS0+cmVzZXQoKTsKICAgICByZWYo KTsKLSAgICBtX2hhbmRsZSA9IFNvY2tldFN0cmVhbUhhbmRsZTo6Y3JlYXRlKG1faGFuZHNoYWtl LnVybCgpLCB0aGlzKTsKKyAgICBtX2hhbmRsZSA9IFNvY2tldFN0cmVhbUhhbmRsZTo6Y3JlYXRl KG1faGFuZHNoYWtlLT51cmwoKSwgdGhpcyk7CiB9CiAKIGJvb2wgV2ViU29ja2V0Q2hhbm5lbDo6 c2VuZChjb25zdCBTdHJpbmcmIG1zZykKQEAgLTEzNCw3ICsxMzksNyBAQCB2b2lkIFdlYlNvY2tl dENoYW5uZWw6OmZhaWwoY29uc3QgU3RyaW5nJiByZWFzb24pCiAgICAgTE9HKE5ldHdvcmssICJX ZWJTb2NrZXRDaGFubmVsICVwIGZhaWw6ICVzIiwgdGhpcywgcmVhc29uLnV0ZjgoKS5kYXRhKCkp OwogICAgIEFTU0VSVCghbV9zdXNwZW5kZWQpOwogICAgIGlmIChtX2NvbnRleHQpCi0gICAgICAg IG1fY29udGV4dC0+YWRkTWVzc2FnZShKU01lc3NhZ2VTb3VyY2UsIExvZ01lc3NhZ2VUeXBlLCBF cnJvck1lc3NhZ2VMZXZlbCwgcmVhc29uLCAwLCBtX2hhbmRzaGFrZS5jbGllbnRPcmlnaW4oKSwg MCk7CisgICAgICAgIG1fY29udGV4dC0+YWRkTWVzc2FnZShKU01lc3NhZ2VTb3VyY2UsIExvZ01l c3NhZ2VUeXBlLCBFcnJvck1lc3NhZ2VMZXZlbCwgcmVhc29uLCAwLCBtX2hhbmRzaGFrZS0+Y2xp ZW50T3JpZ2luKCksIDApOwogICAgIGlmIChtX2hhbmRsZSAmJiAhbV9jbG9zZWQpCiAgICAgICAg IG1faGFuZGxlLT5kaXNjb25uZWN0KCk7IC8vIFdpbGwgY2FsbCBkaWRDbG9zZSgpLgogfQpAQCAt MTQ0LDcgKzE0OSw3IEBAIHZvaWQgV2ViU29ja2V0Q2hhbm5lbDo6ZGlzY29ubmVjdCgpCiAgICAg TE9HKE5ldHdvcmssICJXZWJTb2NrZXRDaGFubmVsICVwIGRpc2Nvbm5lY3QiLCB0aGlzKTsKICAg ICBpZiAobV9pZGVudGlmaWVyICYmIG1fY29udGV4dCkKICAgICAgICAgSW5zcGVjdG9ySW5zdHJ1 bWVudGF0aW9uOjpkaWRDbG9zZVdlYlNvY2tldChtX2NvbnRleHQsIG1faWRlbnRpZmllcik7Ci0g ICAgbV9oYW5kc2hha2UuY2xlYXJTY3JpcHRFeGVjdXRpb25Db250ZXh0KCk7CisgICAgbV9oYW5k c2hha2UtPmNsZWFyU2NyaXB0RXhlY3V0aW9uQ29udGV4dCgpOwogICAgIG1fY2xpZW50ID0gMDsK ICAgICBtX2NvbnRleHQgPSAwOwogICAgIGlmIChtX2hhbmRsZSkKQEAgLTE3MCw4ICsxNzUsOCBA QCB2b2lkIFdlYlNvY2tldENoYW5uZWw6OmRpZE9wZW4oU29ja2V0U3RyZWFtSGFuZGxlKiBoYW5k bGUpCiAgICAgaWYgKCFtX2NvbnRleHQpCiAgICAgICAgIHJldHVybjsKICAgICBpZiAobV9pZGVu dGlmaWVyKQotICAgICAgICBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb246OndpbGxTZW5kV2ViU29j a2V0SGFuZHNoYWtlUmVxdWVzdChtX2NvbnRleHQsIG1faWRlbnRpZmllciwgbV9oYW5kc2hha2Uu Y2xpZW50SGFuZHNoYWtlUmVxdWVzdCgpKTsKLSAgICBDU3RyaW5nIGhhbmRzaGFrZU1lc3NhZ2Ug PSBtX2hhbmRzaGFrZS5jbGllbnRIYW5kc2hha2VNZXNzYWdlKCk7CisgICAgICAgIEluc3BlY3Rv ckluc3RydW1lbnRhdGlvbjo6d2lsbFNlbmRXZWJTb2NrZXRIYW5kc2hha2VSZXF1ZXN0KG1fY29u dGV4dCwgbV9pZGVudGlmaWVyLCBtX2hhbmRzaGFrZS0+Y2xpZW50SGFuZHNoYWtlUmVxdWVzdCgp KTsKKyAgICBDU3RyaW5nIGhhbmRzaGFrZU1lc3NhZ2UgPSBtX2hhbmRzaGFrZS0+Y2xpZW50SGFu ZHNoYWtlTWVzc2FnZSgpOwogICAgIGlmICghaGFuZGxlLT5zZW5kKGhhbmRzaGFrZU1lc3NhZ2Uu ZGF0YSgpLCBoYW5kc2hha2VNZXNzYWdlLmxlbmd0aCgpKSkKICAgICAgICAgZmFpbCgiRmFpbGVk IHRvIHNlbmQgV2ViU29ja2V0IGhhbmRzaGFrZS4iKTsKIH0KQEAgLTI0MSw5ICsyNDYsOSBAQCB2 b2lkIFdlYlNvY2tldENoYW5uZWw6OmRpZEZhaWwoU29ja2V0U3RyZWFtSGFuZGxlKiBoYW5kbGUs IGNvbnN0IFNvY2tldFN0cmVhbUVycgogICAgICAgICBlbHNlCiAgICAgICAgICAgICBtZXNzYWdl ID0gIldlYlNvY2tldCBuZXR3b3JrIGVycm9yOiAiICsgZXJyb3IubG9jYWxpemVkRGVzY3JpcHRp b24oKTsKICAgICAgICAgU3RyaW5nIGZhaWxpbmdVUkwgPSBlcnJvci5mYWlsaW5nVVJMKCk7Ci0g ICAgICAgIEFTU0VSVChmYWlsaW5nVVJMLmlzTnVsbCgpIHx8IG1faGFuZHNoYWtlLnVybCgpLnN0 cmluZygpID09IGZhaWxpbmdVUkwpOworICAgICAgICBBU1NFUlQoZmFpbGluZ1VSTC5pc051bGwo KSB8fCBtX2hhbmRzaGFrZS0+dXJsKCkuc3RyaW5nKCkgPT0gZmFpbGluZ1VSTCk7CiAgICAgICAg IGlmIChmYWlsaW5nVVJMLmlzTnVsbCgpKQotICAgICAgICAgICAgZmFpbGluZ1VSTCA9IG1faGFu ZHNoYWtlLnVybCgpLnN0cmluZygpOworICAgICAgICAgICAgZmFpbGluZ1VSTCA9IG1faGFuZHNo YWtlLT51cmwoKS5zdHJpbmcoKTsKICAgICAgICAgbV9jb250ZXh0LT5hZGRNZXNzYWdlKE90aGVy TWVzc2FnZVNvdXJjZSwgTmV0d29ya0Vycm9yTWVzc2FnZVR5cGUsIEVycm9yTWVzc2FnZUxldmVs LCBtZXNzYWdlLCAwLCBmYWlsaW5nVVJMLCAwKTsKICAgICB9CiAgICAgbV9zaG91bGREaXNjYXJk UmVjZWl2ZWREYXRhID0gdHJ1ZTsKQEAgLTMwNywxOSArMzEyLDE5IEBAIGJvb2wgV2ViU29ja2V0 Q2hhbm5lbDo6cHJvY2Vzc0J1ZmZlcigpCiAKICAgICBSZWZQdHI8V2ViU29ja2V0Q2hhbm5lbD4g cHJvdGVjdCh0aGlzKTsgLy8gVGhlIGNsaWVudCBjYW4gY2xvc2UgdGhlIGNoYW5uZWwsIHBvdGVu dGlhbGx5IHJlbW92aW5nIHRoZSBsYXN0IHJlZmVyZW5jZS4KIAotICAgIGlmIChtX2hhbmRzaGFr ZS5tb2RlKCkgPT0gV2ViU29ja2V0SGFuZHNoYWtlOjpJbmNvbXBsZXRlKSB7Ci0gICAgICAgIGlu dCBoZWFkZXJMZW5ndGggPSBtX2hhbmRzaGFrZS5yZWFkU2VydmVySGFuZHNoYWtlKG1fYnVmZmVy LCBtX2J1ZmZlclNpemUpOworICAgIGlmIChtX2hhbmRzaGFrZS0+bW9kZSgpID09IFdlYlNvY2tl dEhhbmRzaGFrZTo6SW5jb21wbGV0ZSkgeworICAgICAgICBpbnQgaGVhZGVyTGVuZ3RoID0gbV9o YW5kc2hha2UtPnJlYWRTZXJ2ZXJIYW5kc2hha2UobV9idWZmZXIsIG1fYnVmZmVyU2l6ZSk7CiAg ICAgICAgIGlmIChoZWFkZXJMZW5ndGggPD0gMCkKICAgICAgICAgICAgIHJldHVybiBmYWxzZTsK LSAgICAgICAgaWYgKG1faGFuZHNoYWtlLm1vZGUoKSA9PSBXZWJTb2NrZXRIYW5kc2hha2U6OkNv bm5lY3RlZCkgeworICAgICAgICBpZiAobV9oYW5kc2hha2UtPm1vZGUoKSA9PSBXZWJTb2NrZXRI YW5kc2hha2U6OkNvbm5lY3RlZCkgewogICAgICAgICAgICAgaWYgKG1faWRlbnRpZmllcikKLSAg ICAgICAgICAgICAgICBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb246OmRpZFJlY2VpdmVXZWJTb2Nr ZXRIYW5kc2hha2VSZXNwb25zZShtX2NvbnRleHQsIG1faWRlbnRpZmllciwgbV9oYW5kc2hha2Uu c2VydmVySGFuZHNoYWtlUmVzcG9uc2UoKSk7Ci0gICAgICAgICAgICBpZiAoIW1faGFuZHNoYWtl LnNlcnZlclNldENvb2tpZSgpLmlzRW1wdHkoKSkgeworICAgICAgICAgICAgICAgIEluc3BlY3Rv ckluc3RydW1lbnRhdGlvbjo6ZGlkUmVjZWl2ZVdlYlNvY2tldEhhbmRzaGFrZVJlc3BvbnNlKG1f Y29udGV4dCwgbV9pZGVudGlmaWVyLCBtX2hhbmRzaGFrZS0+c2VydmVySGFuZHNoYWtlUmVzcG9u c2UoKSk7CisgICAgICAgICAgICBpZiAoIW1faGFuZHNoYWtlLT5zZXJ2ZXJTZXRDb29raWUoKS5p c0VtcHR5KCkpIHsKICAgICAgICAgICAgICAgICBpZiAobV9jb250ZXh0LT5pc0RvY3VtZW50KCkp IHsKICAgICAgICAgICAgICAgICAgICAgRG9jdW1lbnQqIGRvY3VtZW50ID0gc3RhdGljX2Nhc3Q8 RG9jdW1lbnQqPihtX2NvbnRleHQpOwogICAgICAgICAgICAgICAgICAgICBpZiAoY29va2llc0Vu YWJsZWQoZG9jdW1lbnQpKSB7CiAgICAgICAgICAgICAgICAgICAgICAgICBFeGNlcHRpb25Db2Rl IGVjOyAvLyBFeGNlcHRpb24gKGZvciBzYW5kYm94ZWQgZG9jdW1lbnRzKSBpZ25vcmVkLgotICAg ICAgICAgICAgICAgICAgICAgICAgZG9jdW1lbnQtPnNldENvb2tpZShtX2hhbmRzaGFrZS5zZXJ2 ZXJTZXRDb29raWUoKSwgZWMpOworICAgICAgICAgICAgICAgICAgICAgICAgZG9jdW1lbnQtPnNl dENvb2tpZShtX2hhbmRzaGFrZS0+c2VydmVyU2V0Q29va2llKCksIGVjKTsKICAgICAgICAgICAg ICAgICAgICAgfQogICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgIH0KQEAgLTMzMCwxNCAr MzM1LDE0IEBAIGJvb2wgV2ViU29ja2V0Q2hhbm5lbDo6cHJvY2Vzc0J1ZmZlcigpCiAgICAgICAg ICAgICBMT0coTmV0d29yaywgInJlbWFpbmluZyBpbiByZWFkIGJ1ZiAlbHUiLCBzdGF0aWNfY2Fz dDx1bnNpZ25lZCBsb25nPihtX2J1ZmZlclNpemUpKTsKICAgICAgICAgICAgIHJldHVybiBtX2J1 ZmZlcjsKICAgICAgICAgfQotICAgICAgICBBU1NFUlQobV9oYW5kc2hha2UubW9kZSgpID09IFdl YlNvY2tldEhhbmRzaGFrZTo6RmFpbGVkKTsKKyAgICAgICAgQVNTRVJUKG1faGFuZHNoYWtlLT5t b2RlKCkgPT0gV2ViU29ja2V0SGFuZHNoYWtlOjpGYWlsZWQpOwogICAgICAgICBMT0coTmV0d29y aywgIldlYlNvY2tldENoYW5uZWwgJXAgY29ubmVjdGlvbiBmYWlsZWQiLCB0aGlzKTsKICAgICAg ICAgc2tpcEJ1ZmZlcihoZWFkZXJMZW5ndGgpOwogICAgICAgICBtX3Nob3VsZERpc2NhcmRSZWNl aXZlZERhdGEgPSB0cnVlOwotICAgICAgICBmYWlsKG1faGFuZHNoYWtlLmZhaWx1cmVSZWFzb24o KSk7CisgICAgICAgIGZhaWwobV9oYW5kc2hha2UtPmZhaWx1cmVSZWFzb24oKSk7CiAgICAgICAg IHJldHVybiBmYWxzZTsKICAgICB9Ci0gICAgaWYgKG1faGFuZHNoYWtlLm1vZGUoKSAhPSBXZWJT b2NrZXRIYW5kc2hha2U6OkNvbm5lY3RlZCkKKyAgICBpZiAobV9oYW5kc2hha2UtPm1vZGUoKSAh PSBXZWJTb2NrZXRIYW5kc2hha2U6OkNvbm5lY3RlZCkKICAgICAgICAgcmV0dXJuIGZhbHNlOwog CiAgICAgY29uc3QgY2hhciogbmV4dEZyYW1lID0gbV9idWZmZXI7CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS93ZWJzb2NrZXRzL1dlYlNvY2tldENoYW5uZWwuaCBiL1NvdXJjZS9XZWJDb3Jl L3dlYnNvY2tldHMvV2ViU29ja2V0Q2hhbm5lbC5oCmluZGV4IDVkNTcyODk2Y2NkMzIxMmFiNjM0 NjVjMTU1YjkyYmUwYjI2ZjljMmMuLjY0MjFmZWI4Y2UwNDM1ZDA0NDljMTVkOGRkM2I4MzIzOWNh YzIwYTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3dlYnNvY2tldHMvV2ViU29ja2V0Q2hh bm5lbC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3dlYnNvY2tldHMvV2ViU29ja2V0Q2hhbm5lbC5o CkBAIC05MCw3ICs5MCw3IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogICAgICAgICBTY3JpcHRF eGVjdXRpb25Db250ZXh0KiBtX2NvbnRleHQ7CiAgICAgICAgIFdlYlNvY2tldENoYW5uZWxDbGll bnQqIG1fY2xpZW50OwotICAgICAgICBXZWJTb2NrZXRIYW5kc2hha2UgbV9oYW5kc2hha2U7Cisg ICAgICAgIE93blB0cjxXZWJTb2NrZXRIYW5kc2hha2U+IG1faGFuZHNoYWtlOwogICAgICAgICBS ZWZQdHI8U29ja2V0U3RyZWFtSGFuZGxlPiBtX2hhbmRsZTsKICAgICAgICAgY2hhciogbV9idWZm ZXI7CiAgICAgICAgIHNpemVfdCBtX2J1ZmZlclNpemU7CkBAIC0xMDUsNiArMTA1LDggQEAgbmFt ZXNwYWNlIFdlYkNvcmUgewogICAgICAgICB1bnNpZ25lZCBsb25nIG1fdW5oYW5kbGVkQnVmZmVy ZWRBbW91bnQ7CiAKICAgICAgICAgdW5zaWduZWQgbG9uZyBtX2lkZW50aWZpZXI7IC8vIG1faWRl bnRpZmllciA9PSAwIG1lYW5zIHRoYXQgd2UgY291bGQgbm90IG9idGFpbiBhIHZhbGlkIGlkZW50 aWZpZXIuCisKKyAgICAgICAgYm9vbCBtX3VzZUhpeGllNzZQcm90b2NvbDsKICAgICB9OwogCiB9 IC8vIG5hbWVzcGFjZSBXZWJDb3JlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS93ZWJzb2Nr ZXRzL1dlYlNvY2tldEhhbmRzaGFrZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS93ZWJzb2NrZXRzL1dl YlNvY2tldEhhbmRzaGFrZS5jcHAKaW5kZXggNzRlNDM2MTc0NjAzNjMzZTAyNTMwNmE2MDRmY2Qw ZDNjNDMyMmEyMC4uMjEwYzMwZWU2ZWZhYThkNWY0OTgwNTE0N2Q0ODI4MDhjYjI3YWUyMCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvd2Vic29ja2V0cy9XZWJTb2NrZXRIYW5kc2hha2UuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL3dlYnNvY2tldHMvV2ViU29ja2V0SGFuZHNoYWtlLmNwcApA QCAtMTU5LDExICsxNTksMTIgQEAgc3RhdGljIHZvaWQgZ2VuZXJhdGVFeHBlY3RlZENoYWxsZW5n ZVJlc3BvbnNlKHVpbnQzMl90IG51bWJlcjEsIHVpbnQzMl90IG51bWJlcjIKICAgICBtZW1jcHko ZXhwZWN0ZWRDaGFsbGVuZ2UsIGRpZ2VzdC5kYXRhKCksIDE2KTsKIH0KIAotV2ViU29ja2V0SGFu ZHNoYWtlOjpXZWJTb2NrZXRIYW5kc2hha2UoY29uc3QgS1VSTCYgdXJsLCBjb25zdCBTdHJpbmcm IHByb3RvY29sLCBTY3JpcHRFeGVjdXRpb25Db250ZXh0KiBjb250ZXh0KQorV2ViU29ja2V0SGFu ZHNoYWtlOjpXZWJTb2NrZXRIYW5kc2hha2UoY29uc3QgS1VSTCYgdXJsLCBjb25zdCBTdHJpbmcm IHByb3RvY29sLCBTY3JpcHRFeGVjdXRpb25Db250ZXh0KiBjb250ZXh0LCBib29sIHVzZUhpeGll NzZQcm90b2NvbCkKICAgICA6IG1fdXJsKHVybCkKICAgICAsIG1fY2xpZW50UHJvdG9jb2wocHJv dG9jb2wpCiAgICAgLCBtX3NlY3VyZShtX3VybC5wcm90b2NvbElzKCJ3c3MiKSkKICAgICAsIG1f Y29udGV4dChjb250ZXh0KQorICAgICwgbV91c2VIaXhpZTc2UHJvdG9jb2wodXNlSGl4aWU3NlBy b3RvY29sKQogICAgICwgbV9tb2RlKEluY29tcGxldGUpCiB7CiAgICAgdWludDMyX3QgbnVtYmVy MTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3dlYnNvY2tldHMvV2ViU29ja2V0SGFuZHNo YWtlLmggYi9Tb3VyY2UvV2ViQ29yZS93ZWJzb2NrZXRzL1dlYlNvY2tldEhhbmRzaGFrZS5oCmlu ZGV4IDU1NTZlZWY1MTQ3MTI3NGJkNDE4NTk5M2NkODZmNjMzMGJiZTI2NTYuLjM4MDhlNjExZjYw NjA4MjcyYWNhMmJhNTU4OTg5MjNhYjgyNTQwNjIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3dlYnNvY2tldHMvV2ViU29ja2V0SGFuZHNoYWtlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvd2Vi c29ja2V0cy9XZWJTb2NrZXRIYW5kc2hha2UuaApAQCAtNDgsNyArNDgsNyBAQCBuYW1lc3BhY2Ug V2ViQ29yZSB7CiAgICAgICAgIGVudW0gTW9kZSB7CiAgICAgICAgICAgICBJbmNvbXBsZXRlLCBO b3JtYWwsIEZhaWxlZCwgQ29ubmVjdGVkCiAgICAgICAgIH07Ci0gICAgICAgIFdlYlNvY2tldEhh bmRzaGFrZShjb25zdCBLVVJMJiwgY29uc3QgU3RyaW5nJiBwcm90b2NvbCwgU2NyaXB0RXhlY3V0 aW9uQ29udGV4dCopOworICAgICAgICBXZWJTb2NrZXRIYW5kc2hha2UoY29uc3QgS1VSTCYsIGNv bnN0IFN0cmluZyYgcHJvdG9jb2wsIFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQqLCBib29sIHVzZUhp eGllNzZQcm90b2NvbCk7CiAgICAgICAgIH5XZWJTb2NrZXRIYW5kc2hha2UoKTsKIAogICAgICAg ICBjb25zdCBLVVJMJiB1cmwoKSBjb25zdDsKQEAgLTk3LDYgKzk3LDcgQEAgbmFtZXNwYWNlIFdl YkNvcmUgewogICAgICAgICBTdHJpbmcgbV9jbGllbnRQcm90b2NvbDsKICAgICAgICAgYm9vbCBt X3NlY3VyZTsKICAgICAgICAgU2NyaXB0RXhlY3V0aW9uQ29udGV4dCogbV9jb250ZXh0OworICAg ICAgICBib29sIG1fdXNlSGl4aWU3NlByb3RvY29sOwogCiAgICAgICAgIE1vZGUgbV9tb2RlOwog Cg==