175524 2017-08-13 10:22:04 -0700 Drop non-const getter for CachedResource::resourceRequest() 2017-08-13 14:08:34 -0700 1 1 1 Unclassified WebKit WebCore Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 cdumez cdumez buildbot commit-queue dbates japhet sam webkit-bug-importer youennf oldest_to_newest 1338246 0 cdumez 2017-08-13 10:22:04 -0700 Drop non-const getter for CachedResource::resourceRequest(). It would be unsafe to modify the request of a CachedResource after it has been cached. Exposing such a getter is therefore a footgun. 1338247 1 318011 cdumez 2017-08-13 10:23:48 -0700 Created attachment 318011 Patch 1338251 2 318011 youennf 2017-08-13 12:49:28 -0700 Comment on attachment 318011 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=318011&action=review > Source/WebCore/loader/LinkLoader.cpp:227 > CachedResourceRequest linkRequest(WTFMove(resourceRequest), CachedResourceLoader::defaultCachedResourceOptions(), CachedResource::defaultPriorityForResourceType(type.value())); Could probably be rewritten to CachedResourceRequest linkRequest(document.completeURL(href),...) or CachedResourceRequest linkRequest(ResourceRequest(document.completeURL(href),...) if we do not like creating implicitly requests from urls. 1338254 3 318015 cdumez 2017-08-13 13:26:16 -0700 Created attachment 318015 Patch 1338256 4 318015 commit-queue 2017-08-13 14:07:59 -0700 Comment on attachment 318015 Patch Clearing flags on attachment: 318015 Committed r220632: <http://trac.webkit.org/changeset/220632> 1338257 5 commit-queue 2017-08-13 14:08:01 -0700 All reviewed patches have been landed. Closing bug. 1338258 6 webkit-bug-importer 2017-08-13 14:08:34 -0700 <rdar://problem/33868034> 318011 2017-08-13 10:23:48 -0700 2017-08-13 13:26:15 -0700 Patch bug-175524-20170813102346.patch text/plain 11465 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjIwNjIzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYWI5MDY2MWEzMTkyZTM2 NTU0ZDEyNjRjMDNkNDk5YzI4Mzk5YTFkYS4uNWY5N2Y1M2QzN2I1MDVlOGJmNDJiYTIwZDFiZGY3 MmVkZmI5Njg3ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMzIEBACisyMDE3LTA4LTEzICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgRHJvcCBub24tY29uc3QgZ2V0 dGVyIGZvciBDYWNoZWRSZXNvdXJjZTo6cmVzb3VyY2VSZXF1ZXN0KCkKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3NTUyNAorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIERyb3Agbm9uLWNvbnN0IGdldHRlciBm b3IgQ2FjaGVkUmVzb3VyY2U6OnJlc291cmNlUmVxdWVzdCgpLiBJdCB3b3VsZCBiZSB1bnNhZmUg dG8gbW9kaWZ5IHRoZSByZXF1ZXN0IG9mIGEgQ2FjaGVkUmVzb3VyY2UKKyAgICAgICAgYWZ0ZXIg aXQgaGFzIGJlZW4gY2FjaGVkLiBFeHBvc2luZyBzdWNoIGEgZ2V0dGVyIGlzIHRoZXJlZm9yZSBh IGZvb3RndW4uCisKKyAgICAgICAgKiBsb2FkZXIvTGlua0xvYWRlci5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpMaW5rTG9hZGVyOjpwcmVsb2FkSWZOZWVkZWQpOgorICAgICAgICAqIGxvYWRlci9j YWNoZS9DYWNoZWRJbWFnZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDYWNoZWRJbWFnZTo6Q2Fj aGVkSW1hZ2UpOgorICAgICAgICAqIGxvYWRlci9jYWNoZS9DYWNoZWRJbWFnZS5oOgorICAgICAg ICAqIGxvYWRlci9jYWNoZS9DYWNoZWRSZXNvdXJjZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpD YWNoZWRSZXNvdXJjZTo6Q2FjaGVkUmVzb3VyY2UpOgorICAgICAgICAqIGxvYWRlci9jYWNoZS9D YWNoZWRSZXNvdXJjZS5oOgorICAgICAgICAoV2ViQ29yZTo6Q2FjaGVkUmVzb3VyY2U6OnJlc291 cmNlUmVxdWVzdCBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpDYWNoZWRSZXNvdXJjZTo6aWdu b3JlRm9yUmVxdWVzdENvdW50IGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OkNhY2hlZFJlc291 cmNlOjpzZXRJZ25vcmVGb3JSZXF1ZXN0Q291bnQpOgorICAgICAgICAqIGxvYWRlci9jYWNoZS9D YWNoZWRSZXNvdXJjZUxvYWRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDYWNoZWRSZXNvdXJj ZUxvYWRlcjo6cmVxdWVzdFJlc291cmNlKToKKyAgICAgICAgKiBsb2FkZXIvY2FjaGUvQ2FjaGVk UmVzb3VyY2VSZXF1ZXN0Lmg6CisgICAgICAgIChXZWJDb3JlOjpDYWNoZWRSZXNvdXJjZVJlcXVl c3Q6Omlnbm9yZUZvclJlcXVlc3RDb3VudCBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpDYWNo ZWRSZXNvdXJjZVJlcXVlc3Q6OnNldElnbm9yZUZvclJlcXVlc3RDb3VudCk6CisgICAgICAgICog bG9hZGVyL2NhY2hlL01lbW9yeUNhY2hlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Ok1lbW9yeUNh Y2hlOjphZGRJbWFnZVRvQ2FjaGUpOgorICAgICAgICAqIHBsYXRmb3JtL25ldHdvcmsvUmVzb3Vy Y2VSZXF1ZXN0QmFzZS5oOgorCiAyMDE3LTA4LTEyICBDaHJpcyBEdW1leiAgPGNkdW1lekBhcHBs ZS5jb20+CiAKICAgICAgICAgVXBkYXRlIENhY2hlZFJlc291cmNlTG9hZGVyOjpyZXF1ZXN0UmVz b3VyY2UoKSB0byByZXR1cm4gYSBXVEY6OkV4cGVjdGVkCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9sb2FkZXIvTGlua0xvYWRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvTGlua0xv YWRlci5jcHAKaW5kZXggYTE4MjEzNTc2MTAwNWQwMDU4NGUwYWM4YTIwZmVlOWNkODE1YWY1YS4u MzkwOGVjNzJjNjk5NzQ1NmU1ZjEyOWVmYjRmNWU0NzVlMDliNWM3YSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvbG9hZGVyL0xpbmtMb2FkZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xv YWRlci9MaW5rTG9hZGVyLmNwcApAQCAtMjI0LDkgKzIyNCw5IEBAIHN0ZDo6dW5pcXVlX3B0cjxM aW5rUHJlbG9hZFJlc291cmNlQ2xpZW50PiBMaW5rTG9hZGVyOjpwcmVsb2FkSWZOZWVkZWQoY29u c3QgTGluCiAgICAgICAgIHJldHVybiBudWxscHRyOwogCiAgICAgUmVzb3VyY2VSZXF1ZXN0IHJl c291cmNlUmVxdWVzdChkb2N1bWVudC5jb21wbGV0ZVVSTChocmVmKSk7Ci0gICAgcmVzb3VyY2VS ZXF1ZXN0LnNldElnbm9yZUZvclJlcXVlc3RDb3VudCh0cnVlKTsKICAgICBDYWNoZWRSZXNvdXJj ZVJlcXVlc3QgbGlua1JlcXVlc3QoV1RGTW92ZShyZXNvdXJjZVJlcXVlc3QpLCBDYWNoZWRSZXNv dXJjZUxvYWRlcjo6ZGVmYXVsdENhY2hlZFJlc291cmNlT3B0aW9ucygpLCBDYWNoZWRSZXNvdXJj ZTo6ZGVmYXVsdFByaW9yaXR5Rm9yUmVzb3VyY2VUeXBlKHR5cGUudmFsdWUoKSkpOwogICAgIGxp bmtSZXF1ZXN0LnNldEluaXRpYXRvcigibGluayIpOworICAgIGxpbmtSZXF1ZXN0LnNldElnbm9y ZUZvclJlcXVlc3RDb3VudCh0cnVlKTsKICAgICBsaW5rUmVxdWVzdC5zZXRJc0xpbmtQcmVsb2Fk KCk7CiAKICAgICBsaW5rUmVxdWVzdC5zZXRBc1BvdGVudGlhbGx5Q3Jvc3NPcmlnaW4oY3Jvc3NP cmlnaW5Nb2RlLCBkb2N1bWVudCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIv Y2FjaGUvQ2FjaGVkSW1hZ2UuY3BwIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hlL0NhY2hl ZEltYWdlLmNwcAppbmRleCA0MTNmMDQxNGI3MzczODI3NTJkMTFjNmVkZGFkYzNhYTMyYzZkMzhi Li4xN2Q2ZmZiMWU4NTY2YTgzYzdlMmFmMjcxMjRkOGJiZjcyZTg4MmY3IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2FjaGVkSW1hZ2UuY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL2xvYWRlci9jYWNoZS9DYWNoZWRJbWFnZS5jcHAKQEAgLTY3LDExICs2NywxMyBAQCBD YWNoZWRJbWFnZTo6Q2FjaGVkSW1hZ2UoSW1hZ2UqIGltYWdlLCBTZXNzaW9uSUQgc2Vzc2lvbklE KQogewogfQogCi1DYWNoZWRJbWFnZTo6Q2FjaGVkSW1hZ2UoY29uc3QgVVJMJiB1cmwsIEltYWdl KiBpbWFnZSwgU2Vzc2lvbklEIHNlc3Npb25JRCkKK0NhY2hlZEltYWdlOjpDYWNoZWRJbWFnZShj b25zdCBVUkwmIHVybCwgSW1hZ2UqIGltYWdlLCBTZXNzaW9uSUQgc2Vzc2lvbklELCBjb25zdCBT dHJpbmcmIGRvbWFpbkZvckNhY2hlUGFydGl0aW9uKQogICAgIDogQ2FjaGVkUmVzb3VyY2UodXJs LCBJbWFnZVJlc291cmNlLCBzZXNzaW9uSUQpCiAgICAgLCBtX2ltYWdlKGltYWdlKQogICAgICwg bV9pc01hbnVhbGx5Q2FjaGVkKHRydWUpCiB7CisgICAgbV9yZXNvdXJjZVJlcXVlc3Quc2V0RG9t YWluRm9yQ2FjaGVQYXJ0aXRpb24oZG9tYWluRm9yQ2FjaGVQYXJ0aXRpb24pOworCiAgICAgLy8g VXNlIHRoZSBpbmNvbWluZyBVUkwgaW4gdGhlIHJlc3BvbnNlIGZpZWxkLiBUaGlzIGVuc3VyZXMg dGhhdCBjb2RlIHVzaW5nIHRoZSByZXNwb25zZSBkaXJlY3RseSwKICAgICAvLyBzdWNoIGFzIG9y aWdpbiBjaGVja3MgZm9yIHNlY3VyaXR5LCBhY3R1YWxseSBzZWUgc29tZXRoaW5nLgogICAgIG1f cmVzcG9uc2Uuc2V0VVJMKHVybCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIv Y2FjaGUvQ2FjaGVkSW1hZ2UuaCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9DYWNoZWRJ bWFnZS5oCmluZGV4IDhlYTZmMmUxMGVhMDM3YjlmNDIwOGIzNTA3Y2NmNmIyOGU1MzI4M2EuLjUy YzQ3NmNmZTFjZDQ4NGI4NjEwYzQyMWQ4YmRiNjY0NDA5YzU2YTcgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9DYWNoZWRJbWFnZS5oCisrKyBiL1NvdXJjZS9XZWJDb3Jl L2xvYWRlci9jYWNoZS9DYWNoZWRJbWFnZS5oCkBAIC01MCw3ICs1MCw3IEBAIHB1YmxpYzoKICAg ICBDYWNoZWRJbWFnZShDYWNoZWRSZXNvdXJjZVJlcXVlc3QmJiwgU2Vzc2lvbklEKTsKICAgICBD YWNoZWRJbWFnZShJbWFnZSosIFNlc3Npb25JRCk7CiAgICAgLy8gQ29uc3RydWN0b3IgdG8gdXNl IGZvciBtYW51YWxseSBjYWNoZWQgaW1hZ2VzLgotICAgIENhY2hlZEltYWdlKGNvbnN0IFVSTCYs IEltYWdlKiwgU2Vzc2lvbklEKTsKKyAgICBDYWNoZWRJbWFnZShjb25zdCBVUkwmLCBJbWFnZSos IFNlc3Npb25JRCwgY29uc3QgU3RyaW5nJiBkb21haW5Gb3JDYWNoZVBhcnRpdGlvbik7CiAgICAg dmlydHVhbCB+Q2FjaGVkSW1hZ2UoKTsKIAogICAgIFdFQkNPUkVfRVhQT1JUIEltYWdlKiBpbWFn ZSgpOyAvLyBSZXR1cm5zIHRoZSBudWxsSW1hZ2UoKSBpZiB0aGUgaW1hZ2UgaXMgbm90IGF2YWls YWJsZSB5ZXQuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2FjaGVk UmVzb3VyY2UuY3BwIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hlL0NhY2hlZFJlc291cmNl LmNwcAppbmRleCAwYTE1ZWEwOGQ1YjBiMjVlNjU4MGFlNzEyMzk4NTllM2Y2NTQ5N2I4Li5lNWVl YzI1ZmVlZTRkN2IwOTZlZWQ2ZGM1ODBmYjIxMzc2YWY5NzgyIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2FjaGVkUmVzb3VyY2UuY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL2xvYWRlci9jYWNoZS9DYWNoZWRSZXNvdXJjZS5jcHAKQEAgLTEyOCw2ICsxMjgsNyBAQCBD YWNoZWRSZXNvdXJjZTo6Q2FjaGVkUmVzb3VyY2UoQ2FjaGVkUmVzb3VyY2VSZXF1ZXN0JiYgcmVx dWVzdCwgVHlwZSB0eXBlLCBTZXNzaQogICAgICwgbV9pc0xpbmtQcmVsb2FkKHJlcXVlc3QuaXNM aW5rUHJlbG9hZCgpKQogICAgICwgbV9oYXNVbmtub3duRW5jb2RpbmcocmVxdWVzdC5pc0xpbmtQ cmVsb2FkKCkpCiAgICAgLCBtX3R5cGUodHlwZSkKKyAgICAsIG1faWdub3JlRm9yUmVxdWVzdENv dW50KHJlcXVlc3QuaWdub3JlRm9yUmVxdWVzdENvdW50KCkpCiB7CiAgICAgQVNTRVJUKHNlc3Np b25JRC5pc1ZhbGlkKCkpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2Fj aGUvQ2FjaGVkUmVzb3VyY2UuaCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9DYWNoZWRS ZXNvdXJjZS5oCmluZGV4IDVkMmM5OWVjYjEwN2RlZTQ0ZDQ5Nzc5NjJmYTFjYThkYzgwMGNjZjgu LjY5OTZiYmEyNzUyMDg5NDgxODQ2OWEwMTAyOGMwZWRlZDBjMDA0N2YgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9DYWNoZWRSZXNvdXJjZS5oCisrKyBiL1NvdXJjZS9X ZWJDb3JlL2xvYWRlci9jYWNoZS9DYWNoZWRSZXNvdXJjZS5oCkBAIC0xMTMsNyArMTEzLDYgQEAg cHVibGljOgogICAgIHZpcnR1YWwgYm9vbCBzaG91bGRJZ25vcmVIVFRQU3RhdHVzQ29kZUVycm9y cygpIGNvbnN0IHsgcmV0dXJuIGZhbHNlOyB9CiAKICAgICBjb25zdCBSZXNvdXJjZVJlcXVlc3Qm IHJlc291cmNlUmVxdWVzdCgpIGNvbnN0IHsgcmV0dXJuIG1fcmVzb3VyY2VSZXF1ZXN0OyB9Ci0g ICAgUmVzb3VyY2VSZXF1ZXN0JiByZXNvdXJjZVJlcXVlc3QoKSB7IHJldHVybiBtX3Jlc291cmNl UmVxdWVzdDsgfQogICAgIGNvbnN0IFVSTCYgdXJsKCkgY29uc3QgeyByZXR1cm4gbV9yZXNvdXJj ZVJlcXVlc3QudXJsKCk7fQogICAgIGNvbnN0IFN0cmluZyYgY2FjaGVQYXJ0aXRpb24oKSBjb25z dCB7IHJldHVybiBtX3Jlc291cmNlUmVxdWVzdC5jYWNoZVBhcnRpdGlvbigpOyB9CiAgICAgU2Vz c2lvbklEIHNlc3Npb25JRCgpIGNvbnN0IHsgcmV0dXJuIG1fc2Vzc2lvbklEOyB9CkBAIC0xNjQs OSArMTYzLDExIEBAIHB1YmxpYzoKICAgICBib29sIGlzSW1hZ2UoKSBjb25zdCB7IHJldHVybiB0 eXBlKCkgPT0gSW1hZ2VSZXNvdXJjZTsgfQogICAgIC8vIEZJWE1FOiBDYWNoZWRSYXdSZXNvdXJj ZSBjb3VsZCBiZSBhIG1haW4gcmVzb3VyY2UsIGFuIGF1ZGlvL3ZpZGVvIHJlc291cmNlLCBvciBh IHJhdyBYSFIvaWNvbiByZXNvdXJjZS4KICAgICBib29sIGlzTWFpbk9yTWVkaWFPckljb25PclJh d1Jlc291cmNlKCkgY29uc3QgeyByZXR1cm4gdHlwZSgpID09IE1haW5SZXNvdXJjZSB8fCB0eXBl KCkgPT0gTWVkaWFSZXNvdXJjZSB8fCB0eXBlKCkgPT0gSWNvbiB8fCB0eXBlKCkgPT0gUmF3UmVz b3VyY2UgfHwgdHlwZSgpID09IEJlYWNvbjsgfQorCisgICAgLy8gV2hldGhlciB0aGlzIHJlcXVl c3Qgc2hvdWxkIGltcGFjdCByZXF1ZXN0IGNvdW50aW5nIGFuZCBkZWxheSB3aW5kb3cub25sb2Fk LgogICAgIGJvb2wgaWdub3JlRm9yUmVxdWVzdENvdW50KCkgY29uc3QKICAgICB7Ci0gICAgICAg IHJldHVybiBtX3Jlc291cmNlUmVxdWVzdC5pZ25vcmVGb3JSZXF1ZXN0Q291bnQoKQorICAgICAg ICByZXR1cm4gbV9pZ25vcmVGb3JSZXF1ZXN0Q291bnQKICAgICAgICAgICAgIHx8IHR5cGUoKSA9 PSBNYWluUmVzb3VyY2UKICNpZiBFTkFCTEUoTElOS19QUkVGRVRDSCkKICAgICAgICAgICAgIHx8 IHR5cGUoKSA9PSBMaW5rUHJlZmV0Y2gKQEAgLTE3Niw2ICsxNzcsOCBAQCBwdWJsaWM6CiAgICAg ICAgICAgICB8fCB0eXBlKCkgPT0gUmF3UmVzb3VyY2U7CiAgICAgfQogCisgICAgdm9pZCBzZXRJ Z25vcmVGb3JSZXF1ZXN0Q291bnQoYm9vbCBpZ25vcmVGb3JSZXF1ZXN0Q291bnQpIHsgbV9pZ25v cmVGb3JSZXF1ZXN0Q291bnQgPSBpZ25vcmVGb3JSZXF1ZXN0Q291bnQ7IH0KKwogICAgIHVuc2ln bmVkIGFjY2Vzc0NvdW50KCkgY29uc3QgeyByZXR1cm4gbV9hY2Nlc3NDb3VudDsgfQogICAgIHZv aWQgaW5jcmVhc2VBY2Nlc3NDb3VudCgpIHsgbV9hY2Nlc3NDb3VudCsrOyB9CiAKQEAgLTM3MCw2 ICszNzMsNyBAQCBwcml2YXRlOgogICAgIFZlY3RvcjxzdGQ6OnBhaXI8U3RyaW5nLCBTdHJpbmc+ PiBtX3ZhcnlpbmdIZWFkZXJWYWx1ZXM7CiAKICAgICB1bnNpZ25lZCBsb25nIG1faWRlbnRpZmll ckZvckxvYWRXaXRob3V0UmVzb3VyY2VMb2FkZXIgeyAwIH07CisgICAgYm9vbCBtX2lnbm9yZUZv clJlcXVlc3RDb3VudCB7IGZhbHNlIH07CiB9OwogCiBjbGFzcyBDYWNoZWRSZXNvdXJjZTo6Q2Fs bGJhY2sgewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hlL0NhY2hlZFJl c291cmNlTG9hZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9DYWNoZWRSZXNv dXJjZUxvYWRlci5jcHAKaW5kZXggZjU5OTM2N2FkMTg4YzIzM2MxZTE1OWZhYWVmOThlYjAzMjBh NGU4Ni4uNTQyNDg1OTA2ZmUxMmY1OWIyZDMyNGNkM2IwNGRiNDAyNmM5ODM5OCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hlL0NhY2hlZFJlc291cmNlTG9hZGVyLmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2FjaGVkUmVzb3VyY2VMb2FkZXIuY3Bw CkBAIC04MjMsOCArODIzLDggQEAgUmVzb3VyY2VFcnJvck9yPENhY2hlZFJlc291cmNlSGFuZGxl PENhY2hlZFJlc291cmNlPj4gQ2FjaGVkUmVzb3VyY2VMb2FkZXI6OnJlcXUKICAgICB9CiAgICAg QVNTRVJUKHJlc291cmNlKTsKIAotICAgIGlmIChmb3JQcmVsb2FkID09IEZvclByZWxvYWQ6Ok5v ICYmIHJlc291cmNlLT5sb2FkZXIoKSAmJiByZXNvdXJjZS0+cmVzb3VyY2VSZXF1ZXN0KCkuaWdu b3JlRm9yUmVxdWVzdENvdW50KCkpIHsKLSAgICAgICAgcmVzb3VyY2UtPnJlc291cmNlUmVxdWVz dCgpLnNldElnbm9yZUZvclJlcXVlc3RDb3VudChmYWxzZSk7CisgICAgaWYgKGZvclByZWxvYWQg PT0gRm9yUHJlbG9hZDo6Tm8gJiYgcmVzb3VyY2UtPmxvYWRlcigpICYmIHJlc291cmNlLT5pZ25v cmVGb3JSZXF1ZXN0Q291bnQoKSkgeworICAgICAgICByZXNvdXJjZS0+c2V0SWdub3JlRm9yUmVx dWVzdENvdW50KGZhbHNlKTsKICAgICAgICAgaW5jcmVtZW50UmVxdWVzdENvdW50KCpyZXNvdXJj ZSk7CiAgICAgfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2Fj aGVkUmVzb3VyY2VSZXF1ZXN0LmggYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2FjaGVk UmVzb3VyY2VSZXF1ZXN0LmgKaW5kZXggMjYyZWE1MTk4MDllM2RiNDE5ZWEyMDJmNzZmYzM3MDUz NDkyNjBmMy4uZjUwN2ZjYzY2N2VmNTcyODY4M2RjYjJkYWI2YzhmZTFlODk3OGRkNSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hlL0NhY2hlZFJlc291cmNlUmVxdWVzdC5o CisrKyBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9DYWNoZWRSZXNvdXJjZVJlcXVlc3Qu aApAQCAtNjMsNiArNjMsMTAgQEAgcHVibGljOgogICAgIGJvb2wgYWxsb3dzQ2FjaGluZygpIGNv bnN0IHsgcmV0dXJuIG1fb3B0aW9ucy5jYWNoaW5nUG9saWN5ID09IENhY2hpbmdQb2xpY3k6OkFs bG93Q2FjaGluZzsgfQogICAgIHZvaWQgc2V0Q2FjaGluZ1BvbGljeShDYWNoaW5nUG9saWN5IHBv bGljeSkgeyBtX29wdGlvbnMuY2FjaGluZ1BvbGljeSA9IHBvbGljeTsgIH0KIAorICAgIC8vIFdo ZXRoZXIgdGhpcyByZXF1ZXN0IHNob3VsZCBpbXBhY3QgcmVxdWVzdCBjb3VudGluZyBhbmQgZGVs YXkgd2luZG93Lm9ubG9hZC4KKyAgICBib29sIGlnbm9yZUZvclJlcXVlc3RDb3VudCgpIGNvbnN0 IHsgcmV0dXJuIG1faWdub3JlRm9yUmVxdWVzdENvdW50OyB9CisgICAgdm9pZCBzZXRJZ25vcmVG b3JSZXF1ZXN0Q291bnQoYm9vbCBpZ25vcmVGb3JSZXF1ZXN0Q291bnQpIHsgbV9pZ25vcmVGb3JS ZXF1ZXN0Q291bnQgPSBpZ25vcmVGb3JSZXF1ZXN0Q291bnQ7IH0KKwogICAgIHZvaWQgc2V0QXNQ b3RlbnRpYWxseUNyb3NzT3JpZ2luKGNvbnN0IFN0cmluZyYsIERvY3VtZW50Jik7CiAgICAgdm9p ZCB1cGRhdGVGb3JBY2Nlc3NDb250cm9sKERvY3VtZW50Jik7CiAKQEAgLTk4LDYgKzEwMiw3IEBA IHByaXZhdGU6CiAgICAgUmVmUHRyPFNlY3VyaXR5T3JpZ2luPiBtX29yaWdpbjsKICAgICBTdHJp bmcgbV9mcmFnbWVudElkZW50aWZpZXI7CiAgICAgYm9vbCBtX2lzTGlua1ByZWxvYWQgeyBmYWxz ZSB9OworICAgIGJvb2wgbV9pZ25vcmVGb3JSZXF1ZXN0Q291bnQgeyBmYWxzZSB9OwogfTsKIAog dm9pZCB1cGdyYWRlSW5zZWN1cmVSZXNvdXJjZVJlcXVlc3RJZk5lZWRlZChSZXNvdXJjZVJlcXVl c3QmLCBEb2N1bWVudCYpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hl L01lbW9yeUNhY2hlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9NZW1vcnlDYWNo ZS5jcHAKaW5kZXggNjJkZjE5MGZmYTFlNDM5ZDBjMTViNTU2NzhlYzYxZWIzMzUwNjY1NC4uNTE4 NmExYmJlZDIzZTQ1NTUwOWNmOWRmMDNjMDA4NGJjYzQ3MWQ5ZCAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvbG9hZGVyL2NhY2hlL01lbW9yeUNhY2hlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9sb2FkZXIvY2FjaGUvTWVtb3J5Q2FjaGUuY3BwCkBAIC0yMTcsMTEgKzIxNywxMCBAQCBib29s IE1lbW9yeUNhY2hlOjphZGRJbWFnZVRvQ2FjaGUoTmF0aXZlSW1hZ2VQdHImJiBpbWFnZSwgY29u c3QgVVJMJiB1cmwsIGNvbnN0CiAgICAgaWYgKCFiaXRtYXBJbWFnZSkKICAgICAgICAgcmV0dXJu IGZhbHNlOwogCi0gICAgYXV0byBjYWNoZWRJbWFnZSA9IHN0ZDo6bWFrZV91bmlxdWU8Q2FjaGVk SW1hZ2U+KHVybCwgYml0bWFwSW1hZ2UuZ2V0KCksIHNlc3Npb25JRCk7CisgICAgYXV0byBjYWNo ZWRJbWFnZSA9IHN0ZDo6bWFrZV91bmlxdWU8Q2FjaGVkSW1hZ2U+KHVybCwgYml0bWFwSW1hZ2Uu Z2V0KCksIHNlc3Npb25JRCwgZG9tYWluRm9yQ2FjaGVQYXJ0aXRpb24pOwogCiAgICAgY2FjaGVk SW1hZ2UtPmFkZENsaWVudChkdW1teUNhY2hlZEltYWdlQ2xpZW50KCkpOwogICAgIGNhY2hlZElt YWdlLT5zZXREZWNvZGVkU2l6ZShiaXRtYXBJbWFnZS0+ZGVjb2RlZFNpemUoKSk7Ci0gICAgY2Fj aGVkSW1hZ2UtPnJlc291cmNlUmVxdWVzdCgpLnNldERvbWFpbkZvckNhY2hlUGFydGl0aW9uKGRv bWFpbkZvckNhY2hlUGFydGl0aW9uKTsKIAogICAgIHJldHVybiBhZGQoKmNhY2hlZEltYWdlLnJl bGVhc2UoKSk7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3Jr L1Jlc291cmNlUmVxdWVzdEJhc2UuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsv UmVzb3VyY2VSZXF1ZXN0QmFzZS5oCmluZGV4IGZiNDA1MzBjMDgxYjE4NjU3ZTE5MmIyZjdjYmY0 Y2JlZTFkZGVjMTYuLmI1ZTk0OGVhZWVjMWZkOTBkZGJlNjk4Zjk2NmZiYzdlODVjZTljZGQgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvUmVzb3VyY2VSZXF1ZXN0 QmFzZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvUmVzb3VyY2VSZXF1 ZXN0QmFzZS5oCkBAIC0xNDgsMTAgKzE0OCw2IEBAIHB1YmxpYzoKICAgICBib29sIGhpZGRlbkZy b21JbnNwZWN0b3IoKSBjb25zdCB7IHJldHVybiBtX2hpZGRlbkZyb21JbnNwZWN0b3I7IH0KICAg ICB2b2lkIHNldEhpZGRlbkZyb21JbnNwZWN0b3IoYm9vbCBoaWRkZW5Gcm9tSW5zcGVjdG9yKSB7 IG1faGlkZGVuRnJvbUluc3BlY3RvciA9IGhpZGRlbkZyb21JbnNwZWN0b3I7IH0KIAotICAgIC8v IFdoZXRoZXIgdGhpcyByZXF1ZXN0IHNob3VsZCBpbXBhY3QgcmVxdWVzdCBjb3VudGluZyBhbmQg ZGVsYXkgd2luZG93Lm9ubG9hZC4KLSAgICBib29sIGlnbm9yZUZvclJlcXVlc3RDb3VudCgpIGNv bnN0IHsgcmV0dXJuIG1faWdub3JlRm9yUmVxdWVzdENvdW50OyB9Ci0gICAgdm9pZCBzZXRJZ25v cmVGb3JSZXF1ZXN0Q291bnQoYm9vbCBpZ25vcmVGb3JSZXF1ZXN0Q291bnQpIHsgbV9pZ25vcmVG b3JSZXF1ZXN0Q291bnQgPSBpZ25vcmVGb3JSZXF1ZXN0Q291bnQ7IH0KLQogICAgIGVudW0gY2xh c3MgUmVxdWVzdGVyIHsgVW5zcGVjaWZpZWQsIE1haW4sIFhIUiwgRmV0Y2gsIE1lZGlhIH07CiAg ICAgUmVxdWVzdGVyIHJlcXVlc3RlcigpIGNvbnN0IHsgcmV0dXJuIG1fcmVxdWVzdGVyOyB9CiAg ICAgdm9pZCBzZXRSZXF1ZXN0ZXIoUmVxdWVzdGVyIHJlcXVlc3RlcikgeyBtX3JlcXVlc3RlciA9 IHJlcXVlc3RlcjsgfQpAQCAtMjIyLDcgKzIxOCw2IEBAIHByb3RlY3RlZDoKICAgICBtdXRhYmxl IGJvb2wgbV9yZXNvdXJjZVJlcXVlc3RCb2R5VXBkYXRlZCB7IGZhbHNlIH07CiAgICAgbXV0YWJs ZSBib29sIG1fcGxhdGZvcm1SZXF1ZXN0Qm9keVVwZGF0ZWQgeyBmYWxzZSB9OwogICAgIGJvb2wg bV9oaWRkZW5Gcm9tSW5zcGVjdG9yIHsgZmFsc2UgfTsKLSAgICBib29sIG1faWdub3JlRm9yUmVx dWVzdENvdW50IHsgZmFsc2UgfTsKICAgICBSZXNvdXJjZUxvYWRQcmlvcml0eSBtX3ByaW9yaXR5 IHsgUmVzb3VyY2VMb2FkUHJpb3JpdHk6OkxvdyB9OwogICAgIFJlcXVlc3RlciBtX3JlcXVlc3Rl ciB7IFJlcXVlc3Rlcjo6VW5zcGVjaWZpZWQgfTsKICAgICBTdHJpbmcgbV9pbml0aWF0b3JJZGVu dGlmaWVyOwo= 318015 2017-08-13 13:26:16 -0700 2017-08-13 14:07:59 -0700 Patch bug-175524-20170813132616.patch text/plain 11700 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjIwNjIzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYWI5MDY2MWEzMTkyZTM2 NTU0ZDEyNjRjMDNkNDk5YzI4Mzk5YTFkYS4uNzZlNjE5NGQzYTU3MWM1NjYyMWUzNjQ4MThjMTM1 NjUyYjFmZjY4MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMzIEBACisyMDE3LTA4LTEzICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgRHJvcCBub24tY29uc3QgZ2V0 dGVyIGZvciBDYWNoZWRSZXNvdXJjZTo6cmVzb3VyY2VSZXF1ZXN0KCkKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3NTUyNAorCisgICAgICAgIFJldmll d2VkIGJ5IFlvdWVubiBGYWJsZXQuCisKKyAgICAgICAgRHJvcCBub24tY29uc3QgZ2V0dGVyIGZv ciBDYWNoZWRSZXNvdXJjZTo6cmVzb3VyY2VSZXF1ZXN0KCkuIEl0IHdvdWxkIGJlIHVuc2FmZSB0 byBtb2RpZnkgdGhlIHJlcXVlc3Qgb2YgYSBDYWNoZWRSZXNvdXJjZQorICAgICAgICBhZnRlciBp dCBoYXMgYmVlbiBjYWNoZWQuIEV4cG9zaW5nIHN1Y2ggYSBnZXR0ZXIgaXMgdGhlcmVmb3JlIGEg Zm9vdGd1bi4KKworICAgICAgICAqIGxvYWRlci9MaW5rTG9hZGVyLmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OkxpbmtMb2FkZXI6OnByZWxvYWRJZk5lZWRlZCk6CisgICAgICAgICogbG9hZGVyL2Nh Y2hlL0NhY2hlZEltYWdlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNhY2hlZEltYWdlOjpDYWNo ZWRJbWFnZSk6CisgICAgICAgICogbG9hZGVyL2NhY2hlL0NhY2hlZEltYWdlLmg6CisgICAgICAg ICogbG9hZGVyL2NhY2hlL0NhY2hlZFJlc291cmNlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNh Y2hlZFJlc291cmNlOjpDYWNoZWRSZXNvdXJjZSk6CisgICAgICAgICogbG9hZGVyL2NhY2hlL0Nh Y2hlZFJlc291cmNlLmg6CisgICAgICAgIChXZWJDb3JlOjpDYWNoZWRSZXNvdXJjZTo6cmVzb3Vy Y2VSZXF1ZXN0IGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OkNhY2hlZFJlc291cmNlOjppZ25v cmVGb3JSZXF1ZXN0Q291bnQgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6Q2FjaGVkUmVzb3Vy Y2U6OnNldElnbm9yZUZvclJlcXVlc3RDb3VudCk6CisgICAgICAgICogbG9hZGVyL2NhY2hlL0Nh Y2hlZFJlc291cmNlTG9hZGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNhY2hlZFJlc291cmNl TG9hZGVyOjpyZXF1ZXN0UmVzb3VyY2UpOgorICAgICAgICAqIGxvYWRlci9jYWNoZS9DYWNoZWRS ZXNvdXJjZVJlcXVlc3QuaDoKKyAgICAgICAgKFdlYkNvcmU6OkNhY2hlZFJlc291cmNlUmVxdWVz dDo6aWdub3JlRm9yUmVxdWVzdENvdW50IGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OkNhY2hl ZFJlc291cmNlUmVxdWVzdDo6c2V0SWdub3JlRm9yUmVxdWVzdENvdW50KToKKyAgICAgICAgKiBs b2FkZXIvY2FjaGUvTWVtb3J5Q2FjaGUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TWVtb3J5Q2Fj aGU6OmFkZEltYWdlVG9DYWNoZSk6CisgICAgICAgICogcGxhdGZvcm0vbmV0d29yay9SZXNvdXJj ZVJlcXVlc3RCYXNlLmg6CisKIDIwMTctMDgtMTIgIENocmlzIER1bWV6ICA8Y2R1bWV6QGFwcGxl LmNvbT4KIAogICAgICAgICBVcGRhdGUgQ2FjaGVkUmVzb3VyY2VMb2FkZXI6OnJlcXVlc3RSZXNv dXJjZSgpIHRvIHJldHVybiBhIFdURjo6RXhwZWN0ZWQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL2xvYWRlci9MaW5rTG9hZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9MaW5rTG9h ZGVyLmNwcAppbmRleCBhMTgyMTM1NzYxMDA1ZDAwNTg0ZTBhYzhhMjBmZWU5Y2Q4MTVhZjVhLi43 Mjc5NWIwZTAzZTI3MWQ0ZWRhYmM2MDI0NjUyNDU1ZDFmY2M4MDZlIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9sb2FkZXIvTGlua0xvYWRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbG9h ZGVyL0xpbmtMb2FkZXIuY3BwCkBAIC0yMjMsMTAgKzIyMyw5IEBAIHN0ZDo6dW5pcXVlX3B0cjxM aW5rUHJlbG9hZFJlc291cmNlQ2xpZW50PiBMaW5rTG9hZGVyOjpwcmVsb2FkSWZOZWVkZWQoY29u c3QgTGluCiAgICAgaWYgKCFpc1N1cHBvcnRlZFR5cGUodHlwZS52YWx1ZSgpLCBtaW1lVHlwZSkp CiAgICAgICAgIHJldHVybiBudWxscHRyOwogCi0gICAgUmVzb3VyY2VSZXF1ZXN0IHJlc291cmNl UmVxdWVzdChkb2N1bWVudC5jb21wbGV0ZVVSTChocmVmKSk7Ci0gICAgcmVzb3VyY2VSZXF1ZXN0 LnNldElnbm9yZUZvclJlcXVlc3RDb3VudCh0cnVlKTsKLSAgICBDYWNoZWRSZXNvdXJjZVJlcXVl c3QgbGlua1JlcXVlc3QoV1RGTW92ZShyZXNvdXJjZVJlcXVlc3QpLCBDYWNoZWRSZXNvdXJjZUxv YWRlcjo6ZGVmYXVsdENhY2hlZFJlc291cmNlT3B0aW9ucygpLCBDYWNoZWRSZXNvdXJjZTo6ZGVm YXVsdFByaW9yaXR5Rm9yUmVzb3VyY2VUeXBlKHR5cGUudmFsdWUoKSkpOworICAgIENhY2hlZFJl c291cmNlUmVxdWVzdCBsaW5rUmVxdWVzdChkb2N1bWVudC5jb21wbGV0ZVVSTChocmVmKSwgQ2Fj aGVkUmVzb3VyY2VMb2FkZXI6OmRlZmF1bHRDYWNoZWRSZXNvdXJjZU9wdGlvbnMoKSwgQ2FjaGVk UmVzb3VyY2U6OmRlZmF1bHRQcmlvcml0eUZvclJlc291cmNlVHlwZSh0eXBlLnZhbHVlKCkpKTsK ICAgICBsaW5rUmVxdWVzdC5zZXRJbml0aWF0b3IoImxpbmsiKTsKKyAgICBsaW5rUmVxdWVzdC5z ZXRJZ25vcmVGb3JSZXF1ZXN0Q291bnQodHJ1ZSk7CiAgICAgbGlua1JlcXVlc3Quc2V0SXNMaW5r UHJlbG9hZCgpOwogCiAgICAgbGlua1JlcXVlc3Quc2V0QXNQb3RlbnRpYWxseUNyb3NzT3JpZ2lu KGNyb3NzT3JpZ2luTW9kZSwgZG9jdW1lbnQpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv bG9hZGVyL2NhY2hlL0NhY2hlZEltYWdlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNo ZS9DYWNoZWRJbWFnZS5jcHAKaW5kZXggNDEzZjA0MTRiNzM3MzgyNzUyZDExYzZlZGRhZGMzYWEz MmM2ZDM4Yi4uMTdkNmZmYjFlODU2NmE4M2M3ZTJhZjI3MTI0ZDhiYmY3MmU4ODJmNyAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hlL0NhY2hlZEltYWdlLmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2FjaGVkSW1hZ2UuY3BwCkBAIC02NywxMSArNjcs MTMgQEAgQ2FjaGVkSW1hZ2U6OkNhY2hlZEltYWdlKEltYWdlKiBpbWFnZSwgU2Vzc2lvbklEIHNl c3Npb25JRCkKIHsKIH0KIAotQ2FjaGVkSW1hZ2U6OkNhY2hlZEltYWdlKGNvbnN0IFVSTCYgdXJs LCBJbWFnZSogaW1hZ2UsIFNlc3Npb25JRCBzZXNzaW9uSUQpCitDYWNoZWRJbWFnZTo6Q2FjaGVk SW1hZ2UoY29uc3QgVVJMJiB1cmwsIEltYWdlKiBpbWFnZSwgU2Vzc2lvbklEIHNlc3Npb25JRCwg Y29uc3QgU3RyaW5nJiBkb21haW5Gb3JDYWNoZVBhcnRpdGlvbikKICAgICA6IENhY2hlZFJlc291 cmNlKHVybCwgSW1hZ2VSZXNvdXJjZSwgc2Vzc2lvbklEKQogICAgICwgbV9pbWFnZShpbWFnZSkK ICAgICAsIG1faXNNYW51YWxseUNhY2hlZCh0cnVlKQogeworICAgIG1fcmVzb3VyY2VSZXF1ZXN0 LnNldERvbWFpbkZvckNhY2hlUGFydGl0aW9uKGRvbWFpbkZvckNhY2hlUGFydGl0aW9uKTsKKwog ICAgIC8vIFVzZSB0aGUgaW5jb21pbmcgVVJMIGluIHRoZSByZXNwb25zZSBmaWVsZC4gVGhpcyBl bnN1cmVzIHRoYXQgY29kZSB1c2luZyB0aGUgcmVzcG9uc2UgZGlyZWN0bHksCiAgICAgLy8gc3Vj aCBhcyBvcmlnaW4gY2hlY2tzIGZvciBzZWN1cml0eSwgYWN0dWFsbHkgc2VlIHNvbWV0aGluZy4K ICAgICBtX3Jlc3BvbnNlLnNldFVSTCh1cmwpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv bG9hZGVyL2NhY2hlL0NhY2hlZEltYWdlLmggYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUv Q2FjaGVkSW1hZ2UuaAppbmRleCA4ZWE2ZjJlMTBlYTAzN2I5ZjQyMDhiMzUwN2NjZjZiMjhlNTMy ODNhLi41MmM0NzZjZmUxY2Q0ODRiODYxMGM0MjFkOGJkYjY2NDQwOWM1NmE3IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2FjaGVkSW1hZ2UuaAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2FjaGVkSW1hZ2UuaApAQCAtNTAsNyArNTAsNyBAQCBwdWJs aWM6CiAgICAgQ2FjaGVkSW1hZ2UoQ2FjaGVkUmVzb3VyY2VSZXF1ZXN0JiYsIFNlc3Npb25JRCk7 CiAgICAgQ2FjaGVkSW1hZ2UoSW1hZ2UqLCBTZXNzaW9uSUQpOwogICAgIC8vIENvbnN0cnVjdG9y IHRvIHVzZSBmb3IgbWFudWFsbHkgY2FjaGVkIGltYWdlcy4KLSAgICBDYWNoZWRJbWFnZShjb25z dCBVUkwmLCBJbWFnZSosIFNlc3Npb25JRCk7CisgICAgQ2FjaGVkSW1hZ2UoY29uc3QgVVJMJiwg SW1hZ2UqLCBTZXNzaW9uSUQsIGNvbnN0IFN0cmluZyYgZG9tYWluRm9yQ2FjaGVQYXJ0aXRpb24p OwogICAgIHZpcnR1YWwgfkNhY2hlZEltYWdlKCk7CiAKICAgICBXRUJDT1JFX0VYUE9SVCBJbWFn ZSogaW1hZ2UoKTsgLy8gUmV0dXJucyB0aGUgbnVsbEltYWdlKCkgaWYgdGhlIGltYWdlIGlzIG5v dCBhdmFpbGFibGUgeWV0LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hl L0NhY2hlZFJlc291cmNlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9DYWNoZWRS ZXNvdXJjZS5jcHAKaW5kZXggMGExNWVhMDhkNWIwYjI1ZTY1ODBhZTcxMjM5ODU5ZTNmNjU0OTdi OC4uZTVlZWMyNWZlZWU0ZDdiMDk2ZWVkNmRjNTgwZmIyMTM3NmFmOTc4MiAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hlL0NhY2hlZFJlc291cmNlLmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2FjaGVkUmVzb3VyY2UuY3BwCkBAIC0xMjgsNiArMTI4 LDcgQEAgQ2FjaGVkUmVzb3VyY2U6OkNhY2hlZFJlc291cmNlKENhY2hlZFJlc291cmNlUmVxdWVz dCYmIHJlcXVlc3QsIFR5cGUgdHlwZSwgU2Vzc2kKICAgICAsIG1faXNMaW5rUHJlbG9hZChyZXF1 ZXN0LmlzTGlua1ByZWxvYWQoKSkKICAgICAsIG1faGFzVW5rbm93bkVuY29kaW5nKHJlcXVlc3Qu aXNMaW5rUHJlbG9hZCgpKQogICAgICwgbV90eXBlKHR5cGUpCisgICAgLCBtX2lnbm9yZUZvclJl cXVlc3RDb3VudChyZXF1ZXN0Lmlnbm9yZUZvclJlcXVlc3RDb3VudCgpKQogewogICAgIEFTU0VS VChzZXNzaW9uSUQuaXNWYWxpZCgpKTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9h ZGVyL2NhY2hlL0NhY2hlZFJlc291cmNlLmggYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUv Q2FjaGVkUmVzb3VyY2UuaAppbmRleCA1ZDJjOTllY2IxMDdkZWU0NGQ0OTc3OTYyZmExY2E4ZGM4 MDBjY2Y4Li42OTk2YmJhMjc1MjA4OTQ4MTg0NjlhMDEwMjhjMGVkZWQwYzAwNDdmIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2FjaGVkUmVzb3VyY2UuaAorKysgYi9T b3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2FjaGVkUmVzb3VyY2UuaApAQCAtMTEzLDcgKzEx Myw2IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIGJvb2wgc2hvdWxkSWdub3JlSFRUUFN0YXR1c0Nv ZGVFcnJvcnMoKSBjb25zdCB7IHJldHVybiBmYWxzZTsgfQogCiAgICAgY29uc3QgUmVzb3VyY2VS ZXF1ZXN0JiByZXNvdXJjZVJlcXVlc3QoKSBjb25zdCB7IHJldHVybiBtX3Jlc291cmNlUmVxdWVz dDsgfQotICAgIFJlc291cmNlUmVxdWVzdCYgcmVzb3VyY2VSZXF1ZXN0KCkgeyByZXR1cm4gbV9y ZXNvdXJjZVJlcXVlc3Q7IH0KICAgICBjb25zdCBVUkwmIHVybCgpIGNvbnN0IHsgcmV0dXJuIG1f cmVzb3VyY2VSZXF1ZXN0LnVybCgpO30KICAgICBjb25zdCBTdHJpbmcmIGNhY2hlUGFydGl0aW9u KCkgY29uc3QgeyByZXR1cm4gbV9yZXNvdXJjZVJlcXVlc3QuY2FjaGVQYXJ0aXRpb24oKTsgfQog ICAgIFNlc3Npb25JRCBzZXNzaW9uSUQoKSBjb25zdCB7IHJldHVybiBtX3Nlc3Npb25JRDsgfQpA QCAtMTY0LDkgKzE2MywxMSBAQCBwdWJsaWM6CiAgICAgYm9vbCBpc0ltYWdlKCkgY29uc3QgeyBy ZXR1cm4gdHlwZSgpID09IEltYWdlUmVzb3VyY2U7IH0KICAgICAvLyBGSVhNRTogQ2FjaGVkUmF3 UmVzb3VyY2UgY291bGQgYmUgYSBtYWluIHJlc291cmNlLCBhbiBhdWRpby92aWRlbyByZXNvdXJj ZSwgb3IgYSByYXcgWEhSL2ljb24gcmVzb3VyY2UuCiAgICAgYm9vbCBpc01haW5Pck1lZGlhT3JJ Y29uT3JSYXdSZXNvdXJjZSgpIGNvbnN0IHsgcmV0dXJuIHR5cGUoKSA9PSBNYWluUmVzb3VyY2Ug fHwgdHlwZSgpID09IE1lZGlhUmVzb3VyY2UgfHwgdHlwZSgpID09IEljb24gfHwgdHlwZSgpID09 IFJhd1Jlc291cmNlIHx8IHR5cGUoKSA9PSBCZWFjb247IH0KKworICAgIC8vIFdoZXRoZXIgdGhp cyByZXF1ZXN0IHNob3VsZCBpbXBhY3QgcmVxdWVzdCBjb3VudGluZyBhbmQgZGVsYXkgd2luZG93 Lm9ubG9hZC4KICAgICBib29sIGlnbm9yZUZvclJlcXVlc3RDb3VudCgpIGNvbnN0CiAgICAgewot ICAgICAgICByZXR1cm4gbV9yZXNvdXJjZVJlcXVlc3QuaWdub3JlRm9yUmVxdWVzdENvdW50KCkK KyAgICAgICAgcmV0dXJuIG1faWdub3JlRm9yUmVxdWVzdENvdW50CiAgICAgICAgICAgICB8fCB0 eXBlKCkgPT0gTWFpblJlc291cmNlCiAjaWYgRU5BQkxFKExJTktfUFJFRkVUQ0gpCiAgICAgICAg ICAgICB8fCB0eXBlKCkgPT0gTGlua1ByZWZldGNoCkBAIC0xNzYsNiArMTc3LDggQEAgcHVibGlj OgogICAgICAgICAgICAgfHwgdHlwZSgpID09IFJhd1Jlc291cmNlOwogICAgIH0KIAorICAgIHZv aWQgc2V0SWdub3JlRm9yUmVxdWVzdENvdW50KGJvb2wgaWdub3JlRm9yUmVxdWVzdENvdW50KSB7 IG1faWdub3JlRm9yUmVxdWVzdENvdW50ID0gaWdub3JlRm9yUmVxdWVzdENvdW50OyB9CisKICAg ICB1bnNpZ25lZCBhY2Nlc3NDb3VudCgpIGNvbnN0IHsgcmV0dXJuIG1fYWNjZXNzQ291bnQ7IH0K ICAgICB2b2lkIGluY3JlYXNlQWNjZXNzQ291bnQoKSB7IG1fYWNjZXNzQ291bnQrKzsgfQogCkBA IC0zNzAsNiArMzczLDcgQEAgcHJpdmF0ZToKICAgICBWZWN0b3I8c3RkOjpwYWlyPFN0cmluZywg U3RyaW5nPj4gbV92YXJ5aW5nSGVhZGVyVmFsdWVzOwogCiAgICAgdW5zaWduZWQgbG9uZyBtX2lk ZW50aWZpZXJGb3JMb2FkV2l0aG91dFJlc291cmNlTG9hZGVyIHsgMCB9OworICAgIGJvb2wgbV9p Z25vcmVGb3JSZXF1ZXN0Q291bnQgeyBmYWxzZSB9OwogfTsKIAogY2xhc3MgQ2FjaGVkUmVzb3Vy Y2U6OkNhbGxiYWNrIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9D YWNoZWRSZXNvdXJjZUxvYWRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2Fj aGVkUmVzb3VyY2VMb2FkZXIuY3BwCmluZGV4IGY1OTkzNjdhZDE4OGMyMzNjMWUxNTlmYWFlZjk4 ZWIwMzIwYTRlODYuLjU0MjQ4NTkwNmZlMTJmNTliMmQzMjRjZDNiMDRkYjQwMjZjOTgzOTggMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9DYWNoZWRSZXNvdXJjZUxvYWRl ci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hlL0NhY2hlZFJlc291cmNlTG9h ZGVyLmNwcApAQCAtODIzLDggKzgyMyw4IEBAIFJlc291cmNlRXJyb3JPcjxDYWNoZWRSZXNvdXJj ZUhhbmRsZTxDYWNoZWRSZXNvdXJjZT4+IENhY2hlZFJlc291cmNlTG9hZGVyOjpyZXF1CiAgICAg fQogICAgIEFTU0VSVChyZXNvdXJjZSk7CiAKLSAgICBpZiAoZm9yUHJlbG9hZCA9PSBGb3JQcmVs b2FkOjpObyAmJiByZXNvdXJjZS0+bG9hZGVyKCkgJiYgcmVzb3VyY2UtPnJlc291cmNlUmVxdWVz dCgpLmlnbm9yZUZvclJlcXVlc3RDb3VudCgpKSB7Ci0gICAgICAgIHJlc291cmNlLT5yZXNvdXJj ZVJlcXVlc3QoKS5zZXRJZ25vcmVGb3JSZXF1ZXN0Q291bnQoZmFsc2UpOworICAgIGlmIChmb3JQ cmVsb2FkID09IEZvclByZWxvYWQ6Ok5vICYmIHJlc291cmNlLT5sb2FkZXIoKSAmJiByZXNvdXJj ZS0+aWdub3JlRm9yUmVxdWVzdENvdW50KCkpIHsKKyAgICAgICAgcmVzb3VyY2UtPnNldElnbm9y ZUZvclJlcXVlc3RDb3VudChmYWxzZSk7CiAgICAgICAgIGluY3JlbWVudFJlcXVlc3RDb3VudCgq cmVzb3VyY2UpOwogICAgIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL2Nh Y2hlL0NhY2hlZFJlc291cmNlUmVxdWVzdC5oIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hl L0NhY2hlZFJlc291cmNlUmVxdWVzdC5oCmluZGV4IDI2MmVhNTE5ODA5ZTNkYjQxOWVhMjAyZjc2 ZmMzNzA1MzQ5MjYwZjMuLmY1MDdmY2M2NjdlZjU3Mjg2ODNkY2IyZGFiNmM4ZmUxZTg5NzhkZDUg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9DYWNoZWRSZXNvdXJjZVJl cXVlc3QuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2FjaGVkUmVzb3VyY2VS ZXF1ZXN0LmgKQEAgLTYzLDYgKzYzLDEwIEBAIHB1YmxpYzoKICAgICBib29sIGFsbG93c0NhY2hp bmcoKSBjb25zdCB7IHJldHVybiBtX29wdGlvbnMuY2FjaGluZ1BvbGljeSA9PSBDYWNoaW5nUG9s aWN5OjpBbGxvd0NhY2hpbmc7IH0KICAgICB2b2lkIHNldENhY2hpbmdQb2xpY3koQ2FjaGluZ1Bv bGljeSBwb2xpY3kpIHsgbV9vcHRpb25zLmNhY2hpbmdQb2xpY3kgPSBwb2xpY3k7ICB9CiAKKyAg ICAvLyBXaGV0aGVyIHRoaXMgcmVxdWVzdCBzaG91bGQgaW1wYWN0IHJlcXVlc3QgY291bnRpbmcg YW5kIGRlbGF5IHdpbmRvdy5vbmxvYWQuCisgICAgYm9vbCBpZ25vcmVGb3JSZXF1ZXN0Q291bnQo KSBjb25zdCB7IHJldHVybiBtX2lnbm9yZUZvclJlcXVlc3RDb3VudDsgfQorICAgIHZvaWQgc2V0 SWdub3JlRm9yUmVxdWVzdENvdW50KGJvb2wgaWdub3JlRm9yUmVxdWVzdENvdW50KSB7IG1faWdu b3JlRm9yUmVxdWVzdENvdW50ID0gaWdub3JlRm9yUmVxdWVzdENvdW50OyB9CisKICAgICB2b2lk IHNldEFzUG90ZW50aWFsbHlDcm9zc09yaWdpbihjb25zdCBTdHJpbmcmLCBEb2N1bWVudCYpOwog ICAgIHZvaWQgdXBkYXRlRm9yQWNjZXNzQ29udHJvbChEb2N1bWVudCYpOwogCkBAIC05OCw2ICsx MDIsNyBAQCBwcml2YXRlOgogICAgIFJlZlB0cjxTZWN1cml0eU9yaWdpbj4gbV9vcmlnaW47CiAg ICAgU3RyaW5nIG1fZnJhZ21lbnRJZGVudGlmaWVyOwogICAgIGJvb2wgbV9pc0xpbmtQcmVsb2Fk IHsgZmFsc2UgfTsKKyAgICBib29sIG1faWdub3JlRm9yUmVxdWVzdENvdW50IHsgZmFsc2UgfTsK IH07CiAKIHZvaWQgdXBncmFkZUluc2VjdXJlUmVzb3VyY2VSZXF1ZXN0SWZOZWVkZWQoUmVzb3Vy Y2VSZXF1ZXN0JiwgRG9jdW1lbnQmKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRl ci9jYWNoZS9NZW1vcnlDYWNoZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvTWVt b3J5Q2FjaGUuY3BwCmluZGV4IDYyZGYxOTBmZmExZTQzOWQwYzE1YjU1Njc4ZWM2MWViMzM1MDY2 NTQuLjUxODZhMWJiZWQyM2U0NTU1MDljZjlkZjAzYzAwODRiY2M0NzFkOWQgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9NZW1vcnlDYWNoZS5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvbG9hZGVyL2NhY2hlL01lbW9yeUNhY2hlLmNwcApAQCAtMjE3LDExICsyMTcsMTAg QEAgYm9vbCBNZW1vcnlDYWNoZTo6YWRkSW1hZ2VUb0NhY2hlKE5hdGl2ZUltYWdlUHRyJiYgaW1h Z2UsIGNvbnN0IFVSTCYgdXJsLCBjb25zdAogICAgIGlmICghYml0bWFwSW1hZ2UpCiAgICAgICAg IHJldHVybiBmYWxzZTsKIAotICAgIGF1dG8gY2FjaGVkSW1hZ2UgPSBzdGQ6Om1ha2VfdW5pcXVl PENhY2hlZEltYWdlPih1cmwsIGJpdG1hcEltYWdlLmdldCgpLCBzZXNzaW9uSUQpOworICAgIGF1 dG8gY2FjaGVkSW1hZ2UgPSBzdGQ6Om1ha2VfdW5pcXVlPENhY2hlZEltYWdlPih1cmwsIGJpdG1h cEltYWdlLmdldCgpLCBzZXNzaW9uSUQsIGRvbWFpbkZvckNhY2hlUGFydGl0aW9uKTsKIAogICAg IGNhY2hlZEltYWdlLT5hZGRDbGllbnQoZHVtbXlDYWNoZWRJbWFnZUNsaWVudCgpKTsKICAgICBj YWNoZWRJbWFnZS0+c2V0RGVjb2RlZFNpemUoYml0bWFwSW1hZ2UtPmRlY29kZWRTaXplKCkpOwot ICAgIGNhY2hlZEltYWdlLT5yZXNvdXJjZVJlcXVlc3QoKS5zZXREb21haW5Gb3JDYWNoZVBhcnRp dGlvbihkb21haW5Gb3JDYWNoZVBhcnRpdGlvbik7CiAKICAgICByZXR1cm4gYWRkKCpjYWNoZWRJ bWFnZS5yZWxlYXNlKCkpOwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v bmV0d29yay9SZXNvdXJjZVJlcXVlc3RCYXNlLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9u ZXR3b3JrL1Jlc291cmNlUmVxdWVzdEJhc2UuaAppbmRleCBmYjQwNTMwYzA4MWIxODY1N2UxOTJi MmY3Y2JmNGNiZWUxZGRlYzE2Li5iNWU5NDhlYWVlYzFmZDkwZGRiZTY5OGY5NjZmYmM3ZTg1Y2U5 Y2RkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL1Jlc291cmNl UmVxdWVzdEJhc2UuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL1Jlc291 cmNlUmVxdWVzdEJhc2UuaApAQCAtMTQ4LDEwICsxNDgsNiBAQCBwdWJsaWM6CiAgICAgYm9vbCBo aWRkZW5Gcm9tSW5zcGVjdG9yKCkgY29uc3QgeyByZXR1cm4gbV9oaWRkZW5Gcm9tSW5zcGVjdG9y OyB9CiAgICAgdm9pZCBzZXRIaWRkZW5Gcm9tSW5zcGVjdG9yKGJvb2wgaGlkZGVuRnJvbUluc3Bl Y3RvcikgeyBtX2hpZGRlbkZyb21JbnNwZWN0b3IgPSBoaWRkZW5Gcm9tSW5zcGVjdG9yOyB9CiAK LSAgICAvLyBXaGV0aGVyIHRoaXMgcmVxdWVzdCBzaG91bGQgaW1wYWN0IHJlcXVlc3QgY291bnRp bmcgYW5kIGRlbGF5IHdpbmRvdy5vbmxvYWQuCi0gICAgYm9vbCBpZ25vcmVGb3JSZXF1ZXN0Q291 bnQoKSBjb25zdCB7IHJldHVybiBtX2lnbm9yZUZvclJlcXVlc3RDb3VudDsgfQotICAgIHZvaWQg c2V0SWdub3JlRm9yUmVxdWVzdENvdW50KGJvb2wgaWdub3JlRm9yUmVxdWVzdENvdW50KSB7IG1f aWdub3JlRm9yUmVxdWVzdENvdW50ID0gaWdub3JlRm9yUmVxdWVzdENvdW50OyB9Ci0KICAgICBl bnVtIGNsYXNzIFJlcXVlc3RlciB7IFVuc3BlY2lmaWVkLCBNYWluLCBYSFIsIEZldGNoLCBNZWRp YSB9OwogICAgIFJlcXVlc3RlciByZXF1ZXN0ZXIoKSBjb25zdCB7IHJldHVybiBtX3JlcXVlc3Rl cjsgfQogICAgIHZvaWQgc2V0UmVxdWVzdGVyKFJlcXVlc3RlciByZXF1ZXN0ZXIpIHsgbV9yZXF1 ZXN0ZXIgPSByZXF1ZXN0ZXI7IH0KQEAgLTIyMiw3ICsyMTgsNiBAQCBwcm90ZWN0ZWQ6CiAgICAg bXV0YWJsZSBib29sIG1fcmVzb3VyY2VSZXF1ZXN0Qm9keVVwZGF0ZWQgeyBmYWxzZSB9OwogICAg IG11dGFibGUgYm9vbCBtX3BsYXRmb3JtUmVxdWVzdEJvZHlVcGRhdGVkIHsgZmFsc2UgfTsKICAg ICBib29sIG1faGlkZGVuRnJvbUluc3BlY3RvciB7IGZhbHNlIH07Ci0gICAgYm9vbCBtX2lnbm9y ZUZvclJlcXVlc3RDb3VudCB7IGZhbHNlIH07CiAgICAgUmVzb3VyY2VMb2FkUHJpb3JpdHkgbV9w cmlvcml0eSB7IFJlc291cmNlTG9hZFByaW9yaXR5OjpMb3cgfTsKICAgICBSZXF1ZXN0ZXIgbV9y ZXF1ZXN0ZXIgeyBSZXF1ZXN0ZXI6OlVuc3BlY2lmaWVkIH07CiAgICAgU3RyaW5nIG1faW5pdGlh dG9ySWRlbnRpZmllcjsK