113281 2013-03-26 01:18:33 -0700 REGRESSION (r146518): WebKit2APITests/TestInspector is failing 2013-04-10 00:37:59 -0700 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED Gtk, Regression P2 Normal --- 113498 1 zan zan andersca cgarcia gustavo mrobinson sam timothy webkit.review.bot oldest_to_newest 863447 0 zan 2013-03-26 01:18:33 -0700 The WebKit2APITests/TestInspector unit test is failing after r146518. http://trac.webkit.org/changeset/146518 TEST: ./Tools/gtk/../Scripts/../../WebKitBuild/Release/Programs/WebKit2APITests/TestInspector... (pid=28658) /webkit2/WebKitWebInspector/default: ** ERROR:../../Source/WebKit2/UIProcess/API/gtk/tests/TestInspector.cpp:169:void testInspectorDefault(InspectorTest*, gconstpointer): assertion failed (events.size() == 2): (1 == 2) FAIL 863583 1 195061 zan 2013-03-26 05:20:11 -0700 Created attachment 195061 Patch 863585 2 webkit.review.bot 2013-03-26 05:24:01 -0700 Thanks for the patch. If this patch contains new public API please make sure it follows the guidelines for new WebKit2 GTK+ API. See http://trac.webkit.org/wiki/WebKitGTK/AddingNewWebKit2API 863588 3 zan 2013-03-26 05:36:17 -0700 Waiting for the thumbs-up from a GTK reviewer, will look for a WK2 owner afterwards. 863590 4 195065 zan 2013-03-26 05:41:50 -0700 Created attachment 195065 Patch 863918 5 mrobinson 2013-03-26 12:30:53 -0700 It's unclear from the patch what the original issue was. Do you mind expanding the ChangeLog a bit or leaving a comment here outlining the problem? 863954 6 zan 2013-03-26 13:24:44 -0700 Reconstruction of the WebInspectorProxy opening processing in r146518 caused the change in how the GTK-specific WebInspectorProxy code operates, specifically the 'bring-to-front' signal is not emitted anymore when opening the inspector due to the WebInspectorProxy::bringToFront method now only bringing the inspector window to front if it exists and opening it (and thus being unable to bring it to front) otherwise. Closing of the inspector through the didClose method is now done immediately after sending the WebInspector::Close() message to the WebProcess rather than waiting for the WebProcess to communicate back the order of closing. Due to this the relevant code in the test cases had to be changed to not run the loop but rather just check that the closing was successful. 864725 7 195364 zan 2013-03-27 11:27:40 -0700 Created attachment 195364 Patch Added the explanation to the ChangeLog. 864824 8 195364 mrobinson 2013-03-27 13:37:23 -0700 Comment on attachment 195364 Patch Okay. Looks good to me. We need an owner to r+ this. 865228 9 195364 cgarcia 2013-03-28 01:20:10 -0700 Comment on attachment 195364 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=195364&action=review > Source/WebKit2/UIProcess/WebInspectorProxy.cpp:154 > - open(); > + m_page->process()->send(Messages::WebInspector::Show(), m_page->pageID()); Do we really need to send the Show message again to the WebProcess? I think that what we want here is calling bringToFront(). Since the inspector is connected m_ignoreFirstBringToFront will be false, and platformBringToFront() or open() will be called depending on whether the inspector is visible or not. 865311 10 195364 zan 2013-03-28 03:51:47 -0700 Comment on attachment 195364 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=195364&action=review >> Source/WebKit2/UIProcess/WebInspectorProxy.cpp:154 >> + m_page->process()->send(Messages::WebInspector::Show(), m_page->pageID()); > > Do we really need to send the Show message again to the WebProcess? I think that what we want here is calling bringToFront(). Since the inspector is connected m_ignoreFirstBringToFront will be false, and platformBringToFront() or open() will be called depending on whether the inspector is visible or not. That's fine by me, but note that this introduces the following changes in behavior: * the 'bring-to-front' signal is fired immediately after webkit_web_inspector_show is called on an already-opened web inspector, * the 'open-window' signal is fired immediately after webkit_web_inspector_show is called on an already-connected web inspector. The current patch already deviates from the current behavior with the 'closed' signal fired immediately upon webkit_web_inspector_close being called (hence no more waiting for the closing signal since it's now called immediately). I don't know if it's smart to introduce these changes to an already stable API, I'll let other people make that decision. But yes, calling bringToFront() here works as well, though it introduces behavior changes in how the current API operates. 865379 11 cgarcia 2013-03-28 05:30:46 -0700 (In reply to comment #10) > (From update of attachment 195364 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=195364&action=review > > >> Source/WebKit2/UIProcess/WebInspectorProxy.cpp:154 > >> + m_page->process()->send(Messages::WebInspector::Show(), m_page->pageID()); > > > > Do we really need to send the Show message again to the WebProcess? I think that what we want here is calling bringToFront(). Since the inspector is connected m_ignoreFirstBringToFront will be false, and platformBringToFront() or open() will be called depending on whether the inspector is visible or not. > > That's fine by me, but note that this introduces the following changes in behavior: > * the 'bring-to-front' signal is fired immediately after webkit_web_inspector_show is called on an already-opened web inspector, > * the 'open-window' signal is fired immediately after webkit_web_inspector_show is called on an already-connected web inspector. There's no problem, nothing in our documentation says this shouldn't happen immediately. > The current patch already deviates from the current behavior with the 'closed' signal fired immediately upon webkit_web_inspector_close being called (hence no more waiting for the closing signal since it's now called immediately). I don't know if it's smart to introduce these changes to an already stable API, I'll let other people make that decision. > > But yes, calling bringToFront() here works as well, though it introduces behavior changes in how the current API operates. Those changes in behaviour doesn't affect the way users use the API. 867743 12 196123 zan 2013-04-02 04:59:46 -0700 Created attachment 196123 Patch 868130 13 mrobinson 2013-04-02 11:51:43 -0700 CCing some owners so they can give the r+. 868187 14 zan 2013-04-02 12:59:34 -0700 Hi Timothy -- this patch forces any connected WebInspectorProxy to call the bringToFront method instead of directly going to opening (which is meaningless if the connected inspector is already open), adjusting slightly the code added in r146518. Does this look OK? 868194 15 196123 timothy 2013-04-02 13:09:37 -0700 Comment on attachment 196123 Patch Looks good to me. 870847 16 196123 darin 2013-04-08 10:29:01 -0700 Comment on attachment 196123 Patch OK. 872636 17 196123 zan 2013-04-10 00:37:49 -0700 Comment on attachment 196123 Patch Clearing flags on attachment: 196123 Committed r148083: <http://trac.webkit.org/changeset/148083> 872637 18 zan 2013-04-10 00:37:59 -0700 All reviewed patches have been landed. Closing bug. 195061 2013-03-26 05:20:11 -0700 2013-03-26 05:41:43 -0700 Patch bug-113281-20130326131553.patch text/plain 6377 zan U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ2ODUzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggN2M1NDMzZjUxNTI5MDkz ZTdhMzJhMGU4NjZmODU2MzM3NGViM2U5ZC4uODQwNDVhY2QyMTc0ZTIxNTE5MjJjMjcwZTdiZDUy NzNhNzgxMWYzZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDEzLTAzLTI2ICBaYW4g RG9iZXJzZWsgIDx6ZG9iZXJzZWtAaWdhbGlhLmNvbT4KKworICAgICAgICBSRUdSRVNTSU9OIChy MTQ2NTE4KTogV2ViS2l0MkFQSVRlc3RzL1Rlc3RJbnNwZWN0b3IgaXMgZmFpbGluZworICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTEzMjgxCisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJ L2d0ay90ZXN0cy9UZXN0SW5zcGVjdG9yLmNwcDogQWRqdXN0IHRoZSBUZXN0SW5zcGVjdG9yIHVu aXQgdGVzdCBhZnRlciBjaGFuZ2VzIGluIHIxNDY1MTguCisgICAgICAgIChJbnNwZWN0b3JUZXN0 OjpjbG9zZWQpOiBEbyBub3QgcXVpdCB0aGUgbG9vcCBhcyBpdCBpcyBub3QgcnVuIGFueW1vcmUu CisgICAgICAgIChJbnNwZWN0b3JUZXN0OjpjbG9zZSk6IEZvcm1lcmx5IGNsb3NlQW5kV2FpdFVu dGlsQ2xvc2VkLCB0aGUgY2xvc2luZyBpcyBub3QgYXN5bmNocm9ub3VzIGFueW1vcmUgc28gdGhl IGxvb3AgaXMgbm90IHJ1bi4KKyAgICAgICAgKHRlc3RJbnNwZWN0b3JEZWZhdWx0KTogT25seSB0 aGUgd2luZG93IG9wZW5pbmcgZXZlbnQgaXMgbm93IGV4cGVjdGVkIHVwb24gc2hvd2luZyB0aGUg aW5zcGVjdG9yIGZvciB0aGUgZmlyc3QgdGltZS4KKyAgICAgICAgQ2FsbGluZyB0aGUgSW5zcGVj dG9yVGVzdDo6Y2xvc2UgbWV0aG9kIGFmdGVyIGl0J3MgYmVlbiByZW5hbWVkIGZyb20gY2xvc2VB bmRXYWl0VW50aWxDbG9zZWQuCisgICAgICAgIChDdXN0b21JbnNwZWN0b3JUZXN0OjpkZXN0cm95 V2luZG93KTogRm9ybWVybHkgZGVzdHJveVdpbmRvd0FuZFdhaXRVbnRpbENsb3NlZCwgdGhlIGNs b3NpbmcgaXMgbm90IGFzeW5jaHJvbm91cyBhbnltb3JlCisgICAgICAgIHNvIHRoZSBsb29wIGlz IG5vdCBydW4uCisgICAgICAgICh0ZXN0SW5zcGVjdG9yTWFudWFsQXR0YWNoRGV0YWNoKTogT25s eSB0aGUgd2luZG93IG9wZW5pbmcgZXZlbnQgaXMgbm93IGV4cGVjdGVkIHVwb24gc2hvd2luZyB0 aGUgaW5zcGVjdG9yIGZvciB0aGUgZmlyc3QKKyAgICAgICAgdGltZS4KKyAgICAgICAgKHRlc3RJ bnNwZWN0b3JDdXN0b21Db250YWluZXJEZXN0cm95ZWQpOiBDYWxsaW5nIHRoZSBDdXN0b21JbnNw ZWN0b3JUZXN0OjpkZXN0cm95V2luZG93IG1ldGhvZCBhZnRlciBpdCdzIGJlZW4gcmVuYW1lZAor ICAgICAgICBmcm9tIGRlc3Ryb3lXaW5kb3dBbmRXYWl0VW50aWxDbG9zZWQuCisgICAgICAgICog VUlQcm9jZXNzL1dlYkluc3BlY3RvclByb3h5LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViSW5z cGVjdG9yUHJveHk6OnNob3cpOiBXaGVuIHNob3dpbmcgYSBjb25uZWN0ZWQgV2ViSW5zcGVjdG9y UHJveHksIHNlbmQgdGhlIFNob3cgbWVzc2FnZSB0byB0aGUgV2ViSW5zcGVjdG9yCisgICAgICAg IGxpc3RlbmVyIGluIHRoZSBXZWJQcm9jZXNzLiBUaGlzIHdpbGwgY2F1c2UgdGhlIGluc3BlY3Rv ciBzaG93aW5nIHRvIGJlIGhhbmRsZWQgdGhyb3VnaCB0aGUgYnJpbmdUb0Zyb250IG1ldGhvZCB3 aGljaCBhdAorICAgICAgICB0aGlzIHBvaW50IHdpbGwgbm90IGJlIGlnbm9yZWQgYW5kIHdpbGwg cHJvcGVybHkgZWl0aGVyIGJyaW5nIHRoZSBpbnNwZWN0b3IgdG8gdGhlIGZyb250IG9yIG9wZW4g aXQgaWYgaXQncyBub3QgeWV0CisgICAgICAgIHZpc2libGUuCisKIDIwMTMtMDMtMjUgIEtlbnQg VGFtdXJhICA8dGtlbnRAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJlbmFtZSBFTkFCTEVfSU5Q VVRfVFlQRV9EQVRFVElNRQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQ SS9ndGsvdGVzdHMvVGVzdEluc3BlY3Rvci5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv QVBJL2d0ay90ZXN0cy9UZXN0SW5zcGVjdG9yLmNwcAppbmRleCA2NzM3NDk0MTFhNjExMjQ4MjFi OTIxNzU5YWQ3Mjk1NTMxN2Q3ZDQ3Li5jNzYxOWI5MTg4ZDUwZDA4MjBiYWYxMjU5YWQ1YzYwYmNj ZjI0ODI4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay90ZXN0 cy9UZXN0SW5zcGVjdG9yLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0 ay90ZXN0cy9UZXN0SW5zcGVjdG9yLmNwcApAQCAtOTgsNyArOTgsNiBAQCBwdWJsaWM6CiAgICAg dmlydHVhbCB2b2lkIGNsb3NlZCgpCiAgICAgewogICAgICAgICBtX2V2ZW50cy5hcHBlbmQoQ2xv c2VkKTsKLSAgICAgICAgZ19tYWluX2xvb3BfcXVpdChtX21haW5Mb29wKTsKICAgICB9CiAKICAg ICB2aXJ0dWFsIGJvb2wgYXR0YWNoKCkKQEAgLTE0MCwxMCArMTM5LDkgQEAgcHVibGljOgogICAg ICAgICBnX21haW5fbG9vcF9ydW4obV9tYWluTG9vcCk7CiAgICAgfQogCi0gICAgdm9pZCBjbG9z ZUFuZFdhaXRVbnRpbENsb3NlZCgpCisgICAgdm9pZCBjbG9zZSgpCiAgICAgewogICAgICAgICB3 ZWJraXRfd2ViX2luc3BlY3Rvcl9jbG9zZShtX2luc3BlY3Rvcik7Ci0gICAgICAgIGdfbWFpbl9s b29wX3J1bihtX21haW5Mb29wKTsKICAgICB9CiAKICAgICBXZWJLaXRXZWJJbnNwZWN0b3IqIG1f aW5zcGVjdG9yOwpAQCAtMTY2LDkgKzE2NCw4IEBAIHN0YXRpYyB2b2lkIHRlc3RJbnNwZWN0b3JE ZWZhdWx0KEluc3BlY3RvclRlc3QqIHRlc3QsIGdjb25zdHBvaW50ZXIpCiAgICAgZ19hc3NlcnQo IXdlYmtpdF93ZWJfaW5zcGVjdG9yX2lzX2F0dGFjaGVkKHRlc3QtPm1faW5zcGVjdG9yKSk7CiAg ICAgZ19hc3NlcnRfY21wdWludCh3ZWJraXRfd2ViX2luc3BlY3Rvcl9nZXRfYXR0YWNoZWRfaGVp Z2h0KHRlc3QtPm1faW5zcGVjdG9yKSwgPT0sIDApOwogICAgIFZlY3RvcjxJbnNwZWN0b3JUZXN0 OjpJbnNwZWN0b3JFdmVudHM+JiBldmVudHMgPSB0ZXN0LT5tX2V2ZW50czsKLSAgICBnX2Fzc2Vy dF9jbXBpbnQoZXZlbnRzLnNpemUoKSwgPT0sIDIpOwotICAgIGdfYXNzZXJ0X2NtcGludChldmVu dHNbMF0sID09LCBJbnNwZWN0b3JUZXN0OjpCcmluZ1RvRnJvbnQpOwotICAgIGdfYXNzZXJ0X2Nt cGludChldmVudHNbMV0sID09LCBJbnNwZWN0b3JUZXN0OjpPcGVuV2luZG93KTsKKyAgICBnX2Fz c2VydF9jbXBpbnQoZXZlbnRzLnNpemUoKSwgPT0sIDEpOworICAgIGdfYXNzZXJ0X2NtcGludChl dmVudHNbMF0sID09LCBJbnNwZWN0b3JUZXN0OjpPcGVuV2luZG93KTsKICAgICB0ZXN0LT5tX2V2 ZW50cy5jbGVhcigpOwogCiAgICAgdGVzdC0+c2hvd0FuZFdhaXRVbnRpbEZpbmlzaGVkKHRydWUp OwpAQCAtMTkzLDcgKzE5MCw3IEBAIHN0YXRpYyB2b2lkIHRlc3RJbnNwZWN0b3JEZWZhdWx0KElu c3BlY3RvclRlc3QqIHRlc3QsIGdjb25zdHBvaW50ZXIpCiAgICAgZ19hc3NlcnRfY21waW50KGV2 ZW50c1sxXSwgPT0sIEluc3BlY3RvclRlc3Q6Ok9wZW5XaW5kb3cpOwogICAgIHRlc3QtPm1fZXZl bnRzLmNsZWFyKCk7CiAKLSAgICB0ZXN0LT5jbG9zZUFuZFdhaXRVbnRpbENsb3NlZCgpOworICAg IHRlc3QtPmNsb3NlKCk7CiAgICAgZXZlbnRzID0gdGVzdC0+bV9ldmVudHM7CiAgICAgZ19hc3Nl cnRfY21waW50KGV2ZW50cy5zaXplKCksID09LCAxKTsKICAgICBnX2Fzc2VydF9jbXBpbnQoZXZl bnRzWzBdLCA9PSwgSW5zcGVjdG9yVGVzdDo6Q2xvc2VkKTsKQEAgLTI3MiwxMiArMjY5LDExIEBA IHB1YmxpYzoKICAgICAgICAgcmV0dXJuIEluc3BlY3RvclRlc3Q6OmRldGFjaCgpOwogICAgIH0K IAotICAgIHZvaWQgZGVzdHJveVdpbmRvd0FuZFdhaXRVbnRpbENsb3NlZCgpCisgICAgdm9pZCBk ZXN0cm95V2luZG93KCkKICAgICB7CiAgICAgICAgIGdfYXNzZXJ0KG1faW5zcGVjdG9yV2luZG93 KTsKICAgICAgICAgZ3RrX3dpZGdldF9kZXN0cm95KG1faW5zcGVjdG9yV2luZG93KTsKICAgICAg ICAgbV9pbnNwZWN0b3JXaW5kb3cgPSAwOwotICAgICAgICBnX21haW5fbG9vcF9ydW4obV9tYWlu TG9vcCk7CiAgICAgfQogCiAgICAgR3RrV2lkZ2V0KiBtX2luc3BlY3RvcldpbmRvdzsKQEAgLTI5 NCw5ICsyOTAsOCBAQCBzdGF0aWMgdm9pZCB0ZXN0SW5zcGVjdG9yTWFudWFsQXR0YWNoRGV0YWNo KEN1c3RvbUluc3BlY3RvclRlc3QqIHRlc3QsIGdjb25zdHBvaQogICAgIHRlc3QtPmFzc2VydE9i amVjdElzRGVsZXRlZFdoZW5UZXN0RmluaXNoZXMoR19PQkpFQ1Qod2Via2l0X3dlYl9pbnNwZWN0 b3JfZ2V0X3dlYl92aWV3KHRlc3QtPm1faW5zcGVjdG9yKSkpOwogICAgIGdfYXNzZXJ0KCF3ZWJr aXRfd2ViX2luc3BlY3Rvcl9pc19hdHRhY2hlZCh0ZXN0LT5tX2luc3BlY3RvcikpOwogICAgIFZl Y3RvcjxJbnNwZWN0b3JUZXN0OjpJbnNwZWN0b3JFdmVudHM+JiBldmVudHMgPSB0ZXN0LT5tX2V2 ZW50czsKLSAgICBnX2Fzc2VydF9jbXBpbnQoZXZlbnRzLnNpemUoKSwgPT0sIDIpOwotICAgIGdf YXNzZXJ0X2NtcGludChldmVudHNbMF0sID09LCBJbnNwZWN0b3JUZXN0OjpCcmluZ1RvRnJvbnQp OwotICAgIGdfYXNzZXJ0X2NtcGludChldmVudHNbMV0sID09LCBJbnNwZWN0b3JUZXN0OjpPcGVu V2luZG93KTsKKyAgICBnX2Fzc2VydF9jbXBpbnQoZXZlbnRzLnNpemUoKSwgPT0sIDEpOworICAg IGdfYXNzZXJ0X2NtcGludChldmVudHNbMF0sID09LCBJbnNwZWN0b3JUZXN0OjpPcGVuV2luZG93 KTsKICAgICB0ZXN0LT5tX2V2ZW50cy5jbGVhcigpOwogCiAgICAgdGVzdC0+cmVzaXplVmlld0Fu ZEF0dGFjaCgpOwpAQCAtMzE4LDcgKzMxMyw3IEBAIHN0YXRpYyB2b2lkIHRlc3RJbnNwZWN0b3JN YW51YWxBdHRhY2hEZXRhY2goQ3VzdG9tSW5zcGVjdG9yVGVzdCogdGVzdCwgZ2NvbnN0cG9pCiAg ICAgdGVzdC0+cmVzaXplVmlld0FuZEF0dGFjaCgpOwogICAgIGdfYXNzZXJ0KHdlYmtpdF93ZWJf aW5zcGVjdG9yX2lzX2F0dGFjaGVkKHRlc3QtPm1faW5zcGVjdG9yKSk7CiAgICAgdGVzdC0+bV9l dmVudHMuY2xlYXIoKTsKLSAgICB0ZXN0LT5jbG9zZUFuZFdhaXRVbnRpbENsb3NlZCgpOworICAg IHRlc3QtPmNsb3NlKCk7CiAgICAgZXZlbnRzID0gdGVzdC0+bV9ldmVudHM7CiAgICAgZ19hc3Nl cnRfY21waW50KGV2ZW50cy5zaXplKCksID09LCAyKTsKICAgICBnX2Fzc2VydF9jbXBpbnQoZXZl bnRzWzBdLCA9PSwgSW5zcGVjdG9yVGVzdDo6RGV0YWNoKTsKQEAgLTMzOCw3ICszMzMsNyBAQCBz dGF0aWMgdm9pZCB0ZXN0SW5zcGVjdG9yQ3VzdG9tQ29udGFpbmVyRGVzdHJveWVkKEN1c3RvbUlu c3BlY3RvclRlc3QqIHRlc3QsIGdjbwogICAgIGdfYXNzZXJ0KCF3ZWJraXRfd2ViX2luc3BlY3Rv cl9pc19hdHRhY2hlZCh0ZXN0LT5tX2luc3BlY3RvcikpOwogCiAgICAgdGVzdC0+bV9ldmVudHMu Y2xlYXIoKTsKLSAgICB0ZXN0LT5kZXN0cm95V2luZG93QW5kV2FpdFVudGlsQ2xvc2VkKCk7Cisg ICAgdGVzdC0+ZGVzdHJveVdpbmRvdygpOwogICAgIFZlY3RvcjxJbnNwZWN0b3JUZXN0OjpJbnNw ZWN0b3JFdmVudHM+JiBldmVudHMgPSB0ZXN0LT5tX2V2ZW50czsKICAgICBnX2Fzc2VydF9jbXBp bnQoZXZlbnRzLnNpemUoKSwgPT0sIDEpOwogICAgIGdfYXNzZXJ0X2NtcGludChldmVudHNbMF0s ID09LCBJbnNwZWN0b3JUZXN0OjpDbG9zZWQpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL1dlYkluc3BlY3RvclByb3h5LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9XZWJJbnNwZWN0b3JQcm94eS5jcHAKaW5kZXggZjIxZmI3Y2Y0Yzk3YTExNmU4ZWQzN2ViOTc0 YTE4MDlhODEyNDg4Yy4uMDNmMTY5N2M2MDhlMWYwMzRiNWM3MjA2NjA5MmJiNWY5YWRjYTJlYSAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYkluc3BlY3RvclByb3h5LmNw cAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViSW5zcGVjdG9yUHJveHkuY3BwCkBA IC0xNTEsNyArMTUxLDcgQEAgdm9pZCBXZWJJbnNwZWN0b3JQcm94eTo6c2hvdygpCiAgICAgICAg IHJldHVybjsKIAogICAgIGlmIChpc0Nvbm5lY3RlZCgpKSB7Ci0gICAgICAgIG9wZW4oKTsKKyAg ICAgICAgbV9wYWdlLT5wcm9jZXNzKCktPnNlbmQoTWVzc2FnZXM6OldlYkluc3BlY3Rvcjo6U2hv dygpLCBtX3BhZ2UtPnBhZ2VJRCgpKTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KIAo= 195065 2013-03-26 05:41:50 -0700 2013-03-27 11:27:33 -0700 Patch bug-113281-20130326133732.patch text/plain 8224 zan U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ2ODczCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggN2M1NDMzZjUxNTI5MDkz ZTdhMzJhMGU4NjZmODU2MzM3NGViM2U5ZC4uODQwNDVhY2QyMTc0ZTIxNTE5MjJjMjcwZTdiZDUy NzNhNzgxMWYzZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDEzLTAzLTI2ICBaYW4g RG9iZXJzZWsgIDx6ZG9iZXJzZWtAaWdhbGlhLmNvbT4KKworICAgICAgICBSRUdSRVNTSU9OIChy MTQ2NTE4KTogV2ViS2l0MkFQSVRlc3RzL1Rlc3RJbnNwZWN0b3IgaXMgZmFpbGluZworICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTEzMjgxCisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJ L2d0ay90ZXN0cy9UZXN0SW5zcGVjdG9yLmNwcDogQWRqdXN0IHRoZSBUZXN0SW5zcGVjdG9yIHVu aXQgdGVzdCBhZnRlciBjaGFuZ2VzIGluIHIxNDY1MTguCisgICAgICAgIChJbnNwZWN0b3JUZXN0 OjpjbG9zZWQpOiBEbyBub3QgcXVpdCB0aGUgbG9vcCBhcyBpdCBpcyBub3QgcnVuIGFueW1vcmUu CisgICAgICAgIChJbnNwZWN0b3JUZXN0OjpjbG9zZSk6IEZvcm1lcmx5IGNsb3NlQW5kV2FpdFVu dGlsQ2xvc2VkLCB0aGUgY2xvc2luZyBpcyBub3QgYXN5bmNocm9ub3VzIGFueW1vcmUgc28gdGhl IGxvb3AgaXMgbm90IHJ1bi4KKyAgICAgICAgKHRlc3RJbnNwZWN0b3JEZWZhdWx0KTogT25seSB0 aGUgd2luZG93IG9wZW5pbmcgZXZlbnQgaXMgbm93IGV4cGVjdGVkIHVwb24gc2hvd2luZyB0aGUg aW5zcGVjdG9yIGZvciB0aGUgZmlyc3QgdGltZS4KKyAgICAgICAgQ2FsbGluZyB0aGUgSW5zcGVj dG9yVGVzdDo6Y2xvc2UgbWV0aG9kIGFmdGVyIGl0J3MgYmVlbiByZW5hbWVkIGZyb20gY2xvc2VB bmRXYWl0VW50aWxDbG9zZWQuCisgICAgICAgIChDdXN0b21JbnNwZWN0b3JUZXN0OjpkZXN0cm95 V2luZG93KTogRm9ybWVybHkgZGVzdHJveVdpbmRvd0FuZFdhaXRVbnRpbENsb3NlZCwgdGhlIGNs b3NpbmcgaXMgbm90IGFzeW5jaHJvbm91cyBhbnltb3JlCisgICAgICAgIHNvIHRoZSBsb29wIGlz IG5vdCBydW4uCisgICAgICAgICh0ZXN0SW5zcGVjdG9yTWFudWFsQXR0YWNoRGV0YWNoKTogT25s eSB0aGUgd2luZG93IG9wZW5pbmcgZXZlbnQgaXMgbm93IGV4cGVjdGVkIHVwb24gc2hvd2luZyB0 aGUgaW5zcGVjdG9yIGZvciB0aGUgZmlyc3QKKyAgICAgICAgdGltZS4KKyAgICAgICAgKHRlc3RJ bnNwZWN0b3JDdXN0b21Db250YWluZXJEZXN0cm95ZWQpOiBDYWxsaW5nIHRoZSBDdXN0b21JbnNw ZWN0b3JUZXN0OjpkZXN0cm95V2luZG93IG1ldGhvZCBhZnRlciBpdCdzIGJlZW4gcmVuYW1lZAor ICAgICAgICBmcm9tIGRlc3Ryb3lXaW5kb3dBbmRXYWl0VW50aWxDbG9zZWQuCisgICAgICAgICog VUlQcm9jZXNzL1dlYkluc3BlY3RvclByb3h5LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViSW5z cGVjdG9yUHJveHk6OnNob3cpOiBXaGVuIHNob3dpbmcgYSBjb25uZWN0ZWQgV2ViSW5zcGVjdG9y UHJveHksIHNlbmQgdGhlIFNob3cgbWVzc2FnZSB0byB0aGUgV2ViSW5zcGVjdG9yCisgICAgICAg IGxpc3RlbmVyIGluIHRoZSBXZWJQcm9jZXNzLiBUaGlzIHdpbGwgY2F1c2UgdGhlIGluc3BlY3Rv ciBzaG93aW5nIHRvIGJlIGhhbmRsZWQgdGhyb3VnaCB0aGUgYnJpbmdUb0Zyb250IG1ldGhvZCB3 aGljaCBhdAorICAgICAgICB0aGlzIHBvaW50IHdpbGwgbm90IGJlIGlnbm9yZWQgYW5kIHdpbGwg cHJvcGVybHkgZWl0aGVyIGJyaW5nIHRoZSBpbnNwZWN0b3IgdG8gdGhlIGZyb250IG9yIG9wZW4g aXQgaWYgaXQncyBub3QgeWV0CisgICAgICAgIHZpc2libGUuCisKIDIwMTMtMDMtMjUgIEtlbnQg VGFtdXJhICA8dGtlbnRAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJlbmFtZSBFTkFCTEVfSU5Q VVRfVFlQRV9EQVRFVElNRQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQ SS9ndGsvdGVzdHMvVGVzdEluc3BlY3Rvci5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv QVBJL2d0ay90ZXN0cy9UZXN0SW5zcGVjdG9yLmNwcAppbmRleCA2NzM3NDk0MTFhNjExMjQ4MjFi OTIxNzU5YWQ3Mjk1NTMxN2Q3ZDQ3Li5jNzYxOWI5MTg4ZDUwZDA4MjBiYWYxMjU5YWQ1YzYwYmNj ZjI0ODI4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay90ZXN0 cy9UZXN0SW5zcGVjdG9yLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0 ay90ZXN0cy9UZXN0SW5zcGVjdG9yLmNwcApAQCAtOTgsNyArOTgsNiBAQCBwdWJsaWM6CiAgICAg dmlydHVhbCB2b2lkIGNsb3NlZCgpCiAgICAgewogICAgICAgICBtX2V2ZW50cy5hcHBlbmQoQ2xv c2VkKTsKLSAgICAgICAgZ19tYWluX2xvb3BfcXVpdChtX21haW5Mb29wKTsKICAgICB9CiAKICAg ICB2aXJ0dWFsIGJvb2wgYXR0YWNoKCkKQEAgLTE0MCwxMCArMTM5LDkgQEAgcHVibGljOgogICAg ICAgICBnX21haW5fbG9vcF9ydW4obV9tYWluTG9vcCk7CiAgICAgfQogCi0gICAgdm9pZCBjbG9z ZUFuZFdhaXRVbnRpbENsb3NlZCgpCisgICAgdm9pZCBjbG9zZSgpCiAgICAgewogICAgICAgICB3 ZWJraXRfd2ViX2luc3BlY3Rvcl9jbG9zZShtX2luc3BlY3Rvcik7Ci0gICAgICAgIGdfbWFpbl9s b29wX3J1bihtX21haW5Mb29wKTsKICAgICB9CiAKICAgICBXZWJLaXRXZWJJbnNwZWN0b3IqIG1f aW5zcGVjdG9yOwpAQCAtMTY2LDkgKzE2NCw4IEBAIHN0YXRpYyB2b2lkIHRlc3RJbnNwZWN0b3JE ZWZhdWx0KEluc3BlY3RvclRlc3QqIHRlc3QsIGdjb25zdHBvaW50ZXIpCiAgICAgZ19hc3NlcnQo IXdlYmtpdF93ZWJfaW5zcGVjdG9yX2lzX2F0dGFjaGVkKHRlc3QtPm1faW5zcGVjdG9yKSk7CiAg ICAgZ19hc3NlcnRfY21wdWludCh3ZWJraXRfd2ViX2luc3BlY3Rvcl9nZXRfYXR0YWNoZWRfaGVp Z2h0KHRlc3QtPm1faW5zcGVjdG9yKSwgPT0sIDApOwogICAgIFZlY3RvcjxJbnNwZWN0b3JUZXN0 OjpJbnNwZWN0b3JFdmVudHM+JiBldmVudHMgPSB0ZXN0LT5tX2V2ZW50czsKLSAgICBnX2Fzc2Vy dF9jbXBpbnQoZXZlbnRzLnNpemUoKSwgPT0sIDIpOwotICAgIGdfYXNzZXJ0X2NtcGludChldmVu dHNbMF0sID09LCBJbnNwZWN0b3JUZXN0OjpCcmluZ1RvRnJvbnQpOwotICAgIGdfYXNzZXJ0X2Nt cGludChldmVudHNbMV0sID09LCBJbnNwZWN0b3JUZXN0OjpPcGVuV2luZG93KTsKKyAgICBnX2Fz c2VydF9jbXBpbnQoZXZlbnRzLnNpemUoKSwgPT0sIDEpOworICAgIGdfYXNzZXJ0X2NtcGludChl dmVudHNbMF0sID09LCBJbnNwZWN0b3JUZXN0OjpPcGVuV2luZG93KTsKICAgICB0ZXN0LT5tX2V2 ZW50cy5jbGVhcigpOwogCiAgICAgdGVzdC0+c2hvd0FuZFdhaXRVbnRpbEZpbmlzaGVkKHRydWUp OwpAQCAtMTkzLDcgKzE5MCw3IEBAIHN0YXRpYyB2b2lkIHRlc3RJbnNwZWN0b3JEZWZhdWx0KElu c3BlY3RvclRlc3QqIHRlc3QsIGdjb25zdHBvaW50ZXIpCiAgICAgZ19hc3NlcnRfY21waW50KGV2 ZW50c1sxXSwgPT0sIEluc3BlY3RvclRlc3Q6Ok9wZW5XaW5kb3cpOwogICAgIHRlc3QtPm1fZXZl bnRzLmNsZWFyKCk7CiAKLSAgICB0ZXN0LT5jbG9zZUFuZFdhaXRVbnRpbENsb3NlZCgpOworICAg IHRlc3QtPmNsb3NlKCk7CiAgICAgZXZlbnRzID0gdGVzdC0+bV9ldmVudHM7CiAgICAgZ19hc3Nl cnRfY21waW50KGV2ZW50cy5zaXplKCksID09LCAxKTsKICAgICBnX2Fzc2VydF9jbXBpbnQoZXZl bnRzWzBdLCA9PSwgSW5zcGVjdG9yVGVzdDo6Q2xvc2VkKTsKQEAgLTI3MiwxMiArMjY5LDExIEBA IHB1YmxpYzoKICAgICAgICAgcmV0dXJuIEluc3BlY3RvclRlc3Q6OmRldGFjaCgpOwogICAgIH0K IAotICAgIHZvaWQgZGVzdHJveVdpbmRvd0FuZFdhaXRVbnRpbENsb3NlZCgpCisgICAgdm9pZCBk ZXN0cm95V2luZG93KCkKICAgICB7CiAgICAgICAgIGdfYXNzZXJ0KG1faW5zcGVjdG9yV2luZG93 KTsKICAgICAgICAgZ3RrX3dpZGdldF9kZXN0cm95KG1faW5zcGVjdG9yV2luZG93KTsKICAgICAg ICAgbV9pbnNwZWN0b3JXaW5kb3cgPSAwOwotICAgICAgICBnX21haW5fbG9vcF9ydW4obV9tYWlu TG9vcCk7CiAgICAgfQogCiAgICAgR3RrV2lkZ2V0KiBtX2luc3BlY3RvcldpbmRvdzsKQEAgLTI5 NCw5ICsyOTAsOCBAQCBzdGF0aWMgdm9pZCB0ZXN0SW5zcGVjdG9yTWFudWFsQXR0YWNoRGV0YWNo KEN1c3RvbUluc3BlY3RvclRlc3QqIHRlc3QsIGdjb25zdHBvaQogICAgIHRlc3QtPmFzc2VydE9i amVjdElzRGVsZXRlZFdoZW5UZXN0RmluaXNoZXMoR19PQkpFQ1Qod2Via2l0X3dlYl9pbnNwZWN0 b3JfZ2V0X3dlYl92aWV3KHRlc3QtPm1faW5zcGVjdG9yKSkpOwogICAgIGdfYXNzZXJ0KCF3ZWJr aXRfd2ViX2luc3BlY3Rvcl9pc19hdHRhY2hlZCh0ZXN0LT5tX2luc3BlY3RvcikpOwogICAgIFZl Y3RvcjxJbnNwZWN0b3JUZXN0OjpJbnNwZWN0b3JFdmVudHM+JiBldmVudHMgPSB0ZXN0LT5tX2V2 ZW50czsKLSAgICBnX2Fzc2VydF9jbXBpbnQoZXZlbnRzLnNpemUoKSwgPT0sIDIpOwotICAgIGdf YXNzZXJ0X2NtcGludChldmVudHNbMF0sID09LCBJbnNwZWN0b3JUZXN0OjpCcmluZ1RvRnJvbnQp OwotICAgIGdfYXNzZXJ0X2NtcGludChldmVudHNbMV0sID09LCBJbnNwZWN0b3JUZXN0OjpPcGVu V2luZG93KTsKKyAgICBnX2Fzc2VydF9jbXBpbnQoZXZlbnRzLnNpemUoKSwgPT0sIDEpOworICAg IGdfYXNzZXJ0X2NtcGludChldmVudHNbMF0sID09LCBJbnNwZWN0b3JUZXN0OjpPcGVuV2luZG93 KTsKICAgICB0ZXN0LT5tX2V2ZW50cy5jbGVhcigpOwogCiAgICAgdGVzdC0+cmVzaXplVmlld0Fu ZEF0dGFjaCgpOwpAQCAtMzE4LDcgKzMxMyw3IEBAIHN0YXRpYyB2b2lkIHRlc3RJbnNwZWN0b3JN YW51YWxBdHRhY2hEZXRhY2goQ3VzdG9tSW5zcGVjdG9yVGVzdCogdGVzdCwgZ2NvbnN0cG9pCiAg ICAgdGVzdC0+cmVzaXplVmlld0FuZEF0dGFjaCgpOwogICAgIGdfYXNzZXJ0KHdlYmtpdF93ZWJf aW5zcGVjdG9yX2lzX2F0dGFjaGVkKHRlc3QtPm1faW5zcGVjdG9yKSk7CiAgICAgdGVzdC0+bV9l dmVudHMuY2xlYXIoKTsKLSAgICB0ZXN0LT5jbG9zZUFuZFdhaXRVbnRpbENsb3NlZCgpOworICAg IHRlc3QtPmNsb3NlKCk7CiAgICAgZXZlbnRzID0gdGVzdC0+bV9ldmVudHM7CiAgICAgZ19hc3Nl cnRfY21waW50KGV2ZW50cy5zaXplKCksID09LCAyKTsKICAgICBnX2Fzc2VydF9jbXBpbnQoZXZl bnRzWzBdLCA9PSwgSW5zcGVjdG9yVGVzdDo6RGV0YWNoKTsKQEAgLTMzOCw3ICszMzMsNyBAQCBz dGF0aWMgdm9pZCB0ZXN0SW5zcGVjdG9yQ3VzdG9tQ29udGFpbmVyRGVzdHJveWVkKEN1c3RvbUlu c3BlY3RvclRlc3QqIHRlc3QsIGdjbwogICAgIGdfYXNzZXJ0KCF3ZWJraXRfd2ViX2luc3BlY3Rv cl9pc19hdHRhY2hlZCh0ZXN0LT5tX2luc3BlY3RvcikpOwogCiAgICAgdGVzdC0+bV9ldmVudHMu Y2xlYXIoKTsKLSAgICB0ZXN0LT5kZXN0cm95V2luZG93QW5kV2FpdFVudGlsQ2xvc2VkKCk7Cisg ICAgdGVzdC0+ZGVzdHJveVdpbmRvdygpOwogICAgIFZlY3RvcjxJbnNwZWN0b3JUZXN0OjpJbnNw ZWN0b3JFdmVudHM+JiBldmVudHMgPSB0ZXN0LT5tX2V2ZW50czsKICAgICBnX2Fzc2VydF9jbXBp bnQoZXZlbnRzLnNpemUoKSwgPT0sIDEpOwogICAgIGdfYXNzZXJ0X2NtcGludChldmVudHNbMF0s ID09LCBJbnNwZWN0b3JUZXN0OjpDbG9zZWQpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL1dlYkluc3BlY3RvclByb3h5LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9XZWJJbnNwZWN0b3JQcm94eS5jcHAKaW5kZXggZjIxZmI3Y2Y0Yzk3YTExNmU4ZWQzN2ViOTc0 YTE4MDlhODEyNDg4Yy4uMDNmMTY5N2M2MDhlMWYwMzRiNWM3MjA2NjA5MmJiNWY5YWRjYTJlYSAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYkluc3BlY3RvclByb3h5LmNw cAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViSW5zcGVjdG9yUHJveHkuY3BwCkBA IC0xNTEsNyArMTUxLDcgQEAgdm9pZCBXZWJJbnNwZWN0b3JQcm94eTo6c2hvdygpCiAgICAgICAg IHJldHVybjsKIAogICAgIGlmIChpc0Nvbm5lY3RlZCgpKSB7Ci0gICAgICAgIG9wZW4oKTsKKyAg ICAgICAgbV9wYWdlLT5wcm9jZXNzKCktPnNlbmQoTWVzc2FnZXM6OldlYkluc3BlY3Rvcjo6U2hv dygpLCBtX3BhZ2UtPnBhZ2VJRCgpKTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KIApkaWZmIC0t Z2l0IGEvVG9vbHMvQ2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdlTG9nCmluZGV4IDk4MTg4Yzg1Zjlh ZTRhZjY0OGNhNDdkMzRkMGFkNTNmNDIyMWQ2ZjMuLmJhNzI4ZjNkZmVlZmM0ZGRlNGEyZmVhMTgx YjQ5Mjg2ZDdjN2Y2ODYgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9Ub29scy9D aGFuZ2VMb2cKQEAgLTEsNSArMSwxNSBAQAogMjAxMy0wMy0yNiAgWmFuIERvYmVyc2VrICA8emRv YmVyc2VrQGlnYWxpYS5jb20+CiAKKyAgICAgICAgUkVHUkVTU0lPTiAocjE0NjUxOCk6IFdlYktp dDJBUElUZXN0cy9UZXN0SW5zcGVjdG9yIGlzIGZhaWxpbmcKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExMzI4MQorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogU2NyaXB0cy9ydW4tZ3RrLXRlc3RzOgorICAg ICAgICAoVGVzdFJ1bm5lcik6IFJlbW92ZSB0aGUgc2tpcCBlbnRyeSBmb3IgdGhlIFdlYktpdDJB UElUZXN0cy9UZXN0SW5zcGVjdG9yIHVuaXQgdGVzdC4KKworMjAxMy0wMy0yNiAgWmFuIERvYmVy c2VrICA8emRvYmVyc2VrQGlnYWxpYS5jb20+CisKICAgICAgICAgVW5yZXZpZXdlZCBHVEsgZ2Fy ZGVuaW5nLgogCiAgICAgICAgICogU2NyaXB0cy9ydW4tZ3RrLXRlc3RzOgpkaWZmIC0tZ2l0IGEv VG9vbHMvU2NyaXB0cy9ydW4tZ3RrLXRlc3RzIGIvVG9vbHMvU2NyaXB0cy9ydW4tZ3RrLXRlc3Rz CmluZGV4IGVmNzM3MzU3YTkwM2EzM2EzYTE4YzlmMzc2YjA1NjkwZDZmZjA4M2UuLjM1ZTcwZWQy Njg1YjM0Y2NjNTBiMGMyZWFjMTQwZWNlZGRlY2MzOTAgMTAwNzU1Ci0tLSBhL1Rvb2xzL1Njcmlw dHMvcnVuLWd0ay10ZXN0cworKysgYi9Ub29scy9TY3JpcHRzL3J1bi1ndGstdGVzdHMKQEAgLTY3 LDcgKzY3LDYgQEAgY2xhc3MgVGVzdFJ1bm5lcjoKICAgICAgICAgU2tpcHBlZFRlc3QoInVuaXR0 ZXN0cy90ZXN0d2VicmVzb3VyY2UiLCAiL3dlYmtpdC93ZWJyZXNvdXJjZS9zdWJfcmVzb3VyY2Vf bG9hZGluZyIsICJUZXN0IGZhaWxzIGluIEdUSyBMaW51eCA2NC1iaXQgUmVsZWFzZSBib3QiLCA4 MjMzMCksCiAgICAgICAgIFNraXBwZWRUZXN0KCJ1bml0dGVzdHMvdGVzdHdlYnZpZXciLCAiL3dl YmtpdC93ZWJ2aWV3L2ljb24tdXJpIiwgIlRlc3QgdGltZXMgb3V0IGluIEdUSyBMaW51eCA2NC1i aXQgUmVsZWFzZSBib3QiLCA4MjMyOCksCiAgICAgICAgIFNraXBwZWRUZXN0KCJ1bml0dGVzdHMv dGVzdGF0ayIsICIvd2Via2l0L2F0ay9nZXRUZXh0SW5QYXJhZ3JhcGhBbmRCb2R5TW9kZXJhdGUi LCAiVGVzdCBmYWlscyIsIDEwNTUzOCksCi0gICAgICAgIFNraXBwZWRUZXN0KCJXZWJLaXQyQVBJ VGVzdHMvVGVzdEluc3BlY3RvciIsIFNraXBwZWRUZXN0LkVOVElSRV9TVUlURSwgIlRlc3QgZmFp bHMiLCAxMTMyODEpLAogICAgICAgICBTa2lwcGVkVGVzdCgiV2ViS2l0MkFQSVRlc3RzL1Rlc3RJ bnNwZWN0b3JTZXJ2ZXIiLCBTa2lwcGVkVGVzdC5FTlRJUkVfU1VJVEUsICJUZXN0IHRpbWVzIG91 dCIsIDEwNTg2NiksCiAgICAgICAgIFNraXBwZWRUZXN0KCJXZWJLaXQyQVBJVGVzdHMvVGVzdFJl c291cmNlcyIsICIvd2Via2l0Mi9XZWJLaXRXZWJWaWV3L3Jlc291cmNlcyIsICJUZXN0IGlzIGZs YWt5IGluIEdUSyBMaW51eCAzMi1iaXQgUmVsZWFzZSBib3QiLCA4Mjg2OCksCiAgICAgICAgIFNr aXBwZWRUZXN0KCJXZWJLaXQyQVBJVGVzdHMvVGVzdFdlYktpdEFjY2Vzc2liaWxpdHkiLCAiL3dl YmtpdDIvV2ViS2l0QWNjZXNzaWJpbGl0eS9hdHNwaS1iYXNpYy1oaWVyYXJjaHkiLCAiVGVzdCBm YWlscyIsIDEwMDQwOCksCg== 195364 2013-03-27 11:27:40 -0700 2013-04-02 04:59:41 -0700 Patch bug-113281-20130327192738.patch text/plain 9081 zan U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ2OTk3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggZjZhZGNlMDk1Y2FkZTU3 NjJhZDIxZGE2OTJmY2QwZmQzZGY4YzdhMy4uZDg3NTU2NjFlYzJlOTE4Yzk0ZmRjYWY1ZDAxOWEx MzU1YTQ3YWZhNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM3IEBACisyMDEzLTAzLTI3ICBaYW4g RG9iZXJzZWsgIDx6ZG9iZXJzZWtAaWdhbGlhLmNvbT4KKworICAgICAgICBSRUdSRVNTSU9OIChy MTQ2NTE4KTogV2ViS2l0MkFQSVRlc3RzL1Rlc3RJbnNwZWN0b3IgaXMgZmFpbGluZworICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTEzMjgxCisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUmVjb25zdHJ1Y3Rpb24g b2YgdGhlIFdlYkluc3BlY3RvclByb3h5IG9wZW5pbmcgcHJvY2Vzc2luZyBpbiByMTQ2NTE4IGNh dXNlZCB0aGUgY2hhbmdlIGluIGhvdyB0aGUgR1RLLXNwZWNpZmljCisgICAgICAgIFdlYkluc3Bl Y3RvclByb3h5IGNvZGUgb3BlcmF0ZXMsIHNwZWNpZmljYWxseSB0aGUgJ2JyaW5nLXRvLWZyb250 JyBzaWduYWwgaXMgbm90IGVtaXR0ZWQgYW55bW9yZSB3aGVuIG9wZW5pbmcgdGhlCisgICAgICAg IGluc3BlY3RvciBkdWUgdG8gdGhlIFdlYkluc3BlY3RvclByb3h5OjpicmluZ1RvRnJvbnQgbWV0 aG9kIG5vdyBvbmx5IGJyaW5naW5nIHRoZSBpbnNwZWN0b3Igd2luZG93IHRvIGZyb250IGlmIGl0 IGV4aXN0cworICAgICAgICBhbmQgb3BlbmluZyBpdCAoYW5kIHRodXMgYmVpbmcgdW5hYmxlIHRv IGJyaW5nIGl0IHRvIGZyb250KSBvdGhlcndpc2UuCisKKyAgICAgICAgQ2xvc2luZyBvZiB0aGUg aW5zcGVjdG9yIHRocm91Z2ggdGhlIGRpZENsb3NlIG1ldGhvZCBpcyBub3cgZG9uZSBpbW1lZGlh dGVseSBhZnRlciBzZW5kaW5nIHRoZSBXZWJJbnNwZWN0b3I6OkNsb3NlKCkKKyAgICAgICAgbWVz c2FnZSB0byB0aGUgV2ViUHJvY2VzcyByYXRoZXIgdGhhbiB3YWl0aW5nIGZvciB0aGUgV2ViUHJv Y2VzcyB0byBjb21tdW5pY2F0ZSBiYWNrIHRoZSBvcmRlciBvZiBjbG9zaW5nLiBEdWUgdG8gdGhp cworICAgICAgICB0aGUgcmVsZXZhbnQgY29kZSBpbiB0aGUgdGVzdCBjYXNlcyBoYWQgdG8gYmUg Y2hhbmdlZCB0byBub3QgcnVuIHRoZSBsb29wIGJ1dCByYXRoZXIganVzdCBjaGVjayB0aGF0IHRo ZSBjbG9zaW5nIHdhcworICAgICAgICBzdWNjZXNzZnVsLgorCisgICAgICAgICogVUlQcm9jZXNz L0FQSS9ndGsvdGVzdHMvVGVzdEluc3BlY3Rvci5jcHA6IEFkanVzdCB0aGUgVGVzdEluc3BlY3Rv ciB1bml0IHRlc3QgYWZ0ZXIgY2hhbmdlcyBpbiByMTQ2NTE4LgorICAgICAgICAoSW5zcGVjdG9y VGVzdDo6Y2xvc2VkKTogRG8gbm90IHF1aXQgdGhlIGxvb3AgYXMgaXQgaXMgbm90IHJ1biBhbnlt b3JlLgorICAgICAgICAoSW5zcGVjdG9yVGVzdDo6Y2xvc2UpOiBGb3JtZXJseSBjbG9zZUFuZFdh aXRVbnRpbENsb3NlZCwgdGhlIGNsb3NpbmcgaXMgbm90IGFzeW5jaHJvbm91cyBhbnltb3JlIHNv IHRoZSBsb29wIGlzIG5vdCBydW4uCisgICAgICAgICh0ZXN0SW5zcGVjdG9yRGVmYXVsdCk6IE9u bHkgdGhlIHdpbmRvdyBvcGVuaW5nIGV2ZW50IGlzIG5vdyBleHBlY3RlZCB1cG9uIHNob3dpbmcg dGhlIGluc3BlY3RvciBmb3IgdGhlIGZpcnN0IHRpbWUuCisgICAgICAgIENhbGxpbmcgdGhlIElu c3BlY3RvclRlc3Q6OmNsb3NlIG1ldGhvZCBhZnRlciBpdCdzIGJlZW4gcmVuYW1lZCBmcm9tIGNs b3NlQW5kV2FpdFVudGlsQ2xvc2VkLgorICAgICAgICAoQ3VzdG9tSW5zcGVjdG9yVGVzdDo6ZGVz dHJveVdpbmRvdyk6IEZvcm1lcmx5IGRlc3Ryb3lXaW5kb3dBbmRXYWl0VW50aWxDbG9zZWQsIHRo ZSBjbG9zaW5nIGlzIG5vdCBhc3luY2hyb25vdXMgYW55bW9yZQorICAgICAgICBzbyB0aGUgbG9v cCBpcyBub3QgcnVuLgorICAgICAgICAodGVzdEluc3BlY3Rvck1hbnVhbEF0dGFjaERldGFjaCk6 IE9ubHkgdGhlIHdpbmRvdyBvcGVuaW5nIGV2ZW50IGlzIG5vdyBleHBlY3RlZCB1cG9uIHNob3dp bmcgdGhlIGluc3BlY3RvciBmb3IgdGhlIGZpcnN0CisgICAgICAgIHRpbWUuCisgICAgICAgICh0 ZXN0SW5zcGVjdG9yQ3VzdG9tQ29udGFpbmVyRGVzdHJveWVkKTogQ2FsbGluZyB0aGUgQ3VzdG9t SW5zcGVjdG9yVGVzdDo6ZGVzdHJveVdpbmRvdyBtZXRob2QgYWZ0ZXIgaXQncyBiZWVuIHJlbmFt ZWQKKyAgICAgICAgZnJvbSBkZXN0cm95V2luZG93QW5kV2FpdFVudGlsQ2xvc2VkLgorICAgICAg ICAqIFVJUHJvY2Vzcy9XZWJJbnNwZWN0b3JQcm94eS5jcHA6CisgICAgICAgIChXZWJLaXQ6Oldl Ykluc3BlY3RvclByb3h5OjpzaG93KTogV2hlbiBzaG93aW5nIGEgY29ubmVjdGVkIFdlYkluc3Bl Y3RvclByb3h5LCBzZW5kIHRoZSBTaG93IG1lc3NhZ2UgdG8gdGhlIFdlYkluc3BlY3RvcgorICAg ICAgICBsaXN0ZW5lciBpbiB0aGUgV2ViUHJvY2Vzcy4gVGhpcyB3aWxsIGNhdXNlIHRoZSBpbnNw ZWN0b3Igc2hvd2luZyB0byBiZSBoYW5kbGVkIHRocm91Z2ggdGhlIGJyaW5nVG9Gcm9udCBtZXRo b2Qgd2hpY2ggYXQKKyAgICAgICAgdGhpcyBwb2ludCB3aWxsIG5vdCBiZSBpZ25vcmVkIGFuZCB3 aWxsIHByb3Blcmx5IGVpdGhlciBicmluZyB0aGUgaW5zcGVjdG9yIHRvIHRoZSBmcm9udCBvciBv cGVuIGl0IGlmIGl0J3Mgbm90IHlldAorICAgICAgICB2aXNpYmxlLgorCiAyMDEzLTAzLTI3ICBL b25kYXBhbGx5IEthbHlhbiAgPGthbHlhbi5rb25kYXBhbGx5QGludGVsLmNvbT4KIAogICAgICAg ICBbQ29vcmRHZnhdIFN1cHBvcnQgdG8gc2hhcmUgR3JhcGhpY3NTdXJmYWNlIGZsYWdzIHdpdGgg Y2xpZW50LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvdGVz dHMvVGVzdEluc3BlY3Rvci5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay90 ZXN0cy9UZXN0SW5zcGVjdG9yLmNwcAppbmRleCA2NzM3NDk0MTFhNjExMjQ4MjFiOTIxNzU5YWQ3 Mjk1NTMxN2Q3ZDQ3Li5jNzYxOWI5MTg4ZDUwZDA4MjBiYWYxMjU5YWQ1YzYwYmNjZjI0ODI4IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay90ZXN0cy9UZXN0SW5z cGVjdG9yLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay90ZXN0cy9U ZXN0SW5zcGVjdG9yLmNwcApAQCAtOTgsNyArOTgsNiBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCB2 b2lkIGNsb3NlZCgpCiAgICAgewogICAgICAgICBtX2V2ZW50cy5hcHBlbmQoQ2xvc2VkKTsKLSAg ICAgICAgZ19tYWluX2xvb3BfcXVpdChtX21haW5Mb29wKTsKICAgICB9CiAKICAgICB2aXJ0dWFs IGJvb2wgYXR0YWNoKCkKQEAgLTE0MCwxMCArMTM5LDkgQEAgcHVibGljOgogICAgICAgICBnX21h aW5fbG9vcF9ydW4obV9tYWluTG9vcCk7CiAgICAgfQogCi0gICAgdm9pZCBjbG9zZUFuZFdhaXRV bnRpbENsb3NlZCgpCisgICAgdm9pZCBjbG9zZSgpCiAgICAgewogICAgICAgICB3ZWJraXRfd2Vi X2luc3BlY3Rvcl9jbG9zZShtX2luc3BlY3Rvcik7Ci0gICAgICAgIGdfbWFpbl9sb29wX3J1biht X21haW5Mb29wKTsKICAgICB9CiAKICAgICBXZWJLaXRXZWJJbnNwZWN0b3IqIG1faW5zcGVjdG9y OwpAQCAtMTY2LDkgKzE2NCw4IEBAIHN0YXRpYyB2b2lkIHRlc3RJbnNwZWN0b3JEZWZhdWx0KElu c3BlY3RvclRlc3QqIHRlc3QsIGdjb25zdHBvaW50ZXIpCiAgICAgZ19hc3NlcnQoIXdlYmtpdF93 ZWJfaW5zcGVjdG9yX2lzX2F0dGFjaGVkKHRlc3QtPm1faW5zcGVjdG9yKSk7CiAgICAgZ19hc3Nl cnRfY21wdWludCh3ZWJraXRfd2ViX2luc3BlY3Rvcl9nZXRfYXR0YWNoZWRfaGVpZ2h0KHRlc3Qt Pm1faW5zcGVjdG9yKSwgPT0sIDApOwogICAgIFZlY3RvcjxJbnNwZWN0b3JUZXN0OjpJbnNwZWN0 b3JFdmVudHM+JiBldmVudHMgPSB0ZXN0LT5tX2V2ZW50czsKLSAgICBnX2Fzc2VydF9jbXBpbnQo ZXZlbnRzLnNpemUoKSwgPT0sIDIpOwotICAgIGdfYXNzZXJ0X2NtcGludChldmVudHNbMF0sID09 LCBJbnNwZWN0b3JUZXN0OjpCcmluZ1RvRnJvbnQpOwotICAgIGdfYXNzZXJ0X2NtcGludChldmVu dHNbMV0sID09LCBJbnNwZWN0b3JUZXN0OjpPcGVuV2luZG93KTsKKyAgICBnX2Fzc2VydF9jbXBp bnQoZXZlbnRzLnNpemUoKSwgPT0sIDEpOworICAgIGdfYXNzZXJ0X2NtcGludChldmVudHNbMF0s ID09LCBJbnNwZWN0b3JUZXN0OjpPcGVuV2luZG93KTsKICAgICB0ZXN0LT5tX2V2ZW50cy5jbGVh cigpOwogCiAgICAgdGVzdC0+c2hvd0FuZFdhaXRVbnRpbEZpbmlzaGVkKHRydWUpOwpAQCAtMTkz LDcgKzE5MCw3IEBAIHN0YXRpYyB2b2lkIHRlc3RJbnNwZWN0b3JEZWZhdWx0KEluc3BlY3RvclRl c3QqIHRlc3QsIGdjb25zdHBvaW50ZXIpCiAgICAgZ19hc3NlcnRfY21waW50KGV2ZW50c1sxXSwg PT0sIEluc3BlY3RvclRlc3Q6Ok9wZW5XaW5kb3cpOwogICAgIHRlc3QtPm1fZXZlbnRzLmNsZWFy KCk7CiAKLSAgICB0ZXN0LT5jbG9zZUFuZFdhaXRVbnRpbENsb3NlZCgpOworICAgIHRlc3QtPmNs b3NlKCk7CiAgICAgZXZlbnRzID0gdGVzdC0+bV9ldmVudHM7CiAgICAgZ19hc3NlcnRfY21waW50 KGV2ZW50cy5zaXplKCksID09LCAxKTsKICAgICBnX2Fzc2VydF9jbXBpbnQoZXZlbnRzWzBdLCA9 PSwgSW5zcGVjdG9yVGVzdDo6Q2xvc2VkKTsKQEAgLTI3MiwxMiArMjY5LDExIEBAIHB1YmxpYzoK ICAgICAgICAgcmV0dXJuIEluc3BlY3RvclRlc3Q6OmRldGFjaCgpOwogICAgIH0KIAotICAgIHZv aWQgZGVzdHJveVdpbmRvd0FuZFdhaXRVbnRpbENsb3NlZCgpCisgICAgdm9pZCBkZXN0cm95V2lu ZG93KCkKICAgICB7CiAgICAgICAgIGdfYXNzZXJ0KG1faW5zcGVjdG9yV2luZG93KTsKICAgICAg ICAgZ3RrX3dpZGdldF9kZXN0cm95KG1faW5zcGVjdG9yV2luZG93KTsKICAgICAgICAgbV9pbnNw ZWN0b3JXaW5kb3cgPSAwOwotICAgICAgICBnX21haW5fbG9vcF9ydW4obV9tYWluTG9vcCk7CiAg ICAgfQogCiAgICAgR3RrV2lkZ2V0KiBtX2luc3BlY3RvcldpbmRvdzsKQEAgLTI5NCw5ICsyOTAs OCBAQCBzdGF0aWMgdm9pZCB0ZXN0SW5zcGVjdG9yTWFudWFsQXR0YWNoRGV0YWNoKEN1c3RvbUlu c3BlY3RvclRlc3QqIHRlc3QsIGdjb25zdHBvaQogICAgIHRlc3QtPmFzc2VydE9iamVjdElzRGVs ZXRlZFdoZW5UZXN0RmluaXNoZXMoR19PQkpFQ1Qod2Via2l0X3dlYl9pbnNwZWN0b3JfZ2V0X3dl Yl92aWV3KHRlc3QtPm1faW5zcGVjdG9yKSkpOwogICAgIGdfYXNzZXJ0KCF3ZWJraXRfd2ViX2lu c3BlY3Rvcl9pc19hdHRhY2hlZCh0ZXN0LT5tX2luc3BlY3RvcikpOwogICAgIFZlY3RvcjxJbnNw ZWN0b3JUZXN0OjpJbnNwZWN0b3JFdmVudHM+JiBldmVudHMgPSB0ZXN0LT5tX2V2ZW50czsKLSAg ICBnX2Fzc2VydF9jbXBpbnQoZXZlbnRzLnNpemUoKSwgPT0sIDIpOwotICAgIGdfYXNzZXJ0X2Nt cGludChldmVudHNbMF0sID09LCBJbnNwZWN0b3JUZXN0OjpCcmluZ1RvRnJvbnQpOwotICAgIGdf YXNzZXJ0X2NtcGludChldmVudHNbMV0sID09LCBJbnNwZWN0b3JUZXN0OjpPcGVuV2luZG93KTsK KyAgICBnX2Fzc2VydF9jbXBpbnQoZXZlbnRzLnNpemUoKSwgPT0sIDEpOworICAgIGdfYXNzZXJ0 X2NtcGludChldmVudHNbMF0sID09LCBJbnNwZWN0b3JUZXN0OjpPcGVuV2luZG93KTsKICAgICB0 ZXN0LT5tX2V2ZW50cy5jbGVhcigpOwogCiAgICAgdGVzdC0+cmVzaXplVmlld0FuZEF0dGFjaCgp OwpAQCAtMzE4LDcgKzMxMyw3IEBAIHN0YXRpYyB2b2lkIHRlc3RJbnNwZWN0b3JNYW51YWxBdHRh Y2hEZXRhY2goQ3VzdG9tSW5zcGVjdG9yVGVzdCogdGVzdCwgZ2NvbnN0cG9pCiAgICAgdGVzdC0+ cmVzaXplVmlld0FuZEF0dGFjaCgpOwogICAgIGdfYXNzZXJ0KHdlYmtpdF93ZWJfaW5zcGVjdG9y X2lzX2F0dGFjaGVkKHRlc3QtPm1faW5zcGVjdG9yKSk7CiAgICAgdGVzdC0+bV9ldmVudHMuY2xl YXIoKTsKLSAgICB0ZXN0LT5jbG9zZUFuZFdhaXRVbnRpbENsb3NlZCgpOworICAgIHRlc3QtPmNs b3NlKCk7CiAgICAgZXZlbnRzID0gdGVzdC0+bV9ldmVudHM7CiAgICAgZ19hc3NlcnRfY21waW50 KGV2ZW50cy5zaXplKCksID09LCAyKTsKICAgICBnX2Fzc2VydF9jbXBpbnQoZXZlbnRzWzBdLCA9 PSwgSW5zcGVjdG9yVGVzdDo6RGV0YWNoKTsKQEAgLTMzOCw3ICszMzMsNyBAQCBzdGF0aWMgdm9p ZCB0ZXN0SW5zcGVjdG9yQ3VzdG9tQ29udGFpbmVyRGVzdHJveWVkKEN1c3RvbUluc3BlY3RvclRl c3QqIHRlc3QsIGdjbwogICAgIGdfYXNzZXJ0KCF3ZWJraXRfd2ViX2luc3BlY3Rvcl9pc19hdHRh Y2hlZCh0ZXN0LT5tX2luc3BlY3RvcikpOwogCiAgICAgdGVzdC0+bV9ldmVudHMuY2xlYXIoKTsK LSAgICB0ZXN0LT5kZXN0cm95V2luZG93QW5kV2FpdFVudGlsQ2xvc2VkKCk7CisgICAgdGVzdC0+ ZGVzdHJveVdpbmRvdygpOwogICAgIFZlY3RvcjxJbnNwZWN0b3JUZXN0OjpJbnNwZWN0b3JFdmVu dHM+JiBldmVudHMgPSB0ZXN0LT5tX2V2ZW50czsKICAgICBnX2Fzc2VydF9jbXBpbnQoZXZlbnRz LnNpemUoKSwgPT0sIDEpOwogICAgIGdfYXNzZXJ0X2NtcGludChldmVudHNbMF0sID09LCBJbnNw ZWN0b3JUZXN0OjpDbG9zZWQpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L1dlYkluc3BlY3RvclByb3h5LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJJbnNw ZWN0b3JQcm94eS5jcHAKaW5kZXggZjIxZmI3Y2Y0Yzk3YTExNmU4ZWQzN2ViOTc0YTE4MDlhODEy NDg4Yy4uMDNmMTY5N2M2MDhlMWYwMzRiNWM3MjA2NjA5MmJiNWY5YWRjYTJlYSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYkluc3BlY3RvclByb3h5LmNwcAorKysgYi9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViSW5zcGVjdG9yUHJveHkuY3BwCkBAIC0xNTEsNyAr MTUxLDcgQEAgdm9pZCBXZWJJbnNwZWN0b3JQcm94eTo6c2hvdygpCiAgICAgICAgIHJldHVybjsK IAogICAgIGlmIChpc0Nvbm5lY3RlZCgpKSB7Ci0gICAgICAgIG9wZW4oKTsKKyAgICAgICAgbV9w YWdlLT5wcm9jZXNzKCktPnNlbmQoTWVzc2FnZXM6OldlYkluc3BlY3Rvcjo6U2hvdygpLCBtX3Bh Z2UtPnBhZ2VJRCgpKTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KIApkaWZmIC0tZ2l0IGEvVG9v bHMvQ2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdlTG9nCmluZGV4IDdkZDhlZDQzMjZhNDJjNDhmMTgw NGEzMGZmMmJhMzcyNjc1MTY5NjUuLjRmNDcxOTRiOGZiZDk2YmM2NjZiMDg2MWVmMGQwNjQxNjBm MjEzMDcgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9Ub29scy9DaGFuZ2VMb2cK QEAgLTEsMyArMSwxMyBAQAorMjAxMy0wMy0yNyAgWmFuIERvYmVyc2VrICA8emRvYmVyc2VrQGln YWxpYS5jb20+CisKKyAgICAgICAgUkVHUkVTU0lPTiAocjE0NjUxOCk6IFdlYktpdDJBUElUZXN0 cy9UZXN0SW5zcGVjdG9yIGlzIGZhaWxpbmcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTExMzI4MQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgICogU2NyaXB0cy9ydW4tZ3RrLXRlc3RzOgorICAgICAgICAoVGVz dFJ1bm5lcik6IFJlbW92ZSB0aGUgc2tpcCBlbnRyeSBmb3IgdGhlIFdlYktpdDJBUElUZXN0cy9U ZXN0SW5zcGVjdG9yIHVuaXQgdGVzdC4KKwogMjAxMy0wMy0yNyAgQW50dGkgS29pdmlzdG8gIDxh bnR0aUBhcHBsZS5jb20+CiAKICAgICAgICAgRml4IFphbGFuJ3MgZW1haWwuCmRpZmYgLS1naXQg YS9Ub29scy9TY3JpcHRzL3J1bi1ndGstdGVzdHMgYi9Ub29scy9TY3JpcHRzL3J1bi1ndGstdGVz dHMKaW5kZXggZWY3MzczNTdhOTAzYTMzYTNhMThjOWYzNzZiMDU2OTBkNmZmMDgzZS4uMzVlNzBl ZDI2ODViMzRjY2M1MGIwYzJlYWMxNDBlY2VkZGVjYzM5MCAxMDA3NTUKLS0tIGEvVG9vbHMvU2Ny aXB0cy9ydW4tZ3RrLXRlc3RzCisrKyBiL1Rvb2xzL1NjcmlwdHMvcnVuLWd0ay10ZXN0cwpAQCAt NjcsNyArNjcsNiBAQCBjbGFzcyBUZXN0UnVubmVyOgogICAgICAgICBTa2lwcGVkVGVzdCgidW5p dHRlc3RzL3Rlc3R3ZWJyZXNvdXJjZSIsICIvd2Via2l0L3dlYnJlc291cmNlL3N1Yl9yZXNvdXJj ZV9sb2FkaW5nIiwgIlRlc3QgZmFpbHMgaW4gR1RLIExpbnV4IDY0LWJpdCBSZWxlYXNlIGJvdCIs IDgyMzMwKSwKICAgICAgICAgU2tpcHBlZFRlc3QoInVuaXR0ZXN0cy90ZXN0d2VidmlldyIsICIv d2Via2l0L3dlYnZpZXcvaWNvbi11cmkiLCAiVGVzdCB0aW1lcyBvdXQgaW4gR1RLIExpbnV4IDY0 LWJpdCBSZWxlYXNlIGJvdCIsIDgyMzI4KSwKICAgICAgICAgU2tpcHBlZFRlc3QoInVuaXR0ZXN0 cy90ZXN0YXRrIiwgIi93ZWJraXQvYXRrL2dldFRleHRJblBhcmFncmFwaEFuZEJvZHlNb2RlcmF0 ZSIsICJUZXN0IGZhaWxzIiwgMTA1NTM4KSwKLSAgICAgICAgU2tpcHBlZFRlc3QoIldlYktpdDJB UElUZXN0cy9UZXN0SW5zcGVjdG9yIiwgU2tpcHBlZFRlc3QuRU5USVJFX1NVSVRFLCAiVGVzdCBm YWlscyIsIDExMzI4MSksCiAgICAgICAgIFNraXBwZWRUZXN0KCJXZWJLaXQyQVBJVGVzdHMvVGVz dEluc3BlY3RvclNlcnZlciIsIFNraXBwZWRUZXN0LkVOVElSRV9TVUlURSwgIlRlc3QgdGltZXMg b3V0IiwgMTA1ODY2KSwKICAgICAgICAgU2tpcHBlZFRlc3QoIldlYktpdDJBUElUZXN0cy9UZXN0 UmVzb3VyY2VzIiwgIi93ZWJraXQyL1dlYktpdFdlYlZpZXcvcmVzb3VyY2VzIiwgIlRlc3QgaXMg Zmxha3kgaW4gR1RLIExpbnV4IDMyLWJpdCBSZWxlYXNlIGJvdCIsIDgyODY4KSwKICAgICAgICAg U2tpcHBlZFRlc3QoIldlYktpdDJBUElUZXN0cy9UZXN0V2ViS2l0QWNjZXNzaWJpbGl0eSIsICIv d2Via2l0Mi9XZWJLaXRBY2Nlc3NpYmlsaXR5L2F0c3BpLWJhc2ljLWhpZXJhcmNoeSIsICJUZXN0 IGZhaWxzIiwgMTAwNDA4KSwK 196123 2013-04-02 04:59:46 -0700 2013-04-10 00:37:49 -0700 Patch bug-113281-20130402135938.patch text/plain 12099 zan U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ3MzgyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggNmNlODk1NDgyMjkyYjA2 NWMxZjFiNzc0YTIzOTVjODk5MThmMjlkMy4uZWYyOTc2ZTJlYTgwZTk3Mjc4YzgzOTQyN2Y2YjEw YTZiZjQ2MWM4ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQyIEBACisyMDEzLTA0LTAyICBaYW4g RG9iZXJzZWsgIDx6ZG9iZXJzZWtAaWdhbGlhLmNvbT4KKworICAgICAgICBSRUdSRVNTSU9OIChy MTQ2NTE4KTogV2ViS2l0MkFQSVRlc3RzL1Rlc3RJbnNwZWN0b3IgaXMgZmFpbGluZworICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTEzMjgxCisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQ2hhbmdlcyB0byB0aGUg V2ViSW5zcGVjdG9yUHJveHkgb3BlbmluZyBwcm9jZXNzaW5nIGluIHIxNDY1MTggY2F1c2VkIHRo ZSBjaGFuZ2UgaW4gaG93IHRoZSBHVEstc3BlY2lmaWMKKyAgICAgICAgV2ViSW5zcGVjdG9yUHJv eHkgY29kZSBvcGVyYXRlcywgc3BlY2lmaWNhbGx5IHRoZSAnYnJpbmctdG8tZnJvbnQnIHNpZ25h bCBpcyBub3QgZW1pdHRlZCBhbnltb3JlIHdoZW4gb3BlbmluZyB0aGUKKyAgICAgICAgaW5zcGVj dG9yIGR1ZSB0byB0aGUgV2ViSW5zcGVjdG9yUHJveHk6OmJyaW5nVG9Gcm9udCBtZXRob2Qgbm93 IG9ubHkgYnJpbmdpbmcgdGhlIGluc3BlY3RvciB3aW5kb3cgdG8gZnJvbnQgaWYgaXQgZXhpc3Rz CisgICAgICAgIGFuZCBvcGVuaW5nIGl0IChhbmQgdGh1cyB1bmFibGUgdG8gYnJpbmcgaXQgdG8g ZnJvbnQpIG90aGVyd2lzZS4KKworICAgICAgICBDbG9zaW5nIG9mIHRoZSBpbnNwZWN0b3IgdGhy b3VnaCB0aGUgZGlkQ2xvc2UgbWV0aG9kIGlzIG5vdyBkb25lIGltbWVkaWF0ZWx5IGFmdGVyIHNl bmRpbmcgdGhlIFdlYkluc3BlY3Rvcjo6Q2xvc2UoKQorICAgICAgICBtZXNzYWdlIHRvIHRoZSBX ZWJQcm9jZXNzIHJhdGhlciB0aGFuIHdhaXRpbmcgZm9yIHRoZSBXZWJQcm9jZXNzIHRvIGNvbW11 bmljYXRlIGJhY2sgdGhlIG9yZGVyIG9mIGNsb3NpbmcuIER1ZSB0byB0aGlzCisgICAgICAgIHRo ZSByZWxldmFudCBjb2RlIGluIHRoZSB0ZXN0IGNhc2VzIGhhZCB0byBiZSBjaGFuZ2VkIHRvIG5v dCBydW4gdGhlIGxvb3AgYnV0IHJhdGhlciBqdXN0IGNoZWNrIHRoYXQgdGhlIGNsb3Npbmcgd2Fz CisgICAgICAgIHN1Y2Nlc3NmdWwuCisKKyAgICAgICAgKEluc3BlY3RvclRlc3Q6Okluc3BlY3Rv clRlc3QpOiBSZW1vdmUgdGhlIGluaXRpYWxpemF0aW9uIG9mIHRoZSBub3cgcmVkdW5kYW50IG1f cXVpdE9uQnJpbmdUb0Zyb250IG1lbWJlciB2YXJpYWJsZS4KKyAgICAgICAgKEluc3BlY3RvclRl c3Q6OmJyaW5nVG9Gcm9udCk6IFF1aXQgdGhlIGxvb3Agd2l0aG91dCBjaGVja2luZyB0aGUgcmVt b3ZlZCBtZW1iZXIgdmFyaWFibGUuCisgICAgICAgIChJbnNwZWN0b3JUZXN0OjpjbG9zZWQpOiBE byBub3QgcXVpdCB0aGUgbG9vcCBhcyBpdCBpcyBub3QgcnVuIGFueW1vcmUuCisgICAgICAgIChJ bnNwZWN0b3JUZXN0OjpzaG93SWRsZSk6IEEgaGVscGVyIG1ldGhvZCB0aGF0IGFzeW5jaHJvbm91 c2x5IGNhbGxzIHRoZSB3ZWJraXRfd2ViX2luc3BlY3Rvcl9zaG93IG1ldGhvZCwgcmVtb3Zpbmcg c29tZQorICAgICAgICB1bm5lY2Vzc2FyeSBjb21wbGV4aXR5IGFib3V0IHVuZGVyIHdoYXQgZXhh Y3QgY2lyY3Vtc3RhbmNlcyB0byBxdWl0IHRoZSBsb29wIGluIG9wZW4td2luZG93L2JyaW5nLXRv LWZyb250IGNhbGxiYWNrcy4KKyAgICAgICAgKEluc3BlY3RvclRlc3Q6OnNob3cpOiBSZXBsYWNl cyB0aGUgc2hvd0FuZFdhaXRVbnRpbEZpbmlzaGVkIG1ldGhvZCwgYWRkaW5nIGFuIGlkbGUgaW52 b2NhdGlvbiBvZiB0aGUgc2hvd0lkbGUgaGVscGVyCisgICAgICAgIG1ldGhvZCBhbmQgcnVubmlu ZyB0aGUgbG9vcC4KKyAgICAgICAgKEluc3BlY3RvclRlc3Q6OmNsb3NlKTogRm9ybWVybHkgY2xv c2VBbmRXYWl0VW50aWxDbG9zZWQsIG5vdyBkb2VzIG5vdCBydW4gdGhlIGxvb3AgYW55bW9yZSBh cyB0aGVyZSdzIG5vIG5lZWQgZm9yIGl0LgorICAgICAgICAodGVzdEluc3BlY3RvckRlZmF1bHQp OiBPbmx5IHRoZSB3aW5kb3cgb3BlbmluZyBldmVudCBpcyBub3cgZXhwZWN0ZWQgdXBvbiBzaG93 aW5nIHRoZSBpbnNwZWN0b3IgZm9yIHRoZSBmaXJzdCB0aW1lLgorICAgICAgICBBZGp1c3Rpbmcg Y2FsbHNpdGVzIHRvIHVzZSBJbnNwZWN0b3JUZXN0OjpzaG93IGFuZCBJbnNwZWN0b3JUZXN0Ojpj bG9zZSBpbnN0ZWFkIG9mCisgICAgICAgIEluc3BlY3RvclRlc3Q6OnNob3dBbmRXYWl0VW50aWxG aW5pc2hlZCBhbmQgSW5zcGVjdG9yVGVzdDo6c2hvd0FuZFdhaXRVbnRpbEZpbmlzaGVkLgorICAg ICAgICAoQ3VzdG9tSW5zcGVjdG9yVGVzdDo6ZGVzdHJveVdpbmRvdyk6IEZvcm1lcmx5IGRlc3Ry b3lXaW5kb3dBbmRXYWl0VW50aWxDbG9zZWQsIHRoZSBjbG9zaW5nIGlzIG5vdCBhc3luY2hyb25v dXMgYW55bW9yZQorICAgICAgICBzbyB0aGUgbG9vcCBpcyBub3QgcnVuLgorICAgICAgICAodGVz dEluc3BlY3Rvck1hbnVhbEF0dGFjaERldGFjaCk6IE9ubHkgdGhlIHdpbmRvdyBvcGVuaW5nIGV2 ZW50IGlzIG5vdyBleHBlY3RlZCB1cG9uIHNob3dpbmcgdGhlIGluc3BlY3RvciBmb3IgdGhlIGZp cnN0IHRpbWUuCisgICAgICAgIEFkanVzdGluZyBjYWxsc2l0ZXMgdG8gdXNlIEluc3BlY3RvclRl c3Q6OnNob3cgYW5kIEluc3BlY3RvclRlc3Q6OmNsb3NlIGluc3RlYWQgb2YKKyAgICAgICAgSW5z cGVjdG9yVGVzdDo6c2hvd0FuZFdhaXRVbnRpbEZpbmlzaGVkIGFuZCBJbnNwZWN0b3JUZXN0Ojpz aG93QW5kV2FpdFVudGlsRmluaXNoZWQuCisgICAgICAgICh0ZXN0SW5zcGVjdG9yQ3VzdG9tQ29u dGFpbmVyRGVzdHJveWVkKTogQWRqdXN0aW5nIGNhbGxzaXRlcyB0byB1c2UgSW5zcGVjdG9yVGVz dDo6c2hvdyBhbmQgQ3VzdG9tSW5zcGVjdG9yVGVzdDo6ZGVzdHJveVdpbmRvdworICAgICAgICBp bnN0ZWFkIG9mIEluc3BlY3RvclRlc3Q6OnNob3dBbmRXYWl0VW50aWxGaW5pc2hlZCBhbmQgQ3Vz dG9tSW5zcGVjdG9yVGVzdDo6ZGVzdHJveVdpbmRvd0FuZFdhaXRVbnRpbENsb3NlZC4KKyAgICAg ICAgKiBVSVByb2Nlc3MvV2ViSW5zcGVjdG9yUHJveHkuY3BwOgorICAgICAgICAoV2ViS2l0OjpX ZWJJbnNwZWN0b3JQcm94eTo6c2hvdyk6IFdoZW4gc2hvd2luZyBhIGNvbm5lY3RlZCBXZWJJbnNw ZWN0b3JQcm94eSwgY2FsbCB0aGUgYnJpbmdUb0Zyb250IG1ldGhvZCB3aGljaCB3aWxsCisgICAg ICAgIG9wZW4gdGhlIGluc3BlY3RvciBpZiBpdCdzIG5vdCB5ZXQgdmlzaWJsZSBvciBicmluZyBp dCB0byB0aGUgZnJvbnQgb3RoZXJ3aXNlLiAKKwogMjAxMy0wNC0wMSAgVGltb3RoeSBIYXRjaGVy ICA8dGltb3RoeUBhcHBsZS5jb20+CiAKICAgICAgICAgQWxsb3cgY2hhbmdpbmcgV2ViIEluc3Bl Y3RvciBkb2NrIHNpZGVzIHdpdGhvdXQgdW5kb2NraW5nIGZpcnN0LgpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvdGVzdHMvVGVzdEluc3BlY3Rvci5jcHAgYi9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay90ZXN0cy9UZXN0SW5zcGVjdG9yLmNwcApp bmRleCA2NzM3NDk0MTFhNjExMjQ4MjFiOTIxNzU5YWQ3Mjk1NTMxN2Q3ZDQ3Li43NmQ4MmEzNDhi MjA0NDM1ZGJiYjFmOTlhNTM5MjJjYTZhNmRkMjQzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvQVBJL2d0ay90ZXN0cy9UZXN0SW5zcGVjdG9yLmNwcAorKysgYi9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay90ZXN0cy9UZXN0SW5zcGVjdG9yLmNwcApAQCAtNjQs NyArNjQsNiBAQCBwdWJsaWM6CiAgICAgSW5zcGVjdG9yVGVzdCgpCiAgICAgICAgIDogV2ViVmll d1Rlc3QoKQogICAgICAgICAsIG1faW5zcGVjdG9yKHdlYmtpdF93ZWJfdmlld19nZXRfaW5zcGVj dG9yKG1fd2ViVmlldykpCi0gICAgICAgICwgbV9xdWl0T25CcmluZ1RvRnJvbnQoZmFsc2UpCiAg ICAgewogICAgICAgICB3ZWJraXRfc2V0dGluZ3Nfc2V0X2VuYWJsZV9kZXZlbG9wZXJfZXh0cmFz KHdlYmtpdF93ZWJfdmlld19nZXRfc2V0dGluZ3MobV93ZWJWaWV3KSwgVFJVRSk7CiAgICAgICAg IGFzc2VydE9iamVjdElzRGVsZXRlZFdoZW5UZXN0RmluaXNoZXMoR19PQkpFQ1QobV9pbnNwZWN0 b3IpKTsKQEAgLTkwLDE1ICs4OSwxMyBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCBib29sIGJyaW5n VG9Gcm9udCgpCiAgICAgewogICAgICAgICBtX2V2ZW50cy5hcHBlbmQoQnJpbmdUb0Zyb250KTsK LSAgICAgICAgaWYgKG1fcXVpdE9uQnJpbmdUb0Zyb250KQotICAgICAgICAgICAgZ19tYWluX2xv b3BfcXVpdChtX21haW5Mb29wKTsKKyAgICAgICAgZ19tYWluX2xvb3BfcXVpdChtX21haW5Mb29w KTsKICAgICAgICAgcmV0dXJuIEZBTFNFOwogICAgIH0KIAogICAgIHZpcnR1YWwgdm9pZCBjbG9z ZWQoKQogICAgIHsKICAgICAgICAgbV9ldmVudHMuYXBwZW5kKENsb3NlZCk7Ci0gICAgICAgIGdf bWFpbl9sb29wX3F1aXQobV9tYWluTG9vcCk7CiAgICAgfQogCiAgICAgdmlydHVhbCBib29sIGF0 dGFjaCgpCkBAIC0xMTMsMTIgKzExMCwxNyBAQCBwdWJsaWM6CiAgICAgICAgIHJldHVybiBUUlVF OwogICAgIH0KIAotICAgIHZvaWQgc2hvd0FuZFdhaXRVbnRpbEZpbmlzaGVkKGJvb2wgcXVpdE9u QnJpbmdUb0Zyb250KQorCisgICAgc3RhdGljIGdib29sZWFuIHNob3dJZGxlKEluc3BlY3RvclRl c3QqIHRlc3QpCiAgICAgewotICAgICAgICBtX3F1aXRPbkJyaW5nVG9Gcm9udCA9IHF1aXRPbkJy aW5nVG9Gcm9udDsKLSAgICAgICAgd2Via2l0X3dlYl9pbnNwZWN0b3Jfc2hvdyhtX2luc3BlY3Rv cik7CisgICAgICAgIHdlYmtpdF93ZWJfaW5zcGVjdG9yX3Nob3codGVzdC0+bV9pbnNwZWN0b3Ip OworICAgICAgICByZXR1cm4gRkFMU0U7CisgICAgfQorCisgICAgdm9pZCBzaG93KCkKKyAgICB7 CisgICAgICAgIGdfaWRsZV9hZGQocmVpbnRlcnByZXRfY2FzdDxHU291cmNlRnVuYz4oc2hvd0lk bGUpLCB0aGlzKTsKICAgICAgICAgZ19tYWluX2xvb3BfcnVuKG1fbWFpbkxvb3ApOwotICAgICAg ICBtX3F1aXRPbkJyaW5nVG9Gcm9udCA9IGZhbHNlOwogICAgIH0KIAogICAgIHZvaWQgcmVzaXpl Vmlld0FuZEF0dGFjaCgpCkBAIC0xNDAsMTQgKzE0MiwxMiBAQCBwdWJsaWM6CiAgICAgICAgIGdf bWFpbl9sb29wX3J1bihtX21haW5Mb29wKTsKICAgICB9CiAKLSAgICB2b2lkIGNsb3NlQW5kV2Fp dFVudGlsQ2xvc2VkKCkKKyAgICB2b2lkIGNsb3NlKCkKICAgICB7CiAgICAgICAgIHdlYmtpdF93 ZWJfaW5zcGVjdG9yX2Nsb3NlKG1faW5zcGVjdG9yKTsKLSAgICAgICAgZ19tYWluX2xvb3BfcnVu KG1fbWFpbkxvb3ApOwogICAgIH0KIAogICAgIFdlYktpdFdlYkluc3BlY3RvciogbV9pbnNwZWN0 b3I7Ci0gICAgYm9vbCBtX3F1aXRPbkJyaW5nVG9Gcm9udDsKICAgICBWZWN0b3I8SW5zcGVjdG9y RXZlbnRzPiBtX2V2ZW50czsKIH07CiAKQEAgLTE1OCw3ICsxNTgsNyBAQCBzdGF0aWMgdm9pZCB0 ZXN0SW5zcGVjdG9yRGVmYXVsdChJbnNwZWN0b3JUZXN0KiB0ZXN0LCBnY29uc3Rwb2ludGVyKQog ICAgIHRlc3QtPmxvYWRIdG1sKCI8aHRtbD48Ym9keT48cD5XZWJLaXRHVEsrIEluc3BlY3RvciB0 ZXN0PC9wPjwvYm9keT48L2h0bWw+IiwgMCk7CiAgICAgdGVzdC0+d2FpdFVudGlsTG9hZEZpbmlz aGVkKCk7CiAKLSAgICB0ZXN0LT5zaG93QW5kV2FpdFVudGlsRmluaXNoZWQoZmFsc2UpOworICAg IHRlc3QtPnNob3coKTsKICAgICAvLyBXZSBkb24ndCBhZGQgdGhlIHZpZXcgdG8gYSBjb250YWlu ZXIsIHNvIGNvbnN1bWUgdGhlIHdlYWsgcmVmIHdpdGggR1JlZlB0ci4KICAgICBHUmVmUHRyPFdl YktpdFdlYlZpZXdCYXNlPiBpbnNwZWN0b3JWaWV3ID0gd2Via2l0X3dlYl9pbnNwZWN0b3JfZ2V0 X3dlYl92aWV3KHRlc3QtPm1faW5zcGVjdG9yKTsKICAgICBnX2Fzc2VydChpbnNwZWN0b3JWaWV3 LmdldCgpKTsKQEAgLTE2NiwxMiArMTY2LDExIEBAIHN0YXRpYyB2b2lkIHRlc3RJbnNwZWN0b3JE ZWZhdWx0KEluc3BlY3RvclRlc3QqIHRlc3QsIGdjb25zdHBvaW50ZXIpCiAgICAgZ19hc3NlcnQo IXdlYmtpdF93ZWJfaW5zcGVjdG9yX2lzX2F0dGFjaGVkKHRlc3QtPm1faW5zcGVjdG9yKSk7CiAg ICAgZ19hc3NlcnRfY21wdWludCh3ZWJraXRfd2ViX2luc3BlY3Rvcl9nZXRfYXR0YWNoZWRfaGVp Z2h0KHRlc3QtPm1faW5zcGVjdG9yKSwgPT0sIDApOwogICAgIFZlY3RvcjxJbnNwZWN0b3JUZXN0 OjpJbnNwZWN0b3JFdmVudHM+JiBldmVudHMgPSB0ZXN0LT5tX2V2ZW50czsKLSAgICBnX2Fzc2Vy dF9jbXBpbnQoZXZlbnRzLnNpemUoKSwgPT0sIDIpOwotICAgIGdfYXNzZXJ0X2NtcGludChldmVu dHNbMF0sID09LCBJbnNwZWN0b3JUZXN0OjpCcmluZ1RvRnJvbnQpOwotICAgIGdfYXNzZXJ0X2Nt cGludChldmVudHNbMV0sID09LCBJbnNwZWN0b3JUZXN0OjpPcGVuV2luZG93KTsKKyAgICBnX2Fz c2VydF9jbXBpbnQoZXZlbnRzLnNpemUoKSwgPT0sIDEpOworICAgIGdfYXNzZXJ0X2NtcGludChl dmVudHNbMF0sID09LCBJbnNwZWN0b3JUZXN0OjpPcGVuV2luZG93KTsKICAgICB0ZXN0LT5tX2V2 ZW50cy5jbGVhcigpOwogCi0gICAgdGVzdC0+c2hvd0FuZFdhaXRVbnRpbEZpbmlzaGVkKHRydWUp OworICAgIHRlc3QtPnNob3coKTsKICAgICBldmVudHMgPSB0ZXN0LT5tX2V2ZW50czsKICAgICBn X2Fzc2VydF9jbXBpbnQoZXZlbnRzLnNpemUoKSwgPT0sIDEpOwogICAgIGdfYXNzZXJ0X2NtcGlu dChldmVudHNbMF0sID09LCBJbnNwZWN0b3JUZXN0OjpCcmluZ1RvRnJvbnQpOwpAQCAtMTkzLDcg KzE5Miw3IEBAIHN0YXRpYyB2b2lkIHRlc3RJbnNwZWN0b3JEZWZhdWx0KEluc3BlY3RvclRlc3Qq IHRlc3QsIGdjb25zdHBvaW50ZXIpCiAgICAgZ19hc3NlcnRfY21waW50KGV2ZW50c1sxXSwgPT0s IEluc3BlY3RvclRlc3Q6Ok9wZW5XaW5kb3cpOwogICAgIHRlc3QtPm1fZXZlbnRzLmNsZWFyKCk7 CiAKLSAgICB0ZXN0LT5jbG9zZUFuZFdhaXRVbnRpbENsb3NlZCgpOworICAgIHRlc3QtPmNsb3Nl KCk7CiAgICAgZXZlbnRzID0gdGVzdC0+bV9ldmVudHM7CiAgICAgZ19hc3NlcnRfY21waW50KGV2 ZW50cy5zaXplKCksID09LCAxKTsKICAgICBnX2Fzc2VydF9jbXBpbnQoZXZlbnRzWzBdLCA9PSwg SW5zcGVjdG9yVGVzdDo6Q2xvc2VkKTsKQEAgLTI3MiwxMiArMjcxLDExIEBAIHB1YmxpYzoKICAg ICAgICAgcmV0dXJuIEluc3BlY3RvclRlc3Q6OmRldGFjaCgpOwogICAgIH0KIAotICAgIHZvaWQg ZGVzdHJveVdpbmRvd0FuZFdhaXRVbnRpbENsb3NlZCgpCisgICAgdm9pZCBkZXN0cm95V2luZG93 KCkKICAgICB7CiAgICAgICAgIGdfYXNzZXJ0KG1faW5zcGVjdG9yV2luZG93KTsKICAgICAgICAg Z3RrX3dpZGdldF9kZXN0cm95KG1faW5zcGVjdG9yV2luZG93KTsKICAgICAgICAgbV9pbnNwZWN0 b3JXaW5kb3cgPSAwOwotICAgICAgICBnX21haW5fbG9vcF9ydW4obV9tYWluTG9vcCk7CiAgICAg fQogCiAgICAgR3RrV2lkZ2V0KiBtX2luc3BlY3RvcldpbmRvdzsKQEAgLTI5MCwxMyArMjg4LDEy IEBAIHN0YXRpYyB2b2lkIHRlc3RJbnNwZWN0b3JNYW51YWxBdHRhY2hEZXRhY2goQ3VzdG9tSW5z cGVjdG9yVGVzdCogdGVzdCwgZ2NvbnN0cG9pCiAgICAgdGVzdC0+bG9hZEh0bWwoIjxodG1sPjxi b2R5PjxwPldlYktpdEdUSysgSW5zcGVjdG9yIHRlc3Q8L3A+PC9ib2R5PjwvaHRtbD4iLCAwKTsK ICAgICB0ZXN0LT53YWl0VW50aWxMb2FkRmluaXNoZWQoKTsKIAotICAgIHRlc3QtPnNob3dBbmRX YWl0VW50aWxGaW5pc2hlZChmYWxzZSk7CisgICAgdGVzdC0+c2hvdygpOwogICAgIHRlc3QtPmFz c2VydE9iamVjdElzRGVsZXRlZFdoZW5UZXN0RmluaXNoZXMoR19PQkpFQ1Qod2Via2l0X3dlYl9p bnNwZWN0b3JfZ2V0X3dlYl92aWV3KHRlc3QtPm1faW5zcGVjdG9yKSkpOwogICAgIGdfYXNzZXJ0 KCF3ZWJraXRfd2ViX2luc3BlY3Rvcl9pc19hdHRhY2hlZCh0ZXN0LT5tX2luc3BlY3RvcikpOwog ICAgIFZlY3RvcjxJbnNwZWN0b3JUZXN0OjpJbnNwZWN0b3JFdmVudHM+JiBldmVudHMgPSB0ZXN0 LT5tX2V2ZW50czsKLSAgICBnX2Fzc2VydF9jbXBpbnQoZXZlbnRzLnNpemUoKSwgPT0sIDIpOwot ICAgIGdfYXNzZXJ0X2NtcGludChldmVudHNbMF0sID09LCBJbnNwZWN0b3JUZXN0OjpCcmluZ1Rv RnJvbnQpOwotICAgIGdfYXNzZXJ0X2NtcGludChldmVudHNbMV0sID09LCBJbnNwZWN0b3JUZXN0 OjpPcGVuV2luZG93KTsKKyAgICBnX2Fzc2VydF9jbXBpbnQoZXZlbnRzLnNpemUoKSwgPT0sIDEp OworICAgIGdfYXNzZXJ0X2NtcGludChldmVudHNbMF0sID09LCBJbnNwZWN0b3JUZXN0OjpPcGVu V2luZG93KTsKICAgICB0ZXN0LT5tX2V2ZW50cy5jbGVhcigpOwogCiAgICAgdGVzdC0+cmVzaXpl Vmlld0FuZEF0dGFjaCgpOwpAQCAtMzE4LDcgKzMxNSw3IEBAIHN0YXRpYyB2b2lkIHRlc3RJbnNw ZWN0b3JNYW51YWxBdHRhY2hEZXRhY2goQ3VzdG9tSW5zcGVjdG9yVGVzdCogdGVzdCwgZ2NvbnN0 cG9pCiAgICAgdGVzdC0+cmVzaXplVmlld0FuZEF0dGFjaCgpOwogICAgIGdfYXNzZXJ0KHdlYmtp dF93ZWJfaW5zcGVjdG9yX2lzX2F0dGFjaGVkKHRlc3QtPm1faW5zcGVjdG9yKSk7CiAgICAgdGVz dC0+bV9ldmVudHMuY2xlYXIoKTsKLSAgICB0ZXN0LT5jbG9zZUFuZFdhaXRVbnRpbENsb3NlZCgp OworICAgIHRlc3QtPmNsb3NlKCk7CiAgICAgZXZlbnRzID0gdGVzdC0+bV9ldmVudHM7CiAgICAg Z19hc3NlcnRfY21waW50KGV2ZW50cy5zaXplKCksID09LCAyKTsKICAgICBnX2Fzc2VydF9jbXBp bnQoZXZlbnRzWzBdLCA9PSwgSW5zcGVjdG9yVGVzdDo6RGV0YWNoKTsKQEAgLTMzMywxMiArMzMw LDEyIEBAIHN0YXRpYyB2b2lkIHRlc3RJbnNwZWN0b3JDdXN0b21Db250YWluZXJEZXN0cm95ZWQo Q3VzdG9tSW5zcGVjdG9yVGVzdCogdGVzdCwgZ2NvCiAgICAgdGVzdC0+bG9hZEh0bWwoIjxodG1s Pjxib2R5PjxwPldlYktpdEdUSysgSW5zcGVjdG9yIHRlc3Q8L3A+PC9ib2R5PjwvaHRtbD4iLCAw KTsKICAgICB0ZXN0LT53YWl0VW50aWxMb2FkRmluaXNoZWQoKTsKIAotICAgIHRlc3QtPnNob3dB bmRXYWl0VW50aWxGaW5pc2hlZChmYWxzZSk7CisgICAgdGVzdC0+c2hvdygpOwogICAgIHRlc3Qt PmFzc2VydE9iamVjdElzRGVsZXRlZFdoZW5UZXN0RmluaXNoZXMoR19PQkpFQ1Qod2Via2l0X3dl Yl9pbnNwZWN0b3JfZ2V0X3dlYl92aWV3KHRlc3QtPm1faW5zcGVjdG9yKSkpOwogICAgIGdfYXNz ZXJ0KCF3ZWJraXRfd2ViX2luc3BlY3Rvcl9pc19hdHRhY2hlZCh0ZXN0LT5tX2luc3BlY3Rvcikp OwogCiAgICAgdGVzdC0+bV9ldmVudHMuY2xlYXIoKTsKLSAgICB0ZXN0LT5kZXN0cm95V2luZG93 QW5kV2FpdFVudGlsQ2xvc2VkKCk7CisgICAgdGVzdC0+ZGVzdHJveVdpbmRvdygpOwogICAgIFZl Y3RvcjxJbnNwZWN0b3JUZXN0OjpJbnNwZWN0b3JFdmVudHM+JiBldmVudHMgPSB0ZXN0LT5tX2V2 ZW50czsKICAgICBnX2Fzc2VydF9jbXBpbnQoZXZlbnRzLnNpemUoKSwgPT0sIDEpOwogICAgIGdf YXNzZXJ0X2NtcGludChldmVudHNbMF0sID09LCBJbnNwZWN0b3JUZXN0OjpDbG9zZWQpOwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYkluc3BlY3RvclByb3h5LmNwcCBi L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJJbnNwZWN0b3JQcm94eS5jcHAKaW5kZXggNzg3 NTgwNjI0YjBmMTEyZjQxMmUxZDA2YWU2ZmQ4YjcyNDYyMGRkMy4uMDVkM2RhZjk4Yjc2Y2U5ZmMy MDY1MmJhMjgzNmVjZTQ4MTVjZDIwOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL1dlYkluc3BlY3RvclByb3h5LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv V2ViSW5zcGVjdG9yUHJveHkuY3BwCkBAIC0xNTMsNyArMTUzLDcgQEAgdm9pZCBXZWJJbnNwZWN0 b3JQcm94eTo6c2hvdygpCiAgICAgICAgIHJldHVybjsKIAogICAgIGlmIChpc0Nvbm5lY3RlZCgp KSB7Ci0gICAgICAgIG9wZW4oKTsKKyAgICAgICAgYnJpbmdUb0Zyb250KCk7CiAgICAgICAgIHJl dHVybjsKICAgICB9CiAKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5n ZUxvZwppbmRleCA4YTNlNGI2NDllYmM0MTA0ZDNiMGRlZGM0MjRjMTM0NjBlMDY2MjIxLi4xMTJm YzBmZWMyNjJlMjc4ZDAwMjJjZWU0MjgxNGMwMzMwNGMzNGFhIDEwMDY0NAotLS0gYS9Ub29scy9D aGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTMtMDQt MDIgIFphbiBEb2JlcnNlayAgPHpkb2JlcnNla0BpZ2FsaWEuY29tPgorCisgICAgICAgIFJFR1JF U1NJT04gKHIxNDY1MTgpOiBXZWJLaXQyQVBJVGVzdHMvVGVzdEluc3BlY3RvciBpcyBmYWlsaW5n CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTMyODEK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFNjcmlw dHMvcnVuLWd0ay10ZXN0czoKKyAgICAgICAgKFRlc3RSdW5uZXIpOiBSZW1vdmUgdGhlIHNraXAg ZW50cnkgZm9yIHRoZSBXZWJLaXQyQVBJVGVzdHMvVGVzdEluc3BlY3RvciB1bml0IHRlc3QuCisK IDIwMTMtMDQtMDEgIFNoZXJpZmYgQm90ICA8d2Via2l0LnJldmlldy5ib3RAZ21haWwuY29tPgog CiAgICAgICAgIFVucmV2aWV3ZWQsIHJvbGxpbmcgb3V0IHIxNDczMTkuCmRpZmYgLS1naXQgYS9U b29scy9TY3JpcHRzL3J1bi1ndGstdGVzdHMgYi9Ub29scy9TY3JpcHRzL3J1bi1ndGstdGVzdHMK aW5kZXggZWY3MzczNTdhOTAzYTMzYTNhMThjOWYzNzZiMDU2OTBkNmZmMDgzZS4uMzVlNzBlZDI2 ODViMzRjY2M1MGIwYzJlYWMxNDBlY2VkZGVjYzM5MCAxMDA3NTUKLS0tIGEvVG9vbHMvU2NyaXB0 cy9ydW4tZ3RrLXRlc3RzCisrKyBiL1Rvb2xzL1NjcmlwdHMvcnVuLWd0ay10ZXN0cwpAQCAtNjcs NyArNjcsNiBAQCBjbGFzcyBUZXN0UnVubmVyOgogICAgICAgICBTa2lwcGVkVGVzdCgidW5pdHRl c3RzL3Rlc3R3ZWJyZXNvdXJjZSIsICIvd2Via2l0L3dlYnJlc291cmNlL3N1Yl9yZXNvdXJjZV9s b2FkaW5nIiwgIlRlc3QgZmFpbHMgaW4gR1RLIExpbnV4IDY0LWJpdCBSZWxlYXNlIGJvdCIsIDgy MzMwKSwKICAgICAgICAgU2tpcHBlZFRlc3QoInVuaXR0ZXN0cy90ZXN0d2VidmlldyIsICIvd2Vi a2l0L3dlYnZpZXcvaWNvbi11cmkiLCAiVGVzdCB0aW1lcyBvdXQgaW4gR1RLIExpbnV4IDY0LWJp dCBSZWxlYXNlIGJvdCIsIDgyMzI4KSwKICAgICAgICAgU2tpcHBlZFRlc3QoInVuaXR0ZXN0cy90 ZXN0YXRrIiwgIi93ZWJraXQvYXRrL2dldFRleHRJblBhcmFncmFwaEFuZEJvZHlNb2RlcmF0ZSIs ICJUZXN0IGZhaWxzIiwgMTA1NTM4KSwKLSAgICAgICAgU2tpcHBlZFRlc3QoIldlYktpdDJBUElU ZXN0cy9UZXN0SW5zcGVjdG9yIiwgU2tpcHBlZFRlc3QuRU5USVJFX1NVSVRFLCAiVGVzdCBmYWls cyIsIDExMzI4MSksCiAgICAgICAgIFNraXBwZWRUZXN0KCJXZWJLaXQyQVBJVGVzdHMvVGVzdElu c3BlY3RvclNlcnZlciIsIFNraXBwZWRUZXN0LkVOVElSRV9TVUlURSwgIlRlc3QgdGltZXMgb3V0 IiwgMTA1ODY2KSwKICAgICAgICAgU2tpcHBlZFRlc3QoIldlYktpdDJBUElUZXN0cy9UZXN0UmVz b3VyY2VzIiwgIi93ZWJraXQyL1dlYktpdFdlYlZpZXcvcmVzb3VyY2VzIiwgIlRlc3QgaXMgZmxh a3kgaW4gR1RLIExpbnV4IDMyLWJpdCBSZWxlYXNlIGJvdCIsIDgyODY4KSwKICAgICAgICAgU2tp cHBlZFRlc3QoIldlYktpdDJBUElUZXN0cy9UZXN0V2ViS2l0QWNjZXNzaWJpbGl0eSIsICIvd2Vi a2l0Mi9XZWJLaXRBY2Nlc3NpYmlsaXR5L2F0c3BpLWJhc2ljLWhpZXJhcmNoeSIsICJUZXN0IGZh aWxzIiwgMTAwNDA4KSwK