85736 2012-05-06 09:25:30 -0700 Cleanup: FileSystem API's Entry.toURL() impl should return KURL instead of String 2012-05-07 23:57:21 -0700 1 1 1 Unclassified WebKit WebKit Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 kinuko kinuko levin oldest_to_newest 617112 0 kinuko 2012-05-06 09:25:30 -0700 Entry.toURL() implementation should return KURL instead of String. This would not have any visible impact in the app-facing javascript layer but must make the code clearer and more readable. 617114 1 140423 kinuko 2012-05-06 09:37:58 -0700 Created attachment 140423 Patch 617117 2 kinuko 2012-05-06 10:08:10 -0700 This is one of the patches separated from the bigger one for http://webkit.org/b/84135 (for cross-filesystem support). 617134 3 140428 kinuko 2012-05-06 11:17:03 -0700 Created attachment 140428 Patch 617138 4 140428 levin 2012-05-06 11:30:53 -0700 Comment on attachment 140428 Patch I don't understand why I don't see any changes to whoever calls toURL (maybe there was an implicit conversion?). Anyway, as long as this compiles it seems fine. 617360 5 kinuko 2012-05-06 21:16:21 -0700 (In reply to comment #4) > (From update of attachment 140428 [details]) > I don't understand why I don't see any changes to whoever calls toURL (maybe there was an implicit conversion?). Anyway, as long as this compiles it seems fine. Yes it is converted back to String by implicit conversion in the binding layer. I found that some other IDL implementation is doing this and thought it'd be nice to make it clearer what type of object we are dealing with in C++ world. I could add an explicit conversion code before at the boundary between the binding code if it makes things even clearer. 617463 6 140428 kinuko 2012-05-07 02:02:32 -0700 Comment on attachment 140428 Patch Committed r116273 <http://trac.webkit.org/changeset/116273>. 617690 7 140428 darin 2012-05-07 10:30:45 -0700 Comment on attachment 140428 Patch This seems like a bad change. Why parse the URL and then convert it back to a string each time? We should not use KURL for anything just because it happens to be a URL. This is adding extra work for no benefit. 617798 8 kinuko 2012-05-07 12:02:40 -0700 (In reply to comment #7) > (From update of attachment 140428 [details]) > This seems like a bad change. Why parse the URL and then convert it back to a string each time? We should not use KURL for anything just because it happens to be a URL. This is adding extra work for no benefit. Ok, on the second thought I wondered the same. I'm going to make another change to revert it. Thanks, 618368 9 kinuko 2012-05-07 23:57:21 -0700 (In reply to comment #8) > (In reply to comment #7) > > (From update of attachment 140428 [details] [details]) > > This seems like a bad change. Why parse the URL and then convert it back to a string each time? We should not use KURL for anything just because it happens to be a URL. This is adding extra work for no benefit. > > Ok, on the second thought I wondered the same. I'm going to make another change to revert it. Thanks, The patch is: https://bugs.webkit.org/show_bug.cgi?id=85858 140423 2012-05-06 09:37:58 -0700 2012-05-06 11:16:49 -0700 Patch bug-85736-20120507013756.patch text/plain 6786 kinuko U3VidmVyc2lvbiBSZXZpc2lvbjogMTE2MTg1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZGZmZGJhMWEwMzUxOWYy OTFjNjMxOGJlYTVjMGNlY2NlZjJjNjdhYi4uOTgwNWRiYTRlOWY2NGJmNjExOWQ3OWQ1ZmQ0YmQy YzIwMGFhYjFjZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDEyLTA1LTA2ICBLaW51 a28gWWFzdWRhICA8a2ludWtvQGNocm9taXVtLm9yZz4KKworICAgICAgICBDbGVhbnVwOiBGaWxl U3lzdGVtIEFQSSdzIEVudHJ5LnRvVVJMKCkgaW1wbCBzaG91bGQgcmV0dXJuIEtVUkwgaW5zdGVh ZCBvZiBTdHJpbmcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTg1NzM2CisKKyAgICAgICAgQ2hhbmdlIHRoZSByZXR1cm4gdHlwZSBvZiBFbnRyeTo6dG9V UkwoKSBmcm9tIFN0cmluZyB0byBLVVJMLgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cyBhcyB0aGlzIGNoYW5nZSBzaG91bGQgbm90 IGhhdmUgYW55IHZpc2libGUgaW1wYWN0IGluIHRoZSBqYXZhc2NyaXB0IGxheWVyLgorCisgICAg ICAgICogTW9kdWxlcy9maWxlc3lzdGVtL0VudHJ5QmFzZS5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpFbnRyeUJhc2U6OnRvVVJMKToKKyAgICAgICAgKiBNb2R1bGVzL2ZpbGVzeXN0ZW0vRW50cnlC YXNlLmg6CisgICAgICAgIChFbnRyeUJhc2UpOgorICAgICAgICAqIHBsYXRmb3JtL0FzeW5jRmls ZVN5c3RlbS5oOgorICAgICAgICAoQXN5bmNGaWxlU3lzdGVtKToKKwogMjAxMi0wNS0wNCAgTGV2 aSBXZWludHJhdWIgIDxsZXZpd0BjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgQ29ycmVjdCBwaXhl bCBzbmFwcGluZyBpbiBSZW5kZXJTVkdSb290OjpwYWludFJlcGxhY2VkCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0v Q2hhbmdlTG9nCmluZGV4IGVlOWE0MWVmMzBjNGIxODJkYzYzN2YxMjM5NThiZjY2MjhiMWQyOGUu LmEwOTBmNDZjODAwZGQ2NWQ4ZWNkYTM3NWFjYjc2YTUwZTg1YWQ2YTYgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21p dW0vQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMTItMDUtMDYgIEtpbnVrbyBZYXN1ZGEg IDxraW51a29AY2hyb21pdW0ub3JnPgorCisgICAgICAgIENsZWFudXA6IEZpbGVTeXN0ZW0gQVBJ J3MgRW50cnkudG9VUkwoKSBpbXBsIHNob3VsZCByZXR1cm4gS1VSTCBpbnN0ZWFkIG9mIFN0cmlu ZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODU3MzYK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBDaGFuZ2Ug QXN5bmNGaWxlU3lzdGVtQ2hyb21pdW06OnRvVVJMKCkncyByZXR1cm4gdHlwZSBmcm9tIFN0cmlu ZyB0byBLVVJMLgorCisgICAgICAgICogc3JjL0FzeW5jRmlsZVN5c3RlbUNocm9taXVtLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OkFzeW5jRmlsZVN5c3RlbUNocm9taXVtOjp0b1VSTCk6CisgICAg ICAgIFN0cmluZyB0byBLVVJMLgorICAgICAgICAqIHNyYy9Bc3luY0ZpbGVTeXN0ZW1DaHJvbWl1 bS5oOgorICAgICAgICAoQXN5bmNGaWxlU3lzdGVtQ2hyb21pdW0pOgorCiAyMDEyLTA1LTA0ICBB ZGFtIEJhcnRoICA8YWJhcnRoQHdlYmtpdC5vcmc+CiAKICAgICAgICAgUmVmYWN0b3IgQ1NQIHN0 YXRlIHRvIHByZXBhcmUgZm9yIGhhdmluZyBib3RoIGEgUmVwb3J0T25seSBhbmQgYW4gRW5mb3Jj ZWQgcG9saWN5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2ZpbGVzeXN0ZW0v RW50cnlCYXNlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvZmlsZXN5c3RlbS9FbnRyeUJh c2UuY3BwCmluZGV4IDBiMTI1NGI3YWRkYWQ5OTg5Yjk0OWE4OGIzZDllODU3OGE2ZDQ3MzguLjcy YTIyYmQ4NTk1MmY0ZjA2NDkyZWNhMDY0ZDY2M2ViMTdkODMwOTggMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL01vZHVsZXMvZmlsZXN5c3RlbS9FbnRyeUJhc2UuY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL01vZHVsZXMvZmlsZXN5c3RlbS9FbnRyeUJhc2UuY3BwCkBAIC01NCw3ICs1NCw3IEBA IEVudHJ5QmFzZTo6fkVudHJ5QmFzZSgpCiB7CiB9CiAKLVN0cmluZyBFbnRyeUJhc2U6OnRvVVJM KCkKK0tVUkwgRW50cnlCYXNlOjp0b1VSTCgpIGNvbnN0CiB7CiAgICAgcmV0dXJuIG1fZmlsZVN5 c3RlbS0+YXN5bmNGaWxlU3lzdGVtKCktPnRvVVJMKG1fZmlsZVN5c3RlbS0+c2VjdXJpdHlPcmln aW4oKS0+dG9TdHJpbmcoKSwgbV9mdWxsUGF0aCk7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9Nb2R1bGVzL2ZpbGVzeXN0ZW0vRW50cnlCYXNlLmggYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1 bGVzL2ZpbGVzeXN0ZW0vRW50cnlCYXNlLmgKaW5kZXggYTM0YTkxNGYxZmZiYjdjYmQ2ZTRjMTA2 NjM5YmNhNGU4YTI4ZjA3Yi4uMDE1NjljYjJhNGYyZjk2ZTE0ZTk3ZWMxY2UzNjA2YjBkMWMwMzJj MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9maWxlc3lzdGVtL0VudHJ5QmFz ZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvZmlsZXN5c3RlbS9FbnRyeUJhc2UuaApA QCAtMzMsNyArMzMsNyBAQAogCiAjaWYgRU5BQkxFKEZJTEVfU1lTVEVNKQogCi0jaW5jbHVkZSAi UGxhdGZvcm1TdHJpbmcuaCIKKyNpbmNsdWRlICJLVVJMLmgiCiAjaW5jbHVkZSA8d3RmL1Bhc3NS ZWZQdHIuaD4KICNpbmNsdWRlIDx3dGYvUmVmQ291bnRlZC5oPgogCkBAIC01NSw3ICs1NSw3IEBA IHB1YmxpYzoKICAgICBjb25zdCBTdHJpbmcmIGZ1bGxQYXRoKCkgY29uc3QgeyByZXR1cm4gbV9m dWxsUGF0aDsgfQogICAgIGNvbnN0IFN0cmluZyYgbmFtZSgpIGNvbnN0IHsgcmV0dXJuIG1fbmFt ZTsgfQogCi0gICAgU3RyaW5nIHRvVVJMKCk7CisgICAgS1VSTCB0b1VSTCgpIGNvbnN0OwogCiBw cm90ZWN0ZWQ6CiAgICAgRW50cnlCYXNlKFBhc3NSZWZQdHI8RE9NRmlsZVN5c3RlbUJhc2U+LCBj b25zdCBTdHJpbmcmIGZ1bGxQYXRoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL0FzeW5jRmlsZVN5c3RlbS5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vQXN5bmNGaWxl U3lzdGVtLmgKaW5kZXggNzc5MjEwMWM1MzBhMjFjMjY1Y2ZjNGI0NmEzNDZmYjkyMGM0MTI1My4u NTRkYjAyMTBhOTNmZjkyODEyMmNmNTNkYWQ0Mzc5MDQ1NGEyOTE5ZCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vQXN5bmNGaWxlU3lzdGVtLmgKKysrIGIvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vQXN5bmNGaWxlU3lzdGVtLmgKQEAgLTcyLDcgKzcyLDcgQEAgcHVibGljOgog CiAgICAgc3RhdGljIGJvb2wgY3JhY2tGaWxlU3lzdGVtVVJMKGNvbnN0IEtVUkwmLCBUeXBlJiwg U3RyaW5nJiBmaWxlUGF0aCk7CiAKLSAgICB2aXJ0dWFsIFN0cmluZyB0b1VSTChjb25zdCBTdHJp bmcmIG9yaWdpblN0cmluZywgY29uc3QgU3RyaW5nJiBmdWxsUGF0aCkgPSAwOworICAgIHZpcnR1 YWwgS1VSTCB0b1VSTChjb25zdCBTdHJpbmcmIG9yaWdpblN0cmluZywgY29uc3QgU3RyaW5nJiBm dWxsUGF0aCkgY29uc3QgPSAwOwogCiAgICAgLy8gU3ViY2xhc3MgbXVzdCBpbXBsZW1lbnQgdGhp cyBpZiBpdCBzdXBwb3J0cyBzeW5jaHJvbm91cyBvcGVyYXRpb25zLgogICAgIC8vIFRoaXMgc2hv dWxkIHJldHVybiBmYWxzZSBpZiB0aGVyZSBhcmUgbm8gcGVuZGluZyBvcGVyYXRpb25zLgpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvQXN5bmNGaWxlU3lzdGVtQ2hyb21p dW0uY3BwIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvQXN5bmNGaWxlU3lzdGVtQ2hyb21p dW0uY3BwCmluZGV4IDZmMzU5ODM3MDMwYTU3ZTg0OWFhN2FlZTA2ZGY5MTA0Njk5MDEzOTcuLmIy ZDg5YzY0YWY0YzYzMGQyMmIwNjBkMTIzMWVmM2Q1MTVmYmFhZDYgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQvY2hyb21pdW0vc3JjL0FzeW5jRmlsZVN5c3RlbUNocm9taXVtLmNwcAorKysgYi9T b3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9Bc3luY0ZpbGVTeXN0ZW1DaHJvbWl1bS5jcHAKQEAg LTE5OCwxNSArMTk4LDE1IEBAIEFzeW5jRmlsZVN5c3RlbUNocm9taXVtOjp+QXN5bmNGaWxlU3lz dGVtQ2hyb21pdW0oKQogewogfQogCi1TdHJpbmcgQXN5bmNGaWxlU3lzdGVtQ2hyb21pdW06OnRv VVJMKGNvbnN0IFN0cmluZyYgb3JpZ2luU3RyaW5nLCBjb25zdCBTdHJpbmcmIGZ1bGxQYXRoKQor S1VSTCBBc3luY0ZpbGVTeXN0ZW1DaHJvbWl1bTo6dG9VUkwoY29uc3QgU3RyaW5nJiBvcmlnaW5T dHJpbmcsIGNvbnN0IFN0cmluZyYgZnVsbFBhdGgpIGNvbnN0CiB7CiAgICAgQVNTRVJUKCFvcmln aW5TdHJpbmcuaXNFbXB0eSgpKTsKICAgICBpZiAob3JpZ2luU3RyaW5nID09ICJudWxsIikKLSAg ICAgICAgcmV0dXJuIFN0cmluZygpOworICAgICAgICByZXR1cm4gS1VSTCgpOwogCiAgICAgLy8g Rm9yIG5vdyB3ZSBkb24ndCBzdXBwb3J0IHRvVVJMIGZvciBpc29sYXRlZCBmaWxlc3lzdGVtICh1 bnRpbCB3ZSByZXNvbHZlIHRoZSBpc29sYXRlZCBmaWxlc3lzdGVtIGxpZmV0aW1lIGlzc3VlKS4K ICAgICBpZiAodHlwZSgpID09IGlzb2xhdGVkVHlwZSkKLSAgICAgICAgcmV0dXJuIFN0cmluZygp OworICAgICAgICByZXR1cm4gS1VSTCgpOwogCiAgICAgaWYgKHR5cGUoKSA9PSBleHRlcm5hbFR5 cGUpIHsKICAgICAgICAgLy8gRm9yIGV4dGVybmFsIGZpbGVzeXN0ZW0gb3JpZ2luU3RyaW5nIGNv dWxkIGJlIGRpZmZlcmVudCBmcm9tIHdoYXQgd2UgaGF2ZSBpbiBtX2ZpbGVzeXN0ZW1Sb290VVJM LgpAQCAtMjE2LDEyICsyMTYsMTIgQEAgU3RyaW5nIEFzeW5jRmlsZVN5c3RlbUNocm9taXVtOjp0 b1VSTChjb25zdCBTdHJpbmcmIG9yaWdpblN0cmluZywgY29uc3QgU3RyaW5nJgogICAgICAgICBy ZXN1bHQuYXBwZW5kKCIvIik7CiAgICAgICAgIHJlc3VsdC5hcHBlbmQoZXh0ZXJuYWxQYXRoUHJl Zml4KTsKICAgICAgICAgcmVzdWx0LmFwcGVuZChlbmNvZGVXaXRoVVJMRXNjYXBlU2VxdWVuY2Vz KGZ1bGxQYXRoKSk7Ci0gICAgICAgIHJldHVybiByZXN1bHQudG9TdHJpbmcoKTsKKyAgICAgICAg cmV0dXJuIEtVUkwoUGFyc2VkVVJMU3RyaW5nLCByZXN1bHQudG9TdHJpbmcoKSk7CiAgICAgfQog CiAgICAgLy8gRm9yIHJlZ3VsYXIgdHlwZXMgd2UgY2FuIGp1c3QgY2FsbCB2aXJ0dWFsUGF0aFRv RmlsZVN5c3RlbVVSTCB3aGljaCBhcHBlbmRzIHRoZSBmdWxsUGF0aCB0byB0aGUgbV9maWxlc3lz dGVtUm9vdFVSTCB0aGF0IHNob3VsZCBsb29rIGxpa2UgJ2ZpbGVzeXN0ZW06PG9yaWdpbj4vPHR5 cGVQcmVmaXg+Jy4KICAgICBBU1NFUlQoU2VjdXJpdHlPcmlnaW46OmNyZWF0ZShtX2ZpbGVzeXN0 ZW1Sb290VVJMKS0+dG9TdHJpbmcoKSA9PSBvcmlnaW5TdHJpbmcpOwotICAgIHJldHVybiB2aXJ0 dWFsUGF0aFRvRmlsZVN5c3RlbVVSTChmdWxsUGF0aCk7CisgICAgcmV0dXJuIEtVUkwoUGFyc2Vk VVJMU3RyaW5nLCB2aXJ0dWFsUGF0aFRvRmlsZVN5c3RlbVVSTChmdWxsUGF0aCkpOwogfQogCiB2 b2lkIEFzeW5jRmlsZVN5c3RlbUNocm9taXVtOjptb3ZlKGNvbnN0IFN0cmluZyYgc291cmNlUGF0 aCwgY29uc3QgU3RyaW5nJiBkZXN0aW5hdGlvblBhdGgsIFBhc3NPd25QdHI8QXN5bmNGaWxlU3lz dGVtQ2FsbGJhY2tzPiBjYWxsYmFja3MpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9t aXVtL3NyYy9Bc3luY0ZpbGVTeXN0ZW1DaHJvbWl1bS5oIGIvU291cmNlL1dlYktpdC9jaHJvbWl1 bS9zcmMvQXN5bmNGaWxlU3lzdGVtQ2hyb21pdW0uaAppbmRleCBmNTY1YjMzNGQwZmFjYzk5MjZi MTMyZjMyMmIwYmRiNmFkYWVmMTg0Li5mZTUyMzA1NWFkYWU3MTJiNWUyNDE2MDMzODU2OTQyZmZj YmNkN2EwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9Bc3luY0ZpbGVT eXN0ZW1DaHJvbWl1bS5oCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL0FzeW5jRmls ZVN5c3RlbUNocm9taXVtLmgKQEAgLTU3LDcgKzU3LDcgQEAgcHVibGljOgogCiAgICAgdmlydHVh bCB+QXN5bmNGaWxlU3lzdGVtQ2hyb21pdW0oKTsKIAotICAgIHZpcnR1YWwgU3RyaW5nIHRvVVJM KGNvbnN0IFN0cmluZyYgb3JpZ2luU3RyaW5nLCBjb25zdCBTdHJpbmcmIGZ1bGxQYXRoKTsKKyAg ICB2aXJ0dWFsIEtVUkwgdG9VUkwoY29uc3QgU3RyaW5nJiBvcmlnaW5TdHJpbmcsIGNvbnN0IFN0 cmluZyYgZnVsbFBhdGgpIGNvbnN0OwogICAgIHZpcnR1YWwgdm9pZCBtb3ZlKGNvbnN0IFN0cmlu ZyYgc291cmNlUGF0aCwgY29uc3QgU3RyaW5nJiBkZXN0aW5hdGlvblBhdGgsIFBhc3NPd25QdHI8 QXN5bmNGaWxlU3lzdGVtQ2FsbGJhY2tzPik7CiAgICAgdmlydHVhbCB2b2lkIGNvcHkoY29uc3Qg U3RyaW5nJiBzb3VyY2VQYXRoLCBjb25zdCBTdHJpbmcmIGRlc3RpbmF0aW9uUGF0aCwgUGFzc093 blB0cjxBc3luY0ZpbGVTeXN0ZW1DYWxsYmFja3M+KTsKICAgICB2aXJ0dWFsIHZvaWQgcmVtb3Zl KGNvbnN0IFN0cmluZyYgcGF0aCwgUGFzc093blB0cjxBc3luY0ZpbGVTeXN0ZW1DYWxsYmFja3M+ KTsK 140428 2012-05-06 11:17:03 -0700 2012-05-07 10:30:45 -0700 Patch bug-85736-20120507031702.patch text/plain 10752 kinuko U3VidmVyc2lvbiBSZXZpc2lvbjogMTE2MTg1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZGZmZGJhMWEwMzUxOWYy OTFjNjMxOGJlYTVjMGNlY2NlZjJjNjdhYi4uYWM3M2M1Y2Q2YzcxNWVkOTYzMzJmYmExOGYwNjQx MzliOGIwM2ZmZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDEyLTA1LTA2ICBLaW51 a28gWWFzdWRhICA8a2ludWtvQGNocm9taXVtLm9yZz4KKworICAgICAgICBDbGVhbnVwOiBGaWxl U3lzdGVtIEFQSSdzIEVudHJ5LnRvVVJMKCkgaW1wbCBzaG91bGQgcmV0dXJuIEtVUkwgaW5zdGVh ZCBvZiBTdHJpbmcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTg1NzM2CisKKyAgICAgICAgQ2hhbmdlIHRoZSByZXR1cm4gdHlwZSBvZiBFbnRyeTo6dG9V UkwoKSBmcm9tIFN0cmluZyB0byBLVVJMLgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cyBhcyB0aGlzIGNoYW5nZSBzaG91bGQgbm90 IGhhdmUgYW55IHZpc2libGUgaW1wYWN0IGluIHRoZSBqYXZhc2NyaXB0IGxheWVyLgorCisgICAg ICAgICogTW9kdWxlcy9maWxlc3lzdGVtL0VudHJ5QmFzZS5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpFbnRyeUJhc2U6OnRvVVJMKToKKyAgICAgICAgKiBNb2R1bGVzL2ZpbGVzeXN0ZW0vRW50cnlC YXNlLmg6CisgICAgICAgICogcGxhdGZvcm0vQXN5bmNGaWxlU3lzdGVtLmg6CisgICAgICAgICog cGxhdGZvcm0vYmxhY2tiZXJyeS9Bc3luY0ZpbGVTeXN0ZW1CbGFja2JlcnJ5LmNwcDoKKyAgICAg ICAgKEFzeW5jRmlsZVN5c3RlbUJsYWNrYmVycnk6OnRvVVJMKToKKyAgICAgICAgKiBwbGF0Zm9y bS9ibGFja2JlcnJ5L0FzeW5jRmlsZVN5c3RlbUJsYWNrYmVycnkuaDoKKyAgICAgICAgKiBwbGF0 Zm9ybS9ndGsvQXN5bmNGaWxlU3lzdGVtR3RrLmNwcDoKKyAgICAgICAgKEFzeW5jRmlsZVN5c3Rl bUd0azo6dG9VUkwpOgorICAgICAgICAqIHBsYXRmb3JtL2d0ay9Bc3luY0ZpbGVTeXN0ZW1HdGsu aDoKKwogMjAxMi0wNS0wNCAgTGV2aSBXZWludHJhdWIgIDxsZXZpd0BjaHJvbWl1bS5vcmc+CiAK ICAgICAgICAgQ29ycmVjdCBwaXhlbCBzbmFwcGluZyBpbiBSZW5kZXJTVkdSb290OjpwYWludFJl cGxhY2VkCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZyBiL1Nv dXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4IGVlOWE0MWVmMzBjNGIxODJkYzYz N2YxMjM5NThiZjY2MjhiMWQyOGUuLmEwOTBmNDZjODAwZGQ2NWQ4ZWNkYTM3NWFjYjc2YTUwZTg1 YWQ2YTYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCisrKyBi L1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMTIt MDUtMDYgIEtpbnVrbyBZYXN1ZGEgIDxraW51a29AY2hyb21pdW0ub3JnPgorCisgICAgICAgIENs ZWFudXA6IEZpbGVTeXN0ZW0gQVBJJ3MgRW50cnkudG9VUkwoKSBpbXBsIHNob3VsZCByZXR1cm4g S1VSTCBpbnN0ZWFkIG9mIFN0cmluZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9ODU3MzYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBDaGFuZ2UgQXN5bmNGaWxlU3lzdGVtQ2hyb21pdW06OnRvVVJMKCkncyBy ZXR1cm4gdHlwZSBmcm9tIFN0cmluZyB0byBLVVJMLgorCisgICAgICAgICogc3JjL0FzeW5jRmls ZVN5c3RlbUNocm9taXVtLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkFzeW5jRmlsZVN5c3RlbUNo cm9taXVtOjp0b1VSTCk6CisgICAgICAgIFN0cmluZyB0byBLVVJMLgorICAgICAgICAqIHNyYy9B c3luY0ZpbGVTeXN0ZW1DaHJvbWl1bS5oOgorICAgICAgICAoQXN5bmNGaWxlU3lzdGVtQ2hyb21p dW0pOgorCiAyMDEyLTA1LTA0ICBBZGFtIEJhcnRoICA8YWJhcnRoQHdlYmtpdC5vcmc+CiAKICAg ICAgICAgUmVmYWN0b3IgQ1NQIHN0YXRlIHRvIHByZXBhcmUgZm9yIGhhdmluZyBib3RoIGEgUmVw b3J0T25seSBhbmQgYW4gRW5mb3JjZWQgcG9saWN5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9Nb2R1bGVzL2ZpbGVzeXN0ZW0vRW50cnlCYXNlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL01vZHVs ZXMvZmlsZXN5c3RlbS9FbnRyeUJhc2UuY3BwCmluZGV4IDBiMTI1NGI3YWRkYWQ5OTg5Yjk0OWE4 OGIzZDllODU3OGE2ZDQ3MzguLjcyYTIyYmQ4NTk1MmY0ZjA2NDkyZWNhMDY0ZDY2M2ViMTdkODMw OTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvZmlsZXN5c3RlbS9FbnRyeUJh c2UuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvZmlsZXN5c3RlbS9FbnRyeUJhc2Uu Y3BwCkBAIC01NCw3ICs1NCw3IEBAIEVudHJ5QmFzZTo6fkVudHJ5QmFzZSgpCiB7CiB9CiAKLVN0 cmluZyBFbnRyeUJhc2U6OnRvVVJMKCkKK0tVUkwgRW50cnlCYXNlOjp0b1VSTCgpIGNvbnN0CiB7 CiAgICAgcmV0dXJuIG1fZmlsZVN5c3RlbS0+YXN5bmNGaWxlU3lzdGVtKCktPnRvVVJMKG1fZmls ZVN5c3RlbS0+c2VjdXJpdHlPcmlnaW4oKS0+dG9TdHJpbmcoKSwgbV9mdWxsUGF0aCk7CiB9CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2ZpbGVzeXN0ZW0vRW50cnlCYXNlLmgg Yi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2ZpbGVzeXN0ZW0vRW50cnlCYXNlLmgKaW5kZXggYTM0 YTkxNGYxZmZiYjdjYmQ2ZTRjMTA2NjM5YmNhNGU4YTI4ZjA3Yi4uMDE1NjljYjJhNGYyZjk2ZTE0 ZTk3ZWMxY2UzNjA2YjBkMWMwMzJjMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxl cy9maWxlc3lzdGVtL0VudHJ5QmFzZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvZmls ZXN5c3RlbS9FbnRyeUJhc2UuaApAQCAtMzMsNyArMzMsNyBAQAogCiAjaWYgRU5BQkxFKEZJTEVf U1lTVEVNKQogCi0jaW5jbHVkZSAiUGxhdGZvcm1TdHJpbmcuaCIKKyNpbmNsdWRlICJLVVJMLmgi CiAjaW5jbHVkZSA8d3RmL1Bhc3NSZWZQdHIuaD4KICNpbmNsdWRlIDx3dGYvUmVmQ291bnRlZC5o PgogCkBAIC01NSw3ICs1NSw3IEBAIHB1YmxpYzoKICAgICBjb25zdCBTdHJpbmcmIGZ1bGxQYXRo KCkgY29uc3QgeyByZXR1cm4gbV9mdWxsUGF0aDsgfQogICAgIGNvbnN0IFN0cmluZyYgbmFtZSgp IGNvbnN0IHsgcmV0dXJuIG1fbmFtZTsgfQogCi0gICAgU3RyaW5nIHRvVVJMKCk7CisgICAgS1VS TCB0b1VSTCgpIGNvbnN0OwogCiBwcm90ZWN0ZWQ6CiAgICAgRW50cnlCYXNlKFBhc3NSZWZQdHI8 RE9NRmlsZVN5c3RlbUJhc2U+LCBjb25zdCBTdHJpbmcmIGZ1bGxQYXRoKTsKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL0FzeW5jRmlsZVN5c3RlbS5oIGIvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vQXN5bmNGaWxlU3lzdGVtLmgKaW5kZXggNzc5MjEwMWM1MzBhMjFjMjY1Y2Zj NGI0NmEzNDZmYjkyMGM0MTI1My4uNTRkYjAyMTBhOTNmZjkyODEyMmNmNTNkYWQ0Mzc5MDQ1NGEy OTE5ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vQXN5bmNGaWxlU3lzdGVt LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vQXN5bmNGaWxlU3lzdGVtLmgKQEAgLTcy LDcgKzcyLDcgQEAgcHVibGljOgogCiAgICAgc3RhdGljIGJvb2wgY3JhY2tGaWxlU3lzdGVtVVJM KGNvbnN0IEtVUkwmLCBUeXBlJiwgU3RyaW5nJiBmaWxlUGF0aCk7CiAKLSAgICB2aXJ0dWFsIFN0 cmluZyB0b1VSTChjb25zdCBTdHJpbmcmIG9yaWdpblN0cmluZywgY29uc3QgU3RyaW5nJiBmdWxs UGF0aCkgPSAwOworICAgIHZpcnR1YWwgS1VSTCB0b1VSTChjb25zdCBTdHJpbmcmIG9yaWdpblN0 cmluZywgY29uc3QgU3RyaW5nJiBmdWxsUGF0aCkgY29uc3QgPSAwOwogCiAgICAgLy8gU3ViY2xh c3MgbXVzdCBpbXBsZW1lbnQgdGhpcyBpZiBpdCBzdXBwb3J0cyBzeW5jaHJvbm91cyBvcGVyYXRp b25zLgogICAgIC8vIFRoaXMgc2hvdWxkIHJldHVybiBmYWxzZSBpZiB0aGVyZSBhcmUgbm8gcGVu ZGluZyBvcGVyYXRpb25zLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vYmxh Y2tiZXJyeS9Bc3luY0ZpbGVTeXN0ZW1CbGFja0JlcnJ5LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2JsYWNrYmVycnkvQXN5bmNGaWxlU3lzdGVtQmxhY2tCZXJyeS5jcHAKaW5kZXggNWZl Mjk3ZWIyNGRkMzljZWU0MzdiNzIxMGZlMjY2ZmZhMzYyY2MzMy4uYTc4MGYyMzQzOTdkZjViYTgy ZjA2MjZjM2Y2YTJkOGE5YTlmMDBkOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vYmxhY2tiZXJyeS9Bc3luY0ZpbGVTeXN0ZW1CbGFja0JlcnJ5LmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ibGFja2JlcnJ5L0FzeW5jRmlsZVN5c3RlbUJsYWNrQmVycnkuY3Bw CkBAIC04MCwxMyArODAsMTMgQEAgQXN5bmNGaWxlU3lzdGVtQmxhY2tCZXJyeTo6fkFzeW5jRmls ZVN5c3RlbUJsYWNrQmVycnkoKQogICAgIG5vdEltcGxlbWVudGVkKCk7CiB9CiAKLVN0cmluZyBB c3luY0ZpbGVTeXN0ZW1CbGFja0JlcnJ5Ojp0b1VSTChjb25zdCBTdHJpbmcmIG9yaWdpblN0cmlu ZywgY29uc3QgU3RyaW5nJiBmdWxsUGF0aCkKK0tVUkwgQXN5bmNGaWxlU3lzdGVtQmxhY2tCZXJy eTo6dG9VUkwoY29uc3QgU3RyaW5nJiBvcmlnaW5TdHJpbmcsIGNvbnN0IFN0cmluZyYgZnVsbFBh dGgpIGNvbnN0CiB7CiAgICAgVU5VU0VEX1BBUkFNKG9yaWdpblN0cmluZyk7CiAgICAgVU5VU0VE X1BBUkFNKGZ1bGxQYXRoKTsKIAogICAgIG5vdEltcGxlbWVudGVkKCk7Ci0gICAgcmV0dXJuIFN0 cmluZygpOworICAgIHJldHVybiBLVVJMKCk7CiB9CiAKIHZvaWQgQXN5bmNGaWxlU3lzdGVtQmxh Y2tCZXJyeTo6bW92ZShjb25zdCBTdHJpbmcmIHNvdXJjZVBhdGgsIGNvbnN0IFN0cmluZyYgZGVz dGluYXRpb25QYXRoLCBQYXNzT3duUHRyPEFzeW5jRmlsZVN5c3RlbUNhbGxiYWNrcz4gY2FsbGJh Y2tzKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vYmxhY2tiZXJyeS9Bc3lu Y0ZpbGVTeXN0ZW1CbGFja0JlcnJ5LmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ibGFja2Jl cnJ5L0FzeW5jRmlsZVN5c3RlbUJsYWNrQmVycnkuaAppbmRleCA4ZmE5YTE5OWI1N2NlNWU4MDRm MWQ3NTdkMGQxZmQ1OThlNzI1M2E0Li40ZjUzZGY3YmFlMThlMjcxNWIxNzdmMTRiZDgwOTVmZmU3 YTAwYTY4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ibGFja2JlcnJ5L0Fz eW5jRmlsZVN5c3RlbUJsYWNrQmVycnkuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9i bGFja2JlcnJ5L0FzeW5jRmlsZVN5c3RlbUJsYWNrQmVycnkuaApAQCAtMjksNyArMjksNyBAQCBj bGFzcyBBc3luY0ZpbGVTeXN0ZW1CbGFja0JlcnJ5IDogcHVibGljIEFzeW5jRmlsZVN5c3RlbSB7 CiBwdWJsaWM6CiAgICAgQXN5bmNGaWxlU3lzdGVtQmxhY2tCZXJyeShBc3luY0ZpbGVTeXN0ZW06 OlR5cGUpOwogICAgIHZpcnR1YWwgfkFzeW5jRmlsZVN5c3RlbUJsYWNrQmVycnkoKTsKLSAgICB2 aXJ0dWFsIFN0cmluZyB0b1VSTChjb25zdCBTdHJpbmcmIG9yaWdpblN0cmluZywgY29uc3QgU3Ry aW5nJiBmdWxsUGF0aCk7CisgICAgdmlydHVhbCBLVVJMIHRvVVJMKGNvbnN0IFN0cmluZyYgb3Jp Z2luU3RyaW5nLCBjb25zdCBTdHJpbmcmIGZ1bGxQYXRoKSBjb25zdDsKICAgICB2aXJ0dWFsIHZv aWQgbW92ZShjb25zdCBTdHJpbmcmIHNvdXJjZVBhdGgsIGNvbnN0IFN0cmluZyYgZGVzdGluYXRp b25QYXRoLCBQYXNzT3duUHRyPEFzeW5jRmlsZVN5c3RlbUNhbGxiYWNrcz4pOwogICAgIHZpcnR1 YWwgdm9pZCBjb3B5KGNvbnN0IFN0cmluZyYgc291cmNlUGF0aCwgY29uc3QgU3RyaW5nJiBkZXN0 aW5hdGlvblBhdGgsIFBhc3NPd25QdHI8QXN5bmNGaWxlU3lzdGVtQ2FsbGJhY2tzPik7CiAgICAg dmlydHVhbCB2b2lkIHJlbW92ZShjb25zdCBTdHJpbmcmIHBhdGgsIFBhc3NPd25QdHI8QXN5bmNG aWxlU3lzdGVtQ2FsbGJhY2tzPik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ndGsvQXN5bmNGaWxlU3lzdGVtR3RrLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2d0 ay9Bc3luY0ZpbGVTeXN0ZW1HdGsuY3BwCmluZGV4IGMxZGIwMDZhODQ4ZjM5MjZkZDlmZWMzMWY5 NjRhMGZkYmRhZjY5ZmMuLmEwODI5NWQwYjZjY2Y0MGZhYzdiNDZmNDNkMTBlYmJiMzZjZGMyNDQg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9Bc3luY0ZpbGVTeXN0ZW1H dGsuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9Bc3luY0ZpbGVTeXN0ZW1H dGsuY3BwCkBAIC02OSwxMCArNjksMTAgQEAgQXN5bmNGaWxlU3lzdGVtR3RrOjp+QXN5bmNGaWxl U3lzdGVtR3RrKCkKICAgICBub3RJbXBsZW1lbnRlZCgpOwogfQogCi1TdHJpbmcgQXN5bmNGaWxl U3lzdGVtR3RrOjp0b1VSTChjb25zdCBTdHJpbmcmIG9yaWdpblN0cmluZywgY29uc3QgU3RyaW5n JiBmdWxsUGF0aCkKK0tVUkwgQXN5bmNGaWxlU3lzdGVtR3RrOjp0b1VSTChjb25zdCBTdHJpbmcm IG9yaWdpblN0cmluZywgY29uc3QgU3RyaW5nJiBmdWxsUGF0aCkgY29uc3QKIHsKICAgICBub3RJ bXBsZW1lbnRlZCgpOwotICAgIHJldHVybiBTdHJpbmcoKTsKKyAgICByZXR1cm4gS1VSTCgpOwog fQogCiB2b2lkIEFzeW5jRmlsZVN5c3RlbUd0azo6bW92ZShjb25zdCBTdHJpbmcmIHNvdXJjZVBh dGgsIGNvbnN0IFN0cmluZyYgZGVzdGluYXRpb25QYXRoLCBQYXNzT3duUHRyPEFzeW5jRmlsZVN5 c3RlbUNhbGxiYWNrcz4gY2FsbGJhY2tzKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3RrL0FzeW5jRmlsZVN5c3RlbUd0ay5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3RrL0FzeW5jRmlsZVN5c3RlbUd0ay5oCmluZGV4IGNiNDViNmVhNGJjMjAyMGU4ZWI0YzhlYjVh MTk4ZjA3NmY1YTY5N2IuLjQ0NzM3MjM4MTY4YjQ4OWJkNjRhYjQwNzNmYTQyZjYwZWE1Nzk5NWEg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9Bc3luY0ZpbGVTeXN0ZW1H dGsuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvQXN5bmNGaWxlU3lzdGVtR3Rr LmgKQEAgLTM0LDcgKzM0LDcgQEAgcHVibGljOgogICAgIEFzeW5jRmlsZVN5c3RlbUd0ayhBc3lu Y0ZpbGVTeXN0ZW06OlR5cGUpOwogICAgIHZpcnR1YWwgfkFzeW5jRmlsZVN5c3RlbUd0aygpOwog Ci0gICAgdmlydHVhbCBTdHJpbmcgdG9VUkwoY29uc3QgU3RyaW5nJiBvcmlnaW5TdHJpbmcsIGNv bnN0IFN0cmluZyYgZnVsbFBhdGgpOworICAgIHZpcnR1YWwgS1VSTCB0b1VSTChjb25zdCBTdHJp bmcmIG9yaWdpblN0cmluZywgY29uc3QgU3RyaW5nJiBmdWxsUGF0aCkgY29uc3Q7CiAgICAgdmly dHVhbCB2b2lkIG1vdmUoY29uc3QgU3RyaW5nJiBzb3VyY2VQYXRoLCBjb25zdCBTdHJpbmcmIGRl c3RpbmF0aW9uUGF0aCwgUGFzc093blB0cjxBc3luY0ZpbGVTeXN0ZW1DYWxsYmFja3M+KTsKICAg ICB2aXJ0dWFsIHZvaWQgY29weShjb25zdCBTdHJpbmcmIHNvdXJjZVBhdGgsIGNvbnN0IFN0cmlu ZyYgZGVzdGluYXRpb25QYXRoLCBQYXNzT3duUHRyPEFzeW5jRmlsZVN5c3RlbUNhbGxiYWNrcz4p OwogICAgIHZpcnR1YWwgdm9pZCByZW1vdmUoY29uc3QgU3RyaW5nJiBwYXRoLCBQYXNzT3duUHRy PEFzeW5jRmlsZVN5c3RlbUNhbGxiYWNrcz4pOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9j aHJvbWl1bS9zcmMvQXN5bmNGaWxlU3lzdGVtQ2hyb21pdW0uY3BwIGIvU291cmNlL1dlYktpdC9j aHJvbWl1bS9zcmMvQXN5bmNGaWxlU3lzdGVtQ2hyb21pdW0uY3BwCmluZGV4IDZmMzU5ODM3MDMw YTU3ZTg0OWFhN2FlZTA2ZGY5MTA0Njk5MDEzOTcuLmIyZDg5YzY0YWY0YzYzMGQyMmIwNjBkMTIz MWVmM2Q1MTVmYmFhZDYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL0Fz eW5jRmlsZVN5c3RlbUNocm9taXVtLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Ny Yy9Bc3luY0ZpbGVTeXN0ZW1DaHJvbWl1bS5jcHAKQEAgLTE5OCwxNSArMTk4LDE1IEBAIEFzeW5j RmlsZVN5c3RlbUNocm9taXVtOjp+QXN5bmNGaWxlU3lzdGVtQ2hyb21pdW0oKQogewogfQogCi1T dHJpbmcgQXN5bmNGaWxlU3lzdGVtQ2hyb21pdW06OnRvVVJMKGNvbnN0IFN0cmluZyYgb3JpZ2lu U3RyaW5nLCBjb25zdCBTdHJpbmcmIGZ1bGxQYXRoKQorS1VSTCBBc3luY0ZpbGVTeXN0ZW1DaHJv bWl1bTo6dG9VUkwoY29uc3QgU3RyaW5nJiBvcmlnaW5TdHJpbmcsIGNvbnN0IFN0cmluZyYgZnVs bFBhdGgpIGNvbnN0CiB7CiAgICAgQVNTRVJUKCFvcmlnaW5TdHJpbmcuaXNFbXB0eSgpKTsKICAg ICBpZiAob3JpZ2luU3RyaW5nID09ICJudWxsIikKLSAgICAgICAgcmV0dXJuIFN0cmluZygpOwor ICAgICAgICByZXR1cm4gS1VSTCgpOwogCiAgICAgLy8gRm9yIG5vdyB3ZSBkb24ndCBzdXBwb3J0 IHRvVVJMIGZvciBpc29sYXRlZCBmaWxlc3lzdGVtICh1bnRpbCB3ZSByZXNvbHZlIHRoZSBpc29s YXRlZCBmaWxlc3lzdGVtIGxpZmV0aW1lIGlzc3VlKS4KICAgICBpZiAodHlwZSgpID09IGlzb2xh dGVkVHlwZSkKLSAgICAgICAgcmV0dXJuIFN0cmluZygpOworICAgICAgICByZXR1cm4gS1VSTCgp OwogCiAgICAgaWYgKHR5cGUoKSA9PSBleHRlcm5hbFR5cGUpIHsKICAgICAgICAgLy8gRm9yIGV4 dGVybmFsIGZpbGVzeXN0ZW0gb3JpZ2luU3RyaW5nIGNvdWxkIGJlIGRpZmZlcmVudCBmcm9tIHdo YXQgd2UgaGF2ZSBpbiBtX2ZpbGVzeXN0ZW1Sb290VVJMLgpAQCAtMjE2LDEyICsyMTYsMTIgQEAg U3RyaW5nIEFzeW5jRmlsZVN5c3RlbUNocm9taXVtOjp0b1VSTChjb25zdCBTdHJpbmcmIG9yaWdp blN0cmluZywgY29uc3QgU3RyaW5nJgogICAgICAgICByZXN1bHQuYXBwZW5kKCIvIik7CiAgICAg ICAgIHJlc3VsdC5hcHBlbmQoZXh0ZXJuYWxQYXRoUHJlZml4KTsKICAgICAgICAgcmVzdWx0LmFw cGVuZChlbmNvZGVXaXRoVVJMRXNjYXBlU2VxdWVuY2VzKGZ1bGxQYXRoKSk7Ci0gICAgICAgIHJl dHVybiByZXN1bHQudG9TdHJpbmcoKTsKKyAgICAgICAgcmV0dXJuIEtVUkwoUGFyc2VkVVJMU3Ry aW5nLCByZXN1bHQudG9TdHJpbmcoKSk7CiAgICAgfQogCiAgICAgLy8gRm9yIHJlZ3VsYXIgdHlw ZXMgd2UgY2FuIGp1c3QgY2FsbCB2aXJ0dWFsUGF0aFRvRmlsZVN5c3RlbVVSTCB3aGljaCBhcHBl bmRzIHRoZSBmdWxsUGF0aCB0byB0aGUgbV9maWxlc3lzdGVtUm9vdFVSTCB0aGF0IHNob3VsZCBs b29rIGxpa2UgJ2ZpbGVzeXN0ZW06PG9yaWdpbj4vPHR5cGVQcmVmaXg+Jy4KICAgICBBU1NFUlQo U2VjdXJpdHlPcmlnaW46OmNyZWF0ZShtX2ZpbGVzeXN0ZW1Sb290VVJMKS0+dG9TdHJpbmcoKSA9 PSBvcmlnaW5TdHJpbmcpOwotICAgIHJldHVybiB2aXJ0dWFsUGF0aFRvRmlsZVN5c3RlbVVSTChm dWxsUGF0aCk7CisgICAgcmV0dXJuIEtVUkwoUGFyc2VkVVJMU3RyaW5nLCB2aXJ0dWFsUGF0aFRv RmlsZVN5c3RlbVVSTChmdWxsUGF0aCkpOwogfQogCiB2b2lkIEFzeW5jRmlsZVN5c3RlbUNocm9t aXVtOjptb3ZlKGNvbnN0IFN0cmluZyYgc291cmNlUGF0aCwgY29uc3QgU3RyaW5nJiBkZXN0aW5h dGlvblBhdGgsIFBhc3NPd25QdHI8QXN5bmNGaWxlU3lzdGVtQ2FsbGJhY2tzPiBjYWxsYmFja3Mp CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9Bc3luY0ZpbGVTeXN0ZW1D aHJvbWl1bS5oIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvQXN5bmNGaWxlU3lzdGVtQ2hy b21pdW0uaAppbmRleCBmNTY1YjMzNGQwZmFjYzk5MjZiMTMyZjMyMmIwYmRiNmFkYWVmMTg0Li5m ZTUyMzA1NWFkYWU3MTJiNWUyNDE2MDMzODU2OTQyZmZjYmNkN2EwIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0L2Nocm9taXVtL3NyYy9Bc3luY0ZpbGVTeXN0ZW1DaHJvbWl1bS5oCisrKyBiL1Nv dXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL0FzeW5jRmlsZVN5c3RlbUNocm9taXVtLmgKQEAgLTU3 LDcgKzU3LDcgQEAgcHVibGljOgogCiAgICAgdmlydHVhbCB+QXN5bmNGaWxlU3lzdGVtQ2hyb21p dW0oKTsKIAotICAgIHZpcnR1YWwgU3RyaW5nIHRvVVJMKGNvbnN0IFN0cmluZyYgb3JpZ2luU3Ry aW5nLCBjb25zdCBTdHJpbmcmIGZ1bGxQYXRoKTsKKyAgICB2aXJ0dWFsIEtVUkwgdG9VUkwoY29u c3QgU3RyaW5nJiBvcmlnaW5TdHJpbmcsIGNvbnN0IFN0cmluZyYgZnVsbFBhdGgpIGNvbnN0Owog ICAgIHZpcnR1YWwgdm9pZCBtb3ZlKGNvbnN0IFN0cmluZyYgc291cmNlUGF0aCwgY29uc3QgU3Ry aW5nJiBkZXN0aW5hdGlvblBhdGgsIFBhc3NPd25QdHI8QXN5bmNGaWxlU3lzdGVtQ2FsbGJhY2tz Pik7CiAgICAgdmlydHVhbCB2b2lkIGNvcHkoY29uc3QgU3RyaW5nJiBzb3VyY2VQYXRoLCBjb25z dCBTdHJpbmcmIGRlc3RpbmF0aW9uUGF0aCwgUGFzc093blB0cjxBc3luY0ZpbGVTeXN0ZW1DYWxs YmFja3M+KTsKICAgICB2aXJ0dWFsIHZvaWQgcmVtb3ZlKGNvbnN0IFN0cmluZyYgcGF0aCwgUGFz c093blB0cjxBc3luY0ZpbGVTeXN0ZW1DYWxsYmFja3M+KTsK