33179 2010-01-04 12:50:03 -0800 [Qt] Enterkey to go to Newline does not work in the text area(in HTML form) 2011-05-20 05:48:57 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) S60 Hardware S60 3rd edition RESOLVED FIXED Qt, QtTriaged P1 Blocker --- 57472 1 vikram.malaiya koshuin abarth ademar arendjr benjamin cmarcelo commit-queue cshu eric hausmann joel.parks kenneth koshuin laszlo.gombos luiz max.hong.shen menard suresh.voruganti tonikitoo webkit-ews webkit.review.bot oldest_to_newest 176818 0 vikram.malaiya 2010-01-04 12:50:03 -0800 STEPS TO REPRODUCE: 1.Open browser and Load http://waplabdc.nokia-boston.com/browser/users/diana/inputtest.html 2.Enter text in the textarea and press the enter key to go to new line. ACTUAL RESULTS: The enter key does not lead to newline EXPECTED RESULTS: Hitting the enter key should lead to the newline within the textarea Internally linked to - https://qtrequirements.europe.nokia.com/browse/BR-974 189268 1 48471 sakari.peltomaki 2010-02-10 00:33:25 -0800 Created attachment 48471 patch 189269 2 webkit.review.bot 2010-02-10 00:34:28 -0800 Attachment 48471 did not pass style-queue: Failed to run "WebKitTools/Scripts/check-webkit-style" exit_code: 1 WebKit/qt/WebCoreSupport/EditorClientQt.cpp:385: A case label should not be indented, but line up with its switch statement. [whitespace/indent] [4] WebKit/qt/WebCoreSupport/EditorClientQt.cpp:384: Missing space before ( in switch( [whitespace/parens] [5] WebKit/qt/WebCoreSupport/EditorClientQt.cpp:384: Missing space before { [whitespace/braces] [5] WebKit/qt/WebCoreSupport/EditorClientQt.cpp:392: Tab found; better to use spaces [whitespace/tab] [1] WebKit/qt/WebCoreSupport/EditorClientQt.cpp:393: An else should appear on the same line as the preceding } [whitespace/newline] [4] Total errors found: 5 If any of these errors are false positives, please file a bug against check-webkit-style. 189292 3 48477 sakari.peltomaki 2010-02-10 02:05:46 -0800 Created attachment 48477 patch 189293 4 sakari.peltomaki 2010-02-10 02:06:36 -0800 Added switch / case with two editor handling cases. WebCoreSupport\EditorClientQt.cpp (EditorClientQt::handleKeyboardEvent) 189295 5 webkit.review.bot 2010-02-10 02:11:53 -0800 Attachment 48477 did not pass style-queue: Failed to run "WebKitTools/Scripts/check-webkit-style" exit_code: 1 WebKit/qt/WebCoreSupport/EditorClientQt.cpp:391: Non-label code inside switch statements should be indented. [whitespace/indent] [4] Total errors found: 1 If any of these errors are false positives, please file a bug against check-webkit-style. 189296 6 48478 sakari.peltomaki 2010-02-10 02:22:11 -0800 Created attachment 48478 patch 189297 7 sakari.peltomaki 2010-02-10 02:24:07 -0800 Added switch / case with two editor handling cases. WebCoreSupport\EditorClientQt.cpp (EditorClientQt::handleKeyboardEvent) 189459 8 hausmann 2010-02-10 13:34:57 -0800 This code has been fragile in the past. Could you provide a layout test with it? I'm worried about introducing regressions here... 189580 9 tonikitoo 2010-02-10 19:14:38 -0800 (In reply to comment #7) > Added switch / case with two editor handling cases. > WebCoreSupport\EditorClientQt.cpp (EditorClientQt::handleKeyboardEvent) typos: "+ // Added two case for enter handling used in text editor. E.g. creates new line in multi line editor, + // or starts search if enter is presses in google's text editor field. if (cmd && frame->editor()->command(cmd).isTextInsertion() " * two caseS * is presseD maybe the whole comments needs better English. content LGTM 189649 10 kenneth 2010-02-11 04:15:30 -0800 "+ // Added two case for enter handling used in text editor. E.g. creates new line in multi line editor, + // or starts search if enter is presses in google's text editor field. // Add two special cases for Enter key: // 1) When in multiline editor, Enter release creates a newline. // 2) When in Google's text editor (link pleease!), make Enter start a search Something like that? 190421 11 48478 hausmann 2010-02-15 03:56:39 -0800 Comment on attachment 48478 patch I'm okay with this change, but I'd really like to see an automated layout or unit test for this issue, so avoid this regressing. A link to a nokia-internal website is not sufficient. 196503 12 vestbo 2010-03-05 09:39:40 -0800 Please follow the QtWebKit bug reporting guidelines when reporting bugs. See http://trac.webkit.org/wiki/QtWebKitBugs Specifically: - The 'QtWebKit' component should be used for bugs/features in the public QtWebKit API layer, not to signify that the bug is specific to the Qt port of WebKit http://trac.webkit.org/wiki/QtWebKitBugs#Component 347258 13 arendjr 2011-02-08 03:24:46 -0800 Sir, I just noticed I reported a similar bug (#52572) and I'm a little bit disappointed that a patch from a year ago apparently is not being committed. From what I understand the only reason for not committing is the absence of an automated test. Now I admit I don't know how thorough your tests are, but this bug is only reproducible on Symbian while interacting with the keyboard and therefore very hard to replicate in a test environment. Is it really worthwhile to wait with committing while users are actually complaining about this? 347262 14 koshuin 2011-02-08 03:53:01 -0800 Hi, if you want to continue with this issue it would be excellent. I wasn't sure if the issue existed anymore as nobody has complained and we have changed how Qt inputcontext works. Can you reproduce this using QtSDK 1.1 TP ? Clearing assignment flag. Sakari hasn't worked with webkit for a year now.. I'll close the other issue as duplicate. 347266 15 koshuin 2011-02-08 03:54:36 -0800 *** Bug 52572 has been marked as a duplicate of this bug. *** 347294 16 arendjr 2011-02-08 05:37:28 -0800 I just installed QtSDK 1.1 TP, installed Qt 4.7.1 and Qt 4.7.1 WebKit to my phone and recompiled my application using the new SDK. Unfortunately, I can still reproduce the bug. I did notice one difference with before (apart from some WebKit rendering issues compared to Qt 4.6), which is that the latest character you're typing stays highlighted (like an override cursor) until the entry times out and the character is fixed. It's no more than a cosmetic change though :) Btw, I'm not sure if this is valuable to this bugreport, but apart from the inability to enter newlines, auto-capitalization also doesn't work in QtWebKit, whereas it does in the native browser. 347315 17 koshuin 2011-02-08 06:23:22 -0800 Thanks for the reproduce effort. Auto-capitalization doesn't work and is a known issue. I recall we had to disable it for some reason... maybe it is time to try to enable it again. Underlining is precommit string at work. It should show only if you use T9 or having a language that uses characters to represent syllables. 347318 18 arendjr 2011-02-08 06:26:01 -0800 One more note regarding Qt 4.7.1 WebKit on the N8. I just noticed that when trying to enter something into a password field, the first character will keep adding "stars" for every keypress, even when the final character was not yet selected. For example, if I have to type "3", I have to hit the 3 key 4 times. However, the keyboard will write "def3" instead of "3". (At least that's what I think it does, since the password field will only show "****" instead of "*") Imho, this is quite a serious regression as it will become virtually impossible to enter correct passwords. Should I create a new bug for this? 347321 19 arendjr 2011-02-08 06:35:05 -0800 @Janne: Regarding the auto-capitalization, I found the following commit: http://gitorious.org/webkit/qtwebkit/commit/9036178 So yes, it does appear to be disabled on purpose. However, I think I read (can't find the link for that anymore :( ) this was done because you don't want auto-capitalization in password fields. Looking at the source in question: webPageClient->setInputMethodHint(Qt::ImhHiddenText, isPasswordField); #if defined(Q_WS_MAEMO_5) || defined(Q_OS_SYMBIAN) // disables auto-uppercase and predictive text for mobile devices webPageClient->setInputMethodHint(Qt::ImhNoAutoUppercase, true); webPageClient->setInputMethodHint(Qt::ImhNoPredictiveText, true); #endif // Q_WS_MAEMO_5 || Q_OS_SYMBIAN I think this should then become: webPageClient->setInputMethodHint(Qt::ImhHiddenText, isPasswordField); #if defined(Q_WS_MAEMO_5) || defined(Q_OS_SYMBIAN) if (isPasswordField) { // disables auto-uppercase and predictive text in password fields for mobile devices webPageClient->setInputMethodHint(Qt::ImhNoAutoUppercase, true); webPageClient->setInputMethodHint(Qt::ImhNoPredictiveText, true); } #endif // Q_WS_MAEMO_5 || Q_OS_SYMBIAN Unfortunately I cannot easily compile and install a custom QtWebKit on my phone, otherwise I could try for myself... 347346 20 koshuin 2011-02-08 07:11:23 -0800 (In reply to comment #18) > One more note regarding Qt 4.7.1 WebKit on the N8. I just noticed that when trying to enter something into a password field, the first character will keep adding "stars" for every keypress, even when the final character was not yet selected. Starring without character echo is Bug 32509 > Imho, this is quite a serious regression as it will become virtually impossible to enter correct passwords. Should I create a new bug for this? That has been fixed already. I think it was part of Bug 49787 . >you don't want auto-capitalization in password field Which we still don't want. there was something else... Let's keep this bug report about the Newline issue. For discussion there is mail lists you can and should join, see http://lists.webkit.org/mailman/listinfo 348118 21 benjamin 2011-02-09 03:05:47 -0800 Janne, I raise as P1 because that looks like pretty bad bug. If it is not as important as it looks, please reset the priority to P2. 348838 22 koshuin 2011-02-09 23:53:51 -0800 (In reply to comment #21) > Janne, I raise as P1 because that looks like pretty bad bug. It is what it is. Without the fix you can't add newline on this comment box. So yeah, all forums, feedback forms etc. are affected. 350641 23 suresh.voruganti 2011-02-14 06:57:37 -0800 (In reply to comment #22) > (In reply to comment #21) > > Janne, I raise as P1 because that looks like pretty bad bug. > It is what it is. Without the fix you can't add newline on this comment box. So yeah, all forums, feedback forms etc. are affected. @Janne, are you working on this bug? 350649 24 suresh.voruganti 2011-02-14 07:19:44 -0800 Adding to Qtwebkit 2.1 Master bug. 353138 25 ademar 2011-02-17 13:12:01 -0800 (In reply to comment #23) > (In reply to comment #22) > > (In reply to comment #21) > > > Janne, I raise as P1 because that looks like pretty bad bug. > > It is what it is. Without the fix you can't add newline on this comment box. So yeah, all forums, feedback forms etc. are affected. > > @Janne, are you working on this bug? The 2.1 window is about to close. Janne? 353457 26 koshuin 2011-02-18 00:09:39 -0800 > The 2.1 window is about to close. Janne? Ok, I'll take a look at it. I have a gut feeling that this might be fixable in Qt instead of QtWebkit. Maybe the patch could be applied as OS(SYMBIAN) only. I find it very odd that other systems are not affected by this, indicating to Qt inputcontext being wrong in Symbian... Which is where I base my assumption. 355596 27 suresh.voruganti 2011-02-22 14:17:36 -0800 (In reply to comment #26) > > The 2.1 window is about to close. Janne? > > Ok, I'll take a look at it. I have a gut feeling that this might be fixable in Qt instead of QtWebkit. > > Maybe the patch could be applied as OS(SYMBIAN) only. I find it very odd that other systems are not affected by this, indicating to Qt inputcontext being wrong in Symbian... Which is where I base my assumption. Can we assume that you are fixing in Qt? 356067 28 koshuin 2011-02-23 06:47:44 -0800 Created new task to Qt that I found when investigating this http://bugreports.qt.nokia.com/browse/QTBUG-17639 Patches listed here won't work fully. We are missing few microfocus changes somewhere. One weird thing is that if input field already contains text the caret position and text insertion position are offset by the amount of text i.e. caret doesn't know there is text and insertion does. 359038 29 suresh.voruganti 2011-02-28 07:30:39 -0800 As this issue is getting fixed in Qt, removing the block for Qtwebkit 2.1. 359082 30 koshuin 2011-02-28 08:37:24 -0800 (In reply to comment #29) > As this issue is getting fixed in Qt, removing the block for Qtwebkit 2.1. No it ain't. This still needs a fix here. There is a API design issue in Qt that the report is about. I'll post a fix to this tomorrow that will still need to be done. Sorry, if I mislead you. 359097 31 suresh.voruganti 2011-02-28 09:03:48 -0800 (In reply to comment #30) > (In reply to comment #29) > > As this issue is getting fixed in Qt, removing the block for Qtwebkit 2.1. > > No it ain't. This still needs a fix here. There is a API design issue in Qt that the report is about. I'll post a fix to this tomorrow that will still need to be done. Sorry, if I mislead you. Thank you. I have added this error back to Qtwebkit 2.1 master bug 359862 32 84225 koshuin 2011-03-01 06:47:53 -0800 Created attachment 84225 patch reworked to 2.1 Adding reworked patch here. I'll add tests and stuff and make a proper one once I get past that QWebPage autotests crash on Symbian. This patch due how Qt behaves will not show lines in VKB i.e. everything gets drawn on to same line. underlying textarea will get the newlines and characters correctly. It is even more trouble as there is one more bug that doesn't clear the lines and since caret is not inline with text insertion it is really hard to see from sea of old characters what you are typing. 361655 33 ademar 2011-03-03 09:01:52 -0800 Janne, do you plan to submit a patch for trunk? 2.1 should receive cherry-picks or backports after the patch is submited to trunk, not before. 361825 34 koshuin 2011-03-03 12:22:39 -0800 (In reply to comment #33) > Janne, do you plan to submit a patch for trunk? 2.1 should receive cherry-picks or backports after the patch is submited to trunk, not before. Yes. I started setting up environment where I can build trunk so I can create that patch. It takes ~10 hours to get the environment so I should have it by tomorrow. 364126 35 joel.parks 2011-03-08 13:13:00 -0800 this error is on the QtWebKit 2.1 Top error list and on the QtWebKit 2.1.x Top error list. Janne if you have an ETA(LE) it would be appreciated. 365072 36 85303 koshuin 2011-03-10 03:19:59 -0800 Created attachment 85303 Patch for trunk Patch for trunk inclusion. Tested on Nokia N8 and Nokia E7. Additional test run in WinXP to see that the patch is needed there as well. I can mark this Symbian only if we want to avoid possible regressions that this will cause. 365075 37 webkit.review.bot 2011-03-10 03:22:54 -0800 Attachment 85303 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/WebCoreSupport/EditorClientQt.cpp:539: A case label should not be indented, but line up with its switch statement. [whitespace/indent] [4] Source/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp:2121: Should have a space between // and comment [whitespace/comments] [4] Source/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp:2124: Tab found; better to use spaces [whitespace/tab] [1] Source/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp:2125: Tab found; better to use spaces [whitespace/tab] [1] Source/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp:2140: Should have a space between // and comment [whitespace/comments] [4] Total errors found: 5 in 3 files If any of these errors are false positives, please file a bug against check-webkit-style. 365077 38 85305 koshuin 2011-03-10 03:27:15 -0800 Created attachment 85305 Patch for trunk2 Copy/paste fail 365079 39 webkit.review.bot 2011-03-10 03:32:21 -0800 Attachment 85305 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/WebCoreSupport/EditorClientQt.cpp:539: A case label should not be indented, but line up with its switch statement. [whitespace/indent] [4] Source/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp:2121: Should have a space between // and comment [whitespace/comments] [4] Source/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp:2124: Tab found; better to use spaces [whitespace/tab] [1] Source/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp:2125: Tab found; better to use spaces [whitespace/tab] [1] Source/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp:2140: Should have a space between // and comment [whitespace/comments] [4] Total errors found: 5 in 3 files If any of these errors are false positives, please file a bug against check-webkit-style. 365081 40 85306 koshuin 2011-03-10 03:39:05 -0800 Created attachment 85306 Patch for trunk3 And style fixed <sigh> :) Related note: Why does check-webkit-style try to download irclib? Because of this download the script fails on my machine. 365083 41 webkit.review.bot 2011-03-10 03:41:03 -0800 Attachment 85306 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/WebCoreSupport/EditorClientQt.cpp:539: A case label should not be indented, but line up with its switch statement. [whitespace/indent] [4] Total errors found: 1 in 3 files If any of these errors are false positives, please file a bug against check-webkit-style. 365085 42 webkit-ews 2011-03-10 03:52:59 -0800 Attachment 85303 did not build on qt: Build output: http://queues.webkit.org/results/8125019 365099 43 85308 koshuin 2011-03-10 04:25:53 -0800 Created attachment 85308 Patch for trunk4 Not my day obviously :) 365109 44 85311 koshuin 2011-03-10 05:11:44 -0800 Created attachment 85311 QtWebkit2.1 backport Backport added. I'll run some additional (manual) testing in platforms that I have access to. I won't be at office tomorrow so replies to inquiries on Monday (latest). Just FYI as there were a lot of people asking about this and other stuff. Hah, putting OoO messages into bugzilla :) 366045 45 cmarcelo 2011-03-11 09:28:57 -0800 (In reply to comment #44) > Created an attachment (id=85311) [details] > QtWebkit2.1 backport > > Backport added. I'll run some additional (manual) testing in platforms that I have access to. Ok, then we are not integrating this now to 2.1, please let us know when it's ready. And I think you missed the cq? on the patch for trunk4. 367657 46 koshuin 2011-03-15 07:47:16 -0700 (In reply to comment #45) > (In reply to comment #44) > > Created an attachment (id=85311) [details] [details] > > QtWebkit2.1 backport > > > > Backport added. I'll run some additional (manual) testing in platforms that I have access to. > > Ok, then we are not integrating this now to 2.1, please let us know when it's ready. > > And I think you missed the cq? on the patch for trunk4. Since it is reviewed and no further comments then let's put it in and see if it works on all OSes. Not having it in 2.1 means there is not much testing done on Symbian side. 367939 47 luiz 2011-03-15 14:17:33 -0700 Patch added to 2.1 as 4c627893fc0270728804e185a15245b59e508de9, merged into 2.1.x as well. 375223 48 85308 kling 2011-03-29 05:58:16 -0700 Comment on attachment 85308 Patch for trunk4 View in context: https://bugs.webkit.org/attachment.cgi?id=85308&action=review > Source/WebKit/qt/WebCoreSupport/EditorClientQt.cpp:541 > + case QWebPage::InsertLineSeparator: > + m_page->triggerAction(action); Missing break; statement here. 375228 49 menard 2011-03-29 06:04:55 -0700 Committed r82238: <http://trac.webkit.org/changeset/82238> 375231 50 menard 2011-03-29 06:05:53 -0700 (In reply to comment #48) > (From update of attachment 85308 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=85308&action=review > > > Source/WebKit/qt/WebCoreSupport/EditorClientQt.cpp:541 > > + case QWebPage::InsertLineSeparator: > > + m_page->triggerAction(action); > > Missing break; statement here. The patch I landed contains it, lord Kling. 375246 51 webkit.review.bot 2011-03-29 06:21:27 -0700 http://trac.webkit.org/changeset/82238 might have broken Qt Linux Release minimal 375251 52 menard 2011-03-29 06:26:45 -0700 (In reply to comment #51) > http://trac.webkit.org/changeset/82238 might have broken Qt Linux Release minimal Fix is on the way 375256 53 menard 2011-03-29 06:38:01 -0700 (In reply to comment #52) > (In reply to comment #51) > > http://trac.webkit.org/changeset/82238 might have broken Qt Linux Release minimal > > Fix is on the way Landed http://trac.webkit.org/changeset/82243 383167 54 max.hong.shen 2011-04-11 07:58:07 -0700 It seems this patch has caused a regression issue on Linux, which sends onsearch events twice. (https://bugs.webkit.org/show_bug.cgi?id=57472) This bug (enterkey to go to newline doesn't work) is only reproducible on Symbian, and the root cause is that, when user presses on the enter key through the virtual Keyboard on Symbian, a QKeyEvent WITHOUT text gets fired to the QWebPage, just like below, QKeyEvent keyEnter(QEvent::KeyPress, Qt::Key_Enter, Qt::NoModifier); page->event(&keyEnter); However, the problem is that WebKit's EventHandler requires the keyEnter event contains a text "\r" or "\n", if you want to insert a newline. Otherwise, this insertNewLine request won't be handled. PlatformKeyboardEvent keyPressEvent = initialKeyEvent; if (keyPressEvent.text().isEmpty()) return keydownResult; ... node->dispatchEvent(keypress, ec); // insert new line here If we look back the Linux, things are a little different. When user presses the enter key through the keyboard, a QKeyEvent WITH text "\r" gets fired to the QWebPage as below, QKeyEvent keyEnter(QEvent::KeyPress, Qt::Key_Enter, Qt::NoModifier, "\r"); page->event(&keyEnter); Then, everything works fine - a new line gets inserted to the text area. The problem for the patch is that, on linux, two new lines get inserted when user clicks the enter key since the generated keyevent contains "\r". bool EventHandler::keyEvent(const PlatformKeyboardEvent& initialKeyEvent){ ... m_frame->editor()->handleInputMethodKeydown(keydown.get()); // insert first new line PlatformKeyboardEvent keyPressEvent = initialKeyEvent; if (keyPressEvent.text().isEmpty()) return keydownResult; ... node->dispatchEvent(keypress, ec); // insert second new line here! ... } This also can explain why it causes the regression -- the onsearch event gets fire twice for the same reason. 383172 55 max.hong.shen 2011-04-11 08:03:36 -0700 Again, since this is a symbian only bug. It can be either fixed on Qt-symbian side by sending a QKeyEvent with text info when user presses the enter key on VKB, or fix it on qtwebkit side. Following is how the qtwebkit patch looks like, I will add the patch for review after I finish the test. Index: Source/WebKit/qt/Api/qwebpage.cpp =================================================================== --- Source/WebKit/qt/Api/qwebpage.cpp (revision 83440) +++ Source/WebKit/qt/Api/qwebpage.cpp (working copy) @@ -929,6 +929,9 @@ void QWebPagePrivate::keyPressEvent(QKey else q->triggerAction(QWebPage::Back); break; + case Qt::Key_Enter: + q->triggerAction(editorActionForKeyEvent(ev)); + break; default: handled = false; break; 383185 56 89012 max.hong.shen 2011-04-11 08:48:44 -0700 Created attachment 89012 Allows QtWebKit to insert a new line for a enter key event without key text. I think it makes sense that qtwebkit can insert a new line for a enter key event which has no text. 387778 57 89012 eric 2011-04-18 09:16:22 -0700 Comment on attachment 89012 Allows QtWebKit to insert a new line for a enter key event without key text. Cleared review? from attachment 89012 so that this bug does not appear in http://webkit.org/pending-review. If you would like this patch reviewed, please attach it to a new bug (or re-open this bug before marking it for review again). 390780 58 max.hong.shen 2011-04-22 08:17:08 -0700 The patch has introduced a new bug in Linux (two newlines get inserted when press enter key each time), which needs to be addressed ASAP. 390781 59 90708 max.hong.shen 2011-04-22 08:18:03 -0700 Created attachment 90708 proposed fix 390790 60 90709 max.hong.shen 2011-04-22 08:35:58 -0700 Created attachment 90709 proposed fix 391045 61 90709 tonikitoo 2011-04-22 14:10:45 -0700 Comment on attachment 90709 proposed fix No test? 391845 62 max.hong.shen 2011-04-25 11:44:50 -0700 (In reply to comment #61) > (From update of attachment 90709 [details]) > No test? Just reuse the test added by Janne's patch. See tst_QWebPage::inputMethods() in https://bug-33179-attachments.webkit.org/attachment.cgi?id=85308 392155 63 tonikitoo 2011-04-25 17:24:26 -0700 (In reply to comment #62) > (In reply to comment #61) > > (From update of attachment 90709 [details] [details]) > > No test? > > Just reuse the test added by Janne's patch. See tst_QWebPage::inputMethods() in https://bug-33179-attachments.webkit.org/attachment.cgi?id=85308 Well, it seems these tests did not cover your problem. We should improve it, or it can happen again in the future. Or make it explicit in the changelog why no tests are being added. 392426 64 max.hong.shen 2011-04-26 07:02:14 -0700 (In reply to comment #63) > (In reply to comment #62) > > (In reply to comment #61) > > > (From update of attachment 90709 [details] [details] [details]) > > > No test? > > > > Just reuse the test added by Janne's patch. See tst_QWebPage::inputMethods() in https://bug-33179-attachments.webkit.org/attachment.cgi?id=85308 > > Well, it seems these tests did not cover your problem. We should improve it, or it can happen again in the future. Or make it explicit in the changelog why no tests are being added. You are right, Antonio:) I will add a new test for it. 392550 65 91124 max.hong.shen 2011-04-26 10:24:08 -0700 Created attachment 91124 add more tests 404454 66 cshu 2011-05-16 07:20:51 -0700 I have two comments here: 1. The missing key text can be filled in function keyTextForKeyEvent in file WebCore/platform/qt/PlatformKeyboardEventQt.cpp. Then we don't need the code in qwebpage.cpp and EditorClientQt.cpp. 2. There should be some existing layout tests that are skipped for Qt due to this bug. It would be good to find them out and unskip them. 404505 67 93648 max.hong.shen 2011-05-16 08:50:33 -0700 Created attachment 93648 updated with Chang's comments 404507 68 cshu 2011-05-16 08:57:16 -0700 LGTM. You need to find a reviewer then. :) 404532 69 93648 kenneth 2011-05-16 09:49:32 -0700 Comment on attachment 93648 updated with Chang's comments View in context: https://bugs.webkit.org/attachment.cgi?id=93648&action=review > Source/WebKit/qt/WebCoreSupport/EditorClientQt.cpp:-549 > -void EditorClientQt::handleInputMethodKeydown(KeyboardEvent* event) > +void EditorClientQt::handleInputMethodKeydown(KeyboardEvent*) > { > -#ifndef QT_NO_SHORTCUT > - const PlatformKeyboardEvent* kevent = event->keyEvent(); > - if (kevent->type() == PlatformKeyboardEvent::RawKeyDown) { > - QWebPage::WebAction action = QWebPagePrivate::editorActionForKeyEvent(kevent->qtEvent()); > - switch (action) { > - case QWebPage::InsertParagraphSeparator: > - case QWebPage::InsertLineSeparator: > - m_page->triggerAction(action); > - break; > - default: > - break; > - } > - } > -#endif The changelog doesnt explain why this was done. 404566 70 93664 max.hong.shen 2011-05-16 10:19:20 -0700 Created attachment 93664 updated Changelog 405832 71 93664 kling 2011-05-18 10:51:16 -0700 Comment on attachment 93664 updated Changelog View in context: https://bugs.webkit.org/attachment.cgi?id=93664&action=review LGTM, apart from... > Source/WebCore/platform/qt/PlatformKeyboardEventQt.cpp:590 > case Qt::Key_Backtab: > if (event->text().isNull()) > return "\t"; > + case Qt::Key_Enter: > + if (event->text().isNull()) > + return "\r"; Missing break statement before the Qt::Key_Enter case. 405836 72 cshu 2011-05-18 10:53:46 -0700 (In reply to comment #71) > (From update of attachment 93664 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=93664&action=review > > LGTM, apart from... > > > Source/WebCore/platform/qt/PlatformKeyboardEventQt.cpp:590 > > case Qt::Key_Backtab: > > if (event->text().isNull()) > > return "\t"; > > + case Qt::Key_Enter: > > + if (event->text().isNull()) > > + return "\r"; > > Missing break statement before the Qt::Key_Enter case. Gah, the return statement tricked me, too. 405934 73 93963 max.hong.shen 2011-05-18 12:20:02 -0700 Created attachment 93963 fix the issue found by kling 406050 74 93963 commit-queue 2011-05-18 15:11:07 -0700 Comment on attachment 93963 fix the issue found by kling Clearing flags on attachment: 93963 Committed r86798: <http://trac.webkit.org/changeset/86798> 406602 75 ademar 2011-05-19 13:20:26 -0700 I'm a bit lost between bug 57472 and this one... What's still missing to have them closed? 406655 76 max.hong.shen 2011-05-19 14:35:03 -0700 I closed it :-) 407012 77 ademar 2011-05-20 05:46:14 -0700 Revision r86798 cherry-picked into qtwebkit-2.2 with commit fb119b5 <http://gitorious.org/webkit/qtwebkit/commit/fb119b5> 48471 2010-02-10 00:33:25 -0800 2010-02-10 02:05:46 -0800 patch patch.txt text/plain 2349 sakari.peltomaki ZGlmZiAtLWdpdCBhL1dlYktpdC9xdC9XZWJDb3JlU3VwcG9ydC9FZGl0b3JDbGllbnRRdC5jcHAg Yi9XZWJLaXQvcXQvV2ViQ29yZVN1cHBvcnQvRWRpdG9yQ2xpZW50UXQuY3BwDQppbmRleCA5MGVi YjFkLi45ZjhiYjM0IDEwMDY0NA0KLS0tIGEvV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0L0VkaXRv ckNsaWVudFF0LmNwcA0KKysrIGIvV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0L0VkaXRvckNsaWVu dFF0LmNwcA0KQEAgLTM3NiwxMSArMzc2LDIyIEBAIHZvaWQgRWRpdG9yQ2xpZW50UXQ6OmhhbmRs ZUtleWJvYXJkRXZlbnQoS2V5Ym9hcmRFdmVudCogZXZlbnQpDQogICAgICAgICAgICAgLy8gV2Vi S2l0IGRvZXNuJ3QgaGF2ZSBlbm91Z2ggaW5mb3JtYXRpb24gYWJvdXQgbW9kZSB0byBkZWNpZGUg aG93IGNvbW1hbmRzIHRoYXQganVzdCBpbnNlcnQgdGV4dCBpZiBleGVjdXRlZCB2aWEgRWRpdG9y IHNob3VsZCBiZSB0cmVhdGVkLA0KICAgICAgICAgICAgIC8vIHNvIHdlIGxlYXZlIGl0IHVwb24g V2ViQ29yZSB0byBlaXRoZXIgaGFuZGxlIHRoZW0gaW1tZWRpYXRlbHkgKGUuZy4gVGFiIHRoYXQg Y2hhbmdlcyBmb2N1cykgb3IgbGV0IGEga2V5cHJlc3MgZXZlbnQgYmUgZ2VuZXJhdGVkDQogICAg ICAgICAgICAgLy8gKGUuZy4gVGFiIHRoYXQgaW5zZXJ0cyBhIFRhYiBjaGFyYWN0ZXIsIG9yIEVu dGVyKS4NCisgICAgICAgICAgICAvLyBBZGRlZCB0d28gY2FzZSBmb3IgZW50ZXIgaGFuZGxpbmcg dXNlZCBpbiB0ZXh0IGVkaXRvci4gRS5nLiBjcmVhdGVzIG5ldyBsaW5lIGluIG11bHRpIGxpbmUg ZWRpdG9yLCANCisgICAgICAgICAgICAvLyBvciBzdGFydHMgc2VhcmNoIGlmIGVudGVyIGlzIHBy ZXNzZXMgaW4gZ29vZ2xlJ3MgdGV4dCBlZGl0b3IgZmllbGQuICAgDQogICAgICAgICAgICAgaWYg KGNtZCAmJiBmcmFtZS0+ZWRpdG9yKCktPmNvbW1hbmQoY21kKS5pc1RleHRJbnNlcnRpb24oKQ0K ICAgICAgICAgICAgICAgICAmJiBrZXZlbnQtPnR5cGUoKSA9PSBQbGF0Zm9ybUtleWJvYXJkRXZl bnQ6OlJhd0tleURvd24pDQotICAgICAgICAgICAgICAgIHJldHVybjsNCi0NCi0gICAgICAgICAg ICBtX3BhZ2UtPnRyaWdnZXJBY3Rpb24oYWN0aW9uKTsNCisgICAgICAgICAgICAgICAgew0KKyAg ICAgICAgICAgICAgICBzd2l0Y2goYWN0aW9uKXsNCisgICAgICAgICAgICAgICAgICAgIGNhc2Ug UVdlYlBhZ2U6Okluc2VydFBhcmFncmFwaFNlcGFyYXRvciA6DQorICAgICAgICAgICAgICAgICAg ICBjYXNlIFFXZWJQYWdlOjpJbnNlcnRMaW5lU2VwYXJhdG9yIDoNCisgICAgICAgICAgICAgICAg ICAgICAgICBtX3BhZ2UtPnRyaWdnZXJBY3Rpb24oYWN0aW9uKTsNCisgICAgICAgICAgICAgICAg ICAgICAgICBicmVhazsNCisgICAgICAgICAgICAgICAgICAgIGRlZmF1bHQ6DQorICAgICAgICAg ICAgICAgICAgICAgICAgcmV0dXJuOw0KKyAgICAgICAgICAgICAgICAgICAgfQ0KKyAgICAgICAg ICAgIAl9DQorICAgICAgICAgICAgZWxzZQ0KKyAgICAgICAgICAgICAgICBtX3BhZ2UtPnRyaWdn ZXJBY3Rpb24oYWN0aW9uKTsNCiAgICAgICAgIH0gZWxzZQ0KICNlbmRpZiAvLyBRVF9OT19TSE9S VENVVA0KICAgICAgICAgc3dpdGNoIChrZXZlbnQtPndpbmRvd3NWaXJ0dWFsS2V5Q29kZSgpKSB7 DQogICAgICAgICANCg0KZGlmZiAtLWdpdCBhL1dlYktpdC9xdC9DaGFuZ2VMb2cgYi9XZWJLaXQv cXQvQ2hhbmdlTG9nDQppbmRleCBlM2ZiODZkLi40ZmJlNmQyIDEwMDY0NA0KLS0tIGEvV2ViS2l0 L3F0L0NoYW5nZUxvZw0KKysrIGIvV2ViS2l0L3F0L0NoYW5nZUxvZw0KQEAgLTEsMyArMSwxNiBA QA0KKzIwMTAtMDItMTAgIFNha2FyaSBQZWx0b21ha2kgIDxzYWthcmkucGVsdG9tYWtpQGRpZ2lh LmNvbT4NCisNCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLg0KKw0KKyAgICAg ICAgW1F0XSBFbnRlcmtleSB0byBnbyB0byBOZXdsaW5lIGRvZXMgbm90IHdvcmsgaW4gdGhlIHRl eHQNCisgICAgICAgIGFyZWEoaW4gSFRNTCBmb3JtKS4NCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zMzE3OQ0KKw0KKyAgICAgICAgQWRkZWQgc3dpdGNo IC8gY2FzZSB3aXRoIHR3byBlZGl0b3IgaGFuZGxpbmcgY2FzZXMuDQorDQorICAgICAgICAqV2Vi Q29yZVN1cHBvcnRcRWRpdG9yQ2xpZW50UXQuY3BwDQorICAgICAgICAoRWRpdG9yQ2xpZW50UXQ6 OmhhbmRsZUtleWJvYXJkRXZlbnQpDQorDQogMjAxMC0wMS0xOSAgS2VubmV0aCBSb2hkZSBDaHJp c3RpYW5zZW4gIDxrZW5uZXRoQHdlYmtpdC5vcmc+DQogICAgDQogICAgICBSZXZpZXdlZCBieSBE YXZlIEh5YXR0Lg0K 48477 2010-02-10 02:05:46 -0800 2010-02-10 02:22:11 -0800 patch patch.txt text/plain 2368 sakari.peltomaki ZGlmZiAtLWdpdCBhL1dlYktpdC9xdC9XZWJDb3JlU3VwcG9ydC9FZGl0b3JDbGllbnRRdC5jcHAg Yi9XZWJLaXQvcXQvV2ViQ29yZVN1cHBvcnQvRWRpdG9yQ2xpZW50UXQuY3BwDQppbmRleCA5MGVi YjFkLi4yM2E1ZjgwIDEwMDY0NA0KLS0tIGEvV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0L0VkaXRv ckNsaWVudFF0LmNwcA0KKysrIGIvV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0L0VkaXRvckNsaWVu dFF0LmNwcA0KQEAgLTM3NiwxMSArMzc2LDIwIEBAIHZvaWQgRWRpdG9yQ2xpZW50UXQ6OmhhbmRs ZUtleWJvYXJkRXZlbnQoS2V5Ym9hcmRFdmVudCogZXZlbnQpDQogICAgICAgICAgICAgLy8gV2Vi S2l0IGRvZXNuJ3QgaGF2ZSBlbm91Z2ggaW5mb3JtYXRpb24gYWJvdXQgbW9kZSB0byBkZWNpZGUg aG93IGNvbW1hbmRzIHRoYXQganVzdCBpbnNlcnQgdGV4dCBpZiBleGVjdXRlZCB2aWEgRWRpdG9y IHNob3VsZCBiZSB0cmVhdGVkLA0KICAgICAgICAgICAgIC8vIHNvIHdlIGxlYXZlIGl0IHVwb24g V2ViQ29yZSB0byBlaXRoZXIgaGFuZGxlIHRoZW0gaW1tZWRpYXRlbHkgKGUuZy4gVGFiIHRoYXQg Y2hhbmdlcyBmb2N1cykgb3IgbGV0IGEga2V5cHJlc3MgZXZlbnQgYmUgZ2VuZXJhdGVkDQogICAg ICAgICAgICAgLy8gKGUuZy4gVGFiIHRoYXQgaW5zZXJ0cyBhIFRhYiBjaGFyYWN0ZXIsIG9yIEVu dGVyKS4NCisgICAgICAgICAgICAvLyBBZGRlZCB0d28gY2FzZSBmb3IgZW50ZXIgaGFuZGxpbmcg dXNlZCBpbiB0ZXh0IGVkaXRvci4gRS5nLiBjcmVhdGVzIG5ldyBsaW5lIGluIG11bHRpIGxpbmUg ZWRpdG9yLCANCisgICAgICAgICAgICAvLyBvciBzdGFydHMgc2VhcmNoIGlmIGVudGVyIGlzIHBy ZXNzZXMgaW4gZ29vZ2xlJ3MgdGV4dCBlZGl0b3IgZmllbGQuICAgDQogICAgICAgICAgICAgaWYg KGNtZCAmJiBmcmFtZS0+ZWRpdG9yKCktPmNvbW1hbmQoY21kKS5pc1RleHRJbnNlcnRpb24oKQ0K LSAgICAgICAgICAgICAgICAmJiBrZXZlbnQtPnR5cGUoKSA9PSBQbGF0Zm9ybUtleWJvYXJkRXZl bnQ6OlJhd0tleURvd24pDQotICAgICAgICAgICAgICAgIHJldHVybjsNCi0NCi0gICAgICAgICAg ICBtX3BhZ2UtPnRyaWdnZXJBY3Rpb24oYWN0aW9uKTsNCisgICAgICAgICAgICAgICAgJiYga2V2 ZW50LT50eXBlKCkgPT0gUGxhdGZvcm1LZXlib2FyZEV2ZW50OjpSYXdLZXlEb3duKSB7DQorICAg ICAgICAgICAgICAgIHN3aXRjaCAoYWN0aW9uKSB7DQorICAgICAgICAgICAgICAgIGNhc2UgUVdl YlBhZ2U6Okluc2VydFBhcmFncmFwaFNlcGFyYXRvciA6DQorICAgICAgICAgICAgICAgIGNhc2Ug UVdlYlBhZ2U6Okluc2VydExpbmVTZXBhcmF0b3IgOg0KKyAgICAgICAgICAgICAgICAgICAgbV9w YWdlLT50cmlnZ2VyQWN0aW9uKGFjdGlvbik7DQorICAgICAgICAgICAgICAgICAgICBicmVhazsN CisgICAgICAgICAgICAgICAgZGVmYXVsdDoNCisgICAgICAgICAgICAgICAgICAgIHJldHVybjsN CisgICAgICAgICAgICAgICAgICAgIH0NCisgICAgICAgICAgICB9IGVsc2UNCisgICAgICAgICAg ICAgICAgbV9wYWdlLT50cmlnZ2VyQWN0aW9uKGFjdGlvbik7DQogICAgICAgICB9IGVsc2UNCiAj ZW5kaWYgLy8gUVRfTk9fU0hPUlRDVVQNCiAgICAgICAgIHN3aXRjaCAoa2V2ZW50LT53aW5kb3dz VmlydHVhbEtleUNvZGUoKSkgew0KICAgICAgICAgDQoNCmRpZmYgLS1naXQgYS9XZWJLaXQvcXQv Q2hhbmdlTG9nIGIvV2ViS2l0L3F0L0NoYW5nZUxvZw0KaW5kZXggZTNmYjg2ZC4uNGZiZTZkMiAx MDA2NDQNCi0tLSBhL1dlYktpdC9xdC9DaGFuZ2VMb2cNCisrKyBiL1dlYktpdC9xdC9DaGFuZ2VM b2cNCkBAIC0xLDMgKzEsMTYgQEANCisyMDEwLTAyLTEwICBTYWthcmkgUGVsdG9tYWtpICA8c2Fr YXJpLnBlbHRvbWFraUBkaWdpYS5jb20+DQorDQorICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4NCisNCisgICAgICAgIFtRdF0gRW50ZXJrZXkgdG8gZ28gdG8gTmV3bGluZSBkb2Vz IG5vdCB3b3JrIGluIHRoZSB0ZXh0DQorICAgICAgICBhcmVhKGluIEhUTUwgZm9ybSkuDQorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzMxNzkNCisNCisg ICAgICAgIEFkZGVkIHN3aXRjaCAvIGNhc2Ugd2l0aCB0d28gZWRpdG9yIGhhbmRsaW5nIGNhc2Vz Lg0KKw0KKyAgICAgICAgKldlYkNvcmVTdXBwb3J0XEVkaXRvckNsaWVudFF0LmNwcA0KKyAgICAg ICAgKEVkaXRvckNsaWVudFF0OjpoYW5kbGVLZXlib2FyZEV2ZW50KQ0KKw0KIDIwMTAtMDEtMTkg IEtlbm5ldGggUm9oZGUgQ2hyaXN0aWFuc2VuICA8a2VubmV0aEB3ZWJraXQub3JnPg0KICAgIA0K ICAgICAgUmV2aWV3ZWQgYnkgRGF2ZSBIeWF0dC4NCg== 48478 2010-02-10 02:22:11 -0800 2011-03-01 06:47:53 -0800 patch patch.txt text/plain 2364 sakari.peltomaki ZGlmZiAtLWdpdCBhL1dlYktpdC9xdC9XZWJDb3JlU3VwcG9ydC9FZGl0b3JDbGllbnRRdC5jcHAg Yi9XZWJLaXQvcXQvV2ViQ29yZVN1cHBvcnQvRWRpdG9yQ2xpZW50UXQuY3BwDQppbmRleCA5MGVi YjFkLi41NDFhM2I2IDEwMDY0NA0KLS0tIGEvV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0L0VkaXRv ckNsaWVudFF0LmNwcA0KKysrIGIvV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0L0VkaXRvckNsaWVu dFF0LmNwcA0KQEAgLTM3NiwxMSArMzc2LDIwIEBAIHZvaWQgRWRpdG9yQ2xpZW50UXQ6OmhhbmRs ZUtleWJvYXJkRXZlbnQoS2V5Ym9hcmRFdmVudCogZXZlbnQpDQogICAgICAgICAgICAgLy8gV2Vi S2l0IGRvZXNuJ3QgaGF2ZSBlbm91Z2ggaW5mb3JtYXRpb24gYWJvdXQgbW9kZSB0byBkZWNpZGUg aG93IGNvbW1hbmRzIHRoYXQganVzdCBpbnNlcnQgdGV4dCBpZiBleGVjdXRlZCB2aWEgRWRpdG9y IHNob3VsZCBiZSB0cmVhdGVkLA0KICAgICAgICAgICAgIC8vIHNvIHdlIGxlYXZlIGl0IHVwb24g V2ViQ29yZSB0byBlaXRoZXIgaGFuZGxlIHRoZW0gaW1tZWRpYXRlbHkgKGUuZy4gVGFiIHRoYXQg Y2hhbmdlcyBmb2N1cykgb3IgbGV0IGEga2V5cHJlc3MgZXZlbnQgYmUgZ2VuZXJhdGVkDQogICAg ICAgICAgICAgLy8gKGUuZy4gVGFiIHRoYXQgaW5zZXJ0cyBhIFRhYiBjaGFyYWN0ZXIsIG9yIEVu dGVyKS4NCisgICAgICAgICAgICAvLyBBZGRlZCB0d28gY2FzZSBmb3IgZW50ZXIgaGFuZGxpbmcg dXNlZCBpbiB0ZXh0IGVkaXRvci4gRS5nLiBjcmVhdGVzIG5ldyBsaW5lIGluIG11bHRpIGxpbmUg ZWRpdG9yLCANCisgICAgICAgICAgICAvLyBvciBzdGFydHMgc2VhcmNoIGlmIGVudGVyIGlzIHBy ZXNzZXMgaW4gZ29vZ2xlJ3MgdGV4dCBlZGl0b3IgZmllbGQuICAgDQogICAgICAgICAgICAgaWYg KGNtZCAmJiBmcmFtZS0+ZWRpdG9yKCktPmNvbW1hbmQoY21kKS5pc1RleHRJbnNlcnRpb24oKQ0K LSAgICAgICAgICAgICAgICAmJiBrZXZlbnQtPnR5cGUoKSA9PSBQbGF0Zm9ybUtleWJvYXJkRXZl bnQ6OlJhd0tleURvd24pDQotICAgICAgICAgICAgICAgIHJldHVybjsNCi0NCi0gICAgICAgICAg ICBtX3BhZ2UtPnRyaWdnZXJBY3Rpb24oYWN0aW9uKTsNCisgICAgICAgICAgICAgICAgJiYga2V2 ZW50LT50eXBlKCkgPT0gUGxhdGZvcm1LZXlib2FyZEV2ZW50OjpSYXdLZXlEb3duKSB7DQorICAg ICAgICAgICAgICAgIHN3aXRjaCAoYWN0aW9uKSB7DQorICAgICAgICAgICAgICAgIGNhc2UgUVdl YlBhZ2U6Okluc2VydFBhcmFncmFwaFNlcGFyYXRvciA6DQorICAgICAgICAgICAgICAgIGNhc2Ug UVdlYlBhZ2U6Okluc2VydExpbmVTZXBhcmF0b3IgOg0KKyAgICAgICAgICAgICAgICAgICAgbV9w YWdlLT50cmlnZ2VyQWN0aW9uKGFjdGlvbik7DQorICAgICAgICAgICAgICAgICAgICBicmVhazsN CisgICAgICAgICAgICAgICAgZGVmYXVsdDoNCisgICAgICAgICAgICAgICAgICAgIHJldHVybjsN CisgICAgICAgICAgICAgICAgfQ0KKyAgICAgICAgICAgIH0gZWxzZQ0KKyAgICAgICAgICAgICAg ICBtX3BhZ2UtPnRyaWdnZXJBY3Rpb24oYWN0aW9uKTsNCiAgICAgICAgIH0gZWxzZQ0KICNlbmRp ZiAvLyBRVF9OT19TSE9SVENVVA0KICAgICAgICAgc3dpdGNoIChrZXZlbnQtPndpbmRvd3NWaXJ0 dWFsS2V5Q29kZSgpKSB7DQogICAgICAgICANCg0KZGlmZiAtLWdpdCBhL1dlYktpdC9xdC9DaGFu Z2VMb2cgYi9XZWJLaXQvcXQvQ2hhbmdlTG9nDQppbmRleCBlM2ZiODZkLi40ZmJlNmQyIDEwMDY0 NA0KLS0tIGEvV2ViS2l0L3F0L0NoYW5nZUxvZw0KKysrIGIvV2ViS2l0L3F0L0NoYW5nZUxvZw0K QEAgLTEsMyArMSwxNiBAQA0KKzIwMTAtMDItMTAgIFNha2FyaSBQZWx0b21ha2kgIDxzYWthcmku cGVsdG9tYWtpQGRpZ2lhLmNvbT4NCisNCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLg0KKw0KKyAgICAgICAgW1F0XSBFbnRlcmtleSB0byBnbyB0byBOZXdsaW5lIGRvZXMgbm90 IHdvcmsgaW4gdGhlIHRleHQNCisgICAgICAgIGFyZWEoaW4gSFRNTCBmb3JtKS4NCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zMzE3OQ0KKw0KKyAgICAg ICAgQWRkZWQgc3dpdGNoIC8gY2FzZSB3aXRoIHR3byBlZGl0b3IgaGFuZGxpbmcgY2FzZXMuDQor DQorICAgICAgICAqV2ViQ29yZVN1cHBvcnRcRWRpdG9yQ2xpZW50UXQuY3BwDQorICAgICAgICAo RWRpdG9yQ2xpZW50UXQ6OmhhbmRsZUtleWJvYXJkRXZlbnQpDQorDQogMjAxMC0wMS0xOSAgS2Vu bmV0aCBSb2hkZSBDaHJpc3RpYW5zZW4gIDxrZW5uZXRoQHdlYmtpdC5vcmc+DQogICAgDQogICAg ICBSZXZpZXdlZCBieSBEYXZlIEh5YXR0Lg0K 84225 2011-03-01 06:47:53 -0800 2011-03-10 03:19:59 -0800 patch reworked to 2.1 patch_to_2_1.patch text/plain 1363 koshuin ZGlmZiAtLWdpdCBhL1dlYktpdC9xdC9XZWJDb3JlU3VwcG9ydC9FZGl0b3JDbGllbnRRdC5jcHAg Yi9XZWJLaXQvcXQvV2ViQ29yZVN1cHBvcnQvRWRpdG9yQ2xpZW50UXQuY3BwCmluZGV4IGRkYWZk ZTEuLjA1MTU2YWUgMTAwNjQ0Ci0tLSBhL1dlYktpdC9xdC9XZWJDb3JlU3VwcG9ydC9FZGl0b3JD bGllbnRRdC5jcHAKKysrIGIvV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0L0VkaXRvckNsaWVudFF0 LmNwcApAQCAtMzQ3LDcgKzM0Nyw3IEBAIHZvaWQgRWRpdG9yQ2xpZW50UXQ6OnRvZ2dsZUdyYW1t YXJDaGVja2luZygpCiAKIHZvaWQgRWRpdG9yQ2xpZW50UXQ6OmhhbmRsZUtleWJvYXJkRXZlbnQo S2V5Ym9hcmRFdmVudCogZXZlbnQpCiB7Ci0gICAgRnJhbWUqIGZyYW1lID0gbV9wYWdlLT5kLT5w YWdlLT5mb2N1c0NvbnRyb2xsZXIoKS0+Zm9jdXNlZE9yTWFpbkZyYW1lKCk7CisgICBGcmFtZSog ZnJhbWUgPSBtX3BhZ2UtPmQtPnBhZ2UtPmZvY3VzQ29udHJvbGxlcigpLT5mb2N1c2VkT3JNYWlu RnJhbWUoKTsKICAgICBpZiAoIWZyYW1lIHx8ICFmcmFtZS0+ZG9jdW1lbnQoKS0+Zm9jdXNlZE5v ZGUoKSkKICAgICAgICAgcmV0dXJuOwogCkBAIC00NzUsOCArNDc1LDIxIEBAIHZvaWQgRWRpdG9y Q2xpZW50UXQ6OmhhbmRsZUtleWJvYXJkRXZlbnQoS2V5Ym9hcmRFdmVudCogZXZlbnQpCiAgICAg ZXZlbnQtPnNldERlZmF1bHRIYW5kbGVkKCk7CiB9CiAKLXZvaWQgRWRpdG9yQ2xpZW50UXQ6Omhh bmRsZUlucHV0TWV0aG9kS2V5ZG93bihLZXlib2FyZEV2ZW50KikKK3ZvaWQgRWRpdG9yQ2xpZW50 UXQ6OmhhbmRsZUlucHV0TWV0aG9kS2V5ZG93bihLZXlib2FyZEV2ZW50KiBldmVudCkKIHsKKyNp ZiBPUyhTWU1CSUFOKQorY29uc3QgUGxhdGZvcm1LZXlib2FyZEV2ZW50KiBrZXZlbnQgPSBldmVu dC0+a2V5RXZlbnQoKTsKK2lmIChrZXZlbnQtPnR5cGUoKSA9PSBQbGF0Zm9ybUtleWJvYXJkRXZl bnQ6OlJhd0tleURvd24pIHsKKyAgICBRV2ViUGFnZTo6V2ViQWN0aW9uIGFjdGlvbiA9IFFXZWJQ YWdlUHJpdmF0ZTo6ZWRpdG9yQWN0aW9uRm9yS2V5RXZlbnQoa2V2ZW50LT5xdEV2ZW50KCkpOwor ICAgIHN3aXRjaCAoYWN0aW9uKSB7CisgICAgICAgIGNhc2UgUVdlYlBhZ2U6Okluc2VydFBhcmFn cmFwaFNlcGFyYXRvciA6CisgICAgICAgIGNhc2UgUVdlYlBhZ2U6Okluc2VydExpbmVTZXBhcmF0 b3IgOgorICAgICAgICAgICAgbV9wYWdlLT50cmlnZ2VyQWN0aW9uKGFjdGlvbik7CisgICAgICAg IGRlZmF1bHQ6CisgICAgICAgICAgICBicmVhazsKKyAgICAgICAgfQorICAgIH0KKyNlbmRpZgog fQogCiBFZGl0b3JDbGllbnRRdDo6RWRpdG9yQ2xpZW50UXQoUVdlYlBhZ2UqIHBhZ2UpCg== 85303 2011-03-10 03:19:59 -0800 2011-03-10 03:27:15 -0800 Patch for trunk newline.diff text/plain 3092 koshuin ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvcXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9x dC9DaGFuZ2VMb2cKaW5kZXggYTI4ODI1Yy4uN2YwZjMxMCAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdC9xdC9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9xdC9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxNyBAQAorMjAxMS0wMy0xMCAgSmFubmUgS29za2luZW4gIDxqYW5uZS5wLmtvc2tpbmVu QGRpZ2lhLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBbUXRdIEVudGVya2V5IHRvIGdvIHRvIE5ld2xpbmUgZG9lcyBub3Qgd29yayBpbiB0aGUg dGV4dCBhcmVhKGluIEhUTUwgZm9ybSkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTMzMTc5CisKKyAgICAgICAgRml4ZWQgbmV3bGluZSBnZW5lcmF0aW9u IGZyb20gUXQ6OktleV9FbnRlciB3aGVuIGVkaXR0aW5nIHRleHQgYXJlYSB1c2luZyBJbnB1dE1l dGhvZHMuCisKKyAgICAgICAgKiBXZWJDb3JlU3VwcG9ydC9FZGl0b3JDbGllbnRRdC5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpFZGl0b3JDbGllbnRRdDo6aGFuZGxlSW5wdXRNZXRob2RLZXlkb3du KToKKyAgICAgICAgKiB0ZXN0cy9xd2VicGFnZS90c3RfcXdlYnBhZ2UuY3BwOgorICAgICAgICAo dHN0X1FXZWJQYWdlOjppbnB1dE1ldGhvZHMpOgorCiAyMDExLTAzLTA3ICBTYW0gV2VpbmlnICA8 c2FtQHdlYmtpdC5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgQW5kZXJzIENhcmxzc29uLgpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9xdC9XZWJDb3JlU3VwcG9ydC9FZGl0b3JDbGllbnRR dC5jcHAgYi9Tb3VyY2UvV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0L0VkaXRvckNsaWVudFF0LmNw cAppbmRleCBjZjJmYTQxLi40YjIxNGQ5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L3F0L1dl YkNvcmVTdXBwb3J0L0VkaXRvckNsaWVudFF0LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L3F0L1dl YkNvcmVTdXBwb3J0L0VkaXRvckNsaWVudFF0LmNwcApAQCAtNTMyLDYgKzUzMiwxNyBAQCB2b2lk IEVkaXRvckNsaWVudFF0OjpoYW5kbGVLZXlib2FyZEV2ZW50KEtleWJvYXJkRXZlbnQqIGV2ZW50 KQogCiB2b2lkIEVkaXRvckNsaWVudFF0OjpoYW5kbGVJbnB1dE1ldGhvZEtleWRvd24oS2V5Ym9h cmRFdmVudCopCiB7Citjb25zdCBQbGF0Zm9ybUtleWJvYXJkRXZlbnQqIGtldmVudCA9IGV2ZW50 LT5rZXlFdmVudCgpOworaWYgKGtldmVudC0+dHlwZSgpID09IFBsYXRmb3JtS2V5Ym9hcmRFdmVu dDo6UmF3S2V5RG93bikgeworICAgIFFXZWJQYWdlOjpXZWJBY3Rpb24gYWN0aW9uID0gUVdlYlBh Z2VQcml2YXRlOjplZGl0b3JBY3Rpb25Gb3JLZXlFdmVudChrZXZlbnQtPnF0RXZlbnQoKSk7Cisg ICAgc3dpdGNoIChhY3Rpb24pIHsKKyAgICAgICAgY2FzZSBRV2ViUGFnZTo6SW5zZXJ0UGFyYWdy YXBoU2VwYXJhdG9yIDoKKyAgICAgICAgY2FzZSBRV2ViUGFnZTo6SW5zZXJ0TGluZVNlcGFyYXRv ciA6CisgICAgICAgICAgICBtX3BhZ2UtPnRyaWdnZXJBY3Rpb24oYWN0aW9uKTsKKyAgICAgICAg ZGVmYXVsdDoKKyAgICAgICAgICAgIGJyZWFrOworICAgICAgICB9CisgICAgfQogfQogCiBFZGl0 b3JDbGllbnRRdDo6RWRpdG9yQ2xpZW50UXQoUVdlYlBhZ2UqIHBhZ2UpCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0L3F0L3Rlc3RzL3F3ZWJwYWdlL3RzdF9xd2VicGFnZS5jcHAgYi9Tb3VyY2Uv V2ViS2l0L3F0L3Rlc3RzL3F3ZWJwYWdlL3RzdF9xd2VicGFnZS5jcHAKaW5kZXggNDQxN2FjNS4u ZjFkZDU4OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9xdC90ZXN0cy9xd2VicGFnZS90c3Rf cXdlYnBhZ2UuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvcXQvdGVzdHMvcXdlYnBhZ2UvdHN0X3F3 ZWJwYWdlLmNwcApAQCAtMjExNyw2ICsyMTE3LDI4IEBAIHZvaWQgdHN0X1FXZWJQYWdlOjppbnB1 dE1ldGhvZHMoKQogICAgIGNsaWNrT25QYWdlKHBhZ2UsIGlucHV0RWxlbWVudC5nZW9tZXRyeSgp LmNlbnRlcigpKTsKIAogICAgIFFWRVJJRlkoIXZpZXdFdmVudFNweS5jb250YWlucyhRRXZlbnQ6 OlJlcXVlc3RTb2Z0d2FyZUlucHV0UGFuZWwpKTsKKworICAgIC8vU1RBUlQgLSBOZXdsaW5lIHRl c3QgZm9yIHRleHRhcmVhCisgICAgcUFwcC0+cHJvY2Vzc0V2ZW50cygpOworICAgIHBhZ2UtPm1h aW5GcmFtZSgpLT5zZXRIdG1sKCI8aHRtbD48Ym9keT4iIFwKKwkJCQkJCQkJCQkJCSI8dGV4dGFy ZWEgcm93cz0nNScgY29scz0nMScgaWQ9J2lucHV0NScgdmFsdWU9JycvPiIgXAorCQkJCQkJCQkJ CQkJIjwvYm9keT48L2h0bWw+Iik7CisgICAgcGFnZS0+bWFpbkZyYW1lKCktPmV2YWx1YXRlSmF2 YVNjcmlwdCgidmFyIGlucHV0RWxlID0gZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoJ2lucHV0NScp OyBpbnB1dEVsZS5mb2N1cygpOyBpbnB1dEVsZS5zZWxlY3QoKTsiKTsKKyAgICBRS2V5RXZlbnQg a2V5RW50ZXIoUUV2ZW50OjpLZXlQcmVzcywgUXQ6OktleV9FbnRlciwgUXQ6Ok5vTW9kaWZpZXIp OworICAgIHBhZ2UtPmV2ZW50KCZrZXlFbnRlcik7CisgICAgUUxpc3Q8UUlucHV0TWV0aG9kRXZl bnQ6OkF0dHJpYnV0ZT4gYXR0cmliczsKKworICAgIFFJbnB1dE1ldGhvZEV2ZW50IGV2ZW50VGV4 dCgiXG4iLCBhdHRyaWJzKTsKKyAgICBwYWdlLT5ldmVudCgmZXZlbnRUZXh0KTsKKworICAgIFFJ bnB1dE1ldGhvZEV2ZW50IGV2ZW50VGV4dDIoInRoaXJkIGxpbmUiLCBhdHRyaWJzKTsKKyAgICBw YWdlLT5ldmVudCgmZXZlbnRUZXh0Mik7CisgICAgcUFwcC0+cHJvY2Vzc0V2ZW50cygpOworCisg ICAgUVN0cmluZyBpbnB1dFZhbHVlMiA9IHBhZ2UtPm1haW5GcmFtZSgpLT5ldmFsdWF0ZUphdmFT Y3JpcHQoImRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCdpbnB1dDUnKS52YWx1ZSIpLnRvU3RyaW5n KCk7CisgICAgUUNPTVBBUkUoaW5wdXRWYWx1ZTIsIFFTdHJpbmcoIlxuXG50aGlyZCBsaW5lIikp OworICAgIC8vRU5EIC0gTmV3bGluZSB0ZXN0IGZvciB0ZXh0YXJlYQorCiAgICAgZGVsZXRlIGNv bnRhaW5lcjsKIH0KIAo= 85305 2011-03-10 03:27:15 -0800 2011-03-10 03:39:05 -0800 Patch for trunk2 newline_fixed.diff text/plain 3193 koshuin ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvcXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9x dC9DaGFuZ2VMb2cKaW5kZXggYTI4ODI1Yy4uN2YwZjMxMCAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdC9xdC9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9xdC9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxNyBAQAorMjAxMS0wMy0xMCAgSmFubmUgS29za2luZW4gIDxqYW5uZS5wLmtvc2tpbmVu QGRpZ2lhLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBbUXRdIEVudGVya2V5IHRvIGdvIHRvIE5ld2xpbmUgZG9lcyBub3Qgd29yayBpbiB0aGUg dGV4dCBhcmVhKGluIEhUTUwgZm9ybSkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTMzMTc5CisKKyAgICAgICAgRml4ZWQgbmV3bGluZSBnZW5lcmF0aW9u IGZyb20gUXQ6OktleV9FbnRlciB3aGVuIGVkaXR0aW5nIHRleHQgYXJlYSB1c2luZyBJbnB1dE1l dGhvZHMuCisKKyAgICAgICAgKiBXZWJDb3JlU3VwcG9ydC9FZGl0b3JDbGllbnRRdC5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpFZGl0b3JDbGllbnRRdDo6aGFuZGxlSW5wdXRNZXRob2RLZXlkb3du KToKKyAgICAgICAgKiB0ZXN0cy9xd2VicGFnZS90c3RfcXdlYnBhZ2UuY3BwOgorICAgICAgICAo dHN0X1FXZWJQYWdlOjppbnB1dE1ldGhvZHMpOgorCiAyMDExLTAzLTA3ICBTYW0gV2VpbmlnICA8 c2FtQHdlYmtpdC5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgQW5kZXJzIENhcmxzc29uLgpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9xdC9XZWJDb3JlU3VwcG9ydC9FZGl0b3JDbGllbnRR dC5jcHAgYi9Tb3VyY2UvV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0L0VkaXRvckNsaWVudFF0LmNw cAppbmRleCBjZjJmYTQxLi5mYzljN2Y0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L3F0L1dl YkNvcmVTdXBwb3J0L0VkaXRvckNsaWVudFF0LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L3F0L1dl YkNvcmVTdXBwb3J0L0VkaXRvckNsaWVudFF0LmNwcApAQCAtNTMwLDggKzUzMCwxOSBAQCB2b2lk IEVkaXRvckNsaWVudFF0OjpoYW5kbGVLZXlib2FyZEV2ZW50KEtleWJvYXJkRXZlbnQqIGV2ZW50 KQogI2VuZGlmIC8vIFFUX05PX1NIT1JUQ1VUCiB9CiAKLXZvaWQgRWRpdG9yQ2xpZW50UXQ6Omhh bmRsZUlucHV0TWV0aG9kS2V5ZG93bihLZXlib2FyZEV2ZW50KikKLXsKK3ZvaWQgRWRpdG9yQ2xp ZW50UXQ6OmhhbmRsZUlucHV0TWV0aG9kS2V5ZG93bihLZXlib2FyZEV2ZW50KiBldmVudCkKK3sK K2NvbnN0IFBsYXRmb3JtS2V5Ym9hcmRFdmVudCoga2V2ZW50ID0gZXZlbnQtPmtleUV2ZW50KCk7 CitpZiAoa2V2ZW50LT50eXBlKCkgPT0gUGxhdGZvcm1LZXlib2FyZEV2ZW50OjpSYXdLZXlEb3du KSB7CisgICAgUVdlYlBhZ2U6OldlYkFjdGlvbiBhY3Rpb24gPSBRV2ViUGFnZVByaXZhdGU6OmVk aXRvckFjdGlvbkZvcktleUV2ZW50KGtldmVudC0+cXRFdmVudCgpKTsKKyAgICBzd2l0Y2ggKGFj dGlvbikgeworICAgICAgICBjYXNlIFFXZWJQYWdlOjpJbnNlcnRQYXJhZ3JhcGhTZXBhcmF0b3Ig OgorICAgICAgICBjYXNlIFFXZWJQYWdlOjpJbnNlcnRMaW5lU2VwYXJhdG9yIDoKKyAgICAgICAg ICAgIG1fcGFnZS0+dHJpZ2dlckFjdGlvbihhY3Rpb24pOworICAgICAgICBkZWZhdWx0OgorICAg ICAgICAgICAgYnJlYWs7CisgICAgICAgIH0KKyAgICB9CiB9CiAKIEVkaXRvckNsaWVudFF0OjpF ZGl0b3JDbGllbnRRdChRV2ViUGFnZSogcGFnZSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQv cXQvdGVzdHMvcXdlYnBhZ2UvdHN0X3F3ZWJwYWdlLmNwcCBiL1NvdXJjZS9XZWJLaXQvcXQvdGVz dHMvcXdlYnBhZ2UvdHN0X3F3ZWJwYWdlLmNwcAppbmRleCA0NDE3YWM1Li5mMWRkNTg5IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0L3F0L3Rlc3RzL3F3ZWJwYWdlL3RzdF9xd2VicGFnZS5jcHAK KysrIGIvU291cmNlL1dlYktpdC9xdC90ZXN0cy9xd2VicGFnZS90c3RfcXdlYnBhZ2UuY3BwCkBA IC0yMTE3LDYgKzIxMTcsMjggQEAgdm9pZCB0c3RfUVdlYlBhZ2U6OmlucHV0TWV0aG9kcygpCiAg ICAgY2xpY2tPblBhZ2UocGFnZSwgaW5wdXRFbGVtZW50Lmdlb21ldHJ5KCkuY2VudGVyKCkpOwog CiAgICAgUVZFUklGWSghdmlld0V2ZW50U3B5LmNvbnRhaW5zKFFFdmVudDo6UmVxdWVzdFNvZnR3 YXJlSW5wdXRQYW5lbCkpOworCisgICAgLy9TVEFSVCAtIE5ld2xpbmUgdGVzdCBmb3IgdGV4dGFy ZWEKKyAgICBxQXBwLT5wcm9jZXNzRXZlbnRzKCk7CisgICAgcGFnZS0+bWFpbkZyYW1lKCktPnNl dEh0bWwoIjxodG1sPjxib2R5PiIgXAorCQkJCQkJCQkJCQkJIjx0ZXh0YXJlYSByb3dzPSc1JyBj b2xzPScxJyBpZD0naW5wdXQ1JyB2YWx1ZT0nJy8+IiBcCisJCQkJCQkJCQkJCQkiPC9ib2R5Pjwv aHRtbD4iKTsKKyAgICBwYWdlLT5tYWluRnJhbWUoKS0+ZXZhbHVhdGVKYXZhU2NyaXB0KCJ2YXIg aW5wdXRFbGUgPSBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgnaW5wdXQ1Jyk7IGlucHV0RWxlLmZv Y3VzKCk7IGlucHV0RWxlLnNlbGVjdCgpOyIpOworICAgIFFLZXlFdmVudCBrZXlFbnRlcihRRXZl bnQ6OktleVByZXNzLCBRdDo6S2V5X0VudGVyLCBRdDo6Tm9Nb2RpZmllcik7CisgICAgcGFnZS0+ ZXZlbnQoJmtleUVudGVyKTsKKyAgICBRTGlzdDxRSW5wdXRNZXRob2RFdmVudDo6QXR0cmlidXRl PiBhdHRyaWJzOworCisgICAgUUlucHV0TWV0aG9kRXZlbnQgZXZlbnRUZXh0KCJcbiIsIGF0dHJp YnMpOworICAgIHBhZ2UtPmV2ZW50KCZldmVudFRleHQpOworCisgICAgUUlucHV0TWV0aG9kRXZl bnQgZXZlbnRUZXh0MigidGhpcmQgbGluZSIsIGF0dHJpYnMpOworICAgIHBhZ2UtPmV2ZW50KCZl dmVudFRleHQyKTsKKyAgICBxQXBwLT5wcm9jZXNzRXZlbnRzKCk7CisKKyAgICBRU3RyaW5nIGlu cHV0VmFsdWUyID0gcGFnZS0+bWFpbkZyYW1lKCktPmV2YWx1YXRlSmF2YVNjcmlwdCgiZG9jdW1l bnQuZ2V0RWxlbWVudEJ5SWQoJ2lucHV0NScpLnZhbHVlIikudG9TdHJpbmcoKTsKKyAgICBRQ09N UEFSRShpbnB1dFZhbHVlMiwgUVN0cmluZygiXG5cbnRoaXJkIGxpbmUiKSk7CisgICAgLy9FTkQg LSBOZXdsaW5lIHRlc3QgZm9yIHRleHRhcmVhCisKICAgICBkZWxldGUgY29udGFpbmVyOwogfQog Cg== 85306 2011-03-10 03:39:05 -0800 2011-03-10 04:25:53 -0800 Patch for trunk3 newline_fixed2.diff text/plain 3259 koshuin ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvcXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9x dC9DaGFuZ2VMb2cKaW5kZXggYTI4ODI1Yy4uN2YwZjMxMCAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdC9xdC9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9xdC9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxNyBAQAorMjAxMS0wMy0xMCAgSmFubmUgS29za2luZW4gIDxqYW5uZS5wLmtvc2tpbmVu QGRpZ2lhLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBbUXRdIEVudGVya2V5IHRvIGdvIHRvIE5ld2xpbmUgZG9lcyBub3Qgd29yayBpbiB0aGUg dGV4dCBhcmVhKGluIEhUTUwgZm9ybSkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTMzMTc5CisKKyAgICAgICAgRml4ZWQgbmV3bGluZSBnZW5lcmF0aW9u IGZyb20gUXQ6OktleV9FbnRlciB3aGVuIGVkaXR0aW5nIHRleHQgYXJlYSB1c2luZyBJbnB1dE1l dGhvZHMuCisKKyAgICAgICAgKiBXZWJDb3JlU3VwcG9ydC9FZGl0b3JDbGllbnRRdC5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpFZGl0b3JDbGllbnRRdDo6aGFuZGxlSW5wdXRNZXRob2RLZXlkb3du KToKKyAgICAgICAgKiB0ZXN0cy9xd2VicGFnZS90c3RfcXdlYnBhZ2UuY3BwOgorICAgICAgICAo dHN0X1FXZWJQYWdlOjppbnB1dE1ldGhvZHMpOgorCiAyMDExLTAzLTA3ICBTYW0gV2VpbmlnICA8 c2FtQHdlYmtpdC5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgQW5kZXJzIENhcmxzc29uLgpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9xdC9XZWJDb3JlU3VwcG9ydC9FZGl0b3JDbGllbnRR dC5jcHAgYi9Tb3VyY2UvV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0L0VkaXRvckNsaWVudFF0LmNw cAppbmRleCBjZjJmYTQxLi5mYzljN2Y0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L3F0L1dl YkNvcmVTdXBwb3J0L0VkaXRvckNsaWVudFF0LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L3F0L1dl YkNvcmVTdXBwb3J0L0VkaXRvckNsaWVudFF0LmNwcApAQCAtNTMwLDggKzUzMCwxOSBAQCB2b2lk IEVkaXRvckNsaWVudFF0OjpoYW5kbGVLZXlib2FyZEV2ZW50KEtleWJvYXJkRXZlbnQqIGV2ZW50 KQogI2VuZGlmIC8vIFFUX05PX1NIT1JUQ1VUCiB9CiAKLXZvaWQgRWRpdG9yQ2xpZW50UXQ6Omhh bmRsZUlucHV0TWV0aG9kS2V5ZG93bihLZXlib2FyZEV2ZW50KikKLXsKK3ZvaWQgRWRpdG9yQ2xp ZW50UXQ6OmhhbmRsZUlucHV0TWV0aG9kS2V5ZG93bihLZXlib2FyZEV2ZW50KiBldmVudCkKK3sK K2NvbnN0IFBsYXRmb3JtS2V5Ym9hcmRFdmVudCoga2V2ZW50ID0gZXZlbnQtPmtleUV2ZW50KCk7 CitpZiAoa2V2ZW50LT50eXBlKCkgPT0gUGxhdGZvcm1LZXlib2FyZEV2ZW50OjpSYXdLZXlEb3du KSB7CisgICAgUVdlYlBhZ2U6OldlYkFjdGlvbiBhY3Rpb24gPSBRV2ViUGFnZVByaXZhdGU6OmVk aXRvckFjdGlvbkZvcktleUV2ZW50KGtldmVudC0+cXRFdmVudCgpKTsKKyAgICBzd2l0Y2ggKGFj dGlvbikgeworICAgICAgICBjYXNlIFFXZWJQYWdlOjpJbnNlcnRQYXJhZ3JhcGhTZXBhcmF0b3Ig OgorICAgICAgICBjYXNlIFFXZWJQYWdlOjpJbnNlcnRMaW5lU2VwYXJhdG9yIDoKKyAgICAgICAg ICAgIG1fcGFnZS0+dHJpZ2dlckFjdGlvbihhY3Rpb24pOworICAgICAgICBkZWZhdWx0OgorICAg ICAgICAgICAgYnJlYWs7CisgICAgICAgIH0KKyAgICB9CiB9CiAKIEVkaXRvckNsaWVudFF0OjpF ZGl0b3JDbGllbnRRdChRV2ViUGFnZSogcGFnZSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQv cXQvdGVzdHMvcXdlYnBhZ2UvdHN0X3F3ZWJwYWdlLmNwcCBiL1NvdXJjZS9XZWJLaXQvcXQvdGVz dHMvcXdlYnBhZ2UvdHN0X3F3ZWJwYWdlLmNwcAppbmRleCA0NDE3YWM1Li5iODZjYWI0IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0L3F0L3Rlc3RzL3F3ZWJwYWdlL3RzdF9xd2VicGFnZS5jcHAK KysrIGIvU291cmNlL1dlYktpdC9xdC90ZXN0cy9xd2VicGFnZS90c3RfcXdlYnBhZ2UuY3BwCkBA IC0yMTE3LDYgKzIxMTcsMjggQEAgdm9pZCB0c3RfUVdlYlBhZ2U6OmlucHV0TWV0aG9kcygpCiAg ICAgY2xpY2tPblBhZ2UocGFnZSwgaW5wdXRFbGVtZW50Lmdlb21ldHJ5KCkuY2VudGVyKCkpOwog CiAgICAgUVZFUklGWSghdmlld0V2ZW50U3B5LmNvbnRhaW5zKFFFdmVudDo6UmVxdWVzdFNvZnR3 YXJlSW5wdXRQYW5lbCkpOworCisgICAgLy8gU1RBUlQgLSBOZXdsaW5lIHRlc3QgZm9yIHRleHRh cmVhCisgICAgcUFwcC0+cHJvY2Vzc0V2ZW50cygpOworICAgIHBhZ2UtPm1haW5GcmFtZSgpLT5z ZXRIdG1sKCI8aHRtbD48Ym9keT4iIFwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIjx0ZXh0YXJlYSByb3dzPSc1JyBjb2xzPScxJyBpZD0naW5wdXQ1JyB2YWx1 ZT0nJy8+IiBcCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICI8 L2JvZHk+PC9odG1sPiIpOworICAgIHBhZ2UtPm1haW5GcmFtZSgpLT5ldmFsdWF0ZUphdmFTY3Jp cHQoInZhciBpbnB1dEVsZSA9IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCdpbnB1dDUnKTsgaW5w dXRFbGUuZm9jdXMoKTsgaW5wdXRFbGUuc2VsZWN0KCk7Iik7CisgICAgUUtleUV2ZW50IGtleUVu dGVyKFFFdmVudDo6S2V5UHJlc3MsIFF0OjpLZXlfRW50ZXIsIFF0OjpOb01vZGlmaWVyKTsKKyAg ICBwYWdlLT5ldmVudCgma2V5RW50ZXIpOworICAgIFFMaXN0PFFJbnB1dE1ldGhvZEV2ZW50OjpB dHRyaWJ1dGU+IGF0dHJpYnM7CisKKyAgICBRSW5wdXRNZXRob2RFdmVudCBldmVudFRleHQoIlxu IiwgYXR0cmlicyk7CisgICAgcGFnZS0+ZXZlbnQoJmV2ZW50VGV4dCk7CisKKyAgICBRSW5wdXRN ZXRob2RFdmVudCBldmVudFRleHQyKCJ0aGlyZCBsaW5lIiwgYXR0cmlicyk7CisgICAgcGFnZS0+ ZXZlbnQoJmV2ZW50VGV4dDIpOworICAgIHFBcHAtPnByb2Nlc3NFdmVudHMoKTsKKworICAgIFFT dHJpbmcgaW5wdXRWYWx1ZTIgPSBwYWdlLT5tYWluRnJhbWUoKS0+ZXZhbHVhdGVKYXZhU2NyaXB0 KCJkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgnaW5wdXQ1JykudmFsdWUiKS50b1N0cmluZygpOwor ICAgIFFDT01QQVJFKGlucHV0VmFsdWUyLCBRU3RyaW5nKCJcblxudGhpcmQgbGluZSIpKTsKKyAg ICAvLyBFTkQgLSBOZXdsaW5lIHRlc3QgZm9yIHRleHRhcmVhCisKICAgICBkZWxldGUgY29udGFp bmVyOwogfQogCg== 85308 2011-03-10 04:25:53 -0800 2011-03-29 05:58:16 -0700 Patch for trunk4 newline_fixed3.diff text/plain 3270 koshuin ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvcXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9x dC9DaGFuZ2VMb2cKaW5kZXggYTI4ODI1Yy4uN2YwZjMxMCAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdC9xdC9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9xdC9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxNyBAQAorMjAxMS0wMy0xMCAgSmFubmUgS29za2luZW4gIDxqYW5uZS5wLmtvc2tpbmVu QGRpZ2lhLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBbUXRdIEVudGVya2V5IHRvIGdvIHRvIE5ld2xpbmUgZG9lcyBub3Qgd29yayBpbiB0aGUg dGV4dCBhcmVhKGluIEhUTUwgZm9ybSkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTMzMTc5CisKKyAgICAgICAgRml4ZWQgbmV3bGluZSBnZW5lcmF0aW9u IGZyb20gUXQ6OktleV9FbnRlciB3aGVuIGVkaXR0aW5nIHRleHQgYXJlYSB1c2luZyBJbnB1dE1l dGhvZHMuCisKKyAgICAgICAgKiBXZWJDb3JlU3VwcG9ydC9FZGl0b3JDbGllbnRRdC5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpFZGl0b3JDbGllbnRRdDo6aGFuZGxlSW5wdXRNZXRob2RLZXlkb3du KToKKyAgICAgICAgKiB0ZXN0cy9xd2VicGFnZS90c3RfcXdlYnBhZ2UuY3BwOgorICAgICAgICAo dHN0X1FXZWJQYWdlOjppbnB1dE1ldGhvZHMpOgorCiAyMDExLTAzLTA3ICBTYW0gV2VpbmlnICA8 c2FtQHdlYmtpdC5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgQW5kZXJzIENhcmxzc29uLgpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9xdC9XZWJDb3JlU3VwcG9ydC9FZGl0b3JDbGllbnRR dC5jcHAgYi9Tb3VyY2UvV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0L0VkaXRvckNsaWVudFF0LmNw cAppbmRleCBjZjJmYTQxLi42OGI4ZDk1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L3F0L1dl YkNvcmVTdXBwb3J0L0VkaXRvckNsaWVudFF0LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L3F0L1dl YkNvcmVTdXBwb3J0L0VkaXRvckNsaWVudFF0LmNwcApAQCAtNTMwLDggKzUzMCwxOSBAQCB2b2lk IEVkaXRvckNsaWVudFF0OjpoYW5kbGVLZXlib2FyZEV2ZW50KEtleWJvYXJkRXZlbnQqIGV2ZW50 KQogI2VuZGlmIC8vIFFUX05PX1NIT1JUQ1VUCiB9CiAKLXZvaWQgRWRpdG9yQ2xpZW50UXQ6Omhh bmRsZUlucHV0TWV0aG9kS2V5ZG93bihLZXlib2FyZEV2ZW50KikKK3ZvaWQgRWRpdG9yQ2xpZW50 UXQ6OmhhbmRsZUlucHV0TWV0aG9kS2V5ZG93bihLZXlib2FyZEV2ZW50KiBldmVudCkKIHsKKyAg ICBjb25zdCBQbGF0Zm9ybUtleWJvYXJkRXZlbnQqIGtldmVudCA9IGV2ZW50LT5rZXlFdmVudCgp OworICAgIGlmIChrZXZlbnQtPnR5cGUoKSA9PSBQbGF0Zm9ybUtleWJvYXJkRXZlbnQ6OlJhd0tl eURvd24pIHsKKyAgICAgICAgUVdlYlBhZ2U6OldlYkFjdGlvbiBhY3Rpb24gPSBRV2ViUGFnZVBy aXZhdGU6OmVkaXRvckFjdGlvbkZvcktleUV2ZW50KGtldmVudC0+cXRFdmVudCgpKTsKKyAgICAg ICAgc3dpdGNoIChhY3Rpb24pIHsKKyAgICAgICAgY2FzZSBRV2ViUGFnZTo6SW5zZXJ0UGFyYWdy YXBoU2VwYXJhdG9yOgorICAgICAgICBjYXNlIFFXZWJQYWdlOjpJbnNlcnRMaW5lU2VwYXJhdG9y OgorICAgICAgICAgICAgbV9wYWdlLT50cmlnZ2VyQWN0aW9uKGFjdGlvbik7CisgICAgICAgIGRl ZmF1bHQ6CisgICAgICAgICAgICBicmVhazsKKyAgICAgICAgfQorICAgIH0KIH0KIAogRWRpdG9y Q2xpZW50UXQ6OkVkaXRvckNsaWVudFF0KFFXZWJQYWdlKiBwYWdlKQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdC9xdC90ZXN0cy9xd2VicGFnZS90c3RfcXdlYnBhZ2UuY3BwIGIvU291cmNlL1dl YktpdC9xdC90ZXN0cy9xd2VicGFnZS90c3RfcXdlYnBhZ2UuY3BwCmluZGV4IDQ0MTdhYzUuLmI4 NmNhYjQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvcXQvdGVzdHMvcXdlYnBhZ2UvdHN0X3F3 ZWJwYWdlLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L3F0L3Rlc3RzL3F3ZWJwYWdlL3RzdF9xd2Vi cGFnZS5jcHAKQEAgLTIxMTcsNiArMjExNywyOCBAQCB2b2lkIHRzdF9RV2ViUGFnZTo6aW5wdXRN ZXRob2RzKCkKICAgICBjbGlja09uUGFnZShwYWdlLCBpbnB1dEVsZW1lbnQuZ2VvbWV0cnkoKS5j ZW50ZXIoKSk7CiAKICAgICBRVkVSSUZZKCF2aWV3RXZlbnRTcHkuY29udGFpbnMoUUV2ZW50OjpS ZXF1ZXN0U29mdHdhcmVJbnB1dFBhbmVsKSk7CisKKyAgICAvLyBTVEFSVCAtIE5ld2xpbmUgdGVz dCBmb3IgdGV4dGFyZWEKKyAgICBxQXBwLT5wcm9jZXNzRXZlbnRzKCk7CisgICAgcGFnZS0+bWFp bkZyYW1lKCktPnNldEh0bWwoIjxodG1sPjxib2R5PiIgXAorICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAiPHRleHRhcmVhIHJvd3M9JzUnIGNvbHM9JzEnIGlkPSdp bnB1dDUnIHZhbHVlPScnLz4iIFwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIjwvYm9keT48L2h0bWw+Iik7CisgICAgcGFnZS0+bWFpbkZyYW1lKCktPmV2YWx1 YXRlSmF2YVNjcmlwdCgidmFyIGlucHV0RWxlID0gZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoJ2lu cHV0NScpOyBpbnB1dEVsZS5mb2N1cygpOyBpbnB1dEVsZS5zZWxlY3QoKTsiKTsKKyAgICBRS2V5 RXZlbnQga2V5RW50ZXIoUUV2ZW50OjpLZXlQcmVzcywgUXQ6OktleV9FbnRlciwgUXQ6Ok5vTW9k aWZpZXIpOworICAgIHBhZ2UtPmV2ZW50KCZrZXlFbnRlcik7CisgICAgUUxpc3Q8UUlucHV0TWV0 aG9kRXZlbnQ6OkF0dHJpYnV0ZT4gYXR0cmliczsKKworICAgIFFJbnB1dE1ldGhvZEV2ZW50IGV2 ZW50VGV4dCgiXG4iLCBhdHRyaWJzKTsKKyAgICBwYWdlLT5ldmVudCgmZXZlbnRUZXh0KTsKKwor ICAgIFFJbnB1dE1ldGhvZEV2ZW50IGV2ZW50VGV4dDIoInRoaXJkIGxpbmUiLCBhdHRyaWJzKTsK KyAgICBwYWdlLT5ldmVudCgmZXZlbnRUZXh0Mik7CisgICAgcUFwcC0+cHJvY2Vzc0V2ZW50cygp OworCisgICAgUVN0cmluZyBpbnB1dFZhbHVlMiA9IHBhZ2UtPm1haW5GcmFtZSgpLT5ldmFsdWF0 ZUphdmFTY3JpcHQoImRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCdpbnB1dDUnKS52YWx1ZSIpLnRv U3RyaW5nKCk7CisgICAgUUNPTVBBUkUoaW5wdXRWYWx1ZTIsIFFTdHJpbmcoIlxuXG50aGlyZCBs aW5lIikpOworICAgIC8vIEVORCAtIE5ld2xpbmUgdGVzdCBmb3IgdGV4dGFyZWEKKwogICAgIGRl bGV0ZSBjb250YWluZXI7CiB9CiAK 85311 2011-03-10 05:11:44 -0800 2011-03-15 07:48:30 -0700 QtWebkit2.1 backport newline_2_1_backport.diff text/plain 3322 koshuin ZGlmZiAtLWdpdCBhL1dlYktpdC9xdC9DaGFuZ2VMb2cgYi9XZWJLaXQvcXQvQ2hhbmdlTG9nCmlu ZGV4IGE2NDNkMmEuLjgwOGQyMjUgMTAwNjQ0Ci0tLSBhL1dlYktpdC9xdC9DaGFuZ2VMb2cKKysr IGIvV2ViS2l0L3F0L0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDExLTAzLTA5ICBKYW5u ZSBLb3NraW5lbiAgPGphbm5lLnAua29za2luZW5AZGlnaWEuY29tPgorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtRdF0gRW50ZXJrZXkgdG8gZ28gdG8g TmV3bGluZSBkb2VzIG5vdCB3b3JrIGluIHRoZSB0ZXh0IGFyZWEoaW4gSFRNTCBmb3JtKQorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzMxNzkKKworICAg ICAgICBGaXhlZCBuZXdsaW5lIGdlbmVyYXRpb24gZnJvbSBRdDo6S2V5X0VudGVyIHdoZW4gZWRp dHRpbmcgdGV4dCBhcmVhIHVzaW5nIElucHV0TWV0aG9kcy4KKworICAgICAgICAqIHBsYXRmb3Jt L2dyYXBoaWNzL3F0L0dyYXBoaWNzQ29udGV4dFF0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Okdy YXBoaWNzQ29udGV4dFBsYXRmb3JtUHJpdmF0ZTo6R3JhcGhpY3NDb250ZXh0UGxhdGZvcm1Qcml2 YXRlKToKKyAgICAgICAgKiBXZWJDb3JlU3VwcG9ydC9FZGl0b3JDbGllbnRRdC5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpFZGl0b3JDbGllbnRRdDo6aGFuZGxlSW5wdXRNZXRob2RLZXlkb3duKToK KyAgICAgICAgKiB0ZXN0cy9xd2VicGFnZS90c3RfcXdlYnBhZ2UuY3BwOgorICAgICAgICAodHN0 X1FXZWJQYWdlOjppbnB1dE1ldGhvZHMpOgorCiAyMDExLTAxLTEwICBNaXNoYSBUeXV0eXVuaWsg IDxNaWNoYWVsLlR5dXR5dW5pa0Bub2tpYS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgTGFz emxvIEdvbWJvcy4KZGlmZiAtLWdpdCBhL1dlYktpdC9xdC9XZWJDb3JlU3VwcG9ydC9FZGl0b3JD bGllbnRRdC5jcHAgYi9XZWJLaXQvcXQvV2ViQ29yZVN1cHBvcnQvRWRpdG9yQ2xpZW50UXQuY3Bw CmluZGV4IGRkYWZkZTEuLjczMTc5NTcgMTAwNjQ0Ci0tLSBhL1dlYktpdC9xdC9XZWJDb3JlU3Vw cG9ydC9FZGl0b3JDbGllbnRRdC5jcHAKKysrIGIvV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0L0Vk aXRvckNsaWVudFF0LmNwcApAQCAtNDc1LDggKzQ3NSwxOSBAQCB2b2lkIEVkaXRvckNsaWVudFF0 OjpoYW5kbGVLZXlib2FyZEV2ZW50KEtleWJvYXJkRXZlbnQqIGV2ZW50KQogICAgIGV2ZW50LT5z ZXREZWZhdWx0SGFuZGxlZCgpOwogfQogCi12b2lkIEVkaXRvckNsaWVudFF0OjpoYW5kbGVJbnB1 dE1ldGhvZEtleWRvd24oS2V5Ym9hcmRFdmVudCopCit2b2lkIEVkaXRvckNsaWVudFF0OjpoYW5k bGVJbnB1dE1ldGhvZEtleWRvd24oS2V5Ym9hcmRFdmVudCogZXZlbnQpCiB7CisgICAgY29uc3Qg UGxhdGZvcm1LZXlib2FyZEV2ZW50KiBrZXZlbnQgPSBldmVudC0+a2V5RXZlbnQoKTsKKyAgICBp ZiAoa2V2ZW50LT50eXBlKCkgPT0gUGxhdGZvcm1LZXlib2FyZEV2ZW50OjpSYXdLZXlEb3duKSB7 CisgICAgICAgIFFXZWJQYWdlOjpXZWJBY3Rpb24gYWN0aW9uID0gUVdlYlBhZ2VQcml2YXRlOjpl ZGl0b3JBY3Rpb25Gb3JLZXlFdmVudChrZXZlbnQtPnF0RXZlbnQoKSk7CisgICAgICAgIHN3aXRj aCAoYWN0aW9uKSB7CisgICAgICAgIGNhc2UgUVdlYlBhZ2U6Okluc2VydFBhcmFncmFwaFNlcGFy YXRvcjoKKyAgICAgICAgY2FzZSBRV2ViUGFnZTo6SW5zZXJ0TGluZVNlcGFyYXRvcjoKKyAgICAg ICAgICAgIG1fcGFnZS0+dHJpZ2dlckFjdGlvbihhY3Rpb24pOworICAgICAgICBkZWZhdWx0Ogor ICAgICAgICAgICAgYnJlYWs7CisgICAgICAgIH0KKyAgICB9CiB9CiAKIEVkaXRvckNsaWVudFF0 OjpFZGl0b3JDbGllbnRRdChRV2ViUGFnZSogcGFnZSkKZGlmZiAtLWdpdCBhL1dlYktpdC9xdC90 ZXN0cy9xd2VicGFnZS90c3RfcXdlYnBhZ2UuY3BwIGIvV2ViS2l0L3F0L3Rlc3RzL3F3ZWJwYWdl L3RzdF9xd2VicGFnZS5jcHAKaW5kZXggZjA3NDJlNC4uMDFlODg1YSAxMDA2NDQKLS0tIGEvV2Vi S2l0L3F0L3Rlc3RzL3F3ZWJwYWdlL3RzdF9xd2VicGFnZS5jcHAKKysrIGIvV2ViS2l0L3F0L3Rl c3RzL3F3ZWJwYWdlL3RzdF9xd2VicGFnZS5jcHAKQEAgLTE3NjAsNiArMTc2MCwyNiBAQCB2b2lk IHRzdF9RV2ViUGFnZTo6aW5wdXRNZXRob2RzKCkKICAgICBRQ09NUEFSRShpbnB1dFZhbHVlLCBR U3RyaW5nKCJRdFdlYktpdDIiKSk7CiAgICAgLy9FTkQgLSBUZXN0IGZvciBzZW5kaW5nIGVtcHR5 IFFJbnB1dE1ldGhvZEV2ZW50CiAjZW5kaWYKKyAgICAvLyBTVEFSVCAtIE5ld2xpbmUgdGVzdCBm b3IgdGV4dGFyZWEKKyAgICBxQXBwLT5wcm9jZXNzRXZlbnRzKCk7CisgICAgcGFnZS0+bWFpbkZy YW1lKCktPnNldEh0bWwoIjxodG1sPjxib2R5PiIgXAorICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAiPHRleHRhcmVhIHJvd3M9JzUnIGNvbHM9JzEnIGlkPSdpbnB1 dDUnIHZhbHVlPScnLz4iIFwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIjwvYm9keT48L2h0bWw+Iik7CisgICAgcGFnZS0+bWFpbkZyYW1lKCktPmV2YWx1YXRl SmF2YVNjcmlwdCgidmFyIGlucHV0RWxlID0gZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoJ2lucHV0 NScpOyBpbnB1dEVsZS5mb2N1cygpOyBpbnB1dEVsZS5zZWxlY3QoKTsiKTsKKyAgICBRS2V5RXZl bnQga2V5RW50ZXIoUUV2ZW50OjpLZXlQcmVzcywgUXQ6OktleV9FbnRlciwgUXQ6Ok5vTW9kaWZp ZXIpOworICAgIHBhZ2UtPmV2ZW50KCZrZXlFbnRlcik7CisgICAgUUxpc3Q8UUlucHV0TWV0aG9k RXZlbnQ6OkF0dHJpYnV0ZT4gYXR0cmliczsKKworICAgIFFJbnB1dE1ldGhvZEV2ZW50IGV2ZW50 VGV4dCgiXG4iLCBhdHRyaWJzKTsKKyAgICBwYWdlLT5ldmVudCgmZXZlbnRUZXh0KTsKKworICAg IFFJbnB1dE1ldGhvZEV2ZW50IGV2ZW50VGV4dDIoInRoaXJkIGxpbmUiLCBhdHRyaWJzKTsKKyAg ICBwYWdlLT5ldmVudCgmZXZlbnRUZXh0Mik7CisgICAgcUFwcC0+cHJvY2Vzc0V2ZW50cygpOwor CisgICAgUVN0cmluZyBpbnB1dFZhbHVlMiA9IHBhZ2UtPm1haW5GcmFtZSgpLT5ldmFsdWF0ZUph dmFTY3JpcHQoImRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCdpbnB1dDUnKS52YWx1ZSIpLnRvU3Ry aW5nKCk7CisgICAgUUNPTVBBUkUoaW5wdXRWYWx1ZTIsIFFTdHJpbmcoIlxuXG50aGlyZCBsaW5l IikpOworICAgIC8vIEVORCAtIE5ld2xpbmUgdGVzdCBmb3IgdGV4dGFyZWEKIAogICAgIGRlbGV0 ZSBjb250YWluZXI7CiB9Cg== 89012 2011-04-11 08:48:44 -0700 2011-04-18 09:16:22 -0700 Allows QtWebKit to insert a new line for a enter key event without key text. 33179.patch text/plain 2436 max.hong.shen SW5kZXg6IFNvdXJjZS9XZWJLaXQvcXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJLaXQvcXQvQ2hhbmdlTG9nCShyZXZpc2lvbiA4MzQ0MikKKysrIFNvdXJjZS9XZWJLaXQvcXQv Q2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTEtMDQtMTEgIFlp IFNoZW4gIDx5aS40LnNoZW5Abm9raWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFtRdF0gRW50ZXJrZXkgdG8gZ28gdG8gTmV3bGluZSBkb2Vz IG5vdCB3b3JrIGluIHRoZSB0ZXh0IGFyZWEoaW4gSFRNTCBmb3JtKQorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzMxNzkKKworICAgICAgICBBbGxvd3Mg UXRXZWJLaXQgdG8gaW5zZXJ0IGEgbmV3IGxpbmUgZm9yIGEgZW50ZXIga2V5IGV2ZW50IHdpdGhv dXQga2V5IHRleHQuCisKKyAgICAgICAgKiBBcGkvcXdlYnBhZ2UuY3BwOgorICAgICAgICAoUVdl YlBhZ2VQcml2YXRlOjprZXlQcmVzc0V2ZW50KToKKyAgICAgICAgKiBXZWJDb3JlU3VwcG9ydC9F ZGl0b3JDbGllbnRRdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpFZGl0b3JDbGllbnRRdDo6aGFu ZGxlSW5wdXRNZXRob2RLZXlkb3duKToKKwogMjAxMS0wNC0xMSAgQmVuamFtaW4gUG91bGFpbiAg PGJlbmphbWluLnBvdWxhaW5Abm9raWEuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEFuZHJl YXMgS2xpbmcuCkluZGV4OiBTb3VyY2UvV2ViS2l0L3F0L0FwaS9xd2VicGFnZS5jcHAKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL1dlYktpdC9xdC9BcGkvcXdlYnBhZ2UuY3BwCShyZXZpc2lvbiA4MzQ0 MCkKKysrIFNvdXJjZS9XZWJLaXQvcXQvQXBpL3F3ZWJwYWdlLmNwcAkod29ya2luZyBjb3B5KQpA QCAtOTI5LDYgKzkyOSw5IEBAIHZvaWQgUVdlYlBhZ2VQcml2YXRlOjprZXlQcmVzc0V2ZW50KFFL ZXkKICAgICAgICAgICAgICAgICBlbHNlCiAgICAgICAgICAgICAgICAgICAgIHEtPnRyaWdnZXJB Y3Rpb24oUVdlYlBhZ2U6OkJhY2spOwogICAgICAgICAgICAgICAgIGJyZWFrOworICAgICAgICAg ICAgY2FzZSBRdDo6S2V5X0VudGVyOgorICAgICAgICAgICAgICAgIHEtPnRyaWdnZXJBY3Rpb24o ZWRpdG9yQWN0aW9uRm9yS2V5RXZlbnQoZXYpKTsKKyAgICAgICAgICAgICAgICBicmVhazsKICAg ICAgICAgICAgIGRlZmF1bHQ6CiAgICAgICAgICAgICAgICAgaGFuZGxlZCA9IGZhbHNlOwogICAg ICAgICAgICAgICAgIGJyZWFrOwpJbmRleDogU291cmNlL1dlYktpdC9xdC9XZWJDb3JlU3VwcG9y dC9FZGl0b3JDbGllbnRRdC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9xdC9XZWJD b3JlU3VwcG9ydC9FZGl0b3JDbGllbnRRdC5jcHAJKHJldmlzaW9uIDgzNDQwKQorKysgU291cmNl L1dlYktpdC9xdC9XZWJDb3JlU3VwcG9ydC9FZGl0b3JDbGllbnRRdC5jcHAJKHdvcmtpbmcgY29w eSkKQEAgLTUzMCwyMiArNTMwLDggQEAgdm9pZCBFZGl0b3JDbGllbnRRdDo6aGFuZGxlS2V5Ym9h cmRFdmVudAogI2VuZGlmIC8vIFFUX05PX1NIT1JUQ1VUCiB9CiAKLXZvaWQgRWRpdG9yQ2xpZW50 UXQ6OmhhbmRsZUlucHV0TWV0aG9kS2V5ZG93bihLZXlib2FyZEV2ZW50KiBldmVudCkKK3ZvaWQg RWRpdG9yQ2xpZW50UXQ6OmhhbmRsZUlucHV0TWV0aG9kS2V5ZG93bihLZXlib2FyZEV2ZW50KikK IHsKLSNpZm5kZWYgUVRfTk9fU0hPUlRDVVQKLSAgICBjb25zdCBQbGF0Zm9ybUtleWJvYXJkRXZl bnQqIGtldmVudCA9IGV2ZW50LT5rZXlFdmVudCgpOwotICAgIGlmIChrZXZlbnQtPnR5cGUoKSA9 PSBQbGF0Zm9ybUtleWJvYXJkRXZlbnQ6OlJhd0tleURvd24pIHsKLSAgICAgICAgUVdlYlBhZ2U6 OldlYkFjdGlvbiBhY3Rpb24gPSBRV2ViUGFnZVByaXZhdGU6OmVkaXRvckFjdGlvbkZvcktleUV2 ZW50KGtldmVudC0+cXRFdmVudCgpKTsKLSAgICAgICAgc3dpdGNoIChhY3Rpb24pIHsKLSAgICAg ICAgY2FzZSBRV2ViUGFnZTo6SW5zZXJ0UGFyYWdyYXBoU2VwYXJhdG9yOgotICAgICAgICBjYXNl IFFXZWJQYWdlOjpJbnNlcnRMaW5lU2VwYXJhdG9yOgotICAgICAgICAgICAgbV9wYWdlLT50cmln Z2VyQWN0aW9uKGFjdGlvbik7Ci0gICAgICAgICAgICBicmVhazsKLSAgICAgICAgZGVmYXVsdDoK LSAgICAgICAgICAgIGJyZWFrOwotICAgICAgICB9Ci0gICAgfQotI2VuZGlmCiB9CiAKIEVkaXRv ckNsaWVudFF0OjpFZGl0b3JDbGllbnRRdChRV2ViUGFnZSogcGFnZSkK 90708 2011-04-22 08:18:03 -0700 2011-04-22 08:35:58 -0700 proposed fix 33179.patch text/plain 2436 max.hong.shen SW5kZXg6IFNvdXJjZS9XZWJLaXQvcXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJLaXQvcXQvQ2hhbmdlTG9nCShyZXZpc2lvbiA4MzQ0MikKKysrIFNvdXJjZS9XZWJLaXQvcXQv Q2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTEtMDQtMTEgIFlp IFNoZW4gIDx5aS40LnNoZW5Abm9raWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFtRdF0gRW50ZXJrZXkgdG8gZ28gdG8gTmV3bGluZSBkb2Vz IG5vdCB3b3JrIGluIHRoZSB0ZXh0IGFyZWEoaW4gSFRNTCBmb3JtKQorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzMxNzkKKworICAgICAgICBBbGxvd3Mg UXRXZWJLaXQgdG8gaW5zZXJ0IGEgbmV3IGxpbmUgZm9yIGEgZW50ZXIga2V5IGV2ZW50IHdpdGhv dXQga2V5IHRleHQuCisKKyAgICAgICAgKiBBcGkvcXdlYnBhZ2UuY3BwOgorICAgICAgICAoUVdl YlBhZ2VQcml2YXRlOjprZXlQcmVzc0V2ZW50KToKKyAgICAgICAgKiBXZWJDb3JlU3VwcG9ydC9F ZGl0b3JDbGllbnRRdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpFZGl0b3JDbGllbnRRdDo6aGFu ZGxlSW5wdXRNZXRob2RLZXlkb3duKToKKwogMjAxMS0wNC0xMSAgQmVuamFtaW4gUG91bGFpbiAg PGJlbmphbWluLnBvdWxhaW5Abm9raWEuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEFuZHJl YXMgS2xpbmcuCkluZGV4OiBTb3VyY2UvV2ViS2l0L3F0L0FwaS9xd2VicGFnZS5jcHAKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL1dlYktpdC9xdC9BcGkvcXdlYnBhZ2UuY3BwCShyZXZpc2lvbiA4MzQ0 MCkKKysrIFNvdXJjZS9XZWJLaXQvcXQvQXBpL3F3ZWJwYWdlLmNwcAkod29ya2luZyBjb3B5KQpA QCAtOTI5LDYgKzkyOSw5IEBAIHZvaWQgUVdlYlBhZ2VQcml2YXRlOjprZXlQcmVzc0V2ZW50KFFL ZXkKICAgICAgICAgICAgICAgICBlbHNlCiAgICAgICAgICAgICAgICAgICAgIHEtPnRyaWdnZXJB Y3Rpb24oUVdlYlBhZ2U6OkJhY2spOwogICAgICAgICAgICAgICAgIGJyZWFrOworICAgICAgICAg ICAgY2FzZSBRdDo6S2V5X0VudGVyOgorICAgICAgICAgICAgICAgIHEtPnRyaWdnZXJBY3Rpb24o ZWRpdG9yQWN0aW9uRm9yS2V5RXZlbnQoZXYpKTsKKyAgICAgICAgICAgICAgICBicmVhazsKICAg ICAgICAgICAgIGRlZmF1bHQ6CiAgICAgICAgICAgICAgICAgaGFuZGxlZCA9IGZhbHNlOwogICAg ICAgICAgICAgICAgIGJyZWFrOwpJbmRleDogU291cmNlL1dlYktpdC9xdC9XZWJDb3JlU3VwcG9y dC9FZGl0b3JDbGllbnRRdC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9xdC9XZWJD b3JlU3VwcG9ydC9FZGl0b3JDbGllbnRRdC5jcHAJKHJldmlzaW9uIDgzNDQwKQorKysgU291cmNl L1dlYktpdC9xdC9XZWJDb3JlU3VwcG9ydC9FZGl0b3JDbGllbnRRdC5jcHAJKHdvcmtpbmcgY29w eSkKQEAgLTUzMCwyMiArNTMwLDggQEAgdm9pZCBFZGl0b3JDbGllbnRRdDo6aGFuZGxlS2V5Ym9h cmRFdmVudAogI2VuZGlmIC8vIFFUX05PX1NIT1JUQ1VUCiB9CiAKLXZvaWQgRWRpdG9yQ2xpZW50 UXQ6OmhhbmRsZUlucHV0TWV0aG9kS2V5ZG93bihLZXlib2FyZEV2ZW50KiBldmVudCkKK3ZvaWQg RWRpdG9yQ2xpZW50UXQ6OmhhbmRsZUlucHV0TWV0aG9kS2V5ZG93bihLZXlib2FyZEV2ZW50KikK IHsKLSNpZm5kZWYgUVRfTk9fU0hPUlRDVVQKLSAgICBjb25zdCBQbGF0Zm9ybUtleWJvYXJkRXZl bnQqIGtldmVudCA9IGV2ZW50LT5rZXlFdmVudCgpOwotICAgIGlmIChrZXZlbnQtPnR5cGUoKSA9 PSBQbGF0Zm9ybUtleWJvYXJkRXZlbnQ6OlJhd0tleURvd24pIHsKLSAgICAgICAgUVdlYlBhZ2U6 OldlYkFjdGlvbiBhY3Rpb24gPSBRV2ViUGFnZVByaXZhdGU6OmVkaXRvckFjdGlvbkZvcktleUV2 ZW50KGtldmVudC0+cXRFdmVudCgpKTsKLSAgICAgICAgc3dpdGNoIChhY3Rpb24pIHsKLSAgICAg ICAgY2FzZSBRV2ViUGFnZTo6SW5zZXJ0UGFyYWdyYXBoU2VwYXJhdG9yOgotICAgICAgICBjYXNl IFFXZWJQYWdlOjpJbnNlcnRMaW5lU2VwYXJhdG9yOgotICAgICAgICAgICAgbV9wYWdlLT50cmln Z2VyQWN0aW9uKGFjdGlvbik7Ci0gICAgICAgICAgICBicmVhazsKLSAgICAgICAgZGVmYXVsdDoK LSAgICAgICAgICAgIGJyZWFrOwotICAgICAgICB9Ci0gICAgfQotI2VuZGlmCiB9CiAKIEVkaXRv ckNsaWVudFF0OjpFZGl0b3JDbGllbnRRdChRV2ViUGFnZSogcGFnZSkK 90709 2011-04-22 08:35:58 -0700 2011-04-26 10:24:08 -0700 proposed fix 33179.patch text/plain 2433 max.hong.shen SW5kZXg6IFNvdXJjZS9XZWJLaXQvcXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJLaXQvcXQvQ2hhbmdlTG9nCShyZXZpc2lvbiA4NDYyOCkKKysrIFNvdXJjZS9XZWJLaXQvcXQv Q2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTEtMDQtMjIgIFlp IFNoZW4gIDx5aS40LnNoZW5Abm9raWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFtRdF0gRW50ZXJrZXkgdG8gZ28gdG8gTmV3bGluZSBkb2Vz IG5vdCB3b3JrIGluIHRoZSB0ZXh0IGFyZWEoaW4gSFRNTCBmb3JtKQorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzMxNzkKKworICAgICAgICBBbGxvd3Mg UXRXZWJLaXQgdG8gaW5zZXJ0IGEgbmV3IGxpbmUgZm9yIGEgZW50ZXIga2V5IGV2ZW50IHdpdGhv dXQga2V5IHRleHQuCisKKyAgICAgICAgKiBBcGkvcXdlYnBhZ2UuY3BwOgorICAgICAgICAoUVdl YlBhZ2VQcml2YXRlOjprZXlQcmVzc0V2ZW50KToKKyAgICAgICAgKiBXZWJDb3JlU3VwcG9ydC9F ZGl0b3JDbGllbnRRdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpFZGl0b3JDbGllbnRRdDo6aGFu ZGxlSW5wdXRNZXRob2RLZXlkb3duKToKKwogMjAxMS0wNC0yMiAgWWkgU2hlbiAgPHlpLjQuc2hl bkBub2tpYS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgS2VubmV0aCBSb2hkZSBDaHJpc3Rp YW5zZW4uCkluZGV4OiBTb3VyY2UvV2ViS2l0L3F0L0FwaS9xd2VicGFnZS5jcHAKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL1dlYktpdC9xdC9BcGkvcXdlYnBhZ2UuY3BwCShyZXZpc2lvbiA4NDYyNykK KysrIFNvdXJjZS9XZWJLaXQvcXQvQXBpL3F3ZWJwYWdlLmNwcAkod29ya2luZyBjb3B5KQpAQCAt OTI5LDYgKzkyOSw5IEBAIHZvaWQgUVdlYlBhZ2VQcml2YXRlOjprZXlQcmVzc0V2ZW50KFFLZXkK ICAgICAgICAgICAgICAgICBlbHNlCiAgICAgICAgICAgICAgICAgICAgIHEtPnRyaWdnZXJBY3Rp b24oUVdlYlBhZ2U6OkJhY2spOwogICAgICAgICAgICAgICAgIGJyZWFrOworICAgICAgICAgICAg Y2FzZSBRdDo6S2V5X0VudGVyOgorICAgICAgICAgICAgICAgIHEtPnRyaWdnZXJBY3Rpb24oZWRp dG9yQWN0aW9uRm9yS2V5RXZlbnQoZXYpKTsKKyAgICAgICAgICAgICAgICBicmVhazsKICAgICAg ICAgICAgIGRlZmF1bHQ6CiAgICAgICAgICAgICAgICAgaGFuZGxlZCA9IGZhbHNlOwogICAgICAg ICAgICAgICAgIGJyZWFrOwpJbmRleDogU291cmNlL1dlYktpdC9xdC9XZWJDb3JlU3VwcG9ydC9F ZGl0b3JDbGllbnRRdC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9xdC9XZWJDb3Jl U3VwcG9ydC9FZGl0b3JDbGllbnRRdC5jcHAJKHJldmlzaW9uIDg0NjI3KQorKysgU291cmNlL1dl YktpdC9xdC9XZWJDb3JlU3VwcG9ydC9FZGl0b3JDbGllbnRRdC5jcHAJKHdvcmtpbmcgY29weSkK QEAgLTUzMCwyMiArNTMwLDggQEAgdm9pZCBFZGl0b3JDbGllbnRRdDo6aGFuZGxlS2V5Ym9hcmRF dmVudAogI2VuZGlmIC8vIFFUX05PX1NIT1JUQ1VUCiB9CiAKLXZvaWQgRWRpdG9yQ2xpZW50UXQ6 OmhhbmRsZUlucHV0TWV0aG9kS2V5ZG93bihLZXlib2FyZEV2ZW50KiBldmVudCkKK3ZvaWQgRWRp dG9yQ2xpZW50UXQ6OmhhbmRsZUlucHV0TWV0aG9kS2V5ZG93bihLZXlib2FyZEV2ZW50KikKIHsK LSNpZm5kZWYgUVRfTk9fU0hPUlRDVVQKLSAgICBjb25zdCBQbGF0Zm9ybUtleWJvYXJkRXZlbnQq IGtldmVudCA9IGV2ZW50LT5rZXlFdmVudCgpOwotICAgIGlmIChrZXZlbnQtPnR5cGUoKSA9PSBQ bGF0Zm9ybUtleWJvYXJkRXZlbnQ6OlJhd0tleURvd24pIHsKLSAgICAgICAgUVdlYlBhZ2U6Oldl YkFjdGlvbiBhY3Rpb24gPSBRV2ViUGFnZVByaXZhdGU6OmVkaXRvckFjdGlvbkZvcktleUV2ZW50 KGtldmVudC0+cXRFdmVudCgpKTsKLSAgICAgICAgc3dpdGNoIChhY3Rpb24pIHsKLSAgICAgICAg Y2FzZSBRV2ViUGFnZTo6SW5zZXJ0UGFyYWdyYXBoU2VwYXJhdG9yOgotICAgICAgICBjYXNlIFFX ZWJQYWdlOjpJbnNlcnRMaW5lU2VwYXJhdG9yOgotICAgICAgICAgICAgbV9wYWdlLT50cmlnZ2Vy QWN0aW9uKGFjdGlvbik7Ci0gICAgICAgICAgICBicmVhazsKLSAgICAgICAgZGVmYXVsdDoKLSAg ICAgICAgICAgIGJyZWFrOwotICAgICAgICB9Ci0gICAgfQotI2VuZGlmCiB9CiAKIEVkaXRvckNs aWVudFF0OjpFZGl0b3JDbGllbnRRdChRV2ViUGFnZSogcGFnZSkK 91124 2011-04-26 10:24:08 -0700 2011-05-16 08:50:33 -0700 add more tests 33179.patch text/plain 6209 max.hong.shen SW5kZXg6IFNvdXJjZS9XZWJLaXQvcXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJLaXQvcXQvQ2hhbmdlTG9nCShyZXZpc2lvbiA4NDkyNCkKKysrIFNvdXJjZS9XZWJLaXQvcXQv Q2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTEtMDQtMjYgIFlp IFNoZW4gIDx5aS40LnNoZW5Abm9raWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFtRdF0gRW50ZXJrZXkgdG8gZ28gdG8gTmV3bGluZSBkb2Vz IG5vdCB3b3JrIGluIHRoZSB0ZXh0IGFyZWEoaW4gSFRNTCBmb3JtKQorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzMxNzkKKworICAgICAgICBBbGxvd3Mg UXRXZWJLaXQgdG8gaW5zZXJ0IGEgbmV3IGxpbmUgZm9yIGEgZW50ZXIga2V5IGV2ZW50IHdpdGhv dXQga2V5IHRleHQuCisKKyAgICAgICAgKiBBcGkvcXdlYnBhZ2UuY3BwOgorICAgICAgICAoUVdl YlBhZ2VQcml2YXRlOjprZXlQcmVzc0V2ZW50KToKKyAgICAgICAgKiBXZWJDb3JlU3VwcG9ydC9F ZGl0b3JDbGllbnRRdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpFZGl0b3JDbGllbnRRdDo6aGFu ZGxlSW5wdXRNZXRob2RLZXlkb3duKToKKyAgICAgICAgKiB0ZXN0cy9xd2VicGFnZS90c3RfcXdl YnBhZ2UuY3BwOgorICAgICAgICAodHN0X1FXZWJQYWdlOjppbnB1dE1ldGhvZHMpOgorCiAyMDEx LTA0LTI2ICBLcmlzdMOzZiBLb3N6dHnDsyAgPEtvc3p0eW8uS3Jpc3RvZkBzdHVkLnUtc3plZ2Vk Lmh1PgogCiAgICAgICAgIFJldmlld2VkIGJ5IENzYWJhIE9zenRyb2dvbsOhYy4KSW5kZXg6IFNv dXJjZS9XZWJLaXQvcXQvQXBpL3F3ZWJwYWdlLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0L3F0L0FwaS9xd2VicGFnZS5jcHAJKHJldmlzaW9uIDg0OTA3KQorKysgU291cmNlL1dlYktp dC9xdC9BcGkvcXdlYnBhZ2UuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC05MjksNiArOTI5LDkgQEAg dm9pZCBRV2ViUGFnZVByaXZhdGU6OmtleVByZXNzRXZlbnQoUUtleQogICAgICAgICAgICAgICAg IGVsc2UKICAgICAgICAgICAgICAgICAgICAgcS0+dHJpZ2dlckFjdGlvbihRV2ViUGFnZTo6QmFj ayk7CiAgICAgICAgICAgICAgICAgYnJlYWs7CisgICAgICAgICAgICBjYXNlIFF0OjpLZXlfRW50 ZXI6CisgICAgICAgICAgICAgICAgcS0+dHJpZ2dlckFjdGlvbihlZGl0b3JBY3Rpb25Gb3JLZXlF dmVudChldikpOworICAgICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICAgICAgZGVmYXVsdDoK ICAgICAgICAgICAgICAgICBoYW5kbGVkID0gZmFsc2U7CiAgICAgICAgICAgICAgICAgYnJlYWs7 CkluZGV4OiBTb3VyY2UvV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0L0VkaXRvckNsaWVudFF0LmNw cAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0L0VkaXRvckNs aWVudFF0LmNwcAkocmV2aXNpb24gODQ5MDcpCisrKyBTb3VyY2UvV2ViS2l0L3F0L1dlYkNvcmVT dXBwb3J0L0VkaXRvckNsaWVudFF0LmNwcAkod29ya2luZyBjb3B5KQpAQCAtNTMwLDIyICs1MzAs OCBAQCB2b2lkIEVkaXRvckNsaWVudFF0OjpoYW5kbGVLZXlib2FyZEV2ZW50CiAjZW5kaWYgLy8g UVRfTk9fU0hPUlRDVVQKIH0KIAotdm9pZCBFZGl0b3JDbGllbnRRdDo6aGFuZGxlSW5wdXRNZXRo b2RLZXlkb3duKEtleWJvYXJkRXZlbnQqIGV2ZW50KQordm9pZCBFZGl0b3JDbGllbnRRdDo6aGFu ZGxlSW5wdXRNZXRob2RLZXlkb3duKEtleWJvYXJkRXZlbnQqKQogewotI2lmbmRlZiBRVF9OT19T SE9SVENVVAotICAgIGNvbnN0IFBsYXRmb3JtS2V5Ym9hcmRFdmVudCoga2V2ZW50ID0gZXZlbnQt PmtleUV2ZW50KCk7Ci0gICAgaWYgKGtldmVudC0+dHlwZSgpID09IFBsYXRmb3JtS2V5Ym9hcmRF dmVudDo6UmF3S2V5RG93bikgewotICAgICAgICBRV2ViUGFnZTo6V2ViQWN0aW9uIGFjdGlvbiA9 IFFXZWJQYWdlUHJpdmF0ZTo6ZWRpdG9yQWN0aW9uRm9yS2V5RXZlbnQoa2V2ZW50LT5xdEV2ZW50 KCkpOwotICAgICAgICBzd2l0Y2ggKGFjdGlvbikgewotICAgICAgICBjYXNlIFFXZWJQYWdlOjpJ bnNlcnRQYXJhZ3JhcGhTZXBhcmF0b3I6Ci0gICAgICAgIGNhc2UgUVdlYlBhZ2U6Okluc2VydExp bmVTZXBhcmF0b3I6Ci0gICAgICAgICAgICBtX3BhZ2UtPnRyaWdnZXJBY3Rpb24oYWN0aW9uKTsK LSAgICAgICAgICAgIGJyZWFrOwotICAgICAgICBkZWZhdWx0OgotICAgICAgICAgICAgYnJlYWs7 Ci0gICAgICAgIH0KLSAgICB9Ci0jZW5kaWYKIH0KIAogRWRpdG9yQ2xpZW50UXQ6OkVkaXRvckNs aWVudFF0KFFXZWJQYWdlKiBwYWdlKQpJbmRleDogU291cmNlL1dlYktpdC9xdC90ZXN0cy9xd2Vi cGFnZS90c3RfcXdlYnBhZ2UuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvcXQvdGVz dHMvcXdlYnBhZ2UvdHN0X3F3ZWJwYWdlLmNwcAkocmV2aXNpb24gODQ5MDcpCisrKyBTb3VyY2Uv V2ViS2l0L3F0L3Rlc3RzL3F3ZWJwYWdlL3RzdF9xd2VicGFnZS5jcHAJKHdvcmtpbmcgY29weSkK QEAgLTIxMzUsMTkgKzIxMzUsNjYgQEAgdm9pZCB0c3RfUVdlYlBhZ2U6OmlucHV0TWV0aG9kcygp CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICI8dGV4dGFyZWEg cm93cz0nNScgY29scz0nMScgaWQ9J2lucHV0NScgdmFsdWU9JycvPiIgXAogICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAiPC9ib2R5PjwvaHRtbD4iKTsKICAgICBw YWdlLT5tYWluRnJhbWUoKS0+ZXZhbHVhdGVKYXZhU2NyaXB0KCJ2YXIgaW5wdXRFbGUgPSBkb2N1 bWVudC5nZXRFbGVtZW50QnlJZCgnaW5wdXQ1Jyk7IGlucHV0RWxlLmZvY3VzKCk7IGlucHV0RWxl LnNlbGVjdCgpOyIpOworICAgIAorICAgIC8vIEVudGVyIEtleSB3aXRob3V0IGtleSB0ZXh0CiAg ICAgUUtleUV2ZW50IGtleUVudGVyKFFFdmVudDo6S2V5UHJlc3MsIFF0OjpLZXlfRW50ZXIsIFF0 OjpOb01vZGlmaWVyKTsKICAgICBwYWdlLT5ldmVudCgma2V5RW50ZXIpOwogICAgIFFMaXN0PFFJ bnB1dE1ldGhvZEV2ZW50OjpBdHRyaWJ1dGU+IGF0dHJpYnM7CiAKLSAgICBRSW5wdXRNZXRob2RF dmVudCBldmVudFRleHQoIlxuIiwgYXR0cmlicyk7CisgICAgUUlucHV0TWV0aG9kRXZlbnQgZXZl bnRUZXh0KFFTdHJpbmcoKSwgYXR0cmlicyk7CisgICAgZXZlbnRUZXh0LnNldENvbW1pdFN0cmlu ZygiXG4iKTsKICAgICBwYWdlLT5ldmVudCgmZXZlbnRUZXh0KTsKIAotICAgIFFJbnB1dE1ldGhv ZEV2ZW50IGV2ZW50VGV4dDIoInRoaXJkIGxpbmUiLCBhdHRyaWJzKTsKKyAgICBRSW5wdXRNZXRo b2RFdmVudCBldmVudFRleHQyKFFTdHJpbmcoKSwgYXR0cmlicyk7CisgICAgZXZlbnRUZXh0Mi5z ZXRDb21taXRTdHJpbmcoInRoaXJkIGxpbmUiKTsKICAgICBwYWdlLT5ldmVudCgmZXZlbnRUZXh0 Mik7CiAgICAgcUFwcC0+cHJvY2Vzc0V2ZW50cygpOwogCiAgICAgUVN0cmluZyBpbnB1dFZhbHVl MiA9IHBhZ2UtPm1haW5GcmFtZSgpLT5ldmFsdWF0ZUphdmFTY3JpcHQoImRvY3VtZW50LmdldEVs ZW1lbnRCeUlkKCdpbnB1dDUnKS52YWx1ZSIpLnRvU3RyaW5nKCk7CiAgICAgUUNPTVBBUkUoaW5w dXRWYWx1ZTIsIFFTdHJpbmcoIlxuXG50aGlyZCBsaW5lIikpOworCisgICAgLy8gRW50ZXIgS2V5 IHdpdGgga2V5IHRleHQgJ1xyJworICAgIHBhZ2UtPm1haW5GcmFtZSgpLT5ldmFsdWF0ZUphdmFT Y3JpcHQoInZhciBpbnB1dEVsZSA9IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCdpbnB1dDUnKTsg aW5wdXRFbGUudmFsdWUgPSAnJzsgaW5wdXRFbGUuZm9jdXMoKTsgaW5wdXRFbGUuc2VsZWN0KCk7 Iik7CisgICAgaW5wdXRWYWx1ZTIgPSBwYWdlLT5tYWluRnJhbWUoKS0+ZXZhbHVhdGVKYXZhU2Ny aXB0KCJkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgnaW5wdXQ1JykudmFsdWUiKS50b1N0cmluZygp OworICAgIFFDT01QQVJFKGlucHV0VmFsdWUyLCBRU3RyaW5nKCIiKSk7CisKKyAgICBRS2V5RXZl bnQga2V5RW50ZXJXaXRoQ2FycmlhZ2VSZXR1cm4oUUV2ZW50OjpLZXlQcmVzcywgUXQ6OktleV9F bnRlciwgUXQ6Ok5vTW9kaWZpZXIsICJcciIpOworICAgIHBhZ2UtPmV2ZW50KCZrZXlFbnRlcldp dGhDYXJyaWFnZVJldHVybik7CisgICAgcGFnZS0+ZXZlbnQoJmV2ZW50VGV4dCk7CisgICAgcGFn ZS0+ZXZlbnQoJmV2ZW50VGV4dDIpOworICAgIHFBcHAtPnByb2Nlc3NFdmVudHMoKTsKKworICAg IGlucHV0VmFsdWUyID0gcGFnZS0+bWFpbkZyYW1lKCktPmV2YWx1YXRlSmF2YVNjcmlwdCgiZG9j dW1lbnQuZ2V0RWxlbWVudEJ5SWQoJ2lucHV0NScpLnZhbHVlIikudG9TdHJpbmcoKTsKKyAgICBR Q09NUEFSRShpbnB1dFZhbHVlMiwgUVN0cmluZygiXG5cbnRoaXJkIGxpbmUiKSk7CisKKyAgICAv LyBFbnRlciBLZXkgd2l0aCBrZXkgdGV4dCAnXG4nCisgICAgcGFnZS0+bWFpbkZyYW1lKCktPmV2 YWx1YXRlSmF2YVNjcmlwdCgidmFyIGlucHV0RWxlID0gZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQo J2lucHV0NScpOyBpbnB1dEVsZS52YWx1ZSA9ICcnOyBpbnB1dEVsZS5mb2N1cygpOyBpbnB1dEVs ZS5zZWxlY3QoKTsiKTsKKyAgICBpbnB1dFZhbHVlMiA9IHBhZ2UtPm1haW5GcmFtZSgpLT5ldmFs dWF0ZUphdmFTY3JpcHQoImRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCdpbnB1dDUnKS52YWx1ZSIp LnRvU3RyaW5nKCk7CisgICAgUUNPTVBBUkUoaW5wdXRWYWx1ZTIsIFFTdHJpbmcoIiIpKTsKKwor ICAgIFFLZXlFdmVudCBrZXlFbnRlcldpdGhMaW5lRmVlZChRRXZlbnQ6OktleVByZXNzLCBRdDo6 S2V5X0VudGVyLCBRdDo6Tm9Nb2RpZmllciwgIlxuIik7CisgICAgcGFnZS0+ZXZlbnQoJmtleUVu dGVyV2l0aExpbmVGZWVkKTsKKyAgICBwYWdlLT5ldmVudCgmZXZlbnRUZXh0KTsKKyAgICBwYWdl LT5ldmVudCgmZXZlbnRUZXh0Mik7CisgICAgcUFwcC0+cHJvY2Vzc0V2ZW50cygpOworCisgICAg aW5wdXRWYWx1ZTIgPSBwYWdlLT5tYWluRnJhbWUoKS0+ZXZhbHVhdGVKYXZhU2NyaXB0KCJkb2N1 bWVudC5nZXRFbGVtZW50QnlJZCgnaW5wdXQ1JykudmFsdWUiKS50b1N0cmluZygpOworICAgIFFD T01QQVJFKGlucHV0VmFsdWUyLCBRU3RyaW5nKCJcblxudGhpcmQgbGluZSIpKTsKKworICAgIC8v IEVudGVyIEtleSB3aXRoIGtleSB0ZXh0ICJcblxyIgorICAgIHBhZ2UtPm1haW5GcmFtZSgpLT5l dmFsdWF0ZUphdmFTY3JpcHQoInZhciBpbnB1dEVsZSA9IGRvY3VtZW50LmdldEVsZW1lbnRCeUlk KCdpbnB1dDUnKTsgaW5wdXRFbGUudmFsdWUgPSAnJzsgaW5wdXRFbGUuZm9jdXMoKTsgaW5wdXRF bGUuc2VsZWN0KCk7Iik7CisgICAgaW5wdXRWYWx1ZTIgPSBwYWdlLT5tYWluRnJhbWUoKS0+ZXZh bHVhdGVKYXZhU2NyaXB0KCJkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgnaW5wdXQ1JykudmFsdWUi KS50b1N0cmluZygpOworICAgIFFDT01QQVJFKGlucHV0VmFsdWUyLCBRU3RyaW5nKCIiKSk7CisK KyAgICBRS2V5RXZlbnQga2V5RW50ZXJXaXRoTEZDUihRRXZlbnQ6OktleVByZXNzLCBRdDo6S2V5 X0VudGVyLCBRdDo6Tm9Nb2RpZmllciwgIlxuXHIiKTsKKyAgICBwYWdlLT5ldmVudCgma2V5RW50 ZXJXaXRoTEZDUik7CisgICAgcGFnZS0+ZXZlbnQoJmV2ZW50VGV4dCk7CisgICAgcGFnZS0+ZXZl bnQoJmV2ZW50VGV4dDIpOworICAgIHFBcHAtPnByb2Nlc3NFdmVudHMoKTsKKworICAgIGlucHV0 VmFsdWUyID0gcGFnZS0+bWFpbkZyYW1lKCktPmV2YWx1YXRlSmF2YVNjcmlwdCgiZG9jdW1lbnQu Z2V0RWxlbWVudEJ5SWQoJ2lucHV0NScpLnZhbHVlIikudG9TdHJpbmcoKTsKKyAgICBRQ09NUEFS RShpbnB1dFZhbHVlMiwgUVN0cmluZygiXG5cbnRoaXJkIGxpbmUiKSk7CisKICAgICAvLyBFTkQg LSBOZXdsaW5lIHRlc3QgZm9yIHRleHRhcmVhCiAKICAgICBkZWxldGUgY29udGFpbmVyOwo= 93648 2011-05-16 08:50:33 -0700 2011-05-16 10:19:20 -0700 updated with Chang's comments 33179.patch text/plain 8141 max.hong.shen SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDg2NTc0KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTEtMDUtMTYgIFlpIFNoZW4g IDx5aS40LnNoZW5Abm9raWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIFtRdF0gRW50ZXJrZXkgdG8gZ28gdG8gTmV3bGluZSBkb2VzIG5vdCB3 b3JrIGluIHRoZSB0ZXh0IGFyZWEoaW4gSFRNTCBmb3JtKQorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzMxNzkKKworICAgICAgICBGaWxsIHRoZSBtaXNz aW5nIGtleSB0ZXh0IGZvciB0aGUgRW50ZXJLZXkgZXZlbnQuCisKKyAgICAgICAgVGVzdHM6IGZh c3QvZXZlbnRzL29uc2VhcmNoLWVudGVyLmh0bWwKKworICAgICAgICAqIHBsYXRmb3JtL3F0L1Bs YXRmb3JtS2V5Ym9hcmRFdmVudFF0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmtleVRleHRGb3JL ZXlFdmVudCk6CisKIDIwMTEtMDUtMTYgIFl1cnkgU2VtaWtoYXRza3kgIDx5dXJ5c0BjaHJvbWl1 bS5vcmc+CiAKICAgICAgICAgVW5yZXZpZXdlZC4gV2luZG93cyBidWlsZCBmaXguCkluZGV4OiBT b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9xdC9QbGF0Zm9ybUtleWJvYXJkRXZlbnRRdC5jcHAKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vcXQvUGxhdGZvcm1LZXlib2FyZEV2 ZW50UXQuY3BwCShyZXZpc2lvbiA4NjU2NikKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3F0 L1BsYXRmb3JtS2V5Ym9hcmRFdmVudFF0LmNwcAkod29ya2luZyBjb3B5KQpAQCAtNTg1LDYgKzU4 NSw5IEBAIHN0YXRpYyBTdHJpbmcga2V5VGV4dEZvcktleUV2ZW50KGNvbnN0IFEKICAgICBjYXNl IFF0OjpLZXlfQmFja3RhYjoKICAgICAgICAgaWYgKGV2ZW50LT50ZXh0KCkuaXNOdWxsKCkpCiAg ICAgICAgICAgICByZXR1cm4gIlx0IjsKKyAgICBjYXNlIFF0OjpLZXlfRW50ZXI6CisgICAgICAg IGlmIChldmVudC0+dGV4dCgpLmlzTnVsbCgpKQorICAgICAgICAgICAgcmV0dXJuICJcciI7CiAg ICAgfQogICAgIHJldHVybiBldmVudC0+dGV4dCgpOwogfQpJbmRleDogU291cmNlL1dlYktpdC9x dC9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9xdC9DaGFuZ2VMb2cJKHJl dmlzaW9uIDg2NTc0KQorKysgU291cmNlL1dlYktpdC9xdC9DaGFuZ2VMb2cJKHdvcmtpbmcgY29w eSkKQEAgLTEsMyArMSwxNyBAQAorMjAxMS0wNS0xNiAgWWkgU2hlbiAgPHlpLjQuc2hlbkBub2tp YS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg W1F0XSBFbnRlcmtleSB0byBnbyB0byBOZXdsaW5lIGRvZXMgbm90IHdvcmsgaW4gdGhlIHRleHQg YXJlYShpbiBIVE1MIGZvcm0pCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0zMzE3OQorCisgICAgICAgIEFkZCBtb3JlIEFwaSB0ZXN0cyBmb3IgdGhlIEVu dGVyS2V5IGV2ZW50LgorCisgICAgICAgICogV2ViQ29yZVN1cHBvcnQvRWRpdG9yQ2xpZW50UXQu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6RWRpdG9yQ2xpZW50UXQ6OmhhbmRsZUlucHV0TWV0aG9k S2V5ZG93bik6IFJlbW92ZSBpbXBsZW1lbnRhdGlvbi4KKyAgICAgICAgKiB0ZXN0cy9xd2VicGFn ZS90c3RfcXdlYnBhZ2UuY3BwOgorICAgICAgICAodHN0X1FXZWJQYWdlOjppbnB1dE1ldGhvZHMp OiBBZGQgbW9yZSB0ZXN0cy4KKwogMjAxMS0wNS0xNiAgQWRhbSBCYXJ0aCAgPGFiYXJ0aEB3ZWJr aXQub3JnPgogCiAgICAgICAgIFBhcnRpYWwgcmV2ZXJ0IG9mIHI4NjUzNy4gIEZ1bGxTY3JlZW5W aWRlb1F0LmggY2FuJ3QgZGVwZW5kIG9uIE93blB0ci5oCkluZGV4OiBTb3VyY2UvV2ViS2l0L3F0 L1dlYkNvcmVTdXBwb3J0L0VkaXRvckNsaWVudFF0LmNwcAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0L0VkaXRvckNsaWVudFF0LmNwcAkocmV2aXNpb24gODY1 NjYpCisrKyBTb3VyY2UvV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0L0VkaXRvckNsaWVudFF0LmNw cAkod29ya2luZyBjb3B5KQpAQCAtNTMxLDIyICs1MzEsOCBAQCB2b2lkIEVkaXRvckNsaWVudFF0 OjpoYW5kbGVLZXlib2FyZEV2ZW50CiAjZW5kaWYgLy8gUVRfTk9fU0hPUlRDVVQKIH0KIAotdm9p ZCBFZGl0b3JDbGllbnRRdDo6aGFuZGxlSW5wdXRNZXRob2RLZXlkb3duKEtleWJvYXJkRXZlbnQq IGV2ZW50KQordm9pZCBFZGl0b3JDbGllbnRRdDo6aGFuZGxlSW5wdXRNZXRob2RLZXlkb3duKEtl eWJvYXJkRXZlbnQqKQogewotI2lmbmRlZiBRVF9OT19TSE9SVENVVAotICAgIGNvbnN0IFBsYXRm b3JtS2V5Ym9hcmRFdmVudCoga2V2ZW50ID0gZXZlbnQtPmtleUV2ZW50KCk7Ci0gICAgaWYgKGtl dmVudC0+dHlwZSgpID09IFBsYXRmb3JtS2V5Ym9hcmRFdmVudDo6UmF3S2V5RG93bikgewotICAg ICAgICBRV2ViUGFnZTo6V2ViQWN0aW9uIGFjdGlvbiA9IFFXZWJQYWdlUHJpdmF0ZTo6ZWRpdG9y QWN0aW9uRm9yS2V5RXZlbnQoa2V2ZW50LT5xdEV2ZW50KCkpOwotICAgICAgICBzd2l0Y2ggKGFj dGlvbikgewotICAgICAgICBjYXNlIFFXZWJQYWdlOjpJbnNlcnRQYXJhZ3JhcGhTZXBhcmF0b3I6 Ci0gICAgICAgIGNhc2UgUVdlYlBhZ2U6Okluc2VydExpbmVTZXBhcmF0b3I6Ci0gICAgICAgICAg ICBtX3BhZ2UtPnRyaWdnZXJBY3Rpb24oYWN0aW9uKTsKLSAgICAgICAgICAgIGJyZWFrOwotICAg ICAgICBkZWZhdWx0OgotICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgIH0KLSAgICB9Ci0jZW5k aWYKIH0KIAogRWRpdG9yQ2xpZW50UXQ6OkVkaXRvckNsaWVudFF0KFFXZWJQYWdlKiBwYWdlKQpJ bmRleDogU291cmNlL1dlYktpdC9xdC90ZXN0cy9xd2VicGFnZS90c3RfcXdlYnBhZ2UuY3BwCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvcXQvdGVzdHMvcXdlYnBhZ2UvdHN0X3F3ZWJwYWdl LmNwcAkocmV2aXNpb24gODY1NjYpCisrKyBTb3VyY2UvV2ViS2l0L3F0L3Rlc3RzL3F3ZWJwYWdl L3RzdF9xd2VicGFnZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTIxNTAsMTkgKzIxNTAsNjYgQEAg dm9pZCB0c3RfUVdlYlBhZ2U6OmlucHV0TWV0aG9kcygpCiAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICI8dGV4dGFyZWEgcm93cz0nNScgY29scz0nMScgaWQ9J2lu cHV0NScgdmFsdWU9JycvPiIgXAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAiPC9ib2R5PjwvaHRtbD4iKTsKICAgICBwYWdlLT5tYWluRnJhbWUoKS0+ZXZhbHVh dGVKYXZhU2NyaXB0KCJ2YXIgaW5wdXRFbGUgPSBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgnaW5w dXQ1Jyk7IGlucHV0RWxlLmZvY3VzKCk7IGlucHV0RWxlLnNlbGVjdCgpOyIpOworICAgIAorICAg IC8vIEVudGVyIEtleSB3aXRob3V0IGtleSB0ZXh0CiAgICAgUUtleUV2ZW50IGtleUVudGVyKFFF dmVudDo6S2V5UHJlc3MsIFF0OjpLZXlfRW50ZXIsIFF0OjpOb01vZGlmaWVyKTsKICAgICBwYWdl LT5ldmVudCgma2V5RW50ZXIpOwogICAgIFFMaXN0PFFJbnB1dE1ldGhvZEV2ZW50OjpBdHRyaWJ1 dGU+IGF0dHJpYnM7CiAKLSAgICBRSW5wdXRNZXRob2RFdmVudCBldmVudFRleHQoIlxuIiwgYXR0 cmlicyk7CisgICAgUUlucHV0TWV0aG9kRXZlbnQgZXZlbnRUZXh0KFFTdHJpbmcoKSwgYXR0cmli cyk7CisgICAgZXZlbnRUZXh0LnNldENvbW1pdFN0cmluZygiXG4iKTsKICAgICBwYWdlLT5ldmVu dCgmZXZlbnRUZXh0KTsKIAotICAgIFFJbnB1dE1ldGhvZEV2ZW50IGV2ZW50VGV4dDIoInRoaXJk IGxpbmUiLCBhdHRyaWJzKTsKKyAgICBRSW5wdXRNZXRob2RFdmVudCBldmVudFRleHQyKFFTdHJp bmcoKSwgYXR0cmlicyk7CisgICAgZXZlbnRUZXh0Mi5zZXRDb21taXRTdHJpbmcoInRoaXJkIGxp bmUiKTsKICAgICBwYWdlLT5ldmVudCgmZXZlbnRUZXh0Mik7CiAgICAgcUFwcC0+cHJvY2Vzc0V2 ZW50cygpOwogCiAgICAgUVN0cmluZyBpbnB1dFZhbHVlMiA9IHBhZ2UtPm1haW5GcmFtZSgpLT5l dmFsdWF0ZUphdmFTY3JpcHQoImRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCdpbnB1dDUnKS52YWx1 ZSIpLnRvU3RyaW5nKCk7CiAgICAgUUNPTVBBUkUoaW5wdXRWYWx1ZTIsIFFTdHJpbmcoIlxuXG50 aGlyZCBsaW5lIikpOworCisgICAgLy8gRW50ZXIgS2V5IHdpdGgga2V5IHRleHQgJ1xyJworICAg IHBhZ2UtPm1haW5GcmFtZSgpLT5ldmFsdWF0ZUphdmFTY3JpcHQoInZhciBpbnB1dEVsZSA9IGRv Y3VtZW50LmdldEVsZW1lbnRCeUlkKCdpbnB1dDUnKTsgaW5wdXRFbGUudmFsdWUgPSAnJzsgaW5w dXRFbGUuZm9jdXMoKTsgaW5wdXRFbGUuc2VsZWN0KCk7Iik7CisgICAgaW5wdXRWYWx1ZTIgPSBw YWdlLT5tYWluRnJhbWUoKS0+ZXZhbHVhdGVKYXZhU2NyaXB0KCJkb2N1bWVudC5nZXRFbGVtZW50 QnlJZCgnaW5wdXQ1JykudmFsdWUiKS50b1N0cmluZygpOworICAgIFFDT01QQVJFKGlucHV0VmFs dWUyLCBRU3RyaW5nKCIiKSk7CisKKyAgICBRS2V5RXZlbnQga2V5RW50ZXJXaXRoQ2FycmlhZ2VS ZXR1cm4oUUV2ZW50OjpLZXlQcmVzcywgUXQ6OktleV9FbnRlciwgUXQ6Ok5vTW9kaWZpZXIsICJc ciIpOworICAgIHBhZ2UtPmV2ZW50KCZrZXlFbnRlcldpdGhDYXJyaWFnZVJldHVybik7CisgICAg cGFnZS0+ZXZlbnQoJmV2ZW50VGV4dCk7CisgICAgcGFnZS0+ZXZlbnQoJmV2ZW50VGV4dDIpOwor ICAgIHFBcHAtPnByb2Nlc3NFdmVudHMoKTsKKworICAgIGlucHV0VmFsdWUyID0gcGFnZS0+bWFp bkZyYW1lKCktPmV2YWx1YXRlSmF2YVNjcmlwdCgiZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoJ2lu cHV0NScpLnZhbHVlIikudG9TdHJpbmcoKTsKKyAgICBRQ09NUEFSRShpbnB1dFZhbHVlMiwgUVN0 cmluZygiXG5cbnRoaXJkIGxpbmUiKSk7CisKKyAgICAvLyBFbnRlciBLZXkgd2l0aCBrZXkgdGV4 dCAnXG4nCisgICAgcGFnZS0+bWFpbkZyYW1lKCktPmV2YWx1YXRlSmF2YVNjcmlwdCgidmFyIGlu cHV0RWxlID0gZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoJ2lucHV0NScpOyBpbnB1dEVsZS52YWx1 ZSA9ICcnOyBpbnB1dEVsZS5mb2N1cygpOyBpbnB1dEVsZS5zZWxlY3QoKTsiKTsKKyAgICBpbnB1 dFZhbHVlMiA9IHBhZ2UtPm1haW5GcmFtZSgpLT5ldmFsdWF0ZUphdmFTY3JpcHQoImRvY3VtZW50 LmdldEVsZW1lbnRCeUlkKCdpbnB1dDUnKS52YWx1ZSIpLnRvU3RyaW5nKCk7CisgICAgUUNPTVBB UkUoaW5wdXRWYWx1ZTIsIFFTdHJpbmcoIiIpKTsKKworICAgIFFLZXlFdmVudCBrZXlFbnRlcldp dGhMaW5lRmVlZChRRXZlbnQ6OktleVByZXNzLCBRdDo6S2V5X0VudGVyLCBRdDo6Tm9Nb2RpZmll ciwgIlxuIik7CisgICAgcGFnZS0+ZXZlbnQoJmtleUVudGVyV2l0aExpbmVGZWVkKTsKKyAgICBw YWdlLT5ldmVudCgmZXZlbnRUZXh0KTsKKyAgICBwYWdlLT5ldmVudCgmZXZlbnRUZXh0Mik7Cisg ICAgcUFwcC0+cHJvY2Vzc0V2ZW50cygpOworCisgICAgaW5wdXRWYWx1ZTIgPSBwYWdlLT5tYWlu RnJhbWUoKS0+ZXZhbHVhdGVKYXZhU2NyaXB0KCJkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgnaW5w dXQ1JykudmFsdWUiKS50b1N0cmluZygpOworICAgIFFDT01QQVJFKGlucHV0VmFsdWUyLCBRU3Ry aW5nKCJcblxudGhpcmQgbGluZSIpKTsKKworICAgIC8vIEVudGVyIEtleSB3aXRoIGtleSB0ZXh0 ICJcblxyIgorICAgIHBhZ2UtPm1haW5GcmFtZSgpLT5ldmFsdWF0ZUphdmFTY3JpcHQoInZhciBp bnB1dEVsZSA9IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCdpbnB1dDUnKTsgaW5wdXRFbGUudmFs dWUgPSAnJzsgaW5wdXRFbGUuZm9jdXMoKTsgaW5wdXRFbGUuc2VsZWN0KCk7Iik7CisgICAgaW5w dXRWYWx1ZTIgPSBwYWdlLT5tYWluRnJhbWUoKS0+ZXZhbHVhdGVKYXZhU2NyaXB0KCJkb2N1bWVu dC5nZXRFbGVtZW50QnlJZCgnaW5wdXQ1JykudmFsdWUiKS50b1N0cmluZygpOworICAgIFFDT01Q QVJFKGlucHV0VmFsdWUyLCBRU3RyaW5nKCIiKSk7CisKKyAgICBRS2V5RXZlbnQga2V5RW50ZXJX aXRoTEZDUihRRXZlbnQ6OktleVByZXNzLCBRdDo6S2V5X0VudGVyLCBRdDo6Tm9Nb2RpZmllciwg IlxuXHIiKTsKKyAgICBwYWdlLT5ldmVudCgma2V5RW50ZXJXaXRoTEZDUik7CisgICAgcGFnZS0+ ZXZlbnQoJmV2ZW50VGV4dCk7CisgICAgcGFnZS0+ZXZlbnQoJmV2ZW50VGV4dDIpOworICAgIHFB cHAtPnByb2Nlc3NFdmVudHMoKTsKKworICAgIGlucHV0VmFsdWUyID0gcGFnZS0+bWFpbkZyYW1l KCktPmV2YWx1YXRlSmF2YVNjcmlwdCgiZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoJ2lucHV0NScp LnZhbHVlIikudG9TdHJpbmcoKTsKKyAgICBRQ09NUEFSRShpbnB1dFZhbHVlMiwgUVN0cmluZygi XG5cbnRoaXJkIGxpbmUiKSk7CisKICAgICAvLyBFTkQgLSBOZXdsaW5lIHRlc3QgZm9yIHRleHRh cmVhCiAKICAgICBkZWxldGUgY29udGFpbmVyOwpJbmRleDogTGF5b3V0VGVzdHMvQ2hhbmdlTG9n Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL0NoYW5nZUxvZwkocmV2aXNpb24gODY1NzQpCisr KyBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxNCBAQAor MjAxMS0wNS0xNiAgWWkgU2hlbiAgPHlpLjQuc2hlbkBub2tpYS5jb20+CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW1F0XSBFbnRlcmtleSB0byBnbyB0 byBOZXdsaW5lIGRvZXMgbm90IHdvcmsgaW4gdGhlIHRleHQgYXJlYShpbiBIVE1MIGZvcm0pCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zMzE3OQorCisg ICAgICAgIFVuc2tpcCB0aGUgZmFzdC9ldmVudHMvb25zZWFyY2gtZW50ZXIuaHRtbCB0ZXN0Lgor CisgICAgICAgICogcGxhdGZvcm0vcXQvU2tpcHBlZDoKKwogMjAxMS0wNS0xNiAgQ3NhYmEgT3N6 dHJvZ29uw6FjICA8b3NzeUB3ZWJraXQub3JnPgogCiAgICAgICAgIFVucmV2aWV3ZWQsIHNraXAg ZmFpbGluZyB0ZXN0cy4KSW5kZXg6IExheW91dFRlc3RzL3BsYXRmb3JtL3F0L1NraXBwZWQKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gTGF5b3V0VGVzdHMvcGxhdGZvcm0vcXQvU2tpcHBlZAkocmV2aXNpb24gODY1 NjYpCisrKyBMYXlvdXRUZXN0cy9wbGF0Zm9ybS9xdC9Ta2lwcGVkCSh3b3JraW5nIGNvcHkpCkBA IC0yMjc4LDEwICsyMjc4LDYgQEAgZmFzdC9kb20vSFRNTE1ldGVyRWxlbWVudC9tZXRlci1zdHls ZXMuaAogaHR0cC90ZXN0cy9pbnNwZWN0b3IvbmV0d29yay9uZXR3b3JrLXNpemUtY2h1bmtlZC5o dG1sCiBodHRwL3Rlc3RzL2luc3BlY3Rvci9uZXR3b3JrL25ldHdvcmstc2l6ZS1zeW5jLmh0bWwK IAotIyBbUXRdUkVHUkVTU0lPTihyODIyNDMpOiBmYXN0L2V2ZW50cy9vbnNlYXJjaC1lbnRlci5o dG1sIGZhaWxzCi0jIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01NzQ3 MgotZmFzdC9ldmVudHMvb25zZWFyY2gtZW50ZXIuaHRtbAotCiAjIFtRdF0gbWVkaWEvdmlkZW8t cGxheWJhY2tyYXRlLmh0bWwgZmFpbHMKICMgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTU3NDc2CiBtZWRpYS92aWRlby1wbGF5YmFja3JhdGUuaHRtbAo= 93664 2011-05-16 10:19:20 -0700 2011-05-18 12:20:02 -0700 updated Changelog 33179.patch text/plain 8263 max.hong.shen SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDg2NTc0KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTEtMDUtMTYgIFlpIFNoZW4g IDx5aS40LnNoZW5Abm9raWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIFtRdF0gRW50ZXJrZXkgdG8gZ28gdG8gTmV3bGluZSBkb2VzIG5vdCB3 b3JrIGluIHRoZSB0ZXh0IGFyZWEoaW4gSFRNTCBmb3JtKQorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzMxNzkKKworICAgICAgICBGaWxsIHRoZSBtaXNz aW5nIGtleSB0ZXh0IGZvciB0aGUgRW50ZXJLZXkgZXZlbnQuCisKKyAgICAgICAgVGVzdHM6IGZh c3QvZXZlbnRzL29uc2VhcmNoLWVudGVyLmh0bWwKKworICAgICAgICAqIHBsYXRmb3JtL3F0L1Bs YXRmb3JtS2V5Ym9hcmRFdmVudFF0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmtleVRleHRGb3JL ZXlFdmVudCk6CisKIDIwMTEtMDUtMTYgIFl1cnkgU2VtaWtoYXRza3kgIDx5dXJ5c0BjaHJvbWl1 bS5vcmc+CiAKICAgICAgICAgVW5yZXZpZXdlZC4gV2luZG93cyBidWlsZCBmaXguCkluZGV4OiBT b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9xdC9QbGF0Zm9ybUtleWJvYXJkRXZlbnRRdC5jcHAKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vcXQvUGxhdGZvcm1LZXlib2FyZEV2 ZW50UXQuY3BwCShyZXZpc2lvbiA4NjU2NikKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3F0 L1BsYXRmb3JtS2V5Ym9hcmRFdmVudFF0LmNwcAkod29ya2luZyBjb3B5KQpAQCAtNTg1LDYgKzU4 NSw5IEBAIHN0YXRpYyBTdHJpbmcga2V5VGV4dEZvcktleUV2ZW50KGNvbnN0IFEKICAgICBjYXNl IFF0OjpLZXlfQmFja3RhYjoKICAgICAgICAgaWYgKGV2ZW50LT50ZXh0KCkuaXNOdWxsKCkpCiAg ICAgICAgICAgICByZXR1cm4gIlx0IjsKKyAgICBjYXNlIFF0OjpLZXlfRW50ZXI6CisgICAgICAg IGlmIChldmVudC0+dGV4dCgpLmlzTnVsbCgpKQorICAgICAgICAgICAgcmV0dXJuICJcciI7CiAg ICAgfQogICAgIHJldHVybiBldmVudC0+dGV4dCgpOwogfQpJbmRleDogU291cmNlL1dlYktpdC9x dC9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9xdC9DaGFuZ2VMb2cJKHJl dmlzaW9uIDg2NTc0KQorKysgU291cmNlL1dlYktpdC9xdC9DaGFuZ2VMb2cJKHdvcmtpbmcgY29w eSkKQEAgLTEsMyArMSwxOCBAQAorMjAxMS0wNS0xNiAgWWkgU2hlbiAgPHlpLjQuc2hlbkBub2tp YS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg W1F0XSBFbnRlcmtleSB0byBnbyB0byBOZXdsaW5lIGRvZXMgbm90IHdvcmsgaW4gdGhlIHRleHQg YXJlYShpbiBIVE1MIGZvcm0pCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0zMzE3OQorCisgICAgICAgIFJlbW92ZSB0aGUgaW1wbGVtZW50YXRpb24gb2Yg dGhlIGhhbmRsZUlucHV0TWV0aG9kS2V5ZG93biwgd2hpY2ggaW50cm9kdWNlcworICAgICAgICBh IHJlZ3Jlc3Npb24ocjgyMjQzKSBvbiBMaW51eC4gQWxzbywgYWRkIG1vcmUgQXBpIHRlc3RzIGZv ciB0aGUgRW50ZXJLZXkgZXZlbnQuCisKKyAgICAgICAgKiBXZWJDb3JlU3VwcG9ydC9FZGl0b3JD bGllbnRRdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpFZGl0b3JDbGllbnRRdDo6aGFuZGxlSW5w dXRNZXRob2RLZXlkb3duKTogUmVtb3ZlIGltcGxlbWVudGF0aW9uLgorICAgICAgICAqIHRlc3Rz L3F3ZWJwYWdlL3RzdF9xd2VicGFnZS5jcHA6CisgICAgICAgICh0c3RfUVdlYlBhZ2U6OmlucHV0 TWV0aG9kcyk6IEFkZCBtb3JlIHRlc3RzLgorCiAyMDExLTA1LTE2ICBBZGFtIEJhcnRoICA8YWJh cnRoQHdlYmtpdC5vcmc+CiAKICAgICAgICAgUGFydGlhbCByZXZlcnQgb2Ygcjg2NTM3LiAgRnVs bFNjcmVlblZpZGVvUXQuaCBjYW4ndCBkZXBlbmQgb24gT3duUHRyLmgKSW5kZXg6IFNvdXJjZS9X ZWJLaXQvcXQvV2ViQ29yZVN1cHBvcnQvRWRpdG9yQ2xpZW50UXQuY3BwCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFNvdXJjZS9XZWJLaXQvcXQvV2ViQ29yZVN1cHBvcnQvRWRpdG9yQ2xpZW50UXQuY3BwCShyZXZp c2lvbiA4NjU2NikKKysrIFNvdXJjZS9XZWJLaXQvcXQvV2ViQ29yZVN1cHBvcnQvRWRpdG9yQ2xp ZW50UXQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC01MzEsMjIgKzUzMSw4IEBAIHZvaWQgRWRpdG9y Q2xpZW50UXQ6OmhhbmRsZUtleWJvYXJkRXZlbnQKICNlbmRpZiAvLyBRVF9OT19TSE9SVENVVAog fQogCi12b2lkIEVkaXRvckNsaWVudFF0OjpoYW5kbGVJbnB1dE1ldGhvZEtleWRvd24oS2V5Ym9h cmRFdmVudCogZXZlbnQpCit2b2lkIEVkaXRvckNsaWVudFF0OjpoYW5kbGVJbnB1dE1ldGhvZEtl eWRvd24oS2V5Ym9hcmRFdmVudCopCiB7Ci0jaWZuZGVmIFFUX05PX1NIT1JUQ1VUCi0gICAgY29u c3QgUGxhdGZvcm1LZXlib2FyZEV2ZW50KiBrZXZlbnQgPSBldmVudC0+a2V5RXZlbnQoKTsKLSAg ICBpZiAoa2V2ZW50LT50eXBlKCkgPT0gUGxhdGZvcm1LZXlib2FyZEV2ZW50OjpSYXdLZXlEb3du KSB7Ci0gICAgICAgIFFXZWJQYWdlOjpXZWJBY3Rpb24gYWN0aW9uID0gUVdlYlBhZ2VQcml2YXRl OjplZGl0b3JBY3Rpb25Gb3JLZXlFdmVudChrZXZlbnQtPnF0RXZlbnQoKSk7Ci0gICAgICAgIHN3 aXRjaCAoYWN0aW9uKSB7Ci0gICAgICAgIGNhc2UgUVdlYlBhZ2U6Okluc2VydFBhcmFncmFwaFNl cGFyYXRvcjoKLSAgICAgICAgY2FzZSBRV2ViUGFnZTo6SW5zZXJ0TGluZVNlcGFyYXRvcjoKLSAg ICAgICAgICAgIG1fcGFnZS0+dHJpZ2dlckFjdGlvbihhY3Rpb24pOwotICAgICAgICAgICAgYnJl YWs7Ci0gICAgICAgIGRlZmF1bHQ6Ci0gICAgICAgICAgICBicmVhazsKLSAgICAgICAgfQotICAg IH0KLSNlbmRpZgogfQogCiBFZGl0b3JDbGllbnRRdDo6RWRpdG9yQ2xpZW50UXQoUVdlYlBhZ2Uq IHBhZ2UpCkluZGV4OiBTb3VyY2UvV2ViS2l0L3F0L3Rlc3RzL3F3ZWJwYWdlL3RzdF9xd2VicGFn ZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9xdC90ZXN0cy9xd2VicGFnZS90c3Rf cXdlYnBhZ2UuY3BwCShyZXZpc2lvbiA4NjU2NikKKysrIFNvdXJjZS9XZWJLaXQvcXQvdGVzdHMv cXdlYnBhZ2UvdHN0X3F3ZWJwYWdlLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjE1MCwxOSArMjE1 MCw2NiBAQCB2b2lkIHRzdF9RV2ViUGFnZTo6aW5wdXRNZXRob2RzKCkKICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIjx0ZXh0YXJlYSByb3dzPSc1JyBjb2xzPScx JyBpZD0naW5wdXQ1JyB2YWx1ZT0nJy8+IiBcCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICI8L2JvZHk+PC9odG1sPiIpOwogICAgIHBhZ2UtPm1haW5GcmFtZSgp LT5ldmFsdWF0ZUphdmFTY3JpcHQoInZhciBpbnB1dEVsZSA9IGRvY3VtZW50LmdldEVsZW1lbnRC eUlkKCdpbnB1dDUnKTsgaW5wdXRFbGUuZm9jdXMoKTsgaW5wdXRFbGUuc2VsZWN0KCk7Iik7Cisg ICAgCisgICAgLy8gRW50ZXIgS2V5IHdpdGhvdXQga2V5IHRleHQKICAgICBRS2V5RXZlbnQga2V5 RW50ZXIoUUV2ZW50OjpLZXlQcmVzcywgUXQ6OktleV9FbnRlciwgUXQ6Ok5vTW9kaWZpZXIpOwog ICAgIHBhZ2UtPmV2ZW50KCZrZXlFbnRlcik7CiAgICAgUUxpc3Q8UUlucHV0TWV0aG9kRXZlbnQ6 OkF0dHJpYnV0ZT4gYXR0cmliczsKIAotICAgIFFJbnB1dE1ldGhvZEV2ZW50IGV2ZW50VGV4dCgi XG4iLCBhdHRyaWJzKTsKKyAgICBRSW5wdXRNZXRob2RFdmVudCBldmVudFRleHQoUVN0cmluZygp LCBhdHRyaWJzKTsKKyAgICBldmVudFRleHQuc2V0Q29tbWl0U3RyaW5nKCJcbiIpOwogICAgIHBh Z2UtPmV2ZW50KCZldmVudFRleHQpOwogCi0gICAgUUlucHV0TWV0aG9kRXZlbnQgZXZlbnRUZXh0 MigidGhpcmQgbGluZSIsIGF0dHJpYnMpOworICAgIFFJbnB1dE1ldGhvZEV2ZW50IGV2ZW50VGV4 dDIoUVN0cmluZygpLCBhdHRyaWJzKTsKKyAgICBldmVudFRleHQyLnNldENvbW1pdFN0cmluZygi dGhpcmQgbGluZSIpOwogICAgIHBhZ2UtPmV2ZW50KCZldmVudFRleHQyKTsKICAgICBxQXBwLT5w cm9jZXNzRXZlbnRzKCk7CiAKICAgICBRU3RyaW5nIGlucHV0VmFsdWUyID0gcGFnZS0+bWFpbkZy YW1lKCktPmV2YWx1YXRlSmF2YVNjcmlwdCgiZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoJ2lucHV0 NScpLnZhbHVlIikudG9TdHJpbmcoKTsKICAgICBRQ09NUEFSRShpbnB1dFZhbHVlMiwgUVN0cmlu ZygiXG5cbnRoaXJkIGxpbmUiKSk7CisKKyAgICAvLyBFbnRlciBLZXkgd2l0aCBrZXkgdGV4dCAn XHInCisgICAgcGFnZS0+bWFpbkZyYW1lKCktPmV2YWx1YXRlSmF2YVNjcmlwdCgidmFyIGlucHV0 RWxlID0gZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoJ2lucHV0NScpOyBpbnB1dEVsZS52YWx1ZSA9 ICcnOyBpbnB1dEVsZS5mb2N1cygpOyBpbnB1dEVsZS5zZWxlY3QoKTsiKTsKKyAgICBpbnB1dFZh bHVlMiA9IHBhZ2UtPm1haW5GcmFtZSgpLT5ldmFsdWF0ZUphdmFTY3JpcHQoImRvY3VtZW50Lmdl dEVsZW1lbnRCeUlkKCdpbnB1dDUnKS52YWx1ZSIpLnRvU3RyaW5nKCk7CisgICAgUUNPTVBBUkUo aW5wdXRWYWx1ZTIsIFFTdHJpbmcoIiIpKTsKKworICAgIFFLZXlFdmVudCBrZXlFbnRlcldpdGhD YXJyaWFnZVJldHVybihRRXZlbnQ6OktleVByZXNzLCBRdDo6S2V5X0VudGVyLCBRdDo6Tm9Nb2Rp ZmllciwgIlxyIik7CisgICAgcGFnZS0+ZXZlbnQoJmtleUVudGVyV2l0aENhcnJpYWdlUmV0dXJu KTsKKyAgICBwYWdlLT5ldmVudCgmZXZlbnRUZXh0KTsKKyAgICBwYWdlLT5ldmVudCgmZXZlbnRU ZXh0Mik7CisgICAgcUFwcC0+cHJvY2Vzc0V2ZW50cygpOworCisgICAgaW5wdXRWYWx1ZTIgPSBw YWdlLT5tYWluRnJhbWUoKS0+ZXZhbHVhdGVKYXZhU2NyaXB0KCJkb2N1bWVudC5nZXRFbGVtZW50 QnlJZCgnaW5wdXQ1JykudmFsdWUiKS50b1N0cmluZygpOworICAgIFFDT01QQVJFKGlucHV0VmFs dWUyLCBRU3RyaW5nKCJcblxudGhpcmQgbGluZSIpKTsKKworICAgIC8vIEVudGVyIEtleSB3aXRo IGtleSB0ZXh0ICdcbicKKyAgICBwYWdlLT5tYWluRnJhbWUoKS0+ZXZhbHVhdGVKYXZhU2NyaXB0 KCJ2YXIgaW5wdXRFbGUgPSBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgnaW5wdXQ1Jyk7IGlucHV0 RWxlLnZhbHVlID0gJyc7IGlucHV0RWxlLmZvY3VzKCk7IGlucHV0RWxlLnNlbGVjdCgpOyIpOwor ICAgIGlucHV0VmFsdWUyID0gcGFnZS0+bWFpbkZyYW1lKCktPmV2YWx1YXRlSmF2YVNjcmlwdCgi ZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoJ2lucHV0NScpLnZhbHVlIikudG9TdHJpbmcoKTsKKyAg ICBRQ09NUEFSRShpbnB1dFZhbHVlMiwgUVN0cmluZygiIikpOworCisgICAgUUtleUV2ZW50IGtl eUVudGVyV2l0aExpbmVGZWVkKFFFdmVudDo6S2V5UHJlc3MsIFF0OjpLZXlfRW50ZXIsIFF0OjpO b01vZGlmaWVyLCAiXG4iKTsKKyAgICBwYWdlLT5ldmVudCgma2V5RW50ZXJXaXRoTGluZUZlZWQp OworICAgIHBhZ2UtPmV2ZW50KCZldmVudFRleHQpOworICAgIHBhZ2UtPmV2ZW50KCZldmVudFRl eHQyKTsKKyAgICBxQXBwLT5wcm9jZXNzRXZlbnRzKCk7CisKKyAgICBpbnB1dFZhbHVlMiA9IHBh Z2UtPm1haW5GcmFtZSgpLT5ldmFsdWF0ZUphdmFTY3JpcHQoImRvY3VtZW50LmdldEVsZW1lbnRC eUlkKCdpbnB1dDUnKS52YWx1ZSIpLnRvU3RyaW5nKCk7CisgICAgUUNPTVBBUkUoaW5wdXRWYWx1 ZTIsIFFTdHJpbmcoIlxuXG50aGlyZCBsaW5lIikpOworCisgICAgLy8gRW50ZXIgS2V5IHdpdGgg a2V5IHRleHQgIlxuXHIiCisgICAgcGFnZS0+bWFpbkZyYW1lKCktPmV2YWx1YXRlSmF2YVNjcmlw dCgidmFyIGlucHV0RWxlID0gZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoJ2lucHV0NScpOyBpbnB1 dEVsZS52YWx1ZSA9ICcnOyBpbnB1dEVsZS5mb2N1cygpOyBpbnB1dEVsZS5zZWxlY3QoKTsiKTsK KyAgICBpbnB1dFZhbHVlMiA9IHBhZ2UtPm1haW5GcmFtZSgpLT5ldmFsdWF0ZUphdmFTY3JpcHQo ImRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCdpbnB1dDUnKS52YWx1ZSIpLnRvU3RyaW5nKCk7Cisg ICAgUUNPTVBBUkUoaW5wdXRWYWx1ZTIsIFFTdHJpbmcoIiIpKTsKKworICAgIFFLZXlFdmVudCBr ZXlFbnRlcldpdGhMRkNSKFFFdmVudDo6S2V5UHJlc3MsIFF0OjpLZXlfRW50ZXIsIFF0OjpOb01v ZGlmaWVyLCAiXG5cciIpOworICAgIHBhZ2UtPmV2ZW50KCZrZXlFbnRlcldpdGhMRkNSKTsKKyAg ICBwYWdlLT5ldmVudCgmZXZlbnRUZXh0KTsKKyAgICBwYWdlLT5ldmVudCgmZXZlbnRUZXh0Mik7 CisgICAgcUFwcC0+cHJvY2Vzc0V2ZW50cygpOworCisgICAgaW5wdXRWYWx1ZTIgPSBwYWdlLT5t YWluRnJhbWUoKS0+ZXZhbHVhdGVKYXZhU2NyaXB0KCJkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgn aW5wdXQ1JykudmFsdWUiKS50b1N0cmluZygpOworICAgIFFDT01QQVJFKGlucHV0VmFsdWUyLCBR U3RyaW5nKCJcblxudGhpcmQgbGluZSIpKTsKKwogICAgIC8vIEVORCAtIE5ld2xpbmUgdGVzdCBm b3IgdGV4dGFyZWEKIAogICAgIGRlbGV0ZSBjb250YWluZXI7CkluZGV4OiBMYXlvdXRUZXN0cy9D aGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCShyZXZpc2lvbiA4 NjU3NCkKKysrIExheW91dFRlc3RzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsx LDE0IEBACisyMDExLTA1LTE2ICBZaSBTaGVuICA8eWkuNC5zaGVuQG5va2lhLmNvbT4KKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbUXRdIEVudGVya2V5 IHRvIGdvIHRvIE5ld2xpbmUgZG9lcyBub3Qgd29yayBpbiB0aGUgdGV4dCBhcmVhKGluIEhUTUwg Zm9ybSkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTMz MTc5CisKKyAgICAgICAgVW5za2lwIHRoZSBmYXN0L2V2ZW50cy9vbnNlYXJjaC1lbnRlci5odG1s IHRlc3QuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9xdC9Ta2lwcGVkOgorCiAyMDExLTA1LTE2ICBD c2FiYSBPc3p0cm9nb27DoWMgIDxvc3N5QHdlYmtpdC5vcmc+CiAKICAgICAgICAgVW5yZXZpZXdl ZCwgc2tpcCBmYWlsaW5nIHRlc3RzLgpJbmRleDogTGF5b3V0VGVzdHMvcGxhdGZvcm0vcXQvU2tp cHBlZAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9wbGF0Zm9ybS9xdC9Ta2lwcGVkCShyZXZp c2lvbiA4NjU2NikKKysrIExheW91dFRlc3RzL3BsYXRmb3JtL3F0L1NraXBwZWQJKHdvcmtpbmcg Y29weSkKQEAgLTIyNzgsMTAgKzIyNzgsNiBAQCBmYXN0L2RvbS9IVE1MTWV0ZXJFbGVtZW50L21l dGVyLXN0eWxlcy5oCiBodHRwL3Rlc3RzL2luc3BlY3Rvci9uZXR3b3JrL25ldHdvcmstc2l6ZS1j aHVua2VkLmh0bWwKIGh0dHAvdGVzdHMvaW5zcGVjdG9yL25ldHdvcmsvbmV0d29yay1zaXplLXN5 bmMuaHRtbAogCi0jIFtRdF1SRUdSRVNTSU9OKHI4MjI0Myk6IGZhc3QvZXZlbnRzL29uc2VhcmNo LWVudGVyLmh0bWwgZmFpbHMKLSMgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTU3NDcyCi1mYXN0L2V2ZW50cy9vbnNlYXJjaC1lbnRlci5odG1sCi0KICMgW1F0XSBtZWRp YS92aWRlby1wbGF5YmFja3JhdGUuaHRtbCBmYWlscwogIyBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9NTc0NzYKIG1lZGlhL3ZpZGVvLXBsYXliYWNrcmF0ZS5odG1sCg== 93963 2011-05-18 12:20:02 -0700 2011-05-18 15:11:07 -0700 fix the issue found by kling 33179.patch text/plain 8240 max.hong.shen SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDg2NzgwKQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTEtMDUtMTggIFlpIFNoZW4g IDx5aS40LnNoZW5Abm9raWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIFtRdF0gRW50ZXJrZXkgdG8gZ28gdG8gTmV3bGluZSBkb2VzIG5vdCB3 b3JrIGluIHRoZSB0ZXh0IGFyZWEoaW4gSFRNTCBmb3JtKQorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzMxNzkKKworICAgICAgICBGaWxsIHRoZSBtaXNz aW5nIGtleSB0ZXh0IGZvciB0aGUgRW50ZXJLZXkgZXZlbnQuCisKKyAgICAgICAgVGVzdHM6IGZh c3QvZXZlbnRzL29uc2VhcmNoLWVudGVyLmh0bWwKKworICAgICAgICAqIHBsYXRmb3JtL3F0L1Bs YXRmb3JtS2V5Ym9hcmRFdmVudFF0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmtleVRleHRGb3JL ZXlFdmVudCk6CisKIDIwMTEtMDUtMTggIEV2YW4gTWFydGluICA8ZXZhbkBjaHJvbWl1bS5vcmc+ CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgVG9ueSBDaGFuZy4KSW5kZXg6IFNvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL3F0L1BsYXRmb3JtS2V5Ym9hcmRFdmVudFF0LmNwcAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBT b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9xdC9QbGF0Zm9ybUtleWJvYXJkRXZlbnRRdC5jcHAJKHJl dmlzaW9uIDg2Nzc2KQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vcXQvUGxhdGZvcm1LZXli b2FyZEV2ZW50UXQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC01ODUsNiArNTg1LDEwIEBAIHN0YXRp YyBTdHJpbmcga2V5VGV4dEZvcktleUV2ZW50KGNvbnN0IFEKICAgICBjYXNlIFF0OjpLZXlfQmFj a3RhYjoKICAgICAgICAgaWYgKGV2ZW50LT50ZXh0KCkuaXNOdWxsKCkpCiAgICAgICAgICAgICBy ZXR1cm4gIlx0IjsKKyAgICAgICAgYnJlYWs7CisgICAgY2FzZSBRdDo6S2V5X0VudGVyOgorICAg ICAgICBpZiAoZXZlbnQtPnRleHQoKS5pc051bGwoKSkKKyAgICAgICAgICAgIHJldHVybiAiXHIi OwogICAgIH0KICAgICByZXR1cm4gZXZlbnQtPnRleHQoKTsKIH0KSW5kZXg6IFNvdXJjZS9XZWJL aXQvcXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvcXQvQ2hhbmdlTG9n CShyZXZpc2lvbiA4Njc4MCkKKysrIFNvdXJjZS9XZWJLaXQvcXQvQ2hhbmdlTG9nCSh3b3JraW5n IGNvcHkpCkBAIC0xLDMgKzEsMTggQEAKKzIwMTEtMDUtMTggIFlpIFNoZW4gIDx5aS40LnNoZW5A bm9raWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIFtRdF0gRW50ZXJrZXkgdG8gZ28gdG8gTmV3bGluZSBkb2VzIG5vdCB3b3JrIGluIHRoZSB0 ZXh0IGFyZWEoaW4gSFRNTCBmb3JtKQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MzMxNzkKKworICAgICAgICBSZW1vdmUgdGhlIGltcGxlbWVudGF0aW9u IG9mIHRoZSBoYW5kbGVJbnB1dE1ldGhvZEtleWRvd24sIHdoaWNoIGludHJvZHVjZXMKKyAgICAg ICAgYSByZWdyZXNzaW9uKHI4MjI0Mykgb24gTGludXguIEFsc28sIGFkZCBtb3JlIEFwaSB0ZXN0 cyBmb3IgdGhlIEVudGVyS2V5IGV2ZW50LgorCisgICAgICAgICogV2ViQ29yZVN1cHBvcnQvRWRp dG9yQ2xpZW50UXQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RWRpdG9yQ2xpZW50UXQ6OmhhbmRs ZUlucHV0TWV0aG9kS2V5ZG93bik6IFJlbW92ZSBpbXBsZW1lbnRhdGlvbi4KKyAgICAgICAgKiB0 ZXN0cy9xd2VicGFnZS90c3RfcXdlYnBhZ2UuY3BwOgorICAgICAgICAodHN0X1FXZWJQYWdlOjpp bnB1dE1ldGhvZHMpOiBBZGQgbW9yZSB0ZXN0cy4KKwogMjAxMS0wNS0xOCAgS3Jpc3TDs2YgS29z enR5w7MgIDxLb3N6dHlvLktyaXN0b2ZAc3R1ZC51LXN6ZWdlZC5odT4KIAogICAgICAgICBSZXZp ZXdlZCBieSBDc2FiYSBPc3p0cm9nb27DoWMuCkluZGV4OiBTb3VyY2UvV2ViS2l0L3F0L1dlYkNv cmVTdXBwb3J0L0VkaXRvckNsaWVudFF0LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0 L3F0L1dlYkNvcmVTdXBwb3J0L0VkaXRvckNsaWVudFF0LmNwcAkocmV2aXNpb24gODY3NzYpCisr KyBTb3VyY2UvV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0L0VkaXRvckNsaWVudFF0LmNwcAkod29y a2luZyBjb3B5KQpAQCAtNTMxLDIyICs1MzEsOCBAQCB2b2lkIEVkaXRvckNsaWVudFF0OjpoYW5k bGVLZXlib2FyZEV2ZW50CiAjZW5kaWYgLy8gUVRfTk9fU0hPUlRDVVQKIH0KIAotdm9pZCBFZGl0 b3JDbGllbnRRdDo6aGFuZGxlSW5wdXRNZXRob2RLZXlkb3duKEtleWJvYXJkRXZlbnQqIGV2ZW50 KQordm9pZCBFZGl0b3JDbGllbnRRdDo6aGFuZGxlSW5wdXRNZXRob2RLZXlkb3duKEtleWJvYXJk RXZlbnQqKQogewotI2lmbmRlZiBRVF9OT19TSE9SVENVVAotICAgIGNvbnN0IFBsYXRmb3JtS2V5 Ym9hcmRFdmVudCoga2V2ZW50ID0gZXZlbnQtPmtleUV2ZW50KCk7Ci0gICAgaWYgKGtldmVudC0+ dHlwZSgpID09IFBsYXRmb3JtS2V5Ym9hcmRFdmVudDo6UmF3S2V5RG93bikgewotICAgICAgICBR V2ViUGFnZTo6V2ViQWN0aW9uIGFjdGlvbiA9IFFXZWJQYWdlUHJpdmF0ZTo6ZWRpdG9yQWN0aW9u Rm9yS2V5RXZlbnQoa2V2ZW50LT5xdEV2ZW50KCkpOwotICAgICAgICBzd2l0Y2ggKGFjdGlvbikg ewotICAgICAgICBjYXNlIFFXZWJQYWdlOjpJbnNlcnRQYXJhZ3JhcGhTZXBhcmF0b3I6Ci0gICAg ICAgIGNhc2UgUVdlYlBhZ2U6Okluc2VydExpbmVTZXBhcmF0b3I6Ci0gICAgICAgICAgICBtX3Bh Z2UtPnRyaWdnZXJBY3Rpb24oYWN0aW9uKTsKLSAgICAgICAgICAgIGJyZWFrOwotICAgICAgICBk ZWZhdWx0OgotICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgIH0KLSAgICB9Ci0jZW5kaWYKIH0K IAogRWRpdG9yQ2xpZW50UXQ6OkVkaXRvckNsaWVudFF0KFFXZWJQYWdlKiBwYWdlKQpJbmRleDog U291cmNlL1dlYktpdC9xdC90ZXN0cy9xd2VicGFnZS90c3RfcXdlYnBhZ2UuY3BwCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFNvdXJjZS9XZWJLaXQvcXQvdGVzdHMvcXdlYnBhZ2UvdHN0X3F3ZWJwYWdlLmNwcAko cmV2aXNpb24gODY3NzYpCisrKyBTb3VyY2UvV2ViS2l0L3F0L3Rlc3RzL3F3ZWJwYWdlL3RzdF9x d2VicGFnZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTIxNTAsMTkgKzIxNTAsNjYgQEAgdm9pZCB0 c3RfUVdlYlBhZ2U6OmlucHV0TWV0aG9kcygpCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICI8dGV4dGFyZWEgcm93cz0nNScgY29scz0nMScgaWQ9J2lucHV0NScg dmFsdWU9JycvPiIgXAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAiPC9ib2R5PjwvaHRtbD4iKTsKICAgICBwYWdlLT5tYWluRnJhbWUoKS0+ZXZhbHVhdGVKYXZh U2NyaXB0KCJ2YXIgaW5wdXRFbGUgPSBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgnaW5wdXQ1Jyk7 IGlucHV0RWxlLmZvY3VzKCk7IGlucHV0RWxlLnNlbGVjdCgpOyIpOworICAgIAorICAgIC8vIEVu dGVyIEtleSB3aXRob3V0IGtleSB0ZXh0CiAgICAgUUtleUV2ZW50IGtleUVudGVyKFFFdmVudDo6 S2V5UHJlc3MsIFF0OjpLZXlfRW50ZXIsIFF0OjpOb01vZGlmaWVyKTsKICAgICBwYWdlLT5ldmVu dCgma2V5RW50ZXIpOwogICAgIFFMaXN0PFFJbnB1dE1ldGhvZEV2ZW50OjpBdHRyaWJ1dGU+IGF0 dHJpYnM7CiAKLSAgICBRSW5wdXRNZXRob2RFdmVudCBldmVudFRleHQoIlxuIiwgYXR0cmlicyk7 CisgICAgUUlucHV0TWV0aG9kRXZlbnQgZXZlbnRUZXh0KFFTdHJpbmcoKSwgYXR0cmlicyk7Cisg ICAgZXZlbnRUZXh0LnNldENvbW1pdFN0cmluZygiXG4iKTsKICAgICBwYWdlLT5ldmVudCgmZXZl bnRUZXh0KTsKIAotICAgIFFJbnB1dE1ldGhvZEV2ZW50IGV2ZW50VGV4dDIoInRoaXJkIGxpbmUi LCBhdHRyaWJzKTsKKyAgICBRSW5wdXRNZXRob2RFdmVudCBldmVudFRleHQyKFFTdHJpbmcoKSwg YXR0cmlicyk7CisgICAgZXZlbnRUZXh0Mi5zZXRDb21taXRTdHJpbmcoInRoaXJkIGxpbmUiKTsK ICAgICBwYWdlLT5ldmVudCgmZXZlbnRUZXh0Mik7CiAgICAgcUFwcC0+cHJvY2Vzc0V2ZW50cygp OwogCiAgICAgUVN0cmluZyBpbnB1dFZhbHVlMiA9IHBhZ2UtPm1haW5GcmFtZSgpLT5ldmFsdWF0 ZUphdmFTY3JpcHQoImRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCdpbnB1dDUnKS52YWx1ZSIpLnRv U3RyaW5nKCk7CiAgICAgUUNPTVBBUkUoaW5wdXRWYWx1ZTIsIFFTdHJpbmcoIlxuXG50aGlyZCBs aW5lIikpOworCisgICAgLy8gRW50ZXIgS2V5IHdpdGgga2V5IHRleHQgJ1xyJworICAgIHBhZ2Ut Pm1haW5GcmFtZSgpLT5ldmFsdWF0ZUphdmFTY3JpcHQoInZhciBpbnB1dEVsZSA9IGRvY3VtZW50 LmdldEVsZW1lbnRCeUlkKCdpbnB1dDUnKTsgaW5wdXRFbGUudmFsdWUgPSAnJzsgaW5wdXRFbGUu Zm9jdXMoKTsgaW5wdXRFbGUuc2VsZWN0KCk7Iik7CisgICAgaW5wdXRWYWx1ZTIgPSBwYWdlLT5t YWluRnJhbWUoKS0+ZXZhbHVhdGVKYXZhU2NyaXB0KCJkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgn aW5wdXQ1JykudmFsdWUiKS50b1N0cmluZygpOworICAgIFFDT01QQVJFKGlucHV0VmFsdWUyLCBR U3RyaW5nKCIiKSk7CisKKyAgICBRS2V5RXZlbnQga2V5RW50ZXJXaXRoQ2FycmlhZ2VSZXR1cm4o UUV2ZW50OjpLZXlQcmVzcywgUXQ6OktleV9FbnRlciwgUXQ6Ok5vTW9kaWZpZXIsICJcciIpOwor ICAgIHBhZ2UtPmV2ZW50KCZrZXlFbnRlcldpdGhDYXJyaWFnZVJldHVybik7CisgICAgcGFnZS0+ ZXZlbnQoJmV2ZW50VGV4dCk7CisgICAgcGFnZS0+ZXZlbnQoJmV2ZW50VGV4dDIpOworICAgIHFB cHAtPnByb2Nlc3NFdmVudHMoKTsKKworICAgIGlucHV0VmFsdWUyID0gcGFnZS0+bWFpbkZyYW1l KCktPmV2YWx1YXRlSmF2YVNjcmlwdCgiZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoJ2lucHV0NScp LnZhbHVlIikudG9TdHJpbmcoKTsKKyAgICBRQ09NUEFSRShpbnB1dFZhbHVlMiwgUVN0cmluZygi XG5cbnRoaXJkIGxpbmUiKSk7CisKKyAgICAvLyBFbnRlciBLZXkgd2l0aCBrZXkgdGV4dCAnXG4n CisgICAgcGFnZS0+bWFpbkZyYW1lKCktPmV2YWx1YXRlSmF2YVNjcmlwdCgidmFyIGlucHV0RWxl ID0gZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoJ2lucHV0NScpOyBpbnB1dEVsZS52YWx1ZSA9ICcn OyBpbnB1dEVsZS5mb2N1cygpOyBpbnB1dEVsZS5zZWxlY3QoKTsiKTsKKyAgICBpbnB1dFZhbHVl MiA9IHBhZ2UtPm1haW5GcmFtZSgpLT5ldmFsdWF0ZUphdmFTY3JpcHQoImRvY3VtZW50LmdldEVs ZW1lbnRCeUlkKCdpbnB1dDUnKS52YWx1ZSIpLnRvU3RyaW5nKCk7CisgICAgUUNPTVBBUkUoaW5w dXRWYWx1ZTIsIFFTdHJpbmcoIiIpKTsKKworICAgIFFLZXlFdmVudCBrZXlFbnRlcldpdGhMaW5l RmVlZChRRXZlbnQ6OktleVByZXNzLCBRdDo6S2V5X0VudGVyLCBRdDo6Tm9Nb2RpZmllciwgIlxu Iik7CisgICAgcGFnZS0+ZXZlbnQoJmtleUVudGVyV2l0aExpbmVGZWVkKTsKKyAgICBwYWdlLT5l dmVudCgmZXZlbnRUZXh0KTsKKyAgICBwYWdlLT5ldmVudCgmZXZlbnRUZXh0Mik7CisgICAgcUFw cC0+cHJvY2Vzc0V2ZW50cygpOworCisgICAgaW5wdXRWYWx1ZTIgPSBwYWdlLT5tYWluRnJhbWUo KS0+ZXZhbHVhdGVKYXZhU2NyaXB0KCJkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgnaW5wdXQ1Jyku dmFsdWUiKS50b1N0cmluZygpOworICAgIFFDT01QQVJFKGlucHV0VmFsdWUyLCBRU3RyaW5nKCJc blxudGhpcmQgbGluZSIpKTsKKworICAgIC8vIEVudGVyIEtleSB3aXRoIGtleSB0ZXh0ICJcblxy IgorICAgIHBhZ2UtPm1haW5GcmFtZSgpLT5ldmFsdWF0ZUphdmFTY3JpcHQoInZhciBpbnB1dEVs ZSA9IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCdpbnB1dDUnKTsgaW5wdXRFbGUudmFsdWUgPSAn JzsgaW5wdXRFbGUuZm9jdXMoKTsgaW5wdXRFbGUuc2VsZWN0KCk7Iik7CisgICAgaW5wdXRWYWx1 ZTIgPSBwYWdlLT5tYWluRnJhbWUoKS0+ZXZhbHVhdGVKYXZhU2NyaXB0KCJkb2N1bWVudC5nZXRF bGVtZW50QnlJZCgnaW5wdXQ1JykudmFsdWUiKS50b1N0cmluZygpOworICAgIFFDT01QQVJFKGlu cHV0VmFsdWUyLCBRU3RyaW5nKCIiKSk7CisKKyAgICBRS2V5RXZlbnQga2V5RW50ZXJXaXRoTEZD UihRRXZlbnQ6OktleVByZXNzLCBRdDo6S2V5X0VudGVyLCBRdDo6Tm9Nb2RpZmllciwgIlxuXHIi KTsKKyAgICBwYWdlLT5ldmVudCgma2V5RW50ZXJXaXRoTEZDUik7CisgICAgcGFnZS0+ZXZlbnQo JmV2ZW50VGV4dCk7CisgICAgcGFnZS0+ZXZlbnQoJmV2ZW50VGV4dDIpOworICAgIHFBcHAtPnBy b2Nlc3NFdmVudHMoKTsKKworICAgIGlucHV0VmFsdWUyID0gcGFnZS0+bWFpbkZyYW1lKCktPmV2 YWx1YXRlSmF2YVNjcmlwdCgiZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoJ2lucHV0NScpLnZhbHVl IikudG9TdHJpbmcoKTsKKyAgICBRQ09NUEFSRShpbnB1dFZhbHVlMiwgUVN0cmluZygiXG5cbnRo aXJkIGxpbmUiKSk7CisKICAgICAvLyBFTkQgLSBOZXdsaW5lIHRlc3QgZm9yIHRleHRhcmVhCiAK ICAgICBkZWxldGUgY29udGFpbmVyOwpJbmRleDogTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIExheW91dFRlc3RzL0NoYW5nZUxvZwkocmV2aXNpb24gODY3ODApCisrKyBMYXlv dXRUZXN0cy9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxNCBAQAorMjAxMS0w NS0xOCAgWWkgU2hlbiAgPHlpLjQuc2hlbkBub2tpYS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW1F0XSBFbnRlcmtleSB0byBnbyB0byBOZXds aW5lIGRvZXMgbm90IHdvcmsgaW4gdGhlIHRleHQgYXJlYShpbiBIVE1MIGZvcm0pCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zMzE3OQorCisgICAgICAg IFVuc2tpcCB0aGUgZmFzdC9ldmVudHMvb25zZWFyY2gtZW50ZXIuaHRtbCB0ZXN0LgorCisgICAg ICAgICogcGxhdGZvcm0vcXQvU2tpcHBlZDoKKwogMjAxMS0wNS0xOCAgQ2hhbmcgU2h1ICA8Y3No dUB3ZWJraXQub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IENzYWJhIE9zenRyb2dvbsOhYy4K SW5kZXg6IExheW91dFRlc3RzL3BsYXRmb3JtL3F0L1NraXBwZWQKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5 b3V0VGVzdHMvcGxhdGZvcm0vcXQvU2tpcHBlZAkocmV2aXNpb24gODY3NzYpCisrKyBMYXlvdXRU ZXN0cy9wbGF0Zm9ybS9xdC9Ta2lwcGVkCSh3b3JraW5nIGNvcHkpCkBAIC0yMjQ5LDEwICsyMjQ5 LDYgQEAgZmFzdC9kb20vSFRNTE1ldGVyRWxlbWVudC9tZXRlci1zdHlsZXMuaAogaHR0cC90ZXN0 cy9pbnNwZWN0b3IvbmV0d29yay9uZXR3b3JrLXNpemUtY2h1bmtlZC5odG1sCiBodHRwL3Rlc3Rz L2luc3BlY3Rvci9uZXR3b3JrL25ldHdvcmstc2l6ZS1zeW5jLmh0bWwKIAotIyBbUXRdUkVHUkVT U0lPTihyODIyNDMpOiBmYXN0L2V2ZW50cy9vbnNlYXJjaC1lbnRlci5odG1sIGZhaWxzCi0jIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01NzQ3MgotZmFzdC9ldmVudHMv b25zZWFyY2gtZW50ZXIuaHRtbAotCiAjIFtRdF0gbWVkaWEvdmlkZW8tcGxheWJhY2tyYXRlLmh0 bWwgZmFpbHMKICMgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTU3NDc2 CiBtZWRpYS92aWRlby1wbGF5YmFja3JhdGUuaHRtbAo=