60027 2011-05-03 08:14:09 -0700 webkit-patch post-commits HEAD^.. throws an exception 2011-05-03 15:20:50 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) PC Windows 7 RESOLVED FIXED P2 Normal --- 1 aroben eric abarth commit-queue ddkilzer eric oldest_to_newest 397086 0 aroben 2011-05-03 08:14:09 -0700 webkit-patch post-commits HEAD^.. throws an exception: [Adam Roben@macpro8 OpenSource]\$ webkit-patch post-commits HEAD^.. Traceback (most recent call last): File "/home/Adam Roben/dev/WebKit/OpenSource/Tools/Scripts/webkit-patch", line 71, in <module> main() File "/home/Adam Roben/dev/WebKit/OpenSource/Tools/Scripts/webkit-patch", line 66, in main WebKitPatch(__file__).main() File "/home/Adam Roben/dev/WebKit/OpenSource/Tools/Scripts/webkitpy/tool/multicommandtool.py", line 308, in main result = command.check_arguments_and_execute(options, args, self) File "/home/Adam Roben/dev/WebKit/OpenSource/Tools/Scripts/webkitpy/tool/multicommandtool.py", line 117, in check_arguments_and_execute return self.execute(options, args, tool) or 0 File "/home/Adam Roben/dev/WebKit/OpenSource/Tools/Scripts/webkitpy/tool/commands/upload.py", line 326, in execute commit_message = tool.scm().commit_message_for_local_commit(commit_id) File "/home/Adam Roben/dev/WebKit/OpenSource/Tools/Scripts/webkitpy/common/checkout/scm/git.py", line 442, in commit_message_for_local_commit return CommitMessage(commit_lines[first_line_after_headers:]) NameError: global name 'CommitMessage' is not defined I don't know when this started happening. 397087 1 92076 aroben 2011-05-03 08:17:17 -0700 Created attachment 92076 Patch 397091 2 92076 aroben 2011-05-03 08:17:59 -0700 Comment on attachment 92076 Patch This is the patch I was trying to upload. 397116 3 eric 2011-05-03 09:17:49 -0700 We need to import CommitMessage into git.py. Sorry. :( 397131 4 92085 eric 2011-05-03 09:41:54 -0700 Created attachment 92085 Patch 397143 5 92085 aroben 2011-05-03 09:57:57 -0700 Comment on attachment 92085 Patch Any way to write a test? 397159 6 eric 2011-05-03 10:19:38 -0700 There certainly are. I just wrote this quickly on my train ride to work. The scm tests take like 30m to run... (I'm working on fixing that), so I didn't bother. 397180 7 abarth 2011-05-03 10:46:59 -0700 Eric, do you have a plan to fix all these regressions? There have been a handful of them at this point. 397197 8 eric 2011-05-03 11:02:10 -0700 Yes, I fixed this one this morning. I went looking for other bugs on the train but didn't find them. I think we have one other on file? Do you know of more? I'm certainly happy to fix these imports and add associated unit tests so we don't hit them again. Much of this pain is due to the scm.py tests being too slow to run (and thus they've slowly gotten worse and worse coverage over time and fail to catch these sorts of things). 397203 9 abarth 2011-05-03 11:14:08 -0700 https://bugs.webkit.org/show_bug.cgi?id=59980 for example. Lack of testing and slowness of testing is certainly one reason you caused these regressions. However, it would be useful to read all the code carefully to make sure you're importing everything that you need. Otherwise, we'll get a long tail of these sorts of bug reports. 397245 10 eric 2011-05-03 12:06:05 -0700 (In reply to comment #9) > https://bugs.webkit.org/show_bug.cgi?id=59980 for example. > > Lack of testing and slowness of testing is certainly one reason you caused these regressions. However, it would be useful to read all the code carefully to make sure you're importing everything that you need. Otherwise, we'll get a long tail of these sorts of bug reports. My apologies for the regressions. 397446 11 92085 commit-queue 2011-05-03 15:20:44 -0700 Comment on attachment 92085 Patch Clearing flags on attachment: 92085 Committed r85672: <http://trac.webkit.org/changeset/85672> 397448 12 commit-queue 2011-05-03 15:20:50 -0700 All reviewed patches have been landed. Closing bug. 92076 2011-05-03 08:17:17 -0700 2011-05-03 09:41:44 -0700 Patch 0001-Fix-most-strict-PassOwnPtr-violations-on-Windows.patch text/plain 18706 aroben RnJvbSBkMjdhNDlkNTZlOGZmOTU3ZDZlOTRkODgyYTI5YWQxYjMzY2EyNDNlIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBZGFtIFJvYmVuIDxhcm9iZW5AYXBwbGUuY29tPgpEYXRlOiBU dWUsIDMgTWF5IDIwMTEgMTE6MTA6MDUgLTA0MDAKU3ViamVjdDogW1BBVENIXSBGaXggbW9zdCBz dHJpY3QgUGFzc093blB0ciB2aW9sYXRpb25zIG9uIFdpbmRvd3MKCkZpeGVzIDxodHRwOi8vd2Vi a2l0Lm9yZy9iLzYwMDI1PiBXaW5kb3dzIHNob3VsZCAoYWxtb3N0KSBidWlsZCB3aXRoIHN0cmlj dCBQYXNzT3duUHRyCmVuYWJsZWQKClJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgoKU291cmNl L1dlYkNvcmU6CgoqIGxvYWRlci9FbXB0eUNsaWVudHMuaDoKKiBwbGF0Zm9ybS9HZW9sb2NhdGlv blNlcnZpY2UuY3BwOgoqIHBsYXRmb3JtL2dyYXBoaWNzL3dpbi9NZWRpYVBsYXllclByaXZhdGVR dWlja1RpbWVWaXN1YWxDb250ZXh0LmNwcDoKKiBwbGF0Zm9ybS9ncmFwaGljcy93aW4vTWVkaWFQ bGF5ZXJQcml2YXRlUXVpY2tUaW1lV2luLmNwcDoKKiBwbGF0Zm9ybS9tb2NrL0dlb2xvY2F0aW9u U2VydmljZU1vY2suY3BwOgoqIHJlbmRlcmluZy9SZW5kZXJUaGVtZS5jcHA6CiogcmVuZGVyaW5n L1JlbmRlclRoZW1lU2FmYXJpLmNwcDoKClNvdXJjZS9XZWJLaXQvd2luOgoKKiBXZWJDb3JlU3Vw cG9ydC9XZWJJbnNwZWN0b3JDbGllbnQuaDogTWFkZSB0aGUgZGVzdHJ1Y3RvciBwdWJsaWMsIHdo aWNoIGlzIHJlcXVpcmVkIG5vdwp0aGF0IHRoaXMgdHlwZSBpcyBwdXQgaW50byBhIFBhc3NPd25Q dHIuIChQcmV2aW91c2x5LCBvbmx5CldlYkNvcmU6Okluc3BlY3RvckZyb250ZW5kQ2xpZW50TG9j YWwgd2FzIHB1dCBpbnRvIGEgW1Bhc3NdT3duUHRyLikKCiogRnVsbHNjcmVlblZpZGVvQ29udHJv bGxlci5jcHA6CiogV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQuY3BwOgoqIFdl YkNvcmVTdXBwb3J0L1dlYkluc3BlY3RvckNsaWVudC5jcHA6CiogV2ViSGlzdG9yeS5jcHA6Ciog V2ViSGlzdG9yeUl0ZW0uY3BwOgoqIFdlYlZpZXcuY3BwOgoKU291cmNlL1dlYktpdDI6CgoqIFBs YXRmb3JtL0NvcmVJUEMvd2luL0Nvbm5lY3Rpb25XaW4uY3BwOgooQ29yZUlQQzo6Q29ubmVjdGlv bjo6d3JpdGVFdmVudEhhbmRsZXIpOiBVc2UgbnVsbHB0ci4KClRvb2xzOgoKKiBXZWJLaXRBUElU ZXN0L1Rlc3QuaDogVXNlIGFkb3B0UHRyLgotLS0KIFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyAg ICAgICAgICAgICAgICAgICAgICAgICAgIHwgICAxNyArKysrKysrKysrKysrKysrKwogU291cmNl L1dlYkNvcmUvbG9hZGVyL0VtcHR5Q2xpZW50cy5oICAgICAgICAgICAgICAgfCAgICAyICstCiBT b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9HZW9sb2NhdGlvblNlcnZpY2UuY3BwICAgICB8ICAgIDIg Ky0KIC4uLi9NZWRpYVBsYXllclByaXZhdGVRdWlja1RpbWVWaXN1YWxDb250ZXh0LmNwcCAgIHwg ICAgNCArKy0tCiAuLi4vd2luL01lZGlhUGxheWVyUHJpdmF0ZVF1aWNrVGltZVdpbi5jcHAgICAg ICAgICB8ICAgIDIgKy0KIC4uLi9wbGF0Zm9ybS9tb2NrL0dlb2xvY2F0aW9uU2VydmljZU1vY2su Y3BwICAgICAgIHwgICAgMiArLQogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1l LmNwcCAgICAgICAgICAgfCAgICA0ICsrLS0KIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJUaGVtZVNhZmFyaS5jcHAgICAgIHwgICAgMiArLQogU291cmNlL1dlYktpdC93aW4vQ2hhbmdl TG9nICAgICAgICAgICAgICAgICAgICAgICAgfCAgIDIwICsrKysrKysrKysrKysrKysrKysrCiBT b3VyY2UvV2ViS2l0L3dpbi9GdWxsc2NyZWVuVmlkZW9Db250cm9sbGVyLmNwcCAgICB8ICAgIDIg Ky0KIC4uLi93aW4vV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQuY3BwICAgIHwg ICAgMyArLS0KIC4uLi93aW4vV2ViQ29yZVN1cHBvcnQvV2ViSW5zcGVjdG9yQ2xpZW50LmNwcCAg ICAgIHwgICAgMyArLS0KIC4uLi9XZWJLaXQvd2luL1dlYkNvcmVTdXBwb3J0L1dlYkluc3BlY3Rv ckNsaWVudC5oIHwgICAgMyArLS0KIFNvdXJjZS9XZWJLaXQvd2luL1dlYkhpc3RvcnkuY3BwICAg ICAgICAgICAgICAgICAgIHwgICAgMiArLQogU291cmNlL1dlYktpdC93aW4vV2ViSGlzdG9yeUl0 ZW0uY3BwICAgICAgICAgICAgICAgfCAgICAyICstCiBTb3VyY2UvV2ViS2l0L3dpbi9XZWJWaWV3 LmNwcCAgICAgICAgICAgICAgICAgICAgICB8ICAgMTAgKysrKystLS0tLQogU291cmNlL1dlYktp dDIvQ2hhbmdlTG9nICAgICAgICAgICAgICAgICAgICAgICAgICAgfCAgIDEyICsrKysrKysrKysr KwogLi4uL1dlYktpdDIvUGxhdGZvcm0vQ29yZUlQQy93aW4vQ29ubmVjdGlvbldpbi5jcHAgfCAg ICAyICstCiBUb29scy9DaGFuZ2VMb2cgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICB8ICAgMTEgKysrKysrKysrKysKIFRvb2xzL1dlYktpdEFQSVRlc3QvVGVzdC5oICAgICAgICAg ICAgICAgICAgICAgICAgIHwgICAgMiArLQogMjAgZmlsZXMgY2hhbmdlZCwgODIgaW5zZXJ0aW9u cygrKSwgMjUgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IDhiYzlkNTQuLjEwZjc3NmYgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cKQEAgLTEsMyArMSwyMCBAQAorMjAxMS0wNS0wMyAgQWRhbSBSb2JlbiAgPGFyb2Jl bkBhcHBsZS5jb20+CisKKyAgICAgICAgRml4IG1vc3Qgc3RyaWN0IFBhc3NPd25QdHIgdmlvbGF0 aW9ucyBvbiBXaW5kb3dzCisKKyAgICAgICAgRml4ZXMgPGh0dHA6Ly93ZWJraXQub3JnL2IvNjAw MjU+IFdpbmRvd3Mgc2hvdWxkIChhbG1vc3QpIGJ1aWxkIHdpdGggc3RyaWN0IFBhc3NPd25QdHIK KyAgICAgICAgZW5hYmxlZAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgICogbG9hZGVyL0VtcHR5Q2xpZW50cy5oOgorICAgICAgICAqIHBsYXRmb3JtL0dl b2xvY2F0aW9uU2VydmljZS5jcHA6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3Mvd2luL01l ZGlhUGxheWVyUHJpdmF0ZVF1aWNrVGltZVZpc3VhbENvbnRleHQuY3BwOgorICAgICAgICAqIHBs YXRmb3JtL2dyYXBoaWNzL3dpbi9NZWRpYVBsYXllclByaXZhdGVRdWlja1RpbWVXaW4uY3BwOgor ICAgICAgICAqIHBsYXRmb3JtL21vY2svR2VvbG9jYXRpb25TZXJ2aWNlTW9jay5jcHA6CisgICAg ICAgICogcmVuZGVyaW5nL1JlbmRlclRoZW1lLmNwcDoKKyAgICAgICAgKiByZW5kZXJpbmcvUmVu ZGVyVGhlbWVTYWZhcmkuY3BwOgorCiAyMDExLTA1LTAyICBBZGFtIFJvYmVuICA8YXJvYmVuQGFw cGxlLmNvbT4KIAogICAgICAgICBUYWtlIGFkdmFudGFnZSBvZiBpbXBsaWNpdCBjb252ZXJzaW9u IGZyb20gbnVsbHB0cl90IHRvIFBhc3NPd25QdHIKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L2xvYWRlci9FbXB0eUNsaWVudHMuaCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9FbXB0eUNsaWVu dHMuaAppbmRleCAzY2I4MjZlLi5hMjNkNzViIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9s b2FkZXIvRW1wdHlDbGllbnRzLmgKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL0VtcHR5Q2xp ZW50cy5oCkBAIC01MzksNyArNTM5LDcgQEAgcHVibGljOgogICAgIHZpcnR1YWwgdm9pZCBjb250 ZXh0TWVudURlc3Ryb3llZCgpIHsgfQogCiAjaWYgVVNFKENST1NTX1BMQVRGT1JNX0NPTlRFWFRf TUVOVVMpCi0gICAgdmlydHVhbCBQYXNzT3duUHRyPENvbnRleHRNZW51PiBjdXN0b21pemVNZW51 KFBhc3NPd25QdHI8Q29udGV4dE1lbnU+KSB7IHJldHVybiAwOyB9CisgICAgdmlydHVhbCBQYXNz T3duUHRyPENvbnRleHRNZW51PiBjdXN0b21pemVNZW51KFBhc3NPd25QdHI8Q29udGV4dE1lbnU+ KSB7IHJldHVybiBudWxscHRyOyB9CiAjZWxzZQogICAgIHZpcnR1YWwgUGxhdGZvcm1NZW51RGVz Y3JpcHRpb24gZ2V0Q3VzdG9tTWVudUZyb21EZWZhdWx0SXRlbXMoQ29udGV4dE1lbnUqKSB7IHJl dHVybiAwOyB9CiAjZW5kaWYKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL0dl b2xvY2F0aW9uU2VydmljZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9HZW9sb2NhdGlv blNlcnZpY2UuY3BwCmluZGV4IGRjNWU0YTguLmY4NzkzYTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL0dlb2xvY2F0aW9uU2VydmljZS5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vR2VvbG9jYXRpb25TZXJ2aWNlLmNwcApAQCAtMzgsNyArMzgsNyBAQCBuYW1l c3BhY2UgV2ViQ29yZSB7CiAjaWYgIUVOQUJMRShHRU9MT0NBVElPTikgfHwgRU5BQkxFKENMSUVO VF9CQVNFRF9HRU9MT0NBVElPTikKIHN0YXRpYyBQYXNzT3duUHRyPEdlb2xvY2F0aW9uU2Vydmlj ZT4gY3JlYXRlR2VvbG9jYXRpb25TZXJ2aWNlTnVsbChHZW9sb2NhdGlvblNlcnZpY2VDbGllbnQq KQogewotICAgIHJldHVybiAwOworICAgIHJldHVybiBudWxscHRyOwogfQogCiBHZW9sb2NhdGlv blNlcnZpY2U6OkZhY3RvcnlGdW5jdGlvbiogR2VvbG9jYXRpb25TZXJ2aWNlOjpzX2ZhY3RvcnlG dW5jdGlvbiA9ICZjcmVhdGVHZW9sb2NhdGlvblNlcnZpY2VOdWxsOwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvd2luL01lZGlhUGxheWVyUHJpdmF0ZVF1aWNr VGltZVZpc3VhbENvbnRleHQuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv d2luL01lZGlhUGxheWVyUHJpdmF0ZVF1aWNrVGltZVZpc3VhbENvbnRleHQuY3BwCmluZGV4IDA3 YzMyM2EuLjkxM2FkMzYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL3dpbi9NZWRpYVBsYXllclByaXZhdGVRdWlja1RpbWVWaXN1YWxDb250ZXh0LmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy93aW4vTWVkaWFQbGF5ZXJQcml2YXRl UXVpY2tUaW1lVmlzdWFsQ29udGV4dC5jcHAKQEAgLTg4NSw3ICs4ODUsNyBAQCB2b2lkIE1lZGlh UGxheWVyUHJpdmF0ZVF1aWNrVGltZVZpc3VhbENvbnRleHQ6OnJldHJpZXZlQ3VycmVudEltYWdl KCkKICAgICAgICAgaWYgKCFidWZmZXIubG9ja0Jhc2VBZGRyZXNzKCkpIHsKICAgICAgICAgICAg IGlmIChyZXF1aXJlZERsbHNBdmFpbGFibGUoKSkgewogICAgICAgICAgICAgICAgIGlmICghbV9p bWFnZVF1ZXVlKSB7Ci0gICAgICAgICAgICAgICAgICAgIG1faW1hZ2VRdWV1ZSA9IG5ldyBXS0NB SW1hZ2VRdWV1ZShidWZmZXIud2lkdGgoKSwgYnVmZmVyLmhlaWdodCgpLCAzMCk7CisgICAgICAg ICAgICAgICAgICAgIG1faW1hZ2VRdWV1ZSA9IGFkb3B0UHRyKG5ldyBXS0NBSW1hZ2VRdWV1ZShi dWZmZXIud2lkdGgoKSwgYnVmZmVyLmhlaWdodCgpLCAzMCkpOwogICAgICAgICAgICAgICAgICAg ICBtX2ltYWdlUXVldWUtPnNldEZsYWdzKFdLQ0FJbWFnZVF1ZXVlOjpGaWxsLCBXS0NBSW1hZ2VR dWV1ZTo6RmlsbCk7CiAgICAgICAgICAgICAgICAgICAgIGxheWVyLT5zZXRDb250ZW50cyhtX2lt YWdlUXVldWUtPmdldCgpKTsKICAgICAgICAgICAgICAgICB9CkBAIC0xMjQzLDcgKzEyNDMsNyBA QCB2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZVF1aWNrVGltZVZpc3VhbENvbnRleHQ6OmRlc3Ryb3lM YXllckZvck1vdmllKCkKICAgICAgICAgbV90cmFuc2Zvcm1MYXllciA9IDA7CiAKICAgICBpZiAo bV9pbWFnZVF1ZXVlKQotICAgICAgICBtX2ltYWdlUXVldWUgPSAwOworICAgICAgICBtX2ltYWdl UXVldWUgPSBudWxscHRyOwogI2VuZGlmCiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL3dpbi9NZWRpYVBsYXllclByaXZhdGVRdWlja1RpbWVXaW4uY3Bw IGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvd2luL01lZGlhUGxheWVyUHJpdmF0 ZVF1aWNrVGltZVdpbi5jcHAKaW5kZXggNzRlYzAxNC4uZjI5Njk2ZCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvd2luL01lZGlhUGxheWVyUHJpdmF0ZVF1aWNr VGltZVdpbi5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvd2luL01l ZGlhUGxheWVyUHJpdmF0ZVF1aWNrVGltZVdpbi5jcHAKQEAgLTkxMiw3ICs5MTIsNyBAQCB2b2lk IE1lZGlhUGxheWVyUHJpdmF0ZTo6ZGVzdHJveUxheWVyRm9yTW92aWUoKQogI2lmIFVTRShBQ0NF TEVSQVRFRF9DT01QT1NJVElORykKICAgICBpZiAoIW1fcXRWaWRlb0xheWVyKQogICAgICAgICBy ZXR1cm47Ci0gICAgbV9xdFZpZGVvTGF5ZXIgPSAwOworICAgIG1fcXRWaWRlb0xheWVyID0gbnVs bHB0cjsKICNlbmRpZgogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9t b2NrL0dlb2xvY2F0aW9uU2VydmljZU1vY2suY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v bW9jay9HZW9sb2NhdGlvblNlcnZpY2VNb2NrLmNwcAppbmRleCAxZWYxNzZhLi42ZjUzNGRkIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tb2NrL0dlb2xvY2F0aW9uU2Vydmlj ZU1vY2suY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21vY2svR2VvbG9jYXRpb25T ZXJ2aWNlTW9jay5jcHAKQEAgLTQzLDcgKzQzLDcgQEAgUmVmUHRyPFBvc2l0aW9uRXJyb3I+KiBH ZW9sb2NhdGlvblNlcnZpY2VNb2NrOjpzX2xhc3RFcnJvcjsKIFBhc3NPd25QdHI8R2VvbG9jYXRp b25TZXJ2aWNlPiBHZW9sb2NhdGlvblNlcnZpY2VNb2NrOjpjcmVhdGUoR2VvbG9jYXRpb25TZXJ2 aWNlQ2xpZW50KiBjbGllbnQpCiB7CiAgICAgaW5pdFN0YXRpY3MoKTsKLSAgICByZXR1cm4gbmV3 IEdlb2xvY2F0aW9uU2VydmljZU1vY2soY2xpZW50KTsKKyAgICByZXR1cm4gYWRvcHRQdHIobmV3 IEdlb2xvY2F0aW9uU2VydmljZU1vY2soY2xpZW50KSk7CiB9CiAKIEdlb2xvY2F0aW9uU2Vydmlj ZU1vY2s6Okdlb2xvY2F0aW9uU2VydmljZU1vY2soR2VvbG9jYXRpb25TZXJ2aWNlQ2xpZW50KiBj bGllbnQpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWUu Y3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lLmNwcAppbmRleCA4Mzdj MTdlLi5mY2QyNjg4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy VGhlbWUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUaGVtZS5jcHAK QEAgLTg2NSw3ICs4NjUsNyBAQCB2b2lkIFJlbmRlclRoZW1lOjphZGp1c3RDaGVja2JveFN0eWxl KENTU1N0eWxlU2VsZWN0b3IqLCBSZW5kZXJTdHlsZSogc3R5bGUsIEVsZQogICAgIC8vIGZvciBu b3csIHdlIHdpbGwgbm90IGhvbm9yIGl0LgogICAgIHN0eWxlLT5yZXNldEJvcmRlcigpOwogCi0g ICAgc3R5bGUtPnNldEJveFNoYWRvdygwKTsKKyAgICBzdHlsZS0+c2V0Qm94U2hhZG93KG51bGxw dHIpOwogfQogCiB2b2lkIFJlbmRlclRoZW1lOjphZGp1c3RSYWRpb1N0eWxlKENTU1N0eWxlU2Vs ZWN0b3IqLCBSZW5kZXJTdHlsZSogc3R5bGUsIEVsZW1lbnQqKSBjb25zdApAQCAtODgyLDcgKzg4 Miw3IEBAIHZvaWQgUmVuZGVyVGhlbWU6OmFkanVzdFJhZGlvU3R5bGUoQ1NTU3R5bGVTZWxlY3Rv ciosIFJlbmRlclN0eWxlKiBzdHlsZSwgRWxlbWVuCiAgICAgLy8gZm9yIG5vdywgd2Ugd2lsbCBu b3QgaG9ub3IgaXQuCiAgICAgc3R5bGUtPnJlc2V0Qm9yZGVyKCk7CiAKLSAgICBzdHlsZS0+c2V0 Qm94U2hhZG93KDApOworICAgIHN0eWxlLT5zZXRCb3hTaGFkb3cobnVsbHB0cik7CiB9CiAKIHZv aWQgUmVuZGVyVGhlbWU6OmFkanVzdEJ1dHRvblN0eWxlKENTU1N0eWxlU2VsZWN0b3IqLCBSZW5k ZXJTdHlsZSogc3R5bGUsIEVsZW1lbnQqKSBjb25zdApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lU2FmYXJpLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJUaGVtZVNhZmFyaS5jcHAKaW5kZXggYTJmOWVkMS4uZTljYjQ2YSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lU2FmYXJpLmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWVTYWZhcmkuY3BwCkBAIC05ODks NyArOTg5LDcgQEAgYm9vbCBSZW5kZXJUaGVtZVNhZmFyaTo6cGFpbnRTbGlkZXJUcmFjayhSZW5k ZXJPYmplY3QqIG8sIGNvbnN0IFBhaW50SW5mbyYgcGFpbnQKIAogdm9pZCBSZW5kZXJUaGVtZVNh ZmFyaTo6YWRqdXN0U2xpZGVyVGh1bWJTdHlsZShDU1NTdHlsZVNlbGVjdG9yKiBzZWxlY3Rvciwg UmVuZGVyU3R5bGUqIHN0eWxlLCBFbGVtZW50KiBlKSBjb25zdCAKIHsgCi0gICAgc3R5bGUtPnNl dEJveFNoYWRvdygwKTsgCisgICAgc3R5bGUtPnNldEJveFNoYWRvdyhudWxscHRyKTsgCiB9IAog CiBjb25zdCBmbG9hdCB2ZXJ0aWNhbFNsaWRlckhlaWdodFBhZGRpbmcgPSAwLjFmOwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdC93aW4vQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC93aW4vQ2hh bmdlTG9nCmluZGV4IDI3ZmE3OTcuLmI4ZmQ0NjUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQv d2luL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L3dpbi9DaGFuZ2VMb2cKQEAgLTEsMyAr MSwyMyBAQAorMjAxMS0wNS0wMyAgQWRhbSBSb2JlbiAgPGFyb2JlbkBhcHBsZS5jb20+CisKKyAg ICAgICAgRml4IG1vc3Qgc3RyaWN0IFBhc3NPd25QdHIgdmlvbGF0aW9ucyBvbiBXaW5kb3dzCisK KyAgICAgICAgRml4ZXMgPGh0dHA6Ly93ZWJraXQub3JnL2IvNjAwMjU+IFdpbmRvd3Mgc2hvdWxk IChhbG1vc3QpIGJ1aWxkIHdpdGggc3RyaWN0IFBhc3NPd25QdHIKKyAgICAgICAgZW5hYmxlZAor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogV2ViQ29y ZVN1cHBvcnQvV2ViSW5zcGVjdG9yQ2xpZW50Lmg6IE1hZGUgdGhlIGRlc3RydWN0b3IgcHVibGlj LCB3aGljaCBpcyByZXF1aXJlZCBub3cKKyAgICAgICAgdGhhdCB0aGlzIHR5cGUgaXMgcHV0IGlu dG8gYSBQYXNzT3duUHRyLiAoUHJldmlvdXNseSwgb25seQorICAgICAgICBXZWJDb3JlOjpJbnNw ZWN0b3JGcm9udGVuZENsaWVudExvY2FsIHdhcyBwdXQgaW50byBhIFtQYXNzXU93blB0ci4pCisK KyAgICAgICAgKiBGdWxsc2NyZWVuVmlkZW9Db250cm9sbGVyLmNwcDoKKyAgICAgICAgKiBXZWJD b3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5jcHA6CisgICAgICAgICogV2ViQ29yZVN1 cHBvcnQvV2ViSW5zcGVjdG9yQ2xpZW50LmNwcDoKKyAgICAgICAgKiBXZWJIaXN0b3J5LmNwcDoK KyAgICAgICAgKiBXZWJIaXN0b3J5SXRlbS5jcHA6CisgICAgICAgICogV2ViVmlldy5jcHA6CisK IDIwMTEtMDUtMDEgIFNhbSBXZWluaWcgIDxzYW1Ad2Via2l0Lm9yZz4KIAogICAgICAgICBGaXgg d2luZG93cyBidWlsZC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvd2luL0Z1bGxzY3JlZW5W aWRlb0NvbnRyb2xsZXIuY3BwIGIvU291cmNlL1dlYktpdC93aW4vRnVsbHNjcmVlblZpZGVvQ29u dHJvbGxlci5jcHAKaW5kZXggMjM0OTMyZi4uMzcyMTcwOCAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdC93aW4vRnVsbHNjcmVlblZpZGVvQ29udHJvbGxlci5jcHAKKysrIGIvU291cmNlL1dlYktp dC93aW4vRnVsbHNjcmVlblZpZGVvQ29udHJvbGxlci5jcHAKQEAgLTI5OSw3ICsyOTksNyBAQCB2 b2lkIEZ1bGxzY3JlZW5WaWRlb0NvbnRyb2xsZXI6OmV4aXRGdWxsc2NyZWVuKCkKICAgICBTZXRX aW5kb3dMb25nUHRyKG1faHVkV2luZG93LCAwLCAwKTsKIAogICAgIGlmIChtX2Z1bGxzY3JlZW5X aW5kb3cpCi0gICAgICAgIG1fZnVsbHNjcmVlbldpbmRvdyA9IDA7CisgICAgICAgIG1fZnVsbHNj cmVlbldpbmRvdyA9IG51bGxwdHI7CiAKICAgICBBU1NFUlQoIUlzV2luZG93KG1faHVkV2luZG93 KSk7CiAgICAgbV9odWRXaW5kb3cgPSAwOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC93aW4v V2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQuY3BwIGIvU291cmNlL1dlYktpdC93 aW4vV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQuY3BwCmluZGV4IGNhNjFkMzAu LjZlMDg3YjkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvd2luL1dlYkNvcmVTdXBwb3J0L1dl YkZyYW1lTG9hZGVyQ2xpZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L3dpbi9XZWJDb3JlU3Vw cG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5jcHAKQEAgLTcxNyw4ICs3MTcsNyBAQCB2b2lkIFdl YkZyYW1lTG9hZGVyQ2xpZW50OjpzYXZlUGxhdGZvcm1EYXRhVG9DYWNoZWRGcmFtZShDYWNoZWRG cmFtZSogY2FjaGVkRnJhbQogCiAgICAgQVNTRVJUKGNvcmVGcmFtZS0+bG9hZGVyKCktPmRvY3Vt ZW50TG9hZGVyKCkgPT0gY2FjaGVkRnJhbWUtPmRvY3VtZW50TG9hZGVyKCkpOwogCi0gICAgV2Vi Q2FjaGVkRnJhbWVQbGF0Zm9ybURhdGEqIHdlYlBsYXRmb3JtRGF0YSA9IG5ldyBXZWJDYWNoZWRG cmFtZVBsYXRmb3JtRGF0YShzdGF0aWNfY2FzdDxJV2ViRGF0YVNvdXJjZSo+KGdldFdlYkRhdGFT b3VyY2UoY29yZUZyYW1lLT5sb2FkZXIoKS0+ZG9jdW1lbnRMb2FkZXIoKSkpKTsKLSAgICBjYWNo ZWRGcmFtZS0+c2V0Q2FjaGVkRnJhbWVQbGF0Zm9ybURhdGEod2ViUGxhdGZvcm1EYXRhKTsKKyAg ICBjYWNoZWRGcmFtZS0+c2V0Q2FjaGVkRnJhbWVQbGF0Zm9ybURhdGEoYWRvcHRQdHIobmV3IFdl YkNhY2hlZEZyYW1lUGxhdGZvcm1EYXRhKHN0YXRpY19jYXN0PElXZWJEYXRhU291cmNlKj4oZ2V0 V2ViRGF0YVNvdXJjZShjb3JlRnJhbWUtPmxvYWRlcigpLT5kb2N1bWVudExvYWRlcigpKSkpKSk7 CiAjZWxzZQogICAgIG5vdEltcGxlbWVudGVkKCk7CiAjZW5kaWYKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQvd2luL1dlYkNvcmVTdXBwb3J0L1dlYkluc3BlY3RvckNsaWVudC5jcHAgYi9Tb3Vy Y2UvV2ViS2l0L3dpbi9XZWJDb3JlU3VwcG9ydC9XZWJJbnNwZWN0b3JDbGllbnQuY3BwCmluZGV4 IGNkOGNlZTcuLjhmYzkxMGEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvd2luL1dlYkNvcmVT dXBwb3J0L1dlYkluc3BlY3RvckNsaWVudC5jcHAKKysrIGIvU291cmNlL1dlYktpdC93aW4vV2Vi Q29yZVN1cHBvcnQvV2ViSW5zcGVjdG9yQ2xpZW50LmNwcApAQCAtMTcxLDggKzE3MSw3IEBAIHZv aWQgV2ViSW5zcGVjdG9yQ2xpZW50OjpvcGVuSW5zcGVjdG9yRnJvbnRlbmQoSW5zcGVjdG9yQ29u dHJvbGxlciogaW5zcGVjdG9yQ29uCiAgICAgICAgIHJldHVybjsKIAogICAgIG1fZnJvbnRlbmRQ YWdlID0gY29yZShmcm9udGVuZFdlYlZpZXcuZ2V0KCkpOwotICAgIFdlYkluc3BlY3RvckZyb250 ZW5kQ2xpZW50KiBmcm9udGVuZENsaWVudCA9IG5ldyBXZWJJbnNwZWN0b3JGcm9udGVuZENsaWVu dChtX2luc3BlY3RlZFdlYlZpZXcsIG1faW5zcGVjdGVkV2ViVmlld0h3bmQsIGZyb250ZW5kSHdu ZCwgZnJvbnRlbmRXZWJWaWV3LCBmcm9udGVuZFdlYlZpZXdId25kLCB0aGlzLCBjcmVhdGVGcm9u dGVuZFNldHRpbmdzKCkpOwotICAgIG1fZnJvbnRlbmRQYWdlLT5pbnNwZWN0b3JDb250cm9sbGVy KCktPnNldEluc3BlY3RvckZyb250ZW5kQ2xpZW50KGZyb250ZW5kQ2xpZW50KTsKKyAgICBtX2Zy b250ZW5kUGFnZS0+aW5zcGVjdG9yQ29udHJvbGxlcigpLT5zZXRJbnNwZWN0b3JGcm9udGVuZENs aWVudChhZG9wdFB0cihuZXcgV2ViSW5zcGVjdG9yRnJvbnRlbmRDbGllbnQobV9pbnNwZWN0ZWRX ZWJWaWV3LCBtX2luc3BlY3RlZFdlYlZpZXdId25kLCBmcm9udGVuZEh3bmQsIGZyb250ZW5kV2Vi VmlldywgZnJvbnRlbmRXZWJWaWV3SHduZCwgdGhpcywgY3JlYXRlRnJvbnRlbmRTZXR0aW5ncygp KSkpOwogICAgIG1fZnJvbnRlbmRId25kID0gZnJvbnRlbmRId25kOwogfQogCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0L3dpbi9XZWJDb3JlU3VwcG9ydC9XZWJJbnNwZWN0b3JDbGllbnQuaCBi L1NvdXJjZS9XZWJLaXQvd2luL1dlYkNvcmVTdXBwb3J0L1dlYkluc3BlY3RvckNsaWVudC5oCmlu ZGV4IGU1ZGRiZDUuLjM2MzNkN2YgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvd2luL1dlYkNv cmVTdXBwb3J0L1dlYkluc3BlY3RvckNsaWVudC5oCisrKyBiL1NvdXJjZS9XZWJLaXQvd2luL1dl YkNvcmVTdXBwb3J0L1dlYkluc3BlY3RvckNsaWVudC5oCkBAIC05NSw2ICs5NSw3IEBAIHByaXZh dGU6CiBjbGFzcyBXZWJJbnNwZWN0b3JGcm9udGVuZENsaWVudCA6IHB1YmxpYyBXZWJDb3JlOjpJ bnNwZWN0b3JGcm9udGVuZENsaWVudExvY2FsLCBXZWJDb3JlOjpXaW5kb3dNZXNzYWdlTGlzdGVu ZXIgewogcHVibGljOgogICAgIFdlYkluc3BlY3RvckZyb250ZW5kQ2xpZW50KFdlYlZpZXcqIGlu c3BlY3RlZFdlYlZpZXcsIEhXTkQgaW5zcGVjdGVkV2ViVmlld0h3bmQsIEhXTkQgZnJvbnRlbmRI d25kLCBjb25zdCBDT01QdHI8V2ViVmlldz4mIGZyb3RuZW5kV2ViVmlldywgSFdORCBmcm9udGVu ZFdlYlZpZXdId25kLCBXZWJJbnNwZWN0b3JDbGllbnQqLCBXVEY6OlBhc3NPd25QdHI8U2V0dGlu Z3M+KTsKKyAgICB+V2ViSW5zcGVjdG9yRnJvbnRlbmRDbGllbnQoKTsKIAogICAgIHZpcnR1YWwg dm9pZCBmcm9udGVuZExvYWRlZCgpOwogICAgIApAQCAtMTE1LDggKzExNiw2IEBAIHB1YmxpYzoK ICAgICB2aXJ0dWFsIHZvaWQgbG9hZFNlc3Npb25TZXR0aW5nKGNvbnN0IFdURjo6U3RyaW5nJiBr ZXksIFdURjo6U3RyaW5nKiB2YWx1ZSk7CiAKIHByaXZhdGU6Ci0gICAgfldlYkluc3BlY3RvckZy b250ZW5kQ2xpZW50KCk7Ci0KICAgICB2b2lkIGNsb3NlV2luZG93V2l0aG91dE5vdGlmaWNhdGlv bnMoKTsKICAgICB2b2lkIHNob3dXaW5kb3dXaXRob3V0Tm90aWZpY2F0aW9ucygpOwogCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0L3dpbi9XZWJIaXN0b3J5LmNwcCBiL1NvdXJjZS9XZWJLaXQv d2luL1dlYkhpc3RvcnkuY3BwCmluZGV4IGVmZDY0OTQuLjY5ZGFiNWMgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQvd2luL1dlYkhpc3RvcnkuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvd2luL1dl Ykhpc3RvcnkuY3BwCkBAIC03MzgsNyArNzM4LDcgQEAgdm9pZCBXZWJIaXN0b3J5Ojp2aXNpdGVk VVJMKGNvbnN0IEtVUkwmIHVybCwgY29uc3QgU3RyaW5nJiB0aXRsZSwgY29uc3QgU3RyaW5nJgog ICAgICAgICBlbnRyeVByaXZhdGUtPnNldExhc3RWaXNpdFdhc0hUVFBOb25HZXQoIWVxdWFsSWdu b3JpbmdDYXNlKGh0dHBNZXRob2QsICJHRVQiKSAmJiB1cmwucHJvdG9jb2xJbkhUVFBGYW1pbHko KSk7CiAKICAgICBDT01QdHI8V2ViSGlzdG9yeUl0ZW0+IGl0ZW0oUXVlcnksIGVudHJ5KTsKLSAg ICBpdGVtLT5oaXN0b3J5SXRlbSgpLT5zZXRSZWRpcmVjdFVSTHMoMCk7CisgICAgaXRlbS0+aGlz dG9yeUl0ZW0oKS0+c2V0UmVkaXJlY3RVUkxzKG51bGxwdHIpOwogCiAgICAgQ09NUHRyPENGRGlj dGlvbmFyeVByb3BlcnR5QmFnPiB1c2VySW5mbyA9IGNyZWF0ZVVzZXJJbmZvRnJvbUhpc3RvcnlJ dGVtKAogICAgICAgICBnZXROb3RpZmljYXRpb25TdHJpbmcoa1dlYkhpc3RvcnlJdGVtc0FkZGVk Tm90aWZpY2F0aW9uKSwgZW50cnkpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC93aW4vV2Vi SGlzdG9yeUl0ZW0uY3BwIGIvU291cmNlL1dlYktpdC93aW4vV2ViSGlzdG9yeUl0ZW0uY3BwCmlu ZGV4IGY4YmEyZjEuLmQ5ZjlkZjggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvd2luL1dlYkhp c3RvcnlJdGVtLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L3dpbi9XZWJIaXN0b3J5SXRlbS5jcHAK QEAgLTE0Myw3ICsxNDMsNyBAQCBIUkVTVUxUIFNURE1FVEhPRENBTExUWVBFIFdlYkhpc3RvcnlJ dGVtOjppbml0RnJvbURpY3Rpb25hcnlSZXByZXNlbnRhdGlvbih2b2lkKgogICAgIE93blB0cjxW ZWN0b3I8U3RyaW5nPiA+IHJlZGlyZWN0VVJMc1ZlY3RvcjsKICAgICBpZiAoQ0ZBcnJheVJlZiBy ZWRpcmVjdFVSTHNSZWYgPSBzdGF0aWNfY2FzdDxDRkFycmF5UmVmPihDRkRpY3Rpb25hcnlHZXRW YWx1ZShkaWN0aW9uYXJ5UmVmLCByZWRpcmVjdFVSTHNLZXkpKSkgewogICAgICAgICBDRkluZGV4 IHNpemUgPSBDRkFycmF5R2V0Q291bnQocmVkaXJlY3RVUkxzUmVmKTsKLSAgICAgICAgcmVkaXJl Y3RVUkxzVmVjdG9yID0gUGFzc093blB0cjxWZWN0b3I8U3RyaW5nPiA+KG5ldyBWZWN0b3I8U3Ry aW5nPihzaXplKSk7CisgICAgICAgIHJlZGlyZWN0VVJMc1ZlY3RvciA9IGFkb3B0UHRyKG5ldyBW ZWN0b3I8U3RyaW5nPihzaXplKSk7CiAgICAgICAgIGZvciAoQ0ZJbmRleCBpID0gMDsgaSA8IHNp emU7ICsraSkKICAgICAgICAgICAgICgqcmVkaXJlY3RVUkxzVmVjdG9yKVtpXSA9IFN0cmluZyhz dGF0aWNfY2FzdDxDRlN0cmluZ1JlZj4oQ0ZBcnJheUdldFZhbHVlQXRJbmRleChyZWRpcmVjdFVS THNSZWYsIGkpKSk7CiAgICAgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC93aW4vV2ViVmll dy5jcHAgYi9Tb3VyY2UvV2ViS2l0L3dpbi9XZWJWaWV3LmNwcAppbmRleCAxNzUzMmZjLi4zYzBh Nzk2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L3dpbi9XZWJWaWV3LmNwcAorKysgYi9Tb3Vy Y2UvV2ViS2l0L3dpbi9XZWJWaWV3LmNwcApAQCAtNjEzMyw3ICs2MTMzLDcgQEAgdm9pZCBXZWJW aWV3OjplbnRlckZ1bGxzY3JlZW5Gb3JOb2RlKE5vZGUqIG5vZGUpCiAgICAgICAgIEFTU0VSVCgh bV9mdWxsU2NyZWVuVmlkZW9Db250cm9sbGVyKTsKICAgICB9CiAKLSAgICBtX2Z1bGxTY3JlZW5W aWRlb0NvbnRyb2xsZXIgPSBuZXcgRnVsbHNjcmVlblZpZGVvQ29udHJvbGxlcjsKKyAgICBtX2Z1 bGxTY3JlZW5WaWRlb0NvbnRyb2xsZXIgPSBhZG9wdFB0cihuZXcgRnVsbHNjcmVlblZpZGVvQ29u dHJvbGxlcik7CiAgICAgbV9mdWxsU2NyZWVuVmlkZW9Db250cm9sbGVyLT5zZXRNZWRpYUVsZW1l bnQodmlkZW9FbGVtZW50KTsKICAgICBtX2Z1bGxTY3JlZW5WaWRlb0NvbnRyb2xsZXItPmVudGVy RnVsbHNjcmVlbigpOwogI2VuZGlmCkBAIC02MTUyLDExICs2MTUyLDExIEBAIHN0YXRpYyBQYXNz T3duUHRyPFZlY3RvcjxTdHJpbmc+ID4gdG9TdHJpbmdWZWN0b3IodW5zaWduZWQgcGF0dGVybnND b3VudCwgQlNUUioKIHsKICAgICAvLyBDb252ZXJ0IHRoZSBwYXR0ZXJucyBpbnRvIGEgVmVjdG9y LgogICAgIGlmIChwYXR0ZXJuc0NvdW50ID09IDApCi0gICAgICAgIHJldHVybiAwOwotICAgIFZl Y3RvcjxTdHJpbmc+KiBwYXR0ZXJuc1ZlY3RvciA9IG5ldyBWZWN0b3I8U3RyaW5nPjsKKyAgICAg ICAgcmV0dXJuIG51bGxwdHI7CisgICAgT3duUHRyPFZlY3RvcjxTdHJpbmc+ID4gcGF0dGVybnNW ZWN0b3IgPSBhZG9wdFB0cihuZXcgVmVjdG9yPFN0cmluZz4pOwogICAgIGZvciAodW5zaWduZWQg aSA9IDA7IGkgPCBwYXR0ZXJuc0NvdW50OyArK2kpCiAgICAgICAgIHBhdHRlcm5zVmVjdG9yLT5h cHBlbmQodG9TdHJpbmcocGF0dGVybnNbaV0pKTsKLSAgICByZXR1cm4gcGF0dGVybnNWZWN0b3I7 CisgICAgcmV0dXJuIHBhdHRlcm5zVmVjdG9yLnJlbGVhc2UoKTsKIH0KIAogSFJFU1VMVCBXZWJW aWV3OjphZGRVc2VyU2NyaXB0VG9Hcm91cChCU1RSIGdyb3VwTmFtZSwgSVdlYlNjcmlwdFdvcmxk KiBpV29ybGQsIEJTVFIgc291cmNlLCBCU1RSIHVybCwgCkBAIC02NDI3LDcgKzY0MjcsNyBAQCB2 b2lkIFdlYlZpZXc6OnNldEFjY2VsZXJhdGVkQ29tcG9zaXRpbmcoYm9vbCBhY2NlbGVyYXRlZCkK ICAgICAgICAgbV9sYXllclRyZWVIb3N0LT5zZXRDbGllbnQoMCk7CiAgICAgICAgIG1fbGF5ZXJU cmVlSG9zdC0+c2V0V2luZG93KDApOwogICAgICAgICBtX2xheWVyVHJlZUhvc3QgPSAwOwotICAg ICAgICBtX2JhY2tpbmdMYXllciA9IDA7CisgICAgICAgIG1fYmFja2luZ0xheWVyID0gbnVsbHB0 cjsKICAgICAgICAgbV9pc0FjY2VsZXJhdGVkQ29tcG9zaXRpbmcgPSBmYWxzZTsKICAgICB9CiB9 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cKaW5kZXggZWFlZjA4Zi4uNGU1ZWQ3MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dDIvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1 IEBACisyMDExLTA1LTAzICBBZGFtIFJvYmVuICA8YXJvYmVuQGFwcGxlLmNvbT4KKworICAgICAg ICBGaXggbW9zdCBzdHJpY3QgUGFzc093blB0ciB2aW9sYXRpb25zIG9uIFdpbmRvd3MKKworICAg ICAgICBGaXhlcyA8aHR0cDovL3dlYmtpdC5vcmcvYi82MDAyNT4gV2luZG93cyBzaG91bGQgKGFs bW9zdCkgYnVpbGQgd2l0aCBzdHJpY3QgUGFzc093blB0cgorICAgICAgICBlbmFibGVkCisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBQbGF0Zm9ybS9D b3JlSVBDL3dpbi9Db25uZWN0aW9uV2luLmNwcDoKKyAgICAgICAgKENvcmVJUEM6OkNvbm5lY3Rp b246OndyaXRlRXZlbnRIYW5kbGVyKTogVXNlIG51bGxwdHIuCisKIDIwMTEtMDUtMDIgIEFkYW0g Um9iZW4gIDxhcm9iZW5AYXBwbGUuY29tPgogCiAgICAgICAgIFRha2UgYWR2YW50YWdlIG9mIGlt cGxpY2l0IGNvbnZlcnNpb24gZnJvbSBudWxscHRyX3QgdG8gUGFzc093blB0cgpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdDIvUGxhdGZvcm0vQ29yZUlQQy93aW4vQ29ubmVjdGlvbldpbi5jcHAg Yi9Tb3VyY2UvV2ViS2l0Mi9QbGF0Zm9ybS9Db3JlSVBDL3dpbi9Db25uZWN0aW9uV2luLmNwcApp bmRleCBhYjQ0NjU4Li5mNWI1OWU5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9QbGF0Zm9y bS9Db3JlSVBDL3dpbi9Db25uZWN0aW9uV2luLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9QbGF0 Zm9ybS9Db3JlSVBDL3dpbi9Db25uZWN0aW9uV2luLmNwcApAQCAtMjUxLDcgKzI1MSw3IEBAIHZv aWQgQ29ubmVjdGlvbjo6d3JpdGVFdmVudEhhbmRsZXIoKQogCiAgICAgLy8gVGhlIHBlbmRpbmcg d3JpdGUgaGFzIGZpbmlzaGVkLCBzbyB3ZSBhcmUgbm93IGRvbmUgd2l0aCBpdHMgYXJndW1lbnRz LiBDbGVhcmluZyB0aGlzIG1lbWJlcgogICAgIC8vIHdpbGwgYWxsb3cgdXMgdG8gc2VuZCBtZXNz YWdlcyBhZ2Fpbi4KLSAgICBtX3BlbmRpbmdXcml0ZUFyZ3VtZW50cyA9IDA7CisgICAgbV9wZW5k aW5nV3JpdGVBcmd1bWVudHMgPSBudWxscHRyOwogCiAgICAgLy8gTm93IHRoYXQgdGhlIHBlbmRp bmcgd3JpdGUgaGFzIGZpbmlzaGVkLCB3ZSBjYW4gdHJ5IHRvIHNlbmQgYSBuZXcgbWVzc2FnZS4K ICAgICBzZW5kT3V0Z29pbmdNZXNzYWdlcygpOwpkaWZmIC0tZ2l0IGEvVG9vbHMvQ2hhbmdlTG9n IGIvVG9vbHMvQ2hhbmdlTG9nCmluZGV4IDYyMjIxN2EuLjhiM2VkMWMgMTAwNjQ0Ci0tLSBhL1Rv b2xzL0NoYW5nZUxvZworKysgYi9Ub29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNCBAQAorMjAx MS0wNS0wMyAgQWRhbSBSb2JlbiAgPGFyb2JlbkBhcHBsZS5jb20+CisKKyAgICAgICAgRml4IG1v c3Qgc3RyaWN0IFBhc3NPd25QdHIgdmlvbGF0aW9ucyBvbiBXaW5kb3dzCisKKyAgICAgICAgRml4 ZXMgPGh0dHA6Ly93ZWJraXQub3JnL2IvNjAwMjU+IFdpbmRvd3Mgc2hvdWxkIChhbG1vc3QpIGJ1 aWxkIHdpdGggc3RyaWN0IFBhc3NPd25QdHIKKyAgICAgICAgZW5hYmxlZAorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogV2ViS2l0QVBJVGVzdC9UZXN0 Lmg6IFVzZSBhZG9wdFB0ci4KKwogMjAxMS0wNS0wMiAgQWRhbSBSb2JlbiAgPGFyb2JlbkBhcHBs ZS5jb20+CiAKICAgICAgICAgVGFrZSBhZHZhbnRhZ2Ugb2YgaW1wbGljaXQgbnVsbHB0cl90IC0+ IFBhc3NPd25QdHIgY29udmVyc2lvbgpkaWZmIC0tZ2l0IGEvVG9vbHMvV2ViS2l0QVBJVGVzdC9U ZXN0LmggYi9Ub29scy9XZWJLaXRBUElUZXN0L1Rlc3QuaAppbmRleCAzM2IwN2M5Li40NjUyN2Fj IDEwMDY0NAotLS0gYS9Ub29scy9XZWJLaXRBUElUZXN0L1Rlc3QuaAorKysgYi9Ub29scy9XZWJL aXRBUElUZXN0L1Rlc3QuaApAQCAtNDgsNyArNDgsNyBAQCBwdWJsaWM6CiAgICAgICAgIHN0YXRp YyBjb25zdCBib29sIGluaXRpYWxpemVkOyBcCiAgICAgfTsgXAogICAgIFwKLSAgICBjb25zdCBi b29sIFRFU1RfQ0xBU1NfTkFNRSh0ZXN0Q2FzZU5hbWUsIHRlc3ROYW1lKTo6aW5pdGlhbGl6ZWQg PSAoVGVzdHNDb250cm9sbGVyOjpzaGFyZWQoKS5hZGRUZXN0KG5ldyBURVNUX0NMQVNTX05BTUUo dGVzdENhc2VOYW1lLCB0ZXN0TmFtZSkpLCB0cnVlKTsgXAorICAgIGNvbnN0IGJvb2wgVEVTVF9D TEFTU19OQU1FKHRlc3RDYXNlTmFtZSwgdGVzdE5hbWUpOjppbml0aWFsaXplZCA9IChUZXN0c0Nv bnRyb2xsZXI6OnNoYXJlZCgpLmFkZFRlc3QoYWRvcHRQdHIobmV3IFRFU1RfQ0xBU1NfTkFNRSh0 ZXN0Q2FzZU5hbWUsIHRlc3ROYW1lKSkpLCB0cnVlKTsgXAogICAgIFwKICAgICB2b2lkIFRFU1Rf Q0xBU1NfTkFNRSh0ZXN0Q2FzZU5hbWUsIHRlc3ROYW1lKTo6cnVuKCkKIAotLSAKMS43LjMuMS5t c3lzZ2l0LjAKCg== 92085 2011-05-03 09:41:54 -0700 2011-05-03 15:20:44 -0700 Patch bug-60027-20110503094154.patch text/plain 1239 eric U3VidmVyc2lvbiBSZXZpc2lvbjogODU2MDgKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBi L1Rvb2xzL0NoYW5nZUxvZwppbmRleCA2MjIyMTdhNWYxYzFiNDU3MDhiNjM0ODAyMmNkMDhlZjUy YzJiMTc5Li41MmRlMzI0YWNlOTE0MjYxNjFjMzU0NmZiZTM3MDQxMDA5YTFjYjg4IDEwMDY0NAot LS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTIg QEAKKzIwMTEtMDUtMDMgIEVyaWMgU2VpZGVsICA8ZXJpY0B3ZWJraXQub3JnPgorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIHdlYmtpdC1wYXRjaCBwb3N0 LWNvbW1pdHMgSEVBRF4uLiB0aHJvd3MgYW4gZXhjZXB0aW9uCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02MDAyNworCisgICAgICAgICogU2NyaXB0cy93 ZWJraXRweS9jb21tb24vY2hlY2tvdXQvc2NtL2dpdC5weToKKwogMjAxMS0wNS0wMiAgQWRhbSBS b2JlbiAgPGFyb2JlbkBhcHBsZS5jb20+CiAKICAgICAgICAgVGFrZSBhZHZhbnRhZ2Ugb2YgaW1w bGljaXQgbnVsbHB0cl90IC0+IFBhc3NPd25QdHIgY29udmVyc2lvbgpkaWZmIC0tZ2l0IGEvVG9v bHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvc2NtL2dpdC5weSBiL1Rvb2xzL1Nj cmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L3NjbS9naXQucHkKaW5kZXggMmRlYzg2ZmZm OWM1NGZiYjJmMTk4YjQxYjgzMTUxZGUxNWU3ZTJkNC4uM2UwOGRhZGIyZmIwOTAwMzA4YjlkMmVj NTVjMjFiZjA1YjM2MGE3OSAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21t b24vY2hlY2tvdXQvc2NtL2dpdC5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1v bi9jaGVja291dC9zY20vZ2l0LnB5CkBAIC0zMyw2ICszMyw3IEBAIGltcG9ydCByZQogZnJvbSB3 ZWJraXRweS5jb21tb24ubWVtb2l6ZWQgaW1wb3J0IG1lbW9pemVkCiBmcm9tIHdlYmtpdHB5LmNv bW1vbi5zeXN0ZW0uZXhlY3V0aXZlIGltcG9ydCBFeGVjdXRpdmUsIHJ1bl9jb21tYW5kLCBTY3Jp cHRFcnJvcgogCitmcm9tIC5jb21taXRtZXNzYWdlIGltcG9ydCBDb21taXRNZXNzYWdlCiBmcm9t IC5zY20gaW1wb3J0IEF1dGhlbnRpY2F0aW9uRXJyb3IsIFNDTSwgY29tbWl0X2Vycm9yX2hhbmRs ZXIKIGZyb20gLnN2biBpbXBvcnQgU1ZOLCBTVk5SZXBvc2l0b3J5CiAK