82244 2012-03-26 13:53:23 -0700 Remove obsolete FormDataStreamMac code 2012-03-26 15:52:15 -0700 1 1 1 Unclassified WebKit Page Loading 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 ap ap andersca beidson mitz psolanki oldest_to_newest 588100 0 ap 2012-03-26 13:53:23 -0700 The didSendBodyData delegate exists starting with 10.6, we don't need to check at runtime, or even to keep the code. 588107 1 133887 ap 2012-03-26 13:57:16 -0700 Created attachment 133887 proposed patch One piece of mystery code less in WebCore. 588187 2 133887 buildbot 2012-03-26 15:22:39 -0700 Comment on attachment 133887 proposed patch Attachment 133887 did not pass mac-ews (mac): Output: http://queues.webkit.org/results/12143115 588231 3 ap 2012-03-26 15:52:15 -0700 Committed <http://trac.webkit.org/changeset/112162>. 133887 2012-03-26 13:57:16 -0700 2012-03-26 15:22:39 -0700 proposed patch LeopardCode.txt text/plain 9170 ap SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDExMjE0NCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI2IEBACisyMDEyLTAzLTI2ICBBbGV4ZXkg UHJvc2t1cnlha292ICA8YXBAYXBwbGUuY29tPgorCisgICAgICAgIFJlbW92ZSBvYnNvbGV0ZSBG b3JtRGF0YVN0cmVhbU1hYyBjb2RlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD04MjI0NAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgICogcGxhdGZvcm0vbmV0d29yay9SZXNvdXJjZUhhbmRsZS5oOgorICAgICAg ICBSZW1vdmVkIFJlc291cmNlSGFuZGxlOjpkaWRTZW5kQm9keURhdGFEZWxlZ2F0ZUV4aXN0cygp LgorCisgICAgICAgICogcGxhdGZvcm0vbmV0d29yay9tYWMvRm9ybURhdGFTdHJlYW1NYWMuaDoK KyAgICAgICAgKiBwbGF0Zm9ybS9uZXR3b3JrL21hYy9Gb3JtRGF0YVN0cmVhbU1hYy5tbToKKyAg ICAgICAgUmVtb3ZlZCBjb2RlIHRoYXQgd2FzIG5lZWRlZCB0byBjYWxsIFJlc291cmNlTG9hZGVy Q2xpZW50OjpkaWRTZW5kRGF0YSgpIGJlZm9yZSBGb3VuZGF0aW9uCisgICAgICAgIGFkZGVkIHN1 cHBvcnQgZm9yIGl0LgorCisgICAgICAgICogcGxhdGZvcm0vbmV0d29yay9tYWMvUmVzb3VyY2VI YW5kbGVNYWMubW06CisgICAgICAgIChXZWJDb3JlOjpSZXNvdXJjZUhhbmRsZTo6c3RhcnQpOgor ICAgICAgICAoV2ViQ29yZTo6UmVzb3VyY2VIYW5kbGU6OmNhbmNlbCk6CisgICAgICAgICgtW1dl YkNvcmVSZXNvdXJjZUhhbmRsZUFzRGVsZWdhdGUgY29ubmVjdGlvbjp3aWxsU2VuZFJlcXVlc3Q6 cmVkaXJlY3RSZXNwb25zZTpdKToKKyAgICAgICAgKC1bV2ViQ29yZVJlc291cmNlSGFuZGxlQXNE ZWxlZ2F0ZSBjb25uZWN0aW9uRGlkRmluaXNoTG9hZGluZzpdKToKKyAgICAgICAgKC1bV2ViQ29y ZVJlc291cmNlSGFuZGxlQXNEZWxlZ2F0ZSBjb25uZWN0aW9uOmRpZEZhaWxXaXRoRXJyb3I6XSk6 CisgICAgICAgIFdlIG5vIGxvbmdlciBuZWVkIHRvIGFzc29jaWF0ZSBzdHJlYW1zIHdpdGggUmVz b3VyY2VIYW5kbGVzIQorCiAyMDEyLTAzLTI2ICBOYXRlIENoYXBpbiAgPGphcGhldEBjaHJvbWl1 bS5vcmc+CiAKICAgICAgICAgU2ltcGxpZnkgc2V0dGluZyBsb2FkaW5nIHN0YXRlIGluIERvY3Vt ZW50TG9hZGVyCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL1Jlc291cmNl SGFuZGxlLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9S ZXNvdXJjZUhhbmRsZS5oCShyZXZpc2lvbiAxMTE1NTQpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9uZXR3b3JrL1Jlc291cmNlSGFuZGxlLmgJKHdvcmtpbmcgY29weSkKQEAgLTEwNiw5ICsx MDYsNiBAQCBwdWJsaWM6CiAKICAgICBzdGF0aWMgYm9vbCB3aWxsTG9hZEZyb21DYWNoZShSZXNv dXJjZVJlcXVlc3QmLCBGcmFtZSopOwogICAgIHN0YXRpYyB2b2lkIGNhY2hlTWV0YWRhdGEoY29u c3QgUmVzb3VyY2VSZXNwb25zZSYsIGNvbnN0IFZlY3RvcjxjaGFyPiYpOwotI2lmIFBMQVRGT1JN KE1BQykKLSAgICBzdGF0aWMgYm9vbCBkaWRTZW5kQm9keURhdGFEZWxlZ2F0ZUV4aXN0cygpOwot I2VuZGlmCiAKICAgICB2aXJ0dWFsIH5SZXNvdXJjZUhhbmRsZSgpOwogCkluZGV4OiBTb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL21hYy9Gb3JtRGF0YVN0cmVhbU1hYy5oCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvbWFjL0Zvcm1EYXRhU3RyZWFt TWFjLmgJKHJldmlzaW9uIDExMTU1NCkKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdv cmsvbWFjL0Zvcm1EYXRhU3RyZWFtTWFjLmgJKHdvcmtpbmcgY29weSkKQEAgLTM4LDE0ICszOCwx MCBAQAogbmFtZXNwYWNlIFdlYkNvcmUgewogCiAgICAgY2xhc3MgRm9ybURhdGE7Ci0gICAgY2xh c3MgUmVzb3VyY2VIYW5kbGU7CiAKICAgICB2b2lkIHNldEhUVFBCb2R5KE5TTXV0YWJsZVVSTFJl cXVlc3QgKiwgUGFzc1JlZlB0cjxGb3JtRGF0YT4pOwogICAgIEZvcm1EYXRhKiBodHRwQm9keUZy b21TdHJlYW0oTlNJbnB1dFN0cmVhbSAqKTsKIAotICAgIHZvaWQgYXNzb2NpYXRlU3RyZWFtV2l0 aFJlc291cmNlSGFuZGxlKE5TSW5wdXRTdHJlYW0gKiwgUmVzb3VyY2VIYW5kbGUqKTsKLSAgICB2 b2lkIGRpc2Fzc29jaWF0ZVN0cmVhbVdpdGhSZXNvdXJjZUhhbmRsZShOU0lucHV0U3RyZWFtICop OwotCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCiAKICNlbmRpZiAvLyAhVVNFKENGTkVUV09SSykK SW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvbWFjL0Zvcm1EYXRhU3RyZWFt TWFjLm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvbWFj L0Zvcm1EYXRhU3RyZWFtTWFjLm1tCShyZXZpc2lvbiAxMTE1NTQpCisrKyBTb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9uZXR3b3JrL21hYy9Gb3JtRGF0YVN0cmVhbU1hYy5tbQkod29ya2luZyBjb3B5 KQpAQCAtMjYsOCArMjYsNiBAQAogICogVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9G IFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KICAqLwogCi0vKiBvcmlnaW5hbGx5IHdy aXR0ZW4gYnkgQmVja3kgV2lsbHJpY2gsIGFkZGl0aW9uYWwgY29kZSBieSBEYXJpbiBBZGxlciAq LwotCiAjaW1wb3J0ICJjb25maWcuaCIKICNpbXBvcnQgIkZvcm1EYXRhU3RyZWFtTWFjLmgiCiAK QEAgLTM2LDE0ICszNCwxMSBAQAogI2ltcG9ydCAiQmxvYlJlZ2lzdHJ5SW1wbC5oIgogI2ltcG9y dCAiRmlsZVN5c3RlbS5oIgogI2ltcG9ydCAiRm9ybURhdGEuaCIKLSNpbXBvcnQgIlJlc291cmNl SGFuZGxlLmgiCi0jaW1wb3J0ICJSZXNvdXJjZUhhbmRsZUNsaWVudC5oIgogI2ltcG9ydCAiU2No ZWR1bGVQYWlyLmgiCiAjaW1wb3J0ICJXZWJDb3JlU3lzdGVtSW50ZXJmYWNlLmgiCiAjaW1wb3J0 IDxzeXMvc3RhdC5oPgogI2ltcG9ydCA8c3lzL3R5cGVzLmg+CiAjaW1wb3J0IDx3dGYvQXNzZXJ0 aW9ucy5oPgotI2ltcG9ydCA8d3RmL0hhc2hNYXAuaD4KICNpbXBvcnQgPHd0Zi9NYWluVGhyZWFk Lmg+CiAjaW1wb3J0IDx3dGYvU3RkTGliRXh0cmFzLmg+CiAjaW1wb3J0IDx3dGYvVGhyZWFkaW5n Lmg+CkBAIC02OCw2OCArNjMsNiBAQCBzdGF0aWMgTlNNYXBUYWJsZSAqc3RyZWFtRmllbGRzTWFw KCkKICAgICByZXR1cm4gc3RyZWFtRmllbGRzTWFwOwogfQogCi10eXBlZGVmIEhhc2hNYXA8Q0ZS ZWFkU3RyZWFtUmVmLCBSZWZQdHI8UmVzb3VyY2VIYW5kbGU+ID4gU3RyZWFtUmVzb3VyY2VIYW5k bGVNYXA7Ci1zdGF0aWMgU3RyZWFtUmVzb3VyY2VIYW5kbGVNYXAmIGdldFN0cmVhbVJlc291cmNl SGFuZGxlTWFwKCkKLXsKLSAgICBERUZJTkVfU1RBVElDX0xPQ0FMKFN0cmVhbVJlc291cmNlSGFu ZGxlTWFwLCBzdHJlYW1SZXNvdXJjZUhhbmRsZU1hcCwgKCkpOwotICAgIHJldHVybiBzdHJlYW1S ZXNvdXJjZUhhbmRsZU1hcDsKLX0KLQotdm9pZCBhc3NvY2lhdGVTdHJlYW1XaXRoUmVzb3VyY2VI YW5kbGUoTlNJbnB1dFN0cmVhbSAqc3RyZWFtLCBSZXNvdXJjZUhhbmRsZSogcmVzb3VyY2VIYW5k bGUpCi17Ci0gICAgQVNTRVJUKGlzTWFpblRocmVhZCgpKTsKLQotICAgIEFTU0VSVChyZXNvdXJj ZUhhbmRsZSk7Ci0KLSAgICBpZiAoIXN0cmVhbSkKLSAgICAgICAgcmV0dXJuOwotCi0gICAgewot ICAgICAgICBNdXRleExvY2tlciBsb2NrZXIoc3RyZWFtRmllbGRzTWFwTXV0ZXgoKSk7Ci0gICAg ICAgIGlmICghTlNNYXBHZXQoc3RyZWFtRmllbGRzTWFwKCksIHN0cmVhbSkpCi0gICAgICAgICAg ICByZXR1cm47Ci0gICAgfQotCi0gICAgQVNTRVJUKCFnZXRTdHJlYW1SZXNvdXJjZUhhbmRsZU1h cCgpLmNvbnRhaW5zKChDRlJlYWRTdHJlYW1SZWYpc3RyZWFtKSk7Ci0gICAgZ2V0U3RyZWFtUmVz b3VyY2VIYW5kbGVNYXAoKS5zZXQoKENGUmVhZFN0cmVhbVJlZilzdHJlYW0sIHJlc291cmNlSGFu ZGxlKTsKLX0KLQotdm9pZCBkaXNhc3NvY2lhdGVTdHJlYW1XaXRoUmVzb3VyY2VIYW5kbGUoTlNJ bnB1dFN0cmVhbSAqc3RyZWFtKQotewotICAgIEFTU0VSVChpc01haW5UaHJlYWQoKSk7Ci0KLSAg ICBpZiAoIXN0cmVhbSkKLSAgICAgICAgcmV0dXJuOwotCi0gICAgZ2V0U3RyZWFtUmVzb3VyY2VI YW5kbGVNYXAoKS5yZW1vdmUoKENGUmVhZFN0cmVhbVJlZilzdHJlYW0pOwotfQotCi1zdHJ1Y3Qg RGlkU2VuZERhdGFDYWxsYmFja0RhdGEgewotICAgIERpZFNlbmREYXRhQ2FsbGJhY2tEYXRhKENG UmVhZFN0cmVhbVJlZiBzdHJlYW1fLCB1bnNpZ25lZCBsb25nIGxvbmcgYnl0ZXNTZW50XywgdW5z aWduZWQgbG9uZyBsb25nIHN0cmVhbUxlbmd0aF8pCi0gICAgICAgIDogc3RyZWFtKHN0cmVhbV8p Ci0gICAgICAgICwgYnl0ZXNTZW50KGJ5dGVzU2VudF8pCi0gICAgICAgICwgc3RyZWFtTGVuZ3Ro KHN0cmVhbUxlbmd0aF8pCi0gICAgewotICAgIH0KLQotICAgIENGUmVhZFN0cmVhbVJlZiBzdHJl YW07Ci0gICAgdW5zaWduZWQgbG9uZyBsb25nIGJ5dGVzU2VudDsKLSAgICB1bnNpZ25lZCBsb25n IGxvbmcgc3RyZWFtTGVuZ3RoOwotfTsKLQotc3RhdGljIHZvaWQgcGVyZm9ybURpZFNlbmREYXRh Q2FsbGJhY2sodm9pZCogY29udGV4dCkKLXsKLSAgICBBU1NFUlQoaXNNYWluVGhyZWFkKCkpOwot Ci0gICAgRGlkU2VuZERhdGFDYWxsYmFja0RhdGEqIGRhdGEgPSBzdGF0aWNfY2FzdDxEaWRTZW5k RGF0YUNhbGxiYWNrRGF0YSo+KGNvbnRleHQpOwotICAgIFJlc291cmNlSGFuZGxlKiByZXNvdXJj ZUhhbmRsZSA9IGdldFN0cmVhbVJlc291cmNlSGFuZGxlTWFwKCkuZ2V0KGRhdGEtPnN0cmVhbSku Z2V0KCk7Ci0KLSAgICBpZiAocmVzb3VyY2VIYW5kbGUgJiYgcmVzb3VyY2VIYW5kbGUtPmNsaWVu dCgpKQotICAgICAgICByZXNvdXJjZUhhbmRsZS0+Y2xpZW50KCktPmRpZFNlbmREYXRhKHJlc291 cmNlSGFuZGxlLCBkYXRhLT5ieXRlc1NlbnQsIGRhdGEtPnN0cmVhbUxlbmd0aCk7Ci0KLSAgICBk ZWxldGUgZGF0YTsKLX0KLQogc3RhdGljIHZvaWQgZm9ybUV2ZW50Q2FsbGJhY2soQ0ZSZWFkU3Ry ZWFtUmVmIHN0cmVhbSwgQ0ZTdHJlYW1FdmVudFR5cGUgdHlwZSwgdm9pZCogY29udGV4dCk7CiAK IHN0cnVjdCBGb3JtQ29udGV4dCB7CkBAIC0zMjIsMTIgKzI1NSw2IEBAIHN0YXRpYyBDRkluZGV4 IGZvcm1SZWFkKENGUmVhZFN0cmVhbVJlZiAKICAgICAgICAgICAgICAgICBmb3JtLT5jdXJyZW50 U3RyZWFtUmFuZ2VMZW5ndGggLT0gYnl0ZXNSZWFkOwogI2VuZGlmCiAKLSAgICAgICAgICAgIGlm ICghUmVzb3VyY2VIYW5kbGU6OmRpZFNlbmRCb2R5RGF0YURlbGVnYXRlRXhpc3RzKCkpIHsKLSAg ICAgICAgICAgICAgICAvLyBGSVhNRTogRmlndXJlIG91dCBob3cgdG8gb25seSBkbyB0aGlzIHdo ZW4gYSBSZXNvdXJjZUhhbmRsZUNsaWVudCBpcyBhdmFpbGFibGUuCi0gICAgICAgICAgICAgICAg RGlkU2VuZERhdGFDYWxsYmFja0RhdGEqIGRhdGEgPSBuZXcgRGlkU2VuZERhdGFDYWxsYmFja0Rh dGEoc3RyZWFtLCBmb3JtLT5ieXRlc1NlbnQsIGZvcm0tPnN0cmVhbUxlbmd0aCk7Ci0gICAgICAg ICAgICAgICAgY2FsbE9uTWFpblRocmVhZChwZXJmb3JtRGlkU2VuZERhdGFDYWxsYmFjaywgZGF0 YSk7Ci0gICAgICAgICAgICB9Ci0KICAgICAgICAgICAgIHJldHVybiBieXRlc1JlYWQ7CiAgICAg ICAgIH0KICAgICAgICAgb3Blbk5leHRTdHJlYW0oZm9ybSk7CkluZGV4OiBTb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9uZXR3b3JrL21hYy9SZXNvdXJjZUhhbmRsZU1hYy5tbQo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL21hYy9SZXNvdXJjZUhhbmRsZU1hYy5t bQkocmV2aXNpb24gMTExNTU0KQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9t YWMvUmVzb3VyY2VIYW5kbGVNYWMubW0JKHdvcmtpbmcgY29weSkKQEAgLTE0NywxMiArMTQ3LDYg QEAgUmVzb3VyY2VIYW5kbGU6On5SZXNvdXJjZUhhbmRsZSgpCiAgICAgTE9HKE5ldHdvcmssICJI YW5kbGUgJXAgZGVzdHJveWVkIiwgdGhpcyk7CiB9CiAKLXN0YXRpYyBjb25zdCBkb3VibGUgTWF4 Rm91bmRhdGlvblZlcnNpb25XaXRob3V0ZGlkU2VuZEJvZHlEYXRhRGVsZWdhdGUgPSA2NzcuMjE7 Ci1ib29sIFJlc291cmNlSGFuZGxlOjpkaWRTZW5kQm9keURhdGFEZWxlZ2F0ZUV4aXN0cygpCi17 Ci0gICAgcmV0dXJuIE5TRm91bmRhdGlvblZlcnNpb25OdW1iZXIgPiBNYXhGb3VuZGF0aW9uVmVy c2lvbldpdGhvdXRkaWRTZW5kQm9keURhdGFEZWxlZ2F0ZTsKLX0KLQogc3RhdGljIGJvb2wgc2hv dWxkUmVsYXhUaGlyZFBhcnR5Q29va2llUG9saWN5KGNvbnN0IEtVUkwmIHVybCkKIHsKICAgICAv LyBJZiBhIFVSTCBhbHJlYWR5IGhhcyBjb29raWVzLCB0aGVuIHdlJ2xsIHJlbGF4IHRoZSAzcmQg cGFydHkgY29va2llIHBvbGljeSBhbmQgYWNjZXB0IG5ldyBjb29raWVzLgpAQCAtMjY2LDEwICsy NjAsNiBAQCBib29sIFJlc291cmNlSGFuZGxlOjpzdGFydChOZXR3b3JraW5nQ29uCiAKICAgICBi b29sIHNob3VsZFVzZUNyZWRlbnRpYWxTdG9yYWdlID0gIWNsaWVudCgpIHx8IGNsaWVudCgpLT5z aG91bGRVc2VDcmVkZW50aWFsU3RvcmFnZSh0aGlzKTsKIAotICAgIGlmICghUmVzb3VyY2VIYW5k bGU6OmRpZFNlbmRCb2R5RGF0YURlbGVnYXRlRXhpc3RzKCkpCi0gICAgICAgIGFzc29jaWF0ZVN0 cmVhbVdpdGhSZXNvdXJjZUhhbmRsZShbZmlyc3RSZXF1ZXN0KCkubnNVUkxSZXF1ZXN0KCkgSFRU UEJvZHlTdHJlYW1dLCB0aGlzKTsKLQotCiAgICAgZC0+bV9uZWVkc1NpdGVTcGVjaWZpY1F1aXJr cyA9IGNvbnRleHQtPm5lZWRzU2l0ZVNwZWNpZmljUXVpcmtzKCk7CiAKICAgICBjcmVhdGVOU1VS TENvbm5lY3Rpb24oCkBAIC0zMjEsOCArMzExLDYgQEAgdm9pZCBSZXNvdXJjZUhhbmRsZTo6Y2Fu Y2VsKCkKICAgICBpZiAoZC0+bV9jdXJyZW50TWFjQ2hhbGxlbmdlKQogICAgICAgICBbW2QtPm1f Y3VycmVudE1hY0NoYWxsZW5nZSBzZW5kZXJdIGNhbmNlbEF1dGhlbnRpY2F0aW9uQ2hhbGxlbmdl OmQtPm1fY3VycmVudE1hY0NoYWxsZW5nZV07CiAKLSAgICBpZiAoIVJlc291cmNlSGFuZGxlOjpk aWRTZW5kQm9keURhdGFEZWxlZ2F0ZUV4aXN0cygpKQotICAgICAgICBkaXNhc3NvY2lhdGVTdHJl YW1XaXRoUmVzb3VyY2VIYW5kbGUoW2ZpcnN0UmVxdWVzdCgpLm5zVVJMUmVxdWVzdCgpIEhUVFBC b2R5U3RyZWFtXSk7CiAgICAgW2QtPm1fY29ubmVjdGlvbi5nZXQoKSBjYW5jZWxdOwogfQogCkBA IC03MjMsMTcgKzcxMSw2IEBAIC0gKE5TVVJMUmVxdWVzdCAqKWNvbm5lY3Rpb246KE5TVVJMQ29u bmUKIAogICAgIG1faGFuZGxlLT53aWxsU2VuZFJlcXVlc3QocmVxdWVzdCwgcmVkaXJlY3RSZXNw b25zZSk7CiAKLSAgICBpZiAoIVJlc291cmNlSGFuZGxlOjpkaWRTZW5kQm9keURhdGFEZWxlZ2F0 ZUV4aXN0cygpKSB7Ci0gICAgICAgIC8vIFRoZSBjbGllbnQgbWF5IGNoYW5nZSB0aGUgcmVxdWVz dCdzIGJvZHkgc3RyZWFtLCBpbiB3aGljaCBjYXNlIHdlIGhhdmUgdG8gcmUtYXNzb2NpYXRlCi0g ICAgICAgIC8vIHRoZSBoYW5kbGUgd2l0aCB0aGUgbmV3IHN0cmVhbSBzbyB1cGxvYWQgcHJvZ3Jl c3MgY2FsbGJhY2tzIGNvbnRpbnVlIHRvIHdvcmsgY29ycmVjdGx5LgotICAgICAgICBOU0lucHV0 U3RyZWFtKiBvbGRCb2R5U3RyZWFtID0gW25ld1JlcXVlc3QgSFRUUEJvZHlTdHJlYW1dOwotICAg ICAgICBOU0lucHV0U3RyZWFtKiBuZXdCb2R5U3RyZWFtID0gW3JlcXVlc3QubnNVUkxSZXF1ZXN0 KCkgSFRUUEJvZHlTdHJlYW1dOwotICAgICAgICBpZiAob2xkQm9keVN0cmVhbSAhPSBuZXdCb2R5 U3RyZWFtKSB7Ci0gICAgICAgICAgICBkaXNhc3NvY2lhdGVTdHJlYW1XaXRoUmVzb3VyY2VIYW5k bGUob2xkQm9keVN0cmVhbSk7Ci0gICAgICAgICAgICBhc3NvY2lhdGVTdHJlYW1XaXRoUmVzb3Vy Y2VIYW5kbGUobmV3Qm9keVN0cmVhbSwgbV9oYW5kbGUpOwotICAgICAgICB9Ci0gICAgfQotCiAg ICAgcmV0dXJuIHJlcXVlc3QubnNVUkxSZXF1ZXN0KCk7CiB9CiAKQEAgLTg4MCw5ICs4NTcsNiBA QCAtICh2b2lkKWNvbm5lY3Rpb25EaWRGaW5pc2hMb2FkaW5nOihOU1VSCiAgICAgaWYgKCFtX2hh bmRsZSB8fCAhbV9oYW5kbGUtPmNsaWVudCgpKQogICAgICAgICByZXR1cm47CiAKLSAgICBpZiAo IVJlc291cmNlSGFuZGxlOjpkaWRTZW5kQm9keURhdGFEZWxlZ2F0ZUV4aXN0cygpKQotICAgICAg ICBkaXNhc3NvY2lhdGVTdHJlYW1XaXRoUmVzb3VyY2VIYW5kbGUoW21faGFuZGxlLT5maXJzdFJl cXVlc3QoKS5uc1VSTFJlcXVlc3QoKSBIVFRQQm9keVN0cmVhbV0pOwotCiAgICAgbV9oYW5kbGUt PmNsaWVudCgpLT5kaWRGaW5pc2hMb2FkaW5nKG1faGFuZGxlLCAwKTsKIH0KIApAQCAtODk1LDkg Kzg2OSw2IEBAIC0gKHZvaWQpY29ubmVjdGlvbjooTlNVUkxDb25uZWN0aW9uICopY28KICAgICBp ZiAoIW1faGFuZGxlIHx8ICFtX2hhbmRsZS0+Y2xpZW50KCkpCiAgICAgICAgIHJldHVybjsKIAot ICAgIGlmICghUmVzb3VyY2VIYW5kbGU6OmRpZFNlbmRCb2R5RGF0YURlbGVnYXRlRXhpc3RzKCkp Ci0gICAgICAgIGRpc2Fzc29jaWF0ZVN0cmVhbVdpdGhSZXNvdXJjZUhhbmRsZShbbV9oYW5kbGUt PmZpcnN0UmVxdWVzdCgpLm5zVVJMUmVxdWVzdCgpIEhUVFBCb2R5U3RyZWFtXSk7Ci0KICAgICBt X2hhbmRsZS0+Y2xpZW50KCktPmRpZEZhaWwobV9oYW5kbGUsIGVycm9yKTsKIH0KIAo=