41155 2010-06-24 07:06:51 -0700 In FrameLoader, m_URL is not set before calling client dispatchDidCommitLoad for cached pages 2010-09-20 13:51:16 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) All All RESOLVED FIXED Qt P3 Normal --- 1 nokiabugz dinu.jacob abarth ademar commit-queue cshu laszlo.gombos suresh.voruganti oldest_to_newest 242493 0 nokiabugz 2010-06-24 07:06:51 -0700 STEPS TO REPRODUCE: 1. Load any non-secure page (e.g. www.yahoo.com) 2. Load any secure page (e.g. www.gmail.com) 3. Select Back button. 4. Yahoo page will be loaded, observe the title bar. ACTUAL RESULTS: Secure icon is seen. EXPECTED RESULTS: Secure icon should not be seen. 242506 1 nokiabugz 2010-06-24 07:30:47 -0700 Additional information from Dinu Jacob: The issue happens when we attempt to go back when caching is enabled. When we go back in history with the page cached, in WebCore::FrameLoader::transitionToCommitted, as 'cachePage' is a valid pointer, disptachDidCommitLoad is called (FrameLoader.cpp: 2546 ). At this point , m_URL of FrameLoader has not been updated yet. disptachDidCommitLoad calls client disptachDidCommitLoad which is FrameLoaderClientQt::dispatchDidCommitLoad(). This emits m_webFrame->urlChanged with the url of m_webFrame which is m_URL of FrameLoader ( d->frame->loader()->url() ). As m_URL of FrameLoader has not been updated with the new url, the signal is emitted with the old url. Secureuicontroller is using this url to determine whether to show/hide the secure icon. FrameLoader sets m_URL to the new value immediately after that in WebCore::FrameLoader::open (to cahcedFrame.url() ): #0 WebCore::FrameLoader::open (this=0xb25956a8, cachedFrame=@0xb22be244) at /nokia/bs_nmp/groups/s40_builds/viatches/qt-everywhere-opensource-src-4.6.2/src/3rdparty/webkit/WebCore/loader/FrameLoader.cpp:2638 #1 0xb724ed7f in WebCore::CachedFrame::open (this=0xb22be240) at /nokia/bs_nmp/groups/s40_builds/viatches/qt-everywhere-opensource-src-4.6.2/src/3rdparty/webkit/WebCore/history/CachedFrame.cpp:150 #2 0xb724f8ba in WebCore::CachedPage::restore (this=0xb1fc8d40, page=0xb43c16e0) at /nokia/bs_nmp/groups/s40_builds/viatches/qt-everywhere-opensource-src-4.6.2/src/3rdparty/webkit/WebCore/history/CachedPage.cpp:73 #3 0xb732ae28 in WebCore::FrameLoader::open (this=0xb25956a8, cachedPage=@0xb1fc8d40) at /nokia/bs_nmp/groups/s40_builds/viatches/qt-everywhere-opensource-src-4.6.2/src/3rdparty/webkit/WebCore/loader/FrameLoader.cpp:2631 #4 0xb732fff0 in WebCore::FrameLoader::commitProvisionalLoad (this=0xb25956a8, prpCachedPage=@0xbfffbb44) at /nokia/bs_nmp/groups/s40_builds/viatches/qt-everywhere-opensource-src-4.6.2/src/3rdparty/webkit/WebCore/loader/FrameLoader.cpp:2401 m_URL should be set to the new url before the call to disptachDidCommitLoad. In a normal load, m_URL is initially set to the new value in FrameLoader::didOpenURL called from FrameLoader::commitProvisionalLoad to the url value in m_provisionalDocumentLoader. It is set again after getting data in FrameLoader::begin (called from FrameLoader::receivedFirstData() and m_workingURL is passed into begin - this is also set in didOpenURL ). Even though transitionToCommitted is called in the normal case also, dispatchDidCommitLoad() is not called as cachedPage is not valid. Issue is in Webkit. Fix is: Before calling dispatchDidCommitLoad in the function FrameLoader::transitionToCommitted(PassRefPtr<CachedPage> cachedPage), need to set m_URL. m_URL = dl->url(); 262292 2 63924 dinu.jacob 2010-08-09 13:25:21 -0700 Created attachment 63924 Proposed patch with test case 262294 3 dinu.jacob 2010-08-09 13:30:46 -0700 reopening as it was closed by mistake.. 264803 4 63924 abarth 2010-08-14 23:32:27 -0700 Comment on attachment 63924 Proposed patch with test case We should remove FrameLoader::m_URL instead. It's redundant with Document::url and can only lead to bugs. 271544 5 abarth 2010-08-30 12:02:37 -0700 I think removing FrameLoader::m_URL either recently landed or is about to land. 275009 6 suresh.voruganti 2010-09-07 06:52:45 -0700 Any update on the issue? This is one of the issue that blocks Webkit 2.1 release 275138 7 66737 dinu.jacob 2010-09-07 10:35:41 -0700 Created attachment 66737 Patch file with changes 275140 8 66737 commit-queue 2010-09-07 10:37:13 -0700 Comment on attachment 66737 Patch file with changes Rejecting patch 66737 from review queue. dinu.jacob@Nokia.com does not have reviewer permissions according to http://trac.webkit.org/browser/trunk/WebKitTools/Scripts/webkitpy/common/config/committers.py. - If you do not have reviewer rights please read http://webkit.org/coding/contributing.html for instructions on how to use bugzilla flags. - If you have reviewer rights please correct the error in WebKitTools/Scripts/webkitpy/common/config/committers.py by adding yourself to the file (no review needed). The commit-queue restarts itself every 2 hours. After restart the commit-queue will correctly respect your reviewer rights. 275142 9 66737 commit-queue 2010-09-07 10:39:21 -0700 Comment on attachment 66737 Patch file with changes Rejecting patch 66737 from commit-queue. dinu.jacob@Nokia.com does not have committer permissions according to http://trac.webkit.org/browser/trunk/WebKitTools/Scripts/webkitpy/common/config/committers.py. - If you do not have committer rights please read http://webkit.org/coding/contributing.html for instructions on how to use bugzilla flags. - If you have committer rights please correct the error in WebKitTools/Scripts/webkitpy/common/config/committers.py by adding yourself to the file (no review needed). The commit-queue restarts itself every 2 hours. After restart the commit-queue will correctly respect your committer rights. 275147 10 dinu.jacob 2010-09-07 10:42:42 -0700 (In reply to comment #7) > Created an attachment (id=66737) [details] > Patch file with changes Hi Adam, I haven't seen the patch to remove m_URL yet. While waiting for that, when I analyzed the bug with rest to that change, I found that since the frame document is set to the cached frame document only in FrameLoader::open(CachedFrameBase& cachedFrame), additional changes are required to avoid client from getting the incorrect url still. dispatchDidCommitLoad should be called only after FrameLoader::open is called (where all the initializations including setting the document and url is done). Can you please review the new changes? Dinu 275163 11 66737 darin 2010-09-07 11:08:18 -0700 Comment on attachment 66737 Patch file with changes > + String ptitle = m_documentLoader->title(); > + if (!ptitle.isNull()) > + m_client->dispatchDidReceiveTitle(ptitle); What does "ptitle" mean? Can this local variable just be named "title"? 275209 12 66749 dinu.jacob 2010-09-07 12:28:12 -0700 Created attachment 66749 Patch with change in local variable name Changed local variable ptitle to title as requested. 275268 13 66749 abarth 2010-09-07 13:52:46 -0700 Comment on attachment 66749 Patch with change in local variable name View in context: https://bugs.webkit.org/attachment.cgi?id=66749&action=prettypatch > WebCore/ChangeLog:5 > + When loading a cached page,dispatchDidCommitLoad is called after FrameLoader::open so bad spacing > WebKit/qt/tests/qwebpage/tst_qwebpage.cpp:1292 > +void tst_QWebPage::loadCachedPage() Is there a reason this can't be a LayoutTest? 275799 14 66749 dinu.jacob 2010-09-08 06:29:03 -0700 Comment on attachment 66749 Patch with change in local variable name View in context: https://bugs.webkit.org/attachment.cgi?id=66749&action=prettypatch > WebCore/ChangeLog:5 > + When loading a cached page,dispatchDidCommitLoad is called after FrameLoader::open so Will fix and add another patch > WebKit/qt/tests/qwebpage/tst_qwebpage.cpp:1292 > +void tst_QWebPage::loadCachedPage() The frameloader values (like url etc) that client gets when dispatchDidCommitLoad is called are incorrect. It was best indicated by this test where the client is accessing it while in client's dispatchDidCommitLoad code. 275800 15 66890 dinu.jacob 2010-09-08 06:38:10 -0700 Created attachment 66890 Patch with spacing in comments fixed 276353 16 66890 cfleizach 2010-09-09 00:56:00 -0700 Comment on attachment 66890 Patch with spacing in comments fixed > Index: WebCore/ChangeLog > =================================================================== > --- WebCore/ChangeLog (revision 66977) > +++ WebCore/ChangeLog (working copy) > @@ -1,3 +1,18 @@ > +2010-09-08 Jacob Dinu <dinu.jacob@nokia.com> > + > + Reviewed by NOBODY (OOPS!). > + > + When loading a cached page, dispatchDidCommitLoad is called after FrameLoader::open so > + that all initialzations are done before calling client dispatchDidCommitLoad to avoid spelling (initialzations) > + client from accessing incorrect data. grammar to avoid (the) client > + 276425 17 67026 dinu.jacob 2010-09-09 06:13:08 -0700 Created attachment 67026 Patch with spelling and grammar corrections 276430 18 67026 abarth 2010-09-09 06:28:14 -0700 Comment on attachment 67026 Patch with spelling and grammar corrections You need to click the patch checkbox for the tools to work properly. 276431 19 67026 abarth 2010-09-09 06:29:14 -0700 Comment on attachment 67026 Patch with spelling and grammar corrections This member is being removed in https://bugs.webkit.org/show_bug.cgi?id=41165. Let's wait and see if the problem still exists once that lands. 279675 20 dinu.jacob 2010-09-15 13:37:21 -0700 (In reply to comment #19) > (From update of attachment 67026 [details]) > This member is being removed in https://bugs.webkit.org/show_bug.cgi?id=41165. Let's wait and see if the problem still exists once that lands. Hi Adam, When I asked Nate on when his patch might be landed, he indicated that it was unlikely to happen in the next two weeks ( https://bugs.webkit.org/show_bug.cgi?id=41165#c12). As this bug is a blocker for our release, can you review my patch ? 279707 21 abarth 2010-09-15 14:14:47 -0700 Thanks for coordinating with Nate. Looking now. 279713 22 67026 abarth 2010-09-15 14:20:28 -0700 Comment on attachment 67026 Patch with spelling and grammar corrections I think this is ok. This code is complicated, especially the page cache part. 280053 23 dinu.jacob 2010-09-16 06:38:35 -0700 (In reply to comment #22) > (From update of attachment 67026 [details]) > I think this is ok. This code is complicated, especially the page cache part. Thanks Adam. Should I submit another patch based on the latest and request it to be committed? 280125 24 abarth 2010-09-16 09:03:22 -0700 Sure 280301 25 67832 dinu.jacob 2010-09-16 13:23:27 -0700 Created attachment 67832 Final patch to be committed Patch based on latest revision to be committed after review. 280303 26 dinu.jacob 2010-09-16 13:24:59 -0700 (In reply to comment #24) > Sure Adam, I have a attached a new patch based on the latest revision. Can you please approve and commit this one? Thanks, Dinu 280305 27 67832 darin 2010-09-16 13:30:02 -0700 Comment on attachment 67832 Final patch to be committed View in context: https://bugs.webkit.org/attachment.cgi?id=67832&action=prettypatch > WebCore/ChangeLog:11 > + Only qt What does this cryptic change log line mean? The patch is a change to code that is shared by all platforms. Do you mean to say something like: “This change is harmless for all other platforms and helpful for Qt.”? > WebCore/loader/FrameLoader.cpp:1852 > + // For non-cached HTML pages, these methods are called in receivedFirstData(). This comment, which you moved here with the code, is now confusing. In the old code, it was referring to a line of code just two lines up where receivedFirstData is called. In this new code, it’s hard to understand what that means exactly. 280310 28 dinu.jacob 2010-09-16 13:33:50 -0700 (In reply to comment #27) > (From update of attachment 67832 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=67832&action=prettypatch > > > WebCore/ChangeLog:11 > > + Only qt > > What does this cryptic change log line mean? The patch is a change to code that is shared by all platforms. Do you mean to say something like: “This change is harmless for all other platforms and helpful for Qt.”? > I replaced the line that asked for tests to indicate that tests were written specifically for Qt. Should I just remove this line? > > WebCore/loader/FrameLoader.cpp:1852 > > + // For non-cached HTML pages, these methods are called in receivedFirstData(). > > This comment, which you moved here with the code, is now confusing. In the old code, it was referring to a line of code just two lines up where receivedFirstData is called. In this new code, it’s hard to understand what that means exactly. I will remove this comment 280315 29 67832 abarth 2010-09-16 13:36:25 -0700 Comment on attachment 67832 Final patch to be committed View in context: https://bugs.webkit.org/attachment.cgi?id=67832&action=prettypatch >>> WebCore/ChangeLog:11 >>> + Only qt >> >> What does this cryptic change log line mean? The patch is a change to code that is shared by all platforms. Do you mean to say something like: “This change is harmless for all other platforms and helpful for Qt.”? > > I replaced the line that asked for tests to indicate that tests were written specifically for Qt. Should I just remove this line? Yes. >>> WebCore/loader/FrameLoader.cpp:1852 >>> + // For non-cached HTML pages, these methods are called in receivedFirstData(). >> >> This comment, which you moved here with the code, is now confusing. In the old code, it was referring to a line of code just two lines up where receivedFirstData is called. In this new code, it’s hard to understand what that means exactly. > > I will remove this comment Thanks. 280318 30 dinu.jacob 2010-09-16 13:38:34 -0700 (In reply to comment #29) > (From update of attachment 67832 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=67832&action=prettypatch > > >>> WebCore/ChangeLog:11 > >>> + Only qt > >> > >> What does this cryptic change log line mean? The patch is a change to code that is shared by all platforms. Do you mean to say something like: “This change is harmless for all other platforms and helpful for Qt.”? > > > > I replaced the line that asked for tests to indicate that tests were written specifically for Qt. Should I just remove this line? > > Yes. > > >>> WebCore/loader/FrameLoader.cpp:1852 > >>> + // For non-cached HTML pages, these methods are called in receivedFirstData(). > >> > >> This comment, which you moved here with the code, is now confusing. In the old code, it was referring to a line of code just two lines up where receivedFirstData is called. In this new code, it’s hard to understand what that means exactly. > > > > I will remove this comment > > Thanks. (In reply to comment #29) > (From update of attachment 67832 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=67832&action=prettypatch > > >>> WebCore/ChangeLog:11 > >>> + Only qt > >> > >> What does this cryptic change log line mean? The patch is a change to code that is shared by all platforms. Do you mean to say something like: “This change is harmless for all other platforms and helpful for Qt.”? > > > > I replaced the line that asked for tests to indicate that tests were written specifically for Qt. Should I just remove this line? > > Yes. > > >>> WebCore/loader/FrameLoader.cpp:1852 > >>> + // For non-cached HTML pages, these methods are called in receivedFirstData(). > >> > >> This comment, which you moved here with the code, is now confusing. In the old code, it was referring to a line of code just two lines up where receivedFirstData is called. In this new code, it’s hard to understand what that means exactly. > > > > I will remove this comment > > Thanks. Adam, For the next patch I upload, do I need to set both flags (review and commit ) to ? Thank you for all your help. Dinu 280334 31 67838 dinu.jacob 2010-09-16 13:49:19 -0700 Created attachment 67838 Patch with unwanted comments removed 280339 32 67839 dinu.jacob 2010-09-16 13:51:50 -0700 Created attachment 67839 Patch with unwanted comments removed 280411 33 67839 abarth 2010-09-16 15:42:24 -0700 Comment on attachment 67839 Patch with unwanted comments removed View in context: https://bugs.webkit.org/attachment.cgi?id=67839&action=prettypatch > WebCore/ChangeLog:9 > + When loading a cached page, dispatchDidCommitLoad is called after FrameLoader::open so > + that all initialzations are done before calling client dispatchDidCommitLoad to avoid > + client from accessing incorrect data. > + https://bugs.webkit.org/show_bug.cgi?id=41155 > + Ideally we'd mention the test here, but I don't think its worth re-spinning the patch. > WebCore/loader/FrameLoader.cpp:1857 > + // If we have a title let the WebView know about it. > + String title = m_documentLoader->title(); > + if (!title.isNull()) > + m_client->dispatchDidReceiveTitle(title); On the subject of useless comments. :) 280451 34 dinu.jacob 2010-09-16 16:50:25 -0700 (In reply to comment #33) > (From update of attachment 67839 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=67839&action=prettypatch > > > WebCore/ChangeLog:9 > > + When loading a cached page, dispatchDidCommitLoad is called after FrameLoader::open so > > + that all initialzations are done before calling client dispatchDidCommitLoad to avoid > > + client from accessing incorrect data. > > + https://bugs.webkit.org/show_bug.cgi?id=41155 > > + > > Ideally we'd mention the test here, but I don't think its worth re-spinning the patch. I will remember this next time. > > > WebCore/loader/FrameLoader.cpp:1857 > > + // If we have a title let the WebView know about it. > > + String title = m_documentLoader->title(); > > + if (!title.isNull()) > > + m_client->dispatchDidReceiveTitle(title); > > On the subject of useless comments. :) Had same thoughts but left it alone as you hadn't mentioned it :) 280809 35 67839 eric 2010-09-17 12:44:21 -0700 Comment on attachment 67839 Patch with unwanted comments removed This causes a build failure on mac. Sadly teh commit-queue hung before it could report it. 281110 36 67026 eric 2010-09-18 03:21:11 -0700 Comment on attachment 67026 Patch with spelling and grammar corrections Cleared Adam Barth's review+ from obsolete attachment 67026 so that this bug does not appear in http://webkit.org/pending-commit. 281111 37 67832 eric 2010-09-18 03:21:16 -0700 Comment on attachment 67832 Final patch to be committed Cleared Adam Barth's review+ from obsolete attachment 67832 so that this bug does not appear in http://webkit.org/pending-commit. 281639 38 dinu.jacob 2010-09-20 10:23:41 -0700 (In reply to comment #35) > (From update of attachment 67839 [details]) > This causes a build failure on mac. Sadly teh commit-queue hung before it could report it. I was able to build successfully on mac and found no new test failures either (my build was based on r64875). How can I now address this? Please advice. 281642 39 dinu.jacob 2010-09-20 10:29:02 -0700 (In reply to comment #38) > (In reply to comment #35) > > (From update of attachment 67839 [details] [details]) > > This causes a build failure on mac. Sadly teh commit-queue hung before it could report it. > > I was able to build successfully on mac and found no new test failures either (my build was based on r64875). How can I now address this? Please advice. Typo - based on r67845. 281767 40 67839 eric 2010-09-20 13:03:09 -0700 Comment on attachment 67839 Patch with unwanted comments removed Let's just cq+ it again. It's my fault if the cq hangs. :) 281778 41 67839 commit-queue 2010-09-20 13:20:39 -0700 Comment on attachment 67839 Patch with unwanted comments removed Clearing flags on attachment: 67839 Committed r67878: <http://trac.webkit.org/changeset/67878> 281779 42 commit-queue 2010-09-20 13:20:48 -0700 All reviewed patches have been landed. Closing bug. 281781 43 67839 commit-queue 2010-09-20 13:23:28 -0700 Comment on attachment 67839 Patch with unwanted comments removed Rejecting patch 67839 from commit-queue. Failed to run "[u'/Projects/CommitQueue/WebKitTools/Scripts/svn-apply', u'--force']" exit_code: 1 Last 500 characters of output: 1 succeeded at 1 with fuzz 3. patching file WebCore/loader/FrameLoader.cpp Hunk #1 FAILED at 1848. Hunk #2 FAILED at 1936. Hunk #3 FAILED at 2012. 3 out of 3 hunks FAILED -- saving rejects to file WebCore/loader/FrameLoader.cpp.rej patching file WebKit/qt/ChangeLog Hunk #1 succeeded at 1 with fuzz 3. patching file WebKit/qt/tests/qwebpage/tst_qwebpage.cpp Hunk #1 FAILED at 97. Hunk #2 FAILED at 1289. 2 out of 2 hunks FAILED -- saving rejects to file WebKit/qt/tests/qwebpage/tst_qwebpage.cpp.rej Full output: http://queues.webkit.org/results/4092014 281789 44 ademar 2010-09-20 13:51:04 -0700 Revision r67878 cherry-picked into qtwebkit-2.1 with commit ab9219b <http://gitorious.org/webkit/qtwebkit/commit/ab9219b> 63924 2010-08-09 13:25:21 -0700 2010-09-07 12:28:12 -0700 Proposed patch with test case 41155.patch text/plain 3755 dinu.jacob SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA2NDk5NikKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTkgQEAKKzIwMTAtMDgtMDkgIEphY29iIERpbnUgIDxkaW51LmphY29iQG5va2lh LmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBG cmFtZUxvYWRlcjo6bV9VUkwgaXMgc2V0IHRvIG5ldyB1cmwgYmVmb3JlIGNhbGxpbmcgY2xpZW50 IGRpc3BhdGNoRGlkQ29tbWl0TG9hZAorICAgICAgICB3aGVuIGxvYWRpbmcgYSBjYWNoZWQgcGFn ZShjdXJlbnRseSBzZXQgb25seSBhZnRlciB0aGF0IAorICAgICAgICBpbiBGcmFtZUxvYWRlcjo6 b3BlbihDYWNoZWRGcmFtZUJhc2UmIGNhY2hlZEZyYW1lKS4gQ2xpZW50IGRpc3BhdGNoRGlkQ29t bWl0TG9hZCAKKyAgICAgICAgaXMgY2FsbGVkIGluIEZyYW1lTG9hZGVyOjpkaXNwYXRjaERpZENv bW1pdExvYWQgYW5kIGNsaWVudCBnZXRzIGluY29ycmVjdCB1cmwgdGhyb3VnaCAKKyAgICAgICAg RnJhbWVMb2FkZXI6OnVybCgpIGF0IHRoaXMgcG9pbnQgaWYgbm90IHNldCBiZWZvcmUgY2FsbGlu ZyBkaXNwYXRjaERpZENvbW1pdExvYWQuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD00MTE1NQorCisgICAgICAgIE9ubHkgcXQgCisKKyAgICAgICAgKiBs b2FkZXIvRnJhbWVMb2FkZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVMb2FkZXI6OnRy YW5zaXRpb25Ub0NvbW1pdHRlZCk6CisKIDIwMTAtMDgtMDkgIE1hcmN1cyBCdWxhY2ggIDxidWxh Y2hAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEplcmVteSBPcmxvdy4KSW5k ZXg6IFdlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3Jl L2xvYWRlci9GcmFtZUxvYWRlci5jcHAJKHJldmlzaW9uIDY0NTcxKQorKysgV2ViQ29yZS9sb2Fk ZXIvRnJhbWVMb2FkZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yMDc0LDYgKzIwNzQsOSBAQCB2 b2lkIEZyYW1lTG9hZGVyOjp0cmFuc2l0aW9uVG9Db21taXR0ZWQoCiAgICAgaWYgKCFtX2NsaWVu dC0+aGFzSFRNTFZpZXcoKSkKICAgICAgICAgcmVjZWl2ZWRGaXJzdERhdGEoKTsKICAgICBlbHNl IGlmIChjYWNoZWRQYWdlKSB7CisgICAgICAgIG1fVVJMID0gZGwtPnVybCgpOworICAgICAgICBt X3dvcmtpbmdVUkwgPSBkbC0+dXJsKCk7CisKICAgICAgICAgLy8gRm9yIG5vbi1jYWNoZWQgSFRN TCBwYWdlcywgdGhlc2UgbWV0aG9kcyBhcmUgY2FsbGVkIGluIHJlY2VpdmVkRmlyc3REYXRhKCku CiAgICAgICAgIGRpc3BhdGNoRGlkQ29tbWl0TG9hZCgpOwogCkluZGV4OiBXZWJLaXQvcXQvQ2hh bmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9xdC9DaGFuZ2VMb2cJKHJldmlzaW9uIDY0OTk2 KQorKysgV2ViS2l0L3F0L0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDEzIEBA CisyMDEwLTA4LTA5ICBKYWNvYiBEaW51ICA8ZGludS5qYWNvYkBub2tpYS5jb20+CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkZWQgYSBuZXcgcXdl YnBhZ2UgdGVzdCBmb3IgbG9hZGluZyBhIGNhY2hlZCBwYWdlCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00MTE1NQorCisgICAgICAgICogdGVzdHMvcXdl YnBhZ2UvdHN0X3F3ZWJwYWdlLmNwcDoKKyAgICAgICAgKHRzdF9RV2ViUGFnZTo6bG9hZENhY2hl ZFBhZ2UpOgorCiAyMDEwLTA4LTA4ICBBcml5YSBIaWRheWF0ICA8YXJpeWFAc2VuY2hhLmNvbT4K IAogICAgICAgICBSZXZpZXdlZCBieSBBbnRvbmlvIEdvbWVzLgpJbmRleDogV2ViS2l0L3F0L3Rl c3RzL3F3ZWJwYWdlL3RzdF9xd2VicGFnZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L3F0L3Rl c3RzL3F3ZWJwYWdlL3RzdF9xd2VicGFnZS5jcHAJKHJldmlzaW9uIDY0NTcxKQorKysgV2ViS2l0 L3F0L3Rlc3RzL3F3ZWJwYWdlL3RzdF9xd2VicGFnZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTk3 LDYgKzk3LDcgQEAgcHJpdmF0ZSBzbG90czoKICAgICB2b2lkIGJhY2tBY3Rpb25VcGRhdGUoKTsK ICAgICB2b2lkIGZyYW1lQXQoKTsKICAgICB2b2lkIHJlcXVlc3RDYWNoZSgpOworICAgIHZvaWQg bG9hZENhY2hlZFBhZ2UoKTsKICAgICB2b2lkIHByb3RlY3RCaW5kaW5nc1J1bnRpbWVPYmplY3Rz RnJvbUNvbGxlY3RvcigpOwogICAgIHZvaWQgbG9jYWxVUkxTY2hlbWVzKCk7CiAgICAgdm9pZCB0 ZXN0T3B0aW9uYWxKU09iamVjdHMoKTsKQEAgLTEyODUsNiArMTI4NiwzNyBAQCB2b2lkIHRzdF9R V2ViUGFnZTo6cmVxdWVzdENhY2hlKCkKICAgICAgICAgICAgICAoaW50KVFOZXR3b3JrUmVxdWVz dDo6UHJlZmVyQ2FjaGUpOwogfQogCit2b2lkIHRzdF9RV2ViUGFnZTo6bG9hZENhY2hlZFBhZ2Uo KQoreworICAgIFRlc3RQYWdlIHBhZ2U7CisgICAgUVNpZ25hbFNweSBsb2FkU3B5KCZwYWdlLCBT SUdOQUwobG9hZEZpbmlzaGVkKGJvb2wpKSk7CisgICAgcGFnZS5zZXR0aW5ncygpLT5zZXRNYXhp bXVtUGFnZXNJbkNhY2hlKDMpOworCisgICAgcGFnZS5tYWluRnJhbWUoKS0+bG9hZChRVXJsKCJk YXRhOnRleHQvaHRtbCxUaGlzIGlzIGZpcnN0IHBhZ2UiKSk7CisKKyAgICBRVXJsIGZpcnN0UGFn ZVVybCA9IHBhZ2UubWFpbkZyYW1lKCktPnVybCgpOworICAgIFFUUllfQ09NUEFSRShsb2FkU3B5 LmNvdW50KCksIDEpOworICAgIFFUUllfQ09NUEFSRShwYWdlLm5hdmlnYXRpb25zLmNvdW50KCks IDEpOworCisgICAgcGFnZS5tYWluRnJhbWUoKS0+bG9hZChRVXJsKCJkYXRhOnRleHQvaHRtbCxU aGlzIGlzIHNlY29uZCBwYWdlIikpOworCisgICAgUVRSWV9DT01QQVJFKGxvYWRTcHkuY291bnQo KSwgMik7CisgICAgUVRSWV9DT01QQVJFKHBhZ2UubmF2aWdhdGlvbnMuY291bnQoKSwgMik7CisK KyAgICBwYWdlLnRyaWdnZXJBY3Rpb24oUVdlYlBhZ2U6OlN0b3ApOworICAgIFFWRVJJRlkocGFn ZS5oaXN0b3J5KCktPmNhbkdvQmFjaygpKTsKKworICAgIFFTaWduYWxTcHkgdXJsU3B5KHBhZ2Uu bWFpbkZyYW1lKCksIFNJR05BTCh1cmxDaGFuZ2VkKFFVcmwpKSk7CisgICAgUVZFUklGWSh1cmxT cHkuaXNWYWxpZCgpKTsKKworICAgIHBhZ2UudHJpZ2dlckFjdGlvbihRV2ViUGFnZTo6QmFjayk7 CisgICAgOjp3YWl0Rm9yU2lnbmFsKHBhZ2UubWFpbkZyYW1lKCksIFNJR05BTCh1cmxDaGFuZ2Vk KFFVcmwpKSk7CisgICAgUUNPTVBBUkUodXJsU3B5LnNpemUoKSwgMSk7CisKKyAgICBRTGlzdDxR VmFyaWFudD4gYXJndW1lbnRzMSA9IHVybFNweS50YWtlRmlyc3QoKTsKKyAgICBRQ09NUEFSRShh cmd1bWVudHMxLmF0KDApLnRvVXJsKCksIGZpcnN0UGFnZVVybCk7CisKK30KIHZvaWQgdHN0X1FX ZWJQYWdlOjpiYWNrQWN0aW9uVXBkYXRlKCkKIHsKICAgICBRV2ViVmlldyB2aWV3Owo= 66737 2010-09-07 10:35:41 -0700 2010-09-07 12:28:12 -0700 Patch file with changes 41155_090710.patch text/plain 4496 dinu.jacob SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA2Njg5MSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTggQEAKKzIwMTAtMDktMDcgIEphY29iIERpbnUgIDxkaW51LmphY29iQG5va2lh LmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBX aGVuIGxvYWRpbmcgYSBjYWNoZWQgcGFnZSxkaXNwYXRjaERpZENvbW1pdExvYWQgIGlzIGNhbGxl ZCBhZnRlciBGcmFtZUxvYWRlcjo6b3BlbiBzbworICAgICAgICB0aGF0IGFsbCBpbml0aWFsemF0 aW9ucyBhcmUgZG9uZSBiZWZvcmUgY2FsbGluZyBjbGllbnQgZGlzcGF0Y2hEaWRDb21taXRMb2Fk IHRvIGF2b2lkCisgICAgICAgIGNsaWVudCBmcm9tIGFjY2Vzc2luZyBpbmNvcnJlY3QgZGF0YS4K KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQxMTU1CisK KyAgICAgICAgT25seSBxdAorCisgICAgICAgICogbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OkZyYW1lTG9hZGVyOjpjb21taXRQcm92aXNpb25hbExvYWQpOgorICAg ICAgICAoV2ViQ29yZTo6RnJhbWVMb2FkZXI6OnRyYW5zaXRpb25Ub0NvbW1pdHRlZCk6CisKIDIw MTAtMDktMDcgIE1hcnRpbiBSb2JpbnNvbiAgPG1yb2JpbnNvbkBpZ2FsaWEuY29tPgogCiAgICAg ICAgIFNtYWxsIGJ1aWxkIGZpeC4gUmVtb3ZlIGxpYldlYkNvcmVKUyBmcm9tIENMRUFOX0ZJTEVT LCBhcyBpdApJbmRleDogV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3BwCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFdlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcAkocmV2aXNpb24gNjY4ODEpCisrKyBX ZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTE4NjAsNiAr MTg2MCwxNSBAQCB2b2lkIEZyYW1lTG9hZGVyOjpjb21taXRQcm92aXNpb25hbExvYWQoCiAgICAg aWYgKGNhY2hlZFBhZ2UgJiYgY2FjaGVkUGFnZS0+ZG9jdW1lbnQoKSkgewogICAgICAgICBwcmVw YXJlRm9yQ2FjaGVkUGFnZVJlc3RvcmUoKTsKICAgICAgICAgY2FjaGVkUGFnZS0+cmVzdG9yZSht X2ZyYW1lLT5wYWdlKCkpOworCisgICAgICAgIC8vIEZvciBub24tY2FjaGVkIEhUTUwgcGFnZXMs IHRoZXNlIG1ldGhvZHMgYXJlIGNhbGxlZCBpbiByZWNlaXZlZEZpcnN0RGF0YSgpLgorICAgICAg ICBkaXNwYXRjaERpZENvbW1pdExvYWQoKTsKKworICAgICAgICAvLyBJZiB3ZSBoYXZlIGEgdGl0 bGUgbGV0IHRoZSBXZWJWaWV3IGtub3cgYWJvdXQgaXQuIAorICAgICAgICBTdHJpbmcgcHRpdGxl ID0gbV9kb2N1bWVudExvYWRlci0+dGl0bGUoKTsKKyAgICAgICAgaWYgKCFwdGl0bGUuaXNOdWxs KCkpIAorICAgICAgICAgICAgbV9jbGllbnQtPmRpc3BhdGNoRGlkUmVjZWl2ZVRpdGxlKHB0aXRs ZSk7ICAgICAgICAgCisKICAgICAgICAgY2hlY2tDb21wbGV0ZWQoKTsKICAgICB9IGVsc2UgeyAg ICAgICAgCiAgICAgICAgIEtVUkwgdXJsID0gcGRsLT5zdWJzdGl0dXRlRGF0YSgpLnJlc3BvbnNl VVJMKCk7CkBAIC0yMDE3LDE0ICsyMDI2LDYgQEAgdm9pZCBGcmFtZUxvYWRlcjo6dHJhbnNpdGlv blRvQ29tbWl0dGVkKAogCiAgICAgaWYgKCFtX2NsaWVudC0+aGFzSFRNTFZpZXcoKSkKICAgICAg ICAgcmVjZWl2ZWRGaXJzdERhdGEoKTsKLSAgICBlbHNlIGlmIChjYWNoZWRQYWdlKSB7Ci0gICAg ICAgIC8vIEZvciBub24tY2FjaGVkIEhUTUwgcGFnZXMsIHRoZXNlIG1ldGhvZHMgYXJlIGNhbGxl ZCBpbiByZWNlaXZlZEZpcnN0RGF0YSgpLgotICAgICAgICBkaXNwYXRjaERpZENvbW1pdExvYWQo KTsKLQotICAgICAgICAvLyBJZiB3ZSBoYXZlIGEgdGl0bGUgbGV0IHRoZSBXZWJWaWV3IGtub3cg YWJvdXQgaXQuIAotICAgICAgICBpZiAoIXB0aXRsZS5pc051bGwoKSkgCi0gICAgICAgICAgICBt X2NsaWVudC0+ZGlzcGF0Y2hEaWRSZWNlaXZlVGl0bGUocHRpdGxlKTsgICAgICAgICAKLSAgICB9 CiB9CiAKIHZvaWQgRnJhbWVMb2FkZXI6OmNsaWVudFJlZGlyZWN0Q2FuY2VsbGVkT3JGaW5pc2hl ZChib29sIGNhbmNlbFdpdGhMb2FkSW5Qcm9ncmVzcykKSW5kZXg6IFdlYktpdC9xdC9DaGFuZ2VM b2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gV2ViS2l0L3F0L0NoYW5nZUxvZwkocmV2aXNpb24gNjY4OTEpCisr KyBXZWJLaXQvcXQvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTMgQEAKKzIw MTAtMDktMDcgIEphY29iIERpbnUgIDxkaW51LmphY29iQG5va2lhLmNvbT4KKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGRlZCBhIG5ldyBxd2VicGFn ZSB0ZXN0IGZvciBsb2FkaW5nIGEgY2FjaGVkIHBhZ2UKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQxMTU1CisKKyAgICAgICAgKiB0ZXN0cy9xd2VicGFn ZS90c3RfcXdlYnBhZ2UuY3BwOgorICAgICAgICAodHN0X1FXZWJQYWdlOjpsb2FkQ2FjaGVkUGFn ZSk6CisKIDIwMTAtMDktMDYgIERpZWdvIEdvbnphbGV6ICA8ZGllZ29oY2dAd2Via2l0Lm9yZz4K IAogICAgICAgICBSZXZpZXdlZCBieSBBbnRvbmlvIEdvbWVzLgpJbmRleDogV2ViS2l0L3F0L3Rl c3RzL3F3ZWJwYWdlL3RzdF9xd2VicGFnZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L3F0L3Rl c3RzL3F3ZWJwYWdlL3RzdF9xd2VicGFnZS5jcHAJKHJldmlzaW9uIDY2ODgxKQorKysgV2ViS2l0 L3F0L3Rlc3RzL3F3ZWJwYWdlL3RzdF9xd2VicGFnZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTk3 LDYgKzk3LDcgQEAgcHJpdmF0ZSBzbG90czoKICAgICB2b2lkIGJhY2tBY3Rpb25VcGRhdGUoKTsK ICAgICB2b2lkIGZyYW1lQXQoKTsKICAgICB2b2lkIHJlcXVlc3RDYWNoZSgpOworICAgIHZvaWQg bG9hZENhY2hlZFBhZ2UoKTsKICAgICB2b2lkIHByb3RlY3RCaW5kaW5nc1J1bnRpbWVPYmplY3Rz RnJvbUNvbGxlY3RvcigpOwogICAgIHZvaWQgbG9jYWxVUkxTY2hlbWVzKCk7CiAgICAgdm9pZCB0 ZXN0T3B0aW9uYWxKU09iamVjdHMoKTsKQEAgLTEyODgsNiArMTI4OSwzNyBAQCB2b2lkIHRzdF9R V2ViUGFnZTo6cmVxdWVzdENhY2hlKCkKICAgICAgICAgICAgICAoaW50KVFOZXR3b3JrUmVxdWVz dDo6UHJlZmVyQ2FjaGUpOwogfQogCit2b2lkIHRzdF9RV2ViUGFnZTo6bG9hZENhY2hlZFBhZ2Uo KQoreworICAgIFRlc3RQYWdlIHBhZ2U7CisgICAgUVNpZ25hbFNweSBsb2FkU3B5KCZwYWdlLCBT SUdOQUwobG9hZEZpbmlzaGVkKGJvb2wpKSk7CisgICAgcGFnZS5zZXR0aW5ncygpLT5zZXRNYXhp bXVtUGFnZXNJbkNhY2hlKDMpOworCisgICAgcGFnZS5tYWluRnJhbWUoKS0+bG9hZChRVXJsKCJk YXRhOnRleHQvaHRtbCxUaGlzIGlzIGZpcnN0IHBhZ2UiKSk7CisKKyAgICBRVFJZX0NPTVBBUkUo bG9hZFNweS5jb3VudCgpLCAxKTsKKyAgICBRVFJZX0NPTVBBUkUocGFnZS5uYXZpZ2F0aW9ucy5j b3VudCgpLCAxKTsKKworICAgIFFVcmwgZmlyc3RQYWdlVXJsID0gcGFnZS5tYWluRnJhbWUoKS0+ dXJsKCk7CisgICAgcGFnZS5tYWluRnJhbWUoKS0+bG9hZChRVXJsKCJkYXRhOnRleHQvaHRtbCxU aGlzIGlzIHNlY29uZCBwYWdlIikpOworCisgICAgUVRSWV9DT01QQVJFKGxvYWRTcHkuY291bnQo KSwgMik7CisgICAgUVRSWV9DT01QQVJFKHBhZ2UubmF2aWdhdGlvbnMuY291bnQoKSwgMik7CisK KyAgICBwYWdlLnRyaWdnZXJBY3Rpb24oUVdlYlBhZ2U6OlN0b3ApOworICAgIFFWRVJJRlkocGFn ZS5oaXN0b3J5KCktPmNhbkdvQmFjaygpKTsKKworICAgIFFTaWduYWxTcHkgdXJsU3B5KHBhZ2Uu bWFpbkZyYW1lKCksIFNJR05BTCh1cmxDaGFuZ2VkKFFVcmwpKSk7CisgICAgUVZFUklGWSh1cmxT cHkuaXNWYWxpZCgpKTsKKworICAgIHBhZ2UudHJpZ2dlckFjdGlvbihRV2ViUGFnZTo6QmFjayk7 CisgICAgOjp3YWl0Rm9yU2lnbmFsKHBhZ2UubWFpbkZyYW1lKCksIFNJR05BTCh1cmxDaGFuZ2Vk KFFVcmwpKSk7CisgICAgUUNPTVBBUkUodXJsU3B5LnNpemUoKSwgMSk7CisKKyAgICBRTGlzdDxR VmFyaWFudD4gYXJndW1lbnRzMSA9IHVybFNweS50YWtlRmlyc3QoKTsKKyAgICBRQ09NUEFSRShh cmd1bWVudHMxLmF0KDApLnRvVXJsKCksIGZpcnN0UGFnZVVybCk7CisKK30KIHZvaWQgdHN0X1FX ZWJQYWdlOjpiYWNrQWN0aW9uVXBkYXRlKCkKIHsKICAgICBRV2ViVmlldyB2aWV3Owo= 66749 2010-09-07 12:28:12 -0700 2010-09-08 06:38:33 -0700 Patch with change in local variable name 41155_090710.patch text/plain 4727 dinu.jacob SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA2Njg5OCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTggQEAKKzIwMTAtMDktMDcgIEphY29iIERpbnUgIDxkaW51LmphY29iQG5va2lh LmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBX aGVuIGxvYWRpbmcgYSBjYWNoZWQgcGFnZSxkaXNwYXRjaERpZENvbW1pdExvYWQgIGlzIGNhbGxl ZCBhZnRlciBGcmFtZUxvYWRlcjo6b3BlbiBzbworICAgICAgICB0aGF0IGFsbCBpbml0aWFsemF0 aW9ucyBhcmUgZG9uZSBiZWZvcmUgY2FsbGluZyBjbGllbnQgZGlzcGF0Y2hEaWRDb21taXRMb2Fk IHRvIGF2b2lkCisgICAgICAgIGNsaWVudCBmcm9tIGFjY2Vzc2luZyBpbmNvcnJlY3QgZGF0YS4K KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQxMTU1CisK KyAgICAgICAgT25seSBxdAorCisgICAgICAgICogbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OkZyYW1lTG9hZGVyOjpjb21taXRQcm92aXNpb25hbExvYWQpOgorICAg ICAgICAoV2ViQ29yZTo6RnJhbWVMb2FkZXI6OnRyYW5zaXRpb25Ub0NvbW1pdHRlZCk6CisKIDIw MTAtMDktMDcgIEVyaWMgQ2FybHNvbiAgPGVyaWMuY2FybHNvbkBhcHBsZS5jb20+CiAKICAgICAg ICAgUmV2aWV3ZWQgYnkgRGFyaW4gQWRsZXIuCkluZGV4OiBXZWJDb3JlL2xvYWRlci9GcmFtZUxv YWRlci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3BwCShy ZXZpc2lvbiA2Njg5NykKKysrIFdlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcAkod29ya2lu ZyBjb3B5KQpAQCAtMTg2MCw2ICsxODYwLDE1IEBAIHZvaWQgRnJhbWVMb2FkZXI6OmNvbW1pdFBy b3Zpc2lvbmFsTG9hZCgKICAgICBpZiAoY2FjaGVkUGFnZSAmJiBjYWNoZWRQYWdlLT5kb2N1bWVu dCgpKSB7CiAgICAgICAgIHByZXBhcmVGb3JDYWNoZWRQYWdlUmVzdG9yZSgpOwogICAgICAgICBj YWNoZWRQYWdlLT5yZXN0b3JlKG1fZnJhbWUtPnBhZ2UoKSk7CisKKyAgICAgICAgLy8gRm9yIG5v bi1jYWNoZWQgSFRNTCBwYWdlcywgdGhlc2UgbWV0aG9kcyBhcmUgY2FsbGVkIGluIHJlY2VpdmVk Rmlyc3REYXRhKCkuCisgICAgICAgIGRpc3BhdGNoRGlkQ29tbWl0TG9hZCgpOworCisgICAgICAg IC8vIElmIHdlIGhhdmUgYSB0aXRsZSBsZXQgdGhlIFdlYlZpZXcga25vdyBhYm91dCBpdC4gCisg ICAgICAgIFN0cmluZyB0aXRsZSA9IG1fZG9jdW1lbnRMb2FkZXItPnRpdGxlKCk7CisgICAgICAg IGlmICghdGl0bGUuaXNOdWxsKCkpIAorICAgICAgICAgICAgbV9jbGllbnQtPmRpc3BhdGNoRGlk UmVjZWl2ZVRpdGxlKHRpdGxlKTsgICAgICAgICAKKwogICAgICAgICBjaGVja0NvbXBsZXRlZCgp OwogICAgIH0gZWxzZSB7ICAgICAgICAKICAgICAgICAgS1VSTCB1cmwgPSBwZGwtPnN1YnN0aXR1 dGVEYXRhKCkucmVzcG9uc2VVUkwoKTsKQEAgLTE5NDAsNyArMTk0OSw2IEBAIHZvaWQgRnJhbWVM b2FkZXI6OnRyYW5zaXRpb25Ub0NvbW1pdHRlZCgKIAogICAgIC8vIEhhbmRsZSBhZGRpbmcgdGhl IFVSTCB0byB0aGUgYmFjay9mb3J3YXJkIGxpc3QuCiAgICAgRG9jdW1lbnRMb2FkZXIqIGRsID0g bV9kb2N1bWVudExvYWRlci5nZXQoKTsKLSAgICBTdHJpbmcgcHRpdGxlID0gZGwtPnRpdGxlKCk7 IAogCiAgICAgc3dpdGNoIChtX2xvYWRUeXBlKSB7CiAgICAgICAgIGNhc2UgRnJhbWVMb2FkVHlw ZUZvcndhcmQ6CkBAIC0yMDE3LDE0ICsyMDI1LDYgQEAgdm9pZCBGcmFtZUxvYWRlcjo6dHJhbnNp dGlvblRvQ29tbWl0dGVkKAogCiAgICAgaWYgKCFtX2NsaWVudC0+aGFzSFRNTFZpZXcoKSkKICAg ICAgICAgcmVjZWl2ZWRGaXJzdERhdGEoKTsKLSAgICBlbHNlIGlmIChjYWNoZWRQYWdlKSB7Ci0g ICAgICAgIC8vIEZvciBub24tY2FjaGVkIEhUTUwgcGFnZXMsIHRoZXNlIG1ldGhvZHMgYXJlIGNh bGxlZCBpbiByZWNlaXZlZEZpcnN0RGF0YSgpLgotICAgICAgICBkaXNwYXRjaERpZENvbW1pdExv YWQoKTsKLQotICAgICAgICAvLyBJZiB3ZSBoYXZlIGEgdGl0bGUgbGV0IHRoZSBXZWJWaWV3IGtu b3cgYWJvdXQgaXQuIAotICAgICAgICBpZiAoIXB0aXRsZS5pc051bGwoKSkgCi0gICAgICAgICAg ICBtX2NsaWVudC0+ZGlzcGF0Y2hEaWRSZWNlaXZlVGl0bGUocHRpdGxlKTsgICAgICAgICAKLSAg ICB9CiB9CiAKIHZvaWQgRnJhbWVMb2FkZXI6OmNsaWVudFJlZGlyZWN0Q2FuY2VsbGVkT3JGaW5p c2hlZChib29sIGNhbmNlbFdpdGhMb2FkSW5Qcm9ncmVzcykKSW5kZXg6IFdlYktpdC9xdC9DaGFu Z2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L3F0L0NoYW5nZUxvZwkocmV2aXNpb24gNjY4OTcp CisrKyBXZWJLaXQvcXQvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTMgQEAK KzIwMTAtMDktMDcgIEphY29iIERpbnUgIDxkaW51LmphY29iQG5va2lhLmNvbT4KKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGRlZCBhIG5ldyBxd2Vi cGFnZSB0ZXN0IGZvciBsb2FkaW5nIGEgY2FjaGVkIHBhZ2UKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQxMTU1CisKKyAgICAgICAgKiB0ZXN0cy9xd2Vi cGFnZS90c3RfcXdlYnBhZ2UuY3BwOgorICAgICAgICAodHN0X1FXZWJQYWdlOjpsb2FkQ2FjaGVk UGFnZSk6CisKIDIwMTAtMDktMDYgIERpZWdvIEdvbnphbGV6ICA8ZGllZ29oY2dAd2Via2l0Lm9y Zz4KIAogICAgICAgICBSZXZpZXdlZCBieSBBbnRvbmlvIEdvbWVzLgpJbmRleDogV2ViS2l0L3F0 L3Rlc3RzL3F3ZWJwYWdlL3RzdF9xd2VicGFnZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L3F0 L3Rlc3RzL3F3ZWJwYWdlL3RzdF9xd2VicGFnZS5jcHAJKHJldmlzaW9uIDY2ODk3KQorKysgV2Vi S2l0L3F0L3Rlc3RzL3F3ZWJwYWdlL3RzdF9xd2VicGFnZS5jcHAJKHdvcmtpbmcgY29weSkKQEAg LTk3LDYgKzk3LDcgQEAgcHJpdmF0ZSBzbG90czoKICAgICB2b2lkIGJhY2tBY3Rpb25VcGRhdGUo KTsKICAgICB2b2lkIGZyYW1lQXQoKTsKICAgICB2b2lkIHJlcXVlc3RDYWNoZSgpOworICAgIHZv aWQgbG9hZENhY2hlZFBhZ2UoKTsKICAgICB2b2lkIHByb3RlY3RCaW5kaW5nc1J1bnRpbWVPYmpl Y3RzRnJvbUNvbGxlY3RvcigpOwogICAgIHZvaWQgbG9jYWxVUkxTY2hlbWVzKCk7CiAgICAgdm9p ZCB0ZXN0T3B0aW9uYWxKU09iamVjdHMoKTsKQEAgLTEyODgsNiArMTI4OSwzNyBAQCB2b2lkIHRz dF9RV2ViUGFnZTo6cmVxdWVzdENhY2hlKCkKICAgICAgICAgICAgICAoaW50KVFOZXR3b3JrUmVx dWVzdDo6UHJlZmVyQ2FjaGUpOwogfQogCit2b2lkIHRzdF9RV2ViUGFnZTo6bG9hZENhY2hlZFBh Z2UoKQoreworICAgIFRlc3RQYWdlIHBhZ2U7CisgICAgUVNpZ25hbFNweSBsb2FkU3B5KCZwYWdl LCBTSUdOQUwobG9hZEZpbmlzaGVkKGJvb2wpKSk7CisgICAgcGFnZS5zZXR0aW5ncygpLT5zZXRN YXhpbXVtUGFnZXNJbkNhY2hlKDMpOworCisgICAgcGFnZS5tYWluRnJhbWUoKS0+bG9hZChRVXJs KCJkYXRhOnRleHQvaHRtbCxUaGlzIGlzIGZpcnN0IHBhZ2UiKSk7CisKKyAgICBRVFJZX0NPTVBB UkUobG9hZFNweS5jb3VudCgpLCAxKTsKKyAgICBRVFJZX0NPTVBBUkUocGFnZS5uYXZpZ2F0aW9u cy5jb3VudCgpLCAxKTsKKworICAgIFFVcmwgZmlyc3RQYWdlVXJsID0gcGFnZS5tYWluRnJhbWUo KS0+dXJsKCk7CisgICAgcGFnZS5tYWluRnJhbWUoKS0+bG9hZChRVXJsKCJkYXRhOnRleHQvaHRt bCxUaGlzIGlzIHNlY29uZCBwYWdlIikpOworCisgICAgUVRSWV9DT01QQVJFKGxvYWRTcHkuY291 bnQoKSwgMik7CisgICAgUVRSWV9DT01QQVJFKHBhZ2UubmF2aWdhdGlvbnMuY291bnQoKSwgMik7 CisKKyAgICBwYWdlLnRyaWdnZXJBY3Rpb24oUVdlYlBhZ2U6OlN0b3ApOworICAgIFFWRVJJRlko cGFnZS5oaXN0b3J5KCktPmNhbkdvQmFjaygpKTsKKworICAgIFFTaWduYWxTcHkgdXJsU3B5KHBh Z2UubWFpbkZyYW1lKCksIFNJR05BTCh1cmxDaGFuZ2VkKFFVcmwpKSk7CisgICAgUVZFUklGWSh1 cmxTcHkuaXNWYWxpZCgpKTsKKworICAgIHBhZ2UudHJpZ2dlckFjdGlvbihRV2ViUGFnZTo6QmFj ayk7CisgICAgOjp3YWl0Rm9yU2lnbmFsKHBhZ2UubWFpbkZyYW1lKCksIFNJR05BTCh1cmxDaGFu Z2VkKFFVcmwpKSk7CisgICAgUUNPTVBBUkUodXJsU3B5LnNpemUoKSwgMSk7CisKKyAgICBRTGlz dDxRVmFyaWFudD4gYXJndW1lbnRzMSA9IHVybFNweS50YWtlRmlyc3QoKTsKKyAgICBRQ09NUEFS RShhcmd1bWVudHMxLmF0KDApLnRvVXJsKCksIGZpcnN0UGFnZVVybCk7CisKK30KIHZvaWQgdHN0 X1FXZWJQYWdlOjpiYWNrQWN0aW9uVXBkYXRlKCkKIHsKICAgICBRV2ViVmlldyB2aWV3Owo= 66890 2010-09-08 06:38:10 -0700 2010-09-09 06:13:08 -0700 Patch with spacing in comments fixed 41155_090810.patch text/plain 4730 dinu.jacob SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA2Njk3NykKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTggQEAKKzIwMTAtMDktMDggIEphY29iIERpbnUgIDxkaW51LmphY29iQG5va2lh LmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBX aGVuIGxvYWRpbmcgYSBjYWNoZWQgcGFnZSwgZGlzcGF0Y2hEaWRDb21taXRMb2FkIGlzIGNhbGxl ZCBhZnRlciBGcmFtZUxvYWRlcjo6b3BlbiBzbworICAgICAgICB0aGF0IGFsbCBpbml0aWFsemF0 aW9ucyBhcmUgZG9uZSBiZWZvcmUgY2FsbGluZyBjbGllbnQgZGlzcGF0Y2hEaWRDb21taXRMb2Fk IHRvIGF2b2lkCisgICAgICAgIGNsaWVudCBmcm9tIGFjY2Vzc2luZyBpbmNvcnJlY3QgZGF0YS4K KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQxMTU1CisK KyAgICAgICAgT25seSBxdAorCisgICAgICAgICogbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OkZyYW1lTG9hZGVyOjpjb21taXRQcm92aXNpb25hbExvYWQpOgorICAg ICAgICAoV2ViQ29yZTo6RnJhbWVMb2FkZXI6OnRyYW5zaXRpb25Ub0NvbW1pdHRlZCk6CisKIDIw MTAtMDktMDggIEd5dXlvdW5nIEtpbSAgPGd5dXlvdW5nLmtpbUBzYW1zdW5nLmNvbT4KIAogICAg ICAgICBSZXZpZXdlZCBieSBEaXJrIFNjaHVsemUuCkluZGV4OiBXZWJDb3JlL2xvYWRlci9GcmFt ZUxvYWRlci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3Bw CShyZXZpc2lvbiA2Njk3NykKKysrIFdlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcAkod29y a2luZyBjb3B5KQpAQCAtMTg2MCw2ICsxODYwLDE1IEBAIHZvaWQgRnJhbWVMb2FkZXI6OmNvbW1p dFByb3Zpc2lvbmFsTG9hZCgKICAgICBpZiAoY2FjaGVkUGFnZSAmJiBjYWNoZWRQYWdlLT5kb2N1 bWVudCgpKSB7CiAgICAgICAgIHByZXBhcmVGb3JDYWNoZWRQYWdlUmVzdG9yZSgpOwogICAgICAg ICBjYWNoZWRQYWdlLT5yZXN0b3JlKG1fZnJhbWUtPnBhZ2UoKSk7CisKKyAgICAgICAgLy8gRm9y IG5vbi1jYWNoZWQgSFRNTCBwYWdlcywgdGhlc2UgbWV0aG9kcyBhcmUgY2FsbGVkIGluIHJlY2Vp dmVkRmlyc3REYXRhKCkuCisgICAgICAgIGRpc3BhdGNoRGlkQ29tbWl0TG9hZCgpOworCisgICAg ICAgIC8vIElmIHdlIGhhdmUgYSB0aXRsZSBsZXQgdGhlIFdlYlZpZXcga25vdyBhYm91dCBpdC4g CisgICAgICAgIFN0cmluZyB0aXRsZSA9IG1fZG9jdW1lbnRMb2FkZXItPnRpdGxlKCk7CisgICAg ICAgIGlmICghdGl0bGUuaXNOdWxsKCkpIAorICAgICAgICAgICAgbV9jbGllbnQtPmRpc3BhdGNo RGlkUmVjZWl2ZVRpdGxlKHRpdGxlKTsgICAgICAgICAKKwogICAgICAgICBjaGVja0NvbXBsZXRl ZCgpOwogICAgIH0gZWxzZSB7ICAgICAgICAKICAgICAgICAgS1VSTCB1cmwgPSBwZGwtPnN1YnN0 aXR1dGVEYXRhKCkucmVzcG9uc2VVUkwoKTsKQEAgLTE5NDAsNyArMTk0OSw2IEBAIHZvaWQgRnJh bWVMb2FkZXI6OnRyYW5zaXRpb25Ub0NvbW1pdHRlZCgKIAogICAgIC8vIEhhbmRsZSBhZGRpbmcg dGhlIFVSTCB0byB0aGUgYmFjay9mb3J3YXJkIGxpc3QuCiAgICAgRG9jdW1lbnRMb2FkZXIqIGRs ID0gbV9kb2N1bWVudExvYWRlci5nZXQoKTsKLSAgICBTdHJpbmcgcHRpdGxlID0gZGwtPnRpdGxl KCk7IAogCiAgICAgc3dpdGNoIChtX2xvYWRUeXBlKSB7CiAgICAgICAgIGNhc2UgRnJhbWVMb2Fk VHlwZUZvcndhcmQ6CkBAIC0yMDE3LDE0ICsyMDI1LDYgQEAgdm9pZCBGcmFtZUxvYWRlcjo6dHJh bnNpdGlvblRvQ29tbWl0dGVkKAogCiAgICAgaWYgKCFtX2NsaWVudC0+aGFzSFRNTFZpZXcoKSkK ICAgICAgICAgcmVjZWl2ZWRGaXJzdERhdGEoKTsKLSAgICBlbHNlIGlmIChjYWNoZWRQYWdlKSB7 Ci0gICAgICAgIC8vIEZvciBub24tY2FjaGVkIEhUTUwgcGFnZXMsIHRoZXNlIG1ldGhvZHMgYXJl IGNhbGxlZCBpbiByZWNlaXZlZEZpcnN0RGF0YSgpLgotICAgICAgICBkaXNwYXRjaERpZENvbW1p dExvYWQoKTsKLQotICAgICAgICAvLyBJZiB3ZSBoYXZlIGEgdGl0bGUgbGV0IHRoZSBXZWJWaWV3 IGtub3cgYWJvdXQgaXQuIAotICAgICAgICBpZiAoIXB0aXRsZS5pc051bGwoKSkgCi0gICAgICAg ICAgICBtX2NsaWVudC0+ZGlzcGF0Y2hEaWRSZWNlaXZlVGl0bGUocHRpdGxlKTsgICAgICAgICAK LSAgICB9CiB9CiAKIHZvaWQgRnJhbWVMb2FkZXI6OmNsaWVudFJlZGlyZWN0Q2FuY2VsbGVkT3JG aW5pc2hlZChib29sIGNhbmNlbFdpdGhMb2FkSW5Qcm9ncmVzcykKSW5kZXg6IFdlYktpdC9xdC9D aGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L3F0L0NoYW5nZUxvZwkocmV2aXNpb24gNjY5 NzcpCisrKyBXZWJLaXQvcXQvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTMg QEAKKzIwMTAtMDktMDcgIEphY29iIERpbnUgIDxkaW51LmphY29iQG5va2lhLmNvbT4KKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGRlZCBhIG5ldyBx d2VicGFnZSB0ZXN0IGZvciBsb2FkaW5nIGEgY2FjaGVkIHBhZ2UKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQxMTU1CisKKyAgICAgICAgKiB0ZXN0cy9x d2VicGFnZS90c3RfcXdlYnBhZ2UuY3BwOgorICAgICAgICAodHN0X1FXZWJQYWdlOjpsb2FkQ2Fj aGVkUGFnZSk6CisKIDIwMTAtMDktMDYgIERpZWdvIEdvbnphbGV6ICA8ZGllZ29oY2dAd2Via2l0 Lm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBBbnRvbmlvIEdvbWVzLgpJbmRleDogV2ViS2l0 L3F0L3Rlc3RzL3F3ZWJwYWdlL3RzdF9xd2VicGFnZS5jcHAKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0 L3F0L3Rlc3RzL3F3ZWJwYWdlL3RzdF9xd2VicGFnZS5jcHAJKHJldmlzaW9uIDY2OTc3KQorKysg V2ViS2l0L3F0L3Rlc3RzL3F3ZWJwYWdlL3RzdF9xd2VicGFnZS5jcHAJKHdvcmtpbmcgY29weSkK QEAgLTk3LDYgKzk3LDcgQEAgcHJpdmF0ZSBzbG90czoKICAgICB2b2lkIGJhY2tBY3Rpb25VcGRh dGUoKTsKICAgICB2b2lkIGZyYW1lQXQoKTsKICAgICB2b2lkIHJlcXVlc3RDYWNoZSgpOworICAg IHZvaWQgbG9hZENhY2hlZFBhZ2UoKTsKICAgICB2b2lkIHByb3RlY3RCaW5kaW5nc1J1bnRpbWVP YmplY3RzRnJvbUNvbGxlY3RvcigpOwogICAgIHZvaWQgbG9jYWxVUkxTY2hlbWVzKCk7CiAgICAg dm9pZCB0ZXN0T3B0aW9uYWxKU09iamVjdHMoKTsKQEAgLTEyODgsNiArMTI4OSwzNyBAQCB2b2lk IHRzdF9RV2ViUGFnZTo6cmVxdWVzdENhY2hlKCkKICAgICAgICAgICAgICAoaW50KVFOZXR3b3Jr UmVxdWVzdDo6UHJlZmVyQ2FjaGUpOwogfQogCit2b2lkIHRzdF9RV2ViUGFnZTo6bG9hZENhY2hl ZFBhZ2UoKQoreworICAgIFRlc3RQYWdlIHBhZ2U7CisgICAgUVNpZ25hbFNweSBsb2FkU3B5KCZw YWdlLCBTSUdOQUwobG9hZEZpbmlzaGVkKGJvb2wpKSk7CisgICAgcGFnZS5zZXR0aW5ncygpLT5z ZXRNYXhpbXVtUGFnZXNJbkNhY2hlKDMpOworCisgICAgcGFnZS5tYWluRnJhbWUoKS0+bG9hZChR VXJsKCJkYXRhOnRleHQvaHRtbCxUaGlzIGlzIGZpcnN0IHBhZ2UiKSk7CisKKyAgICBRVFJZX0NP TVBBUkUobG9hZFNweS5jb3VudCgpLCAxKTsKKyAgICBRVFJZX0NPTVBBUkUocGFnZS5uYXZpZ2F0 aW9ucy5jb3VudCgpLCAxKTsKKworICAgIFFVcmwgZmlyc3RQYWdlVXJsID0gcGFnZS5tYWluRnJh bWUoKS0+dXJsKCk7CisgICAgcGFnZS5tYWluRnJhbWUoKS0+bG9hZChRVXJsKCJkYXRhOnRleHQv aHRtbCxUaGlzIGlzIHNlY29uZCBwYWdlIikpOworCisgICAgUVRSWV9DT01QQVJFKGxvYWRTcHku Y291bnQoKSwgMik7CisgICAgUVRSWV9DT01QQVJFKHBhZ2UubmF2aWdhdGlvbnMuY291bnQoKSwg Mik7CisKKyAgICBwYWdlLnRyaWdnZXJBY3Rpb24oUVdlYlBhZ2U6OlN0b3ApOworICAgIFFWRVJJ RlkocGFnZS5oaXN0b3J5KCktPmNhbkdvQmFjaygpKTsKKworICAgIFFTaWduYWxTcHkgdXJsU3B5 KHBhZ2UubWFpbkZyYW1lKCksIFNJR05BTCh1cmxDaGFuZ2VkKFFVcmwpKSk7CisgICAgUVZFUklG WSh1cmxTcHkuaXNWYWxpZCgpKTsKKworICAgIHBhZ2UudHJpZ2dlckFjdGlvbihRV2ViUGFnZTo6 QmFjayk7CisgICAgOjp3YWl0Rm9yU2lnbmFsKHBhZ2UubWFpbkZyYW1lKCksIFNJR05BTCh1cmxD aGFuZ2VkKFFVcmwpKSk7CisgICAgUUNPTVBBUkUodXJsU3B5LnNpemUoKSwgMSk7CisKKyAgICBR TGlzdDxRVmFyaWFudD4gYXJndW1lbnRzMSA9IHVybFNweS50YWtlRmlyc3QoKTsKKyAgICBRQ09N UEFSRShhcmd1bWVudHMxLmF0KDApLnRvVXJsKCksIGZpcnN0UGFnZVVybCk7CisKK30KIHZvaWQg dHN0X1FXZWJQYWdlOjpiYWNrQWN0aW9uVXBkYXRlKCkKIHsKICAgICBRV2ViVmlldyB2aWV3Owo= 67026 2010-09-09 06:13:08 -0700 2010-09-18 03:21:11 -0700 Patch with spelling and grammar corrections 41155_090910.patch text/plain 4735 dinu.jacob SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA2NzA4MCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTggQEAKKzIwMTAtMDktMDkgIEphY29iIERpbnUgIDxkaW51LmphY29iLm5va2lh LmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBX aGVuIGxvYWRpbmcgYSBjYWNoZWQgcGFnZSwgZGlzcGF0Y2hEaWRDb21taXRMb2FkIGlzIGNhbGxl ZCBhZnRlciBGcmFtZUxvYWRlcjo6b3BlbiBzbworICAgICAgICB0aGF0IGFsbCBpbml0aWFsaXph dGlvbnMgYXJlIGRvbmUgYmVmb3JlIGNhbGxpbmcgY2xpZW50IGRpc3BhdGNoRGlkQ29tbWl0TG9h ZCB0byBhdm9pZAorICAgICAgICB0aGUgY2xpZW50IGZyb20gYWNjZXNzaW5nIGluY29ycmVjdCBk YXRhLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDEx NTUKKworICAgICAgICBPbmx5IHF0CisKKyAgICAgICAgKiBsb2FkZXIvRnJhbWVMb2FkZXIuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVMb2FkZXI6OmNvbW1pdFByb3Zpc2lvbmFsTG9hZCk6 CisgICAgICAgIChXZWJDb3JlOjpGcmFtZUxvYWRlcjo6dHJhbnNpdGlvblRvQ29tbWl0dGVkKToK KwogMjAxMC0wOS0wOSAgS3Jpc3RpYW4gQW1saWUgIDxrcmlzdGlhbi5hbWxpZUBub2tpYS5jb20+ CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgQW5kcmVhcyBLbGluZy4KSW5kZXg6IFdlYkNvcmUvbG9h ZGVyL0ZyYW1lTG9hZGVyLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2xvYWRlci9GcmFtZUxv YWRlci5jcHAJKHJldmlzaW9uIDY3MDgwKQorKysgV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIu Y3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xODYwLDYgKzE4NjAsMTUgQEAgdm9pZCBGcmFtZUxvYWRl cjo6Y29tbWl0UHJvdmlzaW9uYWxMb2FkKAogICAgIGlmIChjYWNoZWRQYWdlICYmIGNhY2hlZFBh Z2UtPmRvY3VtZW50KCkpIHsKICAgICAgICAgcHJlcGFyZUZvckNhY2hlZFBhZ2VSZXN0b3JlKCk7 CiAgICAgICAgIGNhY2hlZFBhZ2UtPnJlc3RvcmUobV9mcmFtZS0+cGFnZSgpKTsKKworICAgICAg ICAvLyBGb3Igbm9uLWNhY2hlZCBIVE1MIHBhZ2VzLCB0aGVzZSBtZXRob2RzIGFyZSBjYWxsZWQg aW4gcmVjZWl2ZWRGaXJzdERhdGEoKS4KKyAgICAgICAgZGlzcGF0Y2hEaWRDb21taXRMb2FkKCk7 CisKKyAgICAgICAgLy8gSWYgd2UgaGF2ZSBhIHRpdGxlIGxldCB0aGUgV2ViVmlldyBrbm93IGFi b3V0IGl0LiAKKyAgICAgICAgU3RyaW5nIHRpdGxlID0gbV9kb2N1bWVudExvYWRlci0+dGl0bGUo KTsKKyAgICAgICAgaWYgKCF0aXRsZS5pc051bGwoKSkgCisgICAgICAgICAgICBtX2NsaWVudC0+ ZGlzcGF0Y2hEaWRSZWNlaXZlVGl0bGUodGl0bGUpOyAgICAgICAgIAorCiAgICAgICAgIGNoZWNr Q29tcGxldGVkKCk7CiAgICAgfSBlbHNlIHsgICAgICAgIAogICAgICAgICBLVVJMIHVybCA9IHBk bC0+c3Vic3RpdHV0ZURhdGEoKS5yZXNwb25zZVVSTCgpOwpAQCAtMTk0MCw3ICsxOTQ5LDYgQEAg dm9pZCBGcmFtZUxvYWRlcjo6dHJhbnNpdGlvblRvQ29tbWl0dGVkKAogCiAgICAgLy8gSGFuZGxl IGFkZGluZyB0aGUgVVJMIHRvIHRoZSBiYWNrL2ZvcndhcmQgbGlzdC4KICAgICBEb2N1bWVudExv YWRlciogZGwgPSBtX2RvY3VtZW50TG9hZGVyLmdldCgpOwotICAgIFN0cmluZyBwdGl0bGUgPSBk bC0+dGl0bGUoKTsgCiAKICAgICBzd2l0Y2ggKG1fbG9hZFR5cGUpIHsKICAgICAgICAgY2FzZSBG cmFtZUxvYWRUeXBlRm9yd2FyZDoKQEAgLTIwMTcsMTQgKzIwMjUsNiBAQCB2b2lkIEZyYW1lTG9h ZGVyOjp0cmFuc2l0aW9uVG9Db21taXR0ZWQoCiAKICAgICBpZiAoIW1fY2xpZW50LT5oYXNIVE1M VmlldygpKQogICAgICAgICByZWNlaXZlZEZpcnN0RGF0YSgpOwotICAgIGVsc2UgaWYgKGNhY2hl ZFBhZ2UpIHsKLSAgICAgICAgLy8gRm9yIG5vbi1jYWNoZWQgSFRNTCBwYWdlcywgdGhlc2UgbWV0 aG9kcyBhcmUgY2FsbGVkIGluIHJlY2VpdmVkRmlyc3REYXRhKCkuCi0gICAgICAgIGRpc3BhdGNo RGlkQ29tbWl0TG9hZCgpOwotCi0gICAgICAgIC8vIElmIHdlIGhhdmUgYSB0aXRsZSBsZXQgdGhl IFdlYlZpZXcga25vdyBhYm91dCBpdC4gCi0gICAgICAgIGlmICghcHRpdGxlLmlzTnVsbCgpKSAK LSAgICAgICAgICAgIG1fY2xpZW50LT5kaXNwYXRjaERpZFJlY2VpdmVUaXRsZShwdGl0bGUpOyAg ICAgICAgIAotICAgIH0KIH0KIAogdm9pZCBGcmFtZUxvYWRlcjo6Y2xpZW50UmVkaXJlY3RDYW5j ZWxsZWRPckZpbmlzaGVkKGJvb2wgY2FuY2VsV2l0aExvYWRJblByb2dyZXNzKQpJbmRleDogV2Vi S2l0L3F0L0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQvcXQvQ2hhbmdlTG9nCShyZXZp c2lvbiA2NzA4MCkKKysrIFdlYktpdC9xdC9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEs MyArMSwxMyBAQAorMjAxMC0wOS0wOSAgSmFjb2IgRGludSAgPGRpbnUuamFjb2Iubm9raWEuY29t PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZGVk IGEgbmV3IHF3ZWJwYWdlIHRlc3QgZm9yIGxvYWRpbmcgYSBjYWNoZWQgcGFnZQorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDExNTUKKworICAgICAgICAq IHRlc3RzL3F3ZWJwYWdlL3RzdF9xd2VicGFnZS5jcHA6CisgICAgICAgICh0c3RfUVdlYlBhZ2U6 OmxvYWRDYWNoZWRQYWdlKToKKwogMjAxMC0wOS0wOCAgUGV0ZXIgS2FzdGluZyAgPHBrYXN0aW5n QGdvb2dsZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRGF2aWQgSHlhdHQuCkluZGV4OiBX ZWJLaXQvcXQvdGVzdHMvcXdlYnBhZ2UvdHN0X3F3ZWJwYWdlLmNwcAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBX ZWJLaXQvcXQvdGVzdHMvcXdlYnBhZ2UvdHN0X3F3ZWJwYWdlLmNwcAkocmV2aXNpb24gNjcwODAp CisrKyBXZWJLaXQvcXQvdGVzdHMvcXdlYnBhZ2UvdHN0X3F3ZWJwYWdlLmNwcAkod29ya2luZyBj b3B5KQpAQCAtOTcsNiArOTcsNyBAQCBwcml2YXRlIHNsb3RzOgogICAgIHZvaWQgYmFja0FjdGlv blVwZGF0ZSgpOwogICAgIHZvaWQgZnJhbWVBdCgpOwogICAgIHZvaWQgcmVxdWVzdENhY2hlKCk7 CisgICAgdm9pZCBsb2FkQ2FjaGVkUGFnZSgpOwogICAgIHZvaWQgcHJvdGVjdEJpbmRpbmdzUnVu dGltZU9iamVjdHNGcm9tQ29sbGVjdG9yKCk7CiAgICAgdm9pZCBsb2NhbFVSTFNjaGVtZXMoKTsK ICAgICB2b2lkIHRlc3RPcHRpb25hbEpTT2JqZWN0cygpOwpAQCAtMTI4OCw2ICsxMjg5LDM3IEBA IHZvaWQgdHN0X1FXZWJQYWdlOjpyZXF1ZXN0Q2FjaGUoKQogICAgICAgICAgICAgIChpbnQpUU5l dHdvcmtSZXF1ZXN0OjpQcmVmZXJDYWNoZSk7CiB9CiAKK3ZvaWQgdHN0X1FXZWJQYWdlOjpsb2Fk Q2FjaGVkUGFnZSgpCit7CisgICAgVGVzdFBhZ2UgcGFnZTsKKyAgICBRU2lnbmFsU3B5IGxvYWRT cHkoJnBhZ2UsIFNJR05BTChsb2FkRmluaXNoZWQoYm9vbCkpKTsKKyAgICBwYWdlLnNldHRpbmdz KCktPnNldE1heGltdW1QYWdlc0luQ2FjaGUoMyk7CisKKyAgICBwYWdlLm1haW5GcmFtZSgpLT5s b2FkKFFVcmwoImRhdGE6dGV4dC9odG1sLFRoaXMgaXMgZmlyc3QgcGFnZSIpKTsKKworICAgIFFU UllfQ09NUEFSRShsb2FkU3B5LmNvdW50KCksIDEpOworICAgIFFUUllfQ09NUEFSRShwYWdlLm5h dmlnYXRpb25zLmNvdW50KCksIDEpOworCisgICAgUVVybCBmaXJzdFBhZ2VVcmwgPSBwYWdlLm1h aW5GcmFtZSgpLT51cmwoKTsKKyAgICBwYWdlLm1haW5GcmFtZSgpLT5sb2FkKFFVcmwoImRhdGE6 dGV4dC9odG1sLFRoaXMgaXMgc2Vjb25kIHBhZ2UiKSk7CisKKyAgICBRVFJZX0NPTVBBUkUobG9h ZFNweS5jb3VudCgpLCAyKTsKKyAgICBRVFJZX0NPTVBBUkUocGFnZS5uYXZpZ2F0aW9ucy5jb3Vu dCgpLCAyKTsKKworICAgIHBhZ2UudHJpZ2dlckFjdGlvbihRV2ViUGFnZTo6U3RvcCk7CisgICAg UVZFUklGWShwYWdlLmhpc3RvcnkoKS0+Y2FuR29CYWNrKCkpOworCisgICAgUVNpZ25hbFNweSB1 cmxTcHkocGFnZS5tYWluRnJhbWUoKSwgU0lHTkFMKHVybENoYW5nZWQoUVVybCkpKTsKKyAgICBR VkVSSUZZKHVybFNweS5pc1ZhbGlkKCkpOworCisgICAgcGFnZS50cmlnZ2VyQWN0aW9uKFFXZWJQ YWdlOjpCYWNrKTsKKyAgICA6OndhaXRGb3JTaWduYWwocGFnZS5tYWluRnJhbWUoKSwgU0lHTkFM KHVybENoYW5nZWQoUVVybCkpKTsKKyAgICBRQ09NUEFSRSh1cmxTcHkuc2l6ZSgpLCAxKTsKKwor ICAgIFFMaXN0PFFWYXJpYW50PiBhcmd1bWVudHMxID0gdXJsU3B5LnRha2VGaXJzdCgpOworICAg IFFDT01QQVJFKGFyZ3VtZW50czEuYXQoMCkudG9VcmwoKSwgZmlyc3RQYWdlVXJsKTsKKworfQog dm9pZCB0c3RfUVdlYlBhZ2U6OmJhY2tBY3Rpb25VcGRhdGUoKQogewogICAgIFFXZWJWaWV3IHZp ZXc7Cg== 67832 2010-09-16 13:23:27 -0700 2010-09-18 03:21:16 -0700 Final patch to be committed 41155.patch text/plain 4696 dinu.jacob SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA2NzY1NykKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTkgQEAKKzIwMTAtMDktMTYgIEphY29iIERpbnUgIDxkaW51LmphY29iQG5va2lh LmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBBZGFtIEJhcnRoLgorCisgICAgICAgIFdoZW4g bG9hZGluZyBhIGNhY2hlZCBwYWdlLCBkaXNwYXRjaERpZENvbW1pdExvYWQgaXMgY2FsbGVkIGFm dGVyIEZyYW1lTG9hZGVyOjpvcGVuIHNvCisgICAgICAgIHRoYXQgYWxsIGluaXRpYWx6YXRpb25z IGFyZSBkb25lIGJlZm9yZSBjYWxsaW5nIGNsaWVudCBkaXNwYXRjaERpZENvbW1pdExvYWQgdG8g YXZvaWQKKyAgICAgICAgY2xpZW50IGZyb20gYWNjZXNzaW5nIGluY29ycmVjdCBkYXRhLgorCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00MTE1NQorCisg ICAgICAgIE9ubHkgcXQKKworICAgICAgICAqIGxvYWRlci9GcmFtZUxvYWRlci5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpGcmFtZUxvYWRlcjo6Y29tbWl0UHJvdmlzaW9uYWxMb2FkKToKKyAgICAg ICAgKFdlYkNvcmU6OkZyYW1lTG9hZGVyOjp0cmFuc2l0aW9uVG9Db21taXR0ZWQpOgorCiAyMDEw LTA5LTE2ICBUaG9tYXMgWmFuZGVyIDx0LnphbmRlckBub2tpYS5jb20+CiAKICAgICAgICAgUmV2 aWV3ZWQgYnkgQW5kcmVhcyBLbGluZy4KSW5kZXg6IFdlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVy LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5jcHAJKHJldmlz aW9uIDY3NjIyKQorKysgV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3BwCSh3b3JraW5nIGNv cHkpCkBAIC0xODQ4LDYgKzE4NDgsMTUgQEAgdm9pZCBGcmFtZUxvYWRlcjo6Y29tbWl0UHJvdmlz aW9uYWxMb2FkKAogICAgIGlmIChjYWNoZWRQYWdlICYmIGNhY2hlZFBhZ2UtPmRvY3VtZW50KCkp IHsKICAgICAgICAgcHJlcGFyZUZvckNhY2hlZFBhZ2VSZXN0b3JlKCk7CiAgICAgICAgIGNhY2hl ZFBhZ2UtPnJlc3RvcmUobV9mcmFtZS0+cGFnZSgpKTsKKworICAgICAgICAvLyBGb3Igbm9uLWNh Y2hlZCBIVE1MIHBhZ2VzLCB0aGVzZSBtZXRob2RzIGFyZSBjYWxsZWQgaW4gcmVjZWl2ZWRGaXJz dERhdGEoKS4KKyAgICAgICAgZGlzcGF0Y2hEaWRDb21taXRMb2FkKCk7CisKKyAgICAgICAgLy8g SWYgd2UgaGF2ZSBhIHRpdGxlIGxldCB0aGUgV2ViVmlldyBrbm93IGFib3V0IGl0LiAKKyAgICAg ICAgU3RyaW5nIHRpdGxlID0gbV9kb2N1bWVudExvYWRlci0+dGl0bGUoKTsKKyAgICAgICAgaWYg KCF0aXRsZS5pc051bGwoKSkgCisgICAgICAgICAgICBtX2NsaWVudC0+ZGlzcGF0Y2hEaWRSZWNl aXZlVGl0bGUodGl0bGUpOyAgICAgICAgIAorCiAgICAgICAgIGNoZWNrQ29tcGxldGVkKCk7CiAg ICAgfSBlbHNlIHsgICAgICAgIAogICAgICAgICBLVVJMIHVybCA9IHBkbC0+c3Vic3RpdHV0ZURh dGEoKS5yZXNwb25zZVVSTCgpOwpAQCAtMTkyOCw3ICsxOTM3LDYgQEAgdm9pZCBGcmFtZUxvYWRl cjo6dHJhbnNpdGlvblRvQ29tbWl0dGVkKAogCiAgICAgLy8gSGFuZGxlIGFkZGluZyB0aGUgVVJM IHRvIHRoZSBiYWNrL2ZvcndhcmQgbGlzdC4KICAgICBEb2N1bWVudExvYWRlciogZGwgPSBtX2Rv Y3VtZW50TG9hZGVyLmdldCgpOwotICAgIFN0cmluZyBwdGl0bGUgPSBkbC0+dGl0bGUoKTsgCiAK ICAgICBzd2l0Y2ggKG1fbG9hZFR5cGUpIHsKICAgICAgICAgY2FzZSBGcmFtZUxvYWRUeXBlRm9y d2FyZDoKQEAgLTIwMDUsMTQgKzIwMTMsNiBAQCB2b2lkIEZyYW1lTG9hZGVyOjp0cmFuc2l0aW9u VG9Db21taXR0ZWQoCiAKICAgICBpZiAoIW1fY2xpZW50LT5oYXNIVE1MVmlldygpKQogICAgICAg ICByZWNlaXZlZEZpcnN0RGF0YSgpOwotICAgIGVsc2UgaWYgKGNhY2hlZFBhZ2UpIHsKLSAgICAg ICAgLy8gRm9yIG5vbi1jYWNoZWQgSFRNTCBwYWdlcywgdGhlc2UgbWV0aG9kcyBhcmUgY2FsbGVk IGluIHJlY2VpdmVkRmlyc3REYXRhKCkuCi0gICAgICAgIGRpc3BhdGNoRGlkQ29tbWl0TG9hZCgp OwotCi0gICAgICAgIC8vIElmIHdlIGhhdmUgYSB0aXRsZSBsZXQgdGhlIFdlYlZpZXcga25vdyBh Ym91dCBpdC4gCi0gICAgICAgIGlmICghcHRpdGxlLmlzTnVsbCgpKSAKLSAgICAgICAgICAgIG1f Y2xpZW50LT5kaXNwYXRjaERpZFJlY2VpdmVUaXRsZShwdGl0bGUpOyAgICAgICAgIAotICAgIH0K IH0KIAogdm9pZCBGcmFtZUxvYWRlcjo6Y2xpZW50UmVkaXJlY3RDYW5jZWxsZWRPckZpbmlzaGVk KGJvb2wgY2FuY2VsV2l0aExvYWRJblByb2dyZXNzKQpJbmRleDogV2ViS2l0L3F0L0NoYW5nZUxv Zwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBXZWJLaXQvcXQvQ2hhbmdlTG9nCShyZXZpc2lvbiA2NzY1NykKKysr IFdlYktpdC9xdC9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxMyBAQAorMjAx MC0wOS0xNiAgSmFjb2IgRGludSAgPGRpbnUuamFjb2JAbm9raWEuY29tPgorCisgICAgICAgIFJl dmlld2VkIGJ5IEFkYW0gQmFydGguCisKKyAgICAgICAgQWRkZWQgYSBuZXcgcXdlYnBhZ2UgdGVz dCBmb3IgbG9hZGluZyBhIGNhY2hlZCBwYWdlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD00MTE1NQorCisgICAgICAgICogdGVzdHMvcXdlYnBhZ2UvdHN0 X3F3ZWJwYWdlLmNwcDoKKyAgICAgICAgKHRzdF9RV2ViUGFnZTo6bG9hZENhY2hlZFBhZ2UpOgor CiAyMDEwLTA5LTE2ICBEYXJpbiBBZGxlciAgPGRhcmluQGFwcGxlLmNvbT4KIAogICAgICAgICBG aXggYnVpbGQuCkluZGV4OiBXZWJLaXQvcXQvdGVzdHMvcXdlYnBhZ2UvdHN0X3F3ZWJwYWdlLmNw cAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBXZWJLaXQvcXQvdGVzdHMvcXdlYnBhZ2UvdHN0X3F3ZWJwYWdlLmNw cAkocmV2aXNpb24gNjc2MjIpCisrKyBXZWJLaXQvcXQvdGVzdHMvcXdlYnBhZ2UvdHN0X3F3ZWJw YWdlLmNwcAkod29ya2luZyBjb3B5KQpAQCAtOTcsNiArOTcsNyBAQCBwcml2YXRlIHNsb3RzOgog ICAgIHZvaWQgYmFja0FjdGlvblVwZGF0ZSgpOwogICAgIHZvaWQgZnJhbWVBdCgpOwogICAgIHZv aWQgcmVxdWVzdENhY2hlKCk7CisgICAgdm9pZCBsb2FkQ2FjaGVkUGFnZSgpOwogICAgIHZvaWQg cHJvdGVjdEJpbmRpbmdzUnVudGltZU9iamVjdHNGcm9tQ29sbGVjdG9yKCk7CiAgICAgdm9pZCBs b2NhbFVSTFNjaGVtZXMoKTsKICAgICB2b2lkIHRlc3RPcHRpb25hbEpTT2JqZWN0cygpOwpAQCAt MTI4OCw2ICsxMjg5LDM3IEBAIHZvaWQgdHN0X1FXZWJQYWdlOjpyZXF1ZXN0Q2FjaGUoKQogICAg ICAgICAgICAgIChpbnQpUU5ldHdvcmtSZXF1ZXN0OjpQcmVmZXJDYWNoZSk7CiB9CiAKK3ZvaWQg dHN0X1FXZWJQYWdlOjpsb2FkQ2FjaGVkUGFnZSgpCit7CisgICAgVGVzdFBhZ2UgcGFnZTsKKyAg ICBRU2lnbmFsU3B5IGxvYWRTcHkoJnBhZ2UsIFNJR05BTChsb2FkRmluaXNoZWQoYm9vbCkpKTsK KyAgICBwYWdlLnNldHRpbmdzKCktPnNldE1heGltdW1QYWdlc0luQ2FjaGUoMyk7CisKKyAgICBw YWdlLm1haW5GcmFtZSgpLT5sb2FkKFFVcmwoImRhdGE6dGV4dC9odG1sLFRoaXMgaXMgZmlyc3Qg cGFnZSIpKTsKKworICAgIFFUUllfQ09NUEFSRShsb2FkU3B5LmNvdW50KCksIDEpOworICAgIFFU UllfQ09NUEFSRShwYWdlLm5hdmlnYXRpb25zLmNvdW50KCksIDEpOworCisgICAgUVVybCBmaXJz dFBhZ2VVcmwgPSBwYWdlLm1haW5GcmFtZSgpLT51cmwoKTsKKyAgICBwYWdlLm1haW5GcmFtZSgp LT5sb2FkKFFVcmwoImRhdGE6dGV4dC9odG1sLFRoaXMgaXMgc2Vjb25kIHBhZ2UiKSk7CisKKyAg ICBRVFJZX0NPTVBBUkUobG9hZFNweS5jb3VudCgpLCAyKTsKKyAgICBRVFJZX0NPTVBBUkUocGFn ZS5uYXZpZ2F0aW9ucy5jb3VudCgpLCAyKTsKKworICAgIHBhZ2UudHJpZ2dlckFjdGlvbihRV2Vi UGFnZTo6U3RvcCk7CisgICAgUVZFUklGWShwYWdlLmhpc3RvcnkoKS0+Y2FuR29CYWNrKCkpOwor CisgICAgUVNpZ25hbFNweSB1cmxTcHkocGFnZS5tYWluRnJhbWUoKSwgU0lHTkFMKHVybENoYW5n ZWQoUVVybCkpKTsKKyAgICBRVkVSSUZZKHVybFNweS5pc1ZhbGlkKCkpOworCisgICAgcGFnZS50 cmlnZ2VyQWN0aW9uKFFXZWJQYWdlOjpCYWNrKTsKKyAgICA6OndhaXRGb3JTaWduYWwocGFnZS5t YWluRnJhbWUoKSwgU0lHTkFMKHVybENoYW5nZWQoUVVybCkpKTsKKyAgICBRQ09NUEFSRSh1cmxT cHkuc2l6ZSgpLCAxKTsKKworICAgIFFMaXN0PFFWYXJpYW50PiBhcmd1bWVudHMxID0gdXJsU3B5 LnRha2VGaXJzdCgpOworICAgIFFDT01QQVJFKGFyZ3VtZW50czEuYXQoMCkudG9VcmwoKSwgZmly c3RQYWdlVXJsKTsKKworfQogdm9pZCB0c3RfUVdlYlBhZ2U6OmJhY2tBY3Rpb25VcGRhdGUoKQog ewogICAgIFFXZWJWaWV3IHZpZXc7Cg== 67838 2010-09-16 13:49:19 -0700 2010-09-16 13:50:19 -0700 Patch with unwanted comments removed 41155.patch text/plain 4589 dinu.jacob SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA2NzY1NykKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTcgQEAKKzIwMTAtMDktMTYgIEphY29iIERpbnUgIDxkaW51LmphY29iQG5va2lh LmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBBZGFtIEJhcnRoLgorCisgICAgICAgIFdoZW4g bG9hZGluZyBhIGNhY2hlZCBwYWdlLCBkaXNwYXRjaERpZENvbW1pdExvYWQgaXMgY2FsbGVkIGFm dGVyIEZyYW1lTG9hZGVyOjpvcGVuIHNvCisgICAgICAgIHRoYXQgYWxsIGluaXRpYWx6YXRpb25z IGFyZSBkb25lIGJlZm9yZSBjYWxsaW5nIGNsaWVudCBkaXNwYXRjaERpZENvbW1pdExvYWQgdG8g YXZvaWQKKyAgICAgICAgY2xpZW50IGZyb20gYWNjZXNzaW5nIGluY29ycmVjdCBkYXRhLgorCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00MTE1NQorCisg ICAgICAgICogbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1l TG9hZGVyOjpjb21taXRQcm92aXNpb25hbExvYWQpOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVM b2FkZXI6OnRyYW5zaXRpb25Ub0NvbW1pdHRlZCk6CisKIDIwMTAtMDktMTYgIFRob21hcyBaYW5k ZXIgPHQuemFuZGVyQG5va2lhLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBBbmRyZWFzIEts aW5nLgpJbmRleDogV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3BwCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFdlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcAkocmV2aXNpb24gNjc2MjIpCisrKyBXZWJD b3JlL2xvYWRlci9GcmFtZUxvYWRlci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTE4NDgsNiArMTg0 OCwxNCBAQCB2b2lkIEZyYW1lTG9hZGVyOjpjb21taXRQcm92aXNpb25hbExvYWQoCiAgICAgaWYg KGNhY2hlZFBhZ2UgJiYgY2FjaGVkUGFnZS0+ZG9jdW1lbnQoKSkgewogICAgICAgICBwcmVwYXJl Rm9yQ2FjaGVkUGFnZVJlc3RvcmUoKTsKICAgICAgICAgY2FjaGVkUGFnZS0+cmVzdG9yZShtX2Zy YW1lLT5wYWdlKCkpOworCisgICAgICAgIGRpc3BhdGNoRGlkQ29tbWl0TG9hZCgpOworCisgICAg ICAgIC8vIElmIHdlIGhhdmUgYSB0aXRsZSBsZXQgdGhlIFdlYlZpZXcga25vdyBhYm91dCBpdC4g CisgICAgICAgIFN0cmluZyB0aXRsZSA9IG1fZG9jdW1lbnRMb2FkZXItPnRpdGxlKCk7CisgICAg ICAgIGlmICghdGl0bGUuaXNOdWxsKCkpIAorICAgICAgICAgICAgbV9jbGllbnQtPmRpc3BhdGNo RGlkUmVjZWl2ZVRpdGxlKHRpdGxlKTsgICAgICAgICAKKwogICAgICAgICBjaGVja0NvbXBsZXRl ZCgpOwogICAgIH0gZWxzZSB7ICAgICAgICAKICAgICAgICAgS1VSTCB1cmwgPSBwZGwtPnN1YnN0 aXR1dGVEYXRhKCkucmVzcG9uc2VVUkwoKTsKQEAgLTE5MjgsNyArMTkzNiw2IEBAIHZvaWQgRnJh bWVMb2FkZXI6OnRyYW5zaXRpb25Ub0NvbW1pdHRlZCgKIAogICAgIC8vIEhhbmRsZSBhZGRpbmcg dGhlIFVSTCB0byB0aGUgYmFjay9mb3J3YXJkIGxpc3QuCiAgICAgRG9jdW1lbnRMb2FkZXIqIGRs ID0gbV9kb2N1bWVudExvYWRlci5nZXQoKTsKLSAgICBTdHJpbmcgcHRpdGxlID0gZGwtPnRpdGxl KCk7IAogCiAgICAgc3dpdGNoIChtX2xvYWRUeXBlKSB7CiAgICAgICAgIGNhc2UgRnJhbWVMb2Fk VHlwZUZvcndhcmQ6CkBAIC0yMDA1LDE0ICsyMDEyLDYgQEAgdm9pZCBGcmFtZUxvYWRlcjo6dHJh bnNpdGlvblRvQ29tbWl0dGVkKAogCiAgICAgaWYgKCFtX2NsaWVudC0+aGFzSFRNTFZpZXcoKSkK ICAgICAgICAgcmVjZWl2ZWRGaXJzdERhdGEoKTsKLSAgICBlbHNlIGlmIChjYWNoZWRQYWdlKSB7 Ci0gICAgICAgIC8vIEZvciBub24tY2FjaGVkIEhUTUwgcGFnZXMsIHRoZXNlIG1ldGhvZHMgYXJl IGNhbGxlZCBpbiByZWNlaXZlZEZpcnN0RGF0YSgpLgotICAgICAgICBkaXNwYXRjaERpZENvbW1p dExvYWQoKTsKLQotICAgICAgICAvLyBJZiB3ZSBoYXZlIGEgdGl0bGUgbGV0IHRoZSBXZWJWaWV3 IGtub3cgYWJvdXQgaXQuIAotICAgICAgICBpZiAoIXB0aXRsZS5pc051bGwoKSkgCi0gICAgICAg ICAgICBtX2NsaWVudC0+ZGlzcGF0Y2hEaWRSZWNlaXZlVGl0bGUocHRpdGxlKTsgICAgICAgICAK LSAgICB9CiB9CiAKIHZvaWQgRnJhbWVMb2FkZXI6OmNsaWVudFJlZGlyZWN0Q2FuY2VsbGVkT3JG aW5pc2hlZChib29sIGNhbmNlbFdpdGhMb2FkSW5Qcm9ncmVzcykKSW5kZXg6IFdlYktpdC9xdC9D aGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L3F0L0NoYW5nZUxvZwkocmV2aXNpb24gNjc2 NTcpCisrKyBXZWJLaXQvcXQvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTMg QEAKKzIwMTAtMDktMTYgIEphY29iIERpbnUgIDxkaW51LmphY29iQG5va2lhLmNvbT4KKworICAg ICAgICBSZXZpZXdlZCBieSBBZGFtIEJhcnRoLgorCisgICAgICAgIEFkZGVkIGEgbmV3IHF3ZWJw YWdlIHRlc3QgZm9yIGxvYWRpbmcgYSBjYWNoZWQgcGFnZQorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDExNTUKKworICAgICAgICAqIHRlc3RzL3F3ZWJw YWdlL3RzdF9xd2VicGFnZS5jcHA6CisgICAgICAgICh0c3RfUVdlYlBhZ2U6OmxvYWRDYWNoZWRQ YWdlKToKKwogMjAxMC0wOS0xNiAgRGFyaW4gQWRsZXIgIDxkYXJpbkBhcHBsZS5jb20+CiAKICAg ICAgICAgRml4IGJ1aWxkLgpJbmRleDogV2ViS2l0L3F0L3Rlc3RzL3F3ZWJwYWdlL3RzdF9xd2Vi cGFnZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L3F0L3Rlc3RzL3F3ZWJwYWdlL3RzdF9xd2Vi cGFnZS5jcHAJKHJldmlzaW9uIDY3NjIyKQorKysgV2ViS2l0L3F0L3Rlc3RzL3F3ZWJwYWdlL3Rz dF9xd2VicGFnZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTk3LDYgKzk3LDcgQEAgcHJpdmF0ZSBz bG90czoKICAgICB2b2lkIGJhY2tBY3Rpb25VcGRhdGUoKTsKICAgICB2b2lkIGZyYW1lQXQoKTsK ICAgICB2b2lkIHJlcXVlc3RDYWNoZSgpOworICAgIHZvaWQgbG9hZENhY2hlZFBhZ2UoKTsKICAg ICB2b2lkIHByb3RlY3RCaW5kaW5nc1J1bnRpbWVPYmplY3RzRnJvbUNvbGxlY3RvcigpOwogICAg IHZvaWQgbG9jYWxVUkxTY2hlbWVzKCk7CiAgICAgdm9pZCB0ZXN0T3B0aW9uYWxKU09iamVjdHMo KTsKQEAgLTEyODgsNiArMTI4OSwzNyBAQCB2b2lkIHRzdF9RV2ViUGFnZTo6cmVxdWVzdENhY2hl KCkKICAgICAgICAgICAgICAoaW50KVFOZXR3b3JrUmVxdWVzdDo6UHJlZmVyQ2FjaGUpOwogfQog Cit2b2lkIHRzdF9RV2ViUGFnZTo6bG9hZENhY2hlZFBhZ2UoKQoreworICAgIFRlc3RQYWdlIHBh Z2U7CisgICAgUVNpZ25hbFNweSBsb2FkU3B5KCZwYWdlLCBTSUdOQUwobG9hZEZpbmlzaGVkKGJv b2wpKSk7CisgICAgcGFnZS5zZXR0aW5ncygpLT5zZXRNYXhpbXVtUGFnZXNJbkNhY2hlKDMpOwor CisgICAgcGFnZS5tYWluRnJhbWUoKS0+bG9hZChRVXJsKCJkYXRhOnRleHQvaHRtbCxUaGlzIGlz IGZpcnN0IHBhZ2UiKSk7CisKKyAgICBRVFJZX0NPTVBBUkUobG9hZFNweS5jb3VudCgpLCAxKTsK KyAgICBRVFJZX0NPTVBBUkUocGFnZS5uYXZpZ2F0aW9ucy5jb3VudCgpLCAxKTsKKworICAgIFFV cmwgZmlyc3RQYWdlVXJsID0gcGFnZS5tYWluRnJhbWUoKS0+dXJsKCk7CisgICAgcGFnZS5tYWlu RnJhbWUoKS0+bG9hZChRVXJsKCJkYXRhOnRleHQvaHRtbCxUaGlzIGlzIHNlY29uZCBwYWdlIikp OworCisgICAgUVRSWV9DT01QQVJFKGxvYWRTcHkuY291bnQoKSwgMik7CisgICAgUVRSWV9DT01Q QVJFKHBhZ2UubmF2aWdhdGlvbnMuY291bnQoKSwgMik7CisKKyAgICBwYWdlLnRyaWdnZXJBY3Rp b24oUVdlYlBhZ2U6OlN0b3ApOworICAgIFFWRVJJRlkocGFnZS5oaXN0b3J5KCktPmNhbkdvQmFj aygpKTsKKworICAgIFFTaWduYWxTcHkgdXJsU3B5KHBhZ2UubWFpbkZyYW1lKCksIFNJR05BTCh1 cmxDaGFuZ2VkKFFVcmwpKSk7CisgICAgUVZFUklGWSh1cmxTcHkuaXNWYWxpZCgpKTsKKworICAg IHBhZ2UudHJpZ2dlckFjdGlvbihRV2ViUGFnZTo6QmFjayk7CisgICAgOjp3YWl0Rm9yU2lnbmFs KHBhZ2UubWFpbkZyYW1lKCksIFNJR05BTCh1cmxDaGFuZ2VkKFFVcmwpKSk7CisgICAgUUNPTVBB UkUodXJsU3B5LnNpemUoKSwgMSk7CisKKyAgICBRTGlzdDxRVmFyaWFudD4gYXJndW1lbnRzMSA9 IHVybFNweS50YWtlRmlyc3QoKTsKKyAgICBRQ09NUEFSRShhcmd1bWVudHMxLmF0KDApLnRvVXJs KCksIGZpcnN0UGFnZVVybCk7CisKK30KIHZvaWQgdHN0X1FXZWJQYWdlOjpiYWNrQWN0aW9uVXBk YXRlKCkKIHsKICAgICBRV2ViVmlldyB2aWV3Owo= 67839 2010-09-16 13:51:50 -0700 2010-09-20 13:23:28 -0700 Patch with unwanted comments removed 41155.patch text/plain 4587 dinu.jacob SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA2NzY1NykKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTYgQEAKKzIwMTAtMDktMTYgIEphY29iIERpbnUgIDxkaW51LmphY29iQG5va2lh LmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBBZGFtIEJhcnRoLgorCisgICAgICAgIFdoZW4g bG9hZGluZyBhIGNhY2hlZCBwYWdlLCBkaXNwYXRjaERpZENvbW1pdExvYWQgaXMgY2FsbGVkIGFm dGVyIEZyYW1lTG9hZGVyOjpvcGVuIHNvCisgICAgICAgIHRoYXQgYWxsIGluaXRpYWx6YXRpb25z IGFyZSBkb25lIGJlZm9yZSBjYWxsaW5nIGNsaWVudCBkaXNwYXRjaERpZENvbW1pdExvYWQgdG8g YXZvaWQKKyAgICAgICAgY2xpZW50IGZyb20gYWNjZXNzaW5nIGluY29ycmVjdCBkYXRhLgorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDExNTUKKworICAg ICAgICAqIGxvYWRlci9GcmFtZUxvYWRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZUxv YWRlcjo6Y29tbWl0UHJvdmlzaW9uYWxMb2FkKToKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lTG9h ZGVyOjp0cmFuc2l0aW9uVG9Db21taXR0ZWQpOgorCiAyMDEwLTA5LTE2ICBUaG9tYXMgWmFuZGVy IDx0LnphbmRlckBub2tpYS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgQW5kcmVhcyBLbGlu Zy4KSW5kZXg6IFdlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBX ZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5jcHAJKHJldmlzaW9uIDY3NjIyKQorKysgV2ViQ29y ZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xODQ4LDYgKzE4NDgs MTQgQEAgdm9pZCBGcmFtZUxvYWRlcjo6Y29tbWl0UHJvdmlzaW9uYWxMb2FkKAogICAgIGlmIChj YWNoZWRQYWdlICYmIGNhY2hlZFBhZ2UtPmRvY3VtZW50KCkpIHsKICAgICAgICAgcHJlcGFyZUZv ckNhY2hlZFBhZ2VSZXN0b3JlKCk7CiAgICAgICAgIGNhY2hlZFBhZ2UtPnJlc3RvcmUobV9mcmFt ZS0+cGFnZSgpKTsKKworICAgICAgICBkaXNwYXRjaERpZENvbW1pdExvYWQoKTsKKworICAgICAg ICAvLyBJZiB3ZSBoYXZlIGEgdGl0bGUgbGV0IHRoZSBXZWJWaWV3IGtub3cgYWJvdXQgaXQuIAor ICAgICAgICBTdHJpbmcgdGl0bGUgPSBtX2RvY3VtZW50TG9hZGVyLT50aXRsZSgpOworICAgICAg ICBpZiAoIXRpdGxlLmlzTnVsbCgpKSAKKyAgICAgICAgICAgIG1fY2xpZW50LT5kaXNwYXRjaERp ZFJlY2VpdmVUaXRsZSh0aXRsZSk7ICAgICAgICAgCisKICAgICAgICAgY2hlY2tDb21wbGV0ZWQo KTsKICAgICB9IGVsc2UgeyAgICAgICAgCiAgICAgICAgIEtVUkwgdXJsID0gcGRsLT5zdWJzdGl0 dXRlRGF0YSgpLnJlc3BvbnNlVVJMKCk7CkBAIC0xOTI4LDcgKzE5MzYsNiBAQCB2b2lkIEZyYW1l TG9hZGVyOjp0cmFuc2l0aW9uVG9Db21taXR0ZWQoCiAKICAgICAvLyBIYW5kbGUgYWRkaW5nIHRo ZSBVUkwgdG8gdGhlIGJhY2svZm9yd2FyZCBsaXN0LgogICAgIERvY3VtZW50TG9hZGVyKiBkbCA9 IG1fZG9jdW1lbnRMb2FkZXIuZ2V0KCk7Ci0gICAgU3RyaW5nIHB0aXRsZSA9IGRsLT50aXRsZSgp OyAKIAogICAgIHN3aXRjaCAobV9sb2FkVHlwZSkgewogICAgICAgICBjYXNlIEZyYW1lTG9hZFR5 cGVGb3J3YXJkOgpAQCAtMjAwNSwxNCArMjAxMiw2IEBAIHZvaWQgRnJhbWVMb2FkZXI6OnRyYW5z aXRpb25Ub0NvbW1pdHRlZCgKIAogICAgIGlmICghbV9jbGllbnQtPmhhc0hUTUxWaWV3KCkpCiAg ICAgICAgIHJlY2VpdmVkRmlyc3REYXRhKCk7Ci0gICAgZWxzZSBpZiAoY2FjaGVkUGFnZSkgewot ICAgICAgICAvLyBGb3Igbm9uLWNhY2hlZCBIVE1MIHBhZ2VzLCB0aGVzZSBtZXRob2RzIGFyZSBj YWxsZWQgaW4gcmVjZWl2ZWRGaXJzdERhdGEoKS4KLSAgICAgICAgZGlzcGF0Y2hEaWRDb21taXRM b2FkKCk7Ci0KLSAgICAgICAgLy8gSWYgd2UgaGF2ZSBhIHRpdGxlIGxldCB0aGUgV2ViVmlldyBr bm93IGFib3V0IGl0LiAKLSAgICAgICAgaWYgKCFwdGl0bGUuaXNOdWxsKCkpIAotICAgICAgICAg ICAgbV9jbGllbnQtPmRpc3BhdGNoRGlkUmVjZWl2ZVRpdGxlKHB0aXRsZSk7ICAgICAgICAgCi0g ICAgfQogfQogCiB2b2lkIEZyYW1lTG9hZGVyOjpjbGllbnRSZWRpcmVjdENhbmNlbGxlZE9yRmlu aXNoZWQoYm9vbCBjYW5jZWxXaXRoTG9hZEluUHJvZ3Jlc3MpCkluZGV4OiBXZWJLaXQvcXQvQ2hh bmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9xdC9DaGFuZ2VMb2cJKHJldmlzaW9uIDY3NjU3 KQorKysgV2ViS2l0L3F0L0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDEzIEBA CisyMDEwLTA5LTE2ICBKYWNvYiBEaW51ICA8ZGludS5qYWNvYkBub2tpYS5jb20+CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgQWRhbSBCYXJ0aC4KKworICAgICAgICBBZGRlZCBhIG5ldyBxd2VicGFn ZSB0ZXN0IGZvciBsb2FkaW5nIGEgY2FjaGVkIHBhZ2UKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQxMTU1CisKKyAgICAgICAgKiB0ZXN0cy9xd2VicGFn ZS90c3RfcXdlYnBhZ2UuY3BwOgorICAgICAgICAodHN0X1FXZWJQYWdlOjpsb2FkQ2FjaGVkUGFn ZSk6CisKIDIwMTAtMDktMTYgIERhcmluIEFkbGVyICA8ZGFyaW5AYXBwbGUuY29tPgogCiAgICAg ICAgIEZpeCBidWlsZC4KSW5kZXg6IFdlYktpdC9xdC90ZXN0cy9xd2VicGFnZS90c3RfcXdlYnBh Z2UuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9xdC90ZXN0cy9xd2VicGFnZS90c3RfcXdlYnBh Z2UuY3BwCShyZXZpc2lvbiA2NzYyMikKKysrIFdlYktpdC9xdC90ZXN0cy9xd2VicGFnZS90c3Rf cXdlYnBhZ2UuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC05Nyw2ICs5Nyw3IEBAIHByaXZhdGUgc2xv dHM6CiAgICAgdm9pZCBiYWNrQWN0aW9uVXBkYXRlKCk7CiAgICAgdm9pZCBmcmFtZUF0KCk7CiAg ICAgdm9pZCByZXF1ZXN0Q2FjaGUoKTsKKyAgICB2b2lkIGxvYWRDYWNoZWRQYWdlKCk7CiAgICAg dm9pZCBwcm90ZWN0QmluZGluZ3NSdW50aW1lT2JqZWN0c0Zyb21Db2xsZWN0b3IoKTsKICAgICB2 b2lkIGxvY2FsVVJMU2NoZW1lcygpOwogICAgIHZvaWQgdGVzdE9wdGlvbmFsSlNPYmplY3RzKCk7 CkBAIC0xMjg4LDYgKzEyODksMzcgQEAgdm9pZCB0c3RfUVdlYlBhZ2U6OnJlcXVlc3RDYWNoZSgp CiAgICAgICAgICAgICAgKGludClRTmV0d29ya1JlcXVlc3Q6OlByZWZlckNhY2hlKTsKIH0KIAor dm9pZCB0c3RfUVdlYlBhZ2U6OmxvYWRDYWNoZWRQYWdlKCkKK3sKKyAgICBUZXN0UGFnZSBwYWdl OworICAgIFFTaWduYWxTcHkgbG9hZFNweSgmcGFnZSwgU0lHTkFMKGxvYWRGaW5pc2hlZChib29s KSkpOworICAgIHBhZ2Uuc2V0dGluZ3MoKS0+c2V0TWF4aW11bVBhZ2VzSW5DYWNoZSgzKTsKKwor ICAgIHBhZ2UubWFpbkZyYW1lKCktPmxvYWQoUVVybCgiZGF0YTp0ZXh0L2h0bWwsVGhpcyBpcyBm aXJzdCBwYWdlIikpOworCisgICAgUVRSWV9DT01QQVJFKGxvYWRTcHkuY291bnQoKSwgMSk7Cisg ICAgUVRSWV9DT01QQVJFKHBhZ2UubmF2aWdhdGlvbnMuY291bnQoKSwgMSk7CisKKyAgICBRVXJs IGZpcnN0UGFnZVVybCA9IHBhZ2UubWFpbkZyYW1lKCktPnVybCgpOworICAgIHBhZ2UubWFpbkZy YW1lKCktPmxvYWQoUVVybCgiZGF0YTp0ZXh0L2h0bWwsVGhpcyBpcyBzZWNvbmQgcGFnZSIpKTsK KworICAgIFFUUllfQ09NUEFSRShsb2FkU3B5LmNvdW50KCksIDIpOworICAgIFFUUllfQ09NUEFS RShwYWdlLm5hdmlnYXRpb25zLmNvdW50KCksIDIpOworCisgICAgcGFnZS50cmlnZ2VyQWN0aW9u KFFXZWJQYWdlOjpTdG9wKTsKKyAgICBRVkVSSUZZKHBhZ2UuaGlzdG9yeSgpLT5jYW5Hb0JhY2so KSk7CisKKyAgICBRU2lnbmFsU3B5IHVybFNweShwYWdlLm1haW5GcmFtZSgpLCBTSUdOQUwodXJs Q2hhbmdlZChRVXJsKSkpOworICAgIFFWRVJJRlkodXJsU3B5LmlzVmFsaWQoKSk7CisKKyAgICBw YWdlLnRyaWdnZXJBY3Rpb24oUVdlYlBhZ2U6OkJhY2spOworICAgIDo6d2FpdEZvclNpZ25hbChw YWdlLm1haW5GcmFtZSgpLCBTSUdOQUwodXJsQ2hhbmdlZChRVXJsKSkpOworICAgIFFDT01QQVJF KHVybFNweS5zaXplKCksIDEpOworCisgICAgUUxpc3Q8UVZhcmlhbnQ+IGFyZ3VtZW50czEgPSB1 cmxTcHkudGFrZUZpcnN0KCk7CisgICAgUUNPTVBBUkUoYXJndW1lbnRzMS5hdCgwKS50b1VybCgp LCBmaXJzdFBhZ2VVcmwpOworCit9CiB2b2lkIHRzdF9RV2ViUGFnZTo6YmFja0FjdGlvblVwZGF0 ZSgpCiB7CiAgICAgUVdlYlZpZXcgdmlldzsK