156248 2016-04-05 13:31:56 -0700 Modern IDB: Get blob URLs/files all the way to the IDB backing store 2016-04-05 15:55:42 -0700 1 1 1 Unclassified WebKit WebCore Misc. Safari 9 Unspecified Unspecified RESOLVED FIXED P2 Normal --- 149117 143193 1 beidson beidson achristensen alecflett commit-queue jsbell oldest_to_newest 1180948 0 beidson 2016-04-05 13:31:56 -0700 Modern IDB: Get blob URLs/files all the way to the IDB backing store 1180987 1 275698 beidson 2016-04-05 15:02:51 -0700 Created attachment 275698 Patch v1 1181018 2 275698 commit-queue 2016-04-05 15:55:38 -0700 Comment on attachment 275698 Patch v1 Clearing flags on attachment: 275698 Committed r199078: <http://trac.webkit.org/changeset/199078> 1181019 3 commit-queue 2016-04-05 15:55:42 -0700 All reviewed patches have been landed. Closing bug. 275698 2016-04-05 15:02:51 -0700 2016-04-05 15:55:38 -0700 Patch v1 patch text/plain 15302 beidson ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBmNjY0OGZjLi44ODRjOWQ2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNDAg QEAKKzIwMTYtMDQtMDUgIEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUuY29tPgorCisgICAg ICAgIE1vZGVybiBJREI6IEdldCBibG9iIFVSTHMvZmlsZXMgYWxsIHRoZSB3YXkgdG8gdGhlIElE QiBiYWNraW5nIHN0b3JlLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTU2MjQ4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgTm8gbmV3IHRlc3RzIChObyBjaGFuZ2UgaW4gYmVoYXZpb3IpLgorCisgICAgICAg ICogTW9kdWxlcy9pbmRleGVkZGIvSURCVHJhbnNhY3Rpb24uY3BwOgorICAgICAgICAoV2ViQ29y ZTo6SURCVHJhbnNhY3Rpb246OnB1dE9yQWRkT25TZXJ2ZXIpOgorCisgICAgICAgICogTW9kdWxl cy9pbmRleGVkZGIvSURCVmFsdWUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SURCVmFsdWU6OklE QlZhbHVlKToKKyAgICAgICAgKFdlYkNvcmU6OklEQlZhbHVlOjppc29sYXRlZENvcHkpOgorICAg ICAgICAqIE1vZHVsZXMvaW5kZXhlZGRiL0lEQlZhbHVlLmg6CisgICAgICAgIChXZWJDb3JlOjpJ REJWYWx1ZTo6YmxvYlVSTHMpOgorICAgICAgICAoV2ViQ29yZTo6SURCVmFsdWU6OmJsb2JGaWxl UGF0aHMpOgorICAgICAgICAoV2ViQ29yZTo6SURCVmFsdWU6OmVuY29kZSk6CisgICAgICAgIChX ZWJDb3JlOjpJREJWYWx1ZTo6ZGVjb2RlKToKKworICAgICAgICAqIE1vZHVsZXMvaW5kZXhlZGRi L3NlcnZlci9JREJCYWNraW5nU3RvcmUuaDoKKworICAgICAgICAqIE1vZHVsZXMvaW5kZXhlZGRi L3NlcnZlci9NZW1vcnlJREJCYWNraW5nU3RvcmUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SURC U2VydmVyOjpNZW1vcnlJREJCYWNraW5nU3RvcmU6OmFkZFJlY29yZCk6CisgICAgICAgICogTW9k dWxlcy9pbmRleGVkZGIvc2VydmVyL01lbW9yeUlEQkJhY2tpbmdTdG9yZS5oOgorCisgICAgICAg ICogTW9kdWxlcy9pbmRleGVkZGIvc2VydmVyL1NRTGl0ZUlEQkJhY2tpbmdTdG9yZS5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpJREJTZXJ2ZXI6OlNRTGl0ZUlEQkJhY2tpbmdTdG9yZTo6YWRkUmVj b3JkKToKKyAgICAgICAgKiBNb2R1bGVzL2luZGV4ZWRkYi9zZXJ2ZXIvU1FMaXRlSURCQmFja2lu Z1N0b3JlLmg6CisKKyAgICAgICAgKiBNb2R1bGVzL2luZGV4ZWRkYi9zZXJ2ZXIvVW5pcXVlSURC RGF0YWJhc2UuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SURCU2VydmVyOjpVbmlxdWVJREJEYXRh YmFzZTo6cGVyZm9ybVB1dE9yQWRkKToKKworICAgICAgICAqIGJpbmRpbmdzL2pzL1NlcmlhbGl6 ZWRTY3JpcHRWYWx1ZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTZXJpYWxpemVkU2NyaXB0VmFs dWU6OndyaXRlQmxvYnNUb0Rpc2tGb3JJbmRleGVkREIpOgorCiAyMDE2LTA0LTA1ICBYYWJpZXIg Um9kcmlndWV6IENhbHZhciAgPGNhbHZhcmlzQGlnYWxpYS5jb20+CiAKICAgICAgICAgVW5yZXZp ZXdlZCBidWlsZCBmaXggd2l0aCBHU1RSRUFNRVJfR0wgYWN0aXZlLgpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvSURCVHJhbnNhY3Rpb24uY3BwIGIvU291cmNl L1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvSURCVHJhbnNhY3Rpb24uY3BwCmluZGV4IGE0NDI2 NGIuLmM3ZTEwZGUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRi L0lEQlRyYW5zYWN0aW9uLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRk Yi9JREJUcmFuc2FjdGlvbi5jcHAKQEAgLTg3Nyw5ICs4NzcsOCBAQCB2b2lkIElEQlRyYW5zYWN0 aW9uOjpwdXRPckFkZE9uU2VydmVyKElEQkNsaWVudDo6VHJhbnNhY3Rpb25PcGVyYXRpb24mIG9w ZXJhdGlvbgogCiAgICAgUmVmUHRyPElEQlRyYW5zYWN0aW9uPiBwcm90ZWN0b3IodGhpcyk7CiAg ICAgUmVmUHRyPElEQkNsaWVudDo6VHJhbnNhY3Rpb25PcGVyYXRpb24+IG9wZXJhdGlvblJlZigm b3BlcmF0aW9uKTsKLSAgICB2YWx1ZS0+d3JpdGVCbG9ic1RvRGlza0ZvckluZGV4ZWREQihbcHJv dGVjdG9yLCB0aGlzLCBvcGVyYXRpb25SZWYsIGtleSwgdmFsdWUsIG92ZXJ3cml0ZU1vZGVdKGNv bnN0IElEQlZhbHVlJikgewotICAgICAgICAvLyBGSVhNRTogU2VuZCB0aGUgcGFzc2VkIGluIElE QlZhbHVlIHRvIHRoZSBJREIgc2VydmVyIGluc3RlYWQgb2YgdGhlIFNlcmlhbGl6ZWRTY3JpcHRW YWx1ZS4KLSAgICAgICAgc2VydmVyQ29ubmVjdGlvbigpLnB1dE9yQWRkKCpvcGVyYXRpb25SZWYs IGtleS5nZXQoKSwgKnZhbHVlLCBvdmVyd3JpdGVNb2RlKTsKKyAgICB2YWx1ZS0+d3JpdGVCbG9i c1RvRGlza0ZvckluZGV4ZWREQihbcHJvdGVjdG9yLCB0aGlzLCBvcGVyYXRpb25SZWYsIGtleSwg dmFsdWUsIG92ZXJ3cml0ZU1vZGVdKGNvbnN0IElEQlZhbHVlJiBpZGJWYWx1ZSkgeworICAgICAg ICBzZXJ2ZXJDb25uZWN0aW9uKCkucHV0T3JBZGQoKm9wZXJhdGlvblJlZiwga2V5LmdldCgpLCBp ZGJWYWx1ZSwgb3ZlcndyaXRlTW9kZSk7CiAgICAgfSk7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL0lEQlZhbHVlLmNwcCBiL1NvdXJjZS9XZWJDb3Jl L01vZHVsZXMvaW5kZXhlZGRiL0lEQlZhbHVlLmNwcAppbmRleCA3ZjkxZGNiYS4uZjFkZWUxMiAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvSURCVmFsdWUuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL0lEQlZhbHVlLmNwcApAQCAt NDEsMTAgKzQxLDI2IEBAIElEQlZhbHVlOjpJREJWYWx1ZShjb25zdCBTZXJpYWxpemVkU2NyaXB0 VmFsdWUmIHNjcmlwdFZhbHVlKQogewogfQogCitJREJWYWx1ZTo6SURCVmFsdWUoY29uc3QgU2Vy aWFsaXplZFNjcmlwdFZhbHVlJiBzY3JpcHRWYWx1ZSwgY29uc3QgVmVjdG9yPFN0cmluZz4mIGJs b2JVUkxzLCBjb25zdCBWZWN0b3I8U3RyaW5nPiYgYmxvYkZpbGVQYXRocykKKyAgICA6IG1fZGF0 YShUaHJlYWRTYWZlRGF0YUJ1ZmZlcjo6Y29weVZlY3RvcihzY3JpcHRWYWx1ZS5kYXRhKCkpKQor ICAgICwgbV9ibG9iVVJMcyhibG9iVVJMcykKKyAgICAsIG1fYmxvYkZpbGVQYXRocyhibG9iRmls ZVBhdGhzKQoreworfQorCiBJREJWYWx1ZSBJREJWYWx1ZTo6aXNvbGF0ZWRDb3B5KCkgY29uc3QK IHsKICAgICBJREJWYWx1ZSByZXN1bHQ7CiAgICAgcmVzdWx0Lm1fZGF0YSA9IG1fZGF0YTsKKwor ICAgIHJlc3VsdC5tX2Jsb2JVUkxzLnJlc2VydmVJbml0aWFsQ2FwYWNpdHkobV9ibG9iVVJMcy5z aXplKCkpOworICAgIGZvciAoYXV0byYgdXJsIDogbV9ibG9iVVJMcykKKyAgICAgICAgcmVzdWx0 Lm1fYmxvYlVSTHMudW5jaGVja2VkQXBwZW5kKHVybC5pc29sYXRlZENvcHkoKSk7CisKKyAgICBy ZXN1bHQubV9ibG9iRmlsZVBhdGhzLnJlc2VydmVJbml0aWFsQ2FwYWNpdHkobV9ibG9iRmlsZVBh dGhzLnNpemUoKSk7CisgICAgZm9yIChhdXRvJiBwYXRoIDogbV9ibG9iRmlsZVBhdGhzKQorICAg ICAgICByZXN1bHQubV9ibG9iRmlsZVBhdGhzLnVuY2hlY2tlZEFwcGVuZChwYXRoLmlzb2xhdGVk Q29weSgpKTsKKwogICAgIHJldHVybiByZXN1bHQ7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL0lEQlZhbHVlLmggYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1 bGVzL2luZGV4ZWRkYi9JREJWYWx1ZS5oCmluZGV4IDFhY2ZmZGEuLmY0NDczOGQgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL0lEQlZhbHVlLmgKKysrIGIvU291 cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvSURCVmFsdWUuaApAQCAtMjcsNiArMjcsNyBA QAogI2lmIEVOQUJMRShJTkRFWEVEX0RBVEFCQVNFKQogCiAjaW5jbHVkZSAiVGhyZWFkU2FmZURh dGFCdWZmZXIuaCIKKyNpbmNsdWRlIDx3dGYvdGV4dC9XVEZTdHJpbmcuaD4KIAogbmFtZXNwYWNl IFdlYkNvcmUgewogCkBAIC0zNiwxNiArMzcsMjEgQEAgY2xhc3MgSURCVmFsdWUgewogcHVibGlj OgogICAgIFdFQkNPUkVfRVhQT1JUIElEQlZhbHVlKCk7CiAgICAgSURCVmFsdWUoY29uc3QgU2Vy aWFsaXplZFNjcmlwdFZhbHVlJik7CisgICAgSURCVmFsdWUoY29uc3QgU2VyaWFsaXplZFNjcmlw dFZhbHVlJiwgY29uc3QgVmVjdG9yPFN0cmluZz4mIGJsb2JVUkxzLCBjb25zdCBWZWN0b3I8U3Ry aW5nPiYgYmxvYkZpbGVQYXRocyk7CiAKICAgICBJREJWYWx1ZSBpc29sYXRlZENvcHkoKSBjb25z dDsKIAogICAgIGNvbnN0IFRocmVhZFNhZmVEYXRhQnVmZmVyJiBkYXRhKCkgY29uc3QgeyByZXR1 cm4gbV9kYXRhOyB9CisgICAgY29uc3QgVmVjdG9yPFN0cmluZz4mIGJsb2JVUkxzKCkgY29uc3Qg eyByZXR1cm4gbV9ibG9iVVJMczsgfQorICAgIGNvbnN0IFZlY3RvcjxTdHJpbmc+JiBibG9iRmls ZVBhdGhzKCkgY29uc3QgeyByZXR1cm4gbV9ibG9iRmlsZVBhdGhzOyB9CiAKICAgICB0ZW1wbGF0 ZTxjbGFzcyBFbmNvZGVyPiB2b2lkIGVuY29kZShFbmNvZGVyJikgY29uc3Q7CiAgICAgdGVtcGxh dGU8Y2xhc3MgRGVjb2Rlcj4gc3RhdGljIGJvb2wgZGVjb2RlKERlY29kZXImLCBJREJWYWx1ZSYp OwogCiBwcml2YXRlOgogICAgIFRocmVhZFNhZmVEYXRhQnVmZmVyIG1fZGF0YTsKKyAgICBWZWN0 b3I8U3RyaW5nPiBtX2Jsb2JVUkxzOworICAgIFZlY3RvcjxTdHJpbmc+IG1fYmxvYkZpbGVQYXRo czsKIH07CiAKIApAQCAtNTMsNiArNTksOCBAQCB0ZW1wbGF0ZTxjbGFzcyBFbmNvZGVyPgogdm9p ZCBJREJWYWx1ZTo6ZW5jb2RlKEVuY29kZXImIGVuY29kZXIpIGNvbnN0CiB7CiAgICAgZW5jb2Rl ciA8PCBtX2RhdGE7CisgICAgZW5jb2RlciA8PCBtX2Jsb2JVUkxzOworICAgIGVuY29kZXIgPDwg bV9ibG9iRmlsZVBhdGhzOwogfQogCiB0ZW1wbGF0ZTxjbGFzcyBEZWNvZGVyPgpAQCAtNjEsNiAr NjksMTIgQEAgYm9vbCBJREJWYWx1ZTo6ZGVjb2RlKERlY29kZXImIGRlY29kZXIsIElEQlZhbHVl JiByZXN1bHQpCiAgICAgaWYgKCFkZWNvZGVyLmRlY29kZShyZXN1bHQubV9kYXRhKSkKICAgICAg ICAgcmV0dXJuIGZhbHNlOwogCisgICAgaWYgKCFkZWNvZGVyLmRlY29kZShyZXN1bHQubV9ibG9i VVJMcykpCisgICAgICAgIHJldHVybiBmYWxzZTsKKworICAgIGlmICghZGVjb2Rlci5kZWNvZGUo cmVzdWx0Lm1fYmxvYkZpbGVQYXRocykpCisgICAgICAgIHJldHVybiBmYWxzZTsKKwogICAgIHJl dHVybiB0cnVlOwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4 ZWRkYi9zZXJ2ZXIvSURCQmFja2luZ1N0b3JlLmggYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2lu ZGV4ZWRkYi9zZXJ2ZXIvSURCQmFja2luZ1N0b3JlLmgKaW5kZXggNTNmMTE3Zi4uNTI5NGExNyAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvc2VydmVyL0lEQkJh Y2tpbmdTdG9yZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL3NlcnZl ci9JREJCYWNraW5nU3RvcmUuaApAQCAtNjcsNyArNjcsNyBAQCBwdWJsaWM6CiAgICAgdmlydHVh bCBJREJFcnJvciBkZWxldGVJbmRleChjb25zdCBJREJSZXNvdXJjZUlkZW50aWZpZXImIHRyYW5z YWN0aW9uSWRlbnRpZmllciwgdWludDY0X3Qgb2JqZWN0U3RvcmVJZGVudGlmaWVyLCB1aW50NjRf dCBpbmRleElkZW50aWZpZXIpID0gMDsKICAgICB2aXJ0dWFsIElEQkVycm9yIGtleUV4aXN0c0lu T2JqZWN0U3RvcmUoY29uc3QgSURCUmVzb3VyY2VJZGVudGlmaWVyJiB0cmFuc2FjdGlvbklkZW50 aWZpZXIsIHVpbnQ2NF90IG9iamVjdFN0b3JlSWRlbnRpZmllciwgY29uc3QgSURCS2V5RGF0YSYs IGJvb2wmIGtleUV4aXN0cykgPSAwOwogICAgIHZpcnR1YWwgSURCRXJyb3IgZGVsZXRlUmFuZ2Uo Y29uc3QgSURCUmVzb3VyY2VJZGVudGlmaWVyJiB0cmFuc2FjdGlvbklkZW50aWZpZXIsIHVpbnQ2 NF90IG9iamVjdFN0b3JlSWRlbnRpZmllciwgY29uc3QgSURCS2V5UmFuZ2VEYXRhJikgPSAwOwot ICAgIHZpcnR1YWwgSURCRXJyb3IgYWRkUmVjb3JkKGNvbnN0IElEQlJlc291cmNlSWRlbnRpZmll ciYgdHJhbnNhY3Rpb25JZGVudGlmaWVyLCBjb25zdCBJREJPYmplY3RTdG9yZUluZm8mLCBjb25z dCBJREJLZXlEYXRhJiwgY29uc3QgVGhyZWFkU2FmZURhdGFCdWZmZXImIHZhbHVlKSA9IDA7Cisg ICAgdmlydHVhbCBJREJFcnJvciBhZGRSZWNvcmQoY29uc3QgSURCUmVzb3VyY2VJZGVudGlmaWVy JiB0cmFuc2FjdGlvbklkZW50aWZpZXIsIGNvbnN0IElEQk9iamVjdFN0b3JlSW5mbyYsIGNvbnN0 IElEQktleURhdGEmLCBjb25zdCBUaHJlYWRTYWZlRGF0YUJ1ZmZlciYgdmFsdWUsIGNvbnN0IFZl Y3RvcjxTdHJpbmc+JiBibG9iVVJMcywgY29uc3QgVmVjdG9yPFN0cmluZz4mIGJsb2JGaWxlUGF0 aHMpID0gMDsKICAgICB2aXJ0dWFsIElEQkVycm9yIGdldFJlY29yZChjb25zdCBJREJSZXNvdXJj ZUlkZW50aWZpZXImIHRyYW5zYWN0aW9uSWRlbnRpZmllciwgdWludDY0X3Qgb2JqZWN0U3RvcmVJ ZGVudGlmaWVyLCBjb25zdCBJREJLZXlSYW5nZURhdGEmLCBUaHJlYWRTYWZlRGF0YUJ1ZmZlciYg b3V0VmFsdWUpID0gMDsKICAgICB2aXJ0dWFsIElEQkVycm9yIGdldEluZGV4UmVjb3JkKGNvbnN0 IElEQlJlc291cmNlSWRlbnRpZmllciYgdHJhbnNhY3Rpb25JZGVudGlmaWVyLCB1aW50NjRfdCBv YmplY3RTdG9yZUlkZW50aWZpZXIsIHVpbnQ2NF90IGluZGV4SWRlbnRpZmllciwgSW5kZXhlZERC OjpJbmRleFJlY29yZFR5cGUsIGNvbnN0IElEQktleVJhbmdlRGF0YSYsIElEQkdldFJlc3VsdCYg b3V0VmFsdWUpID0gMDsKICAgICB2aXJ0dWFsIElEQkVycm9yIGdldENvdW50KGNvbnN0IElEQlJl c291cmNlSWRlbnRpZmllciYgdHJhbnNhY3Rpb25JZGVudGlmaWVyLCB1aW50NjRfdCBvYmplY3RT dG9yZUlkZW50aWZpZXIsIHVpbnQ2NF90IGluZGV4SWRlbnRpZmllciwgY29uc3QgSURCS2V5UmFu Z2VEYXRhJiwgdWludDY0X3QmIG91dENvdW50KSA9IDA7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9zZXJ2ZXIvTWVtb3J5SURCQmFja2luZ1N0b3JlLmNwcCBi L1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL3NlcnZlci9NZW1vcnlJREJCYWNraW5n U3RvcmUuY3BwCmluZGV4IDZjMWZkODIuLmRiNWI1ZTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL01vZHVsZXMvaW5kZXhlZGRiL3NlcnZlci9NZW1vcnlJREJCYWNraW5nU3RvcmUuY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL3NlcnZlci9NZW1vcnlJREJCYWNr aW5nU3RvcmUuY3BwCkBAIC0yNjcsNyArMjY3LDcgQEAgSURCRXJyb3IgTWVtb3J5SURCQmFja2lu Z1N0b3JlOjpkZWxldGVSYW5nZShjb25zdCBJREJSZXNvdXJjZUlkZW50aWZpZXImIHRyYW5zYWMK ICAgICByZXR1cm4gSURCRXJyb3IoKTsKIH0KIAotSURCRXJyb3IgTWVtb3J5SURCQmFja2luZ1N0 b3JlOjphZGRSZWNvcmQoY29uc3QgSURCUmVzb3VyY2VJZGVudGlmaWVyJiB0cmFuc2FjdGlvbklk ZW50aWZpZXIsIGNvbnN0IElEQk9iamVjdFN0b3JlSW5mbyYgb2JqZWN0U3RvcmVJbmZvLCBjb25z dCBJREJLZXlEYXRhJiBrZXlEYXRhLCBjb25zdCBUaHJlYWRTYWZlRGF0YUJ1ZmZlciYgdmFsdWUp CitJREJFcnJvciBNZW1vcnlJREJCYWNraW5nU3RvcmU6OmFkZFJlY29yZChjb25zdCBJREJSZXNv dXJjZUlkZW50aWZpZXImIHRyYW5zYWN0aW9uSWRlbnRpZmllciwgY29uc3QgSURCT2JqZWN0U3Rv cmVJbmZvJiBvYmplY3RTdG9yZUluZm8sIGNvbnN0IElEQktleURhdGEmIGtleURhdGEsIGNvbnN0 IFRocmVhZFNhZmVEYXRhQnVmZmVyJiB2YWx1ZSwgY29uc3QgVmVjdG9yPFN0cmluZz4mLCBjb25z dCBWZWN0b3I8U3RyaW5nPiYpCiB7CiAgICAgTE9HKEluZGV4ZWREQiwgIk1lbW9yeUlEQkJhY2tp bmdTdG9yZTo6YWRkUmVjb3JkIik7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVs ZXMvaW5kZXhlZGRiL3NlcnZlci9NZW1vcnlJREJCYWNraW5nU3RvcmUuaCBiL1NvdXJjZS9XZWJD b3JlL01vZHVsZXMvaW5kZXhlZGRiL3NlcnZlci9NZW1vcnlJREJCYWNraW5nU3RvcmUuaAppbmRl eCAzODFkNmJhLi4yODI2YmIxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2lu ZGV4ZWRkYi9zZXJ2ZXIvTWVtb3J5SURCQmFja2luZ1N0b3JlLmgKKysrIGIvU291cmNlL1dlYkNv cmUvTW9kdWxlcy9pbmRleGVkZGIvc2VydmVyL01lbW9yeUlEQkJhY2tpbmdTdG9yZS5oCkBAIC01 OSw3ICs1OSw3IEBAIHB1YmxpYzoKICAgICBJREJFcnJvciBkZWxldGVJbmRleChjb25zdCBJREJS ZXNvdXJjZUlkZW50aWZpZXImIHRyYW5zYWN0aW9uSWRlbnRpZmllciwgdWludDY0X3Qgb2JqZWN0 U3RvcmVJZGVudGlmaWVyLCB1aW50NjRfdCBpbmRleElkZW50aWZpZXIpIGZpbmFsOwogICAgIElE QkVycm9yIGtleUV4aXN0c0luT2JqZWN0U3RvcmUoY29uc3QgSURCUmVzb3VyY2VJZGVudGlmaWVy JiB0cmFuc2FjdGlvbklkZW50aWZpZXIsIHVpbnQ2NF90IG9iamVjdFN0b3JlSWRlbnRpZmllciwg Y29uc3QgSURCS2V5RGF0YSYsIGJvb2wmIGtleUV4aXN0cykgZmluYWw7CiAgICAgSURCRXJyb3Ig ZGVsZXRlUmFuZ2UoY29uc3QgSURCUmVzb3VyY2VJZGVudGlmaWVyJiB0cmFuc2FjdGlvbklkZW50 aWZpZXIsIHVpbnQ2NF90IG9iamVjdFN0b3JlSWRlbnRpZmllciwgY29uc3QgSURCS2V5UmFuZ2VE YXRhJikgZmluYWw7Ci0gICAgSURCRXJyb3IgYWRkUmVjb3JkKGNvbnN0IElEQlJlc291cmNlSWRl bnRpZmllciYgdHJhbnNhY3Rpb25JZGVudGlmaWVyLCBjb25zdCBJREJPYmplY3RTdG9yZUluZm8m LCBjb25zdCBJREJLZXlEYXRhJiwgY29uc3QgVGhyZWFkU2FmZURhdGFCdWZmZXImIHZhbHVlKSBm aW5hbDsKKyAgICBJREJFcnJvciBhZGRSZWNvcmQoY29uc3QgSURCUmVzb3VyY2VJZGVudGlmaWVy JiB0cmFuc2FjdGlvbklkZW50aWZpZXIsIGNvbnN0IElEQk9iamVjdFN0b3JlSW5mbyYsIGNvbnN0 IElEQktleURhdGEmLCBjb25zdCBUaHJlYWRTYWZlRGF0YUJ1ZmZlciYgdmFsdWUsIGNvbnN0IFZl Y3RvcjxTdHJpbmc+JiBibG9iVVJMcywgY29uc3QgVmVjdG9yPFN0cmluZz4mIGJsb2JGaWxlUGF0 aHMpIGZpbmFsOwogICAgIElEQkVycm9yIGdldFJlY29yZChjb25zdCBJREJSZXNvdXJjZUlkZW50 aWZpZXImIHRyYW5zYWN0aW9uSWRlbnRpZmllciwgdWludDY0X3Qgb2JqZWN0U3RvcmVJZGVudGlm aWVyLCBjb25zdCBJREJLZXlSYW5nZURhdGEmLCBUaHJlYWRTYWZlRGF0YUJ1ZmZlciYgb3V0VmFs dWUpIGZpbmFsOwogICAgIElEQkVycm9yIGdldEluZGV4UmVjb3JkKGNvbnN0IElEQlJlc291cmNl SWRlbnRpZmllciYgdHJhbnNhY3Rpb25JZGVudGlmaWVyLCB1aW50NjRfdCBvYmplY3RTdG9yZUlk ZW50aWZpZXIsIHVpbnQ2NF90IGluZGV4SWRlbnRpZmllciwgSW5kZXhlZERCOjpJbmRleFJlY29y ZFR5cGUsIGNvbnN0IElEQktleVJhbmdlRGF0YSYsIElEQkdldFJlc3VsdCYgb3V0VmFsdWUpIGZp bmFsOwogICAgIElEQkVycm9yIGdldENvdW50KGNvbnN0IElEQlJlc291cmNlSWRlbnRpZmllciYg dHJhbnNhY3Rpb25JZGVudGlmaWVyLCB1aW50NjRfdCBvYmplY3RTdG9yZUlkZW50aWZpZXIsIHVp bnQ2NF90IGluZGV4SWRlbnRpZmllciwgY29uc3QgSURCS2V5UmFuZ2VEYXRhJiwgdWludDY0X3Qm IG91dENvdW50KSBmaW5hbDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5k ZXhlZGRiL3NlcnZlci9TUUxpdGVJREJCYWNraW5nU3RvcmUuY3BwIGIvU291cmNlL1dlYkNvcmUv TW9kdWxlcy9pbmRleGVkZGIvc2VydmVyL1NRTGl0ZUlEQkJhY2tpbmdTdG9yZS5jcHAKaW5kZXgg ZjA0NDgwYS4uNmI1ZmFjOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRl eGVkZGIvc2VydmVyL1NRTGl0ZUlEQkJhY2tpbmdTdG9yZS5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvTW9kdWxlcy9pbmRleGVkZGIvc2VydmVyL1NRTGl0ZUlEQkJhY2tpbmdTdG9yZS5jcHAKQEAg LTEyODIsNyArMTI4Miw3IEBAIElEQkVycm9yIFNRTGl0ZUlEQkJhY2tpbmdTdG9yZTo6dXBkYXRl QWxsSW5kZXhlc0ZvckFkZFJlY29yZChjb25zdCBJREJPYmplY3RTdG9yCiAgICAgcmV0dXJuIGVy cm9yOwogfQogCi1JREJFcnJvciBTUUxpdGVJREJCYWNraW5nU3RvcmU6OmFkZFJlY29yZChjb25z dCBJREJSZXNvdXJjZUlkZW50aWZpZXImIHRyYW5zYWN0aW9uSWRlbnRpZmllciwgY29uc3QgSURC T2JqZWN0U3RvcmVJbmZvJiBvYmplY3RTdG9yZUluZm8sIGNvbnN0IElEQktleURhdGEmIGtleURh dGEsIGNvbnN0IFRocmVhZFNhZmVEYXRhQnVmZmVyJiB2YWx1ZSkKK0lEQkVycm9yIFNRTGl0ZUlE QkJhY2tpbmdTdG9yZTo6YWRkUmVjb3JkKGNvbnN0IElEQlJlc291cmNlSWRlbnRpZmllciYgdHJh bnNhY3Rpb25JZGVudGlmaWVyLCBjb25zdCBJREJPYmplY3RTdG9yZUluZm8mIG9iamVjdFN0b3Jl SW5mbywgY29uc3QgSURCS2V5RGF0YSYga2V5RGF0YSwgY29uc3QgVGhyZWFkU2FmZURhdGFCdWZm ZXImIHZhbHVlLCBjb25zdCBWZWN0b3I8U3RyaW5nPiYsIGNvbnN0IFZlY3RvcjxTdHJpbmc+JikK IHsKICAgICBMT0coSW5kZXhlZERCLCAiU1FMaXRlSURCQmFja2luZ1N0b3JlOjphZGRSZWNvcmQg LSBrZXkgJXMsIG9iamVjdCBzdG9yZSAlIiBQUkl1NjQsIGtleURhdGEubG9nZ2luZ1N0cmluZygp LnV0ZjgoKS5kYXRhKCksIG9iamVjdFN0b3JlSW5mby5pZGVudGlmaWVyKCkpOwogCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9zZXJ2ZXIvU1FMaXRlSURCQmFj a2luZ1N0b3JlLmggYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9zZXJ2ZXIvU1FM aXRlSURCQmFja2luZ1N0b3JlLmgKaW5kZXggZDZhM2M2My4uN2YyMzkyYSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvc2VydmVyL1NRTGl0ZUlEQkJhY2tpbmdT dG9yZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL3NlcnZlci9TUUxp dGVJREJCYWNraW5nU3RvcmUuaApAQCAtNjMsNyArNjMsNyBAQCBwdWJsaWM6CiAgICAgSURCRXJy b3IgZGVsZXRlSW5kZXgoY29uc3QgSURCUmVzb3VyY2VJZGVudGlmaWVyJiB0cmFuc2FjdGlvbklk ZW50aWZpZXIsIHVpbnQ2NF90IG9iamVjdFN0b3JlSWRlbnRpZmllciwgdWludDY0X3QgaW5kZXhJ ZGVudGlmaWVyKSBmaW5hbDsKICAgICBJREJFcnJvciBrZXlFeGlzdHNJbk9iamVjdFN0b3JlKGNv bnN0IElEQlJlc291cmNlSWRlbnRpZmllciYgdHJhbnNhY3Rpb25JZGVudGlmaWVyLCB1aW50NjRf dCBvYmplY3RTdG9yZUlkZW50aWZpZXIsIGNvbnN0IElEQktleURhdGEmLCBib29sJiBrZXlFeGlz dHMpIGZpbmFsOwogICAgIElEQkVycm9yIGRlbGV0ZVJhbmdlKGNvbnN0IElEQlJlc291cmNlSWRl bnRpZmllciYgdHJhbnNhY3Rpb25JZGVudGlmaWVyLCB1aW50NjRfdCBvYmplY3RTdG9yZUlkZW50 aWZpZXIsIGNvbnN0IElEQktleVJhbmdlRGF0YSYpIGZpbmFsOwotICAgIElEQkVycm9yIGFkZFJl Y29yZChjb25zdCBJREJSZXNvdXJjZUlkZW50aWZpZXImIHRyYW5zYWN0aW9uSWRlbnRpZmllciwg Y29uc3QgSURCT2JqZWN0U3RvcmVJbmZvJiwgY29uc3QgSURCS2V5RGF0YSYsIGNvbnN0IFRocmVh ZFNhZmVEYXRhQnVmZmVyJiB2YWx1ZSkgZmluYWw7CisgICAgSURCRXJyb3IgYWRkUmVjb3JkKGNv bnN0IElEQlJlc291cmNlSWRlbnRpZmllciYgdHJhbnNhY3Rpb25JZGVudGlmaWVyLCBjb25zdCBJ REJPYmplY3RTdG9yZUluZm8mLCBjb25zdCBJREJLZXlEYXRhJiwgY29uc3QgVGhyZWFkU2FmZURh dGFCdWZmZXImIHZhbHVlLCBjb25zdCBWZWN0b3I8U3RyaW5nPiYgYmxvYlVSTHMsIGNvbnN0IFZl Y3RvcjxTdHJpbmc+JiBibG9iRmlsZVBhdGhzKSBmaW5hbDsKICAgICBJREJFcnJvciBnZXRSZWNv cmQoY29uc3QgSURCUmVzb3VyY2VJZGVudGlmaWVyJiB0cmFuc2FjdGlvbklkZW50aWZpZXIsIHVp bnQ2NF90IG9iamVjdFN0b3JlSWRlbnRpZmllciwgY29uc3QgSURCS2V5UmFuZ2VEYXRhJiwgVGhy ZWFkU2FmZURhdGFCdWZmZXImIG91dFZhbHVlKSBmaW5hbDsKICAgICBJREJFcnJvciBnZXRJbmRl eFJlY29yZChjb25zdCBJREJSZXNvdXJjZUlkZW50aWZpZXImIHRyYW5zYWN0aW9uSWRlbnRpZmll ciwgdWludDY0X3Qgb2JqZWN0U3RvcmVJZGVudGlmaWVyLCB1aW50NjRfdCBpbmRleElkZW50aWZp ZXIsIEluZGV4ZWREQjo6SW5kZXhSZWNvcmRUeXBlLCBjb25zdCBJREJLZXlSYW5nZURhdGEmLCBJ REJHZXRSZXN1bHQmIG91dFZhbHVlKSBmaW5hbDsKICAgICBJREJFcnJvciBnZXRDb3VudChjb25z dCBJREJSZXNvdXJjZUlkZW50aWZpZXImIHRyYW5zYWN0aW9uSWRlbnRpZmllciwgdWludDY0X3Qg b2JqZWN0U3RvcmVJZGVudGlmaWVyLCB1aW50NjRfdCBpbmRleElkZW50aWZpZXIsIGNvbnN0IElE QktleVJhbmdlRGF0YSYsIHVpbnQ2NF90JiBvdXRDb3VudCkgZmluYWw7CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9zZXJ2ZXIvVW5pcXVlSURCRGF0YWJhc2Uu Y3BwIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvc2VydmVyL1VuaXF1ZUlEQkRh dGFiYXNlLmNwcAppbmRleCBiMjc1MjM2Li5mNTBkZTU4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9zZXJ2ZXIvVW5pcXVlSURCRGF0YWJhc2UuY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL3NlcnZlci9VbmlxdWVJREJEYXRhYmFz ZS5jcHAKQEAgLTc5NSw3ICs3OTUsNyBAQCB2b2lkIFVuaXF1ZUlEQkRhdGFiYXNlOjpwZXJmb3Jt UHV0T3JBZGQodWludDY0X3QgY2FsbGJhY2tJZGVudGlmaWVyLCBjb25zdCBJREJSZQogICAgICAg ICByZXR1cm47CiAgICAgfQogCi0gICAgZXJyb3IgPSBtX2JhY2tpbmdTdG9yZS0+YWRkUmVjb3Jk KHRyYW5zYWN0aW9uSWRlbnRpZmllciwgKm9iamVjdFN0b3JlSW5mbywgdXNlZEtleSwgaW5qZWN0 ZWRSZWNvcmRWYWx1ZS5kYXRhKCkgPyBpbmplY3RlZFJlY29yZFZhbHVlIDogb3JpZ2luYWxSZWNv cmRWYWx1ZS5kYXRhKCkpOworICAgIGVycm9yID0gbV9iYWNraW5nU3RvcmUtPmFkZFJlY29yZCh0 cmFuc2FjdGlvbklkZW50aWZpZXIsICpvYmplY3RTdG9yZUluZm8sIHVzZWRLZXksIGluamVjdGVk UmVjb3JkVmFsdWUuZGF0YSgpID8gaW5qZWN0ZWRSZWNvcmRWYWx1ZSA6IG9yaWdpbmFsUmVjb3Jk VmFsdWUuZGF0YSgpLCBvcmlnaW5hbFJlY29yZFZhbHVlLmJsb2JVUkxzKCksIG9yaWdpbmFsUmVj b3JkVmFsdWUuYmxvYkZpbGVQYXRocygpKTsKICAgICBpZiAoIWVycm9yLmlzTnVsbCgpKSB7CiAg ICAgICAgIG1fc2VydmVyLnBvc3REYXRhYmFzZVRhc2tSZXBseShjcmVhdGVDcm9zc1RocmVhZFRh c2soKnRoaXMsICZVbmlxdWVJREJEYXRhYmFzZTo6ZGlkUGVyZm9ybVB1dE9yQWRkLCBjYWxsYmFj a0lkZW50aWZpZXIsIGVycm9yLCB1c2VkS2V5KSk7CiAgICAgICAgIHJldHVybjsKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL1NlcmlhbGl6ZWRTY3JpcHRWYWx1ZS5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9TZXJpYWxpemVkU2NyaXB0VmFsdWUuY3BwCmlu ZGV4IDY5OTExOWEuLjFlYzdlYzAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdz L2pzL1NlcmlhbGl6ZWRTY3JpcHRWYWx1ZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvYmluZGlu Z3MvanMvU2VyaWFsaXplZFNjcmlwdFZhbHVlLmNwcApAQCAtMjc1MCwxNiArMjc1MCwyMiBAQCB1 aW50MzJfdCBTZXJpYWxpemVkU2NyaXB0VmFsdWU6OndpcmVGb3JtYXRWZXJzaW9uKCkKIHZvaWQg U2VyaWFsaXplZFNjcmlwdFZhbHVlOjp3cml0ZUJsb2JzVG9EaXNrRm9ySW5kZXhlZERCKHN0ZDo6 ZnVuY3Rpb248dm9pZCAoY29uc3QgSURCVmFsdWUmKT4gY29tcGxldGlvbkhhbmRsZXIpCiB7CiAg ICAgQVNTRVJUKGlzTWFpblRocmVhZCgpKTsKLQotICAgIGlmIChtX2Jsb2JVUkxzLmlzRW1wdHko KSkgewotICAgICAgICBjb21wbGV0aW9uSGFuZGxlcih7IH0pOwotICAgICAgICByZXR1cm47Ci0g ICAgfQorICAgIEFTU0VSVChoYXNCbG9iVVJMcygpKTsKIAogICAgIFJlZlB0cjxTZXJpYWxpemVk U2NyaXB0VmFsdWU+IHByb3RlY3Rvcih0aGlzKTsKLSAgICBibG9iUmVnaXN0cnkoKS53cml0ZUJs b2JzVG9UZW1wb3JhcnlGaWxlcyhtX2Jsb2JVUkxzLCBbY29tcGxldGlvbkhhbmRsZXIsIHRoaXMs IHByb3RlY3Rvcl0oY29uc3QgVmVjdG9yPFN0cmluZz4mKSB7Ci0gICAgICAgIC8vIEZJWE1FOiBS ZXR1cm4gYW4gSURCVmFsdWUgdGhhdCBjb250YWlucyBib3RoIHRoZSBTZXJpYWxpemVkU2NyaXB0 VmFsdWUgZGF0YSBhbmQgYWxsIGJsb2IgZmlsZSBkYXRhLgotICAgICAgICBjb21wbGV0aW9uSGFu ZGxlcih7IH0pOworICAgIGJsb2JSZWdpc3RyeSgpLndyaXRlQmxvYnNUb1RlbXBvcmFyeUZpbGVz KG1fYmxvYlVSTHMsIFtjb21wbGV0aW9uSGFuZGxlciwgdGhpcywgcHJvdGVjdG9yXShjb25zdCBW ZWN0b3I8U3RyaW5nPiYgYmxvYkZpbGVQYXRocykgeworICAgICAgICBBU1NFUlQoaXNNYWluVGhy ZWFkKCkpOworCisgICAgICAgIGlmIChibG9iRmlsZVBhdGhzLmlzRW1wdHkoKSkgeworICAgICAg ICAgICAgLy8gV2Ugc2hvdWxkIGhhdmUgc3VjY2Vzc2Z1bGx5IHdyaXR0ZW4gYmxvYnMgdG8gdGVt cG9yYXJ5IGZpbGVzLgorICAgICAgICAgICAgLy8gSWYgd2UgZmFpbGVkLCB0aGVuIHdlIGNhbid0 IHN1Y2Nlc3NmdWxseSBzdG9yZSB0aGlzIHJlY29yZC4KKyAgICAgICAgICAgIGNvbXBsZXRpb25I YW5kbGVyKHsgfSk7CisgICAgICAgICAgICByZXR1cm47CisgICAgICAgIH0KKworICAgICAgICBB U1NFUlQobV9ibG9iVVJMcy5zaXplKCkgPT0gYmxvYkZpbGVQYXRocy5zaXplKCkpOworICAgICAg ICAKKyAgICAgICAgY29tcGxldGlvbkhhbmRsZXIoeyAqdGhpcywgbV9ibG9iVVJMcywgYmxvYkZp bGVQYXRocyB9KTsKICAgICB9KTsKIH0KIAo=