53897 2011-02-06 18:05:56 -0800 [chromium] WebPageSerializerImpl doesn't serialize sub-frames correctly 2011-04-07 22:00:07 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 public webkit-unassigned abarth commit-queue paroga yaar oldest_to_newest 346421 0 public 2011-02-06 18:05:56 -0800 Exported sub-frames are not referenced correctly by it's parent frame. Exported sub-frames also is using the wrong path for it's resources. This bug is related to http://code.google.com/p/chromium/issues/detail?id=25303 346425 1 81439 public 2011-02-06 18:18:20 -0800 Created attachment 81439 patch for WebPageSerializerImpl.cpp Fixed resource paths in sub-frames. Also made sure sub-frames are referenced correctly from parent frame. 346428 2 81439 paroga 2011-02-06 18:32:00 -0800 Comment on attachment 81439 patch for WebPageSerializerImpl.cpp View in context: https://bugs.webkit.org/attachment.cgi?id=81439&action=review Every patch needs a ChangeLog. See http://webkit.org/coding/contributing.html for mor information. > Source/WebKit/chromium/src/WebPageSerializerImpl.cpp:330 > // Get the absolute link > - String completeURL = param->document->completeURL(attrValue); > + // handle iframe and frame tags We usually write whole sentences. Should read: Handle iframe and frame tags. Does this comment add any extra value? IMHO it does not, so we can remove it. See webkit-dev thread for the actual discussion about comments: https://lists.webkit.org/pipermail/webkit-dev/2011-January/015767.html > Source/WebKit/chromium/src/WebPageSerializerImpl.cpp:333 > + WebFrameImpl* subFrame = > + WebFrameImpl::fromFrameOwnerElement( > + const_cast<Element*>(element)); Is this const_cast really necessary? > Source/WebKit/chromium/src/WebPageSerializerImpl.cpp:336 > + String completeURL = subFrame ? > + KURL(subFrame->url()) : > + param->document->completeURL(attrValue); Can you write this in one line only. Not need for 3 lines :-) Same for the subFrame above 346436 3 81442 public 2011-02-06 19:26:46 -0800 Created attachment 81442 Fixed formatting and removed const cast 346437 4 public 2011-02-06 19:31:31 -0800 (In reply to comment #2) > (From update of attachment 81439 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=81439&action=review > > Every patch needs a ChangeLog. See http://webkit.org/coding/contributing.html for mor information. Fixed. > > > Source/WebKit/chromium/src/WebPageSerializerImpl.cpp:330 > > // Get the absolute link > > - String completeURL = param->document->completeURL(attrValue); > > + // handle iframe and frame tags > > We usually write whole sentences. Should read: Handle iframe and frame tags. > Does this comment add any extra value? IMHO it does not, so we can remove it. > See webkit-dev thread for the actual discussion about comments: https://lists.webkit.org/pipermail/webkit-dev/2011-January/015767.html Fixed. > > > Source/WebKit/chromium/src/WebPageSerializerImpl.cpp:333 > > + WebFrameImpl* subFrame = > > + WebFrameImpl::fromFrameOwnerElement( > > + const_cast<Element*>(element)); > > Is this const_cast really necessary? Removed the const_cast and made fromFrameOwnerElement take a const argument instead. > > > Source/WebKit/chromium/src/WebPageSerializerImpl.cpp:336 > > + String completeURL = subFrame ? > > + KURL(subFrame->url()) : > > + param->document->completeURL(attrValue); > > Can you write this in one line only. Not need for 3 lines :-) Same for the subFrame above Fixed. 346504 5 paroga 2011-02-07 01:07:21 -0800 View in context: https://bugs.webkit.org/attachment.cgi?id=81442&action=review Did you used svn-create-patch to generate this patch? Seams you patch has a problem to apply clearly: See the bubbles beside your patch. They should be green, like at your last patch. FYI: "Tools/Scripts/webkit-patch upload" can help a load when creating a patch > Source/WebKit/chromium/ChangeLog:5 > + Fixed resource paths in sub-frames. Also made sure sub-frames are referenced correctly from parent frame. https://bugs.webkit.org/show_bug.cgi?id=53897 We usually write a short description in the first line after the "reviewed by" and in the next line the bug# and after an additional empty line comes a "detailed description". See the example at http://webkit.org/coding/contributing.html#changelogs. 346995 6 81561 public 2011-02-07 18:10:43 -0800 Created attachment 81561 Fixed ChangeLog 346999 7 81561 abarth 2011-02-07 18:22:28 -0800 Comment on attachment 81561 Fixed ChangeLog View in context: https://bugs.webkit.org/attachment.cgi?id=81561&action=review > Source/WebKit/chromium/src/WebFrameImpl.cpp:1963 > -WebFrameImpl* WebFrameImpl::fromFrameOwnerElement(Element* element) > +WebFrameImpl* WebFrameImpl::fromFrameOwnerElement(const Element* element) Why is this change related to the problem you're trying to solve? We almost never have "const Element*". > Source/WebKit/chromium/src/WebPageSerializerImpl.cpp:331 > + String completeURL = subFrame ? KURL(subFrame->url()) : param->document->completeURL(attrValue); Why do we need to call KURL if we're trying to get a String in the end? 347000 8 abarth 2011-02-07 18:22:46 -0800 Those are really more questions than anything... 347027 9 public 2011-02-07 19:50:19 -0800 (In reply to comment #7) > (From update of attachment 81561 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=81561&action=review > > > Source/WebKit/chromium/src/WebFrameImpl.cpp:1963 > > -WebFrameImpl* WebFrameImpl::fromFrameOwnerElement(Element* element) > > +WebFrameImpl* WebFrameImpl::fromFrameOwnerElement(const Element* element) > > Why is this change related to the problem you're trying to solve? We almost never have "const Element*". openTagToString is passed a const Element*. So I either had to remove the constness, cast it away or make fromFrameOwnerElement take a const argument. I thought the latter was the cleaner solution. > > > Source/WebKit/chromium/src/WebPageSerializerImpl.cpp:331 > > + String completeURL = subFrame ? KURL(subFrame->url()) : param->document->completeURL(attrValue); > > Why do we need to call KURL if we're trying to get a String in the end? That's how it was done previously in that file, e.g in the constructor and completeURL(). I just stuck to the same style. 347054 10 81561 abarth 2011-02-07 20:54:06 -0800 Comment on attachment 81561 Fixed ChangeLog View in context: https://bugs.webkit.org/attachment.cgi?id=81561&action=review >>> Source/WebKit/chromium/src/WebFrameImpl.cpp:1963 >>> -WebFrameImpl* WebFrameImpl::fromFrameOwnerElement(Element* element) >>> +WebFrameImpl* WebFrameImpl::fromFrameOwnerElement(const Element* element) >> >> Why is this change related to the problem you're trying to solve? We almost never have "const Element*". > > openTagToString is passed a const Element*. So I either had to remove the constness, cast it away or make fromFrameOwnerElement take a const argument. > I thought the latter was the cleaner solution. It's better to remove the constness. "const Element" doesn't make any sense. >>> Source/WebKit/chromium/src/WebPageSerializerImpl.cpp:331 >>> - String completeURL = param->document->completeURL(attrValue); >>> + WebFrameImpl* subFrame = WebFrameImpl::fromFrameOwnerElement(element); >>> + String completeURL = subFrame ? KURL(subFrame->url()) : param->document->completeURL(attrValue); >> >> Why do we need to call KURL if we're trying to get a String in the end? > > That's how it was done previously in that file, e.g in the constructor and completeURL(). I just stuck to the same style. That probably wrong. We should probably fix it. 348781 11 81915 public 2011-02-09 19:58:25 -0800 Created attachment 81915 Patch 348783 12 public 2011-02-09 20:04:33 -0800 (In reply to comment #10) > (From update of attachment 81561 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=81561&action=review > > >>> Source/WebKit/chromium/src/WebFrameImpl.cpp:1963 > >>> -WebFrameImpl* WebFrameImpl::fromFrameOwnerElement(Element* element) > >>> +WebFrameImpl* WebFrameImpl::fromFrameOwnerElement(const Element* element) > >> > >> Why is this change related to the problem you're trying to solve? We almost never have "const Element*". > > > > openTagToString is passed a const Element*. So I either had to remove the constness, cast it away or make fromFrameOwnerElement take a const argument. > > I thought the latter was the cleaner solution. > > It's better to remove the constness. "const Element" doesn't make any sense. Removed the constness from the function argument. > > >>> Source/WebKit/chromium/src/WebPageSerializerImpl.cpp:331 > >>> - String completeURL = param->document->completeURL(attrValue); > >>> + WebFrameImpl* subFrame = WebFrameImpl::fromFrameOwnerElement(element); > >>> + String completeURL = subFrame ? KURL(subFrame->url()) : param->document->completeURL(attrValue); > >> > >> Why do we need to call KURL if we're trying to get a String in the end? > > > > That's how it was done previously in that file, e.g in the constructor and completeURL(). I just stuck to the same style. > > That probably wrong. We should probably fix it. Changed it to grab the url directly rather than calling KURL. 351855 13 public 2011-02-15 20:46:47 -0800 Is everything looking ok? 379192 14 81915 fishd 2011-04-04 16:29:21 -0700 Comment on attachment 81915 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=81915&action=review > Source/WebKit/chromium/ChangeLog:8 > + Serialize sub-frames correctly when using 'save page as'. it would be helpful if this ChangeLog actually described the bug you are fixing. what was incorrect about the way sub-frames were serialized? one shouldn't need to open the bug report to figure out why a change is being made. 379564 15 88236 public 2011-04-05 08:01:16 -0700 Created attachment 88236 Better ChangeLog description 381540 16 88236 fishd 2011-04-07 11:51:18 -0700 Comment on attachment 88236 Better ChangeLog description View in context: https://bugs.webkit.org/attachment.cgi?id=88236&action=review > Source/WebKit/chromium/ChangeLog:15 > + sub-directory appended to the path of resources located in the same sub-directory. appended -> prepended 381951 17 88760 public 2011-04-07 20:05:23 -0700 Created attachment 88760 Updated ChangeLog 381955 18 88760 public 2011-04-07 20:11:38 -0700 Comment on attachment 88760 Updated ChangeLog Changed "appended" to "prepended". 381979 19 88764 paroga 2011-04-07 21:21:03 -0700 Created attachment 88764 Patch for landing 381980 20 paroga 2011-04-07 21:28:47 -0700 (In reply to comment #18) > (From update of attachment 88760 [details]) > Changed "appended" to "prepended". FYI: If a patch got a "r+" you can replace the "Reviewed by NOBODY (OOPS!)." with the correct name or you shouldn't remove the "r+" flag from "old" attachment. Otherwise the commit-queue can't find the correct reviewer and and a reviewer must set the r+ flag again. Also there was an unneeded space after the "saved." in line12. ;-) 381996 21 88764 commit-queue 2011-04-07 21:59:58 -0700 Comment on attachment 88764 Patch for landing Clearing flags on attachment: 88764 Committed r83252: <http://trac.webkit.org/changeset/83252> 381997 22 commit-queue 2011-04-07 22:00:07 -0700 All reviewed patches have been landed. Closing bug. 81439 2011-02-06 18:18:20 -0800 2011-02-06 19:26:46 -0800 patch for WebPageSerializerImpl.cpp serialize-patch.txt text/plain 1573 public SW5kZXg6IFNvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlBhZ2VTZXJpYWxpemVySW1wbC5j cHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViUGFnZVNlcmlh bGl6ZXJJbXBsLmNwcAkocmV2aXNpb24gNzc3NzIpCisrKyBTb3VyY2UvV2ViS2l0L2Nocm9taXVt L3NyYy9XZWJQYWdlU2VyaWFsaXplckltcGwuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zMjcsMTEg KzMyNywxOCBAQCB2b2lkIFdlYlBhZ2VTZXJpYWxpemVySW1wbDo6b3BlblRhZ1RvU3RyCiAgICAg ICAgICAgICAgICAgICAgICAgICByZXN1bHQgKz0gYXR0clZhbHVlOwogICAgICAgICAgICAgICAg ICAgICBlbHNlIHsKICAgICAgICAgICAgICAgICAgICAgICAgIC8vIEdldCB0aGUgYWJzb2x1dGUg bGluawotICAgICAgICAgICAgICAgICAgICAgICAgU3RyaW5nIGNvbXBsZXRlVVJMID0gcGFyYW0t PmRvY3VtZW50LT5jb21wbGV0ZVVSTChhdHRyVmFsdWUpOworICAgICAgICAgICAgICAgICAgICAg ICAgLy8gaGFuZGxlIGlmcmFtZSBhbmQgZnJhbWUgdGFncworICAgICAgICAgICAgICAgICAgICAg ICAgV2ViRnJhbWVJbXBsKiBzdWJGcmFtZSA9IAorICAgICAgICAgICAgICAgICAgICAgICAgICAg IFdlYkZyYW1lSW1wbDo6ZnJvbUZyYW1lT3duZXJFbGVtZW50KAorICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY29uc3RfY2FzdDxFbGVtZW50Kj4oZWxlbWVu dCkpOworICAgICAgICAgICAgICAgICAgICAgICAgU3RyaW5nIGNvbXBsZXRlVVJMID0gc3ViRnJh bWUgPyAKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICBLVVJMKHN1YkZyYW1lLT51cmwoKSkg OgorICAgICAgICAgICAgICAgICAgICAgICAgICAgIHBhcmFtLT5kb2N1bWVudC0+Y29tcGxldGVV UkwoYXR0clZhbHVlKTsKKwogICAgICAgICAgICAgICAgICAgICAgICAgLy8gQ2hlY2sgd2hldGhl ciB3ZSBoYXZlIGxvY2FsIGZpbGVzIGZvciB0aG9zZSBsaW5rLgogICAgICAgICAgICAgICAgICAg ICAgICAgaWYgKG1fbG9jYWxMaW5rcy5jb250YWlucyhjb21wbGV0ZVVSTCkpIHsKLSAgICAgICAg ICAgICAgICAgICAgICAgICAgICBpZiAoIW1fbG9jYWxEaXJlY3RvcnlOYW1lLmlzRW1wdHkoKSkK LSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcmVzdWx0ICs9ICIuLyIgKyBtX2xvY2Fs RGlyZWN0b3J5TmFtZSArICIvIjsKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICBpZiAoIXBh cmFtLT5kaXJlY3RvcnlOYW1lLmlzRW1wdHkoKSkKKyAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgcmVzdWx0ICs9ICIuLyIgKyBwYXJhbS0+ZGlyZWN0b3J5TmFtZSArICIvIjsKICAgICAg ICAgICAgICAgICAgICAgICAgICAgICByZXN1bHQgKz0gbV9sb2NhbExpbmtzLmdldChjb21wbGV0 ZVVSTCk7CiAgICAgICAgICAgICAgICAgICAgICAgICB9IGVsc2UKICAgICAgICAgICAgICAgICAg ICAgICAgICAgICByZXN1bHQgKz0gY29tcGxldGVVUkw7Cg== 81442 2011-02-06 19:26:46 -0800 2011-02-07 18:10:38 -0800 Fixed formatting and removed const cast serialize-patch.txt text/plain 3816 public SW5kZXg6IFNvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCShyZXZpc2lvbiA3Nzc4MikKKysrIFNvdXJj ZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjQg QEAKKzIwMTEtMDItMDYgIE1hZ251cyBEYW5pZWxzc29uICA8cHVibGljQGZ1enphYy5jb20+CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRml4ZWQgcmVz b3VyY2UgcGF0aHMgaW4gc3ViLWZyYW1lcy4gQWxzbyBtYWRlIHN1cmUgc3ViLWZyYW1lcyBhcmUg cmVmZXJlbmNlZCBjb3JyZWN0bHkgZnJvbSBwYXJlbnQgZnJhbWUuIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD01Mzg5NworCisgICAgICAgICogc3JjL1dlYkZyYW1lSW1w bC5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYkZyYW1lSW1wbDo6ZnJvbUZyYW1lT3duZXJFbGVt ZW50KToKKyAgICAgICAgKiBzcmMvV2ViRnJhbWVJbXBsLmg6CisgICAgICAgICogc3JjL1dlYlBh Z2VTZXJpYWxpemVySW1wbC5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VTZXJpYWxpemVy SW1wbDo6b3BlblRhZ1RvU3RyaW5nKToKKwogMjAxMS0wMi0wNCAgQ2hhcmxpZSBSZWlzICA8Y3Jl aXNAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IE1paGFpIFBhcnBhcml0YS4K SW5kZXg6IFNvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYkZyYW1lSW1wbC5jcHAKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViRnJhbWVJbXBsLmNwcAkocmV2 aXNpb24gNzc3NzIpCisrKyBTb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJGcmFtZUltcGwu Y3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xOTYwLDcgKzE5NjAsNyBAQCBXZWJGcmFtZUltcGwqIFdl YkZyYW1lSW1wbDo6ZnJvbUZyYW1lKGNvCiAgICAgcmV0dXJuIHN0YXRpY19jYXN0PEZyYW1lTG9h ZGVyQ2xpZW50SW1wbCo+KGZyYW1lLT5sb2FkZXIoKS0+Y2xpZW50KCkpLT53ZWJGcmFtZSgpOwog fQogCi1XZWJGcmFtZUltcGwqIFdlYkZyYW1lSW1wbDo6ZnJvbUZyYW1lT3duZXJFbGVtZW50KEVs ZW1lbnQqIGVsZW1lbnQpCitXZWJGcmFtZUltcGwqIFdlYkZyYW1lSW1wbDo6ZnJvbUZyYW1lT3du ZXJFbGVtZW50KGNvbnN0IEVsZW1lbnQqIGVsZW1lbnQpCiB7CiAgICAgaWYgKCFlbGVtZW50CiAg ICAgICAgIHx8ICFlbGVtZW50LT5pc0ZyYW1lT3duZXJFbGVtZW50KCkKQEAgLTE5NjgsOCArMTk2 OCw4IEBAIFdlYkZyYW1lSW1wbCogV2ViRnJhbWVJbXBsOjpmcm9tRnJhbWVPd24KICAgICAgICAg ICAgICYmICFlbGVtZW50LT5oYXNUYWdOYW1lKEhUTUxOYW1lczo6ZnJhbWVUYWcpKSkKICAgICAg ICAgcmV0dXJuIDA7CiAKLSAgICBIVE1MRnJhbWVPd25lckVsZW1lbnQqIGZyYW1lRWxlbWVudCA9 Ci0gICAgICAgIHN0YXRpY19jYXN0PEhUTUxGcmFtZU93bmVyRWxlbWVudCo+KGVsZW1lbnQpOwor ICAgIGNvbnN0IEhUTUxGcmFtZU93bmVyRWxlbWVudCogZnJhbWVFbGVtZW50ID0KKyAgICAgICAg c3RhdGljX2Nhc3Q8Y29uc3QgSFRNTEZyYW1lT3duZXJFbGVtZW50Kj4oZWxlbWVudCk7CiAgICAg cmV0dXJuIGZyb21GcmFtZShmcmFtZUVsZW1lbnQtPmNvbnRlbnRGcmFtZSgpKTsKIH0KIApJbmRl eDogU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViRnJhbWVJbXBsLmgKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViRnJhbWVJbXBsLmgJKHJldmlzaW9uIDc3 NzcyKQorKysgU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViRnJhbWVJbXBsLmgJKHdvcmtp bmcgY29weSkKQEAgLTIxMCw3ICsyMTAsNyBAQCBwdWJsaWM6CiAgICAgdm9pZCBjcmVhdGVGcmFt ZVZpZXcoKTsKIAogICAgIHN0YXRpYyBXZWJGcmFtZUltcGwqIGZyb21GcmFtZShjb25zdCBXZWJD b3JlOjpGcmFtZSopOwotICAgIHN0YXRpYyBXZWJGcmFtZUltcGwqIGZyb21GcmFtZU93bmVyRWxl bWVudChXZWJDb3JlOjpFbGVtZW50KiBlbGVtZW50KTsKKyAgICBzdGF0aWMgV2ViRnJhbWVJbXBs KiBmcm9tRnJhbWVPd25lckVsZW1lbnQoY29uc3QgV2ViQ29yZTo6RWxlbWVudCogZWxlbWVudCk7 CiAKICAgICAvLyBJZiB0aGUgZnJhbWUgaG9zdHMgYSBQbHVnaW5Eb2N1bWVudCwgdGhpcyBtZXRo b2QgcmV0dXJucyB0aGUgV2ViUGx1Z2luQ29udGFpbmVySW1wbAogICAgIC8vIHRoYXQgaG9zdHMg dGhlIHBsdWdpbi4KSW5kZXg6IFNvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlBhZ2VTZXJp YWxpemVySW1wbC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMv V2ViUGFnZVNlcmlhbGl6ZXJJbXBsLmNwcAkocmV2aXNpb24gNzc3NzIpCisrKyBTb3VyY2UvV2Vi S2l0L2Nocm9taXVtL3NyYy9XZWJQYWdlU2VyaWFsaXplckltcGwuY3BwCSh3b3JraW5nIGNvcHkp CkBAIC0zMjcsMTEgKzMyNywxMiBAQCB2b2lkIFdlYlBhZ2VTZXJpYWxpemVySW1wbDo6b3BlblRh Z1RvU3RyCiAgICAgICAgICAgICAgICAgICAgICAgICByZXN1bHQgKz0gYXR0clZhbHVlOwogICAg ICAgICAgICAgICAgICAgICBlbHNlIHsKICAgICAgICAgICAgICAgICAgICAgICAgIC8vIEdldCB0 aGUgYWJzb2x1dGUgbGluawotICAgICAgICAgICAgICAgICAgICAgICAgU3RyaW5nIGNvbXBsZXRl VVJMID0gcGFyYW0tPmRvY3VtZW50LT5jb21wbGV0ZVVSTChhdHRyVmFsdWUpOworICAgICAgICAg ICAgICAgICAgICAgICAgV2ViRnJhbWVJbXBsKiBzdWJGcmFtZSA9IFdlYkZyYW1lSW1wbDo6ZnJv bUZyYW1lT3duZXJFbGVtZW50KGVsZW1lbnQpOworICAgICAgICAgICAgICAgICAgICAgICAgU3Ry aW5nIGNvbXBsZXRlVVJMID0gc3ViRnJhbWUgPyBLVVJMKHN1YkZyYW1lLT51cmwoKSkgOiBwYXJh bS0+ZG9jdW1lbnQtPmNvbXBsZXRlVVJMKGF0dHJWYWx1ZSk7CiAgICAgICAgICAgICAgICAgICAg ICAgICAvLyBDaGVjayB3aGV0aGVyIHdlIGhhdmUgbG9jYWwgZmlsZXMgZm9yIHRob3NlIGxpbmsu CiAgICAgICAgICAgICAgICAgICAgICAgICBpZiAobV9sb2NhbExpbmtzLmNvbnRhaW5zKGNvbXBs ZXRlVVJMKSkgewotICAgICAgICAgICAgICAgICAgICAgICAgICAgIGlmICghbV9sb2NhbERpcmVj dG9yeU5hbWUuaXNFbXB0eSgpKQotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICByZXN1 bHQgKz0gIi4vIiArIG1fbG9jYWxEaXJlY3RvcnlOYW1lICsgIi8iOworICAgICAgICAgICAgICAg ICAgICAgICAgICAgIGlmICghcGFyYW0tPmRpcmVjdG9yeU5hbWUuaXNFbXB0eSgpKQorICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICByZXN1bHQgKz0gIi4vIiArIHBhcmFtLT5kaXJlY3Rv cnlOYW1lICsgIi8iOwogICAgICAgICAgICAgICAgICAgICAgICAgICAgIHJlc3VsdCArPSBtX2xv Y2FsTGlua3MuZ2V0KGNvbXBsZXRlVVJMKTsKICAgICAgICAgICAgICAgICAgICAgICAgIH0gZWxz ZQogICAgICAgICAgICAgICAgICAgICAgICAgICAgIHJlc3VsdCArPSBjb21wbGV0ZVVSTDsK 81561 2011-02-07 18:10:43 -0800 2011-02-09 19:58:22 -0800 Fixed ChangeLog bug-53897-20110207181040.patch text/plain 4003 public SW5kZXg6IFNvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCShyZXZpc2lvbiA3Nzg3NSkKKysrIFNvdXJj ZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTkg QEAKKzIwMTEtMDItMDcgIE1hZ251cyBEYW5pZWxzc29uICA8cHVibGljQGZ1enphYy5jb20+CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW2Nocm9taXVt XSBXZWJQYWdlU2VyaWFsaXplckltcGwgZG9lc24ndCBzZXJpYWxpemUgc3ViLWZyYW1lcyBjb3Jy ZWN0bHkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTUz ODk3CisKKyAgICAgICAgU2VyaWFsaXplIHN1Yi1mcmFtZXMgY29ycmVjdGx5IHdoZW4gdXNpbmcg J3NhdmUgcGFnZSBhcycuCisKKyAgICAgICAgKiBzcmMvV2ViRnJhbWVJbXBsLmNwcDoKKyAgICAg ICAgKFdlYktpdDo6V2ViRnJhbWVJbXBsOjpmcm9tRnJhbWVPd25lckVsZW1lbnQpOiBNYWRlIGZ1 bmN0aW9uIHRha2UgYSBjb25zdCBhcmd1bWVudC4KKyAgICAgICAgKiBzcmMvV2ViRnJhbWVJbXBs Lmg6CisgICAgICAgICogc3JjL1dlYlBhZ2VTZXJpYWxpemVySW1wbC5jcHA6CisgICAgICAgIChX ZWJLaXQ6OldlYlBhZ2VTZXJpYWxpemVySW1wbDo6b3BlblRhZ1RvU3RyaW5nKTogRml4ZWQgcmVz b3VyY2UgcGF0aHMgaW4gc3ViLWZyYW1lcy4gCisgICAgICAgIEFsc28gbWFkZSBzdXJlIHN1Yi1m cmFtZXMgYXJlIHJlZmVyZW5jZWQgY29ycmVjdGx5IGZyb20gcGFyZW50IGZyYW1lLgorCiAyMDEx LTAyLTAzICBNT1JJVEEgSGFqaW1lICA8bW9ycml0YUBnb29nbGUuY29tPgogCiAgICAgICAgIFJl dmlld2VkIGJ5IERhcmluIEZpc2hlci4KSW5kZXg6IFNvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3Jj L1dlYkZyYW1lSW1wbC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9jaHJvbWl1bS9z cmMvV2ViRnJhbWVJbXBsLmNwcAkocmV2aXNpb24gNzc3NzIpCisrKyBTb3VyY2UvV2ViS2l0L2No cm9taXVtL3NyYy9XZWJGcmFtZUltcGwuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xOTYwLDcgKzE5 NjAsNyBAQCBXZWJGcmFtZUltcGwqIFdlYkZyYW1lSW1wbDo6ZnJvbUZyYW1lKGNvCiAgICAgcmV0 dXJuIHN0YXRpY19jYXN0PEZyYW1lTG9hZGVyQ2xpZW50SW1wbCo+KGZyYW1lLT5sb2FkZXIoKS0+ Y2xpZW50KCkpLT53ZWJGcmFtZSgpOwogfQogCi1XZWJGcmFtZUltcGwqIFdlYkZyYW1lSW1wbDo6 ZnJvbUZyYW1lT3duZXJFbGVtZW50KEVsZW1lbnQqIGVsZW1lbnQpCitXZWJGcmFtZUltcGwqIFdl YkZyYW1lSW1wbDo6ZnJvbUZyYW1lT3duZXJFbGVtZW50KGNvbnN0IEVsZW1lbnQqIGVsZW1lbnQp CiB7CiAgICAgaWYgKCFlbGVtZW50CiAgICAgICAgIHx8ICFlbGVtZW50LT5pc0ZyYW1lT3duZXJF bGVtZW50KCkKQEAgLTE5NjgsOCArMTk2OCw4IEBAIFdlYkZyYW1lSW1wbCogV2ViRnJhbWVJbXBs Ojpmcm9tRnJhbWVPd24KICAgICAgICAgICAgICYmICFlbGVtZW50LT5oYXNUYWdOYW1lKEhUTUxO YW1lczo6ZnJhbWVUYWcpKSkKICAgICAgICAgcmV0dXJuIDA7CiAKLSAgICBIVE1MRnJhbWVPd25l ckVsZW1lbnQqIGZyYW1lRWxlbWVudCA9Ci0gICAgICAgIHN0YXRpY19jYXN0PEhUTUxGcmFtZU93 bmVyRWxlbWVudCo+KGVsZW1lbnQpOworICAgIGNvbnN0IEhUTUxGcmFtZU93bmVyRWxlbWVudCog ZnJhbWVFbGVtZW50ID0KKyAgICAgICAgc3RhdGljX2Nhc3Q8Y29uc3QgSFRNTEZyYW1lT3duZXJF bGVtZW50Kj4oZWxlbWVudCk7CiAgICAgcmV0dXJuIGZyb21GcmFtZShmcmFtZUVsZW1lbnQtPmNv bnRlbnRGcmFtZSgpKTsKIH0KIApJbmRleDogU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2Vi RnJhbWVJbXBsLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2Vi RnJhbWVJbXBsLmgJKHJldmlzaW9uIDc3NzcyKQorKysgU291cmNlL1dlYktpdC9jaHJvbWl1bS9z cmMvV2ViRnJhbWVJbXBsLmgJKHdvcmtpbmcgY29weSkKQEAgLTIxMCw3ICsyMTAsNyBAQCBwdWJs aWM6CiAgICAgdm9pZCBjcmVhdGVGcmFtZVZpZXcoKTsKIAogICAgIHN0YXRpYyBXZWJGcmFtZUlt cGwqIGZyb21GcmFtZShjb25zdCBXZWJDb3JlOjpGcmFtZSopOwotICAgIHN0YXRpYyBXZWJGcmFt ZUltcGwqIGZyb21GcmFtZU93bmVyRWxlbWVudChXZWJDb3JlOjpFbGVtZW50KiBlbGVtZW50KTsK KyAgICBzdGF0aWMgV2ViRnJhbWVJbXBsKiBmcm9tRnJhbWVPd25lckVsZW1lbnQoY29uc3QgV2Vi Q29yZTo6RWxlbWVudCopOwogCiAgICAgLy8gSWYgdGhlIGZyYW1lIGhvc3RzIGEgUGx1Z2luRG9j dW1lbnQsIHRoaXMgbWV0aG9kIHJldHVybnMgdGhlIFdlYlBsdWdpbkNvbnRhaW5lckltcGwKICAg ICAvLyB0aGF0IGhvc3RzIHRoZSBwbHVnaW4uCkluZGV4OiBTb3VyY2UvV2ViS2l0L2Nocm9taXVt L3NyYy9XZWJQYWdlU2VyaWFsaXplckltcGwuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvY2hyb21pdW0vc3JjL1dlYlBhZ2VTZXJpYWxpemVySW1wbC5jcHAJKHJldmlzaW9uIDc3Nzcy KQorKysgU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViUGFnZVNlcmlhbGl6ZXJJbXBsLmNw cAkod29ya2luZyBjb3B5KQpAQCAtMzI3LDExICszMjcsMTIgQEAgdm9pZCBXZWJQYWdlU2VyaWFs aXplckltcGw6Om9wZW5UYWdUb1N0cgogICAgICAgICAgICAgICAgICAgICAgICAgcmVzdWx0ICs9 IGF0dHJWYWx1ZTsKICAgICAgICAgICAgICAgICAgICAgZWxzZSB7CiAgICAgICAgICAgICAgICAg ICAgICAgICAvLyBHZXQgdGhlIGFic29sdXRlIGxpbmsKLSAgICAgICAgICAgICAgICAgICAgICAg IFN0cmluZyBjb21wbGV0ZVVSTCA9IHBhcmFtLT5kb2N1bWVudC0+Y29tcGxldGVVUkwoYXR0clZh bHVlKTsKKyAgICAgICAgICAgICAgICAgICAgICAgIFdlYkZyYW1lSW1wbCogc3ViRnJhbWUgPSBX ZWJGcmFtZUltcGw6OmZyb21GcmFtZU93bmVyRWxlbWVudChlbGVtZW50KTsKKyAgICAgICAgICAg ICAgICAgICAgICAgIFN0cmluZyBjb21wbGV0ZVVSTCA9IHN1YkZyYW1lID8gS1VSTChzdWJGcmFt ZS0+dXJsKCkpIDogcGFyYW0tPmRvY3VtZW50LT5jb21wbGV0ZVVSTChhdHRyVmFsdWUpOwogICAg ICAgICAgICAgICAgICAgICAgICAgLy8gQ2hlY2sgd2hldGhlciB3ZSBoYXZlIGxvY2FsIGZpbGVz IGZvciB0aG9zZSBsaW5rLgogICAgICAgICAgICAgICAgICAgICAgICAgaWYgKG1fbG9jYWxMaW5r cy5jb250YWlucyhjb21wbGV0ZVVSTCkpIHsKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICBp ZiAoIW1fbG9jYWxEaXJlY3RvcnlOYW1lLmlzRW1wdHkoKSkKLSAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgcmVzdWx0ICs9ICIuLyIgKyBtX2xvY2FsRGlyZWN0b3J5TmFtZSArICIvIjsK KyAgICAgICAgICAgICAgICAgICAgICAgICAgICBpZiAoIXBhcmFtLT5kaXJlY3RvcnlOYW1lLmlz RW1wdHkoKSkKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcmVzdWx0ICs9ICIuLyIg KyBwYXJhbS0+ZGlyZWN0b3J5TmFtZSArICIvIjsKICAgICAgICAgICAgICAgICAgICAgICAgICAg ICByZXN1bHQgKz0gbV9sb2NhbExpbmtzLmdldChjb21wbGV0ZVVSTCk7CiAgICAgICAgICAgICAg ICAgICAgICAgICB9IGVsc2UKICAgICAgICAgICAgICAgICAgICAgICAgICAgICByZXN1bHQgKz0g Y29tcGxldGVVUkw7Cg== 81915 2011-02-09 19:58:25 -0800 2011-04-05 08:01:12 -0700 Patch bug-53897-20110209195824.patch text/plain 5309 public SW5kZXg6IFNvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCShyZXZpc2lvbiA3ODE3MikKKysrIFNvdXJj ZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTkg QEAKKzIwMTEtMDItMDkgIE1hZ251cyBEYW5pZWxzc29uICA8cHVibGljQGZ1enphYy5jb20+CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW2Nocm9taXVt XSBXZWJQYWdlU2VyaWFsaXplckltcGwgZG9lc24ndCBzZXJpYWxpemUgc3ViLWZyYW1lcyBjb3Jy ZWN0bHkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTUz ODk3CisKKyAgICAgICAgU2VyaWFsaXplIHN1Yi1mcmFtZXMgY29ycmVjdGx5IHdoZW4gdXNpbmcg J3NhdmUgcGFnZSBhcycuCisKKyAgICAgICAgKiBzcmMvV2ViUGFnZVNlcmlhbGl6ZXJJbXBsLmNw cDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVNlcmlhbGl6ZXJJbXBsOjpvcGVuVGFnVG9TdHJp bmcpOiBGaXhlZCByZXNvdXJjZSBwYXRocyBpbiBzdWItZnJhbWVzLiAKKyAgICAgICAgQWxzbyBt YWRlIHN1cmUgc3ViLWZyYW1lcyBhcmUgcmVmZXJlbmNlZCBjb3JyZWN0bHkgZnJvbSBwYXJlbnQg ZnJhbWUuCisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VTZXJpYWxpemVySW1wbDo6ZW5kVGFnVG9T dHJpbmcpOiBSZW1vdmVkIGNvbnN0bmVzcyBmcm9tIGFyZ3VtZW50LgorICAgICAgICAoV2ViS2l0 OjpXZWJQYWdlU2VyaWFsaXplckltcGw6OmJ1aWxkQ29udGVudEZvck5vZGUpOiBEaXR0by4KKyAg ICAgICAgKiBzcmMvV2ViUGFnZVNlcmlhbGl6ZXJJbXBsLmg6CisKIDIwMTEtMDItMDkgIERhdmlk IEhvbGxvd2F5ICA8ZGhvbGxvd2FAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5 IERhcmluIEZpc2hlci4KSW5kZXg6IFNvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlBhZ2VT ZXJpYWxpemVySW1wbC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9jaHJvbWl1bS9z cmMvV2ViUGFnZVNlcmlhbGl6ZXJJbXBsLmNwcAkocmV2aXNpb24gNzc3NzIpCisrKyBTb3VyY2Uv V2ViS2l0L2Nocm9taXVtL3NyYy9XZWJQYWdlU2VyaWFsaXplckltcGwuY3BwCSh3b3JraW5nIGNv cHkpCkBAIC0yOTQsNyArMjk0LDcgQEAgdm9pZCBXZWJQYWdlU2VyaWFsaXplckltcGw6OmVuY29k ZUFuZEZsdQogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgc3RhdHVzKTsK IH0KIAotdm9pZCBXZWJQYWdlU2VyaWFsaXplckltcGw6Om9wZW5UYWdUb1N0cmluZyhjb25zdCBF bGVtZW50KiBlbGVtZW50LAordm9pZCBXZWJQYWdlU2VyaWFsaXplckltcGw6Om9wZW5UYWdUb1N0 cmluZyhFbGVtZW50KiBlbGVtZW50LAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICBTZXJpYWxpemVEb21QYXJhbSogcGFyYW0pCiB7CiAgICAgLy8gRklYTUU6IHVz ZSBTdHJpbmdCdWlsZGVyIGluc3RlYWQgb2YgU3RyaW5nLgpAQCAtMzI3LDExICszMjcsMTMgQEAg dm9pZCBXZWJQYWdlU2VyaWFsaXplckltcGw6Om9wZW5UYWdUb1N0cgogICAgICAgICAgICAgICAg ICAgICAgICAgcmVzdWx0ICs9IGF0dHJWYWx1ZTsKICAgICAgICAgICAgICAgICAgICAgZWxzZSB7 CiAgICAgICAgICAgICAgICAgICAgICAgICAvLyBHZXQgdGhlIGFic29sdXRlIGxpbmsKLSAgICAg ICAgICAgICAgICAgICAgICAgIFN0cmluZyBjb21wbGV0ZVVSTCA9IHBhcmFtLT5kb2N1bWVudC0+ Y29tcGxldGVVUkwoYXR0clZhbHVlKTsKKyAgICAgICAgICAgICAgICAgICAgICAgIFdlYkZyYW1l SW1wbCogc3ViRnJhbWUgPSBXZWJGcmFtZUltcGw6OmZyb21GcmFtZU93bmVyRWxlbWVudChlbGVt ZW50KTsKKyAgICAgICAgICAgICAgICAgICAgICAgIFN0cmluZyBjb21wbGV0ZVVSTCA9IHN1YkZy YW1lID8gc3ViRnJhbWUtPmZyYW1lKCktPmRvY3VtZW50KCktPnVybCgpIDogCisgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHBhcmFtLT5kb2N1 bWVudC0+Y29tcGxldGVVUkwoYXR0clZhbHVlKTsKICAgICAgICAgICAgICAgICAgICAgICAgIC8v IENoZWNrIHdoZXRoZXIgd2UgaGF2ZSBsb2NhbCBmaWxlcyBmb3IgdGhvc2UgbGluay4KICAgICAg ICAgICAgICAgICAgICAgICAgIGlmIChtX2xvY2FsTGlua3MuY29udGFpbnMoY29tcGxldGVVUkwp KSB7Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgaWYgKCFtX2xvY2FsRGlyZWN0b3J5TmFt ZS5pc0VtcHR5KCkpCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHJlc3VsdCArPSAi Li8iICsgbV9sb2NhbERpcmVjdG9yeU5hbWUgKyAiLyI7CisgICAgICAgICAgICAgICAgICAgICAg ICAgICAgaWYgKCFwYXJhbS0+ZGlyZWN0b3J5TmFtZS5pc0VtcHR5KCkpCisgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIHJlc3VsdCArPSAiLi8iICsgcGFyYW0tPmRpcmVjdG9yeU5hbWUg KyAiLyI7CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcmVzdWx0ICs9IG1fbG9jYWxMaW5r cy5nZXQoY29tcGxldGVVUkwpOwogICAgICAgICAgICAgICAgICAgICAgICAgfSBlbHNlCiAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgcmVzdWx0ICs9IGNvbXBsZXRlVVJMOwpAQCAtMzU5LDcg KzM2MSw3IEBAIHZvaWQgV2ViUGFnZVNlcmlhbGl6ZXJJbXBsOjpvcGVuVGFnVG9TdHIKIH0KIAog Ly8gU2VyaWFsaXplIGVuZCB0YWcgb2YgYW4gc3BlY2lmaWVkIGVsZW1lbnQuCi12b2lkIFdlYlBh Z2VTZXJpYWxpemVySW1wbDo6ZW5kVGFnVG9TdHJpbmcoY29uc3QgRWxlbWVudCogZWxlbWVudCwK K3ZvaWQgV2ViUGFnZVNlcmlhbGl6ZXJJbXBsOjplbmRUYWdUb1N0cmluZyhFbGVtZW50KiBlbGVt ZW50LAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFNlcmlhbGl6 ZURvbVBhcmFtKiBwYXJhbSkKIHsKICAgICBib29sIG5lZWRTa2lwOwpAQCAtMzk2LDE4ICszOTgs MTggQEAgdm9pZCBXZWJQYWdlU2VyaWFsaXplckltcGw6OmVuZFRhZ1RvU3RyaQogICAgIHNhdmVI VE1MQ29udGVudFRvQnVmZmVyKHJlc3VsdCwgcGFyYW0pOwogfQogCi12b2lkIFdlYlBhZ2VTZXJp YWxpemVySW1wbDo6YnVpbGRDb250ZW50Rm9yTm9kZShjb25zdCBOb2RlKiBub2RlLAordm9pZCBX ZWJQYWdlU2VyaWFsaXplckltcGw6OmJ1aWxkQ29udGVudEZvck5vZGUoTm9kZSogbm9kZSwKICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFNlcmlhbGl6ZURv bVBhcmFtKiBwYXJhbSkKIHsKICAgICBzd2l0Y2ggKG5vZGUtPm5vZGVUeXBlKCkpIHsKICAgICBj YXNlIE5vZGU6OkVMRU1FTlRfTk9ERToKICAgICAgICAgLy8gUHJvY2VzcyBvcGVuIHRhZyBvZiBl bGVtZW50LgotICAgICAgICBvcGVuVGFnVG9TdHJpbmcoc3RhdGljX2Nhc3Q8Y29uc3QgRWxlbWVu dCo+KG5vZGUpLCBwYXJhbSk7CisgICAgICAgIG9wZW5UYWdUb1N0cmluZyhzdGF0aWNfY2FzdDxF bGVtZW50Kj4obm9kZSksIHBhcmFtKTsKICAgICAgICAgLy8gV2FsayB0aHJvdWdoIHRoZSBjaGls ZHJlbiBub2RlcyBhbmQgcHJvY2VzcyBpdC4KLSAgICAgICAgZm9yIChjb25zdCBOb2RlICpjaGls ZCA9IG5vZGUtPmZpcnN0Q2hpbGQoKTsgY2hpbGQ7IGNoaWxkID0gY2hpbGQtPm5leHRTaWJsaW5n KCkpCisgICAgICAgIGZvciAoTm9kZSAqY2hpbGQgPSBub2RlLT5maXJzdENoaWxkKCk7IGNoaWxk OyBjaGlsZCA9IGNoaWxkLT5uZXh0U2libGluZygpKQogICAgICAgICAgICAgYnVpbGRDb250ZW50 Rm9yTm9kZShjaGlsZCwgcGFyYW0pOwogICAgICAgICAvLyBQcm9jZXNzIGVuZCB0YWcgb2YgZWxl bWVudC4KLSAgICAgICAgZW5kVGFnVG9TdHJpbmcoc3RhdGljX2Nhc3Q8Y29uc3QgRWxlbWVudCo+ KG5vZGUpLCBwYXJhbSk7CisgICAgICAgIGVuZFRhZ1RvU3RyaW5nKHN0YXRpY19jYXN0PEVsZW1l bnQqPihub2RlKSwgcGFyYW0pOwogICAgICAgICBicmVhazsKICAgICBjYXNlIE5vZGU6OlRFWFRf Tk9ERToKICAgICAgICAgc2F2ZUhUTUxDb250ZW50VG9CdWZmZXIoY3JlYXRlTWFya3VwKG5vZGUp LCBwYXJhbSk7CkluZGV4OiBTb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJQYWdlU2VyaWFs aXplckltcGwuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJQ YWdlU2VyaWFsaXplckltcGwuaAkocmV2aXNpb24gNzc3NzIpCisrKyBTb3VyY2UvV2ViS2l0L2No cm9taXVtL3NyYy9XZWJQYWdlU2VyaWFsaXplckltcGwuaAkod29ya2luZyBjb3B5KQpAQCAtMTc0 LDEzICsxNzQsMTMgQEAgcHJpdmF0ZToKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFNl cmlhbGl6ZURvbVBhcmFtKiBwYXJhbSwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIEZs dXNoT3B0aW9uKTsKICAgICAvLyBTZXJpYWxpemUgb3BlbiB0YWcgb2YgYW4gc3BlY2lmaWVkIGVs ZW1lbnQuCi0gICAgdm9pZCBvcGVuVGFnVG9TdHJpbmcoY29uc3QgV2ViQ29yZTo6RWxlbWVudCog ZWxlbWVudCwKKyAgICB2b2lkIG9wZW5UYWdUb1N0cmluZyhXZWJDb3JlOjpFbGVtZW50KiwKICAg ICAgICAgICAgICAgICAgICAgICAgICBTZXJpYWxpemVEb21QYXJhbSogcGFyYW0pOwogICAgIC8v IFNlcmlhbGl6ZSBlbmQgdGFnIG9mIGFuIHNwZWNpZmllZCBlbGVtZW50LgotICAgIHZvaWQgZW5k VGFnVG9TdHJpbmcoY29uc3QgV2ViQ29yZTo6RWxlbWVudCogZWxlbWVudCwKKyAgICB2b2lkIGVu ZFRhZ1RvU3RyaW5nKFdlYkNvcmU6OkVsZW1lbnQqLAogICAgICAgICAgICAgICAgICAgICAgICAg U2VyaWFsaXplRG9tUGFyYW0qIHBhcmFtKTsKICAgICAvLyBCdWlsZCBjb250ZW50IGZvciBhIHNw ZWNpZmllZCBub2RlCi0gICAgdm9pZCBidWlsZENvbnRlbnRGb3JOb2RlKGNvbnN0IFdlYkNvcmU6 Ok5vZGUqIG5vZGUsCisgICAgdm9pZCBidWlsZENvbnRlbnRGb3JOb2RlKFdlYkNvcmU6Ok5vZGUq LAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICBTZXJpYWxpemVEb21QYXJhbSogcGFyYW0p OwogfTsKIAo= 88236 2011-04-05 08:01:16 -0700 2011-04-07 20:05:20 -0700 Better ChangeLog description bug-53897-20110405080115.patch text/plain 5817 public SW5kZXg6IFNvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCShyZXZpc2lvbiA4MjkyNSkKKysrIFNvdXJj ZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjYg QEAKKzIwMTEtMDQtMDUgIE1hZ251cyBEYW5pZWxzc29uICA8cHVibGljQGZ1enphYy5jb20+CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW2Nocm9taXVt XSBXZWJQYWdlU2VyaWFsaXplckltcGwgZG9lc24ndCBzZXJpYWxpemUgc3ViLWZyYW1lcyBjb3Jy ZWN0bHkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTUz ODk3CisKKyAgICAgICAgV2hlbiBzZXJpYWxpemluZyBhIHdlYiBwYWdlIHVzaW5nICdzYXZlIHBh Z2UgYXMnLCBzdWItZnJhbWVzIGFuZCByZXNvdXJjZXMgZ2V0cworICAgICAgICBzYXZlZCBpbiBh IHN1Yi1kaXJlY3RvcnkuIEhvd2V2ZXIsIGZyYW1lIGVsZW1lbnRzIGRpZG4ndCBnZXQgdXBkYXRl ZCB0byByZWZlcmVuY2UKKyAgICAgICAgdGhlc2Ugc2F2ZWQgc3ViLWZyYW1lcywgYnV0IHdlcmUg c3RpbGwgcmVmZXJlbmNpbmcgdGhlIG9yaWdpbmFsIHVybC4gU28gd2hlbiBvcGVuaW5nCisgICAg ICAgIGEgc2F2ZWQgd2ViIHBhZ2UsIGFueSBzdWItZnJhbWVzIHdvdWxkIGdldCBwdWxsZWQgaW4g ZnJvbSB0aGUgb3JpZ2luYWwgdXJsIHJhdGhlciB0aGFuIAorICAgICAgICB3aGF0IHdhcyBzYXZl ZC4gCisKKyAgICAgICAgSW4gYWRkaXRpb24gdG8gdGhpcywgc3ViLWZyYW1lcyBpbiB0aGUgc3Vi LWRpcmVjdG9yeSBlcnJvbmVvdXNseSBoYWQgdGhlIG5hbWUgb2YgdGhlCisgICAgICAgIHN1Yi1k aXJlY3RvcnkgYXBwZW5kZWQgdG8gdGhlIHBhdGggb2YgcmVzb3VyY2VzIGxvY2F0ZWQgaW4gdGhl IHNhbWUgc3ViLWRpcmVjdG9yeS4KKworICAgICAgICAqIHNyYy9XZWJQYWdlU2VyaWFsaXplcklt cGwuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlU2VyaWFsaXplckltcGw6Om9wZW5UYWdU b1N0cm5lOiBGaXhlZCByZXNvdXJjZSBwYXRocyBpbiBzdWItZnJhbWVzLiAKKyAgICAgICAgQWxz byBtYWRlIHN1cmUgc3ViLWZyYW1lcyBhcmUgcmVmZXJlbmNlZCBjb3JyZWN0bHkgZnJvbSBwYXJl bnQgZnJhbWUuCisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VTZXJpYWxpemVySW1wbDo6ZW5kVGFn VG9TdHJpbmcpOiBSZW1vdmVkIGNvbnN0bmVzcyBmcm9tIGFyZ3VtZW50LgorICAgICAgICAoV2Vi S2l0OjpXZWJQYWdlU2VyaWFsaXplckltcGw6OmJ1aWxkQ29udGVudEZvck5vZGUpOiBEaXR0by4K KyAgICAgICAgKiBzcmMvV2ViUGFnZVNlcmlhbGl6ZXJJbXBsLmg6CisKIDIwMTEtMDQtMDUgIEhh bnMgV2VubmJvcmcgIDxoYW5zQGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBB ZGFtIEJhcnRoCkluZGV4OiBTb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJQYWdlU2VyaWFs aXplckltcGwuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dl YlBhZ2VTZXJpYWxpemVySW1wbC5jcHAJKHJldmlzaW9uIDgyOTI1KQorKysgU291cmNlL1dlYktp dC9jaHJvbWl1bS9zcmMvV2ViUGFnZVNlcmlhbGl6ZXJJbXBsLmNwcAkod29ya2luZyBjb3B5KQpA QCAtMjk1LDcgKzI5NSw3IEBAIHZvaWQgV2ViUGFnZVNlcmlhbGl6ZXJJbXBsOjplbmNvZGVBbmRG bHUKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHN0YXR1cyk7CiB9CiAK LXZvaWQgV2ViUGFnZVNlcmlhbGl6ZXJJbXBsOjpvcGVuVGFnVG9TdHJpbmcoY29uc3QgRWxlbWVu dCogZWxlbWVudCwKK3ZvaWQgV2ViUGFnZVNlcmlhbGl6ZXJJbXBsOjpvcGVuVGFnVG9TdHJpbmco RWxlbWVudCogZWxlbWVudCwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgU2VyaWFsaXplRG9tUGFyYW0qIHBhcmFtKQogewogICAgIC8vIEZJWE1FOiB1c2UgU3Ry aW5nQnVpbGRlciBpbnN0ZWFkIG9mIFN0cmluZy4KQEAgLTMyOCwxMSArMzI4LDEzIEBAIHZvaWQg V2ViUGFnZVNlcmlhbGl6ZXJJbXBsOjpvcGVuVGFnVG9TdHIKICAgICAgICAgICAgICAgICAgICAg ICAgIHJlc3VsdCArPSBhdHRyVmFsdWU7CiAgICAgICAgICAgICAgICAgICAgIGVsc2UgewogICAg ICAgICAgICAgICAgICAgICAgICAgLy8gR2V0IHRoZSBhYnNvbHV0ZSBsaW5rCi0gICAgICAgICAg ICAgICAgICAgICAgICBTdHJpbmcgY29tcGxldGVVUkwgPSBwYXJhbS0+ZG9jdW1lbnQtPmNvbXBs ZXRlVVJMKGF0dHJWYWx1ZSk7CisgICAgICAgICAgICAgICAgICAgICAgICBXZWJGcmFtZUltcGwq IHN1YkZyYW1lID0gV2ViRnJhbWVJbXBsOjpmcm9tRnJhbWVPd25lckVsZW1lbnQoZWxlbWVudCk7 CisgICAgICAgICAgICAgICAgICAgICAgICBTdHJpbmcgY29tcGxldGVVUkwgPSBzdWJGcmFtZSA/ IHN1YkZyYW1lLT5mcmFtZSgpLT5kb2N1bWVudCgpLT51cmwoKSA6IAorICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBwYXJhbS0+ZG9jdW1lbnQt PmNvbXBsZXRlVVJMKGF0dHJWYWx1ZSk7CiAgICAgICAgICAgICAgICAgICAgICAgICAvLyBDaGVj ayB3aGV0aGVyIHdlIGhhdmUgbG9jYWwgZmlsZXMgZm9yIHRob3NlIGxpbmsuCiAgICAgICAgICAg ICAgICAgICAgICAgICBpZiAobV9sb2NhbExpbmtzLmNvbnRhaW5zKGNvbXBsZXRlVVJMKSkgewot ICAgICAgICAgICAgICAgICAgICAgICAgICAgIGlmICghbV9sb2NhbERpcmVjdG9yeU5hbWUuaXNF bXB0eSgpKQotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICByZXN1bHQgKz0gIi4vIiAr IG1fbG9jYWxEaXJlY3RvcnlOYW1lICsgIi8iOworICAgICAgICAgICAgICAgICAgICAgICAgICAg IGlmICghcGFyYW0tPmRpcmVjdG9yeU5hbWUuaXNFbXB0eSgpKQorICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICByZXN1bHQgKz0gIi4vIiArIHBhcmFtLT5kaXJlY3RvcnlOYW1lICsgIi8i OwogICAgICAgICAgICAgICAgICAgICAgICAgICAgIHJlc3VsdCArPSBtX2xvY2FsTGlua3MuZ2V0 KGNvbXBsZXRlVVJMKTsKICAgICAgICAgICAgICAgICAgICAgICAgIH0gZWxzZQogICAgICAgICAg ICAgICAgICAgICAgICAgICAgIHJlc3VsdCArPSBjb21wbGV0ZVVSTDsKQEAgLTM2MCw3ICszNjIs NyBAQCB2b2lkIFdlYlBhZ2VTZXJpYWxpemVySW1wbDo6b3BlblRhZ1RvU3RyCiB9CiAKIC8vIFNl cmlhbGl6ZSBlbmQgdGFnIG9mIGFuIHNwZWNpZmllZCBlbGVtZW50Lgotdm9pZCBXZWJQYWdlU2Vy aWFsaXplckltcGw6OmVuZFRhZ1RvU3RyaW5nKGNvbnN0IEVsZW1lbnQqIGVsZW1lbnQsCit2b2lk IFdlYlBhZ2VTZXJpYWxpemVySW1wbDo6ZW5kVGFnVG9TdHJpbmcoRWxlbWVudCogZWxlbWVudCwK ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBTZXJpYWxpemVEb21Q YXJhbSogcGFyYW0pCiB7CiAgICAgYm9vbCBuZWVkU2tpcDsKQEAgLTM5NywxOCArMzk5LDE4IEBA IHZvaWQgV2ViUGFnZVNlcmlhbGl6ZXJJbXBsOjplbmRUYWdUb1N0cmkKICAgICBzYXZlSFRNTENv bnRlbnRUb0J1ZmZlcihyZXN1bHQsIHBhcmFtKTsKIH0KIAotdm9pZCBXZWJQYWdlU2VyaWFsaXpl ckltcGw6OmJ1aWxkQ29udGVudEZvck5vZGUoY29uc3QgTm9kZSogbm9kZSwKK3ZvaWQgV2ViUGFn ZVNlcmlhbGl6ZXJJbXBsOjpidWlsZENvbnRlbnRGb3JOb2RlKE5vZGUqIG5vZGUsCiAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBTZXJpYWxpemVEb21QYXJh bSogcGFyYW0pCiB7CiAgICAgc3dpdGNoIChub2RlLT5ub2RlVHlwZSgpKSB7CiAgICAgY2FzZSBO b2RlOjpFTEVNRU5UX05PREU6CiAgICAgICAgIC8vIFByb2Nlc3Mgb3BlbiB0YWcgb2YgZWxlbWVu dC4KLSAgICAgICAgb3BlblRhZ1RvU3RyaW5nKHN0YXRpY19jYXN0PGNvbnN0IEVsZW1lbnQqPihu b2RlKSwgcGFyYW0pOworICAgICAgICBvcGVuVGFnVG9TdHJpbmcoc3RhdGljX2Nhc3Q8RWxlbWVu dCo+KG5vZGUpLCBwYXJhbSk7CiAgICAgICAgIC8vIFdhbGsgdGhyb3VnaCB0aGUgY2hpbGRyZW4g bm9kZXMgYW5kIHByb2Nlc3MgaXQuCi0gICAgICAgIGZvciAoY29uc3QgTm9kZSAqY2hpbGQgPSBu b2RlLT5maXJzdENoaWxkKCk7IGNoaWxkOyBjaGlsZCA9IGNoaWxkLT5uZXh0U2libGluZygpKQor ICAgICAgICBmb3IgKE5vZGUgKmNoaWxkID0gbm9kZS0+Zmlyc3RDaGlsZCgpOyBjaGlsZDsgY2hp bGQgPSBjaGlsZC0+bmV4dFNpYmxpbmcoKSkKICAgICAgICAgICAgIGJ1aWxkQ29udGVudEZvck5v ZGUoY2hpbGQsIHBhcmFtKTsKICAgICAgICAgLy8gUHJvY2VzcyBlbmQgdGFnIG9mIGVsZW1lbnQu Ci0gICAgICAgIGVuZFRhZ1RvU3RyaW5nKHN0YXRpY19jYXN0PGNvbnN0IEVsZW1lbnQqPihub2Rl KSwgcGFyYW0pOworICAgICAgICBlbmRUYWdUb1N0cmluZyhzdGF0aWNfY2FzdDxFbGVtZW50Kj4o bm9kZSksIHBhcmFtKTsKICAgICAgICAgYnJlYWs7CiAgICAgY2FzZSBOb2RlOjpURVhUX05PREU6 CiAgICAgICAgIHNhdmVIVE1MQ29udGVudFRvQnVmZmVyKGNyZWF0ZU1hcmt1cChub2RlKSwgcGFy YW0pOwpJbmRleDogU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViUGFnZVNlcmlhbGl6ZXJJ bXBsLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViUGFnZVNl cmlhbGl6ZXJJbXBsLmgJKHJldmlzaW9uIDgyOTI1KQorKysgU291cmNlL1dlYktpdC9jaHJvbWl1 bS9zcmMvV2ViUGFnZVNlcmlhbGl6ZXJJbXBsLmgJKHdvcmtpbmcgY29weSkKQEAgLTE3NCwxMyAr MTc0LDEzIEBAIHByaXZhdGU6CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBTZXJpYWxp emVEb21QYXJhbSogcGFyYW0sCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBGbHVzaE9w dGlvbik7CiAgICAgLy8gU2VyaWFsaXplIG9wZW4gdGFnIG9mIGFuIHNwZWNpZmllZCBlbGVtZW50 LgotICAgIHZvaWQgb3BlblRhZ1RvU3RyaW5nKGNvbnN0IFdlYkNvcmU6OkVsZW1lbnQqIGVsZW1l bnQsCisgICAgdm9pZCBvcGVuVGFnVG9TdHJpbmcoV2ViQ29yZTo6RWxlbWVudCosCiAgICAgICAg ICAgICAgICAgICAgICAgICAgU2VyaWFsaXplRG9tUGFyYW0qIHBhcmFtKTsKICAgICAvLyBTZXJp YWxpemUgZW5kIHRhZyBvZiBhbiBzcGVjaWZpZWQgZWxlbWVudC4KLSAgICB2b2lkIGVuZFRhZ1Rv U3RyaW5nKGNvbnN0IFdlYkNvcmU6OkVsZW1lbnQqIGVsZW1lbnQsCisgICAgdm9pZCBlbmRUYWdU b1N0cmluZyhXZWJDb3JlOjpFbGVtZW50KiwKICAgICAgICAgICAgICAgICAgICAgICAgIFNlcmlh bGl6ZURvbVBhcmFtKiBwYXJhbSk7CiAgICAgLy8gQnVpbGQgY29udGVudCBmb3IgYSBzcGVjaWZp ZWQgbm9kZQotICAgIHZvaWQgYnVpbGRDb250ZW50Rm9yTm9kZShjb25zdCBXZWJDb3JlOjpOb2Rl KiBub2RlLAorICAgIHZvaWQgYnVpbGRDb250ZW50Rm9yTm9kZShXZWJDb3JlOjpOb2RlKiwKICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgU2VyaWFsaXplRG9tUGFyYW0qIHBhcmFtKTsKIH07 CiAK 88760 2011-04-07 20:05:23 -0700 2011-04-07 21:20:56 -0700 Updated ChangeLog bug-53897-20110407200528.patch text/plain 5818 public SW5kZXg6IFNvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCShyZXZpc2lvbiA4MjkyNSkKKysrIFNvdXJj ZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjYg QEAKKzIwMTEtMDQtMDUgIE1hZ251cyBEYW5pZWxzc29uICA8cHVibGljQGZ1enphYy5jb20+CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW2Nocm9taXVt XSBXZWJQYWdlU2VyaWFsaXplckltcGwgZG9lc24ndCBzZXJpYWxpemUgc3ViLWZyYW1lcyBjb3Jy ZWN0bHkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTUz ODk3CisKKyAgICAgICAgV2hlbiBzZXJpYWxpemluZyBhIHdlYiBwYWdlIHVzaW5nICdzYXZlIHBh Z2UgYXMnLCBzdWItZnJhbWVzIGFuZCByZXNvdXJjZXMgZ2V0cworICAgICAgICBzYXZlZCBpbiBh IHN1Yi1kaXJlY3RvcnkuIEhvd2V2ZXIsIGZyYW1lIGVsZW1lbnRzIGRpZG4ndCBnZXQgdXBkYXRl ZCB0byByZWZlcmVuY2UKKyAgICAgICAgdGhlc2Ugc2F2ZWQgc3ViLWZyYW1lcywgYnV0IHdlcmUg c3RpbGwgcmVmZXJlbmNpbmcgdGhlIG9yaWdpbmFsIHVybC4gU28gd2hlbiBvcGVuaW5nCisgICAg ICAgIGEgc2F2ZWQgd2ViIHBhZ2UsIGFueSBzdWItZnJhbWVzIHdvdWxkIGdldCBwdWxsZWQgaW4g ZnJvbSB0aGUgb3JpZ2luYWwgdXJsIHJhdGhlciB0aGFuIAorICAgICAgICB3aGF0IHdhcyBzYXZl ZC4gCisKKyAgICAgICAgSW4gYWRkaXRpb24gdG8gdGhpcywgc3ViLWZyYW1lcyBpbiB0aGUgc3Vi LWRpcmVjdG9yeSBlcnJvbmVvdXNseSBoYWQgdGhlIG5hbWUgb2YgdGhlCisgICAgICAgIHN1Yi1k aXJlY3RvcnkgcHJlcGVuZGVkIHRvIHRoZSBwYXRoIG9mIHJlc291cmNlcyBsb2NhdGVkIGluIHRo ZSBzYW1lIHN1Yi1kaXJlY3RvcnkuCisKKyAgICAgICAgKiBzcmMvV2ViUGFnZVNlcmlhbGl6ZXJJ bXBsLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVNlcmlhbGl6ZXJJbXBsOjpvcGVuVGFn VG9TdHJuZTogRml4ZWQgcmVzb3VyY2UgcGF0aHMgaW4gc3ViLWZyYW1lcy4gCisgICAgICAgIEFs c28gbWFkZSBzdXJlIHN1Yi1mcmFtZXMgYXJlIHJlZmVyZW5jZWQgY29ycmVjdGx5IGZyb20gcGFy ZW50IGZyYW1lLgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlU2VyaWFsaXplckltcGw6OmVuZFRh Z1RvU3RyaW5nKTogUmVtb3ZlZCBjb25zdG5lc3MgZnJvbSBhcmd1bWVudC4KKyAgICAgICAgKFdl YktpdDo6V2ViUGFnZVNlcmlhbGl6ZXJJbXBsOjpidWlsZENvbnRlbnRGb3JOb2RlKTogRGl0dG8u CisgICAgICAgICogc3JjL1dlYlBhZ2VTZXJpYWxpemVySW1wbC5oOgorCiAyMDExLTA0LTA1ICBI YW5zIFdlbm5ib3JnICA8aGFuc0BjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkg QWRhbSBCYXJ0aApJbmRleDogU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViUGFnZVNlcmlh bGl6ZXJJbXBsLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9X ZWJQYWdlU2VyaWFsaXplckltcGwuY3BwCShyZXZpc2lvbiA4MjkyNSkKKysrIFNvdXJjZS9XZWJL aXQvY2hyb21pdW0vc3JjL1dlYlBhZ2VTZXJpYWxpemVySW1wbC5jcHAJKHdvcmtpbmcgY29weSkK QEAgLTI5NSw3ICsyOTUsNyBAQCB2b2lkIFdlYlBhZ2VTZXJpYWxpemVySW1wbDo6ZW5jb2RlQW5k Rmx1CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBzdGF0dXMpOwogfQog Ci12b2lkIFdlYlBhZ2VTZXJpYWxpemVySW1wbDo6b3BlblRhZ1RvU3RyaW5nKGNvbnN0IEVsZW1l bnQqIGVsZW1lbnQsCit2b2lkIFdlYlBhZ2VTZXJpYWxpemVySW1wbDo6b3BlblRhZ1RvU3RyaW5n KEVsZW1lbnQqIGVsZW1lbnQsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIFNlcmlhbGl6ZURvbVBhcmFtKiBwYXJhbSkKIHsKICAgICAvLyBGSVhNRTogdXNlIFN0 cmluZ0J1aWxkZXIgaW5zdGVhZCBvZiBTdHJpbmcuCkBAIC0zMjgsMTEgKzMyOCwxMyBAQCB2b2lk IFdlYlBhZ2VTZXJpYWxpemVySW1wbDo6b3BlblRhZ1RvU3RyCiAgICAgICAgICAgICAgICAgICAg ICAgICByZXN1bHQgKz0gYXR0clZhbHVlOwogICAgICAgICAgICAgICAgICAgICBlbHNlIHsKICAg ICAgICAgICAgICAgICAgICAgICAgIC8vIEdldCB0aGUgYWJzb2x1dGUgbGluawotICAgICAgICAg ICAgICAgICAgICAgICAgU3RyaW5nIGNvbXBsZXRlVVJMID0gcGFyYW0tPmRvY3VtZW50LT5jb21w bGV0ZVVSTChhdHRyVmFsdWUpOworICAgICAgICAgICAgICAgICAgICAgICAgV2ViRnJhbWVJbXBs KiBzdWJGcmFtZSA9IFdlYkZyYW1lSW1wbDo6ZnJvbUZyYW1lT3duZXJFbGVtZW50KGVsZW1lbnQp OworICAgICAgICAgICAgICAgICAgICAgICAgU3RyaW5nIGNvbXBsZXRlVVJMID0gc3ViRnJhbWUg PyBzdWJGcmFtZS0+ZnJhbWUoKS0+ZG9jdW1lbnQoKS0+dXJsKCkgOiAKKyAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcGFyYW0tPmRvY3VtZW50 LT5jb21wbGV0ZVVSTChhdHRyVmFsdWUpOwogICAgICAgICAgICAgICAgICAgICAgICAgLy8gQ2hl Y2sgd2hldGhlciB3ZSBoYXZlIGxvY2FsIGZpbGVzIGZvciB0aG9zZSBsaW5rLgogICAgICAgICAg ICAgICAgICAgICAgICAgaWYgKG1fbG9jYWxMaW5rcy5jb250YWlucyhjb21wbGV0ZVVSTCkpIHsK LSAgICAgICAgICAgICAgICAgICAgICAgICAgICBpZiAoIW1fbG9jYWxEaXJlY3RvcnlOYW1lLmlz RW1wdHkoKSkKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcmVzdWx0ICs9ICIuLyIg KyBtX2xvY2FsRGlyZWN0b3J5TmFtZSArICIvIjsKKyAgICAgICAgICAgICAgICAgICAgICAgICAg ICBpZiAoIXBhcmFtLT5kaXJlY3RvcnlOYW1lLmlzRW1wdHkoKSkKKyAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgcmVzdWx0ICs9ICIuLyIgKyBwYXJhbS0+ZGlyZWN0b3J5TmFtZSArICIv IjsKICAgICAgICAgICAgICAgICAgICAgICAgICAgICByZXN1bHQgKz0gbV9sb2NhbExpbmtzLmdl dChjb21wbGV0ZVVSTCk7CiAgICAgICAgICAgICAgICAgICAgICAgICB9IGVsc2UKICAgICAgICAg ICAgICAgICAgICAgICAgICAgICByZXN1bHQgKz0gY29tcGxldGVVUkw7CkBAIC0zNjAsNyArMzYy LDcgQEAgdm9pZCBXZWJQYWdlU2VyaWFsaXplckltcGw6Om9wZW5UYWdUb1N0cgogfQogCiAvLyBT ZXJpYWxpemUgZW5kIHRhZyBvZiBhbiBzcGVjaWZpZWQgZWxlbWVudC4KLXZvaWQgV2ViUGFnZVNl cmlhbGl6ZXJJbXBsOjplbmRUYWdUb1N0cmluZyhjb25zdCBFbGVtZW50KiBlbGVtZW50LAordm9p ZCBXZWJQYWdlU2VyaWFsaXplckltcGw6OmVuZFRhZ1RvU3RyaW5nKEVsZW1lbnQqIGVsZW1lbnQs CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgU2VyaWFsaXplRG9t UGFyYW0qIHBhcmFtKQogewogICAgIGJvb2wgbmVlZFNraXA7CkBAIC0zOTcsMTggKzM5OSwxOCBA QCB2b2lkIFdlYlBhZ2VTZXJpYWxpemVySW1wbDo6ZW5kVGFnVG9TdHJpCiAgICAgc2F2ZUhUTUxD b250ZW50VG9CdWZmZXIocmVzdWx0LCBwYXJhbSk7CiB9CiAKLXZvaWQgV2ViUGFnZVNlcmlhbGl6 ZXJJbXBsOjpidWlsZENvbnRlbnRGb3JOb2RlKGNvbnN0IE5vZGUqIG5vZGUsCit2b2lkIFdlYlBh Z2VTZXJpYWxpemVySW1wbDo6YnVpbGRDb250ZW50Rm9yTm9kZShOb2RlKiBub2RlLAogICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgU2VyaWFsaXplRG9tUGFy YW0qIHBhcmFtKQogewogICAgIHN3aXRjaCAobm9kZS0+bm9kZVR5cGUoKSkgewogICAgIGNhc2Ug Tm9kZTo6RUxFTUVOVF9OT0RFOgogICAgICAgICAvLyBQcm9jZXNzIG9wZW4gdGFnIG9mIGVsZW1l bnQuCi0gICAgICAgIG9wZW5UYWdUb1N0cmluZyhzdGF0aWNfY2FzdDxjb25zdCBFbGVtZW50Kj4o bm9kZSksIHBhcmFtKTsKKyAgICAgICAgb3BlblRhZ1RvU3RyaW5nKHN0YXRpY19jYXN0PEVsZW1l bnQqPihub2RlKSwgcGFyYW0pOwogICAgICAgICAvLyBXYWxrIHRocm91Z2ggdGhlIGNoaWxkcmVu IG5vZGVzIGFuZCBwcm9jZXNzIGl0LgotICAgICAgICBmb3IgKGNvbnN0IE5vZGUgKmNoaWxkID0g bm9kZS0+Zmlyc3RDaGlsZCgpOyBjaGlsZDsgY2hpbGQgPSBjaGlsZC0+bmV4dFNpYmxpbmcoKSkK KyAgICAgICAgZm9yIChOb2RlICpjaGlsZCA9IG5vZGUtPmZpcnN0Q2hpbGQoKTsgY2hpbGQ7IGNo aWxkID0gY2hpbGQtPm5leHRTaWJsaW5nKCkpCiAgICAgICAgICAgICBidWlsZENvbnRlbnRGb3JO b2RlKGNoaWxkLCBwYXJhbSk7CiAgICAgICAgIC8vIFByb2Nlc3MgZW5kIHRhZyBvZiBlbGVtZW50 LgotICAgICAgICBlbmRUYWdUb1N0cmluZyhzdGF0aWNfY2FzdDxjb25zdCBFbGVtZW50Kj4obm9k ZSksIHBhcmFtKTsKKyAgICAgICAgZW5kVGFnVG9TdHJpbmcoc3RhdGljX2Nhc3Q8RWxlbWVudCo+ KG5vZGUpLCBwYXJhbSk7CiAgICAgICAgIGJyZWFrOwogICAgIGNhc2UgTm9kZTo6VEVYVF9OT0RF OgogICAgICAgICBzYXZlSFRNTENvbnRlbnRUb0J1ZmZlcihjcmVhdGVNYXJrdXAobm9kZSksIHBh cmFtKTsKSW5kZXg6IFNvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlBhZ2VTZXJpYWxpemVy SW1wbC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlBhZ2VT ZXJpYWxpemVySW1wbC5oCShyZXZpc2lvbiA4MjkyNSkKKysrIFNvdXJjZS9XZWJLaXQvY2hyb21p dW0vc3JjL1dlYlBhZ2VTZXJpYWxpemVySW1wbC5oCSh3b3JraW5nIGNvcHkpCkBAIC0xNzQsMTMg KzE3NCwxMyBAQCBwcml2YXRlOgogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgU2VyaWFs aXplRG9tUGFyYW0qIHBhcmFtLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgRmx1c2hP cHRpb24pOwogICAgIC8vIFNlcmlhbGl6ZSBvcGVuIHRhZyBvZiBhbiBzcGVjaWZpZWQgZWxlbWVu dC4KLSAgICB2b2lkIG9wZW5UYWdUb1N0cmluZyhjb25zdCBXZWJDb3JlOjpFbGVtZW50KiBlbGVt ZW50LAorICAgIHZvaWQgb3BlblRhZ1RvU3RyaW5nKFdlYkNvcmU6OkVsZW1lbnQqLAogICAgICAg ICAgICAgICAgICAgICAgICAgIFNlcmlhbGl6ZURvbVBhcmFtKiBwYXJhbSk7CiAgICAgLy8gU2Vy aWFsaXplIGVuZCB0YWcgb2YgYW4gc3BlY2lmaWVkIGVsZW1lbnQuCi0gICAgdm9pZCBlbmRUYWdU b1N0cmluZyhjb25zdCBXZWJDb3JlOjpFbGVtZW50KiBlbGVtZW50LAorICAgIHZvaWQgZW5kVGFn VG9TdHJpbmcoV2ViQ29yZTo6RWxlbWVudCosCiAgICAgICAgICAgICAgICAgICAgICAgICBTZXJp YWxpemVEb21QYXJhbSogcGFyYW0pOwogICAgIC8vIEJ1aWxkIGNvbnRlbnQgZm9yIGEgc3BlY2lm aWVkIG5vZGUKLSAgICB2b2lkIGJ1aWxkQ29udGVudEZvck5vZGUoY29uc3QgV2ViQ29yZTo6Tm9k ZSogbm9kZSwKKyAgICB2b2lkIGJ1aWxkQ29udGVudEZvck5vZGUoV2ViQ29yZTo6Tm9kZSosCiAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIFNlcmlhbGl6ZURvbVBhcmFtKiBwYXJhbSk7CiB9 OwogCg== 88764 2011-04-07 21:21:03 -0700 2011-04-07 21:59:58 -0700 Patch for landing bug-53897-20110408062100.patch text/plain 6126 paroga U3VidmVyc2lvbiBSZXZpc2lvbjogODMyNDcKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKaW5kZXgg OWJkOTUzNDM1ZjBkOTMzOTRiY2MxYzFlZjllYTM0MWQ0NjZhMDU0OC4uZWNhMzMzMjJiODgwM2Rl OGYxMzg2MDhlMTk2MTAyOWJmMGJhNGI4OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJv bWl1bS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKQEAg LTEsMyArMSwyNiBAQAorMjAxMS0wNC0wNyAgTWFnbnVzIERhbmllbHNzb24gIDxwdWJsaWNAZnV6 emFjLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBEYXJpbiBGaXNoZXIuCisKKyAgICAgICAg W2Nocm9taXVtXSBXZWJQYWdlU2VyaWFsaXplckltcGwgZG9lc24ndCBzZXJpYWxpemUgc3ViLWZy YW1lcyBjb3JyZWN0bHkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTUzODk3CisKKyAgICAgICAgV2hlbiBzZXJpYWxpemluZyBhIHdlYiBwYWdlIHVzaW5n ICdzYXZlIHBhZ2UgYXMnLCBzdWItZnJhbWVzIGFuZCByZXNvdXJjZXMgZ2V0cworICAgICAgICBz YXZlZCBpbiBhIHN1Yi1kaXJlY3RvcnkuIEhvd2V2ZXIsIGZyYW1lIGVsZW1lbnRzIGRpZG4ndCBn ZXQgdXBkYXRlZCB0byByZWZlcmVuY2UKKyAgICAgICAgdGhlc2Ugc2F2ZWQgc3ViLWZyYW1lcywg YnV0IHdlcmUgc3RpbGwgcmVmZXJlbmNpbmcgdGhlIG9yaWdpbmFsIHVybC4gU28gd2hlbiBvcGVu aW5nCisgICAgICAgIGEgc2F2ZWQgd2ViIHBhZ2UsIGFueSBzdWItZnJhbWVzIHdvdWxkIGdldCBw dWxsZWQgaW4gZnJvbSB0aGUgb3JpZ2luYWwgdXJsIHJhdGhlciB0aGFuIAorICAgICAgICB3aGF0 IHdhcyBzYXZlZC4KKworICAgICAgICBJbiBhZGRpdGlvbiB0byB0aGlzLCBzdWItZnJhbWVzIGlu IHRoZSBzdWItZGlyZWN0b3J5IGVycm9uZW91c2x5IGhhZCB0aGUgbmFtZSBvZiB0aGUKKyAgICAg ICAgc3ViLWRpcmVjdG9yeSBwcmVwZW5kZWQgdG8gdGhlIHBhdGggb2YgcmVzb3VyY2VzIGxvY2F0 ZWQgaW4gdGhlIHNhbWUgc3ViLWRpcmVjdG9yeS4KKworICAgICAgICAqIHNyYy9XZWJQYWdlU2Vy aWFsaXplckltcGwuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlU2VyaWFsaXplckltcGw6 Om9wZW5UYWdUb1N0cm5lOiBGaXhlZCByZXNvdXJjZSBwYXRocyBpbiBzdWItZnJhbWVzLiAKKyAg ICAgICAgQWxzbyBtYWRlIHN1cmUgc3ViLWZyYW1lcyBhcmUgcmVmZXJlbmNlZCBjb3JyZWN0bHkg ZnJvbSBwYXJlbnQgZnJhbWUuCisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VTZXJpYWxpemVySW1w bDo6ZW5kVGFnVG9TdHJpbmcpOiBSZW1vdmVkIGNvbnN0bmVzcyBmcm9tIGFyZ3VtZW50LgorICAg ICAgICAoV2ViS2l0OjpXZWJQYWdlU2VyaWFsaXplckltcGw6OmJ1aWxkQ29udGVudEZvck5vZGUp OiBEaXR0by4KKyAgICAgICAgKiBzcmMvV2ViUGFnZVNlcmlhbGl6ZXJJbXBsLmg6CisKIDIwMTEt MDQtMDcgIEFuZHJldyBTY2hlcmt1cyAgPHNjaGVya3VzQGNocm9taXVtLm9yZz4KIAogICAgICAg ICBSZXZlcnQgRU5BQkxFX1RSQUNLIHBhdGNoIGR1ZSB0byBjb21waWxlIGZhaWx1cmVzLgpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViUGFnZVNlcmlhbGl6ZXJJbXBs LmNwcCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlBhZ2VTZXJpYWxpemVySW1wbC5j cHAKaW5kZXggNGI2NWI5ZTdlN2NjZmE4NGY1ZjEwZWFmZmI5ZjY5NzNkODI3M2JkMi4uMjgwNzQ3 ZjMwNThiYjAyNzViNmJjYzhmODY3ZmIyMjQ4NzEwNjEzMSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdC9jaHJvbWl1bS9zcmMvV2ViUGFnZVNlcmlhbGl6ZXJJbXBsLmNwcAorKysgYi9Tb3VyY2Uv V2ViS2l0L2Nocm9taXVtL3NyYy9XZWJQYWdlU2VyaWFsaXplckltcGwuY3BwCkBAIC0yOTUsNyAr Mjk1LDcgQEAgdm9pZCBXZWJQYWdlU2VyaWFsaXplckltcGw6OmVuY29kZUFuZEZsdXNoQnVmZmVy KAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgc3RhdHVzKTsKIH0KIAot dm9pZCBXZWJQYWdlU2VyaWFsaXplckltcGw6Om9wZW5UYWdUb1N0cmluZyhjb25zdCBFbGVtZW50 KiBlbGVtZW50LAordm9pZCBXZWJQYWdlU2VyaWFsaXplckltcGw6Om9wZW5UYWdUb1N0cmluZyhF bGVtZW50KiBlbGVtZW50LAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICBTZXJpYWxpemVEb21QYXJhbSogcGFyYW0pCiB7CiAgICAgLy8gRklYTUU6IHVzZSBTdHJp bmdCdWlsZGVyIGluc3RlYWQgb2YgU3RyaW5nLgpAQCAtMzI4LDExICszMjgsMTMgQEAgdm9pZCBX ZWJQYWdlU2VyaWFsaXplckltcGw6Om9wZW5UYWdUb1N0cmluZyhjb25zdCBFbGVtZW50KiBlbGVt ZW50LAogICAgICAgICAgICAgICAgICAgICAgICAgcmVzdWx0ICs9IGF0dHJWYWx1ZTsKICAgICAg ICAgICAgICAgICAgICAgZWxzZSB7CiAgICAgICAgICAgICAgICAgICAgICAgICAvLyBHZXQgdGhl IGFic29sdXRlIGxpbmsKLSAgICAgICAgICAgICAgICAgICAgICAgIFN0cmluZyBjb21wbGV0ZVVS TCA9IHBhcmFtLT5kb2N1bWVudC0+Y29tcGxldGVVUkwoYXR0clZhbHVlKTsKKyAgICAgICAgICAg ICAgICAgICAgICAgIFdlYkZyYW1lSW1wbCogc3ViRnJhbWUgPSBXZWJGcmFtZUltcGw6OmZyb21G cmFtZU93bmVyRWxlbWVudChlbGVtZW50KTsKKyAgICAgICAgICAgICAgICAgICAgICAgIFN0cmlu ZyBjb21wbGV0ZVVSTCA9IHN1YkZyYW1lID8gc3ViRnJhbWUtPmZyYW1lKCktPmRvY3VtZW50KCkt PnVybCgpIDogCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIHBhcmFtLT5kb2N1bWVudC0+Y29tcGxldGVVUkwoYXR0clZhbHVlKTsKICAgICAg ICAgICAgICAgICAgICAgICAgIC8vIENoZWNrIHdoZXRoZXIgd2UgaGF2ZSBsb2NhbCBmaWxlcyBm b3IgdGhvc2UgbGluay4KICAgICAgICAgICAgICAgICAgICAgICAgIGlmIChtX2xvY2FsTGlua3Mu Y29udGFpbnMoY29tcGxldGVVUkwpKSB7Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgaWYg KCFtX2xvY2FsRGlyZWN0b3J5TmFtZS5pc0VtcHR5KCkpCi0gICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIHJlc3VsdCArPSAiLi8iICsgbV9sb2NhbERpcmVjdG9yeU5hbWUgKyAiLyI7Cisg ICAgICAgICAgICAgICAgICAgICAgICAgICAgaWYgKCFwYXJhbS0+ZGlyZWN0b3J5TmFtZS5pc0Vt cHR5KCkpCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHJlc3VsdCArPSAiLi8iICsg cGFyYW0tPmRpcmVjdG9yeU5hbWUgKyAiLyI7CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAg cmVzdWx0ICs9IG1fbG9jYWxMaW5rcy5nZXQoY29tcGxldGVVUkwpOwogICAgICAgICAgICAgICAg ICAgICAgICAgfSBlbHNlCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcmVzdWx0ICs9IGNv bXBsZXRlVVJMOwpAQCAtMzYwLDcgKzM2Miw3IEBAIHZvaWQgV2ViUGFnZVNlcmlhbGl6ZXJJbXBs OjpvcGVuVGFnVG9TdHJpbmcoY29uc3QgRWxlbWVudCogZWxlbWVudCwKIH0KIAogLy8gU2VyaWFs aXplIGVuZCB0YWcgb2YgYW4gc3BlY2lmaWVkIGVsZW1lbnQuCi12b2lkIFdlYlBhZ2VTZXJpYWxp emVySW1wbDo6ZW5kVGFnVG9TdHJpbmcoY29uc3QgRWxlbWVudCogZWxlbWVudCwKK3ZvaWQgV2Vi UGFnZVNlcmlhbGl6ZXJJbXBsOjplbmRUYWdUb1N0cmluZyhFbGVtZW50KiBlbGVtZW50LAogICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFNlcmlhbGl6ZURvbVBhcmFt KiBwYXJhbSkKIHsKICAgICBib29sIG5lZWRTa2lwOwpAQCAtMzk3LDE4ICszOTksMTggQEAgdm9p ZCBXZWJQYWdlU2VyaWFsaXplckltcGw6OmVuZFRhZ1RvU3RyaW5nKGNvbnN0IEVsZW1lbnQqIGVs ZW1lbnQsCiAgICAgc2F2ZUhUTUxDb250ZW50VG9CdWZmZXIocmVzdWx0LCBwYXJhbSk7CiB9CiAK LXZvaWQgV2ViUGFnZVNlcmlhbGl6ZXJJbXBsOjpidWlsZENvbnRlbnRGb3JOb2RlKGNvbnN0IE5v ZGUqIG5vZGUsCit2b2lkIFdlYlBhZ2VTZXJpYWxpemVySW1wbDo6YnVpbGRDb250ZW50Rm9yTm9k ZShOb2RlKiBub2RlLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgU2VyaWFsaXplRG9tUGFyYW0qIHBhcmFtKQogewogICAgIHN3aXRjaCAobm9kZS0+bm9k ZVR5cGUoKSkgewogICAgIGNhc2UgTm9kZTo6RUxFTUVOVF9OT0RFOgogICAgICAgICAvLyBQcm9j ZXNzIG9wZW4gdGFnIG9mIGVsZW1lbnQuCi0gICAgICAgIG9wZW5UYWdUb1N0cmluZyhzdGF0aWNf Y2FzdDxjb25zdCBFbGVtZW50Kj4obm9kZSksIHBhcmFtKTsKKyAgICAgICAgb3BlblRhZ1RvU3Ry aW5nKHN0YXRpY19jYXN0PEVsZW1lbnQqPihub2RlKSwgcGFyYW0pOwogICAgICAgICAvLyBXYWxr IHRocm91Z2ggdGhlIGNoaWxkcmVuIG5vZGVzIGFuZCBwcm9jZXNzIGl0LgotICAgICAgICBmb3Ig KGNvbnN0IE5vZGUgKmNoaWxkID0gbm9kZS0+Zmlyc3RDaGlsZCgpOyBjaGlsZDsgY2hpbGQgPSBj aGlsZC0+bmV4dFNpYmxpbmcoKSkKKyAgICAgICAgZm9yIChOb2RlICpjaGlsZCA9IG5vZGUtPmZp cnN0Q2hpbGQoKTsgY2hpbGQ7IGNoaWxkID0gY2hpbGQtPm5leHRTaWJsaW5nKCkpCiAgICAgICAg ICAgICBidWlsZENvbnRlbnRGb3JOb2RlKGNoaWxkLCBwYXJhbSk7CiAgICAgICAgIC8vIFByb2Nl c3MgZW5kIHRhZyBvZiBlbGVtZW50LgotICAgICAgICBlbmRUYWdUb1N0cmluZyhzdGF0aWNfY2Fz dDxjb25zdCBFbGVtZW50Kj4obm9kZSksIHBhcmFtKTsKKyAgICAgICAgZW5kVGFnVG9TdHJpbmco c3RhdGljX2Nhc3Q8RWxlbWVudCo+KG5vZGUpLCBwYXJhbSk7CiAgICAgICAgIGJyZWFrOwogICAg IGNhc2UgTm9kZTo6VEVYVF9OT0RFOgogICAgICAgICBzYXZlSFRNTENvbnRlbnRUb0J1ZmZlcihj cmVhdGVNYXJrdXAobm9kZSksIHBhcmFtKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vc3JjL1dlYlBhZ2VTZXJpYWxpemVySW1wbC5oIGIvU291cmNlL1dlYktpdC9jaHJvbWl1 bS9zcmMvV2ViUGFnZVNlcmlhbGl6ZXJJbXBsLmgKaW5kZXggNWVlODgwNTM2Mjk4YjExMzFjNmRh N2QyMjc5YjUxZGUxZTVhNjA2NC4uYjUzYmQ2NjM1NjU4MWQyYmM5NGI0YjRhMjEwMDY5OWU0ZjQ3 ZDc1MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViUGFnZVNlcmlh bGl6ZXJJbXBsLmgKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViUGFnZVNlcmlh bGl6ZXJJbXBsLmgKQEAgLTE3NCwxMyArMTc0LDEzIEBAIHByaXZhdGU6CiAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICBTZXJpYWxpemVEb21QYXJhbSogcGFyYW0sCiAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICBGbHVzaE9wdGlvbik7CiAgICAgLy8gU2VyaWFsaXplIG9wZW4gdGFn IG9mIGFuIHNwZWNpZmllZCBlbGVtZW50LgotICAgIHZvaWQgb3BlblRhZ1RvU3RyaW5nKGNvbnN0 IFdlYkNvcmU6OkVsZW1lbnQqIGVsZW1lbnQsCisgICAgdm9pZCBvcGVuVGFnVG9TdHJpbmcoV2Vi Q29yZTo6RWxlbWVudCosCiAgICAgICAgICAgICAgICAgICAgICAgICAgU2VyaWFsaXplRG9tUGFy YW0qIHBhcmFtKTsKICAgICAvLyBTZXJpYWxpemUgZW5kIHRhZyBvZiBhbiBzcGVjaWZpZWQgZWxl bWVudC4KLSAgICB2b2lkIGVuZFRhZ1RvU3RyaW5nKGNvbnN0IFdlYkNvcmU6OkVsZW1lbnQqIGVs ZW1lbnQsCisgICAgdm9pZCBlbmRUYWdUb1N0cmluZyhXZWJDb3JlOjpFbGVtZW50KiwKICAgICAg ICAgICAgICAgICAgICAgICAgIFNlcmlhbGl6ZURvbVBhcmFtKiBwYXJhbSk7CiAgICAgLy8gQnVp bGQgY29udGVudCBmb3IgYSBzcGVjaWZpZWQgbm9kZQotICAgIHZvaWQgYnVpbGRDb250ZW50Rm9y Tm9kZShjb25zdCBXZWJDb3JlOjpOb2RlKiBub2RlLAorICAgIHZvaWQgYnVpbGRDb250ZW50Rm9y Tm9kZShXZWJDb3JlOjpOb2RlKiwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgU2VyaWFs aXplRG9tUGFyYW0qIHBhcmFtKTsKIH07CiAK