68560 2011-09-21 12:45:30 -0700 [Qt] HTTP header injection via QWebPage::userAgentForUrl() 2011-12-20 04:56:30 -0800 1 1 1 Unclassified WebKit Platform 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED Qt P2 Normal --- 1 jarred jarred ademar ap ariya.hidayat cmarcelo hausmann jesus robert webkit.review.bot oldest_to_newest 471061 0 108210 jarred 2011-09-21 12:45:30 -0700 Created attachment 108210 userAgentForUrl stripping This is an interesting issue, that isn't any one particular tier's fault. When working with PhantomJS (based on QtWebKit), where the user is able to provide their own user agent, we discovered that the user (or attacker?) can set the user agent in such a way to add another HTTP header implicitly to the ResourceRequest: userAgent = 'My User Agent\nX-My-New-Header: oh noes!'; Which will result in sending the HTTP request w/ headers: User-Agent: My User Agent X-My-New-Header: oh noes! Clearly, this could be problematic. HTTPHeaderMap doesn't filter the values at all (relying on platform network stack?). QNetworkRequest clearly just writes the headers onto the stream without a care. This is either everyone's fault or no one's fault. While XMLHttpRequest does a validity check of header values (to make sure they don't contain \r or \n) since it's a scriptable API, internal header management does not validate, falling back to the platform's network stack to handle it properly. Though this is an edge case, QWebPage is offering to the consumer of the QtWebKit API the ability to set the user agent header and doesn't protect it. Attached is a patch that does the obvious and strips out newline chars to protect this particular scenario, from within WebCore. But, maybe some handling belongs in QNetwork as well, which would make this a temporary patch. Or such behavior is acceptable in QNetwork, which means the validation should occur on a higher tier. Input on this matter is welcomed! 471081 1 jesus 2011-09-21 13:01:54 -0700 (In reply to comment #0) > Input on this matter is welcomed! I'm not sure where exactly the "protection" should go, but I agree that we need it. Let's just make sure to have a test covering it as well. Now that we had this heads-up, is there any other place our API might be prone to injection?! 471090 2 jarred 2011-09-21 13:09:11 -0700 (In reply to comment #1) > Now that we had this heads-up, is there any other place our API might be prone to injection?! Good question; I'll scour the API to see if any relevant issues are present elsewhere. In the meantime though I will prepare an official patch w/ a test to cover up this one case in particular. Sound good? 471134 3 ademar 2011-09-21 13:56:40 -0700 I fail to see an attack scenario... How could an attacker provide the user-agent? Maybe I'm missing a feature from your PhanonJS, or maybe you don't want to trust the end user at all? Could you please provide a real world attack scenario? Finally, if this (or any other bug you find) is indeed a security vulnerability, please open a bug against the Security component. This way the bug is kept private while we fix it and give some time to all vendors to fix their applications and distribute the patches to end users (in this case the only vendor would be QtWebKit). More details about the WebKit security policy here: http://www.webkit.org/security/ 471142 4 robert 2011-09-21 14:04:22 -0700 This is an interesting find, but I agree with Ademar it's not a vulnerability. If a client is allowing third-party code to set the UA there isn't much additional leverage to be had from adding a new header. Still worth fixing though. 471148 5 jarred 2011-09-21 14:10:34 -0700 (In reply to comment #3) > I fail to see an attack scenario... How could an attacker provide the user-agent? Maybe I'm missing a feature from your PhanonJS, or maybe you don't want to trust the end user at all? Could you please provide a real world attack scenario? > > Finally, if this (or any other bug you find) is indeed a security vulnerability, please open a bug against the Security component. This way the bug is kept private while we fix it and give some time to all vendors to fix their applications and distribute the patches to end users (in this case the only vendor would be QtWebKit). > > More details about the WebKit security policy here: http://www.webkit.org/security/ I consider this more of a straight up bug in handling the result from userAgentFromUrl - not so much a security problem. My scenario: because PhantomJS exposes a global "phantomjs" variable in the context of a web site (as a tool its often used to scrape web sites), a site could detect its presence and set the user agent overriding some identity headers (cookies, preflight origin w/ CORS? etc.) and who the heck knows what could come next. Niche, and no big deal. But, nevertheless, userAgentFromUrl shouldn't return an invalid header value; at least that we can all agree with. 471156 6 ariya.hidayat 2011-09-21 14:28:17 -0700 Related PhantomJS comment: http://code.google.com/p/phantomjs/issues/detail?id=45#c5 471531 7 ademar 2011-09-22 06:42:49 -0700 Changing the bug title to clarify this is not a security problem. 523959 8 119879 jarred 2011-12-19 10:04:41 -0800 Created attachment 119879 Patch 523960 9 webkit.review.bot 2011-12-19 10:06:33 -0800 Attachment 119879 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebKit/qt/ChangeLog', u'Source/WebK..." exit_code: 1 Source/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp:2677: This { should be at the end of the previous line [whitespace/braces] [4] Total errors found: 1 in 3 files If any of these errors are false positives, please file a bug against check-webkit-style. 523962 10 jarred 2011-12-19 10:07:33 -0800 > Source/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp:2677: This { should be at the end of the previous line [whitespace/braces] [4] > Total errors found: 1 in 3 files false positive 523965 11 119879 webkit-ews 2011-12-19 10:10:42 -0800 Comment on attachment 119879 Patch Attachment 119879 did not pass qt-ews (qt): Output: http://queues.webkit.org/results/10934582 523968 12 119881 jarred 2011-12-19 10:14:43 -0800 Created attachment 119881 Patch 523970 13 webkit.review.bot 2011-12-19 10:17:04 -0800 Attachment 119881 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebKit/qt/ChangeLog', u'Source/WebK..." exit_code: 1 Source/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp:2677: This { should be at the end of the previous line [whitespace/braces] [4] Total errors found: 1 in 3 files If any of these errors are false positives, please file a bug against check-webkit-style. 523971 14 119881 webkit-ews 2011-12-19 10:18:49 -0800 Comment on attachment 119881 Patch Attachment 119881 did not pass qt-ews (qt): Output: http://queues.webkit.org/results/10928607 523997 15 119884 jarred 2011-12-19 10:45:13 -0800 Created attachment 119884 Patch 524002 16 webkit.review.bot 2011-12-19 10:48:19 -0800 Attachment 119884 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebKit/qt/ChangeLog', u'Source/WebK..." exit_code: 1 Source/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp:2677: This { should be at the end of the previous line [whitespace/braces] [4] Total errors found: 1 in 3 files If any of these errors are false positives, please file a bug against check-webkit-style. 524137 17 119884 benjamin 2011-12-19 13:12:22 -0800 Comment on attachment 119884 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=119884&action=review > Source/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp:739 > + return m_webFrame->page()->userAgentForUrl(url).replace(QRegExp(QLatin1String("[\n\r]")), QLatin1String("")); QLatin1String("") -> QLatin1String(). Using QRegExp() is always a bad idea. 524138 18 119884 benjamin 2011-12-19 13:13:28 -0800 Comment on attachment 119884 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=119884&action=review > Source/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp:2680 > + virtual QString userAgentForUrl(const QUrl& url) const > + { return QString("My User Agent\nX-New-Http-Header: Oh Noes!"); } Coding style. > Source/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp:2686 > + QString userAgent("My User AgentX-New-Http-Header: Oh Noes!"); Make that a static const QLatin1String in CustomUserAgentWebPage? 524144 19 119908 jarred 2011-12-19 13:32:25 -0800 Created attachment 119908 Patch 524147 20 webkit.review.bot 2011-12-19 13:35:41 -0800 Attachment 119908 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebKit/qt/ChangeLog', u'Source/WebK..." exit_code: 1 Source/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp:2677: This { should be at the end of the previous line [whitespace/braces] [4] Total errors found: 1 in 3 files If any of these errors are false positives, please file a bug against check-webkit-style. 524149 21 119908 webkit-ews 2011-12-19 13:36:37 -0800 Comment on attachment 119908 Patch Attachment 119908 did not pass qt-ews (qt): Output: http://queues.webkit.org/results/10943036 524150 22 jarred 2011-12-19 13:37:32 -0800 (In reply to comment #21) > (From update of attachment 119908 [details]) > Attachment 119908 [details] did not pass qt-ews (qt): > Output: http://queues.webkit.org/results/10943036 lol, thanks Benjamin ;-P I love cowboying patches... 524155 23 119911 jarred 2011-12-19 13:40:24 -0800 Created attachment 119911 Patch 524157 24 webkit.review.bot 2011-12-19 13:42:26 -0800 Attachment 119911 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebKit/qt/ChangeLog', u'Source/WebK..." exit_code: 1 Source/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp:2677: This { should be at the end of the previous line [whitespace/braces] [4] Total errors found: 1 in 3 files If any of these errors are false positives, please file a bug against check-webkit-style. 524176 25 119916 jarred 2011-12-19 14:04:02 -0800 Created attachment 119916 Patch 524182 26 webkit.review.bot 2011-12-19 14:08:06 -0800 Attachment 119916 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebKit/qt/ChangeLog', u'Source/WebK..." exit_code: 1 Source/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp:2677: This { should be at the end of the previous line [whitespace/braces] [4] Total errors found: 1 in 3 files If any of these errors are false positives, please file a bug against check-webkit-style. 524202 27 119916 benjamin 2011-12-19 14:48:11 -0800 Comment on attachment 119916 Patch Actually, I know think this is incorrect. A end of line is valid in a header with a continuation (http://www.w3.org/Protocols/rfc2616/rfc2616-sec2.html#sec2.2 ). You might decide not to handle this case in Qt 524203 28 119916 benjamin 2011-12-19 14:48:12 -0800 Comment on attachment 119916 Patch Actually, I know think this is incorrect. A end of line is valid in a header with a continuation (http://www.w3.org/Protocols/rfc2616/rfc2616-sec2.html#sec2.2 ). You might decide not to handle this case in Qt 524208 29 jarred 2011-12-19 15:01:09 -0800 (In reply to comment #28) > (From update of attachment 119916 [details]) > Actually, I know think this is incorrect. A end of line is valid in a header with a continuation (http://www.w3.org/Protocols/rfc2616/rfc2616-sec2.html#sec2.2 ). You might decide not to handle this case in Qt We can do a white space check after a crlf before deciding to strip. I'm dropping this bug for now, someone can choose to merge this as-is, enhance it per the rfc, or forget about it. For user agent though I can say that it's reasonable to forget about line comtinuations... 524465 30 119916 hausmann 2011-12-20 00:28:20 -0800 Comment on attachment 119916 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=119916&action=review I think that's a very good solution to the problem. I think this can be written more efficiently though and there's a style nitpick :) > Source/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp:739 > + return m_webFrame->page()->userAgentForUrl(url).replace(QLatin1String("\n"), QString()).replace(QLatin1String("\r"), QString()); I think it is better to use remove() instead of replace(): return m_webFrame->page()->userAgentForUrl(url).remove(QLatin1Char('\n')).remove(QLatin1Char('\r')); I think in the common case of _no_ newlines/linefeeds being present, the simple iteration that QString::remove(QChar) does is faster than creating temporary QStrings and firing up the QStringMatcher machinery. 524466 31 hausmann 2011-12-20 00:29:43 -0800 (In reply to comment #29) > (In reply to comment #28) > > (From update of attachment 119916 [details] [details]) > > Actually, I know think this is incorrect. A end of line is valid in a header with a continuation (http://www.w3.org/Protocols/rfc2616/rfc2616-sec2.html#sec2.2 ). You might decide not to handle this case in Qt > > We can do a white space check after a crlf before deciding to strip. I'm dropping this bug for now, someone can choose to merge this as-is, enhance it per the rfc, or forget about it. For user agent though I can say that it's reasonable to forget about line comtinuations... Yeah, I'm inclined to agree. Let's not worry about continuations while at the same time the fix to this problem is simple enough that we could put it straight into the library :) 524512 32 120003 jarred 2011-12-20 03:29:53 -0800 Created attachment 120003 Patch Sounds good Simon, remove() for the win. New patch... 524513 33 webkit.review.bot 2011-12-20 03:31:20 -0800 Attachment 120003 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebKit/qt/ChangeLog', u'Source/WebK..." exit_code: 1 Source/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp:2677: This { should be at the end of the previous line [whitespace/braces] [4] Total errors found: 1 in 3 files If any of these errors are false positives, please file a bug against check-webkit-style. 524514 34 120003 hausmann 2011-12-20 03:41:19 -0800 Comment on attachment 120003 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=120003&action=review >> Source/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp:2677 >> +{ > > This { should be at the end of the previous line [whitespace/braces] [4] Style queue is right here.... ;) Want to fix it when landing? 524515 35 jarred 2011-12-20 03:43:13 -0800 (In reply to comment #34) > (From update of attachment 120003 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=120003&action=review > > >> Source/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp:2677 > >> +{ > > > > This { should be at the end of the previous line [whitespace/braces] [4] > > Style queue is right here.... ;) Want to fix it when landing? I can but it's consistent with *all* of the other test classes in there; I purposefully ignored the style checker on this one. I'd rather stay consistent to the file. Let me know and I'll do one or the other before landing. 524519 36 hausmann 2011-12-20 03:45:57 -0800 (In reply to comment #35) > (In reply to comment #34) > > (From update of attachment 120003 [details] [details]) > > View in context: https://bugs.webkit.org/attachment.cgi?id=120003&action=review > > > > >> Source/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp:2677 > > >> +{ > > > > > > This { should be at the end of the previous line [whitespace/braces] [4] > > > > Style queue is right here.... ;) Want to fix it when landing? > > I can but it's consistent with *all* of the other test classes in there; I purposefully ignored the style checker on this one. I'd rather stay consistent to the file. Let me know and I'll do one or the other before landing. That's fine with me, too :) 524520 37 120003 hausmann 2011-12-20 03:46:19 -0800 Comment on attachment 120003 Patch In that case, let's give it a go :) 524521 38 jarred 2011-12-20 03:47:15 -0800 (In reply to comment #37) > (From update of attachment 120003 [details]) > In that case, let's give it a go :) Ok cool :) Thanks for the review. 524538 39 120003 webkit.review.bot 2011-12-20 04:56:24 -0800 Comment on attachment 120003 Patch Clearing flags on attachment: 120003 Committed r103320: <http://trac.webkit.org/changeset/103320> 524539 40 webkit.review.bot 2011-12-20 04:56:30 -0800 All reviewed patches have been landed. Closing bug. 108210 2011-09-21 12:45:30 -0700 2011-12-19 10:04:32 -0800 userAgentForUrl stripping userAgentForUrl.patch text/plain 643 jarred ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvcXQvV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJD bGllbnRRdC5jcHAgYi9Tb3VyY2UvV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVy Q2xpZW50UXQuY3BwCmluZGV4IDEzNmFkMjEuLjFmMDEyYjQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQvcXQvV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRRdC5jcHAKKysrIGIvU291 cmNlL1dlYktpdC9xdC9XZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRlckNsaWVudFF0LmNwcApAQCAt NzMyLDcgKzczMiw3IEBAIHZvaWQgRnJhbWVMb2FkZXJDbGllbnRRdDo6c2V0VGl0bGUoY29uc3Qg U3RyaW5nV2l0aERpcmVjdGlvbiYgdGl0bGUsIGNvbnN0IEtVUkwmCiBTdHJpbmcgRnJhbWVMb2Fk ZXJDbGllbnRRdDo6dXNlckFnZW50KGNvbnN0IEtVUkwmIHVybCkKIHsKICAgICBpZiAobV93ZWJG cmFtZSkgewotICAgICAgICByZXR1cm4gbV93ZWJGcmFtZS0+cGFnZSgpLT51c2VyQWdlbnRGb3JV cmwodXJsKTsKKyAgICAgICAgcmV0dXJuIG1fd2ViRnJhbWUtPnBhZ2UoKS0+dXNlckFnZW50Rm9y VXJsKHVybCkucmVwbGFjZShRUmVnRXhwKCJbXG5ccl0iKSwgIiIpOwogICAgIH0KICAgICByZXR1 cm4gU3RyaW5nKCk7CiB9Cg== 119879 2011-12-19 10:04:41 -0800 2011-12-19 10:14:37 -0800 Patch bug-68560-20111219130439.patch text/plain 3162 jarred U3VidmVyc2lvbiBSZXZpc2lvbjogMTAzMjM4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L3F0 L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvcXQvQ2hhbmdlTG9nCmluZGV4IDg5MDgwNmJkMGVm MTA3NDlhMzg3MDU3NGY1NmNjMjkyYWUzMDU4MjguLmQ3ZTY2YjE4NmQ5YjJkZmU1YjVlZWMyYWY4 ODMxOGI5YmY5OTVmM2IgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvcXQvQ2hhbmdlTG9nCisr KyBiL1NvdXJjZS9XZWJLaXQvcXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIgQEAKKzIwMTEtMTIt MTkgIEphcnJlZCBOaWNob2xscyAgPGphcnJlZEBzZW5jaGEuY29tPgorCisgICAgICAgIFtRdF0g SFRUUCBoZWFkZXIgaW5qZWN0aW9uIHZpYSBRV2ViUGFnZTo6dXNlckFnZW50Rm9yVXJsKCkKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTY4NTYwCisKKyAg ICAgICAgU3RyaXAgb3V0IG5ld2xpbmUgY2hhcmFjdGVycyBmcm9tIHRoZSByZXN1bHQgb2YgdXNl ckFnZW50Rm9yVXJsKCkgdG8gcHJldmVudCBhZGRpdGlvbmFsCisgICAgICAgIEhUVFAgaGVhZGVy cyBpbiBIVFRQIHJlcXVlc3RzLgorCisgICAgICAgIE5ldyBRdFRlc3QgY2FzZSB0aGF0IHZhbGlk YXRlcyB0aGUgdXNlciBhZ2VudCwgYXMgcmV0dXJuZWQgYnkgbmF2aWdhdG9yLnVzZXJBZ2VudCwg ZG9lcyBub3QKKyAgICAgICAgY29udGFpbiBhbnkgbmV3bGluZSBjaGFyYWN0ZXJzLgorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogV2ViQ29yZVN1cHBv cnQvRnJhbWVMb2FkZXJDbGllbnRRdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZUxvYWRl ckNsaWVudFF0Ojp1c2VyQWdlbnQpOgorICAgICAgICAqIHRlc3RzL3F3ZWJwYWdlL3RzdF9xd2Vi cGFnZS5jcHA6CisgICAgICAgIChDdXN0b21Vc2VyQWdlbnRXZWJQYWdlOjp1c2VyQWdlbnRGb3JV cmwpOgorICAgICAgICAodHN0X1FXZWJQYWdlOjp1c2VyQWdlbnROZXdsaW5lU3RyaXBwaW5nKToK KwogMjAxMS0xMi0xOSAgQWxleGFuZGVyIEbDpnLDuHkgIDxhaGZAMHg5MC5kaz4KIAogICAgICAg ICBbUXRdIENsZWFudXAgUVRNX05BTUVTUEFDRSB1c2FnZSBpbiBEZXZpY2VPcmllbnRhdGlvblBy b3ZpZGVyUXQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvcXQvV2ViQ29yZVN1cHBvcnQvRnJh bWVMb2FkZXJDbGllbnRRdC5jcHAgYi9Tb3VyY2UvV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0L0Zy YW1lTG9hZGVyQ2xpZW50UXQuY3BwCmluZGV4IGU3Y2MxNjEzZGVmNjEzZGI1ZGM4ZThmNDIzNzk1 MWUxZDdiNDQ3YTAuLjljOTNlM2E3NjNmOTU5YTg1YWQyODViMWFiMjk2ZjE3ZGNiOGQwZTcgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvcXQvV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGll bnRRdC5jcHAKKysrIGIvU291cmNlL1dlYktpdC9xdC9XZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRl ckNsaWVudFF0LmNwcApAQCAtNzM2LDcgKzczNiw3IEBAIHZvaWQgRnJhbWVMb2FkZXJDbGllbnRR dDo6c2V0VGl0bGUoY29uc3QgU3RyaW5nV2l0aERpcmVjdGlvbiYgdGl0bGUsIGNvbnN0IEtVUkwm CiBTdHJpbmcgRnJhbWVMb2FkZXJDbGllbnRRdDo6dXNlckFnZW50KGNvbnN0IEtVUkwmIHVybCkK IHsKICAgICBpZiAobV93ZWJGcmFtZSkgewotICAgICAgICByZXR1cm4gbV93ZWJGcmFtZS0+cGFn ZSgpLT51c2VyQWdlbnRGb3JVcmwodXJsKTsKKyAgICAgICAgcmV0dXJuIG1fd2ViRnJhbWUtPnBh Z2UoKS0+dXNlckFnZW50Rm9yVXJsKHVybCkucmVwbGFjZShRUmVnRXhwKCJbXG5ccl0iLCAiIikp OwogICAgIH0KICAgICByZXR1cm4gU3RyaW5nKCk7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0L3F0L3Rlc3RzL3F3ZWJwYWdlL3RzdF9xd2VicGFnZS5jcHAgYi9Tb3VyY2UvV2ViS2l0L3F0 L3Rlc3RzL3F3ZWJwYWdlL3RzdF9xd2VicGFnZS5jcHAKaW5kZXggMmI5Y2M5ZjI5YTBkNmUwMDU4 N2VkOWM4NjdmZmZiNzA1MWZmZDAzYi4uMTVlMjYzYjVmMzgyYjJlZDJmOTFjMjYwN2M1MTdkMThh ODZiZWZjMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9xdC90ZXN0cy9xd2VicGFnZS90c3Rf cXdlYnBhZ2UuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvcXQvdGVzdHMvcXdlYnBhZ2UvdHN0X3F3 ZWJwYWdlLmNwcApAQCAtMTQwLDYgKzE0MCw3IEBAIHByaXZhdGUgc2xvdHM6CiAgICAgdm9pZCBl cnJvclBhZ2VFeHRlbnNpb25JbkZyYW1lc2V0KCk7CiAgICAgdm9pZCBlcnJvclBhZ2VFeHRlbnNp b25Mb2FkRmluaXNoZWQoKTsKICAgICB2b2lkIHVzZXJBZ2VudEFwcGxpY2F0aW9uTmFtZSgpOwor ICAgIHZvaWQgdXNlckFnZW50TmV3bGluZVN0cmlwcGluZygpOwogCiAgICAgdm9pZCB2aWV3TW9k ZXMoKTsKIApAQCAtMjY3Miw2ICsyNjczLDIyIEBAIHZvaWQgdHN0X1FXZWJQYWdlOjp1c2VyQWdl bnRBcHBsaWNhdGlvbk5hbWUoKQogICAgIFFDb3JlQXBwbGljYXRpb246OnNldEFwcGxpY2F0aW9u TmFtZShvbGRBcHBsaWNhdGlvbk5hbWUpOwogfQogCitjbGFzcyBDdXN0b21Vc2VyQWdlbnRXZWJQ YWdlIDogcHVibGljIFFXZWJQYWdlCit7Citwcm90ZWN0ZWQ6CisgICAgdmlydHVhbCBRU3RyaW5n IHVzZXJBZ2VudEZvclVybChjb25zdCBRVXJsJiB1cmwpIGNvbnN0CisgICAgeyByZXR1cm4gUVN0 cmluZygiTXkgVXNlciBBZ2VudFxuWC1OZXctSHR0cC1IZWFkZXI6IE9oIE5vZXMhIik7IH0KK307 CisKK3ZvaWQgdHN0X1FXZWJQYWdlOjp1c2VyQWdlbnROZXdsaW5lU3RyaXBwaW5nKCkKK3sKKyAg ICBDdXN0b21Vc2VyQWdlbnRXZWJQYWdlIHBhZ2U7CisgICAgUVN0cmluZyB1c2VyQWdlbnQoIk15 IFVzZXIgQWdlbnRYLU5ldy1IdHRwLUhlYWRlcjogT2ggTm9lcyEiKTsKKyAgICBRV2ViRnJhbWUq IG1haW5GcmFtZSA9IHBhZ2UubWFpbkZyYW1lKCk7CisgICAgbWFpbkZyYW1lLT5zZXRIdG1sKCI8 aHRtbD48Ym9keT48L2JvZHk+PC9odG1sPiIpOworICAgIFFDT01QQVJFKG1haW5GcmFtZS0+ZXZh bHVhdGVKYXZhU2NyaXB0KCJuYXZpZ2F0b3IudXNlckFnZW50IikudG9TdHJpbmcoKSwgdXNlckFn ZW50KTsKK30KKwogdm9pZCB0c3RfUVdlYlBhZ2U6OmNyYXNoVGVzdHNfTGF6eUluaXRpYWxpemF0 aW9uT2ZNYWluRnJhbWUoKQogewogICAgIHsK 119881 2011-12-19 10:14:43 -0800 2011-12-19 10:45:07 -0800 Patch bug-68560-20111219131441.patch text/plain 3162 jarred U3VidmVyc2lvbiBSZXZpc2lvbjogMTAzMjM4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L3F0 L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvcXQvQ2hhbmdlTG9nCmluZGV4IDg5MDgwNmJkMGVm MTA3NDlhMzg3MDU3NGY1NmNjMjkyYWUzMDU4MjguLmQ3ZTY2YjE4NmQ5YjJkZmU1YjVlZWMyYWY4 ODMxOGI5YmY5OTVmM2IgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvcXQvQ2hhbmdlTG9nCisr KyBiL1NvdXJjZS9XZWJLaXQvcXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIgQEAKKzIwMTEtMTIt MTkgIEphcnJlZCBOaWNob2xscyAgPGphcnJlZEBzZW5jaGEuY29tPgorCisgICAgICAgIFtRdF0g SFRUUCBoZWFkZXIgaW5qZWN0aW9uIHZpYSBRV2ViUGFnZTo6dXNlckFnZW50Rm9yVXJsKCkKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTY4NTYwCisKKyAg ICAgICAgU3RyaXAgb3V0IG5ld2xpbmUgY2hhcmFjdGVycyBmcm9tIHRoZSByZXN1bHQgb2YgdXNl ckFnZW50Rm9yVXJsKCkgdG8gcHJldmVudCBhZGRpdGlvbmFsCisgICAgICAgIEhUVFAgaGVhZGVy cyBpbiBIVFRQIHJlcXVlc3RzLgorCisgICAgICAgIE5ldyBRdFRlc3QgY2FzZSB0aGF0IHZhbGlk YXRlcyB0aGUgdXNlciBhZ2VudCwgYXMgcmV0dXJuZWQgYnkgbmF2aWdhdG9yLnVzZXJBZ2VudCwg ZG9lcyBub3QKKyAgICAgICAgY29udGFpbiBhbnkgbmV3bGluZSBjaGFyYWN0ZXJzLgorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogV2ViQ29yZVN1cHBv cnQvRnJhbWVMb2FkZXJDbGllbnRRdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZUxvYWRl ckNsaWVudFF0Ojp1c2VyQWdlbnQpOgorICAgICAgICAqIHRlc3RzL3F3ZWJwYWdlL3RzdF9xd2Vi cGFnZS5jcHA6CisgICAgICAgIChDdXN0b21Vc2VyQWdlbnRXZWJQYWdlOjp1c2VyQWdlbnRGb3JV cmwpOgorICAgICAgICAodHN0X1FXZWJQYWdlOjp1c2VyQWdlbnROZXdsaW5lU3RyaXBwaW5nKToK KwogMjAxMS0xMi0xOSAgQWxleGFuZGVyIEbDpnLDuHkgIDxhaGZAMHg5MC5kaz4KIAogICAgICAg ICBbUXRdIENsZWFudXAgUVRNX05BTUVTUEFDRSB1c2FnZSBpbiBEZXZpY2VPcmllbnRhdGlvblBy b3ZpZGVyUXQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvcXQvV2ViQ29yZVN1cHBvcnQvRnJh bWVMb2FkZXJDbGllbnRRdC5jcHAgYi9Tb3VyY2UvV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0L0Zy YW1lTG9hZGVyQ2xpZW50UXQuY3BwCmluZGV4IGU3Y2MxNjEzZGVmNjEzZGI1ZGM4ZThmNDIzNzk1 MWUxZDdiNDQ3YTAuLmJmMDliZjZjYTQ2YTQ1YTI1MzVmMGFlMDA1YTNjZDI0OGFmZjM2OWIgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvcXQvV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGll bnRRdC5jcHAKKysrIGIvU291cmNlL1dlYktpdC9xdC9XZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRl ckNsaWVudFF0LmNwcApAQCAtNzM2LDcgKzczNiw3IEBAIHZvaWQgRnJhbWVMb2FkZXJDbGllbnRR dDo6c2V0VGl0bGUoY29uc3QgU3RyaW5nV2l0aERpcmVjdGlvbiYgdGl0bGUsIGNvbnN0IEtVUkwm CiBTdHJpbmcgRnJhbWVMb2FkZXJDbGllbnRRdDo6dXNlckFnZW50KGNvbnN0IEtVUkwmIHVybCkK IHsKICAgICBpZiAobV93ZWJGcmFtZSkgewotICAgICAgICByZXR1cm4gbV93ZWJGcmFtZS0+cGFn ZSgpLT51c2VyQWdlbnRGb3JVcmwodXJsKTsKKyAgICAgICAgcmV0dXJuIG1fd2ViRnJhbWUtPnBh Z2UoKS0+dXNlckFnZW50Rm9yVXJsKHVybCkucmVwbGFjZShRUmVnRXhwKCJbXG5ccl0iKSwgIiIp OwogICAgIH0KICAgICByZXR1cm4gU3RyaW5nKCk7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0L3F0L3Rlc3RzL3F3ZWJwYWdlL3RzdF9xd2VicGFnZS5jcHAgYi9Tb3VyY2UvV2ViS2l0L3F0 L3Rlc3RzL3F3ZWJwYWdlL3RzdF9xd2VicGFnZS5jcHAKaW5kZXggMmI5Y2M5ZjI5YTBkNmUwMDU4 N2VkOWM4NjdmZmZiNzA1MWZmZDAzYi4uMTVlMjYzYjVmMzgyYjJlZDJmOTFjMjYwN2M1MTdkMThh ODZiZWZjMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9xdC90ZXN0cy9xd2VicGFnZS90c3Rf cXdlYnBhZ2UuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvcXQvdGVzdHMvcXdlYnBhZ2UvdHN0X3F3 ZWJwYWdlLmNwcApAQCAtMTQwLDYgKzE0MCw3IEBAIHByaXZhdGUgc2xvdHM6CiAgICAgdm9pZCBl cnJvclBhZ2VFeHRlbnNpb25JbkZyYW1lc2V0KCk7CiAgICAgdm9pZCBlcnJvclBhZ2VFeHRlbnNp b25Mb2FkRmluaXNoZWQoKTsKICAgICB2b2lkIHVzZXJBZ2VudEFwcGxpY2F0aW9uTmFtZSgpOwor ICAgIHZvaWQgdXNlckFnZW50TmV3bGluZVN0cmlwcGluZygpOwogCiAgICAgdm9pZCB2aWV3TW9k ZXMoKTsKIApAQCAtMjY3Miw2ICsyNjczLDIyIEBAIHZvaWQgdHN0X1FXZWJQYWdlOjp1c2VyQWdl bnRBcHBsaWNhdGlvbk5hbWUoKQogICAgIFFDb3JlQXBwbGljYXRpb246OnNldEFwcGxpY2F0aW9u TmFtZShvbGRBcHBsaWNhdGlvbk5hbWUpOwogfQogCitjbGFzcyBDdXN0b21Vc2VyQWdlbnRXZWJQ YWdlIDogcHVibGljIFFXZWJQYWdlCit7Citwcm90ZWN0ZWQ6CisgICAgdmlydHVhbCBRU3RyaW5n IHVzZXJBZ2VudEZvclVybChjb25zdCBRVXJsJiB1cmwpIGNvbnN0CisgICAgeyByZXR1cm4gUVN0 cmluZygiTXkgVXNlciBBZ2VudFxuWC1OZXctSHR0cC1IZWFkZXI6IE9oIE5vZXMhIik7IH0KK307 CisKK3ZvaWQgdHN0X1FXZWJQYWdlOjp1c2VyQWdlbnROZXdsaW5lU3RyaXBwaW5nKCkKK3sKKyAg ICBDdXN0b21Vc2VyQWdlbnRXZWJQYWdlIHBhZ2U7CisgICAgUVN0cmluZyB1c2VyQWdlbnQoIk15 IFVzZXIgQWdlbnRYLU5ldy1IdHRwLUhlYWRlcjogT2ggTm9lcyEiKTsKKyAgICBRV2ViRnJhbWUq IG1haW5GcmFtZSA9IHBhZ2UubWFpbkZyYW1lKCk7CisgICAgbWFpbkZyYW1lLT5zZXRIdG1sKCI8 aHRtbD48Ym9keT48L2JvZHk+PC9odG1sPiIpOworICAgIFFDT01QQVJFKG1haW5GcmFtZS0+ZXZh bHVhdGVKYXZhU2NyaXB0KCJuYXZpZ2F0b3IudXNlckFnZW50IikudG9TdHJpbmcoKSwgdXNlckFn ZW50KTsKK30KKwogdm9pZCB0c3RfUVdlYlBhZ2U6OmNyYXNoVGVzdHNfTGF6eUluaXRpYWxpemF0 aW9uT2ZNYWluRnJhbWUoKQogewogICAgIHsK 119884 2011-12-19 10:45:13 -0800 2011-12-19 13:32:19 -0800 Patch bug-68560-20111219134511.patch text/plain 3192 jarred U3VidmVyc2lvbiBSZXZpc2lvbjogMTAzMjM4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L3F0 L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvcXQvQ2hhbmdlTG9nCmluZGV4IDg5MDgwNmJkMGVm MTA3NDlhMzg3MDU3NGY1NmNjMjkyYWUzMDU4MjguLmQ3ZTY2YjE4NmQ5YjJkZmU1YjVlZWMyYWY4 ODMxOGI5YmY5OTVmM2IgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvcXQvQ2hhbmdlTG9nCisr KyBiL1NvdXJjZS9XZWJLaXQvcXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIgQEAKKzIwMTEtMTIt MTkgIEphcnJlZCBOaWNob2xscyAgPGphcnJlZEBzZW5jaGEuY29tPgorCisgICAgICAgIFtRdF0g SFRUUCBoZWFkZXIgaW5qZWN0aW9uIHZpYSBRV2ViUGFnZTo6dXNlckFnZW50Rm9yVXJsKCkKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTY4NTYwCisKKyAg ICAgICAgU3RyaXAgb3V0IG5ld2xpbmUgY2hhcmFjdGVycyBmcm9tIHRoZSByZXN1bHQgb2YgdXNl ckFnZW50Rm9yVXJsKCkgdG8gcHJldmVudCBhZGRpdGlvbmFsCisgICAgICAgIEhUVFAgaGVhZGVy cyBpbiBIVFRQIHJlcXVlc3RzLgorCisgICAgICAgIE5ldyBRdFRlc3QgY2FzZSB0aGF0IHZhbGlk YXRlcyB0aGUgdXNlciBhZ2VudCwgYXMgcmV0dXJuZWQgYnkgbmF2aWdhdG9yLnVzZXJBZ2VudCwg ZG9lcyBub3QKKyAgICAgICAgY29udGFpbiBhbnkgbmV3bGluZSBjaGFyYWN0ZXJzLgorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogV2ViQ29yZVN1cHBv cnQvRnJhbWVMb2FkZXJDbGllbnRRdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZUxvYWRl ckNsaWVudFF0Ojp1c2VyQWdlbnQpOgorICAgICAgICAqIHRlc3RzL3F3ZWJwYWdlL3RzdF9xd2Vi cGFnZS5jcHA6CisgICAgICAgIChDdXN0b21Vc2VyQWdlbnRXZWJQYWdlOjp1c2VyQWdlbnRGb3JV cmwpOgorICAgICAgICAodHN0X1FXZWJQYWdlOjp1c2VyQWdlbnROZXdsaW5lU3RyaXBwaW5nKToK KwogMjAxMS0xMi0xOSAgQWxleGFuZGVyIEbDpnLDuHkgIDxhaGZAMHg5MC5kaz4KIAogICAgICAg ICBbUXRdIENsZWFudXAgUVRNX05BTUVTUEFDRSB1c2FnZSBpbiBEZXZpY2VPcmllbnRhdGlvblBy b3ZpZGVyUXQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvcXQvV2ViQ29yZVN1cHBvcnQvRnJh bWVMb2FkZXJDbGllbnRRdC5jcHAgYi9Tb3VyY2UvV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0L0Zy YW1lTG9hZGVyQ2xpZW50UXQuY3BwCmluZGV4IGU3Y2MxNjEzZGVmNjEzZGI1ZGM4ZThmNDIzNzk1 MWUxZDdiNDQ3YTAuLmZhODc3NDMwMDBjNWZmMGNiNWMwZTdmYWUxODc1OThiMGQ5ZjBkNWYgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvcXQvV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGll bnRRdC5jcHAKKysrIGIvU291cmNlL1dlYktpdC9xdC9XZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRl ckNsaWVudFF0LmNwcApAQCAtNzM2LDcgKzczNiw3IEBAIHZvaWQgRnJhbWVMb2FkZXJDbGllbnRR dDo6c2V0VGl0bGUoY29uc3QgU3RyaW5nV2l0aERpcmVjdGlvbiYgdGl0bGUsIGNvbnN0IEtVUkwm CiBTdHJpbmcgRnJhbWVMb2FkZXJDbGllbnRRdDo6dXNlckFnZW50KGNvbnN0IEtVUkwmIHVybCkK IHsKICAgICBpZiAobV93ZWJGcmFtZSkgewotICAgICAgICByZXR1cm4gbV93ZWJGcmFtZS0+cGFn ZSgpLT51c2VyQWdlbnRGb3JVcmwodXJsKTsKKyAgICAgICAgcmV0dXJuIG1fd2ViRnJhbWUtPnBh Z2UoKS0+dXNlckFnZW50Rm9yVXJsKHVybCkucmVwbGFjZShRUmVnRXhwKFFMYXRpbjFTdHJpbmco IltcblxyXSIpKSwgUUxhdGluMVN0cmluZygiIikpOwogICAgIH0KICAgICByZXR1cm4gU3RyaW5n KCk7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L3F0L3Rlc3RzL3F3ZWJwYWdlL3RzdF9x d2VicGFnZS5jcHAgYi9Tb3VyY2UvV2ViS2l0L3F0L3Rlc3RzL3F3ZWJwYWdlL3RzdF9xd2VicGFn ZS5jcHAKaW5kZXggMmI5Y2M5ZjI5YTBkNmUwMDU4N2VkOWM4NjdmZmZiNzA1MWZmZDAzYi4uMTVl MjYzYjVmMzgyYjJlZDJmOTFjMjYwN2M1MTdkMThhODZiZWZjMiAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdC9xdC90ZXN0cy9xd2VicGFnZS90c3RfcXdlYnBhZ2UuY3BwCisrKyBiL1NvdXJjZS9X ZWJLaXQvcXQvdGVzdHMvcXdlYnBhZ2UvdHN0X3F3ZWJwYWdlLmNwcApAQCAtMTQwLDYgKzE0MCw3 IEBAIHByaXZhdGUgc2xvdHM6CiAgICAgdm9pZCBlcnJvclBhZ2VFeHRlbnNpb25JbkZyYW1lc2V0 KCk7CiAgICAgdm9pZCBlcnJvclBhZ2VFeHRlbnNpb25Mb2FkRmluaXNoZWQoKTsKICAgICB2b2lk IHVzZXJBZ2VudEFwcGxpY2F0aW9uTmFtZSgpOworICAgIHZvaWQgdXNlckFnZW50TmV3bGluZVN0 cmlwcGluZygpOwogCiAgICAgdm9pZCB2aWV3TW9kZXMoKTsKIApAQCAtMjY3Miw2ICsyNjczLDIy IEBAIHZvaWQgdHN0X1FXZWJQYWdlOjp1c2VyQWdlbnRBcHBsaWNhdGlvbk5hbWUoKQogICAgIFFD b3JlQXBwbGljYXRpb246OnNldEFwcGxpY2F0aW9uTmFtZShvbGRBcHBsaWNhdGlvbk5hbWUpOwog fQogCitjbGFzcyBDdXN0b21Vc2VyQWdlbnRXZWJQYWdlIDogcHVibGljIFFXZWJQYWdlCit7Citw cm90ZWN0ZWQ6CisgICAgdmlydHVhbCBRU3RyaW5nIHVzZXJBZ2VudEZvclVybChjb25zdCBRVXJs JiB1cmwpIGNvbnN0CisgICAgeyByZXR1cm4gUVN0cmluZygiTXkgVXNlciBBZ2VudFxuWC1OZXct SHR0cC1IZWFkZXI6IE9oIE5vZXMhIik7IH0KK307CisKK3ZvaWQgdHN0X1FXZWJQYWdlOjp1c2Vy QWdlbnROZXdsaW5lU3RyaXBwaW5nKCkKK3sKKyAgICBDdXN0b21Vc2VyQWdlbnRXZWJQYWdlIHBh Z2U7CisgICAgUVN0cmluZyB1c2VyQWdlbnQoIk15IFVzZXIgQWdlbnRYLU5ldy1IdHRwLUhlYWRl cjogT2ggTm9lcyEiKTsKKyAgICBRV2ViRnJhbWUqIG1haW5GcmFtZSA9IHBhZ2UubWFpbkZyYW1l KCk7CisgICAgbWFpbkZyYW1lLT5zZXRIdG1sKCI8aHRtbD48Ym9keT48L2JvZHk+PC9odG1sPiIp OworICAgIFFDT01QQVJFKG1haW5GcmFtZS0+ZXZhbHVhdGVKYXZhU2NyaXB0KCJuYXZpZ2F0b3Iu dXNlckFnZW50IikudG9TdHJpbmcoKSwgdXNlckFnZW50KTsKK30KKwogdm9pZCB0c3RfUVdlYlBh Z2U6OmNyYXNoVGVzdHNfTGF6eUluaXRpYWxpemF0aW9uT2ZNYWluRnJhbWUoKQogewogICAgIHsK 119908 2011-12-19 13:32:25 -0800 2011-12-19 13:40:18 -0800 Patch bug-68560-20111219163223.patch text/plain 3369 jarred U3VidmVyc2lvbiBSZXZpc2lvbjogMTAzMjM4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L3F0 L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvcXQvQ2hhbmdlTG9nCmluZGV4IDg5MDgwNmJkMGVm MTA3NDlhMzg3MDU3NGY1NmNjMjkyYWUzMDU4MjguLmQ3ZTY2YjE4NmQ5YjJkZmU1YjVlZWMyYWY4 ODMxOGI5YmY5OTVmM2IgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvcXQvQ2hhbmdlTG9nCisr KyBiL1NvdXJjZS9XZWJLaXQvcXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIgQEAKKzIwMTEtMTIt MTkgIEphcnJlZCBOaWNob2xscyAgPGphcnJlZEBzZW5jaGEuY29tPgorCisgICAgICAgIFtRdF0g SFRUUCBoZWFkZXIgaW5qZWN0aW9uIHZpYSBRV2ViUGFnZTo6dXNlckFnZW50Rm9yVXJsKCkKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTY4NTYwCisKKyAg ICAgICAgU3RyaXAgb3V0IG5ld2xpbmUgY2hhcmFjdGVycyBmcm9tIHRoZSByZXN1bHQgb2YgdXNl ckFnZW50Rm9yVXJsKCkgdG8gcHJldmVudCBhZGRpdGlvbmFsCisgICAgICAgIEhUVFAgaGVhZGVy cyBpbiBIVFRQIHJlcXVlc3RzLgorCisgICAgICAgIE5ldyBRdFRlc3QgY2FzZSB0aGF0IHZhbGlk YXRlcyB0aGUgdXNlciBhZ2VudCwgYXMgcmV0dXJuZWQgYnkgbmF2aWdhdG9yLnVzZXJBZ2VudCwg ZG9lcyBub3QKKyAgICAgICAgY29udGFpbiBhbnkgbmV3bGluZSBjaGFyYWN0ZXJzLgorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogV2ViQ29yZVN1cHBv cnQvRnJhbWVMb2FkZXJDbGllbnRRdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZUxvYWRl ckNsaWVudFF0Ojp1c2VyQWdlbnQpOgorICAgICAgICAqIHRlc3RzL3F3ZWJwYWdlL3RzdF9xd2Vi cGFnZS5jcHA6CisgICAgICAgIChDdXN0b21Vc2VyQWdlbnRXZWJQYWdlOjp1c2VyQWdlbnRGb3JV cmwpOgorICAgICAgICAodHN0X1FXZWJQYWdlOjp1c2VyQWdlbnROZXdsaW5lU3RyaXBwaW5nKToK KwogMjAxMS0xMi0xOSAgQWxleGFuZGVyIEbDpnLDuHkgIDxhaGZAMHg5MC5kaz4KIAogICAgICAg ICBbUXRdIENsZWFudXAgUVRNX05BTUVTUEFDRSB1c2FnZSBpbiBEZXZpY2VPcmllbnRhdGlvblBy b3ZpZGVyUXQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvcXQvV2ViQ29yZVN1cHBvcnQvRnJh bWVMb2FkZXJDbGllbnRRdC5jcHAgYi9Tb3VyY2UvV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0L0Zy YW1lTG9hZGVyQ2xpZW50UXQuY3BwCmluZGV4IGU3Y2MxNjEzZGVmNjEzZGI1ZGM4ZThmNDIzNzk1 MWUxZDdiNDQ3YTAuLjg4NTQ3NjU0Mzg1ODUyOTZjYmUwMDUyZGY0NjljZmVmYjM0YTMwMzMgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvcXQvV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGll bnRRdC5jcHAKKysrIGIvU291cmNlL1dlYktpdC9xdC9XZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRl ckNsaWVudFF0LmNwcApAQCAtNzM2LDcgKzczNiw3IEBAIHZvaWQgRnJhbWVMb2FkZXJDbGllbnRR dDo6c2V0VGl0bGUoY29uc3QgU3RyaW5nV2l0aERpcmVjdGlvbiYgdGl0bGUsIGNvbnN0IEtVUkwm CiBTdHJpbmcgRnJhbWVMb2FkZXJDbGllbnRRdDo6dXNlckFnZW50KGNvbnN0IEtVUkwmIHVybCkK IHsKICAgICBpZiAobV93ZWJGcmFtZSkgewotICAgICAgICByZXR1cm4gbV93ZWJGcmFtZS0+cGFn ZSgpLT51c2VyQWdlbnRGb3JVcmwodXJsKTsKKyAgICAgICAgcmV0dXJuIG1fd2ViRnJhbWUtPnBh Z2UoKS0+dXNlckFnZW50Rm9yVXJsKHVybCkucmVwbGFjZShRTGF0aW4xU3RyaW5nKCJcbiIpLCBR TGF0aW4xU3RyaW5nKCkpLnJlcGxhY2UoUUxhdGluMVN0cmluZygiXHIiKSwgUUxhdGluMVN0cmlu ZygpKTsKICAgICB9CiAgICAgcmV0dXJuIFN0cmluZygpOwogfQpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdC9xdC90ZXN0cy9xd2VicGFnZS90c3RfcXdlYnBhZ2UuY3BwIGIvU291cmNlL1dlYktp dC9xdC90ZXN0cy9xd2VicGFnZS90c3RfcXdlYnBhZ2UuY3BwCmluZGV4IDJiOWNjOWYyOWEwZDZl MDA1ODdlZDljODY3ZmZmYjcwNTFmZmQwM2IuLmIzZmYzYjljMTk3ODc1M2JlNzA1NWQ2YjI2MTBh NzQ2OWMzYzhlOGYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvcXQvdGVzdHMvcXdlYnBhZ2Uv dHN0X3F3ZWJwYWdlLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L3F0L3Rlc3RzL3F3ZWJwYWdlL3Rz dF9xd2VicGFnZS5jcHAKQEAgLTE0MCw2ICsxNDAsNyBAQCBwcml2YXRlIHNsb3RzOgogICAgIHZv aWQgZXJyb3JQYWdlRXh0ZW5zaW9uSW5GcmFtZXNldCgpOwogICAgIHZvaWQgZXJyb3JQYWdlRXh0 ZW5zaW9uTG9hZEZpbmlzaGVkKCk7CiAgICAgdm9pZCB1c2VyQWdlbnRBcHBsaWNhdGlvbk5hbWUo KTsKKyAgICB2b2lkIHVzZXJBZ2VudE5ld2xpbmVTdHJpcHBpbmcoKTsKIAogICAgIHZvaWQgdmll d01vZGVzKCk7CiAKQEAgLTI2NzIsNiArMjY3MywyNiBAQCB2b2lkIHRzdF9RV2ViUGFnZTo6dXNl ckFnZW50QXBwbGljYXRpb25OYW1lKCkKICAgICBRQ29yZUFwcGxpY2F0aW9uOjpzZXRBcHBsaWNh dGlvbk5hbWUob2xkQXBwbGljYXRpb25OYW1lKTsKIH0KIAorY2xhc3MgQ3VzdG9tVXNlckFnZW50 V2ViUGFnZSA6IHB1YmxpYyBRV2ViUGFnZQoreworcHVibGljOgorICAgIHN0YXRpYyBjb25zdCBR TGF0aW4xU3RyaW5nIGZpbHRlcmVkVXNlckFnZW50OworcHJvdGVjdGVkOgorICAgIHZpcnR1YWwg UVN0cmluZyB1c2VyQWdlbnRGb3JVcmwoY29uc3QgUVVybCYgdXJsKSBjb25zdAorICAgIHsKKyAg ICAgICAgcmV0dXJuIFFTdHJpbmcoIk15IFVzZXIgQWdlbnRcblgtTmV3LUh0dHAtSGVhZGVyOiBP aCBOb2VzISIpOworICAgIH0KK307Citjb25zdCBRTGF0aW4xU3RyaW5nIEN1c3RvbVVzZXJBZ2Vu dFdlYlBhZ2U6OmZpbHRlcmVkVXNlckFnZW50KCJNeSBVc2VyIEFnZW50WC1OZXctSHR0cC1IZWFk ZXI6IE9oIE5vZXMhIik7CisKK3ZvaWQgdHN0X1FXZWJQYWdlOjp1c2VyQWdlbnROZXdsaW5lU3Ry aXBwaW5nKCkKK3sKKyAgICBDdXN0b21Vc2VyQWdlbnRXZWJQYWdlIHBhZ2U7CisgICAgUVdlYkZy YW1lKiBtYWluRnJhbWUgPSBwYWdlLm1haW5GcmFtZSgpOworICAgIG1haW5GcmFtZS0+c2V0SHRt bCgiPGh0bWw+PGJvZHk+PC9ib2R5PjwvaHRtbD4iKTsKKyAgICBRQ09NUEFSRShtYWluRnJhbWUt PmV2YWx1YXRlSmF2YVNjcmlwdCgibmF2aWdhdG9yLnVzZXJBZ2VudCIpLnRvU3RyaW5nKCksIEN1 c3RvbVVzZXJBZ2VudFdlYlBhZ2U6OmZpbHRlcmVkVXNlckFnZW50KTsKK30KKwogdm9pZCB0c3Rf UVdlYlBhZ2U6OmNyYXNoVGVzdHNfTGF6eUluaXRpYWxpemF0aW9uT2ZNYWluRnJhbWUoKQogewog ICAgIHsK 119911 2011-12-19 13:40:24 -0800 2011-12-19 14:03:55 -0800 Patch bug-68560-20111219164023.patch text/plain 3373 jarred U3VidmVyc2lvbiBSZXZpc2lvbjogMTAzMjM4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L3F0 L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvcXQvQ2hhbmdlTG9nCmluZGV4IDg5MDgwNmJkMGVm MTA3NDlhMzg3MDU3NGY1NmNjMjkyYWUzMDU4MjguLmQ3ZTY2YjE4NmQ5YjJkZmU1YjVlZWMyYWY4 ODMxOGI5YmY5OTVmM2IgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvcXQvQ2hhbmdlTG9nCisr KyBiL1NvdXJjZS9XZWJLaXQvcXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIgQEAKKzIwMTEtMTIt MTkgIEphcnJlZCBOaWNob2xscyAgPGphcnJlZEBzZW5jaGEuY29tPgorCisgICAgICAgIFtRdF0g SFRUUCBoZWFkZXIgaW5qZWN0aW9uIHZpYSBRV2ViUGFnZTo6dXNlckFnZW50Rm9yVXJsKCkKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTY4NTYwCisKKyAg ICAgICAgU3RyaXAgb3V0IG5ld2xpbmUgY2hhcmFjdGVycyBmcm9tIHRoZSByZXN1bHQgb2YgdXNl ckFnZW50Rm9yVXJsKCkgdG8gcHJldmVudCBhZGRpdGlvbmFsCisgICAgICAgIEhUVFAgaGVhZGVy cyBpbiBIVFRQIHJlcXVlc3RzLgorCisgICAgICAgIE5ldyBRdFRlc3QgY2FzZSB0aGF0IHZhbGlk YXRlcyB0aGUgdXNlciBhZ2VudCwgYXMgcmV0dXJuZWQgYnkgbmF2aWdhdG9yLnVzZXJBZ2VudCwg ZG9lcyBub3QKKyAgICAgICAgY29udGFpbiBhbnkgbmV3bGluZSBjaGFyYWN0ZXJzLgorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogV2ViQ29yZVN1cHBv cnQvRnJhbWVMb2FkZXJDbGllbnRRdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZUxvYWRl ckNsaWVudFF0Ojp1c2VyQWdlbnQpOgorICAgICAgICAqIHRlc3RzL3F3ZWJwYWdlL3RzdF9xd2Vi cGFnZS5jcHA6CisgICAgICAgIChDdXN0b21Vc2VyQWdlbnRXZWJQYWdlOjp1c2VyQWdlbnRGb3JV cmwpOgorICAgICAgICAodHN0X1FXZWJQYWdlOjp1c2VyQWdlbnROZXdsaW5lU3RyaXBwaW5nKToK KwogMjAxMS0xMi0xOSAgQWxleGFuZGVyIEbDpnLDuHkgIDxhaGZAMHg5MC5kaz4KIAogICAgICAg ICBbUXRdIENsZWFudXAgUVRNX05BTUVTUEFDRSB1c2FnZSBpbiBEZXZpY2VPcmllbnRhdGlvblBy b3ZpZGVyUXQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvcXQvV2ViQ29yZVN1cHBvcnQvRnJh bWVMb2FkZXJDbGllbnRRdC5jcHAgYi9Tb3VyY2UvV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0L0Zy YW1lTG9hZGVyQ2xpZW50UXQuY3BwCmluZGV4IGU3Y2MxNjEzZGVmNjEzZGI1ZGM4ZThmNDIzNzk1 MWUxZDdiNDQ3YTAuLjE2Y2JlZTEwYWQxNzU1NWRhNDIwMTRlZmEzOGU1ZmQxMTY3N2Q2MzkgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvcXQvV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGll bnRRdC5jcHAKKysrIGIvU291cmNlL1dlYktpdC9xdC9XZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRl ckNsaWVudFF0LmNwcApAQCAtNzM2LDcgKzczNiw3IEBAIHZvaWQgRnJhbWVMb2FkZXJDbGllbnRR dDo6c2V0VGl0bGUoY29uc3QgU3RyaW5nV2l0aERpcmVjdGlvbiYgdGl0bGUsIGNvbnN0IEtVUkwm CiBTdHJpbmcgRnJhbWVMb2FkZXJDbGllbnRRdDo6dXNlckFnZW50KGNvbnN0IEtVUkwmIHVybCkK IHsKICAgICBpZiAobV93ZWJGcmFtZSkgewotICAgICAgICByZXR1cm4gbV93ZWJGcmFtZS0+cGFn ZSgpLT51c2VyQWdlbnRGb3JVcmwodXJsKTsKKyAgICAgICAgcmV0dXJuIG1fd2ViRnJhbWUtPnBh Z2UoKS0+dXNlckFnZW50Rm9yVXJsKHVybCkucmVwbGFjZShRTGF0aW4xU3RyaW5nKCJcbiIpLCBR TGF0aW4xU3RyaW5nKCIiKSkucmVwbGFjZShRTGF0aW4xU3RyaW5nKCJcciIpLCBRTGF0aW4xU3Ry aW5nKCIiKSk7CiAgICAgfQogICAgIHJldHVybiBTdHJpbmcoKTsKIH0KZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQvcXQvdGVzdHMvcXdlYnBhZ2UvdHN0X3F3ZWJwYWdlLmNwcCBiL1NvdXJjZS9X ZWJLaXQvcXQvdGVzdHMvcXdlYnBhZ2UvdHN0X3F3ZWJwYWdlLmNwcAppbmRleCAyYjljYzlmMjlh MGQ2ZTAwNTg3ZWQ5Yzg2N2ZmZmI3MDUxZmZkMDNiLi5iM2ZmM2I5YzE5Nzg3NTNiZTcwNTVkNmIy NjEwYTc0NjljM2M4ZThmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L3F0L3Rlc3RzL3F3ZWJw YWdlL3RzdF9xd2VicGFnZS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9xdC90ZXN0cy9xd2VicGFn ZS90c3RfcXdlYnBhZ2UuY3BwCkBAIC0xNDAsNiArMTQwLDcgQEAgcHJpdmF0ZSBzbG90czoKICAg ICB2b2lkIGVycm9yUGFnZUV4dGVuc2lvbkluRnJhbWVzZXQoKTsKICAgICB2b2lkIGVycm9yUGFn ZUV4dGVuc2lvbkxvYWRGaW5pc2hlZCgpOwogICAgIHZvaWQgdXNlckFnZW50QXBwbGljYXRpb25O YW1lKCk7CisgICAgdm9pZCB1c2VyQWdlbnROZXdsaW5lU3RyaXBwaW5nKCk7CiAKICAgICB2b2lk IHZpZXdNb2RlcygpOwogCkBAIC0yNjcyLDYgKzI2NzMsMjYgQEAgdm9pZCB0c3RfUVdlYlBhZ2U6 OnVzZXJBZ2VudEFwcGxpY2F0aW9uTmFtZSgpCiAgICAgUUNvcmVBcHBsaWNhdGlvbjo6c2V0QXBw bGljYXRpb25OYW1lKG9sZEFwcGxpY2F0aW9uTmFtZSk7CiB9CiAKK2NsYXNzIEN1c3RvbVVzZXJB Z2VudFdlYlBhZ2UgOiBwdWJsaWMgUVdlYlBhZ2UKK3sKK3B1YmxpYzoKKyAgICBzdGF0aWMgY29u c3QgUUxhdGluMVN0cmluZyBmaWx0ZXJlZFVzZXJBZ2VudDsKK3Byb3RlY3RlZDoKKyAgICB2aXJ0 dWFsIFFTdHJpbmcgdXNlckFnZW50Rm9yVXJsKGNvbnN0IFFVcmwmIHVybCkgY29uc3QKKyAgICB7 CisgICAgICAgIHJldHVybiBRU3RyaW5nKCJNeSBVc2VyIEFnZW50XG5YLU5ldy1IdHRwLUhlYWRl cjogT2ggTm9lcyEiKTsKKyAgICB9Cit9OworY29uc3QgUUxhdGluMVN0cmluZyBDdXN0b21Vc2Vy QWdlbnRXZWJQYWdlOjpmaWx0ZXJlZFVzZXJBZ2VudCgiTXkgVXNlciBBZ2VudFgtTmV3LUh0dHAt SGVhZGVyOiBPaCBOb2VzISIpOworCit2b2lkIHRzdF9RV2ViUGFnZTo6dXNlckFnZW50TmV3bGlu ZVN0cmlwcGluZygpCit7CisgICAgQ3VzdG9tVXNlckFnZW50V2ViUGFnZSBwYWdlOworICAgIFFX ZWJGcmFtZSogbWFpbkZyYW1lID0gcGFnZS5tYWluRnJhbWUoKTsKKyAgICBtYWluRnJhbWUtPnNl dEh0bWwoIjxodG1sPjxib2R5PjwvYm9keT48L2h0bWw+Iik7CisgICAgUUNPTVBBUkUobWFpbkZy YW1lLT5ldmFsdWF0ZUphdmFTY3JpcHQoIm5hdmlnYXRvci51c2VyQWdlbnQiKS50b1N0cmluZygp LCBDdXN0b21Vc2VyQWdlbnRXZWJQYWdlOjpmaWx0ZXJlZFVzZXJBZ2VudCk7Cit9CisKIHZvaWQg dHN0X1FXZWJQYWdlOjpjcmFzaFRlc3RzX0xhenlJbml0aWFsaXphdGlvbk9mTWFpbkZyYW1lKCkK IHsKICAgICB7Cg== 119916 2011-12-19 14:04:02 -0800 2011-12-20 03:29:46 -0800 Patch bug-68560-20111219170401.patch text/plain 3357 jarred U3VidmVyc2lvbiBSZXZpc2lvbjogMTAzMjM4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L3F0 L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvcXQvQ2hhbmdlTG9nCmluZGV4IDg5MDgwNmJkMGVm MTA3NDlhMzg3MDU3NGY1NmNjMjkyYWUzMDU4MjguLmQ3ZTY2YjE4NmQ5YjJkZmU1YjVlZWMyYWY4 ODMxOGI5YmY5OTVmM2IgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvcXQvQ2hhbmdlTG9nCisr KyBiL1NvdXJjZS9XZWJLaXQvcXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIgQEAKKzIwMTEtMTIt MTkgIEphcnJlZCBOaWNob2xscyAgPGphcnJlZEBzZW5jaGEuY29tPgorCisgICAgICAgIFtRdF0g SFRUUCBoZWFkZXIgaW5qZWN0aW9uIHZpYSBRV2ViUGFnZTo6dXNlckFnZW50Rm9yVXJsKCkKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTY4NTYwCisKKyAg ICAgICAgU3RyaXAgb3V0IG5ld2xpbmUgY2hhcmFjdGVycyBmcm9tIHRoZSByZXN1bHQgb2YgdXNl ckFnZW50Rm9yVXJsKCkgdG8gcHJldmVudCBhZGRpdGlvbmFsCisgICAgICAgIEhUVFAgaGVhZGVy cyBpbiBIVFRQIHJlcXVlc3RzLgorCisgICAgICAgIE5ldyBRdFRlc3QgY2FzZSB0aGF0IHZhbGlk YXRlcyB0aGUgdXNlciBhZ2VudCwgYXMgcmV0dXJuZWQgYnkgbmF2aWdhdG9yLnVzZXJBZ2VudCwg ZG9lcyBub3QKKyAgICAgICAgY29udGFpbiBhbnkgbmV3bGluZSBjaGFyYWN0ZXJzLgorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogV2ViQ29yZVN1cHBv cnQvRnJhbWVMb2FkZXJDbGllbnRRdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZUxvYWRl ckNsaWVudFF0Ojp1c2VyQWdlbnQpOgorICAgICAgICAqIHRlc3RzL3F3ZWJwYWdlL3RzdF9xd2Vi cGFnZS5jcHA6CisgICAgICAgIChDdXN0b21Vc2VyQWdlbnRXZWJQYWdlOjp1c2VyQWdlbnRGb3JV cmwpOgorICAgICAgICAodHN0X1FXZWJQYWdlOjp1c2VyQWdlbnROZXdsaW5lU3RyaXBwaW5nKToK KwogMjAxMS0xMi0xOSAgQWxleGFuZGVyIEbDpnLDuHkgIDxhaGZAMHg5MC5kaz4KIAogICAgICAg ICBbUXRdIENsZWFudXAgUVRNX05BTUVTUEFDRSB1c2FnZSBpbiBEZXZpY2VPcmllbnRhdGlvblBy b3ZpZGVyUXQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvcXQvV2ViQ29yZVN1cHBvcnQvRnJh bWVMb2FkZXJDbGllbnRRdC5jcHAgYi9Tb3VyY2UvV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0L0Zy YW1lTG9hZGVyQ2xpZW50UXQuY3BwCmluZGV4IGU3Y2MxNjEzZGVmNjEzZGI1ZGM4ZThmNDIzNzk1 MWUxZDdiNDQ3YTAuLjNjZDEyZGRhYjJmODI0ZWMwZTUzZDY0NGMxZmQ2MDFhYmJkY2Q3ODkgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvcXQvV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGll bnRRdC5jcHAKKysrIGIvU291cmNlL1dlYktpdC9xdC9XZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRl ckNsaWVudFF0LmNwcApAQCAtNzM2LDcgKzczNiw3IEBAIHZvaWQgRnJhbWVMb2FkZXJDbGllbnRR dDo6c2V0VGl0bGUoY29uc3QgU3RyaW5nV2l0aERpcmVjdGlvbiYgdGl0bGUsIGNvbnN0IEtVUkwm CiBTdHJpbmcgRnJhbWVMb2FkZXJDbGllbnRRdDo6dXNlckFnZW50KGNvbnN0IEtVUkwmIHVybCkK IHsKICAgICBpZiAobV93ZWJGcmFtZSkgewotICAgICAgICByZXR1cm4gbV93ZWJGcmFtZS0+cGFn ZSgpLT51c2VyQWdlbnRGb3JVcmwodXJsKTsKKyAgICAgICAgcmV0dXJuIG1fd2ViRnJhbWUtPnBh Z2UoKS0+dXNlckFnZW50Rm9yVXJsKHVybCkucmVwbGFjZShRTGF0aW4xU3RyaW5nKCJcbiIpLCBR U3RyaW5nKCkpLnJlcGxhY2UoUUxhdGluMVN0cmluZygiXHIiKSwgUVN0cmluZygpKTsKICAgICB9 CiAgICAgcmV0dXJuIFN0cmluZygpOwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9xdC90 ZXN0cy9xd2VicGFnZS90c3RfcXdlYnBhZ2UuY3BwIGIvU291cmNlL1dlYktpdC9xdC90ZXN0cy9x d2VicGFnZS90c3RfcXdlYnBhZ2UuY3BwCmluZGV4IDJiOWNjOWYyOWEwZDZlMDA1ODdlZDljODY3 ZmZmYjcwNTFmZmQwM2IuLmIzZmYzYjljMTk3ODc1M2JlNzA1NWQ2YjI2MTBhNzQ2OWMzYzhlOGYg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvcXQvdGVzdHMvcXdlYnBhZ2UvdHN0X3F3ZWJwYWdl LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L3F0L3Rlc3RzL3F3ZWJwYWdlL3RzdF9xd2VicGFnZS5j cHAKQEAgLTE0MCw2ICsxNDAsNyBAQCBwcml2YXRlIHNsb3RzOgogICAgIHZvaWQgZXJyb3JQYWdl RXh0ZW5zaW9uSW5GcmFtZXNldCgpOwogICAgIHZvaWQgZXJyb3JQYWdlRXh0ZW5zaW9uTG9hZEZp bmlzaGVkKCk7CiAgICAgdm9pZCB1c2VyQWdlbnRBcHBsaWNhdGlvbk5hbWUoKTsKKyAgICB2b2lk IHVzZXJBZ2VudE5ld2xpbmVTdHJpcHBpbmcoKTsKIAogICAgIHZvaWQgdmlld01vZGVzKCk7CiAK QEAgLTI2NzIsNiArMjY3MywyNiBAQCB2b2lkIHRzdF9RV2ViUGFnZTo6dXNlckFnZW50QXBwbGlj YXRpb25OYW1lKCkKICAgICBRQ29yZUFwcGxpY2F0aW9uOjpzZXRBcHBsaWNhdGlvbk5hbWUob2xk QXBwbGljYXRpb25OYW1lKTsKIH0KIAorY2xhc3MgQ3VzdG9tVXNlckFnZW50V2ViUGFnZSA6IHB1 YmxpYyBRV2ViUGFnZQoreworcHVibGljOgorICAgIHN0YXRpYyBjb25zdCBRTGF0aW4xU3RyaW5n IGZpbHRlcmVkVXNlckFnZW50OworcHJvdGVjdGVkOgorICAgIHZpcnR1YWwgUVN0cmluZyB1c2Vy QWdlbnRGb3JVcmwoY29uc3QgUVVybCYgdXJsKSBjb25zdAorICAgIHsKKyAgICAgICAgcmV0dXJu IFFTdHJpbmcoIk15IFVzZXIgQWdlbnRcblgtTmV3LUh0dHAtSGVhZGVyOiBPaCBOb2VzISIpOwor ICAgIH0KK307Citjb25zdCBRTGF0aW4xU3RyaW5nIEN1c3RvbVVzZXJBZ2VudFdlYlBhZ2U6OmZp bHRlcmVkVXNlckFnZW50KCJNeSBVc2VyIEFnZW50WC1OZXctSHR0cC1IZWFkZXI6IE9oIE5vZXMh Iik7CisKK3ZvaWQgdHN0X1FXZWJQYWdlOjp1c2VyQWdlbnROZXdsaW5lU3RyaXBwaW5nKCkKK3sK KyAgICBDdXN0b21Vc2VyQWdlbnRXZWJQYWdlIHBhZ2U7CisgICAgUVdlYkZyYW1lKiBtYWluRnJh bWUgPSBwYWdlLm1haW5GcmFtZSgpOworICAgIG1haW5GcmFtZS0+c2V0SHRtbCgiPGh0bWw+PGJv ZHk+PC9ib2R5PjwvaHRtbD4iKTsKKyAgICBRQ09NUEFSRShtYWluRnJhbWUtPmV2YWx1YXRlSmF2 YVNjcmlwdCgibmF2aWdhdG9yLnVzZXJBZ2VudCIpLnRvU3RyaW5nKCksIEN1c3RvbVVzZXJBZ2Vu dFdlYlBhZ2U6OmZpbHRlcmVkVXNlckFnZW50KTsKK30KKwogdm9pZCB0c3RfUVdlYlBhZ2U6OmNy YXNoVGVzdHNfTGF6eUluaXRpYWxpemF0aW9uT2ZNYWluRnJhbWUoKQogewogICAgIHsK 120003 2011-12-20 03:29:53 -0800 2011-12-20 04:56:24 -0800 Patch bug-68560-20111220062951.patch text/plain 3288 jarred U3VidmVyc2lvbiBSZXZpc2lvbjogMTAzMzAzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L3F0 L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvcXQvQ2hhbmdlTG9nCmluZGV4IDZkNmE2ZTMwODQ4 YWNhZThkYTE2MzA5YTY0Y2RiYmMzZDAzNjBjMzEuLjBkMTM5Nzk0MzFhZjhiZGYzMzFmOGRlNzdj MjQwOTI2NTdmN2I0NDUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvcXQvQ2hhbmdlTG9nCisr KyBiL1NvdXJjZS9XZWJLaXQvcXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIgQEAKKzIwMTEtMTIt MTkgIEphcnJlZCBOaWNob2xscyAgPGphcnJlZEBzZW5jaGEuY29tPgorCisgICAgICAgIFtRdF0g SFRUUCBoZWFkZXIgaW5qZWN0aW9uIHZpYSBRV2ViUGFnZTo6dXNlckFnZW50Rm9yVXJsKCkKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTY4NTYwCisKKyAg ICAgICAgU3RyaXAgb3V0IG5ld2xpbmUgY2hhcmFjdGVycyBmcm9tIHRoZSByZXN1bHQgb2YgdXNl ckFnZW50Rm9yVXJsKCkgdG8gcHJldmVudCBhZGRpdGlvbmFsCisgICAgICAgIEhUVFAgaGVhZGVy cyBpbiBIVFRQIHJlcXVlc3RzLgorCisgICAgICAgIE5ldyBRdFRlc3QgY2FzZSB0aGF0IHZhbGlk YXRlcyB0aGUgdXNlciBhZ2VudCwgYXMgcmV0dXJuZWQgYnkgbmF2aWdhdG9yLnVzZXJBZ2VudCwg ZG9lcyBub3QKKyAgICAgICAgY29udGFpbiBhbnkgbmV3bGluZSBjaGFyYWN0ZXJzLgorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogV2ViQ29yZVN1cHBv cnQvRnJhbWVMb2FkZXJDbGllbnRRdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZUxvYWRl ckNsaWVudFF0Ojp1c2VyQWdlbnQpOgorICAgICAgICAqIHRlc3RzL3F3ZWJwYWdlL3RzdF9xd2Vi cGFnZS5jcHA6CisgICAgICAgIChDdXN0b21Vc2VyQWdlbnRXZWJQYWdlOjp1c2VyQWdlbnRGb3JV cmwpOgorICAgICAgICAodHN0X1FXZWJQYWdlOjp1c2VyQWdlbnROZXdsaW5lU3RyaXBwaW5nKToK KwogMjAxMS0xMi0xOSAgU2FtIFdlaW5pZyAgPHNhbUB3ZWJraXQub3JnPgogCiAgICAgICAgIE1v cmUgUGxhdGZvcm1FdmVudCBjbGVhbnVwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L3F0L1dl YkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50UXQuY3BwIGIvU291cmNlL1dlYktpdC9xdC9X ZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRlckNsaWVudFF0LmNwcAppbmRleCBlN2NjMTYxM2RlZjYx M2RiNWRjOGU4ZjQyMzc5NTFlMWQ3YjQ0N2EwLi5iMzU4ODM2MWVkNmVjYmRlNGYxNWQyMzk0NWY4 NWRjMmI2MzNkYjkyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0 L0ZyYW1lTG9hZGVyQ2xpZW50UXQuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvcXQvV2ViQ29yZVN1 cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRRdC5jcHAKQEAgLTczNiw3ICs3MzYsNyBAQCB2b2lkIEZy YW1lTG9hZGVyQ2xpZW50UXQ6OnNldFRpdGxlKGNvbnN0IFN0cmluZ1dpdGhEaXJlY3Rpb24mIHRp dGxlLCBjb25zdCBLVVJMJgogU3RyaW5nIEZyYW1lTG9hZGVyQ2xpZW50UXQ6OnVzZXJBZ2VudChj b25zdCBLVVJMJiB1cmwpCiB7CiAgICAgaWYgKG1fd2ViRnJhbWUpIHsKLSAgICAgICAgcmV0dXJu IG1fd2ViRnJhbWUtPnBhZ2UoKS0+dXNlckFnZW50Rm9yVXJsKHVybCk7CisgICAgICAgIHJldHVy biBtX3dlYkZyYW1lLT5wYWdlKCktPnVzZXJBZ2VudEZvclVybCh1cmwpLnJlbW92ZShRTGF0aW4x Q2hhcignXG4nKSkucmVtb3ZlKFFMYXRpbjFDaGFyKCdccicpKTsKICAgICB9CiAgICAgcmV0dXJu IFN0cmluZygpOwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9xdC90ZXN0cy9xd2VicGFn ZS90c3RfcXdlYnBhZ2UuY3BwIGIvU291cmNlL1dlYktpdC9xdC90ZXN0cy9xd2VicGFnZS90c3Rf cXdlYnBhZ2UuY3BwCmluZGV4IDJiOWNjOWYyOWEwZDZlMDA1ODdlZDljODY3ZmZmYjcwNTFmZmQw M2IuLmIzZmYzYjljMTk3ODc1M2JlNzA1NWQ2YjI2MTBhNzQ2OWMzYzhlOGYgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQvcXQvdGVzdHMvcXdlYnBhZ2UvdHN0X3F3ZWJwYWdlLmNwcAorKysgYi9T b3VyY2UvV2ViS2l0L3F0L3Rlc3RzL3F3ZWJwYWdlL3RzdF9xd2VicGFnZS5jcHAKQEAgLTE0MCw2 ICsxNDAsNyBAQCBwcml2YXRlIHNsb3RzOgogICAgIHZvaWQgZXJyb3JQYWdlRXh0ZW5zaW9uSW5G cmFtZXNldCgpOwogICAgIHZvaWQgZXJyb3JQYWdlRXh0ZW5zaW9uTG9hZEZpbmlzaGVkKCk7CiAg ICAgdm9pZCB1c2VyQWdlbnRBcHBsaWNhdGlvbk5hbWUoKTsKKyAgICB2b2lkIHVzZXJBZ2VudE5l d2xpbmVTdHJpcHBpbmcoKTsKIAogICAgIHZvaWQgdmlld01vZGVzKCk7CiAKQEAgLTI2NzIsNiAr MjY3MywyNiBAQCB2b2lkIHRzdF9RV2ViUGFnZTo6dXNlckFnZW50QXBwbGljYXRpb25OYW1lKCkK ICAgICBRQ29yZUFwcGxpY2F0aW9uOjpzZXRBcHBsaWNhdGlvbk5hbWUob2xkQXBwbGljYXRpb25O YW1lKTsKIH0KIAorY2xhc3MgQ3VzdG9tVXNlckFnZW50V2ViUGFnZSA6IHB1YmxpYyBRV2ViUGFn ZQoreworcHVibGljOgorICAgIHN0YXRpYyBjb25zdCBRTGF0aW4xU3RyaW5nIGZpbHRlcmVkVXNl ckFnZW50OworcHJvdGVjdGVkOgorICAgIHZpcnR1YWwgUVN0cmluZyB1c2VyQWdlbnRGb3JVcmwo Y29uc3QgUVVybCYgdXJsKSBjb25zdAorICAgIHsKKyAgICAgICAgcmV0dXJuIFFTdHJpbmcoIk15 IFVzZXIgQWdlbnRcblgtTmV3LUh0dHAtSGVhZGVyOiBPaCBOb2VzISIpOworICAgIH0KK307Citj b25zdCBRTGF0aW4xU3RyaW5nIEN1c3RvbVVzZXJBZ2VudFdlYlBhZ2U6OmZpbHRlcmVkVXNlckFn ZW50KCJNeSBVc2VyIEFnZW50WC1OZXctSHR0cC1IZWFkZXI6IE9oIE5vZXMhIik7CisKK3ZvaWQg dHN0X1FXZWJQYWdlOjp1c2VyQWdlbnROZXdsaW5lU3RyaXBwaW5nKCkKK3sKKyAgICBDdXN0b21V c2VyQWdlbnRXZWJQYWdlIHBhZ2U7CisgICAgUVdlYkZyYW1lKiBtYWluRnJhbWUgPSBwYWdlLm1h aW5GcmFtZSgpOworICAgIG1haW5GcmFtZS0+c2V0SHRtbCgiPGh0bWw+PGJvZHk+PC9ib2R5Pjwv aHRtbD4iKTsKKyAgICBRQ09NUEFSRShtYWluRnJhbWUtPmV2YWx1YXRlSmF2YVNjcmlwdCgibmF2 aWdhdG9yLnVzZXJBZ2VudCIpLnRvU3RyaW5nKCksIEN1c3RvbVVzZXJBZ2VudFdlYlBhZ2U6OmZp bHRlcmVkVXNlckFnZW50KTsKK30KKwogdm9pZCB0c3RfUVdlYlBhZ2U6OmNyYXNoVGVzdHNfTGF6 eUluaXRpYWxpemF0aW9uT2ZNYWluRnJhbWUoKQogewogICAgIHsK