43197 2010-07-29 09:49:14 -0700 WebKit2 often says "plugin directory" when it means "plugins directory" 2010-08-03 10:33:30 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 43189 1 aroben aroben sullivan oldest_to_newest 257743 0 aroben 2010-07-29 09:49:14 -0700 WebKit2 often says "plugin directory" when it means "plugins directory" 257744 1 62965 aroben 2010-07-29 09:50:13 -0700 Created attachment 62965 Patch 259530 2 aroben 2010-08-03 10:33:30 -0700 Committed r64287: <http://trac.webkit.org/changeset/64287> 62965 2010-07-29 09:50:13 -0700 2010-07-29 09:51:09 -0700 Patch bug-43197-20100729125011.patch text/plain 11676 aroben ZGlmZiAtLWdpdCBhL1dlYktpdDIvQ2hhbmdlTG9nIGIvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXgg MTAzYTJiNDY3ZmU3MDQ2NTA4YzdhMWFmZDYzYzZlZTBkNzMwMzU2NS4uY2MxMTczNGEzMDgyYzg5 MjQzMThmYmJhMmNkMDljYTZmYjA3MWFhNCAxMDA2NDQKLS0tIGEvV2ViS2l0Mi9DaGFuZ2VMb2cK KysrIGIvV2ViS2l0Mi9DaGFuZ2VMb2cKQEAgLTEsNSArMSw0MSBAQAogMjAxMC0wNy0yOSAgQWRh bSBSb2JlbiAgPGFyb2JlbkBhcHBsZS5jb20+CiAKKyAgICAgICAgQWx3YXlzIHNheSAicGx1Z2lu cyBkaXJlY3RvcnkiIHdoZW4gcmVmZXJyaW5nIHRvIGEgZGlyZWN0b3J5CisgICAgICAgIGNvbnRh aW5pbmcgb25lIG9yIG1vcmUgcGx1Z2lucworCisgICAgICAgIEZpeGVzIDxodHRwOi8vd2Via2l0 Lm9yZy9iLzQzMTk3PiBXZWJLaXQyIG9mdGVuIHNheXMgInBsdWdpbgorICAgICAgICBkaXJlY3Rv cnkiIHdoZW4gaXQgbWVhbnMgInBsdWdpbnMgZGlyZWN0b3J5IgorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9DL1dLQ29udGV4 dC5jcHA6CisgICAgICAgIChfV0tDb250ZXh0U2V0QWRkaXRpb25hbFBsdWdpbnNEaXJlY3Rvcnkp OgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQy9XS0NvbnRleHRQcml2YXRlLmg6CisgICAgICAg IFJlbmFtZWQgZnJvbSBfV0tDb250ZXh0U2V0QWRkaXRpb25hbFBsdWdpbkRpcmVjdG9yeS4KKwor ICAgICAgICAqIFVJUHJvY2Vzcy9QbHVnaW5zL1BsdWdpbkluZm9TdG9yZS5jcHA6CisgICAgICAg IChXZWJLaXQ6OlBsdWdpbkluZm9TdG9yZTo6c2V0QWRkaXRpb25hbFBsdWdpbnNEaXJlY3Rvcmll cyk6IFJlbmFtZWQKKyAgICAgICAgZnJvbSBzZXRBZGRpdGlvbmFsUGx1Z2luRGlyZWN0b3JpZXMu CisgICAgICAgIChXZWJLaXQ6OlBsdWdpbkluZm9TdG9yZTo6bG9hZFBsdWdpbnNJZk5lY2Vzc2Fy eSk6IFVwZGF0ZWQgZm9yIHJlbmFtZS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9QbHVnaW5zL1Bs dWdpbkluZm9TdG9yZS5oOiBSZW5hbWVkCisgICAgICAgIG1fYWRkaXRpb25hbFBsdWdpbkRpcmVj dG9yaWVzIHRvIG1fYWRkaXRpb25hbFBsdWdpbnNEaXJlY3Rvcmllcy4KKworICAgICAgICAqIFVJ UHJvY2Vzcy9QbHVnaW5zL21hYy9QbHVnaW5JbmZvU3RvcmVNYWMubW06CisgICAgICAgIChXZWJL aXQ6OlBsdWdpbkluZm9TdG9yZTo6cGx1Z2luc0RpcmVjdG9yaWVzKToKKyAgICAgICAgKiBVSVBy b2Nlc3MvUGx1Z2lucy9xdC9QbHVnaW5JbmZvU3RvcmVRdC5jcHA6CisgICAgICAgIChXZWJLaXQ6 OlBsdWdpbkluZm9TdG9yZTo6cGx1Z2luc0RpcmVjdG9yaWVzKToKKyAgICAgICAgKiBVSVByb2Nl c3MvUGx1Z2lucy93aW4vUGx1Z2luSW5mb1N0b3JlV2luLmNwcDoKKyAgICAgICAgKFdlYktpdDo6 UGx1Z2luSW5mb1N0b3JlOjpwbHVnaW5zRGlyZWN0b3JpZXMpOgorICAgICAgICBSZW5hbWVkIGZy b20gcGx1Z2luRGlyZWN0b3JpZXMuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViQ29udGV4dC5j cHA6CisgICAgICAgIChXZWJLaXQ6OldlYkNvbnRleHQ6OnNldEFkZGl0aW9uYWxQbHVnaW5zRGly ZWN0b3J5KToKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViQ29udGV4dC5oOgorICAgICAgICBSZW5h bWVkIGZyb20gc2V0QWRkaXRpb25hbFBsdWdpbkRpcmVjdG9yeS4KKworMjAxMC0wNy0yOSAgQWRh bSBSb2JlbiAgPGFyb2JlbkBhcHBsZS5jb20+CisKICAgICAgICAgQWx3YXlzIHNheSAiZGlyZWN0 b3J5IiB3aGVuIHJlZmVycmluZyB0byBhIHBsdWdpbiBkaXJlY3RvcnkKIAogICAgICAgICBGaXhl cyA8aHR0cDovL3dlYmtpdC5vcmcvYi80MzE5NT4gV2ViS2l0MiBvZnRlbiBzYXlzICJwbHVnaW4g cGF0aCIKZGlmZiAtLWdpdCBhL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9DL1dLQ29udGV4dC5jcHAg Yi9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9XS0NvbnRleHQuY3BwCmluZGV4IDM5MjFjYTVkMGYz MzVkMzFjOGM1MzVjOTUyYTk3Njc3MDQ2OWI0ZWQuLmZkNDAxOWU1ODRmYTg1ZjFjYWM5NjRhOTYz ZjI2ZDQ1Njc4ZjcxODUgMTAwNjQ0Ci0tLSBhL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9DL1dLQ29u dGV4dC5jcHAKKysrIGIvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvV0tDb250ZXh0LmNwcApAQCAt MTA1LDkgKzEwNSw5IEBAIHZvaWQgV0tDb250ZXh0UmVsZWFzZShXS0NvbnRleHRSZWYgY29udGV4 dFJlZikKICAgICB0b1dLKGNvbnRleHRSZWYpLT5kZXJlZigpOwogfQogCi12b2lkIF9XS0NvbnRl eHRTZXRBZGRpdGlvbmFsUGx1Z2luRGlyZWN0b3J5KFdLQ29udGV4dFJlZiBjb250ZXh0UmVmLCBX S1N0cmluZ1JlZiBwbHVnaW5EaXJlY3RvcnkpCit2b2lkIF9XS0NvbnRleHRTZXRBZGRpdGlvbmFs UGx1Z2luc0RpcmVjdG9yeShXS0NvbnRleHRSZWYgY29udGV4dFJlZiwgV0tTdHJpbmdSZWYgcGx1 Z2luc0RpcmVjdG9yeSkKIHsKLSAgICB0b1dLKGNvbnRleHRSZWYpLT5zZXRBZGRpdGlvbmFsUGx1 Z2luRGlyZWN0b3J5KHRvV0socGx1Z2luRGlyZWN0b3J5KS0+c3RyaW5nKCkpOworICAgIHRvV0so Y29udGV4dFJlZiktPnNldEFkZGl0aW9uYWxQbHVnaW5zRGlyZWN0b3J5KHRvV0socGx1Z2luc0Rp cmVjdG9yeSktPnN0cmluZygpKTsKIH0KIAogdm9pZCBfV0tDb250ZXh0UmVnaXN0ZXJVUkxTY2hl bWVBc0VtcHR5RG9jdW1lbnQoV0tDb250ZXh0UmVmIGNvbnRleHRSZWYsIFdLU3RyaW5nUmVmIHVy bFNjaGVtZSkKZGlmZiAtLWdpdCBhL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9DL1dLQ29udGV4dFBy aXZhdGUuaCBiL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9DL1dLQ29udGV4dFByaXZhdGUuaAppbmRl eCAwYjg2ZTA5NDhmMmQzZmUzNDE5NDQyNzJjODZkOTRmZjQwOTYxNWQyLi41NDMwY2ZhMjFiN2Jl Njg2Zjc5OTE2N2ExMTRjMzFjOWQyMTFhZWEyIDEwMDY0NAotLS0gYS9XZWJLaXQyL1VJUHJvY2Vz cy9BUEkvQy9XS0NvbnRleHRQcml2YXRlLmgKKysrIGIvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0Mv V0tDb250ZXh0UHJpdmF0ZS5oCkBAIC00NCw3ICs0NCw3IEBAIFdLX0VYUE9SVCB2b2lkIFdLQ29u dGV4dEdldFN0YXRpc3RpY3MoV0tDb250ZXh0UmVmIGNvbnRleHQsIFdLQ29udGV4dFN0YXRpc3Rp Y3MqCiAKIFdLX0VYUE9SVCBXS0NvbnRleHRSZWYgV0tDb250ZXh0R2V0U2hhcmVkVGhyZWFkQ29u dGV4dCgpOwogCi1XS19FWFBPUlQgdm9pZCBfV0tDb250ZXh0U2V0QWRkaXRpb25hbFBsdWdpbkRp cmVjdG9yeShXS0NvbnRleHRSZWYgY29udGV4dCwgV0tTdHJpbmdSZWYgcGx1Z2luRGlyZWN0b3J5 KTsKK1dLX0VYUE9SVCB2b2lkIF9XS0NvbnRleHRTZXRBZGRpdGlvbmFsUGx1Z2luc0RpcmVjdG9y eShXS0NvbnRleHRSZWYgY29udGV4dCwgV0tTdHJpbmdSZWYgcGx1Z2luc0RpcmVjdG9yeSk7CiAK IFdLX0VYUE9SVCB2b2lkIF9XS0NvbnRleHRSZWdpc3RlclVSTFNjaGVtZUFzRW1wdHlEb2N1bWVu dChXS0NvbnRleHRSZWYgY29udGV4dCwgV0tTdHJpbmdSZWYgdXJsU2NoZW1lKTsKIApkaWZmIC0t Z2l0IGEvV2ViS2l0Mi9VSVByb2Nlc3MvUGx1Z2lucy9QbHVnaW5JbmZvU3RvcmUuY3BwIGIvV2Vi S2l0Mi9VSVByb2Nlc3MvUGx1Z2lucy9QbHVnaW5JbmZvU3RvcmUuY3BwCmluZGV4IDU2NmNkMWVj MGJhMDU0ZTI5MTc0ODA3NTliYzFhMjdlN2U4N2MwZjcuLjUxMDJhY2I0ZGM5NmZlZjIyYTdmYmNl NzJlMTkxZGM5OGZhOTI5NGYgMTAwNjQ0Ci0tLSBhL1dlYktpdDIvVUlQcm9jZXNzL1BsdWdpbnMv UGx1Z2luSW5mb1N0b3JlLmNwcAorKysgYi9XZWJLaXQyL1VJUHJvY2Vzcy9QbHVnaW5zL1BsdWdp bkluZm9TdG9yZS5jcHAKQEAgLTQwLDkgKzQwLDkgQEAgUGx1Z2luSW5mb1N0b3JlOjpQbHVnaW5J bmZvU3RvcmUoKQogewogfQogCi12b2lkIFBsdWdpbkluZm9TdG9yZTo6c2V0QWRkaXRpb25hbFBs dWdpbkRpcmVjdG9yaWVzKGNvbnN0IFZlY3RvcjxXZWJDb3JlOjpTdHJpbmc+JiBkaXJlY3Rvcmll cykKK3ZvaWQgUGx1Z2luSW5mb1N0b3JlOjpzZXRBZGRpdGlvbmFsUGx1Z2luc0RpcmVjdG9yaWVz KGNvbnN0IFZlY3RvcjxXZWJDb3JlOjpTdHJpbmc+JiBkaXJlY3RvcmllcykKIHsKLSAgICBtX2Fk ZGl0aW9uYWxQbHVnaW5EaXJlY3RvcmllcyA9IGRpcmVjdG9yaWVzOworICAgIG1fYWRkaXRpb25h bFBsdWdpbnNEaXJlY3RvcmllcyA9IGRpcmVjdG9yaWVzOwogICAgIHJlZnJlc2goKTsKIH0KIApA QCAtNTgsMTEgKzU4LDExIEBAIHZvaWQgUGx1Z2luSW5mb1N0b3JlOjpsb2FkUGx1Z2luc0lmTmVj ZXNzYXJ5KCkKIAogICAgIG1fcGx1Z2lucy5jbGVhcigpOwogCi0gICAgLy8gRmlyc3QsIGxvYWQg cGx1Zy1pbnMgZnJvbSB0aGUgYWRkaXRpb25hbCBwbHVnLWluIGRpcmVjdG9yaWVzIHNwZWNpZmll ZC4KLSAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IG1fYWRkaXRpb25hbFBsdWdpbkRpcmVjdG9y aWVzLnNpemUoKTsgKytpKQotICAgICAgICBsb2FkUGx1Z2luc0luRGlyZWN0b3J5KG1fYWRkaXRp b25hbFBsdWdpbkRpcmVjdG9yaWVzW2ldKTsKKyAgICAvLyBGaXJzdCwgbG9hZCBwbHVnLWlucyBm cm9tIHRoZSBhZGRpdGlvbmFsIHBsdWctaW5zIGRpcmVjdG9yaWVzIHNwZWNpZmllZC4KKyAgICBm b3IgKHNpemVfdCBpID0gMDsgaSA8IG1fYWRkaXRpb25hbFBsdWdpbnNEaXJlY3Rvcmllcy5zaXpl KCk7ICsraSkKKyAgICAgICAgbG9hZFBsdWdpbnNJbkRpcmVjdG9yeShtX2FkZGl0aW9uYWxQbHVn aW5zRGlyZWN0b3JpZXNbaV0pOwogCi0gICAgVmVjdG9yPFN0cmluZz4gZGlyZWN0b3JpZXMgPSBw bHVnaW5EaXJlY3RvcmllcygpOworICAgIFZlY3RvcjxTdHJpbmc+IGRpcmVjdG9yaWVzID0gcGx1 Z2luc0RpcmVjdG9yaWVzKCk7CiAgICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBkaXJlY3Rvcmll cy5zaXplKCk7ICsraSkKICAgICAgICAgbG9hZFBsdWdpbnNJbkRpcmVjdG9yeShkaXJlY3Rvcmll c1tpXSk7CiAKZGlmZiAtLWdpdCBhL1dlYktpdDIvVUlQcm9jZXNzL1BsdWdpbnMvUGx1Z2luSW5m b1N0b3JlLmggYi9XZWJLaXQyL1VJUHJvY2Vzcy9QbHVnaW5zL1BsdWdpbkluZm9TdG9yZS5oCmlu ZGV4IDI1ZGJlMjg2YzA2ZTM0YmFkZDA3ZTgwZmFlOTQzNDcyMjFhM2NlN2MuLjlmZjFmNjMyOTA1 ZDA5YmEyMTBiYzAwNjllMzBiN2Y1N2IyMmYzOGEgMTAwNjQ0Ci0tLSBhL1dlYktpdDIvVUlQcm9j ZXNzL1BsdWdpbnMvUGx1Z2luSW5mb1N0b3JlLmgKKysrIGIvV2ViS2l0Mi9VSVByb2Nlc3MvUGx1 Z2lucy9QbHVnaW5JbmZvU3RvcmUuaApAQCAtMzgsNyArMzgsNyBAQCBjbGFzcyBQbHVnaW5JbmZv U3RvcmUgewogcHVibGljOgogICAgIFBsdWdpbkluZm9TdG9yZSgpOwogCi0gICAgdm9pZCBzZXRB ZGRpdGlvbmFsUGx1Z2luRGlyZWN0b3JpZXMoY29uc3QgVmVjdG9yPFdlYkNvcmU6OlN0cmluZz4m KTsKKyAgICB2b2lkIHNldEFkZGl0aW9uYWxQbHVnaW5zRGlyZWN0b3JpZXMoY29uc3QgVmVjdG9y PFdlYkNvcmU6OlN0cmluZz4mKTsKIAogICAgIHZvaWQgcmVmcmVzaCgpOwogICAgIHZvaWQgZ2V0 UGx1Z2lucyhWZWN0b3I8V2ViQ29yZTo6UGx1Z2luSW5mbz4mIHBsdWdpbnMpOwpAQCAtNjksMTIg KzY5LDEyIEBAIHByaXZhdGU6CiAgICAgdm9pZCBsb2FkUGx1Z2luKGNvbnN0IFdlYkNvcmU6OlN0 cmluZyYgcGx1Z2luUGF0aCk7CiAgICAgCiAgICAgLy8gUGxhdGZvcm0gc3BlY2lmaWMgbWVtYmVy IGZ1bmN0aW9ucy4KLSAgICBzdGF0aWMgVmVjdG9yPFdlYkNvcmU6OlN0cmluZz4gcGx1Z2luRGly ZWN0b3JpZXMoKTsKKyAgICBzdGF0aWMgVmVjdG9yPFdlYkNvcmU6OlN0cmluZz4gcGx1Z2luc0Rp cmVjdG9yaWVzKCk7CiAgICAgc3RhdGljIFZlY3RvcjxXZWJDb3JlOjpTdHJpbmc+IHBsdWdpblBh dGhzSW5EaXJlY3RvcnkoY29uc3QgV2ViQ29yZTo6U3RyaW5nJiBkaXJlY3RvcnkpOwogICAgIHN0 YXRpYyBib29sIGdldFBsdWdpbkluZm8oY29uc3QgV2ViQ29yZTo6U3RyaW5nJiBwbHVnaW5QYXRo LCBQbHVnaW4mIHBsdWdpbik7CiAgICAgc3RhdGljIGJvb2wgc2hvdWxkVXNlUGx1Z2luKGNvbnN0 IFBsdWdpbiYgcGx1Z2luLCBjb25zdCBWZWN0b3I8UGx1Z2luPiYgbG9hZGVkUGx1Z2lucyk7CiAg ICAgCi0gICAgVmVjdG9yPFdlYkNvcmU6OlN0cmluZz4gbV9hZGRpdGlvbmFsUGx1Z2luRGlyZWN0 b3JpZXM7CisgICAgVmVjdG9yPFdlYkNvcmU6OlN0cmluZz4gbV9hZGRpdGlvbmFsUGx1Z2luc0Rp cmVjdG9yaWVzOwogICAgIFZlY3RvcjxQbHVnaW4+IG1fcGx1Z2luczsKICAgICBib29sIG1fcGx1 Z2luTGlzdElzVXBUb0RhdGU7CiB9OwpkaWZmIC0tZ2l0IGEvV2ViS2l0Mi9VSVByb2Nlc3MvUGx1 Z2lucy9tYWMvUGx1Z2luSW5mb1N0b3JlTWFjLm1tIGIvV2ViS2l0Mi9VSVByb2Nlc3MvUGx1Z2lu cy9tYWMvUGx1Z2luSW5mb1N0b3JlTWFjLm1tCmluZGV4IDg4M2M1MjRhOWYxZTk2MzhjYmM4MDA2 OGU3YmQ3Zjk0NmJmM2YzYzQuLjMxMTAxMjRhMjRiMjU5YWNiZDI1ZGY4NjM5ZTg3ODVlMGJjZTYw YjcgMTAwNjQ0Ci0tLSBhL1dlYktpdDIvVUlQcm9jZXNzL1BsdWdpbnMvbWFjL1BsdWdpbkluZm9T dG9yZU1hYy5tbQorKysgYi9XZWJLaXQyL1VJUHJvY2Vzcy9QbHVnaW5zL21hYy9QbHVnaW5JbmZv U3RvcmVNYWMubW0KQEAgLTMzLDE0ICszMywxNCBAQCB1c2luZyBuYW1lc3BhY2UgV2ViQ29yZTsK IAogbmFtZXNwYWNlIFdlYktpdCB7CiAKLVZlY3RvcjxTdHJpbmc+IFBsdWdpbkluZm9TdG9yZTo6 cGx1Z2luRGlyZWN0b3JpZXMoKQorVmVjdG9yPFN0cmluZz4gUGx1Z2luSW5mb1N0b3JlOjpwbHVn aW5zRGlyZWN0b3JpZXMoKQogewotICAgIFZlY3RvcjxTdHJpbmc+IHBsdWdpbkRpcmVjdG9yaWVz OworICAgIFZlY3RvcjxTdHJpbmc+IHBsdWdpbnNEaXJlY3RvcmllczsKIAotICAgIHBsdWdpbkRp cmVjdG9yaWVzLmFwcGVuZChbTlNIb21lRGlyZWN0b3J5KCkgc3RyaW5nQnlBcHBlbmRpbmdQYXRo Q29tcG9uZW50OkAiTGlicmFyeS9JbnRlcm5ldCBQbHVnLUlucyJdKTsKLSAgICBwbHVnaW5EaXJl Y3Rvcmllcy5hcHBlbmQoIi9MaWJyYXJ5L0ludGVybmV0IFBsdWctSW5zIik7CisgICAgcGx1Z2lu c0RpcmVjdG9yaWVzLmFwcGVuZChbTlNIb21lRGlyZWN0b3J5KCkgc3RyaW5nQnlBcHBlbmRpbmdQ YXRoQ29tcG9uZW50OkAiTGlicmFyeS9JbnRlcm5ldCBQbHVnLUlucyJdKTsKKyAgICBwbHVnaW5z RGlyZWN0b3JpZXMuYXBwZW5kKCIvTGlicmFyeS9JbnRlcm5ldCBQbHVnLUlucyIpOwogICAgIAot ICAgIHJldHVybiBwbHVnaW5EaXJlY3RvcmllczsKKyAgICByZXR1cm4gcGx1Z2luc0RpcmVjdG9y aWVzOwogfQogCiAvLyBGSVhNRTogT25jZSB0aGUgVUkgcHJvY2VzcyBrbm93cyB0aGUgZGlmZmVy ZW5jZSBiZXR3ZWVuIHRoZSBtYWluIHRocmVhZCBhbmQgdGhlIHdlYiB0aHJlYWQgd2UgY2FuIGRy b3AgdGhpcyBhbmQganVzdCB1c2UKZGlmZiAtLWdpdCBhL1dlYktpdDIvVUlQcm9jZXNzL1BsdWdp bnMvcXQvUGx1Z2luSW5mb1N0b3JlUXQuY3BwIGIvV2ViS2l0Mi9VSVByb2Nlc3MvUGx1Z2lucy9x dC9QbHVnaW5JbmZvU3RvcmVRdC5jcHAKaW5kZXggNjJkNWU3ODdhMGY5MzVkNTJhZWYyOTNiYzNi ZDJmMWYzZjk3YjJmZi4uMmIxMDEyM2QwYmE3MDJiZjI0YTE4NjgxMTBmM2ZhZDc3MDA5ZmMzNSAx MDA2NDQKLS0tIGEvV2ViS2l0Mi9VSVByb2Nlc3MvUGx1Z2lucy9xdC9QbHVnaW5JbmZvU3RvcmVR dC5jcHAKKysrIGIvV2ViS2l0Mi9VSVByb2Nlc3MvUGx1Z2lucy9xdC9QbHVnaW5JbmZvU3RvcmVR dC5jcHAKQEAgLTMxLDcgKzMxLDcgQEAgdXNpbmcgbmFtZXNwYWNlIFdlYkNvcmU7CiAKIG5hbWVz cGFjZSBXZWJLaXQgewogCi1WZWN0b3I8U3RyaW5nPiBQbHVnaW5JbmZvU3RvcmU6OnBsdWdpbkRp cmVjdG9yaWVzKCkKK1ZlY3RvcjxTdHJpbmc+IFBsdWdpbkluZm9TdG9yZTo6cGx1Z2luc0RpcmVj dG9yaWVzKCkKIHsKICAgICBub3RJbXBsZW1lbnRlZCgpOwogICAgIHJldHVybiBWZWN0b3I8U3Ry aW5nPigpOwpkaWZmIC0tZ2l0IGEvV2ViS2l0Mi9VSVByb2Nlc3MvUGx1Z2lucy93aW4vUGx1Z2lu SW5mb1N0b3JlV2luLmNwcCBiL1dlYktpdDIvVUlQcm9jZXNzL1BsdWdpbnMvd2luL1BsdWdpbklu Zm9TdG9yZVdpbi5jcHAKaW5kZXggNjJkNWU3ODdhMGY5MzVkNTJhZWYyOTNiYzNiZDJmMWYzZjk3 YjJmZi4uMmIxMDEyM2QwYmE3MDJiZjI0YTE4NjgxMTBmM2ZhZDc3MDA5ZmMzNSAxMDA2NDQKLS0t IGEvV2ViS2l0Mi9VSVByb2Nlc3MvUGx1Z2lucy93aW4vUGx1Z2luSW5mb1N0b3JlV2luLmNwcAor KysgYi9XZWJLaXQyL1VJUHJvY2Vzcy9QbHVnaW5zL3dpbi9QbHVnaW5JbmZvU3RvcmVXaW4uY3Bw CkBAIC0zMSw3ICszMSw3IEBAIHVzaW5nIG5hbWVzcGFjZSBXZWJDb3JlOwogCiBuYW1lc3BhY2Ug V2ViS2l0IHsKIAotVmVjdG9yPFN0cmluZz4gUGx1Z2luSW5mb1N0b3JlOjpwbHVnaW5EaXJlY3Rv cmllcygpCitWZWN0b3I8U3RyaW5nPiBQbHVnaW5JbmZvU3RvcmU6OnBsdWdpbnNEaXJlY3Rvcmll cygpCiB7CiAgICAgbm90SW1wbGVtZW50ZWQoKTsKICAgICByZXR1cm4gVmVjdG9yPFN0cmluZz4o KTsKZGlmZiAtLWdpdCBhL1dlYktpdDIvVUlQcm9jZXNzL1dlYkNvbnRleHQuY3BwIGIvV2ViS2l0 Mi9VSVByb2Nlc3MvV2ViQ29udGV4dC5jcHAKaW5kZXggMTZjN2ExZmJhMjI3NzgyMDEzNTVlMDQ1 ZGM2ZjAxZGI0NWMxNjI0OS4uY2Q1MjZiNTJjOTY3YWRjYzQ4ODdhNDRmOTBmZWQ0ZDdhY2QyMzlk ZiAxMDA2NDQKLS0tIGEvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViQ29udGV4dC5jcHAKKysrIGIvV2Vi S2l0Mi9VSVByb2Nlc3MvV2ViQ29udGV4dC5jcHAKQEAgLTIxOCwxMiArMjE4LDEyIEBAIHZvaWQg V2ViQ29udGV4dDo6Z2V0U3RhdGlzdGljcyhXS0NvbnRleHRTdGF0aXN0aWNzKiBzdGF0aXN0aWNz KQogICAgICAgICAoKml0KS0+Z2V0U3RhdGlzdGljcyhzdGF0aXN0aWNzKTsKIH0KIAotdm9pZCBX ZWJDb250ZXh0OjpzZXRBZGRpdGlvbmFsUGx1Z2luRGlyZWN0b3J5KGNvbnN0IFdlYkNvcmU6OlN0 cmluZyYgZGlyZWN0b3J5KQordm9pZCBXZWJDb250ZXh0OjpzZXRBZGRpdGlvbmFsUGx1Z2luc0Rp cmVjdG9yeShjb25zdCBXZWJDb3JlOjpTdHJpbmcmIGRpcmVjdG9yeSkKIHsKICAgICBWZWN0b3I8 U3RyaW5nPiBkaXJlY3RvcmllczsKICAgICBkaXJlY3Rvcmllcy5hcHBlbmQoZGlyZWN0b3J5KTsK IAotICAgIG1fcGx1Z2luSW5mb1N0b3JlLnNldEFkZGl0aW9uYWxQbHVnaW5EaXJlY3Rvcmllcyhk aXJlY3Rvcmllcyk7CisgICAgbV9wbHVnaW5JbmZvU3RvcmUuc2V0QWRkaXRpb25hbFBsdWdpbnNE aXJlY3RvcmllcyhkaXJlY3Rvcmllcyk7CiB9CiAKIHZvaWQgV2ViQ29udGV4dDo6cmVnaXN0ZXJV UkxTY2hlbWVBc0VtcHR5RG9jdW1lbnQoY29uc3QgU3RyaW5nJiB1cmxTY2hlbWUpCmRpZmYgLS1n aXQgYS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJDb250ZXh0LmggYi9XZWJLaXQyL1VJUHJvY2Vzcy9X ZWJDb250ZXh0LmgKaW5kZXggYzkwODlmNWE5MDVhNWEzYTJkMjgxZGJkMzY2MjA5OTI4ZGJjZTRi OC4uMGM2N2Q3MzAyNDA0OTQzOTlmZGZhZTNmNzM0NGQ4MDNiYmU4NjBkZCAxMDA2NDQKLS0tIGEv V2ViS2l0Mi9VSVByb2Nlc3MvV2ViQ29udGV4dC5oCisrKyBiL1dlYktpdDIvVUlQcm9jZXNzL1dl YkNvbnRleHQuaApAQCAtODksNyArODksNyBAQCBwdWJsaWM6CiAgICAgdm9pZCBwb3B1bGF0ZVZp c2l0ZWRMaW5rcygpOwogICAgIAogICAgIHZvaWQgZ2V0U3RhdGlzdGljcyhXS0NvbnRleHRTdGF0 aXN0aWNzKiBzdGF0aXN0aWNzKTsKLSAgICB2b2lkIHNldEFkZGl0aW9uYWxQbHVnaW5EaXJlY3Rv cnkoY29uc3QgV2ViQ29yZTo6U3RyaW5nJik7CisgICAgdm9pZCBzZXRBZGRpdGlvbmFsUGx1Z2lu c0RpcmVjdG9yeShjb25zdCBXZWJDb3JlOjpTdHJpbmcmKTsKIAogICAgIFBsdWdpbkluZm9TdG9y ZSogcGx1Z2luSW5mb1N0b3JlKCkgeyByZXR1cm4gJm1fcGx1Z2luSW5mb1N0b3JlOyB9CiAgICAg V2ViQ29yZTo6U3RyaW5nIGFwcGxpY2F0aW9uQ2FjaGVEaXJlY3RvcnkoKTsKZGlmZiAtLWdpdCBh L1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxvZwppbmRleCAyZWM2 NzE4ZjdmNzlmNzEzMmFjNGIzZGFkM2Y5N2E4YmEwZmI3MmJkLi5iNDRkNDlhMTcwZTIyMDVhYWQ3 YmU4YjdlNWVjOGQyZDRhMTRhMDk4IDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VMb2cK KysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMTggQEAKIDIwMTAtMDctMjkg IEFkYW0gUm9iZW4gIDxhcm9iZW5AYXBwbGUuY29tPgogCisgICAgICAgIEFsd2F5cyBzYXkgInBs dWdpbnMgZGlyZWN0b3J5IiB3aGVuIHJlZmVycmluZyB0byBhIGRpcmVjdG9yeQorICAgICAgICBj b250YWluaW5nIG9uZSBvciBtb3JlIHBsdWdpbnMKKworICAgICAgICBGaXhlcyA8aHR0cDovL3dl YmtpdC5vcmcvYi80MzE5Nz4gV2ViS2l0MiBvZnRlbiBzYXlzICJwbHVnaW4KKyAgICAgICAgZGly ZWN0b3J5IiB3aGVuIGl0IG1lYW5zICJwbHVnaW5zIGRpcmVjdG9yeSIKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFdlYktpdFRlc3RSdW5uZXIvVGVz dENvbnRyb2xsZXIuY3BwOgorICAgICAgICAoV1RSOjpUZXN0Q29udHJvbGxlcjo6aW5pdGlhbGl6 ZSk6IFVwZGF0ZWQgZm9yIHJlbmFtZS4KKworMjAxMC0wNy0yOSAgQWRhbSBSb2JlbiAgPGFyb2Jl bkBhcHBsZS5jb20+CisKICAgICAgICAgQWx3YXlzIHNheSAiZGlyZWN0b3J5IiB3aGVuIHJlZmVy cmluZyB0byBhIHBsdWdpbiBkaXJlY3RvcnkKIAogICAgICAgICBGaXhlcyA8aHR0cDovL3dlYmtp dC5vcmcvYi80MzE5NT4gV2ViS2l0MiBvZnRlbiBzYXlzICJwbHVnaW4gcGF0aCIKZGlmZiAtLWdp dCBhL1dlYktpdFRvb2xzL1dlYktpdFRlc3RSdW5uZXIvVGVzdENvbnRyb2xsZXIuY3BwIGIvV2Vi S2l0VG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9UZXN0Q29udHJvbGxlci5jcHAKaW5kZXggY2UxYjQ3 NGE0MzAwNTAxMmFkNTk2YTFhMzRkYjc4ODExYWNhMDA5OS4uZTNhNmI5MDYxZDJlZWQ3NDA4NGMy MGU1NDRlMGQ3OTE5NWQzZDZmNSAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvV2ViS2l0VGVzdFJ1 bm5lci9UZXN0Q29udHJvbGxlci5jcHAKKysrIGIvV2ViS2l0VG9vbHMvV2ViS2l0VGVzdFJ1bm5l ci9UZXN0Q29udHJvbGxlci5jcHAKQEAgLTg2LDcgKzg2LDcgQEAgdm9pZCBUZXN0Q29udHJvbGxl cjo6aW5pdGlhbGl6ZShpbnQgYXJnYywgY29uc3QgY2hhciogYXJndltdKQogICAgIH07CiAgICAg V0tDb250ZXh0U2V0SW5qZWN0ZWRCdW5kbGVDbGllbnQobV9jb250ZXh0LmdldCgpLCAmaW5qZWN0 ZWRCdW5kbGVQYXRoQ2xpZW50KTsKIAotICAgIF9XS0NvbnRleHRTZXRBZGRpdGlvbmFsUGx1Z2lu RGlyZWN0b3J5KG1fY29udGV4dC5nZXQoKSwgdGVzdFBsdWdpbkRpcmVjdG9yeSgpKTsKKyAgICBf V0tDb250ZXh0U2V0QWRkaXRpb25hbFBsdWdpbnNEaXJlY3RvcnkobV9jb250ZXh0LmdldCgpLCB0 ZXN0UGx1Z2luRGlyZWN0b3J5KCkpOwogICAgIAogICAgIG1fcGFnZU5hbWVzcGFjZS5hZG9wdChX S1BhZ2VOYW1lc3BhY2VDcmVhdGUobV9jb250ZXh0LmdldCgpKSk7CiAgICAgbV9tYWluV2ViVmll dyA9IG5ldyBQbGF0Zm9ybVdlYlZpZXcobV9wYWdlTmFtZXNwYWNlLmdldCgpKTsK