73869 2011-12-05 15:09:29 -0800 BlackBerry PlayBook doesn't sniff mime types 2012-03-26 23:39:02 -0700 1 1 1 Unclassified WebKit Page Loading 528+ (Nightly build) Other Other RESOLVED FIXED P2 Normal --- 73791 73144 0 tabbott webkit-unassigned charles.wei leo.yang rakuco rwlbuis tonikitoo webkit.review.bot oldest_to_newest 515435 0 tabbott 2011-12-05 15:09:29 -0800 Need to hook up the mime type sniffer. 515890 1 118046 tabbott 2011-12-06 07:12:56 -0800 Created attachment 118046 hook up MIMESniffer 515920 2 118046 rwlbuis 2011-12-06 08:05:38 -0800 Comment on attachment 118046 hook up MIMESniffer View in context: https://bugs.webkit.org/attachment.cgi?id=118046&action=review This really needs a ChangeLog! Looks quite good otherwise. > Source/WebCore/platform/network/MIMESniffing.cpp:28 > +using std::strlen; This should not be needed. Also it may be better to do this in a seperate bug. > Source/WebCore/platform/network/blackberry/NetworkJob.cpp:364 > + if (pos != -1) { pos variable can be introduced in the if > Source/WebCore/platform/network/blackberry/NetworkJob.cpp:374 > + const char* type = sniffer.sniff(buf, len); Can be included in if. > Source/WebCore/platform/network/blackberry/NetworkJob.cpp:376 > + m_sniffedMimeType = WTF::String(type); Wrong indentation. 516160 3 118092 tabbott 2011-12-06 12:36:15 -0800 Created attachment 118092 cleaned up some style, added changelog entry 516163 4 118092 rwlbuis 2011-12-06 12:41:53 -0800 Comment on attachment 118092 cleaned up some style, added changelog entry View in context: https://bugs.webkit.org/attachment.cgi?id=118092&action=review The code looks great to me, but ChangeLog does not follow the required format. Probably last round but r1 for now. > Source/WebCore/ChangeLog:19 > + The ChangeLog is not quite right, it goes: bug title bug url reviewed by Description of the solution Tests, or why there are no tests. 516173 5 118096 tabbott 2011-12-06 12:51:59 -0800 Created attachment 118096 correct changelog format 516177 6 118099 tabbott 2011-12-06 12:55:32 -0800 Created attachment 118099 previous patch introduced unwanted changes 516185 7 118099 rwlbuis 2011-12-06 13:09:11 -0800 Comment on attachment 118099 previous patch introduced unwanted changes View in context: https://bugs.webkit.org/attachment.cgi?id=118099&action=review > Source/WebCore/ChangeLog:1 > +2011-12-06 Tyler Abbott <tabbott@rim.com> needs an empty line before the bug title > Source/WebCore/ChangeLog:7 > + Hook up MIMESniffing. Override Content-Types will I'd say "Hook up MIMESniffing for the BlackBerry port. 516200 8 118102 tabbott 2011-12-06 13:36:44 -0800 Created attachment 118102 better commit message 516205 9 118102 rwlbuis 2011-12-06 13:38:07 -0800 Comment on attachment 118102 better commit message LGTM 516265 10 118102 webkit.review.bot 2011-12-06 14:39:07 -0800 Comment on attachment 118102 better commit message Rejecting attachment 118102 from commit-queue. Failed to run "['/mnt/git/webkit-commit-queue/Tools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '-..." exit_code: 2 Last 500 characters of output: ED at 346. Hunk #5 FAILED at 551. 5 out of 5 hunks FAILED -- saving rejects to file Source/WebCore/platform/network/blackberry/NetworkJob.cpp.rej patching file Source/WebCore/platform/network/blackberry/NetworkJob.h Hunk #1 FAILED at 152. Hunk #2 FAILED at 177. 2 out of 2 hunks FAILED -- saving rejects to file Source/WebCore/platform/network/blackberry/NetworkJob.h.rej Failed to run "[u'/mnt/git/webkit-commit-queue/Tools/Scripts/svn-apply', u'--reviewer', u'Rob Buis', u'--force']" exit_code: 1 Full output: http://queues.webkit.org/results/10736865 516273 11 tabbott 2011-12-06 14:52:44 -0800 (In reply to comment #10) > (From update of attachment 118102 [details]) > Rejecting attachment 118102 [details] from commit-queue. > > Failed to run "['/mnt/git/webkit-commit-queue/Tools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '-..." exit_code: 2 > > Last 500 characters of output: > ED at 346. > Hunk #5 FAILED at 551. > 5 out of 5 hunks FAILED -- saving rejects to file Source/WebCore/platform/network/blackberry/NetworkJob.cpp.rej > patching file Source/WebCore/platform/network/blackberry/NetworkJob.h > Hunk #1 FAILED at 152. > Hunk #2 FAILED at 177. > 2 out of 2 hunks FAILED -- saving rejects to file Source/WebCore/platform/network/blackberry/NetworkJob.h.rej > > Failed to run "[u'/mnt/git/webkit-commit-queue/Tools/Scripts/svn-apply', u'--reviewer', u'Rob Buis', u'--force']" exit_code: 1 > > Full output: http://queues.webkit.org/results/10736865 Looks like these files haven't been pushed upstream yet. Thanks for the review Rob. 516352 12 leo.yang 2011-12-06 16:34:35 -0800 A nit: remove WTF:: before String because it's unnecessary and you need to keep the same style with other usage of String in the same file. 525681 13 118102 eric 2011-12-21 15:06:05 -0800 Comment on attachment 118102 better commit message He's not a committer, so this might as well be r-. 549720 14 tonikitoo 2012-02-05 21:44:24 -0800 (In reply to comment #13) > (From update of attachment 118102 [details]) > He's not a committer, so this might as well be r-. tyler, please move on here :-) 549980 15 tabbott 2012-02-06 07:17:21 -0800 (In reply to comment #14) > (In reply to comment #13) > > (From update of attachment 118102 [details] [details]) > > He's not a committer, so this might as well be r-. > > tyler, please move on here :-) This is on my TODO list :-) 575209 16 131105 tabbott 2012-03-09 14:12:32 -0800 Created attachment 131105 The old patch was stale, here is a fresh one. 575221 17 131105 rwlbuis 2012-03-09 14:24:20 -0800 Comment on attachment 131105 The old patch was stale, here is a fresh one. LGTM. 575409 18 131105 webkit.review.bot 2012-03-09 18:56:09 -0800 Comment on attachment 131105 The old patch was stale, here is a fresh one. Clearing flags on attachment: 131105 Committed r110361: <http://trac.webkit.org/changeset/110361> 575410 19 webkit.review.bot 2012-03-09 18:56:15 -0800 All reviewed patches have been landed. Closing bug. 588596 20 charles.wei 2012-03-26 23:39:02 -0700 *** Bug 75340 has been marked as a duplicate of this bug. *** 118046 2011-12-06 07:12:56 -0800 2011-12-06 12:36:15 -0800 hook up MIMESniffer 0001-2011-12-05-Tyler-Abbott-tabbott-rim.com.patch text/plain 6307 tabbott RnJvbSA5M2I2YWI2OGEyZTMxYTEyOWY1NjVjNTEwNWFiNmU4Yjg2Y2FmZmU2IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBUeWxlciBBYmJvdHQgPHRhYmJvdHRAcmltLmNvbT4KRGF0ZTog TW9uLCA1IERlYyAyMDExIDE2OjA0OjUwIC0wNTAwClN1YmplY3Q6IFtQQVRDSF0gMjAxMS0xMi0w NSAgVHlsZXIgQWJib3R0ICA8dGFiYm90dEByaW0uY29tPgoKICAgICAgICBDb21waWxlIGFuZCBo b29rIHVwIE1JTUVTbmlmZmluZy4gT3ZlcnJpZGUgQ29udGVudC1UeXBlcyB3aWxsCiAgICAgICAg bm90IGJlIG92ZXJyaWRlbi4gRmlsZSBleHRlbnNpb25zIHdpbGwgYmUgdHJ1c3RlZCB3aGVuIGNv bnRlbnQKICAgICAgICBpcyBsb2FkZWQgZnJvbSBkaXNrLgoKICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KCiAgICAgICAgTm8gbmV3IHRlc3RzLiAoT09QUyEpCgogICAgICAgICog Q01ha2VMaXN0c0JsYWNrQmVycnkudHh0OgogICAgICAgICogcGxhdGZvcm0vbmV0d29yay9NSU1F U25pZmZpbmcuY3BwOgogICAgICAgICogcGxhdGZvcm0vbmV0d29yay9ibGFja2JlcnJ5L05ldHdv cmtKb2IuY3BwOgogICAgICAgIChXZWJDb3JlOjpOZXR3b3JrSm9iOjpOZXR3b3JrSm9iKToKICAg ICAgICAoV2ViQ29yZTo6TmV0d29ya0pvYjo6aW5pdGlhbGl6ZSk6CiAgICAgICAgKFdlYkNvcmU6 Ok5ldHdvcmtKb2I6OmhhbmRsZU5vdGlmeURhdGFSZWNlaXZlZCk6CiAgICAgICAgKiBwbGF0Zm9y bS9uZXR3b3JrL2JsYWNrYmVycnkvTmV0d29ya0pvYi5oOgotLS0KIFNvdXJjZS9XZWJDb3JlL0NN YWtlTGlzdHNCbGFja0JlcnJ5LnR4dCAgICAgICAgICAgIHwgICAgMSArCiBTb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9uZXR3b3JrL01JTUVTbmlmZmluZy5jcHAgICB8ICAgIDQgKysKIC4uLi9wbGF0 Zm9ybS9uZXR3b3JrL2JsYWNrYmVycnkvTmV0d29ya0pvYi5jcHAgICAgIHwgICAzNyArKysrKysr KysrKysrKysrKy0tCiAuLi4vcGxhdGZvcm0vbmV0d29yay9ibGFja2JlcnJ5L05ldHdvcmtKb2Iu aCAgICAgICB8ICAgIDIgKwogNCBmaWxlcyBjaGFuZ2VkLCA0MCBpbnNlcnRpb25zKCspLCA0IGRl bGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NNYWtlTGlzdHNCbGFja0Jl cnJ5LnR4dCBiL1NvdXJjZS9XZWJDb3JlL0NNYWtlTGlzdHNCbGFja0JlcnJ5LnR4dAppbmRleCA2 MGFlOThjLi5lNjM3ZWFiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DTWFrZUxpc3RzQmxh Y2tCZXJyeS50eHQKKysrIGIvU291cmNlL1dlYkNvcmUvQ01ha2VMaXN0c0JsYWNrQmVycnkudHh0 CkBAIC04Nyw2ICs4Nyw3IEBAIExJU1QoQVBQRU5EIFdlYkNvcmVfU09VUkNFUwogCiAjIE5ldHdv cmtpbmcgc291cmNlcwogTElTVChBUFBFTkQgV2ViQ29yZV9TT1VSQ0VTCisgICAgcGxhdGZvcm0v bmV0d29yay9NSU1FU25pZmZpbmcuY3BwCiAgICAgcGxhdGZvcm0vbmV0d29yay9Qcm94eVNlcnZl ci5jcHAKICAgICBwbGF0Zm9ybS9uZXR3b3JrL2JsYWNrYmVycnkvQWJvdXREYXRhLmNwcAogICAg IHBsYXRmb3JtL25ldHdvcmsvYmxhY2tiZXJyeS9EZWZlcnJlZERhdGEuY3BwCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL01JTUVTbmlmZmluZy5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL01JTUVTbmlmZmluZy5jcHAKaW5kZXggZjk4Njhj MS4uNTNhYzVmNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9N SU1FU25pZmZpbmcuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvTUlN RVNuaWZmaW5nLmNwcApAQCAtMjMsNiArMjMsMTAgQEAKICNpbmNsdWRlIDxjc3RyaW5nPgogI2lu Y2x1ZGUgPHN0ZGludC5oPgogCit1c2luZyBzdGQ6Om1lbWNtcDsKK3VzaW5nIHN0ZDo6c3RyY21w OwordXNpbmcgc3RkOjpzdHJsZW47CisKIC8vIE1JTUUgdHlwZSBzbmlmZmluZyBpbXBsZW1lbnRh dGlvbiBiYXNlZCBvbiBodHRwOi8vdG9vbHMuaWV0Zi5vcmcvaHRtbC9kcmFmdC1hYmFydGgtbWlt ZS1zbmlmZi0wNgogCiBuYW1lc3BhY2UgewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vbmV0d29yay9ibGFja2JlcnJ5L05ldHdvcmtKb2IuY3BwIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vbmV0d29yay9ibGFja2JlcnJ5L05ldHdvcmtKb2IuY3BwCmluZGV4IGJiZWUwMTgu LjE1MGJhZDQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvYmxh Y2tiZXJyeS9OZXR3b3JrSm9iLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3 b3JrL2JsYWNrYmVycnkvTmV0d29ya0pvYi5jcHAKQEAgLTI4LDYgKzI4LDcgQEAKICNpbmNsdWRl ICJGcmFtZUxvYWRlckNsaWVudEJsYWNrQmVycnkuaCIKICNpbmNsdWRlICJIVFRQUGFyc2Vycy5o IgogI2luY2x1ZGUgIktVUkwuaCIKKyNpbmNsdWRlICJNSU1FU25pZmZpbmcuaCIKICNpbmNsdWRl ICJNSU1FVHlwZVJlZ2lzdHJ5LmgiCiAjaW5jbHVkZSAiTmV0d29ya01hbmFnZXIuaCIKICNpbmNs dWRlICJSZXNvdXJjZUhhbmRsZUNsaWVudC5oIgpAQCAtMTA4LDYgKzEwOSw3IEBAIE5ldHdvcmtK b2I6Ok5ldHdvcmtKb2IoKQogICAgICwgbV9jYWxsaW5nQ2xpZW50KGZhbHNlKQogICAgICwgbV9p c1hIUihmYWxzZSkKICAgICAsIG1fbmVlZHNSZXRyeUFzRlRQRGlyZWN0b3J5KGZhbHNlKQorICAg ICwgbV9pc092ZXJyaWRlQ29udGVudFR5cGUoZmFsc2UpCiB7CiB9CiAKQEAgLTEzOSw4ICsxNDEs MTAgQEAgYm9vbCBOZXR3b3JrSm9iOjppbml0aWFsaXplKGludCBwbGF5ZXJJZCwKIAogICAgIC8v IFdlIGRvbid0IG5lZWQgdG8gZXhwbGljaXRseSBjYWxsIG5vdGlmeUhlYWRlclJlY2VpdmVkLCBh cyB0aGUgQ29udGVudC1UeXBlCiAgICAgLy8gd2lsbCB1bHRpbWF0ZWx5IGdldCBwYXJzZWQgd2hl biBzZW5kUmVzcG9uc2VJZk5lZWRlZCBnZXRzIGNhbGxlZC4KLSAgICBpZiAoIXJlcXVlc3QuZ2V0 T3ZlcnJpZGVDb250ZW50VHlwZSgpLmVtcHR5KCkpCisgICAgaWYgKCFyZXF1ZXN0LmdldE92ZXJy aWRlQ29udGVudFR5cGUoKS5lbXB0eSgpKSB7CiAgICAgICAgIG1fY29udGVudFR5cGUgPSBTdHJp bmcocmVxdWVzdC5nZXRPdmVycmlkZUNvbnRlbnRUeXBlKCkuY19zdHIoKSk7CisgICAgICAgIG1f aXNPdmVycmlkZUNvbnRlbnRUeXBlID0gdHJ1ZTsKKyAgICB9CiAKICAgICBpZiAobV9pc0RhdGEg fHwgbV9pc0Fib3V0KSAvLyBObyBuZWVkIHRvIGNyZWF0ZSB0aGUgc3RyZWFtcyBmb3IgZGF0YSBh bmQgYWJvdXQKICAgICAgICAgcmV0dXJuIHRydWU7CkBAIC0zNDYsNiArMzUwLDMzIEBAIHZvaWQg TmV0d29ya0pvYjo6aGFuZGxlTm90aWZ5RGF0YVJlY2VpdmVkKGNvbnN0IGNoYXIqIGJ1Ziwgc2l6 ZV90IGxlbikKICAgICBpZiAoIWJ1ZiB8fCAhbGVuKQogICAgICAgICByZXR1cm47CiAKKyAgICAv LyBUaGUgbG9hZEZpbGUgQVBJIHNldHMgdGhlIG92ZXJyaWRlIGNvbnRlbnQgdHlwZSwKKyAgICAv LyB0aGlzIHdpbGwgYWx3YXlzIGJlIHVzZWQgYXMgdGhlIGNvbnRlbnQgdHlwZSBhbmQgc2hvdWxk IG5vdCBiZSBvdmVycmlkZGVuLgorICAgIGlmICghbV9kYXRhUmVjZWl2ZWQgJiYgIW1faXNPdmVy cmlkZUNvbnRlbnRUeXBlKSB7CisgICAgICAgIGJvb2wgc2hvdWxkU25pZmYgPSB0cnVlOworCisg ICAgICAgIC8vIERvbid0IGJvdGhlciBzbmlmZmluZyB0aGUgY29udGVudCB0eXBlIG9mIGEgZmls ZSB0aGF0CisgICAgICAgIC8vIGlzIG9uIGEgZmlsZSBzeXN0ZW0gaWYgaXQgaGFzIGEgTUlNRSBt YXBwYWJsZSBmaWxlIGV4dGVuc2lvbi4KKyAgICAgICAgLy8gVGhlIGZpbGUgZXh0ZW5zaW9uIGlz IGxpa2VseSB0byBiZSBjb3JyZWN0LgorICAgICAgICBpZiAobV9pc0ZpbGUpIHsKKyAgICAgICAg ICAgIFdURjo6U3RyaW5nIHVybEZpbGVuYW1lID0gbV9yZXNwb25zZS51cmwoKS5sYXN0UGF0aENv bXBvbmVudCgpOworICAgICAgICAgICAgc2l6ZV90IHBvcyA9IHVybEZpbGVuYW1lLnJldmVyc2VG aW5kKCcuJyk7CisgICAgICAgICAgICBpZiAocG9zICE9IC0xKSB7CisgICAgICAgICAgICAgICAg V1RGOjpTdHJpbmcgZXh0ZW5zaW9uID0gdXJsRmlsZW5hbWUuc3Vic3RyaW5nKHBvcyArIDEpOwor ICAgICAgICAgICAgICAgIFdURjo6U3RyaW5nIG1pbWVUeXBlID0gTUlNRVR5cGVSZWdpc3RyeTo6 Z2V0TUlNRVR5cGVGb3JFeHRlbnNpb24oZXh0ZW5zaW9uKTsKKyAgICAgICAgICAgICAgICBpZiAo IW1pbWVUeXBlLmlzRW1wdHkoKSkKKyAgICAgICAgICAgICAgICAgICAgc2hvdWxkU25pZmYgPSBm YWxzZTsKKyAgICAgICAgICAgIH0KKyAgICAgICAgfQorCisgICAgICAgIGlmIChzaG91bGRTbmlm ZikgeworICAgICAgICAgICAgTUlNRVNuaWZmZXIgc25pZmZlciA9IE1JTUVTbmlmZmVyKG1fY29u dGVudFR5cGUubGF0aW4xKCkuZGF0YSgpLCBNSU1FVHlwZVJlZ2lzdHJ5Ojppc1N1cHBvcnRlZElt YWdlUmVzb3VyY2VNSU1FVHlwZShtX2NvbnRlbnRUeXBlKSk7CisgICAgICAgICAgICBjb25zdCBj aGFyKiB0eXBlID0gc25pZmZlci5zbmlmZihidWYsIGxlbik7CisgICAgICAgICAgICBpZiAodHlw ZSkKKyAgICAgICAgICAgIAltX3NuaWZmZWRNaW1lVHlwZSA9IFdURjo6U3RyaW5nKHR5cGUpOwor ICAgICAgICB9CisgICAgfQorCiAgICAgbV9kYXRhUmVjZWl2ZWQgPSB0cnVlOwogCiAgICAgLy8g cHJvdGVjdCBhZ2FpbnN0IHJlZW50cmFuY3kKQEAgLTU1MSwxMSArNTgyLDkgQEAgdm9pZCBOZXR3 b3JrSm9iOjpzZW5kUmVzcG9uc2VJZk5lZWRlZCgpCiAgICAgLy8gZ2V0IHRoZSBNSU1FIHR5cGUg dGhhdCB3YXMgc2V0IGJ5IHRoZSBjb250ZW50IHNuaWZmZXIKICAgICAvLyBpZiB0aGVyZSdzIG5v IGN1c3RvbSBzbmlmZmVyIGhlYWRlciwgdHJ5IHRvIHNldCBpdCBmcm9tIHRoZSBDb250ZW50LVR5 cGUgaGVhZGVyCiAgICAgLy8gaWYgdGhpcyBmYWlscywgZ3Vlc3MgaXQgZnJvbSBleHRlbnNpb24K LSAgICBTdHJpbmcgbWltZVR5cGU7CisgICAgU3RyaW5nIG1pbWVUeXBlID0gbV9zbmlmZmVkTWlt ZVR5cGU7CiAgICAgaWYgKG1faXNGVFAgJiYgbV9pc0ZUUERpcikKICAgICAgICAgbWltZVR5cGUg PSAiYXBwbGljYXRpb24veC1mdHAtZGlyZWN0b3J5IjsKLSAgICBlbHNlCi0gICAgICAgIG1pbWVU eXBlID0gbV9yZXNwb25zZS5odHRwSGVhZGVyRmllbGQoQmxhY2tCZXJyeTo6UGxhdGZvcm06Ok5l dHdvcmtSZXF1ZXN0OjpIRUFERVJfUklNX1NOSUZGRURfTUlNRV9UWVBFKTsKICAgICBpZiAobWlt ZVR5cGUuaXNOdWxsKCkpCiAgICAgICAgIG1pbWVUeXBlID0gZXh0cmFjdE1JTUVUeXBlRnJvbU1l ZGlhVHlwZShtX2NvbnRlbnRUeXBlKTsKICAgICBpZiAobWltZVR5cGUuaXNOdWxsKCkpCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2JsYWNrYmVycnkvTmV0d29y a0pvYi5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9ibGFja2JlcnJ5L05ldHdv cmtKb2IuaAppbmRleCBhNzg5N2ZhLi5mYzA4OGJjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9uZXR3b3JrL2JsYWNrYmVycnkvTmV0d29ya0pvYi5oCisrKyBiL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvYmxhY2tiZXJyeS9OZXR3b3JrSm9iLmgKQEAgLTE1Miw2 ICsxNTIsNyBAQCBwcml2YXRlOgogICAgIE93blB0cjxNdWx0aXBhcnRSZXNwb25zZURlbGVnYXRl PiBtX211bHRpcGFydERlbGVnYXRlOwogICAgIFRpbWVyPE5ldHdvcmtKb2I+IG1fZGVsZXRlSm9i VGltZXI7CiAgICAgU3RyaW5nIG1fY29udGVudFR5cGU7CisgICAgU3RyaW5nIG1fc25pZmZlZE1p bWVUeXBlOwogICAgIFN0cmluZyBtX2NvbnRlbnREaXNwb3NpdGlvbjsKICAgICBCbGFja0JlcnJ5 OjpQbGF0Zm9ybTo6TmV0d29ya1N0cmVhbUZhY3RvcnkqIG1fc3RyZWFtRmFjdG9yeTsKICAgICBi b29sIG1faXNGaWxlOwpAQCAtMTc3LDYgKzE3OCw3IEBAIHByaXZhdGU6CiAgICAgY29uc3QgRnJh bWUqIG1fZnJhbWU7CiAgICAgYm9vbCBtX2lzWEhSOyAvLyBGSVhNRSAtIEFmdGVyIDcuMCwgcmVt b3ZlIHRoaXMuIE9ubHkgdGhlIFF0IHBvcnQgcmVwb3J0cyBIVFRQIGVycm9yIHN0YXR1c2VzIGFz IGRpZEZhaWxzLCBzbyB3ZSBwcm9iYWJseSBzaG91bGRuJ3QuCiAgICAgYm9vbCBtX25lZWRzUmV0 cnlBc0ZUUERpcmVjdG9yeTsKKyAgICBib29sIG1faXNPdmVycmlkZUNvbnRlbnRUeXBlOwogfTsK IAogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQotLSAKMS43LjEKCg== 118092 2011-12-06 12:36:15 -0800 2011-12-06 12:51:59 -0800 cleaned up some style, added changelog entry 0001-2011-12-06-Tyler-Abbott-tabbott-rim.com.patch text/plain 6906 tabbott RnJvbSBkYTQ1YTA4YWI5NmQwYzA4MDhlMTQyYTcwOWVlMDQxNjliZTk0NjI2IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBUeWxlciBBYmJvdHQgPHRhYmJvdHRAcmltLmNvbT4KRGF0ZTog VHVlLCA2IERlYyAyMDExIDE1OjI1OjU1IC0wNTAwClN1YmplY3Q6IFtQQVRDSF0gMjAxMS0xMi0w NiAgVHlsZXIgQWJib3R0ICA8dGFiYm90dEByaW0uY29tPgoKICAgICAgICBIb29rIHVwIE1JTUVT bmlmZmluZy4gT3ZlcnJpZGUgQ29udGVudC1UeXBlcyB3aWxsCiAgICAgICAgbm90IGJlIG92ZXJy aWRlbi4gRmlsZSBleHRlbnNpb25zIHdpbGwgYmUgdHJ1c3RlZCB3aGVuIGNvbnRlbnQKICAgICAg ICBpcyBsb2FkZWQgZnJvbSBkaXNrLgogICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD03Mzg2OQoKICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K CiAgICAgICAgQmxhY2tCZXJyeSB0ZXN0cyBhcmUgbm90IHlldCBwcmVzZW50IGluIHdlYmtpdC5v cmcgY29kZWJhc2UuCgogICAgICAgICogQ01ha2VMaXN0c0JsYWNrQmVycnkudHh0OgogICAgICAg ICogcGxhdGZvcm0vbmV0d29yay9ibGFja2JlcnJ5L05ldHdvcmtKb2IuY3BwOgogICAgICAgIChX ZWJDb3JlOjpOZXR3b3JrSm9iOjpOZXR3b3JrSm9iKToKICAgICAgICAoV2ViQ29yZTo6TmV0d29y a0pvYjo6aW5pdGlhbGl6ZSk6CiAgICAgICAgKFdlYkNvcmU6Ok5ldHdvcmtKb2I6OmhhbmRsZU5v dGlmeURhdGFSZWNlaXZlZCk6CiAgICAgICAgKFdlYkNvcmU6Ok5ldHdvcmtKb2I6OnNlbmRSZXNw b25zZUlmTmVlZGVkKToKICAgICAgICAqIHBsYXRmb3JtL25ldHdvcmsvYmxhY2tiZXJyeS9OZXR3 b3JrSm9iLmg6Ci0tLQogU291cmNlL1dlYkNvcmUvQ01ha2VMaXN0c0JsYWNrQmVycnkudHh0ICAg ICAgICAgICAgfCAgICAxICsKIFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyAgICAgICAgICAgICAg ICAgICAgICAgICAgIHwgICAxOSArKysrKysrKysrKwogLi4uL3BsYXRmb3JtL25ldHdvcmsvYmxh Y2tiZXJyeS9OZXR3b3JrSm9iLmNwcCAgICAgfCAgIDM1ICsrKysrKysrKysrKysrKysrLS0KIC4u Li9wbGF0Zm9ybS9uZXR3b3JrL2JsYWNrYmVycnkvTmV0d29ya0pvYi5oICAgICAgIHwgICAgMiAr CiA0IGZpbGVzIGNoYW5nZWQsIDUzIGluc2VydGlvbnMoKyksIDQgZGVsZXRpb25zKC0pCgpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvQ01ha2VMaXN0c0JsYWNrQmVycnkudHh0IGIvU291cmNl L1dlYkNvcmUvQ01ha2VMaXN0c0JsYWNrQmVycnkudHh0CmluZGV4IDYwYWU5OGMuLmU2MzdlYWIg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL0NNYWtlTGlzdHNCbGFja0JlcnJ5LnR4dAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9DTWFrZUxpc3RzQmxhY2tCZXJyeS50eHQKQEAgLTg3LDYgKzg3LDcg QEAgTElTVChBUFBFTkQgV2ViQ29yZV9TT1VSQ0VTCiAKICMgTmV0d29ya2luZyBzb3VyY2VzCiBM SVNUKEFQUEVORCBXZWJDb3JlX1NPVVJDRVMKKyAgICBwbGF0Zm9ybS9uZXR3b3JrL01JTUVTbmlm ZmluZy5jcHAKICAgICBwbGF0Zm9ybS9uZXR3b3JrL1Byb3h5U2VydmVyLmNwcAogICAgIHBsYXRm b3JtL25ldHdvcmsvYmxhY2tiZXJyeS9BYm91dERhdGEuY3BwCiAgICAgcGxhdGZvcm0vbmV0d29y ay9ibGFja2JlcnJ5L0RlZmVycmVkRGF0YS5jcHAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCAxNDg1NzlkLi5kZDY1 MWZmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl YkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIgQEAKKzIwMTEtMTItMDYgIFR5bGVyIEFiYm90 dCAgPHRhYmJvdHRAcmltLmNvbT4KKworICAgICAgICBIb29rIHVwIE1JTUVTbmlmZmluZy4gT3Zl cnJpZGUgQ29udGVudC1UeXBlcyB3aWxsCisgICAgICAgIG5vdCBiZSBvdmVycmlkZW4uIEZpbGUg ZXh0ZW5zaW9ucyB3aWxsIGJlIHRydXN0ZWQgd2hlbiBjb250ZW50CisgICAgICAgIGlzIGxvYWRl ZCBmcm9tIGRpc2suCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD03Mzg2OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIEJsYWNrQmVycnkgdGVzdHMgYXJlIG5vdCB5ZXQgcHJlc2VudCBpbiB3ZWJraXQub3JnIGNv ZGViYXNlLgorCisgICAgICAgICogQ01ha2VMaXN0c0JsYWNrQmVycnkudHh0OgorICAgICAgICAq IHBsYXRmb3JtL25ldHdvcmsvYmxhY2tiZXJyeS9OZXR3b3JrSm9iLmNwcDoKKyAgICAgICAgKFdl YkNvcmU6Ok5ldHdvcmtKb2I6Ok5ldHdvcmtKb2IpOgorICAgICAgICAoV2ViQ29yZTo6TmV0d29y a0pvYjo6aW5pdGlhbGl6ZSk6CisgICAgICAgIChXZWJDb3JlOjpOZXR3b3JrSm9iOjpoYW5kbGVO b3RpZnlEYXRhUmVjZWl2ZWQpOgorICAgICAgICAoV2ViQ29yZTo6TmV0d29ya0pvYjo6c2VuZFJl c3BvbnNlSWZOZWVkZWQpOgorICAgICAgICAqIHBsYXRmb3JtL25ldHdvcmsvYmxhY2tiZXJyeS9O ZXR3b3JrSm9iLmg6CisKIDIwMTEtMDktMTUgIFl1dGEgS2l0YW11cmEgIDx5dXRha0BjaHJvbWl1 bS5vcmc+CiAKICAgICAgICAgVGhyZWFkYWJsZVdlYlNvY2tldENoYW5uZWxDbGllbnRXcmFwcGVy IHNob3VsZG4ndCBoYXZlIGEgU3RyaW5nIGluIGl0LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vbmV0d29yay9ibGFja2JlcnJ5L05ldHdvcmtKb2IuY3BwIGIvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vbmV0d29yay9ibGFja2JlcnJ5L05ldHdvcmtKb2IuY3BwCmluZGV4IGJi ZWUwMTguLjJhN2Q0ZmUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdv cmsvYmxhY2tiZXJyeS9OZXR3b3JrSm9iLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9uZXR3b3JrL2JsYWNrYmVycnkvTmV0d29ya0pvYi5jcHAKQEAgLTI4LDYgKzI4LDcgQEAKICNp bmNsdWRlICJGcmFtZUxvYWRlckNsaWVudEJsYWNrQmVycnkuaCIKICNpbmNsdWRlICJIVFRQUGFy c2Vycy5oIgogI2luY2x1ZGUgIktVUkwuaCIKKyNpbmNsdWRlICJNSU1FU25pZmZpbmcuaCIKICNp bmNsdWRlICJNSU1FVHlwZVJlZ2lzdHJ5LmgiCiAjaW5jbHVkZSAiTmV0d29ya01hbmFnZXIuaCIK ICNpbmNsdWRlICJSZXNvdXJjZUhhbmRsZUNsaWVudC5oIgpAQCAtMTA4LDYgKzEwOSw3IEBAIE5l dHdvcmtKb2I6Ok5ldHdvcmtKb2IoKQogICAgICwgbV9jYWxsaW5nQ2xpZW50KGZhbHNlKQogICAg ICwgbV9pc1hIUihmYWxzZSkKICAgICAsIG1fbmVlZHNSZXRyeUFzRlRQRGlyZWN0b3J5KGZhbHNl KQorICAgICwgbV9pc092ZXJyaWRlQ29udGVudFR5cGUoZmFsc2UpCiB7CiB9CiAKQEAgLTEzOSw4 ICsxNDEsMTAgQEAgYm9vbCBOZXR3b3JrSm9iOjppbml0aWFsaXplKGludCBwbGF5ZXJJZCwKIAog ICAgIC8vIFdlIGRvbid0IG5lZWQgdG8gZXhwbGljaXRseSBjYWxsIG5vdGlmeUhlYWRlclJlY2Vp dmVkLCBhcyB0aGUgQ29udGVudC1UeXBlCiAgICAgLy8gd2lsbCB1bHRpbWF0ZWx5IGdldCBwYXJz ZWQgd2hlbiBzZW5kUmVzcG9uc2VJZk5lZWRlZCBnZXRzIGNhbGxlZC4KLSAgICBpZiAoIXJlcXVl c3QuZ2V0T3ZlcnJpZGVDb250ZW50VHlwZSgpLmVtcHR5KCkpCisgICAgaWYgKCFyZXF1ZXN0Lmdl dE92ZXJyaWRlQ29udGVudFR5cGUoKS5lbXB0eSgpKSB7CiAgICAgICAgIG1fY29udGVudFR5cGUg PSBTdHJpbmcocmVxdWVzdC5nZXRPdmVycmlkZUNvbnRlbnRUeXBlKCkuY19zdHIoKSk7CisgICAg ICAgIG1faXNPdmVycmlkZUNvbnRlbnRUeXBlID0gdHJ1ZTsKKyAgICB9CiAKICAgICBpZiAobV9p c0RhdGEgfHwgbV9pc0Fib3V0KSAvLyBObyBuZWVkIHRvIGNyZWF0ZSB0aGUgc3RyZWFtcyBmb3Ig ZGF0YSBhbmQgYWJvdXQKICAgICAgICAgcmV0dXJuIHRydWU7CkBAIC0zNDYsNiArMzUwLDMxIEBA IHZvaWQgTmV0d29ya0pvYjo6aGFuZGxlTm90aWZ5RGF0YVJlY2VpdmVkKGNvbnN0IGNoYXIqIGJ1 Ziwgc2l6ZV90IGxlbikKICAgICBpZiAoIWJ1ZiB8fCAhbGVuKQogICAgICAgICByZXR1cm47CiAK KyAgICAvLyBUaGUgbG9hZEZpbGUgQVBJIHNldHMgdGhlIG92ZXJyaWRlIGNvbnRlbnQgdHlwZSwK KyAgICAvLyB0aGlzIHdpbGwgYWx3YXlzIGJlIHVzZWQgYXMgdGhlIGNvbnRlbnQgdHlwZSBhbmQg c2hvdWxkIG5vdCBiZSBvdmVycmlkZGVuLgorICAgIGlmICghbV9kYXRhUmVjZWl2ZWQgJiYgIW1f aXNPdmVycmlkZUNvbnRlbnRUeXBlKSB7CisgICAgICAgIGJvb2wgc2hvdWxkU25pZmYgPSB0cnVl OworCisgICAgICAgIC8vIERvbid0IGJvdGhlciBzbmlmZmluZyB0aGUgY29udGVudCB0eXBlIG9m IGEgZmlsZSB0aGF0CisgICAgICAgIC8vIGlzIG9uIGEgZmlsZSBzeXN0ZW0gaWYgaXQgaGFzIGEg TUlNRSBtYXBwYWJsZSBmaWxlIGV4dGVuc2lvbi4KKyAgICAgICAgLy8gVGhlIGZpbGUgZXh0ZW5z aW9uIGlzIGxpa2VseSB0byBiZSBjb3JyZWN0LgorICAgICAgICBpZiAobV9pc0ZpbGUpIHsKKyAg ICAgICAgICAgIFdURjo6U3RyaW5nIHVybEZpbGVuYW1lID0gbV9yZXNwb25zZS51cmwoKS5sYXN0 UGF0aENvbXBvbmVudCgpOworICAgICAgICAgICAgaWYgKHNpemVfdCBwb3MgPSB1cmxGaWxlbmFt ZS5yZXZlcnNlRmluZCgnLicpICE9IC0xKSB7CisgICAgICAgICAgICAgICAgV1RGOjpTdHJpbmcg ZXh0ZW5zaW9uID0gdXJsRmlsZW5hbWUuc3Vic3RyaW5nKHBvcyArIDEpOworICAgICAgICAgICAg ICAgIFdURjo6U3RyaW5nIG1pbWVUeXBlID0gTUlNRVR5cGVSZWdpc3RyeTo6Z2V0TUlNRVR5cGVG b3JFeHRlbnNpb24oZXh0ZW5zaW9uKTsKKyAgICAgICAgICAgICAgICBpZiAoIW1pbWVUeXBlLmlz RW1wdHkoKSkKKyAgICAgICAgICAgICAgICAgICAgc2hvdWxkU25pZmYgPSBmYWxzZTsKKyAgICAg ICAgICAgIH0KKyAgICAgICAgfQorCisgICAgICAgIGlmIChzaG91bGRTbmlmZikgeworICAgICAg ICAgICAgTUlNRVNuaWZmZXIgc25pZmZlciA9IE1JTUVTbmlmZmVyKG1fY29udGVudFR5cGUubGF0 aW4xKCkuZGF0YSgpLCBNSU1FVHlwZVJlZ2lzdHJ5Ojppc1N1cHBvcnRlZEltYWdlUmVzb3VyY2VN SU1FVHlwZShtX2NvbnRlbnRUeXBlKSk7CisgICAgICAgICAgICBpZiAoY29uc3QgY2hhciogdHlw ZSA9IHNuaWZmZXIuc25pZmYoYnVmLCBsZW4pKQorICAgICAgICAgICAgICAgIG1fc25pZmZlZE1p bWVUeXBlID0gV1RGOjpTdHJpbmcodHlwZSk7CisgICAgICAgIH0KKyAgICB9CisKICAgICBtX2Rh dGFSZWNlaXZlZCA9IHRydWU7CiAKICAgICAvLyBwcm90ZWN0IGFnYWluc3QgcmVlbnRyYW5jeQpA QCAtNTUxLDExICs1ODAsOSBAQCB2b2lkIE5ldHdvcmtKb2I6OnNlbmRSZXNwb25zZUlmTmVlZGVk KCkKICAgICAvLyBnZXQgdGhlIE1JTUUgdHlwZSB0aGF0IHdhcyBzZXQgYnkgdGhlIGNvbnRlbnQg c25pZmZlcgogICAgIC8vIGlmIHRoZXJlJ3Mgbm8gY3VzdG9tIHNuaWZmZXIgaGVhZGVyLCB0cnkg dG8gc2V0IGl0IGZyb20gdGhlIENvbnRlbnQtVHlwZSBoZWFkZXIKICAgICAvLyBpZiB0aGlzIGZh aWxzLCBndWVzcyBpdCBmcm9tIGV4dGVuc2lvbgotICAgIFN0cmluZyBtaW1lVHlwZTsKKyAgICBT dHJpbmcgbWltZVR5cGUgPSBtX3NuaWZmZWRNaW1lVHlwZTsKICAgICBpZiAobV9pc0ZUUCAmJiBt X2lzRlRQRGlyKQogICAgICAgICBtaW1lVHlwZSA9ICJhcHBsaWNhdGlvbi94LWZ0cC1kaXJlY3Rv cnkiOwotICAgIGVsc2UKLSAgICAgICAgbWltZVR5cGUgPSBtX3Jlc3BvbnNlLmh0dHBIZWFkZXJG aWVsZChCbGFja0JlcnJ5OjpQbGF0Zm9ybTo6TmV0d29ya1JlcXVlc3Q6OkhFQURFUl9SSU1fU05J RkZFRF9NSU1FX1RZUEUpOwogICAgIGlmIChtaW1lVHlwZS5pc051bGwoKSkKICAgICAgICAgbWlt ZVR5cGUgPSBleHRyYWN0TUlNRVR5cGVGcm9tTWVkaWFUeXBlKG1fY29udGVudFR5cGUpOwogICAg IGlmIChtaW1lVHlwZS5pc051bGwoKSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL25ldHdvcmsvYmxhY2tiZXJyeS9OZXR3b3JrSm9iLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9uZXR3b3JrL2JsYWNrYmVycnkvTmV0d29ya0pvYi5oCmluZGV4IGE3ODk3ZmEuLmZjMDg4 YmMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvYmxhY2tiZXJy eS9OZXR3b3JrSm9iLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9ibGFj a2JlcnJ5L05ldHdvcmtKb2IuaApAQCAtMTUyLDYgKzE1Miw3IEBAIHByaXZhdGU6CiAgICAgT3du UHRyPE11bHRpcGFydFJlc3BvbnNlRGVsZWdhdGU+IG1fbXVsdGlwYXJ0RGVsZWdhdGU7CiAgICAg VGltZXI8TmV0d29ya0pvYj4gbV9kZWxldGVKb2JUaW1lcjsKICAgICBTdHJpbmcgbV9jb250ZW50 VHlwZTsKKyAgICBTdHJpbmcgbV9zbmlmZmVkTWltZVR5cGU7CiAgICAgU3RyaW5nIG1fY29udGVu dERpc3Bvc2l0aW9uOwogICAgIEJsYWNrQmVycnk6OlBsYXRmb3JtOjpOZXR3b3JrU3RyZWFtRmFj dG9yeSogbV9zdHJlYW1GYWN0b3J5OwogICAgIGJvb2wgbV9pc0ZpbGU7CkBAIC0xNzcsNiArMTc4 LDcgQEAgcHJpdmF0ZToKICAgICBjb25zdCBGcmFtZSogbV9mcmFtZTsKICAgICBib29sIG1faXNY SFI7IC8vIEZJWE1FIC0gQWZ0ZXIgNy4wLCByZW1vdmUgdGhpcy4gT25seSB0aGUgUXQgcG9ydCBy ZXBvcnRzIEhUVFAgZXJyb3Igc3RhdHVzZXMgYXMgZGlkRmFpbHMsIHNvIHdlIHByb2JhYmx5IHNo b3VsZG4ndC4KICAgICBib29sIG1fbmVlZHNSZXRyeUFzRlRQRGlyZWN0b3J5OworICAgIGJvb2wg bV9pc092ZXJyaWRlQ29udGVudFR5cGU7CiB9OwogCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCi0t IAoxLjcuMQoK 118096 2011-12-06 12:51:59 -0800 2011-12-06 12:55:32 -0800 correct changelog format 0001-2011-12-06-Tyler-Abbott-tabbott-rim.com.patch text/plain 7515 tabbott RnJvbSAzMjBmY2IxZDBlMjA2NGY4OWFjNDY3YjcxYTI5OWQ0ZDg5ZWRkNjI0IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBUeWxlciBBYmJvdHQgPHRhYmJvdHRAcmltLmNvbT4KRGF0ZTog VHVlLCA2IERlYyAyMDExIDE1OjI1OjU1IC0wNTAwClN1YmplY3Q6IFtQQVRDSF0gMjAxMS0xMi0w NiAgVHlsZXIgQWJib3R0ICA8dGFiYm90dEByaW0uY29tPgoKICAgICAgICBIb29rIHVwIE1JTUVT bmlmZmluZy4gT3ZlcnJpZGUgQ29udGVudC1UeXBlcyB3aWxsCiAgICAgICAgbm90IGJlIG92ZXJy aWRlbi4gRmlsZSBleHRlbnNpb25zIHdpbGwgYmUgdHJ1c3RlZCB3aGVuIGNvbnRlbnQKICAgICAg ICBpcyBsb2FkZWQgZnJvbSBkaXNrLgogICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD03Mzg2OQoKICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K CiAgICAgICAgQmxhY2tCZXJyeSB0ZXN0cyBhcmUgbm90IHlldCBwcmVzZW50IGluIHdlYmtpdC5v cmcgY29kZWJhc2UuCgogICAgICAgICogQ01ha2VMaXN0c0JsYWNrQmVycnkudHh0OgogICAgICAg ICogcGxhdGZvcm0vbmV0d29yay9ibGFja2JlcnJ5L05ldHdvcmtKb2IuY3BwOgogICAgICAgIChX ZWJDb3JlOjpOZXR3b3JrSm9iOjpOZXR3b3JrSm9iKToKICAgICAgICAoV2ViQ29yZTo6TmV0d29y a0pvYjo6aW5pdGlhbGl6ZSk6CiAgICAgICAgKFdlYkNvcmU6Ok5ldHdvcmtKb2I6OmhhbmRsZU5v dGlmeURhdGFSZWNlaXZlZCk6CiAgICAgICAgKFdlYkNvcmU6Ok5ldHdvcmtKb2I6OnNlbmRSZXNw b25zZUlmTmVlZGVkKToKICAgICAgICAqIHBsYXRmb3JtL25ldHdvcmsvYmxhY2tiZXJyeS9OZXR3 b3JrSm9iLmg6Ci0tLQogU291cmNlL1dlYkNvcmUvQ01ha2VMaXN0c0JsYWNrQmVycnkudHh0ICAg ICAgICAgICAgfCAgICAxICsKIFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyAgICAgICAgICAgICAg ICAgICAgICAgICAgIHwgICAyMCArKysrKysrKysrKwogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v bmV0d29yay9NSU1FU25pZmZpbmcuY3BwICAgfCAgICA0ICsrCiAuLi4vcGxhdGZvcm0vbmV0d29y ay9ibGFja2JlcnJ5L05ldHdvcmtKb2IuY3BwICAgICB8ICAgMzUgKysrKysrKysrKysrKysrKyst LQogLi4uL3BsYXRmb3JtL25ldHdvcmsvYmxhY2tiZXJyeS9OZXR3b3JrSm9iLmggICAgICAgfCAg ICAyICsKIDUgZmlsZXMgY2hhbmdlZCwgNTggaW5zZXJ0aW9ucygrKSwgNCBkZWxldGlvbnMoLSkK CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9DTWFrZUxpc3RzQmxhY2tCZXJyeS50eHQgYi9T b3VyY2UvV2ViQ29yZS9DTWFrZUxpc3RzQmxhY2tCZXJyeS50eHQKaW5kZXggNjBhZTk4Yy4uZTYz N2VhYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ01ha2VMaXN0c0JsYWNrQmVycnkudHh0 CisrKyBiL1NvdXJjZS9XZWJDb3JlL0NNYWtlTGlzdHNCbGFja0JlcnJ5LnR4dApAQCAtODcsNiAr ODcsNyBAQCBMSVNUKEFQUEVORCBXZWJDb3JlX1NPVVJDRVMKIAogIyBOZXR3b3JraW5nIHNvdXJj ZXMKIExJU1QoQVBQRU5EIFdlYkNvcmVfU09VUkNFUworICAgIHBsYXRmb3JtL25ldHdvcmsvTUlN RVNuaWZmaW5nLmNwcAogICAgIHBsYXRmb3JtL25ldHdvcmsvUHJveHlTZXJ2ZXIuY3BwCiAgICAg cGxhdGZvcm0vbmV0d29yay9ibGFja2JlcnJ5L0Fib3V0RGF0YS5jcHAKICAgICBwbGF0Zm9ybS9u ZXR3b3JrL2JsYWNrYmVycnkvRGVmZXJyZWREYXRhLmNwcApkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IDE0ODU3OWQu LjRkMzFhMTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3Vy Y2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMyBAQAorMjAxMS0xMi0wNiAgVHlsZXIg QWJib3R0ICA8dGFiYm90dEByaW0uY29tPgorICAgICAgICBCbGFja0JlcnJ5IFBsYXlCb29rIGRv ZXNuJ3Qgc25pZmYgbWltZSB0eXBlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9NzM4NjkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBIb29rIHVwIE1JTUVTbmlmZmluZy4gT3ZlcnJpZGUgQ29udGVudC1UeXBl cyB3aWxsCisgICAgICAgIG5vdCBiZSBvdmVycmlkZW4uIEZpbGUgZXh0ZW5zaW9ucyB3aWxsIGJl IHRydXN0ZWQgd2hlbiBjb250ZW50CisgICAgICAgIGlzIGxvYWRlZCBmcm9tIGRpc2suCisKKyAg ICAgICAgQmxhY2tCZXJyeSB0ZXN0cyBhcmUgbm90IHlldCBwcmVzZW50IGluIHdlYmtpdC5vcmcg Y29kZWJhc2UuCisKKyAgICAgICAgKiBDTWFrZUxpc3RzQmxhY2tCZXJyeS50eHQ6CisgICAgICAg ICogcGxhdGZvcm0vbmV0d29yay9ibGFja2JlcnJ5L05ldHdvcmtKb2IuY3BwOgorICAgICAgICAo V2ViQ29yZTo6TmV0d29ya0pvYjo6TmV0d29ya0pvYik6CisgICAgICAgIChXZWJDb3JlOjpOZXR3 b3JrSm9iOjppbml0aWFsaXplKToKKyAgICAgICAgKFdlYkNvcmU6Ok5ldHdvcmtKb2I6OmhhbmRs ZU5vdGlmeURhdGFSZWNlaXZlZCk6CisgICAgICAgIChXZWJDb3JlOjpOZXR3b3JrSm9iOjpzZW5k UmVzcG9uc2VJZk5lZWRlZCk6CisgICAgICAgICogcGxhdGZvcm0vbmV0d29yay9ibGFja2JlcnJ5 L05ldHdvcmtKb2IuaDoKKwogMjAxMS0wOS0xNSAgWXV0YSBLaXRhbXVyYSAgPHl1dGFrQGNocm9t aXVtLm9yZz4KIAogICAgICAgICBUaHJlYWRhYmxlV2ViU29ja2V0Q2hhbm5lbENsaWVudFdyYXBw ZXIgc2hvdWxkbid0IGhhdmUgYSBTdHJpbmcgaW4gaXQuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9uZXR3b3JrL01JTUVTbmlmZmluZy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9uZXR3b3JrL01JTUVTbmlmZmluZy5jcHAKaW5kZXggZjk4NjhjMS4uNTNhYzVmNiAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9NSU1FU25pZmZpbmcu Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvTUlNRVNuaWZmaW5nLmNw cApAQCAtMjMsNiArMjMsMTAgQEAKICNpbmNsdWRlIDxjc3RyaW5nPgogI2luY2x1ZGUgPHN0ZGlu dC5oPgogCit1c2luZyBzdGQ6Om1lbWNtcDsKK3VzaW5nIHN0ZDo6c3RyY21wOwordXNpbmcgc3Rk OjpzdHJsZW47CisKIC8vIE1JTUUgdHlwZSBzbmlmZmluZyBpbXBsZW1lbnRhdGlvbiBiYXNlZCBv biBodHRwOi8vdG9vbHMuaWV0Zi5vcmcvaHRtbC9kcmFmdC1hYmFydGgtbWltZS1zbmlmZi0wNgog CiBuYW1lc3BhY2UgewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29y ay9ibGFja2JlcnJ5L05ldHdvcmtKb2IuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0 d29yay9ibGFja2JlcnJ5L05ldHdvcmtKb2IuY3BwCmluZGV4IGJiZWUwMTguLjJhN2Q0ZmUgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvYmxhY2tiZXJyeS9OZXR3 b3JrSm9iLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2JsYWNrYmVy cnkvTmV0d29ya0pvYi5jcHAKQEAgLTI4LDYgKzI4LDcgQEAKICNpbmNsdWRlICJGcmFtZUxvYWRl ckNsaWVudEJsYWNrQmVycnkuaCIKICNpbmNsdWRlICJIVFRQUGFyc2Vycy5oIgogI2luY2x1ZGUg IktVUkwuaCIKKyNpbmNsdWRlICJNSU1FU25pZmZpbmcuaCIKICNpbmNsdWRlICJNSU1FVHlwZVJl Z2lzdHJ5LmgiCiAjaW5jbHVkZSAiTmV0d29ya01hbmFnZXIuaCIKICNpbmNsdWRlICJSZXNvdXJj ZUhhbmRsZUNsaWVudC5oIgpAQCAtMTA4LDYgKzEwOSw3IEBAIE5ldHdvcmtKb2I6Ok5ldHdvcmtK b2IoKQogICAgICwgbV9jYWxsaW5nQ2xpZW50KGZhbHNlKQogICAgICwgbV9pc1hIUihmYWxzZSkK ICAgICAsIG1fbmVlZHNSZXRyeUFzRlRQRGlyZWN0b3J5KGZhbHNlKQorICAgICwgbV9pc092ZXJy aWRlQ29udGVudFR5cGUoZmFsc2UpCiB7CiB9CiAKQEAgLTEzOSw4ICsxNDEsMTAgQEAgYm9vbCBO ZXR3b3JrSm9iOjppbml0aWFsaXplKGludCBwbGF5ZXJJZCwKIAogICAgIC8vIFdlIGRvbid0IG5l ZWQgdG8gZXhwbGljaXRseSBjYWxsIG5vdGlmeUhlYWRlclJlY2VpdmVkLCBhcyB0aGUgQ29udGVu dC1UeXBlCiAgICAgLy8gd2lsbCB1bHRpbWF0ZWx5IGdldCBwYXJzZWQgd2hlbiBzZW5kUmVzcG9u c2VJZk5lZWRlZCBnZXRzIGNhbGxlZC4KLSAgICBpZiAoIXJlcXVlc3QuZ2V0T3ZlcnJpZGVDb250 ZW50VHlwZSgpLmVtcHR5KCkpCisgICAgaWYgKCFyZXF1ZXN0LmdldE92ZXJyaWRlQ29udGVudFR5 cGUoKS5lbXB0eSgpKSB7CiAgICAgICAgIG1fY29udGVudFR5cGUgPSBTdHJpbmcocmVxdWVzdC5n ZXRPdmVycmlkZUNvbnRlbnRUeXBlKCkuY19zdHIoKSk7CisgICAgICAgIG1faXNPdmVycmlkZUNv bnRlbnRUeXBlID0gdHJ1ZTsKKyAgICB9CiAKICAgICBpZiAobV9pc0RhdGEgfHwgbV9pc0Fib3V0 KSAvLyBObyBuZWVkIHRvIGNyZWF0ZSB0aGUgc3RyZWFtcyBmb3IgZGF0YSBhbmQgYWJvdXQKICAg ICAgICAgcmV0dXJuIHRydWU7CkBAIC0zNDYsNiArMzUwLDMxIEBAIHZvaWQgTmV0d29ya0pvYjo6 aGFuZGxlTm90aWZ5RGF0YVJlY2VpdmVkKGNvbnN0IGNoYXIqIGJ1Ziwgc2l6ZV90IGxlbikKICAg ICBpZiAoIWJ1ZiB8fCAhbGVuKQogICAgICAgICByZXR1cm47CiAKKyAgICAvLyBUaGUgbG9hZEZp bGUgQVBJIHNldHMgdGhlIG92ZXJyaWRlIGNvbnRlbnQgdHlwZSwKKyAgICAvLyB0aGlzIHdpbGwg YWx3YXlzIGJlIHVzZWQgYXMgdGhlIGNvbnRlbnQgdHlwZSBhbmQgc2hvdWxkIG5vdCBiZSBvdmVy cmlkZGVuLgorICAgIGlmICghbV9kYXRhUmVjZWl2ZWQgJiYgIW1faXNPdmVycmlkZUNvbnRlbnRU eXBlKSB7CisgICAgICAgIGJvb2wgc2hvdWxkU25pZmYgPSB0cnVlOworCisgICAgICAgIC8vIERv bid0IGJvdGhlciBzbmlmZmluZyB0aGUgY29udGVudCB0eXBlIG9mIGEgZmlsZSB0aGF0CisgICAg ICAgIC8vIGlzIG9uIGEgZmlsZSBzeXN0ZW0gaWYgaXQgaGFzIGEgTUlNRSBtYXBwYWJsZSBmaWxl IGV4dGVuc2lvbi4KKyAgICAgICAgLy8gVGhlIGZpbGUgZXh0ZW5zaW9uIGlzIGxpa2VseSB0byBi ZSBjb3JyZWN0LgorICAgICAgICBpZiAobV9pc0ZpbGUpIHsKKyAgICAgICAgICAgIFdURjo6U3Ry aW5nIHVybEZpbGVuYW1lID0gbV9yZXNwb25zZS51cmwoKS5sYXN0UGF0aENvbXBvbmVudCgpOwor ICAgICAgICAgICAgaWYgKHNpemVfdCBwb3MgPSB1cmxGaWxlbmFtZS5yZXZlcnNlRmluZCgnLicp ICE9IC0xKSB7CisgICAgICAgICAgICAgICAgV1RGOjpTdHJpbmcgZXh0ZW5zaW9uID0gdXJsRmls ZW5hbWUuc3Vic3RyaW5nKHBvcyArIDEpOworICAgICAgICAgICAgICAgIFdURjo6U3RyaW5nIG1p bWVUeXBlID0gTUlNRVR5cGVSZWdpc3RyeTo6Z2V0TUlNRVR5cGVGb3JFeHRlbnNpb24oZXh0ZW5z aW9uKTsKKyAgICAgICAgICAgICAgICBpZiAoIW1pbWVUeXBlLmlzRW1wdHkoKSkKKyAgICAgICAg ICAgICAgICAgICAgc2hvdWxkU25pZmYgPSBmYWxzZTsKKyAgICAgICAgICAgIH0KKyAgICAgICAg fQorCisgICAgICAgIGlmIChzaG91bGRTbmlmZikgeworICAgICAgICAgICAgTUlNRVNuaWZmZXIg c25pZmZlciA9IE1JTUVTbmlmZmVyKG1fY29udGVudFR5cGUubGF0aW4xKCkuZGF0YSgpLCBNSU1F VHlwZVJlZ2lzdHJ5Ojppc1N1cHBvcnRlZEltYWdlUmVzb3VyY2VNSU1FVHlwZShtX2NvbnRlbnRU eXBlKSk7CisgICAgICAgICAgICBpZiAoY29uc3QgY2hhciogdHlwZSA9IHNuaWZmZXIuc25pZmYo YnVmLCBsZW4pKQorICAgICAgICAgICAgICAgIG1fc25pZmZlZE1pbWVUeXBlID0gV1RGOjpTdHJp bmcodHlwZSk7CisgICAgICAgIH0KKyAgICB9CisKICAgICBtX2RhdGFSZWNlaXZlZCA9IHRydWU7 CiAKICAgICAvLyBwcm90ZWN0IGFnYWluc3QgcmVlbnRyYW5jeQpAQCAtNTUxLDExICs1ODAsOSBA QCB2b2lkIE5ldHdvcmtKb2I6OnNlbmRSZXNwb25zZUlmTmVlZGVkKCkKICAgICAvLyBnZXQgdGhl IE1JTUUgdHlwZSB0aGF0IHdhcyBzZXQgYnkgdGhlIGNvbnRlbnQgc25pZmZlcgogICAgIC8vIGlm IHRoZXJlJ3Mgbm8gY3VzdG9tIHNuaWZmZXIgaGVhZGVyLCB0cnkgdG8gc2V0IGl0IGZyb20gdGhl IENvbnRlbnQtVHlwZSBoZWFkZXIKICAgICAvLyBpZiB0aGlzIGZhaWxzLCBndWVzcyBpdCBmcm9t IGV4dGVuc2lvbgotICAgIFN0cmluZyBtaW1lVHlwZTsKKyAgICBTdHJpbmcgbWltZVR5cGUgPSBt X3NuaWZmZWRNaW1lVHlwZTsKICAgICBpZiAobV9pc0ZUUCAmJiBtX2lzRlRQRGlyKQogICAgICAg ICBtaW1lVHlwZSA9ICJhcHBsaWNhdGlvbi94LWZ0cC1kaXJlY3RvcnkiOwotICAgIGVsc2UKLSAg ICAgICAgbWltZVR5cGUgPSBtX3Jlc3BvbnNlLmh0dHBIZWFkZXJGaWVsZChCbGFja0JlcnJ5OjpQ bGF0Zm9ybTo6TmV0d29ya1JlcXVlc3Q6OkhFQURFUl9SSU1fU05JRkZFRF9NSU1FX1RZUEUpOwog ICAgIGlmIChtaW1lVHlwZS5pc051bGwoKSkKICAgICAgICAgbWltZVR5cGUgPSBleHRyYWN0TUlN RVR5cGVGcm9tTWVkaWFUeXBlKG1fY29udGVudFR5cGUpOwogICAgIGlmIChtaW1lVHlwZS5pc051 bGwoKSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvYmxhY2ti ZXJyeS9OZXR3b3JrSm9iLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2JsYWNr YmVycnkvTmV0d29ya0pvYi5oCmluZGV4IGE3ODk3ZmEuLmZjMDg4YmMgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvYmxhY2tiZXJyeS9OZXR3b3JrSm9iLmgKKysr IGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9ibGFja2JlcnJ5L05ldHdvcmtKb2Iu aApAQCAtMTUyLDYgKzE1Miw3IEBAIHByaXZhdGU6CiAgICAgT3duUHRyPE11bHRpcGFydFJlc3Bv bnNlRGVsZWdhdGU+IG1fbXVsdGlwYXJ0RGVsZWdhdGU7CiAgICAgVGltZXI8TmV0d29ya0pvYj4g bV9kZWxldGVKb2JUaW1lcjsKICAgICBTdHJpbmcgbV9jb250ZW50VHlwZTsKKyAgICBTdHJpbmcg bV9zbmlmZmVkTWltZVR5cGU7CiAgICAgU3RyaW5nIG1fY29udGVudERpc3Bvc2l0aW9uOwogICAg IEJsYWNrQmVycnk6OlBsYXRmb3JtOjpOZXR3b3JrU3RyZWFtRmFjdG9yeSogbV9zdHJlYW1GYWN0 b3J5OwogICAgIGJvb2wgbV9pc0ZpbGU7CkBAIC0xNzcsNiArMTc4LDcgQEAgcHJpdmF0ZToKICAg ICBjb25zdCBGcmFtZSogbV9mcmFtZTsKICAgICBib29sIG1faXNYSFI7IC8vIEZJWE1FIC0gQWZ0 ZXIgNy4wLCByZW1vdmUgdGhpcy4gT25seSB0aGUgUXQgcG9ydCByZXBvcnRzIEhUVFAgZXJyb3Ig c3RhdHVzZXMgYXMgZGlkRmFpbHMsIHNvIHdlIHByb2JhYmx5IHNob3VsZG4ndC4KICAgICBib29s IG1fbmVlZHNSZXRyeUFzRlRQRGlyZWN0b3J5OworICAgIGJvb2wgbV9pc092ZXJyaWRlQ29udGVu dFR5cGU7CiB9OwogCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCi0tIAoxLjcuMQoK 118099 2011-12-06 12:55:32 -0800 2011-12-06 13:36:44 -0800 previous patch introduced unwanted changes 0001-2011-12-06-Tyler-Abbott-tabbott-rim.com.patch text/plain 6960 tabbott RnJvbSBjNTcxOTg0ZGUxOTczOWJmMDdjMDgyODBhNGFmZmRkMGM1OTM1OTg1IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBUeWxlciBBYmJvdHQgPHRhYmJvdHRAcmltLmNvbT4KRGF0ZTog VHVlLCA2IERlYyAyMDExIDE1OjI1OjU1IC0wNTAwClN1YmplY3Q6IFtQQVRDSF0gMjAxMS0xMi0w NiAgVHlsZXIgQWJib3R0ICA8dGFiYm90dEByaW0uY29tPgoKICAgICAgICBIb29rIHVwIE1JTUVT bmlmZmluZy4gT3ZlcnJpZGUgQ29udGVudC1UeXBlcyB3aWxsCiAgICAgICAgbm90IGJlIG92ZXJy aWRlbi4gRmlsZSBleHRlbnNpb25zIHdpbGwgYmUgdHJ1c3RlZCB3aGVuIGNvbnRlbnQKICAgICAg ICBpcyBsb2FkZWQgZnJvbSBkaXNrLgogICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD03Mzg2OQoKICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K CiAgICAgICAgQmxhY2tCZXJyeSB0ZXN0cyBhcmUgbm90IHlldCBwcmVzZW50IGluIHdlYmtpdC5v cmcgY29kZWJhc2UuCgogICAgICAgICogQ01ha2VMaXN0c0JsYWNrQmVycnkudHh0OgogICAgICAg ICogcGxhdGZvcm0vbmV0d29yay9ibGFja2JlcnJ5L05ldHdvcmtKb2IuY3BwOgogICAgICAgIChX ZWJDb3JlOjpOZXR3b3JrSm9iOjpOZXR3b3JrSm9iKToKICAgICAgICAoV2ViQ29yZTo6TmV0d29y a0pvYjo6aW5pdGlhbGl6ZSk6CiAgICAgICAgKFdlYkNvcmU6Ok5ldHdvcmtKb2I6OmhhbmRsZU5v dGlmeURhdGFSZWNlaXZlZCk6CiAgICAgICAgKFdlYkNvcmU6Ok5ldHdvcmtKb2I6OnNlbmRSZXNw b25zZUlmTmVlZGVkKToKICAgICAgICAqIHBsYXRmb3JtL25ldHdvcmsvYmxhY2tiZXJyeS9OZXR3 b3JrSm9iLmg6Ci0tLQogU291cmNlL1dlYkNvcmUvQ01ha2VMaXN0c0JsYWNrQmVycnkudHh0ICAg ICAgICAgICAgfCAgICAxICsKIFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyAgICAgICAgICAgICAg ICAgICAgICAgICAgIHwgICAyMCArKysrKysrKysrKwogLi4uL3BsYXRmb3JtL25ldHdvcmsvYmxh Y2tiZXJyeS9OZXR3b3JrSm9iLmNwcCAgICAgfCAgIDM1ICsrKysrKysrKysrKysrKysrLS0KIC4u Li9wbGF0Zm9ybS9uZXR3b3JrL2JsYWNrYmVycnkvTmV0d29ya0pvYi5oICAgICAgIHwgICAgMiAr CiA0IGZpbGVzIGNoYW5nZWQsIDU0IGluc2VydGlvbnMoKyksIDQgZGVsZXRpb25zKC0pCgpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvQ01ha2VMaXN0c0JsYWNrQmVycnkudHh0IGIvU291cmNl L1dlYkNvcmUvQ01ha2VMaXN0c0JsYWNrQmVycnkudHh0CmluZGV4IDYwYWU5OGMuLmU2MzdlYWIg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL0NNYWtlTGlzdHNCbGFja0JlcnJ5LnR4dAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9DTWFrZUxpc3RzQmxhY2tCZXJyeS50eHQKQEAgLTg3LDYgKzg3LDcg QEAgTElTVChBUFBFTkQgV2ViQ29yZV9TT1VSQ0VTCiAKICMgTmV0d29ya2luZyBzb3VyY2VzCiBM SVNUKEFQUEVORCBXZWJDb3JlX1NPVVJDRVMKKyAgICBwbGF0Zm9ybS9uZXR3b3JrL01JTUVTbmlm ZmluZy5jcHAKICAgICBwbGF0Zm9ybS9uZXR3b3JrL1Byb3h5U2VydmVyLmNwcAogICAgIHBsYXRm b3JtL25ldHdvcmsvYmxhY2tiZXJyeS9BYm91dERhdGEuY3BwCiAgICAgcGxhdGZvcm0vbmV0d29y ay9ibGFja2JlcnJ5L0RlZmVycmVkRGF0YS5jcHAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCAxNDg1NzlkLi40ZDMx YTEwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl YkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjMgQEAKKzIwMTEtMTItMDYgIFR5bGVyIEFiYm90 dCAgPHRhYmJvdHRAcmltLmNvbT4KKyAgICAgICAgQmxhY2tCZXJyeSBQbGF5Qm9vayBkb2Vzbid0 IHNuaWZmIG1pbWUgdHlwZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTczODY5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgSG9vayB1cCBNSU1FU25pZmZpbmcuIE92ZXJyaWRlIENvbnRlbnQtVHlwZXMgd2ls bAorICAgICAgICBub3QgYmUgb3ZlcnJpZGVuLiBGaWxlIGV4dGVuc2lvbnMgd2lsbCBiZSB0cnVz dGVkIHdoZW4gY29udGVudAorICAgICAgICBpcyBsb2FkZWQgZnJvbSBkaXNrLgorCisgICAgICAg IEJsYWNrQmVycnkgdGVzdHMgYXJlIG5vdCB5ZXQgcHJlc2VudCBpbiB3ZWJraXQub3JnIGNvZGVi YXNlLgorCisgICAgICAgICogQ01ha2VMaXN0c0JsYWNrQmVycnkudHh0OgorICAgICAgICAqIHBs YXRmb3JtL25ldHdvcmsvYmxhY2tiZXJyeS9OZXR3b3JrSm9iLmNwcDoKKyAgICAgICAgKFdlYkNv cmU6Ok5ldHdvcmtKb2I6Ok5ldHdvcmtKb2IpOgorICAgICAgICAoV2ViQ29yZTo6TmV0d29ya0pv Yjo6aW5pdGlhbGl6ZSk6CisgICAgICAgIChXZWJDb3JlOjpOZXR3b3JrSm9iOjpoYW5kbGVOb3Rp ZnlEYXRhUmVjZWl2ZWQpOgorICAgICAgICAoV2ViQ29yZTo6TmV0d29ya0pvYjo6c2VuZFJlc3Bv bnNlSWZOZWVkZWQpOgorICAgICAgICAqIHBsYXRmb3JtL25ldHdvcmsvYmxhY2tiZXJyeS9OZXR3 b3JrSm9iLmg6CisKIDIwMTEtMDktMTUgIFl1dGEgS2l0YW11cmEgIDx5dXRha0BjaHJvbWl1bS5v cmc+CiAKICAgICAgICAgVGhyZWFkYWJsZVdlYlNvY2tldENoYW5uZWxDbGllbnRXcmFwcGVyIHNo b3VsZG4ndCBoYXZlIGEgU3RyaW5nIGluIGl0LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vbmV0d29yay9ibGFja2JlcnJ5L05ldHdvcmtKb2IuY3BwIGIvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vbmV0d29yay9ibGFja2JlcnJ5L05ldHdvcmtKb2IuY3BwCmluZGV4IGJiZWUw MTguLjJhN2Q0ZmUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsv YmxhY2tiZXJyeS9OZXR3b3JrSm9iLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9u ZXR3b3JrL2JsYWNrYmVycnkvTmV0d29ya0pvYi5jcHAKQEAgLTI4LDYgKzI4LDcgQEAKICNpbmNs dWRlICJGcmFtZUxvYWRlckNsaWVudEJsYWNrQmVycnkuaCIKICNpbmNsdWRlICJIVFRQUGFyc2Vy cy5oIgogI2luY2x1ZGUgIktVUkwuaCIKKyNpbmNsdWRlICJNSU1FU25pZmZpbmcuaCIKICNpbmNs dWRlICJNSU1FVHlwZVJlZ2lzdHJ5LmgiCiAjaW5jbHVkZSAiTmV0d29ya01hbmFnZXIuaCIKICNp bmNsdWRlICJSZXNvdXJjZUhhbmRsZUNsaWVudC5oIgpAQCAtMTA4LDYgKzEwOSw3IEBAIE5ldHdv cmtKb2I6Ok5ldHdvcmtKb2IoKQogICAgICwgbV9jYWxsaW5nQ2xpZW50KGZhbHNlKQogICAgICwg bV9pc1hIUihmYWxzZSkKICAgICAsIG1fbmVlZHNSZXRyeUFzRlRQRGlyZWN0b3J5KGZhbHNlKQor ICAgICwgbV9pc092ZXJyaWRlQ29udGVudFR5cGUoZmFsc2UpCiB7CiB9CiAKQEAgLTEzOSw4ICsx NDEsMTAgQEAgYm9vbCBOZXR3b3JrSm9iOjppbml0aWFsaXplKGludCBwbGF5ZXJJZCwKIAogICAg IC8vIFdlIGRvbid0IG5lZWQgdG8gZXhwbGljaXRseSBjYWxsIG5vdGlmeUhlYWRlclJlY2VpdmVk LCBhcyB0aGUgQ29udGVudC1UeXBlCiAgICAgLy8gd2lsbCB1bHRpbWF0ZWx5IGdldCBwYXJzZWQg d2hlbiBzZW5kUmVzcG9uc2VJZk5lZWRlZCBnZXRzIGNhbGxlZC4KLSAgICBpZiAoIXJlcXVlc3Qu Z2V0T3ZlcnJpZGVDb250ZW50VHlwZSgpLmVtcHR5KCkpCisgICAgaWYgKCFyZXF1ZXN0LmdldE92 ZXJyaWRlQ29udGVudFR5cGUoKS5lbXB0eSgpKSB7CiAgICAgICAgIG1fY29udGVudFR5cGUgPSBT dHJpbmcocmVxdWVzdC5nZXRPdmVycmlkZUNvbnRlbnRUeXBlKCkuY19zdHIoKSk7CisgICAgICAg IG1faXNPdmVycmlkZUNvbnRlbnRUeXBlID0gdHJ1ZTsKKyAgICB9CiAKICAgICBpZiAobV9pc0Rh dGEgfHwgbV9pc0Fib3V0KSAvLyBObyBuZWVkIHRvIGNyZWF0ZSB0aGUgc3RyZWFtcyBmb3IgZGF0 YSBhbmQgYWJvdXQKICAgICAgICAgcmV0dXJuIHRydWU7CkBAIC0zNDYsNiArMzUwLDMxIEBAIHZv aWQgTmV0d29ya0pvYjo6aGFuZGxlTm90aWZ5RGF0YVJlY2VpdmVkKGNvbnN0IGNoYXIqIGJ1Ziwg c2l6ZV90IGxlbikKICAgICBpZiAoIWJ1ZiB8fCAhbGVuKQogICAgICAgICByZXR1cm47CiAKKyAg ICAvLyBUaGUgbG9hZEZpbGUgQVBJIHNldHMgdGhlIG92ZXJyaWRlIGNvbnRlbnQgdHlwZSwKKyAg ICAvLyB0aGlzIHdpbGwgYWx3YXlzIGJlIHVzZWQgYXMgdGhlIGNvbnRlbnQgdHlwZSBhbmQgc2hv dWxkIG5vdCBiZSBvdmVycmlkZGVuLgorICAgIGlmICghbV9kYXRhUmVjZWl2ZWQgJiYgIW1faXNP dmVycmlkZUNvbnRlbnRUeXBlKSB7CisgICAgICAgIGJvb2wgc2hvdWxkU25pZmYgPSB0cnVlOwor CisgICAgICAgIC8vIERvbid0IGJvdGhlciBzbmlmZmluZyB0aGUgY29udGVudCB0eXBlIG9mIGEg ZmlsZSB0aGF0CisgICAgICAgIC8vIGlzIG9uIGEgZmlsZSBzeXN0ZW0gaWYgaXQgaGFzIGEgTUlN RSBtYXBwYWJsZSBmaWxlIGV4dGVuc2lvbi4KKyAgICAgICAgLy8gVGhlIGZpbGUgZXh0ZW5zaW9u IGlzIGxpa2VseSB0byBiZSBjb3JyZWN0LgorICAgICAgICBpZiAobV9pc0ZpbGUpIHsKKyAgICAg ICAgICAgIFdURjo6U3RyaW5nIHVybEZpbGVuYW1lID0gbV9yZXNwb25zZS51cmwoKS5sYXN0UGF0 aENvbXBvbmVudCgpOworICAgICAgICAgICAgaWYgKHNpemVfdCBwb3MgPSB1cmxGaWxlbmFtZS5y ZXZlcnNlRmluZCgnLicpICE9IC0xKSB7CisgICAgICAgICAgICAgICAgV1RGOjpTdHJpbmcgZXh0 ZW5zaW9uID0gdXJsRmlsZW5hbWUuc3Vic3RyaW5nKHBvcyArIDEpOworICAgICAgICAgICAgICAg IFdURjo6U3RyaW5nIG1pbWVUeXBlID0gTUlNRVR5cGVSZWdpc3RyeTo6Z2V0TUlNRVR5cGVGb3JF eHRlbnNpb24oZXh0ZW5zaW9uKTsKKyAgICAgICAgICAgICAgICBpZiAoIW1pbWVUeXBlLmlzRW1w dHkoKSkKKyAgICAgICAgICAgICAgICAgICAgc2hvdWxkU25pZmYgPSBmYWxzZTsKKyAgICAgICAg ICAgIH0KKyAgICAgICAgfQorCisgICAgICAgIGlmIChzaG91bGRTbmlmZikgeworICAgICAgICAg ICAgTUlNRVNuaWZmZXIgc25pZmZlciA9IE1JTUVTbmlmZmVyKG1fY29udGVudFR5cGUubGF0aW4x KCkuZGF0YSgpLCBNSU1FVHlwZVJlZ2lzdHJ5Ojppc1N1cHBvcnRlZEltYWdlUmVzb3VyY2VNSU1F VHlwZShtX2NvbnRlbnRUeXBlKSk7CisgICAgICAgICAgICBpZiAoY29uc3QgY2hhciogdHlwZSA9 IHNuaWZmZXIuc25pZmYoYnVmLCBsZW4pKQorICAgICAgICAgICAgICAgIG1fc25pZmZlZE1pbWVU eXBlID0gV1RGOjpTdHJpbmcodHlwZSk7CisgICAgICAgIH0KKyAgICB9CisKICAgICBtX2RhdGFS ZWNlaXZlZCA9IHRydWU7CiAKICAgICAvLyBwcm90ZWN0IGFnYWluc3QgcmVlbnRyYW5jeQpAQCAt NTUxLDExICs1ODAsOSBAQCB2b2lkIE5ldHdvcmtKb2I6OnNlbmRSZXNwb25zZUlmTmVlZGVkKCkK ICAgICAvLyBnZXQgdGhlIE1JTUUgdHlwZSB0aGF0IHdhcyBzZXQgYnkgdGhlIGNvbnRlbnQgc25p ZmZlcgogICAgIC8vIGlmIHRoZXJlJ3Mgbm8gY3VzdG9tIHNuaWZmZXIgaGVhZGVyLCB0cnkgdG8g c2V0IGl0IGZyb20gdGhlIENvbnRlbnQtVHlwZSBoZWFkZXIKICAgICAvLyBpZiB0aGlzIGZhaWxz LCBndWVzcyBpdCBmcm9tIGV4dGVuc2lvbgotICAgIFN0cmluZyBtaW1lVHlwZTsKKyAgICBTdHJp bmcgbWltZVR5cGUgPSBtX3NuaWZmZWRNaW1lVHlwZTsKICAgICBpZiAobV9pc0ZUUCAmJiBtX2lz RlRQRGlyKQogICAgICAgICBtaW1lVHlwZSA9ICJhcHBsaWNhdGlvbi94LWZ0cC1kaXJlY3Rvcnki OwotICAgIGVsc2UKLSAgICAgICAgbWltZVR5cGUgPSBtX3Jlc3BvbnNlLmh0dHBIZWFkZXJGaWVs ZChCbGFja0JlcnJ5OjpQbGF0Zm9ybTo6TmV0d29ya1JlcXVlc3Q6OkhFQURFUl9SSU1fU05JRkZF RF9NSU1FX1RZUEUpOwogICAgIGlmIChtaW1lVHlwZS5pc051bGwoKSkKICAgICAgICAgbWltZVR5 cGUgPSBleHRyYWN0TUlNRVR5cGVGcm9tTWVkaWFUeXBlKG1fY29udGVudFR5cGUpOwogICAgIGlm IChtaW1lVHlwZS5pc051bGwoKSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L25ldHdvcmsvYmxhY2tiZXJyeS9OZXR3b3JrSm9iLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9uZXR3b3JrL2JsYWNrYmVycnkvTmV0d29ya0pvYi5oCmluZGV4IGE3ODk3ZmEuLmZjMDg4YmMg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvYmxhY2tiZXJyeS9O ZXR3b3JrSm9iLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9ibGFja2Jl cnJ5L05ldHdvcmtKb2IuaApAQCAtMTUyLDYgKzE1Miw3IEBAIHByaXZhdGU6CiAgICAgT3duUHRy PE11bHRpcGFydFJlc3BvbnNlRGVsZWdhdGU+IG1fbXVsdGlwYXJ0RGVsZWdhdGU7CiAgICAgVGlt ZXI8TmV0d29ya0pvYj4gbV9kZWxldGVKb2JUaW1lcjsKICAgICBTdHJpbmcgbV9jb250ZW50VHlw ZTsKKyAgICBTdHJpbmcgbV9zbmlmZmVkTWltZVR5cGU7CiAgICAgU3RyaW5nIG1fY29udGVudERp c3Bvc2l0aW9uOwogICAgIEJsYWNrQmVycnk6OlBsYXRmb3JtOjpOZXR3b3JrU3RyZWFtRmFjdG9y eSogbV9zdHJlYW1GYWN0b3J5OwogICAgIGJvb2wgbV9pc0ZpbGU7CkBAIC0xNzcsNiArMTc4LDcg QEAgcHJpdmF0ZToKICAgICBjb25zdCBGcmFtZSogbV9mcmFtZTsKICAgICBib29sIG1faXNYSFI7 IC8vIEZJWE1FIC0gQWZ0ZXIgNy4wLCByZW1vdmUgdGhpcy4gT25seSB0aGUgUXQgcG9ydCByZXBv cnRzIEhUVFAgZXJyb3Igc3RhdHVzZXMgYXMgZGlkRmFpbHMsIHNvIHdlIHByb2JhYmx5IHNob3Vs ZG4ndC4KICAgICBib29sIG1fbmVlZHNSZXRyeUFzRlRQRGlyZWN0b3J5OworICAgIGJvb2wgbV9p c092ZXJyaWRlQ29udGVudFR5cGU7CiB9OwogCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCi0tIAox LjcuMQoK 118102 2011-12-06 13:36:44 -0800 2012-03-09 14:12:32 -0800 better commit message 0001-2011-12-06-Tyler-Abbott-tabbott-rim.com.patch text/plain 6978 tabbott RnJvbSBjNTg1MmNlMzI3MWQwN2ZmNDkyZDhiMDEwOTQ3YjE5ODhhNWMyYzZhIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBUeWxlciBBYmJvdHQgPHRhYmJvdHRAcmltLmNvbT4KRGF0ZTog VHVlLCA2IERlYyAyMDExIDE1OjI1OjU1IC0wNTAwClN1YmplY3Q6IFtQQVRDSF0gMjAxMS0xMi0w NiAgVHlsZXIgQWJib3R0ICA8dGFiYm90dEByaW0uY29tPgoKICAgICAgICBIb29rIHVwIE1JTUVT bmlmZmluZy4gT3ZlcnJpZGUgQ29udGVudC1UeXBlcyB3aWxsCiAgICAgICAgbm90IGJlIG92ZXJy aWRlbi4gRmlsZSBleHRlbnNpb25zIHdpbGwgYmUgdHJ1c3RlZCB3aGVuIGNvbnRlbnQKICAgICAg ICBpcyBsb2FkZWQgZnJvbSBkaXNrLgogICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD03Mzg2OQoKICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K CiAgICAgICAgQmxhY2tCZXJyeSB0ZXN0cyBhcmUgbm90IHlldCBwcmVzZW50IGluIHdlYmtpdC5v cmcgY29kZWJhc2UuCgogICAgICAgICogQ01ha2VMaXN0c0JsYWNrQmVycnkudHh0OgogICAgICAg ICogcGxhdGZvcm0vbmV0d29yay9ibGFja2JlcnJ5L05ldHdvcmtKb2IuY3BwOgogICAgICAgIChX ZWJDb3JlOjpOZXR3b3JrSm9iOjpOZXR3b3JrSm9iKToKICAgICAgICAoV2ViQ29yZTo6TmV0d29y a0pvYjo6aW5pdGlhbGl6ZSk6CiAgICAgICAgKFdlYkNvcmU6Ok5ldHdvcmtKb2I6OmhhbmRsZU5v dGlmeURhdGFSZWNlaXZlZCk6CiAgICAgICAgKFdlYkNvcmU6Ok5ldHdvcmtKb2I6OnNlbmRSZXNw b25zZUlmTmVlZGVkKToKICAgICAgICAqIHBsYXRmb3JtL25ldHdvcmsvYmxhY2tiZXJyeS9OZXR3 b3JrSm9iLmg6Ci0tLQogU291cmNlL1dlYkNvcmUvQ01ha2VMaXN0c0JsYWNrQmVycnkudHh0ICAg ICAgICAgICAgfCAgICAxICsKIFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyAgICAgICAgICAgICAg ICAgICAgICAgICAgIHwgICAyMSArKysrKysrKysrKysKIC4uLi9wbGF0Zm9ybS9uZXR3b3JrL2Js YWNrYmVycnkvTmV0d29ya0pvYi5jcHAgICAgIHwgICAzNSArKysrKysrKysrKysrKysrKy0tCiAu Li4vcGxhdGZvcm0vbmV0d29yay9ibGFja2JlcnJ5L05ldHdvcmtKb2IuaCAgICAgICB8ICAgIDIg KwogNCBmaWxlcyBjaGFuZ2VkLCA1NSBpbnNlcnRpb25zKCspLCA0IGRlbGV0aW9ucygtKQoKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NNYWtlTGlzdHNCbGFja0JlcnJ5LnR4dCBiL1NvdXJj ZS9XZWJDb3JlL0NNYWtlTGlzdHNCbGFja0JlcnJ5LnR4dAppbmRleCA2MGFlOThjLi5lNjM3ZWFi IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DTWFrZUxpc3RzQmxhY2tCZXJyeS50eHQKKysr IGIvU291cmNlL1dlYkNvcmUvQ01ha2VMaXN0c0JsYWNrQmVycnkudHh0CkBAIC04Nyw2ICs4Nyw3 IEBAIExJU1QoQVBQRU5EIFdlYkNvcmVfU09VUkNFUwogCiAjIE5ldHdvcmtpbmcgc291cmNlcwog TElTVChBUFBFTkQgV2ViQ29yZV9TT1VSQ0VTCisgICAgcGxhdGZvcm0vbmV0d29yay9NSU1FU25p ZmZpbmcuY3BwCiAgICAgcGxhdGZvcm0vbmV0d29yay9Qcm94eVNlcnZlci5jcHAKICAgICBwbGF0 Zm9ybS9uZXR3b3JrL2JsYWNrYmVycnkvQWJvdXREYXRhLmNwcAogICAgIHBsYXRmb3JtL25ldHdv cmsvYmxhY2tiZXJyeS9EZWZlcnJlZERhdGEuY3BwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTQ4NTc5ZC4uY2Jl NTg4ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9X ZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDExLTEyLTA2ICBUeWxlciBBYmJv dHQgIDx0YWJib3R0QHJpbS5jb20+CisKKyAgICAgICAgQmxhY2tCZXJyeSBQbGF5Qm9vayBkb2Vz bid0IHNuaWZmIG1pbWUgdHlwZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTczODY5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgSG9vayB1cCBNSU1FU25pZmZpbmcgZm9yIEJsYWNrQmVycnkuIE92ZXJyaWRl IENvbnRlbnQtVHlwZXMgd2lsbAorICAgICAgICBub3QgYmUgb3ZlcnJpZGVuLiBGaWxlIGV4dGVu c2lvbnMgd2lsbCBiZSB0cnVzdGVkIHdoZW4gY29udGVudAorICAgICAgICBpcyBsb2FkZWQgZnJv bSBkaXNrLgorCisgICAgICAgIEJsYWNrQmVycnkgdGVzdHMgYXJlIG5vdCB5ZXQgcHJlc2VudCBp biB3ZWJraXQub3JnIGNvZGViYXNlLgorCisgICAgICAgICogQ01ha2VMaXN0c0JsYWNrQmVycnku dHh0OgorICAgICAgICAqIHBsYXRmb3JtL25ldHdvcmsvYmxhY2tiZXJyeS9OZXR3b3JrSm9iLmNw cDoKKyAgICAgICAgKFdlYkNvcmU6Ok5ldHdvcmtKb2I6Ok5ldHdvcmtKb2IpOgorICAgICAgICAo V2ViQ29yZTo6TmV0d29ya0pvYjo6aW5pdGlhbGl6ZSk6CisgICAgICAgIChXZWJDb3JlOjpOZXR3 b3JrSm9iOjpoYW5kbGVOb3RpZnlEYXRhUmVjZWl2ZWQpOgorICAgICAgICAoV2ViQ29yZTo6TmV0 d29ya0pvYjo6c2VuZFJlc3BvbnNlSWZOZWVkZWQpOgorICAgICAgICAqIHBsYXRmb3JtL25ldHdv cmsvYmxhY2tiZXJyeS9OZXR3b3JrSm9iLmg6CisKIDIwMTEtMDktMTUgIFl1dGEgS2l0YW11cmEg IDx5dXRha0BjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgVGhyZWFkYWJsZVdlYlNvY2tldENoYW5u ZWxDbGllbnRXcmFwcGVyIHNob3VsZG4ndCBoYXZlIGEgU3RyaW5nIGluIGl0LgpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9ibGFja2JlcnJ5L05ldHdvcmtKb2Iu Y3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9ibGFja2JlcnJ5L05ldHdvcmtK b2IuY3BwCmluZGV4IGJiZWUwMTguLjJhN2Q0ZmUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL25ldHdvcmsvYmxhY2tiZXJyeS9OZXR3b3JrSm9iLmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2JsYWNrYmVycnkvTmV0d29ya0pvYi5jcHAKQEAgLTI4 LDYgKzI4LDcgQEAKICNpbmNsdWRlICJGcmFtZUxvYWRlckNsaWVudEJsYWNrQmVycnkuaCIKICNp bmNsdWRlICJIVFRQUGFyc2Vycy5oIgogI2luY2x1ZGUgIktVUkwuaCIKKyNpbmNsdWRlICJNSU1F U25pZmZpbmcuaCIKICNpbmNsdWRlICJNSU1FVHlwZVJlZ2lzdHJ5LmgiCiAjaW5jbHVkZSAiTmV0 d29ya01hbmFnZXIuaCIKICNpbmNsdWRlICJSZXNvdXJjZUhhbmRsZUNsaWVudC5oIgpAQCAtMTA4 LDYgKzEwOSw3IEBAIE5ldHdvcmtKb2I6Ok5ldHdvcmtKb2IoKQogICAgICwgbV9jYWxsaW5nQ2xp ZW50KGZhbHNlKQogICAgICwgbV9pc1hIUihmYWxzZSkKICAgICAsIG1fbmVlZHNSZXRyeUFzRlRQ RGlyZWN0b3J5KGZhbHNlKQorICAgICwgbV9pc092ZXJyaWRlQ29udGVudFR5cGUoZmFsc2UpCiB7 CiB9CiAKQEAgLTEzOSw4ICsxNDEsMTAgQEAgYm9vbCBOZXR3b3JrSm9iOjppbml0aWFsaXplKGlu dCBwbGF5ZXJJZCwKIAogICAgIC8vIFdlIGRvbid0IG5lZWQgdG8gZXhwbGljaXRseSBjYWxsIG5v dGlmeUhlYWRlclJlY2VpdmVkLCBhcyB0aGUgQ29udGVudC1UeXBlCiAgICAgLy8gd2lsbCB1bHRp bWF0ZWx5IGdldCBwYXJzZWQgd2hlbiBzZW5kUmVzcG9uc2VJZk5lZWRlZCBnZXRzIGNhbGxlZC4K LSAgICBpZiAoIXJlcXVlc3QuZ2V0T3ZlcnJpZGVDb250ZW50VHlwZSgpLmVtcHR5KCkpCisgICAg aWYgKCFyZXF1ZXN0LmdldE92ZXJyaWRlQ29udGVudFR5cGUoKS5lbXB0eSgpKSB7CiAgICAgICAg IG1fY29udGVudFR5cGUgPSBTdHJpbmcocmVxdWVzdC5nZXRPdmVycmlkZUNvbnRlbnRUeXBlKCku Y19zdHIoKSk7CisgICAgICAgIG1faXNPdmVycmlkZUNvbnRlbnRUeXBlID0gdHJ1ZTsKKyAgICB9 CiAKICAgICBpZiAobV9pc0RhdGEgfHwgbV9pc0Fib3V0KSAvLyBObyBuZWVkIHRvIGNyZWF0ZSB0 aGUgc3RyZWFtcyBmb3IgZGF0YSBhbmQgYWJvdXQKICAgICAgICAgcmV0dXJuIHRydWU7CkBAIC0z NDYsNiArMzUwLDMxIEBAIHZvaWQgTmV0d29ya0pvYjo6aGFuZGxlTm90aWZ5RGF0YVJlY2VpdmVk KGNvbnN0IGNoYXIqIGJ1Ziwgc2l6ZV90IGxlbikKICAgICBpZiAoIWJ1ZiB8fCAhbGVuKQogICAg ICAgICByZXR1cm47CiAKKyAgICAvLyBUaGUgbG9hZEZpbGUgQVBJIHNldHMgdGhlIG92ZXJyaWRl IGNvbnRlbnQgdHlwZSwKKyAgICAvLyB0aGlzIHdpbGwgYWx3YXlzIGJlIHVzZWQgYXMgdGhlIGNv bnRlbnQgdHlwZSBhbmQgc2hvdWxkIG5vdCBiZSBvdmVycmlkZGVuLgorICAgIGlmICghbV9kYXRh UmVjZWl2ZWQgJiYgIW1faXNPdmVycmlkZUNvbnRlbnRUeXBlKSB7CisgICAgICAgIGJvb2wgc2hv dWxkU25pZmYgPSB0cnVlOworCisgICAgICAgIC8vIERvbid0IGJvdGhlciBzbmlmZmluZyB0aGUg Y29udGVudCB0eXBlIG9mIGEgZmlsZSB0aGF0CisgICAgICAgIC8vIGlzIG9uIGEgZmlsZSBzeXN0 ZW0gaWYgaXQgaGFzIGEgTUlNRSBtYXBwYWJsZSBmaWxlIGV4dGVuc2lvbi4KKyAgICAgICAgLy8g VGhlIGZpbGUgZXh0ZW5zaW9uIGlzIGxpa2VseSB0byBiZSBjb3JyZWN0LgorICAgICAgICBpZiAo bV9pc0ZpbGUpIHsKKyAgICAgICAgICAgIFdURjo6U3RyaW5nIHVybEZpbGVuYW1lID0gbV9yZXNw b25zZS51cmwoKS5sYXN0UGF0aENvbXBvbmVudCgpOworICAgICAgICAgICAgaWYgKHNpemVfdCBw b3MgPSB1cmxGaWxlbmFtZS5yZXZlcnNlRmluZCgnLicpICE9IC0xKSB7CisgICAgICAgICAgICAg ICAgV1RGOjpTdHJpbmcgZXh0ZW5zaW9uID0gdXJsRmlsZW5hbWUuc3Vic3RyaW5nKHBvcyArIDEp OworICAgICAgICAgICAgICAgIFdURjo6U3RyaW5nIG1pbWVUeXBlID0gTUlNRVR5cGVSZWdpc3Ry eTo6Z2V0TUlNRVR5cGVGb3JFeHRlbnNpb24oZXh0ZW5zaW9uKTsKKyAgICAgICAgICAgICAgICBp ZiAoIW1pbWVUeXBlLmlzRW1wdHkoKSkKKyAgICAgICAgICAgICAgICAgICAgc2hvdWxkU25pZmYg PSBmYWxzZTsKKyAgICAgICAgICAgIH0KKyAgICAgICAgfQorCisgICAgICAgIGlmIChzaG91bGRT bmlmZikgeworICAgICAgICAgICAgTUlNRVNuaWZmZXIgc25pZmZlciA9IE1JTUVTbmlmZmVyKG1f Y29udGVudFR5cGUubGF0aW4xKCkuZGF0YSgpLCBNSU1FVHlwZVJlZ2lzdHJ5Ojppc1N1cHBvcnRl ZEltYWdlUmVzb3VyY2VNSU1FVHlwZShtX2NvbnRlbnRUeXBlKSk7CisgICAgICAgICAgICBpZiAo Y29uc3QgY2hhciogdHlwZSA9IHNuaWZmZXIuc25pZmYoYnVmLCBsZW4pKQorICAgICAgICAgICAg ICAgIG1fc25pZmZlZE1pbWVUeXBlID0gV1RGOjpTdHJpbmcodHlwZSk7CisgICAgICAgIH0KKyAg ICB9CisKICAgICBtX2RhdGFSZWNlaXZlZCA9IHRydWU7CiAKICAgICAvLyBwcm90ZWN0IGFnYWlu c3QgcmVlbnRyYW5jeQpAQCAtNTUxLDExICs1ODAsOSBAQCB2b2lkIE5ldHdvcmtKb2I6OnNlbmRS ZXNwb25zZUlmTmVlZGVkKCkKICAgICAvLyBnZXQgdGhlIE1JTUUgdHlwZSB0aGF0IHdhcyBzZXQg YnkgdGhlIGNvbnRlbnQgc25pZmZlcgogICAgIC8vIGlmIHRoZXJlJ3Mgbm8gY3VzdG9tIHNuaWZm ZXIgaGVhZGVyLCB0cnkgdG8gc2V0IGl0IGZyb20gdGhlIENvbnRlbnQtVHlwZSBoZWFkZXIKICAg ICAvLyBpZiB0aGlzIGZhaWxzLCBndWVzcyBpdCBmcm9tIGV4dGVuc2lvbgotICAgIFN0cmluZyBt aW1lVHlwZTsKKyAgICBTdHJpbmcgbWltZVR5cGUgPSBtX3NuaWZmZWRNaW1lVHlwZTsKICAgICBp ZiAobV9pc0ZUUCAmJiBtX2lzRlRQRGlyKQogICAgICAgICBtaW1lVHlwZSA9ICJhcHBsaWNhdGlv bi94LWZ0cC1kaXJlY3RvcnkiOwotICAgIGVsc2UKLSAgICAgICAgbWltZVR5cGUgPSBtX3Jlc3Bv bnNlLmh0dHBIZWFkZXJGaWVsZChCbGFja0JlcnJ5OjpQbGF0Zm9ybTo6TmV0d29ya1JlcXVlc3Q6 OkhFQURFUl9SSU1fU05JRkZFRF9NSU1FX1RZUEUpOwogICAgIGlmIChtaW1lVHlwZS5pc051bGwo KSkKICAgICAgICAgbWltZVR5cGUgPSBleHRyYWN0TUlNRVR5cGVGcm9tTWVkaWFUeXBlKG1fY29u dGVudFR5cGUpOwogICAgIGlmIChtaW1lVHlwZS5pc051bGwoKSkKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvYmxhY2tiZXJyeS9OZXR3b3JrSm9iLmggYi9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2JsYWNrYmVycnkvTmV0d29ya0pvYi5oCmluZGV4 IGE3ODk3ZmEuLmZjMDg4YmMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25l dHdvcmsvYmxhY2tiZXJyeS9OZXR3b3JrSm9iLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vbmV0d29yay9ibGFja2JlcnJ5L05ldHdvcmtKb2IuaApAQCAtMTUyLDYgKzE1Miw3IEBAIHBy aXZhdGU6CiAgICAgT3duUHRyPE11bHRpcGFydFJlc3BvbnNlRGVsZWdhdGU+IG1fbXVsdGlwYXJ0 RGVsZWdhdGU7CiAgICAgVGltZXI8TmV0d29ya0pvYj4gbV9kZWxldGVKb2JUaW1lcjsKICAgICBT dHJpbmcgbV9jb250ZW50VHlwZTsKKyAgICBTdHJpbmcgbV9zbmlmZmVkTWltZVR5cGU7CiAgICAg U3RyaW5nIG1fY29udGVudERpc3Bvc2l0aW9uOwogICAgIEJsYWNrQmVycnk6OlBsYXRmb3JtOjpO ZXR3b3JrU3RyZWFtRmFjdG9yeSogbV9zdHJlYW1GYWN0b3J5OwogICAgIGJvb2wgbV9pc0ZpbGU7 CkBAIC0xNzcsNiArMTc4LDcgQEAgcHJpdmF0ZToKICAgICBjb25zdCBGcmFtZSogbV9mcmFtZTsK ICAgICBib29sIG1faXNYSFI7IC8vIEZJWE1FIC0gQWZ0ZXIgNy4wLCByZW1vdmUgdGhpcy4gT25s eSB0aGUgUXQgcG9ydCByZXBvcnRzIEhUVFAgZXJyb3Igc3RhdHVzZXMgYXMgZGlkRmFpbHMsIHNv IHdlIHByb2JhYmx5IHNob3VsZG4ndC4KICAgICBib29sIG1fbmVlZHNSZXRyeUFzRlRQRGlyZWN0 b3J5OworICAgIGJvb2wgbV9pc092ZXJyaWRlQ29udGVudFR5cGU7CiB9OwogCiB9IC8vIG5hbWVz cGFjZSBXZWJDb3JlCi0tIAoxLjcuMQoK 131105 2012-03-09 14:12:32 -0800 2012-03-09 18:56:09 -0800 The old patch was stale, here is a fresh one. 0001-2012-03-09-Tyler-Abbott-tabbott-rim.com.patch text/plain 6963 tabbott RnJvbSA2YWVjYjgzOTVhZThhNThiODkyOTI5ODY0ODRjNGMyNDlmODNjZjZjIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBUeWxlciBBYmJvdHQgPHRhYmJvdHRAcmltLmNvbT4KRGF0ZTog VHVlLCA2IERlYyAyMDExIDE2OjU1OjIyIC0wNTAwClN1YmplY3Q6IFtQQVRDSF0gMjAxMi0wMy0w OSAgVHlsZXIgQWJib3R0ICA8dGFiYm90dEByaW0uY29tPgogIAlIb29rIHVwIE1JTUVTbmlmZmlu Zy4gT3ZlcnJpZGUgQ29udGVudC1UeXBlcyB3aWxsIG5vdCBiZQogICAgICAgICBvdmVycmlkZW4u IEZpbGUgZXh0ZW5zaW9ucyB3aWxsIGJlIHRydXN0ZWQgd2hlbiBjb250ZW50CiAgICAgICAgIGlz IGxvYWRlZCBmcm9tIGRpc2suCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD03Mzg2OQoKICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KCiAg ICAgICAgQmxhY2tCZXJyeSB0ZXN0cyBhcmUgbm90IHlldCBwcmVzZW50IGluIHdlYmtpdC5vcmcg Y29kZWJhc2UuCi0tLQogU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nICAgICAgICAgICAgICAgICAg ICAgICAgICAgfCAgIDIyICsrKysrKysrKysrKwogU291cmNlL1dlYkNvcmUvUGxhdGZvcm1CbGFj a0JlcnJ5LmNtYWtlICAgICAgICAgICAgfCAgICAxICsKIC4uLi9wbGF0Zm9ybS9uZXR3b3JrL2Js YWNrYmVycnkvTmV0d29ya0pvYi5jcHAgICAgIHwgICAzNiArKysrKysrKysrKysrKysrKy0tCiAu Li4vcGxhdGZvcm0vbmV0d29yay9ibGFja2JlcnJ5L05ldHdvcmtKb2IuaCAgICAgICB8ICAgIDIg KwogNCBmaWxlcyBjaGFuZ2VkLCA1NyBpbnNlcnRpb25zKCspLCA0IGRlbGV0aW9ucygtKQoKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwppbmRleCAxYmFhNjQ3Li4xYTBjODk1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjUgQEAK KzIwMTItMDMtMDkgIFR5bGVyIEFiYm90dCAgPHRhYmJvdHRAcmltLmNvbT4KKworICAgICAgICBC bGFja0JlcnJ5IFBsYXlCb29rIGRvZXNuJ3Qgc25pZmYgbWltZSB0eXBlcworICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzM4NjkKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBIb29rIHVwIE1JTUVTbmlmZmluZyBm b3IgQmxhY2tCZXJyeS4gT3ZlcnJpZGUgQ29udGVudC1UeXBlcyB3aWxsCisgICAgICAgIG5vdCBi ZSBvdmVycmlkZW4uIEZpbGUgZXh0ZW5zaW9ucyB3aWxsIGJlIHRydXN0ZWQgd2hlbiBjb250ZW50 CisgICAgICAgIGlzIGxvYWRlZCBmcm9tIGRpc2suCisKKyAgICAgICAgTm8gdGVzdHMsIEJsYWNr QmVycnkgdGVzdHMgYXJlIG5vdCB5ZXQgcHJlc2VudCBpbiB3ZWJraXQub3JnIGNvZGViYXNlLgor CisgICAgICAgICogUGxhdGZvcm1CbGFja0JlcnJ5LmNtYWtlOgorICAgICAgICAqIHBsYXRmb3Jt L25ldHdvcmsvYmxhY2tiZXJyeS9OZXR3b3JrSm9iLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Ok5l dHdvcmtKb2I6Ok5ldHdvcmtKb2IpOgorICAgICAgICAoV2ViQ29yZTo6TmV0d29ya0pvYjo6aW5p dGlhbGl6ZSk6CisgICAgICAgIChXZWJDb3JlOjpOZXR3b3JrSm9iOjpoYW5kbGVOb3RpZnlEYXRh UmVjZWl2ZWQpOgorICAgICAgICAoV2ViQ29yZTo6TmV0d29ya0pvYjo6c2VuZFJlc3BvbnNlSWZO ZWVkZWQpOgorICAgICAgICAqIHBsYXRmb3JtL25ldHdvcmsvYmxhY2tiZXJyeS9OZXR3b3JrSm9i Lmg6CisgICAgICAgIChOZXR3b3JrSm9iKToKKwogMjAxMi0wMy0wOSAgTmF0ZSBDaGFwaW4gIDxq YXBoZXRAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIENhY2hlZFJhd1Jlc291cmNlIGJyZWFrcyB3 aGVuIHRyeWluZyB0byBsb2FkCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9QbGF0Zm9ybUJs YWNrQmVycnkuY21ha2UgYi9Tb3VyY2UvV2ViQ29yZS9QbGF0Zm9ybUJsYWNrQmVycnkuY21ha2UK aW5kZXggNmI0NzY3OS4uZGYyNzM1YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvUGxhdGZv cm1CbGFja0JlcnJ5LmNtYWtlCisrKyBiL1NvdXJjZS9XZWJDb3JlL1BsYXRmb3JtQmxhY2tCZXJy eS5jbWFrZQpAQCAtODcsNiArODcsNyBAQCBMSVNUKEFQUEVORCBXZWJDb3JlX1NPVVJDRVMKIAog IyBOZXR3b3JraW5nIHNvdXJjZXMKIExJU1QoQVBQRU5EIFdlYkNvcmVfU09VUkNFUworICAgIHBs YXRmb3JtL25ldHdvcmsvTUlNRVNuaWZmaW5nLmNwcAogICAgIHBsYXRmb3JtL25ldHdvcmsvUHJv eHlTZXJ2ZXIuY3BwCiAgICAgcGxhdGZvcm0vbmV0d29yay9ibGFja2JlcnJ5L0RlZmVycmVkRGF0 YS5jcHAKICAgICBwbGF0Zm9ybS9uZXR3b3JrL2JsYWNrYmVycnkvTmV0d29ya0pvYi5jcHAKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvYmxhY2tiZXJyeS9OZXR3 b3JrSm9iLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvYmxhY2tiZXJyeS9O ZXR3b3JrSm9iLmNwcAppbmRleCA3ODZiNzFlLi45MTJiN2U5IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2JsYWNrYmVycnkvTmV0d29ya0pvYi5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9ibGFja2JlcnJ5L05ldHdvcmtKb2IuY3Bw CkBAIC0yNyw2ICsyNyw3IEBACiAjaW5jbHVkZSAiRnJhbWVMb2FkZXJDbGllbnRCbGFja0JlcnJ5 LmgiCiAjaW5jbHVkZSAiSFRUUFBhcnNlcnMuaCIKICNpbmNsdWRlICJLVVJMLmgiCisjaW5jbHVk ZSAiTUlNRVNuaWZmaW5nLmgiCiAjaW5jbHVkZSAiTUlNRVR5cGVSZWdpc3RyeS5oIgogI2luY2x1 ZGUgIk5ldHdvcmtNYW5hZ2VyLmgiCiAjaW5jbHVkZSAiUmVzb3VyY2VIYW5kbGVDbGllbnQuaCIK QEAgLTEwNyw2ICsxMDgsNyBAQCBOZXR3b3JrSm9iOjpOZXR3b3JrSm9iKCkKICAgICAsIG1fY2Fs bGluZ0NsaWVudChmYWxzZSkKICAgICAsIG1faXNYSFIoZmFsc2UpCiAgICAgLCBtX25lZWRzUmV0 cnlBc0ZUUERpcmVjdG9yeShmYWxzZSkKKyAgICAsIG1faXNPdmVycmlkZUNvbnRlbnRUeXBlKGZh bHNlKQogICAgICwgbV9leHRlbmRlZFN0YXR1c0NvZGUoMCkKICAgICAsIG1fcmVkaXJlY3RDb3Vu dCgwKQogICAgICwgbV9kZWZlcnJlZERhdGEoKnRoaXMpCkBAIC0xNTEsOCArMTUzLDEwIEBAIGJv b2wgTmV0d29ya0pvYjo6aW5pdGlhbGl6ZShpbnQgcGxheWVySWQsCiAKICAgICAvLyBXZSBkb24n dCBuZWVkIHRvIGV4cGxpY2l0bHkgY2FsbCBub3RpZnlIZWFkZXJSZWNlaXZlZCwgYXMgdGhlIENv bnRlbnQtVHlwZQogICAgIC8vIHdpbGwgdWx0aW1hdGVseSBnZXQgcGFyc2VkIHdoZW4gc2VuZFJl c3BvbnNlSWZOZWVkZWQgZ2V0cyBjYWxsZWQuCi0gICAgaWYgKCFyZXF1ZXN0LmdldE92ZXJyaWRl Q29udGVudFR5cGUoKS5lbXB0eSgpKQorICAgIGlmICghcmVxdWVzdC5nZXRPdmVycmlkZUNvbnRl bnRUeXBlKCkuZW1wdHkoKSkgewogICAgICAgICBtX2NvbnRlbnRUeXBlID0gU3RyaW5nKHJlcXVl c3QuZ2V0T3ZlcnJpZGVDb250ZW50VHlwZSgpLmNfc3RyKCkpOworICAgICAgICBtX2lzT3ZlcnJp ZGVDb250ZW50VHlwZSA9IHRydWU7CisgICAgfQogCiAgICAgLy8gTm8gbmVlZCB0byBjcmVhdGUg dGhlIHN0cmVhbXMgZm9yIGRhdGEgYW5kIGFib3V0LgogICAgIGlmIChtX2lzRGF0YSB8fCBtX2lz QWJvdXQpCkBAIC0zODIsNiArMzg2LDMyIEBAIHZvaWQgTmV0d29ya0pvYjo6aGFuZGxlTm90aWZ5 RGF0YVJlY2VpdmVkKGNvbnN0IGNoYXIqIGJ1Ziwgc2l6ZV90IGxlbikKICAgICBpZiAoIWJ1ZiB8 fCAhbGVuKQogICAgICAgICByZXR1cm47CiAKKyAgICAvLyBUaGUgbG9hZEZpbGUgQVBJIHNldHMg dGhlIG92ZXJyaWRlIGNvbnRlbnQgdHlwZSwKKyAgICAvLyB0aGlzIHdpbGwgYWx3YXlzIGJlIHVz ZWQgYXMgdGhlIGNvbnRlbnQgdHlwZSBhbmQgc2hvdWxkIG5vdCBiZSBvdmVycmlkZGVuLgorICAg IGlmICghbV9kYXRhUmVjZWl2ZWQgJiYgIW1faXNPdmVycmlkZUNvbnRlbnRUeXBlKSB7CisgICAg ICAgIGJvb2wgc2hvdWxkU25pZmYgPSB0cnVlOworCisgICAgICAgIC8vIERvbid0IGJvdGhlciBz bmlmZmluZyB0aGUgY29udGVudCB0eXBlIG9mIGEgZmlsZSB0aGF0CisgICAgICAgIC8vIGlzIG9u IGEgZmlsZSBzeXN0ZW0gaWYgaXQgaGFzIGEgTUlNRSBtYXBwYWJsZSBmaWxlIGV4dGVuc2lvbi4K KyAgICAgICAgLy8gVGhlIGZpbGUgZXh0ZW5zaW9uIGlzIGxpa2VseSB0byBiZSBjb3JyZWN0Lgor ICAgICAgICBpZiAobV9pc0ZpbGUpIHsKKyAgICAgICAgICAgIFN0cmluZyB1cmxGaWxlbmFtZSA9 IG1fcmVzcG9uc2UudXJsKCkubGFzdFBhdGhDb21wb25lbnQoKTsKKyAgICAgICAgICAgIHNpemVf dCBwb3MgPSB1cmxGaWxlbmFtZS5yZXZlcnNlRmluZCgnLicpOworICAgICAgICAgICAgaWYgKHBv cyAhPSBXVEY6Om5vdEZvdW5kKSB7CisgICAgICAgICAgICAgICAgU3RyaW5nIGV4dGVuc2lvbiA9 IHVybEZpbGVuYW1lLnN1YnN0cmluZyhwb3MgKyAxKTsKKyAgICAgICAgICAgICAgICBTdHJpbmcg bWltZVR5cGUgPSBNSU1FVHlwZVJlZ2lzdHJ5OjpnZXRNSU1FVHlwZUZvckV4dGVuc2lvbihleHRl bnNpb24pOworICAgICAgICAgICAgICAgIGlmICghbWltZVR5cGUuaXNFbXB0eSgpKQorICAgICAg ICAgICAgICAgICAgICBzaG91bGRTbmlmZiA9IGZhbHNlOworICAgICAgICAgICAgfQorICAgICAg ICB9CisKKyAgICAgICAgaWYgKHNob3VsZFNuaWZmKSB7CisgICAgICAgICAgICBNSU1FU25pZmZl ciBzbmlmZmVyID0gTUlNRVNuaWZmZXIobV9jb250ZW50VHlwZS5sYXRpbjEoKS5kYXRhKCksIE1J TUVUeXBlUmVnaXN0cnk6OmlzU3VwcG9ydGVkSW1hZ2VSZXNvdXJjZU1JTUVUeXBlKG1fY29udGVu dFR5cGUpKTsKKyAgICAgICAgICAgIGlmIChjb25zdCBjaGFyKiB0eXBlID0gc25pZmZlci5zbmlm ZihidWYsIHN0ZDo6bWluKGxlbiwgc25pZmZlci5kYXRhU2l6ZSgpKSkpCisgICAgICAgICAgICAg ICAgbV9zbmlmZmVkTWltZVR5cGUgPSBTdHJpbmcodHlwZSk7CisgICAgICAgIH0KKyAgICB9CisK ICAgICBtX2RhdGFSZWNlaXZlZCA9IHRydWU7CiAKICAgICAvLyBQcm90ZWN0IGFnYWluc3QgcmVl bnRyYW5jeS4KQEAgLTU4MywxMSArNjEzLDkgQEAgdm9pZCBOZXR3b3JrSm9iOjpzZW5kUmVzcG9u c2VJZk5lZWRlZCgpCiAgICAgLy8gR2V0IHRoZSBNSU1FIHR5cGUgdGhhdCB3YXMgc2V0IGJ5IHRo ZSBjb250ZW50IHNuaWZmZXIKICAgICAvLyBpZiB0aGVyZSdzIG5vIGN1c3RvbSBzbmlmZmVyIGhl YWRlciwgdHJ5IHRvIHNldCBpdCBmcm9tIHRoZSBDb250ZW50LVR5cGUgaGVhZGVyCiAgICAgLy8g aWYgdGhpcyBmYWlscywgZ3Vlc3MgaXQgZnJvbSBleHRlbnNpb24uCi0gICAgU3RyaW5nIG1pbWVU eXBlOworICAgIFN0cmluZyBtaW1lVHlwZSA9IG1fc25pZmZlZE1pbWVUeXBlOwogICAgIGlmICht X2lzRlRQICYmIG1faXNGVFBEaXIpCiAgICAgICAgIG1pbWVUeXBlID0gImFwcGxpY2F0aW9uL3gt ZnRwLWRpcmVjdG9yeSI7Ci0gICAgZWxzZQotICAgICAgICBtaW1lVHlwZSA9IG1fcmVzcG9uc2Uu aHR0cEhlYWRlckZpZWxkKEJsYWNrQmVycnk6OlBsYXRmb3JtOjpOZXR3b3JrUmVxdWVzdDo6SEVB REVSX1JJTV9TTklGRkVEX01JTUVfVFlQRSk7CiAgICAgaWYgKG1pbWVUeXBlLmlzTnVsbCgpKQog ICAgICAgICBtaW1lVHlwZSA9IGV4dHJhY3RNSU1FVHlwZUZyb21NZWRpYVR5cGUobV9jb250ZW50 VHlwZSk7CiAgICAgaWYgKG1pbWVUeXBlLmlzTnVsbCgpKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vbmV0d29yay9ibGFja2JlcnJ5L05ldHdvcmtKb2IuaCBiL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvYmxhY2tiZXJyeS9OZXR3b3JrSm9iLmgKaW5kZXggNDQ3 YTY0NC4uYTUwMDU5YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29y ay9ibGFja2JlcnJ5L05ldHdvcmtKb2IuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9u ZXR3b3JrL2JsYWNrYmVycnkvTmV0d29ya0pvYi5oCkBAIC0xNTgsNiArMTU4LDcgQEAgcHJpdmF0 ZToKICAgICBPd25QdHI8UmVzb3VyY2VSZXNwb25zZT4gbV9tdWx0aXBhcnRSZXNwb25zZTsKICAg ICBUaW1lcjxOZXR3b3JrSm9iPiBtX2RlbGV0ZUpvYlRpbWVyOwogICAgIFN0cmluZyBtX2NvbnRl bnRUeXBlOworICAgIFN0cmluZyBtX3NuaWZmZWRNaW1lVHlwZTsKICAgICBTdHJpbmcgbV9jb250 ZW50RGlzcG9zaXRpb247CiAgICAgQmxhY2tCZXJyeTo6UGxhdGZvcm06Ok5ldHdvcmtTdHJlYW1G YWN0b3J5KiBtX3N0cmVhbUZhY3Rvcnk7CiAgICAgYm9vbCBtX2lzRmlsZTsKQEAgLTE3NSw2ICsx NzYsNyBAQCBwcml2YXRlOgogICAgIGJvb2wgbV9jYWxsaW5nQ2xpZW50OwogICAgIGJvb2wgbV9p c1hIUjsgLy8gRklYTUUgLSBBZnRlciA3LjAsIHJlbW92ZSB0aGlzLiBPbmx5IHRoZSBRdCBwb3J0 IHJlcG9ydHMgSFRUUCBlcnJvciBzdGF0dXNlcyBhcyBkaWRGYWlscywgc28gd2UgcHJvYmFibHkg c2hvdWxkbid0LgogICAgIGJvb2wgbV9uZWVkc1JldHJ5QXNGVFBEaXJlY3Rvcnk7CisgICAgYm9v bCBtX2lzT3ZlcnJpZGVDb250ZW50VHlwZTsKIAogICAgIC8vIElmIGFuIEhUVFAgc3RhdHVzIGNv ZGUgaXMgcmVjZWl2ZWQsIG1fZXh0ZW5kZWRTdGF0dXNDb2RlIGFuZCBtX3Jlc3BvbnNlLmh0dHBT dGF0dXNDb2RlIHdpbGwgYm90aCBiZSBzZXQgdG8gaXQuCiAgICAgLy8gSWYgYSBwbGF0Zm9ybSBl cnJvciBjb2RlIGlzIHJlY2VpdmVkLCBtX2V4dGVuZGVkU3RhdHVzQ29kZSB3aWxsIGJlIHNldCB0 byBpdCBhbmQgbV9yZXNwb25zZS5odHRwU3RhdHVzQ29kZSB3aWxsIGJlIHNldCB0byA0MDQuCi0t IAoxLjcuMQoK