138871 2014-11-19 07:47:19 -0800 [GTK] Provide convenience API in DOM bindings to post messages to user message handlers 2014-11-20 04:46:09 -0800 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 aperez aperez cgarcia commit-queue darin gustavo pnormand svillar oldest_to_newest 1049778 0 aperez 2014-11-19 07:47:19 -0800 As per this comment: https://bugs.webkit.org/show_bug.cgi?id=138411#c1 ”The "raw" API is not very convenient to use, we should add custom API to make it easier to use.” 1049780 1 241860 aperez 2014-11-19 08:11:07 -0800 Created attachment 241860 Patch 1049784 2 241860 cgarcia 2014-11-19 08:43:18 -0800 Comment on attachment 241860 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=241860&action=review Thanks! I have just some minor comments. > Source/WebCore/bindings/gobject/WebKitDOMCustom.cpp:68 > +gboolean webkit_dom_dom_window_post_user_message(WebKitDOMDOMWindow* window, const gchar* handlerName, const gchar* message) This is equivalent to window.webkit.messageHandlers.<handler>.postMessage, so I think we could convert that into webkit_dom_dom_window_webkit_message_handlers_post_message(WebKitDOMDOMWindow* window, const gchar* handlerName, const gchar* message); > Source/WebCore/bindings/gobject/WebKitDOMCustom.cpp:70 > +#if ENABLE(USER_MESSAGE_HANDLERS) We are building with USER_MESSAGE_HANDLERS unconditionally, so we can just remove the #if. > Source/WebCore/bindings/gobject/WebKitDOMCustom.cpp:72 > + g_return_val_if_fail(WEBKIT_DOM_IS_DOM_WINDOW(window), FALSE); > + g_return_val_if_fail(message, FALSE); You should check handlerName is a valid pointer too > Source/WebCore/bindings/gobject/WebKitDOMCustom.cpp:78 > + auto handler = domWindow->webkitNamespace()->messageHandlers()->handler(String::fromUTF8(handlerName), WebCore::mainThreadNormalWorld()); DOMWindow::webkitNamespace() can return nullptr, you should check it. > Source/WebCore/bindings/gobject/WebKitDOMCustom.cpp:79 > + if (handler == nullptr) Don't compare to nullptr, use !handler > Source/WebCore/bindings/gobject/WebKitDOMCustom.h:51 > + */ Since: 2.8 > Source/WebCore/bindings/gobject/WebKitDOMCustom.symbols:3 > +gboolean webkit_dom_dom_window_post_user_message(WebKitDOMDOMWindow*, const gchar*, const gchar*) You should also add the symbols to the webkitdom.symbols file, right after webkit_dom_dom_window_get_type > Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitUserContentManager.cpp:371 > + g_assert(test->registerHandler("dom-convenience")); > + > + test->loadHtml("<html></html>", nullptr); > + WebKitJavascriptResult* javascriptResult = test->waitUntilMessageReceived("dom-convenience"); > + g_assert(javascriptResult); > + GUniquePtr<char> valueString(WebViewTest::javascriptResultToCString(javascriptResult)); > + g_assert_cmpstr(valueString.get(), ==, "DocumentLoaded"); > + > + test->unregisterHandler("dom-convenience"); Maybe we can merge both tests, connect to both handlers and check that both messages are received and are the same. 1049850 3 241871 aperez 2014-11-19 11:40:27 -0800 Created attachment 241871 Patch 1049851 4 aperez 2014-11-19 11:41:06 -0800 Nits fixed, the patch should be good to go now :-) 1050068 5 241871 cgarcia 2014-11-20 00:26:03 -0800 Comment on attachment 241871 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=241871&action=review > Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitUserContentManager.cpp:355 > + g_assert(javascriptResult); Why duplicating the assert here? > Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitUserContentManager.cpp:366 > + g_assert(javascriptResult); > + g_assert(javascriptResult); Ditto. 1050107 6 241939 aperez 2014-11-20 04:00:29 -0800 Created attachment 241939 Patch 1050113 7 241939 commit-queue 2014-11-20 04:46:05 -0800 Comment on attachment 241939 Patch Clearing flags on attachment: 241939 Committed r176393: <http://trac.webkit.org/changeset/176393> 1050114 8 commit-queue 2014-11-20 04:46:09 -0800 All reviewed patches have been landed. Closing bug. 241860 2014-11-19 08:11:07 -0800 2014-11-19 11:40:19 -0800 Patch bug-138871-20141119181119.patch text/plain 8081 aperez U3VidmVyc2lvbiBSZXZpc2lvbjogMTc2MzE4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTVkYzMzNjQxZTVlZTE2 NzYyY2E2YjJhNTBjMGI4NjljNWNjNDU5My4uMGExZGM3NjJjYjg2NDA2OGFiOWRhMDM5YzJlZTg5 Njg1YTdkY2EwNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDE0LTExLTE5ICBBZHJp YW4gUGVyZXogZGUgQ2FzdHJvICA8YXBlcmV6QGlnYWxpYS5jb20+CisKKyAgICAgICAgW0dUS10g UHJvdmlkZSBjb252ZW5pZW5jZSBBUEkgaW4gRE9NIGJpbmRpbmdzIHRvIHBvc3QgbWVzc2FnZXMg dG8gdXNlciBtZXNzYWdlIGhhbmRsZXJzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0xMzg4NzEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBBZGRzIGEgY29udmVuaWVuY2UgZnVuY3Rpb24gaW4gdGhlIFdlYktp dEdUSysgRE9NIGJpbmRpbmdzIHRvIHBvc3QKKyAgICAgICAgbWVzc2FnZXMgdG8gdXNlciBtZXNz YWdlIGhhbmRsZXJzIGluIGEgd2F5IGNvbnZlbmllbnQgd2F5IG1vcmUKKyAgICAgICAgY29udmVu aWVudCB0aGFuIHVzaW5nIHRoZSBhdXRvZ2VuZXJhdGVkIGJpbmRpbmdzLgorCisgICAgICAgICog YmluZGluZ3MvZ29iamVjdC9XZWJLaXRET01DdXN0b20uY3BwOgorICAgICAgICAod2Via2l0X2Rv bV9kb21fd2luZG93X3Bvc3RfdXNlcl9tZXNzYWdlKToKKyAgICAgICAgQWRkZWQgbmV3IGNvbnZl bmllbmNlIEFQSSBmdW5jdGlvbiB0byBwb3N0IG1lc3NhZ2VzIHRvIHVzZXIgbWVzc2FnZQorICAg ICAgICBoYW5kbGVycy4KKyAgICAgICAgKiBiaW5kaW5ncy9nb2JqZWN0L1dlYktpdERPTUN1c3Rv bS5oOiBEaXR0by4KKyAgICAgICAgKiBiaW5kaW5ncy9nb2JqZWN0L1dlYktpdERPTUN1c3RvbS5z eW1ib2xzOiBEaXR0by4KKwogMjAxNC0xMS0xOSAgQ2hyaXMgRmxlaXphY2ggIDxjZmxlaXphY2hA YXBwbGUuY29tPgogCiAgICAgICAgIEFYOiBTY3JlZW4gYnJhaWxsZSBpbnB1dCBkb2Vzbid0IHdv cmsgb24gZm9ybXMuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9nb2JqZWN0 L1dlYktpdERPTUN1c3RvbS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9nb2JqZWN0L1dl YktpdERPTUN1c3RvbS5jcHAKaW5kZXggYzc3MTkwZGI3ZWUzMjFjYWQ3NzJhZmI2NTQxZTMwZmFk ZTU2MjE5Ny4uNGU2Yzc2ZjRlNjA4MmRmOWQwMzVmYjI2NGUxZjhhY2NhYmNmNGNiOSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvZ29iamVjdC9XZWJLaXRET01DdXN0b20uY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2dvYmplY3QvV2ViS2l0RE9NQ3VzdG9tLmNw cApAQCAtMjAsNiArMjAsNyBAQAogI2luY2x1ZGUgIldlYktpdERPTUN1c3RvbS5oIgogCiAjaW5j bHVkZSAiSlNNYWluVGhyZWFkRXhlY1N0YXRlLmgiCisjaW5jbHVkZSAiU2VyaWFsaXplZFNjcmlw dFZhbHVlLmgiCiAjaW5jbHVkZSAiV2ViS2l0RE9NRE9NV2luZG93UHJpdmF0ZS5oIgogI2luY2x1 ZGUgIldlYktpdERPTUhUTUxJbnB1dEVsZW1lbnQuaCIKICNpbmNsdWRlICJXZWJLaXRET01IVE1M SW5wdXRFbGVtZW50UHJpdmF0ZS5oIgpAQCAtNjQsMyArNjUsMjcgQEAgV2ViS2l0RE9NVXNlck1l c3NhZ2VIYW5kbGVyKiB3ZWJraXRfZG9tX3VzZXJfbWVzc2FnZV9oYW5kbGVyc19uYW1lc3BhY2Vf Z2V0X2hhbmQKICAgICByZXR1cm4ga2l0KGNvcmUoaGFuZGxlcnNOYW1lc3BhY2UpLT5oYW5kbGVy KFN0cmluZzo6ZnJvbVVURjgobmFtZSksIFdlYkNvcmU6Om1haW5UaHJlYWROb3JtYWxXb3JsZCgp KSk7CiB9CiAKK2dib29sZWFuIHdlYmtpdF9kb21fZG9tX3dpbmRvd19wb3N0X3VzZXJfbWVzc2Fn ZShXZWJLaXRET01ET01XaW5kb3cqIHdpbmRvdywgY29uc3QgZ2NoYXIqIGhhbmRsZXJOYW1lLCBj b25zdCBnY2hhciogbWVzc2FnZSkKK3sKKyNpZiBFTkFCTEUoVVNFUl9NRVNTQUdFX0hBTkRMRVJT KQorICAgIGdfcmV0dXJuX3ZhbF9pZl9mYWlsKFdFQktJVF9ET01fSVNfRE9NX1dJTkRPVyh3aW5k b3cpLCBGQUxTRSk7CisgICAgZ19yZXR1cm5fdmFsX2lmX2ZhaWwobWVzc2FnZSwgRkFMU0UpOwor CisgICAgV2ViQ29yZTo6RE9NV2luZG93KiBkb21XaW5kb3cgPSBjb3JlKHdpbmRvdyk7CisgICAg aWYgKCFkb21XaW5kb3ctPnNob3VsZEhhdmVXZWJLaXROYW1lc3BhY2VGb3JXb3JsZChXZWJDb3Jl OjptYWluVGhyZWFkTm9ybWFsV29ybGQoKSkpCisgICAgICAgIHJldHVybiBGQUxTRTsKKworICAg IGF1dG8gaGFuZGxlciA9IGRvbVdpbmRvdy0+d2Via2l0TmFtZXNwYWNlKCktPm1lc3NhZ2VIYW5k bGVycygpLT5oYW5kbGVyKFN0cmluZzo6ZnJvbVVURjgoaGFuZGxlck5hbWUpLCBXZWJDb3JlOjpt YWluVGhyZWFkTm9ybWFsV29ybGQoKSk7CisgICAgaWYgKGhhbmRsZXIgPT0gbnVsbHB0cikKKyAg ICAgICAgcmV0dXJuIEZBTFNFOworCisgICAgV2ViQ29yZTo6SlNNYWluVGhyZWFkTnVsbFN0YXRl IHN0YXRlOworICAgIGhhbmRsZXItPnBvc3RNZXNzYWdlKFdlYkNvcmU6OlNlcmlhbGl6ZWRTY3Jp cHRWYWx1ZTo6Y3JlYXRlKFN0cmluZzo6ZnJvbVVURjgobWVzc2FnZSkpKTsKKyAgICByZXR1cm4g VFJVRTsKKyNlbHNlCisgICAgVU5VU0VEX1BBUkFNKHdpbmRvdyk7CisgICAgVU5VU0VEX1BBUkFN KG1lc3NhZ2UpOworICAgIFdFQktJVF9GRUFUVVJFX05PVF9QUkVTRU5UKCJVc2VyIE1lc3NhZ2Ug SGFuZGxlciIpOworICAgIHJldHVybiBGQUxTRTsKKyNlbmRpZiAvKiBFTkFCTEUoVVNFUl9NRVNT QUdFX0hBTkRMRVJTKSAqLworfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mv Z29iamVjdC9XZWJLaXRET01DdXN0b20uaCBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2dvYmpl Y3QvV2ViS2l0RE9NQ3VzdG9tLmgKaW5kZXggYmQxNTYzZDQwYTU4ZGQ1YTY4YjQwZWYxMTQ5MTAx ZDA2MDFjNTc1My4uODk1ODc4N2M4N2Q1NWFiMGEwMGM1MDNmNzg4MWIyMDg4NWRlN2ZmNiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvZ29iamVjdC9XZWJLaXRET01DdXN0b20u aAorKysgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9nb2JqZWN0L1dlYktpdERPTUN1c3RvbS5o CkBAIC00MSw2ICs0MSwxNiBAQCBXRUJLSVRfQVBJIGdib29sZWFuIHdlYmtpdF9kb21faHRtbF90 ZXh0X2FyZWFfZWxlbWVudF9pc19lZGl0ZWQoV2ViS2l0RE9NSFRNTFRleAogICovCiBXRUJLSVRf QVBJIGdib29sZWFuIHdlYmtpdF9kb21faHRtbF9pbnB1dF9lbGVtZW50X2lzX2VkaXRlZChXZWJL aXRET01IVE1MSW5wdXRFbGVtZW50KiBpbnB1dCk7CiAKKy8qKgorICogd2Via2l0X2RvbV9kb21f d2luZG93X3Bvc3RfdXNlcl9tZXNzYWdlOgorICogQHdpbmRvdzogQSAjV2ViS2l0RE9NRE9NV2lu ZG93CisgKiBAaGFuZGxlcjogTmFtZSBvZiB0aGUgdXNlciBtZXNzYWdlIGhhbmRsZXIuCisgKiBA bWVzc2FnZTogSmF2YVNjcmlwdCB2YWx1ZSB0byBiZSBzZW50LgorICoKKyAqIFJldHVybnM6IFdo ZXRoZXIgdGhlIG1lc3NhZ2Ugd2FzIHN1Y2Nlc3NmdWxseSBzZW50LgorICovCitnYm9vbGVhbiB3 ZWJraXRfZG9tX2RvbV93aW5kb3dfcG9zdF91c2VyX21lc3NhZ2UoV2ViS2l0RE9NRE9NV2luZG93 KiB3aW5kb3csIGNvbnN0IGdjaGFyKiBoYW5kbGVyLCBjb25zdCBnY2hhciogbWVzc2FnZSk7CisK IEdfRU5EX0RFQ0xTCiAKICNlbmRpZgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYmluZGlu Z3MvZ29iamVjdC9XZWJLaXRET01DdXN0b20uc3ltYm9scyBiL1NvdXJjZS9XZWJDb3JlL2JpbmRp bmdzL2dvYmplY3QvV2ViS2l0RE9NQ3VzdG9tLnN5bWJvbHMKaW5kZXggMjg2YzE3NTUzODU3ODgx Njk4ZTk5YWM4YTc1MDkwY2VjNjNhZmU2YS4uMzk0YTg5ZmJiMmFmNzM4OWE1YjkwNzlhZDgwNzQx NWIxN2E2Y2JkZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvZ29iamVjdC9X ZWJLaXRET01DdXN0b20uc3ltYm9scworKysgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9nb2Jq ZWN0L1dlYktpdERPTUN1c3RvbS5zeW1ib2xzCkBAIC0xLDIgKzEsMyBAQAogZ2Jvb2xlYW4gd2Vi a2l0X2RvbV9odG1sX3RleHRfYXJlYV9lbGVtZW50X2lzX2VkaXRlZChXZWJLaXRET01IVE1MVGV4 dEFyZWFFbGVtZW50KikKIGdib29sZWFuIHdlYmtpdF9kb21faHRtbF9pbnB1dF9lbGVtZW50X2lz X2VkaXRlZChXZWJLaXRET01IVE1MSW5wdXRFbGVtZW50KikKK2dib29sZWFuIHdlYmtpdF9kb21f ZG9tX3dpbmRvd19wb3N0X3VzZXJfbWVzc2FnZShXZWJLaXRET01ET01XaW5kb3cqLCBjb25zdCBn Y2hhciosIGNvbnN0IGdjaGFyKikKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xz L0NoYW5nZUxvZwppbmRleCBlZTdmMDRmMjEyY2YwNWZlOTVhNDAxYmFiMWFkZDVkOTk3YzM5ZjQ3 Li43YTBlNGU5MmE4MjI4ZGNhOTQ0MmQ4NGZhNjEwODMwYTA2NzE3YWFkIDEwMDY0NAotLS0gYS9U b29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAKKzIw MTQtMTEtMTkgIEFkcmlhbiBQZXJleiBkZSBDYXN0cm8gIDxhcGVyZXpAaWdhbGlhLmNvbT4KKwor ICAgICAgICBbR1RLXSBQcm92aWRlIGNvbnZlbmllbmNlIEFQSSBpbiBET00gYmluZGluZ3MgdG8g cG9zdCBtZXNzYWdlcyB0byB1c2VyIG1lc3NhZ2UgaGFuZGxlcnMKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzODg3MQorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZCBhIHRlc3QgY2FzZSBmb3IgdGhlIGNv bnZlbmllbmNlIEFQSSBmb3IgcG9zdGluZyB1c2VyIG1lc3NhZ2VzCisgICAgICAgIGFkZGVkIHRv IHRoZSBET00gYmluZGluZ3MuCisKKyAgICAgICAgKiBUZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktp dDJHdGsvVGVzdFdlYktpdFVzZXJDb250ZW50TWFuYWdlci5jcHA6CisgICAgICAgICh0ZXN0VXNl ckNvbnRlbnRNYW5hZ2VyTWVzc2FnZUZyb21Db252ZW5pZW5jZURPTUJpbmRpbmdzKToKKyAgICAg ICAgKGJlZm9yZUFsbCk6CisgICAgICAgICogVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXQyR3Rr L1dlYkV4dGVuc2lvblRlc3QuY3BwOgorICAgICAgICAoZG9jdW1lbnRMb2FkZWRDYWxsYmFjayk6 CisKIDIwMTQtMTEtMTkgIENocmlzIEZsZWl6YWNoICA8Y2ZsZWl6YWNoQGFwcGxlLmNvbT4KIAog ICAgICAgICBBWDogU2NyZWVuIGJyYWlsbGUgaW5wdXQgZG9lc24ndCB3b3JrIG9uIGZvcm1zLgpk aWZmIC0tZ2l0IGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXQyR3RrL1Rlc3RXZWJL aXRVc2VyQ29udGVudE1hbmFnZXIuY3BwIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJL aXQyR3RrL1Rlc3RXZWJLaXRVc2VyQ29udGVudE1hbmFnZXIuY3BwCmluZGV4IGMyNDBhNWJhNDRh ODk0OTUyNjNhNTVmYmM5NjgyMGZkYzZlNGU1MWIuLjI3ZGFmZTdlOGIzZDE5ODQ3YWU0Mzg5ODBj ODNiOTU1ZTIzMDAxM2EgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2Vi S2l0Mkd0ay9UZXN0V2ViS2l0VXNlckNvbnRlbnRNYW5hZ2VyLmNwcAorKysgYi9Ub29scy9UZXN0 V2ViS2l0QVBJL1Rlc3RzL1dlYktpdDJHdGsvVGVzdFdlYktpdFVzZXJDb250ZW50TWFuYWdlci5j cHAKQEAgLTM1OCw2ICszNTgsMTkgQEAgc3RhdGljIHZvaWQgdGVzdFVzZXJDb250ZW50TWFuYWdl clNjcmlwdE1lc3NhZ2VGcm9tRE9NQmluZGluZ3MoVXNlclNjcmlwdE1lc3NhZ2UKICAgICB0ZXN0 LT51bnJlZ2lzdGVySGFuZGxlcigiZG9tIik7CiB9CiAKK3N0YXRpYyB2b2lkIHRlc3RVc2VyQ29u dGVudE1hbmFnZXJNZXNzYWdlRnJvbUNvbnZlbmllbmNlRE9NQmluZGluZ3MoVXNlclNjcmlwdE1l c3NhZ2VUZXN0KiB0ZXN0LCBnY29uc3Rwb2ludGVyKQoreworICAgIGdfYXNzZXJ0KHRlc3QtPnJl Z2lzdGVySGFuZGxlcigiZG9tLWNvbnZlbmllbmNlIikpOworCisgICAgdGVzdC0+bG9hZEh0bWwo IjxodG1sPjwvaHRtbD4iLCBudWxscHRyKTsKKyAgICBXZWJLaXRKYXZhc2NyaXB0UmVzdWx0KiBq YXZhc2NyaXB0UmVzdWx0ID0gdGVzdC0+d2FpdFVudGlsTWVzc2FnZVJlY2VpdmVkKCJkb20tY29u dmVuaWVuY2UiKTsKKyAgICBnX2Fzc2VydChqYXZhc2NyaXB0UmVzdWx0KTsKKyAgICBHVW5pcXVl UHRyPGNoYXI+IHZhbHVlU3RyaW5nKFdlYlZpZXdUZXN0OjpqYXZhc2NyaXB0UmVzdWx0VG9DU3Ry aW5nKGphdmFzY3JpcHRSZXN1bHQpKTsKKyAgICBnX2Fzc2VydF9jbXBzdHIodmFsdWVTdHJpbmcu Z2V0KCksID09LCAiRG9jdW1lbnRMb2FkZWQiKTsKKworICAgIHRlc3QtPnVucmVnaXN0ZXJIYW5k bGVyKCJkb20tY29udmVuaWVuY2UiKTsKK30KKwogc3RhdGljIHZvaWQgc2VydmVyQ2FsbGJhY2so U291cFNlcnZlciogc2VydmVyLCBTb3VwTWVzc2FnZSogbWVzc2FnZSwgY29uc3QgY2hhciogcGF0 aCwgR0hhc2hUYWJsZSosIFNvdXBDbGllbnRDb250ZXh0KiwgZ3BvaW50ZXIpCiB7CiAgICAgc291 cF9tZXNzYWdlX3NldF9zdGF0dXMobWVzc2FnZSwgU09VUF9TVEFUVVNfT0spOwpAQCAtMzc1LDYg KzM4OCw3IEBAIHZvaWQgYmVmb3JlQWxsKCkKICAgICBVc2VyQ29udGVudE1hbmFnZXJUZXN0Ojph ZGQoIldlYktpdFVzZXJDb250ZW50TWFuYWdlciIsICJpbmplY3RlZC1zY3JpcHQiLCB0ZXN0VXNl ckNvbnRlbnRNYW5hZ2VySW5qZWN0ZWRTY3JpcHQpOwogICAgIFVzZXJTY3JpcHRNZXNzYWdlVGVz dDo6YWRkKCJXZWJLaXRVc2VyQ29udGVudE1hbmFnZXIiLCAic2NyaXB0LW1lc3NhZ2UtcmVjZWl2 ZWQiLCB0ZXN0VXNlckNvbnRlbnRNYW5hZ2VyU2NyaXB0TWVzc2FnZVJlY2VpdmVkKTsKICAgICBV c2VyU2NyaXB0TWVzc2FnZVRlc3Q6OmFkZCgiV2ViS2l0VXNlckNvbnRlbnRNYW5hZ2VyIiwgInNj cmlwdC1tZXNzYWdlLWZyb20tZG9tLWJpbmRpbmdzIiwgdGVzdFVzZXJDb250ZW50TWFuYWdlclNj cmlwdE1lc3NhZ2VGcm9tRE9NQmluZGluZ3MpOworICAgIFVzZXJTY3JpcHRNZXNzYWdlVGVzdDo6 YWRkKCJXZWJLaXRVc2VyQ29udGVudE1hbmFnZXIiLCAic2NyaXB0LW1lc3NhZ2UtZnJvbS1jb252 ZW5pZW5jZS1kb20tYmluZGluZ3MiLCB0ZXN0VXNlckNvbnRlbnRNYW5hZ2VyTWVzc2FnZUZyb21D b252ZW5pZW5jZURPTUJpbmRpbmdzKTsKIH0KIAogdm9pZCBhZnRlckFsbCgpCmRpZmYgLS1naXQg YS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdDJHdGsvV2ViRXh0ZW5zaW9uVGVzdC5j cHAgYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdDJHdGsvV2ViRXh0ZW5zaW9uVGVz dC5jcHAKaW5kZXggNTRiNTQzODU0MDY0Y2ViNGNhOWNlZGY0MzdmZDEyYjI0NTJjODQ3Zi4uNTll MDgxNzQ3Y2Y0MjAzMTlkOWY0MDM5MTZlZDQ0ODk1MGUyNGFlNSAxMDA2NDQKLS0tIGEvVG9vbHMv VGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXQyR3RrL1dlYkV4dGVuc2lvblRlc3QuY3BwCisrKyBi L1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Mkd0ay9XZWJFeHRlbnNpb25UZXN0LmNw cApAQCAtMTA5LDYgKzEwOSw3IEBAIHN0YXRpYyB2b2lkIGRvY3VtZW50TG9hZGVkQ2FsbGJhY2so V2ViS2l0V2ViUGFnZSogd2ViUGFnZSwgV2ViS2l0V2ViRXh0ZW5zaW9uKiBlCiAgICAgICAgICAg ICB3ZWJraXRfZG9tX3VzZXJfbWVzc2FnZV9oYW5kbGVyX3Bvc3RfbWVzc2FnZShoYW5kbGVyLCAi RG9jdW1lbnRMb2FkZWQiKTsKICAgICB9CiAKKyAgICB3ZWJraXRfZG9tX2RvbV93aW5kb3dfcG9z dF91c2VyX21lc3NhZ2Uod2luZG93LCAiZG9tLWNvbnZlbmllbmNlIiwgIkRvY3VtZW50TG9hZGVk Iik7CiAKICAgICBncG9pbnRlciBkYXRhID0gZ19vYmplY3RfZ2V0X2RhdGEoR19PQkpFQ1QoZXh0 ZW5zaW9uKSwgImRidXMtY29ubmVjdGlvbiIpOwogICAgIGlmIChkYXRhKQo= 241871 2014-11-19 11:40:27 -0800 2014-11-20 04:00:20 -0800 Patch bug-138871-20141119214039.patch text/plain 8807 aperez U3VidmVyc2lvbiBSZXZpc2lvbjogMTc2MzI3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjEwMzZhZDI0ZTRmOTRj YTE2MTcwNzdiOTlmYThmOTk2ZTI0YzIzZS4uMzQ3ZmE4ZTE2YzQ2YjEzZGI3NmVmNTMzYWE5YjM4 NjE0MzZkN2U3MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDE0LTExLTE5ICBBZHJp YW4gUGVyZXogZGUgQ2FzdHJvICA8YXBlcmV6QGlnYWxpYS5jb20+CisKKyAgICAgICAgW0dUS10g UHJvdmlkZSBjb252ZW5pZW5jZSBBUEkgaW4gRE9NIGJpbmRpbmdzIHRvIHBvc3QgbWVzc2FnZXMg dG8gdXNlciBtZXNzYWdlIGhhbmRsZXJzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0xMzg4NzEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBBZGRzIGEgY29udmVuaWVuY2UgZnVuY3Rpb24gaW4gdGhlIFdlYktp dEdUSysgRE9NIGJpbmRpbmdzIHRvIHBvc3QKKyAgICAgICAgbWVzc2FnZXMgdG8gdXNlciBtZXNz YWdlIGhhbmRsZXJzIGluIGEgd2F5IGNvbnZlbmllbnQgd2F5IG1vcmUKKyAgICAgICAgY29udmVu aWVudCB0aGFuIHVzaW5nIHRoZSBhdXRvZ2VuZXJhdGVkIGJpbmRpbmdzLgorCisgICAgICAgICog YmluZGluZ3MvZ29iamVjdC9XZWJLaXRET01DdXN0b20uY3BwOgorICAgICAgICAod2Via2l0X2Rv bV9kb21fd2luZG93X3dlYmtpdF9tZXNzYWdlX2hhbmRsZXJzX3Bvc3RfbWVzc2FnZSk6CisgICAg ICAgIEFkZGVkIG5ldyBjb252ZW5pZW5jZSBBUEkgZnVuY3Rpb24gdG8gcG9zdCBtZXNzYWdlcyB0 byB1c2VyIG1lc3NhZ2UKKyAgICAgICAgaGFuZGxlcnMuCisgICAgICAgICogYmluZGluZ3MvZ29i amVjdC9XZWJLaXRET01DdXN0b20uaDogRGl0dG8uCisgICAgICAgICogYmluZGluZ3MvZ29iamVj dC9XZWJLaXRET01DdXN0b20uc3ltYm9sczogRGl0dG8uCisKIDIwMTQtMTEtMTkgIFBoaWxpcHBl IE5vcm1hbmQgIDxwbm9ybWFuZEBpZ2FsaWEuY29tPgogCiAgICAgICAgIE1pc3NpbmcgTlVMTC1j aGVjayBpbiBWaWRlb1RyYWNrOjpzZXRMYW5ndWFnZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvYmluZGluZ3MvZ29iamVjdC9XZWJLaXRET01DdXN0b20uY3BwIGIvU291cmNlL1dlYkNvcmUv YmluZGluZ3MvZ29iamVjdC9XZWJLaXRET01DdXN0b20uY3BwCmluZGV4IGM3NzE5MGRiN2VlMzIx Y2FkNzcyYWZiNjU0MWUzMGZhZGU1NjIxOTcuLmNmZGIxMzI3YTZhYTcxMThiNTI5ZTQ5ZTA1NTc0 Nzk2OTVhZjg1ZGIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2dvYmplY3Qv V2ViS2l0RE9NQ3VzdG9tLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9nb2JqZWN0 L1dlYktpdERPTUN1c3RvbS5jcHAKQEAgLTIwLDYgKzIwLDcgQEAKICNpbmNsdWRlICJXZWJLaXRE T01DdXN0b20uaCIKIAogI2luY2x1ZGUgIkpTTWFpblRocmVhZEV4ZWNTdGF0ZS5oIgorI2luY2x1 ZGUgIlNlcmlhbGl6ZWRTY3JpcHRWYWx1ZS5oIgogI2luY2x1ZGUgIldlYktpdERPTURPTVdpbmRv d1ByaXZhdGUuaCIKICNpbmNsdWRlICJXZWJLaXRET01IVE1MSW5wdXRFbGVtZW50LmgiCiAjaW5j bHVkZSAiV2ViS2l0RE9NSFRNTElucHV0RWxlbWVudFByaXZhdGUuaCIKQEAgLTY0LDMgKzY1LDI1 IEBAIFdlYktpdERPTVVzZXJNZXNzYWdlSGFuZGxlciogd2Via2l0X2RvbV91c2VyX21lc3NhZ2Vf aGFuZGxlcnNfbmFtZXNwYWNlX2dldF9oYW5kCiAgICAgcmV0dXJuIGtpdChjb3JlKGhhbmRsZXJz TmFtZXNwYWNlKS0+aGFuZGxlcihTdHJpbmc6OmZyb21VVEY4KG5hbWUpLCBXZWJDb3JlOjptYWlu VGhyZWFkTm9ybWFsV29ybGQoKSkpOwogfQogCitnYm9vbGVhbiB3ZWJraXRfZG9tX2RvbV93aW5k b3dfd2Via2l0X21lc3NhZ2VfaGFuZGxlcnNfcG9zdF9tZXNzYWdlKFdlYktpdERPTURPTVdpbmRv dyogd2luZG93LCBjb25zdCBnY2hhciogaGFuZGxlck5hbWUsIGNvbnN0IGdjaGFyKiBtZXNzYWdl KQoreworICAgIGdfcmV0dXJuX3ZhbF9pZl9mYWlsKFdFQktJVF9ET01fSVNfRE9NX1dJTkRPVyh3 aW5kb3cpLCBGQUxTRSk7CisgICAgZ19yZXR1cm5fdmFsX2lmX2ZhaWwoaGFuZGxlck5hbWUsIEZB TFNFKTsKKyAgICBnX3JldHVybl92YWxfaWZfZmFpbChtZXNzYWdlLCBGQUxTRSk7CisKKyAgICBX ZWJDb3JlOjpET01XaW5kb3cqIGRvbVdpbmRvdyA9IGNvcmUod2luZG93KTsKKyAgICBpZiAoIWRv bVdpbmRvdy0+c2hvdWxkSGF2ZVdlYktpdE5hbWVzcGFjZUZvcldvcmxkKFdlYkNvcmU6Om1haW5U aHJlYWROb3JtYWxXb3JsZCgpKSkKKyAgICAgICAgcmV0dXJuIEZBTFNFOworCisgICAgYXV0byB3 ZWJraXROYW1lc3BhY2UgPSBkb21XaW5kb3ctPndlYmtpdE5hbWVzcGFjZSgpOworICAgIGlmICgh d2Via2l0TmFtZXNwYWNlKQorICAgICAgICByZXR1cm4gRkFMU0U7CisKKyAgICBhdXRvIGhhbmRs ZXIgPSB3ZWJraXROYW1lc3BhY2UtPm1lc3NhZ2VIYW5kbGVycygpLT5oYW5kbGVyKFN0cmluZzo6 ZnJvbVVURjgoaGFuZGxlck5hbWUpLCBXZWJDb3JlOjptYWluVGhyZWFkTm9ybWFsV29ybGQoKSk7 CisgICAgaWYgKCFoYW5kbGVyKQorICAgICAgICByZXR1cm4gRkFMU0U7CisKKyAgICBXZWJDb3Jl OjpKU01haW5UaHJlYWROdWxsU3RhdGUgc3RhdGU7CisgICAgaGFuZGxlci0+cG9zdE1lc3NhZ2Uo V2ViQ29yZTo6U2VyaWFsaXplZFNjcmlwdFZhbHVlOjpjcmVhdGUoU3RyaW5nOjpmcm9tVVRGOCht ZXNzYWdlKSkpOworICAgIHJldHVybiBUUlVFOworfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvYmluZGluZ3MvZ29iamVjdC9XZWJLaXRET01DdXN0b20uaCBiL1NvdXJjZS9XZWJDb3JlL2Jp bmRpbmdzL2dvYmplY3QvV2ViS2l0RE9NQ3VzdG9tLmgKaW5kZXggYmQxNTYzZDQwYTU4ZGQ1YTY4 YjQwZWYxMTQ5MTAxZDA2MDFjNTc1My4uZDNhMDVjMzVhMWI3ODQzNWY2NGMyZWIwZTU5NTRkM2Jk YjBjNzhmOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvZ29iamVjdC9XZWJL aXRET01DdXN0b20uaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9nb2JqZWN0L1dlYktp dERPTUN1c3RvbS5oCkBAIC00MSw2ICs0MSwxOCBAQCBXRUJLSVRfQVBJIGdib29sZWFuIHdlYmtp dF9kb21faHRtbF90ZXh0X2FyZWFfZWxlbWVudF9pc19lZGl0ZWQoV2ViS2l0RE9NSFRNTFRleAog ICovCiBXRUJLSVRfQVBJIGdib29sZWFuIHdlYmtpdF9kb21faHRtbF9pbnB1dF9lbGVtZW50X2lz X2VkaXRlZChXZWJLaXRET01IVE1MSW5wdXRFbGVtZW50KiBpbnB1dCk7CiAKKy8qKgorICogd2Vi a2l0X2RvbV9kb21fd2luZG93X3Bvc3RfdXNlcl9tZXNzYWdlOgorICogQHdpbmRvdzogQSAjV2Vi S2l0RE9NRE9NV2luZG93CisgKiBAaGFuZGxlcjogTmFtZSBvZiB0aGUgdXNlciBtZXNzYWdlIGhh bmRsZXIuCisgKiBAbWVzc2FnZTogSmF2YVNjcmlwdCB2YWx1ZSB0byBiZSBzZW50LgorICoKKyAq IFJldHVybnM6IFdoZXRoZXIgdGhlIG1lc3NhZ2Ugd2FzIHN1Y2Nlc3NmdWxseSBzZW50LgorICoK KyAqIFNpbmNlOiAyLjgKKyAqLworZ2Jvb2xlYW4gd2Via2l0X2RvbV9kb21fd2luZG93X3dlYmtp dF9tZXNzYWdlX2hhbmRsZXJzX3Bvc3RfbWVzc2FnZShXZWJLaXRET01ET01XaW5kb3cqIHdpbmRv dywgY29uc3QgZ2NoYXIqIGhhbmRsZXIsIGNvbnN0IGdjaGFyKiBtZXNzYWdlKTsKKwogR19FTkRf REVDTFMKIAogI2VuZGlmCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9nb2Jq ZWN0L1dlYktpdERPTUN1c3RvbS5zeW1ib2xzIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvZ29i amVjdC9XZWJLaXRET01DdXN0b20uc3ltYm9scwppbmRleCAyODZjMTc1NTM4NTc4ODE2OThlOTlh YzhhNzUwOTBjZWM2M2FmZTZhLi5iZmRmYTNlNTk2ODc0MWRhNGZmMDhiOGZmNWEzMzkwN2VhNjdi NmMwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9nb2JqZWN0L1dlYktpdERP TUN1c3RvbS5zeW1ib2xzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2dvYmplY3QvV2Vi S2l0RE9NQ3VzdG9tLnN5bWJvbHMKQEAgLTEsMiArMSwzIEBACiBnYm9vbGVhbiB3ZWJraXRfZG9t X2h0bWxfdGV4dF9hcmVhX2VsZW1lbnRfaXNfZWRpdGVkKFdlYktpdERPTUhUTUxUZXh0QXJlYUVs ZW1lbnQqKQogZ2Jvb2xlYW4gd2Via2l0X2RvbV9odG1sX2lucHV0X2VsZW1lbnRfaXNfZWRpdGVk KFdlYktpdERPTUhUTUxJbnB1dEVsZW1lbnQqKQorZ2Jvb2xlYW4gd2Via2l0X2RvbV9kb21fd2lu ZG93X3dlYmtpdF9tZXNzYWdlX2hhbmRsZXJzX3Bvc3RfbWVzc2FnZShXZWJLaXRET01ET01XaW5k b3cqLCBjb25zdCBnY2hhciosIGNvbnN0IGdjaGFyKikKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL2JpbmRpbmdzL2dvYmplY3Qvd2Via2l0ZG9tLnN5bWJvbHMgYi9Tb3VyY2UvV2ViQ29yZS9i aW5kaW5ncy9nb2JqZWN0L3dlYmtpdGRvbS5zeW1ib2xzCmluZGV4IDRkYTE2MTk3YTU2ZDczMmQx OTA3NWUxZjczM2VmMGU1ZWUzYmZhZmMuLmQwMmM2N2FjYTNmNGJmOGZiYzNlMWI3ODVjMjRjZGUy ODY1YmU0NTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2dvYmplY3Qvd2Vi a2l0ZG9tLnN5bWJvbHMKKysrIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvZ29iamVjdC93ZWJr aXRkb20uc3ltYm9scwpAQCAtMjIsNiArMjIsNyBAQCBXZWJLaXRET01Eb2N1bWVudCogd2Via2l0 X2RvbV9kb21faW1wbGVtZW50YXRpb25fY3JlYXRlX2RvY3VtZW50KFdlYktpdERPTURPTUltcAog V2ViS2l0RE9NQ1NTU3R5bGVTaGVldCogd2Via2l0X2RvbV9kb21faW1wbGVtZW50YXRpb25fY3Jl YXRlX2Nzc19zdHlsZV9zaGVldChXZWJLaXRET01ET01JbXBsZW1lbnRhdGlvbiosIGNvbnN0IGdj aGFyKiwgY29uc3QgZ2NoYXIqLCBHRXJyb3IqKikKIFdlYktpdERPTUhUTUxEb2N1bWVudCogd2Vi a2l0X2RvbV9kb21faW1wbGVtZW50YXRpb25fY3JlYXRlX2h0bWxfZG9jdW1lbnQoV2ViS2l0RE9N RE9NSW1wbGVtZW50YXRpb24qLCBjb25zdCBnY2hhciopCiBHVHlwZSB3ZWJraXRfZG9tX2RvbV93 aW5kb3dfZ2V0X3R5cGUodm9pZCkKK2dib29sZWFuIHdlYmtpdF9kb21fZG9tX3dpbmRvd193ZWJr aXRfbWVzc2FnZV9oYW5kbGVyc19wb3N0X21lc3NhZ2UoV2ViS2l0RE9NRE9NV2luZG93KiwgY29u c3QgZ2NoYXIqLCBjb25zdCBnY2hhciopCiBHVHlwZSB3ZWJraXRfZG9tX2RvY3VtZW50X2dldF90 eXBlKHZvaWQpCiBXZWJLaXRET01Eb2N1bWVudFR5cGUqIHdlYmtpdF9kb21fZG9jdW1lbnRfZ2V0 X2RvY3R5cGUoV2ViS2l0RE9NRG9jdW1lbnQqKQogV2ViS2l0RE9NSFRNTENvbGxlY3Rpb24qIHdl YmtpdF9kb21fZG9jdW1lbnRfZ2V0X2ltYWdlcyhXZWJLaXRET01Eb2N1bWVudCopCmRpZmYgLS1n aXQgYS9Ub29scy9DaGFuZ2VMb2cgYi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZWU3ZjA0ZjIxMmNm MDVmZTk1YTQwMWJhYjFhZGQ1ZDk5N2MzOWY0Ny4uN2EwZTRlOTJhODIyOGRjYTk0NDJkODRmYTYx MDgzMGEwNjcxN2FhZCAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0No YW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDE0LTExLTE5ICBBZHJpYW4gUGVyZXogZGUgQ2Fz dHJvICA8YXBlcmV6QGlnYWxpYS5jb20+CisKKyAgICAgICAgW0dUS10gUHJvdmlkZSBjb252ZW5p ZW5jZSBBUEkgaW4gRE9NIGJpbmRpbmdzIHRvIHBvc3QgbWVzc2FnZXMgdG8gdXNlciBtZXNzYWdl IGhhbmRsZXJzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0xMzg4NzEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBBZGQgYSB0ZXN0IGNhc2UgZm9yIHRoZSBjb252ZW5pZW5jZSBBUEkgZm9yIHBvc3RpbmcgdXNl ciBtZXNzYWdlcworICAgICAgICBhZGRlZCB0byB0aGUgRE9NIGJpbmRpbmdzLgorCisgICAgICAg ICogVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXQyR3RrL1Rlc3RXZWJLaXRVc2VyQ29udGVudE1h bmFnZXIuY3BwOgorICAgICAgICAodGVzdFVzZXJDb250ZW50TWFuYWdlck1lc3NhZ2VGcm9tQ29u dmVuaWVuY2VET01CaW5kaW5ncyk6CisgICAgICAgIChiZWZvcmVBbGwpOgorICAgICAgICAqIFRl c3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Mkd0ay9XZWJFeHRlbnNpb25UZXN0LmNwcDoKKyAgICAg ICAgKGRvY3VtZW50TG9hZGVkQ2FsbGJhY2spOgorCiAyMDE0LTExLTE5ICBDaHJpcyBGbGVpemFj aCAgPGNmbGVpemFjaEBhcHBsZS5jb20+CiAKICAgICAgICAgQVg6IFNjcmVlbiBicmFpbGxlIGlu cHV0IGRvZXNuJ3Qgd29yayBvbiBmb3Jtcy4KZGlmZiAtLWdpdCBhL1Rvb2xzL1Rlc3RXZWJLaXRB UEkvVGVzdHMvV2ViS2l0Mkd0ay9UZXN0V2ViS2l0VXNlckNvbnRlbnRNYW5hZ2VyLmNwcCBiL1Rv b2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Mkd0ay9UZXN0V2ViS2l0VXNlckNvbnRlbnRN YW5hZ2VyLmNwcAppbmRleCBjMjQwYTViYTQ0YTg5NDk1MjYzYTU1ZmJjOTY4MjBmZGM2ZTRlNTFi Li45MTdiZmU1MTczY2RmNjU2ZWQyOTliNDFmNjk3NTAxN2Q3YjgxYTRhIDEwMDY0NAotLS0gYS9U b29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdDJHdGsvVGVzdFdlYktpdFVzZXJDb250ZW50 TWFuYWdlci5jcHAKKysrIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXQyR3RrL1Rl c3RXZWJLaXRVc2VyQ29udGVudE1hbmFnZXIuY3BwCkBAIC0zNDksMTMgKzM0OSwyNSBAQCBzdGF0 aWMgdm9pZCB0ZXN0VXNlckNvbnRlbnRNYW5hZ2VyU2NyaXB0TWVzc2FnZUZyb21ET01CaW5kaW5n cyhVc2VyU2NyaXB0TWVzc2FnZQogewogICAgIGdfYXNzZXJ0KHRlc3QtPnJlZ2lzdGVySGFuZGxl cigiZG9tIikpOwogCi0gICAgdGVzdC0+bG9hZEh0bWwoIjxodG1sPjwvaHRtbD4iLCBudWxscHRy KTsKKyAgICB0ZXN0LT5sb2FkSHRtbCgiPGh0bWw+MTwvaHRtbD4iLCBudWxscHRyKTsKICAgICBX ZWJLaXRKYXZhc2NyaXB0UmVzdWx0KiBqYXZhc2NyaXB0UmVzdWx0ID0gdGVzdC0+d2FpdFVudGls TWVzc2FnZVJlY2VpdmVkKCJkb20iKTsKICAgICBnX2Fzc2VydChqYXZhc2NyaXB0UmVzdWx0KTsK KyAgICBnX2Fzc2VydChqYXZhc2NyaXB0UmVzdWx0KTsKICAgICBHVW5pcXVlUHRyPGNoYXI+IHZh bHVlU3RyaW5nKFdlYlZpZXdUZXN0OjpqYXZhc2NyaXB0UmVzdWx0VG9DU3RyaW5nKGphdmFzY3Jp cHRSZXN1bHQpKTsKICAgICBnX2Fzc2VydF9jbXBzdHIodmFsdWVTdHJpbmcuZ2V0KCksID09LCAi RG9jdW1lbnRMb2FkZWQiKTsKIAogICAgIHRlc3QtPnVucmVnaXN0ZXJIYW5kbGVyKCJkb20iKTsK KworICAgIGdfYXNzZXJ0KHRlc3QtPnJlZ2lzdGVySGFuZGxlcigiZG9tLWNvbnZlbmllbmNlIikp OworCisgICAgdGVzdC0+bG9hZEh0bWwoIjxodG1sPjI8L2h0bWw+IiwgbnVsbHB0cik7CisgICAg amF2YXNjcmlwdFJlc3VsdCA9IHRlc3QtPndhaXRVbnRpbE1lc3NhZ2VSZWNlaXZlZCgiZG9tLWNv bnZlbmllbmNlIik7CisgICAgZ19hc3NlcnQoamF2YXNjcmlwdFJlc3VsdCk7CisgICAgZ19hc3Nl cnQoamF2YXNjcmlwdFJlc3VsdCk7CisgICAgdmFsdWVTdHJpbmcucmVzZXQoV2ViVmlld1Rlc3Q6 OmphdmFzY3JpcHRSZXN1bHRUb0NTdHJpbmcoamF2YXNjcmlwdFJlc3VsdCkpOworICAgIGdfYXNz ZXJ0X2NtcHN0cih2YWx1ZVN0cmluZy5nZXQoKSwgPT0sICJEb2N1bWVudExvYWRlZCIpOworCisg ICAgdGVzdC0+dW5yZWdpc3RlckhhbmRsZXIoImRvbS1jb252ZW5pZW5jZSIpOwogfQogCiBzdGF0 aWMgdm9pZCBzZXJ2ZXJDYWxsYmFjayhTb3VwU2VydmVyKiBzZXJ2ZXIsIFNvdXBNZXNzYWdlKiBt ZXNzYWdlLCBjb25zdCBjaGFyKiBwYXRoLCBHSGFzaFRhYmxlKiwgU291cENsaWVudENvbnRleHQq LCBncG9pbnRlcikKZGlmZiAtLWdpdCBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0 Mkd0ay9XZWJFeHRlbnNpb25UZXN0LmNwcCBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2Vi S2l0Mkd0ay9XZWJFeHRlbnNpb25UZXN0LmNwcAppbmRleCA1NGI1NDM4NTQwNjRjZWI0Y2E5Y2Vk ZjQzN2ZkMTJiMjQ1MmM4NDdmLi5mZDA5NTk2Y2Q5MDBkNmY1N2YyZGI2NGY2ZjZjYjY1ZmZmMTAw ZGE1IDEwMDY0NAotLS0gYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdDJHdGsvV2Vi RXh0ZW5zaW9uVGVzdC5jcHAKKysrIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXQy R3RrL1dlYkV4dGVuc2lvblRlc3QuY3BwCkBAIC0xMDksNiArMTA5LDcgQEAgc3RhdGljIHZvaWQg ZG9jdW1lbnRMb2FkZWRDYWxsYmFjayhXZWJLaXRXZWJQYWdlKiB3ZWJQYWdlLCBXZWJLaXRXZWJF eHRlbnNpb24qIGUKICAgICAgICAgICAgIHdlYmtpdF9kb21fdXNlcl9tZXNzYWdlX2hhbmRsZXJf cG9zdF9tZXNzYWdlKGhhbmRsZXIsICJEb2N1bWVudExvYWRlZCIpOwogICAgIH0KIAorICAgIHdl YmtpdF9kb21fZG9tX3dpbmRvd193ZWJraXRfbWVzc2FnZV9oYW5kbGVyc19wb3N0X21lc3NhZ2Uo d2luZG93LCAiZG9tLWNvbnZlbmllbmNlIiwgIkRvY3VtZW50TG9hZGVkIik7CiAKICAgICBncG9p bnRlciBkYXRhID0gZ19vYmplY3RfZ2V0X2RhdGEoR19PQkpFQ1QoZXh0ZW5zaW9uKSwgImRidXMt Y29ubmVjdGlvbiIpOwogICAgIGlmIChkYXRhKQo= 241939 2014-11-20 04:00:29 -0800 2014-11-20 04:46:05 -0800 Patch bug-138871-20141120140042.patch text/plain 8741 aperez U3VidmVyc2lvbiBSZXZpc2lvbjogMTc2MzI3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjEwMzZhZDI0ZTRmOTRj YTE2MTcwNzdiOTlmYThmOTk2ZTI0YzIzZS4uMzQ3ZmE4ZTE2YzQ2YjEzZGI3NmVmNTMzYWE5YjM4 NjE0MzZkN2U3MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDE0LTExLTE5ICBBZHJp YW4gUGVyZXogZGUgQ2FzdHJvICA8YXBlcmV6QGlnYWxpYS5jb20+CisKKyAgICAgICAgW0dUS10g UHJvdmlkZSBjb252ZW5pZW5jZSBBUEkgaW4gRE9NIGJpbmRpbmdzIHRvIHBvc3QgbWVzc2FnZXMg dG8gdXNlciBtZXNzYWdlIGhhbmRsZXJzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0xMzg4NzEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBBZGRzIGEgY29udmVuaWVuY2UgZnVuY3Rpb24gaW4gdGhlIFdlYktp dEdUSysgRE9NIGJpbmRpbmdzIHRvIHBvc3QKKyAgICAgICAgbWVzc2FnZXMgdG8gdXNlciBtZXNz YWdlIGhhbmRsZXJzIGluIGEgd2F5IGNvbnZlbmllbnQgd2F5IG1vcmUKKyAgICAgICAgY29udmVu aWVudCB0aGFuIHVzaW5nIHRoZSBhdXRvZ2VuZXJhdGVkIGJpbmRpbmdzLgorCisgICAgICAgICog YmluZGluZ3MvZ29iamVjdC9XZWJLaXRET01DdXN0b20uY3BwOgorICAgICAgICAod2Via2l0X2Rv bV9kb21fd2luZG93X3dlYmtpdF9tZXNzYWdlX2hhbmRsZXJzX3Bvc3RfbWVzc2FnZSk6CisgICAg ICAgIEFkZGVkIG5ldyBjb252ZW5pZW5jZSBBUEkgZnVuY3Rpb24gdG8gcG9zdCBtZXNzYWdlcyB0 byB1c2VyIG1lc3NhZ2UKKyAgICAgICAgaGFuZGxlcnMuCisgICAgICAgICogYmluZGluZ3MvZ29i amVjdC9XZWJLaXRET01DdXN0b20uaDogRGl0dG8uCisgICAgICAgICogYmluZGluZ3MvZ29iamVj dC9XZWJLaXRET01DdXN0b20uc3ltYm9sczogRGl0dG8uCisKIDIwMTQtMTEtMTkgIFBoaWxpcHBl IE5vcm1hbmQgIDxwbm9ybWFuZEBpZ2FsaWEuY29tPgogCiAgICAgICAgIE1pc3NpbmcgTlVMTC1j aGVjayBpbiBWaWRlb1RyYWNrOjpzZXRMYW5ndWFnZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvYmluZGluZ3MvZ29iamVjdC9XZWJLaXRET01DdXN0b20uY3BwIGIvU291cmNlL1dlYkNvcmUv YmluZGluZ3MvZ29iamVjdC9XZWJLaXRET01DdXN0b20uY3BwCmluZGV4IGM3NzE5MGRiN2VlMzIx Y2FkNzcyYWZiNjU0MWUzMGZhZGU1NjIxOTcuLmNmZGIxMzI3YTZhYTcxMThiNTI5ZTQ5ZTA1NTc0 Nzk2OTVhZjg1ZGIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2dvYmplY3Qv V2ViS2l0RE9NQ3VzdG9tLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9nb2JqZWN0 L1dlYktpdERPTUN1c3RvbS5jcHAKQEAgLTIwLDYgKzIwLDcgQEAKICNpbmNsdWRlICJXZWJLaXRE T01DdXN0b20uaCIKIAogI2luY2x1ZGUgIkpTTWFpblRocmVhZEV4ZWNTdGF0ZS5oIgorI2luY2x1 ZGUgIlNlcmlhbGl6ZWRTY3JpcHRWYWx1ZS5oIgogI2luY2x1ZGUgIldlYktpdERPTURPTVdpbmRv d1ByaXZhdGUuaCIKICNpbmNsdWRlICJXZWJLaXRET01IVE1MSW5wdXRFbGVtZW50LmgiCiAjaW5j bHVkZSAiV2ViS2l0RE9NSFRNTElucHV0RWxlbWVudFByaXZhdGUuaCIKQEAgLTY0LDMgKzY1LDI1 IEBAIFdlYktpdERPTVVzZXJNZXNzYWdlSGFuZGxlciogd2Via2l0X2RvbV91c2VyX21lc3NhZ2Vf aGFuZGxlcnNfbmFtZXNwYWNlX2dldF9oYW5kCiAgICAgcmV0dXJuIGtpdChjb3JlKGhhbmRsZXJz TmFtZXNwYWNlKS0+aGFuZGxlcihTdHJpbmc6OmZyb21VVEY4KG5hbWUpLCBXZWJDb3JlOjptYWlu VGhyZWFkTm9ybWFsV29ybGQoKSkpOwogfQogCitnYm9vbGVhbiB3ZWJraXRfZG9tX2RvbV93aW5k b3dfd2Via2l0X21lc3NhZ2VfaGFuZGxlcnNfcG9zdF9tZXNzYWdlKFdlYktpdERPTURPTVdpbmRv dyogd2luZG93LCBjb25zdCBnY2hhciogaGFuZGxlck5hbWUsIGNvbnN0IGdjaGFyKiBtZXNzYWdl KQoreworICAgIGdfcmV0dXJuX3ZhbF9pZl9mYWlsKFdFQktJVF9ET01fSVNfRE9NX1dJTkRPVyh3 aW5kb3cpLCBGQUxTRSk7CisgICAgZ19yZXR1cm5fdmFsX2lmX2ZhaWwoaGFuZGxlck5hbWUsIEZB TFNFKTsKKyAgICBnX3JldHVybl92YWxfaWZfZmFpbChtZXNzYWdlLCBGQUxTRSk7CisKKyAgICBX ZWJDb3JlOjpET01XaW5kb3cqIGRvbVdpbmRvdyA9IGNvcmUod2luZG93KTsKKyAgICBpZiAoIWRv bVdpbmRvdy0+c2hvdWxkSGF2ZVdlYktpdE5hbWVzcGFjZUZvcldvcmxkKFdlYkNvcmU6Om1haW5U aHJlYWROb3JtYWxXb3JsZCgpKSkKKyAgICAgICAgcmV0dXJuIEZBTFNFOworCisgICAgYXV0byB3 ZWJraXROYW1lc3BhY2UgPSBkb21XaW5kb3ctPndlYmtpdE5hbWVzcGFjZSgpOworICAgIGlmICgh d2Via2l0TmFtZXNwYWNlKQorICAgICAgICByZXR1cm4gRkFMU0U7CisKKyAgICBhdXRvIGhhbmRs ZXIgPSB3ZWJraXROYW1lc3BhY2UtPm1lc3NhZ2VIYW5kbGVycygpLT5oYW5kbGVyKFN0cmluZzo6 ZnJvbVVURjgoaGFuZGxlck5hbWUpLCBXZWJDb3JlOjptYWluVGhyZWFkTm9ybWFsV29ybGQoKSk7 CisgICAgaWYgKCFoYW5kbGVyKQorICAgICAgICByZXR1cm4gRkFMU0U7CisKKyAgICBXZWJDb3Jl OjpKU01haW5UaHJlYWROdWxsU3RhdGUgc3RhdGU7CisgICAgaGFuZGxlci0+cG9zdE1lc3NhZ2Uo V2ViQ29yZTo6U2VyaWFsaXplZFNjcmlwdFZhbHVlOjpjcmVhdGUoU3RyaW5nOjpmcm9tVVRGOCht ZXNzYWdlKSkpOworICAgIHJldHVybiBUUlVFOworfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvYmluZGluZ3MvZ29iamVjdC9XZWJLaXRET01DdXN0b20uaCBiL1NvdXJjZS9XZWJDb3JlL2Jp bmRpbmdzL2dvYmplY3QvV2ViS2l0RE9NQ3VzdG9tLmgKaW5kZXggYmQxNTYzZDQwYTU4ZGQ1YTY4 YjQwZWYxMTQ5MTAxZDA2MDFjNTc1My4uZDNhMDVjMzVhMWI3ODQzNWY2NGMyZWIwZTU5NTRkM2Jk YjBjNzhmOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvZ29iamVjdC9XZWJL aXRET01DdXN0b20uaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9nb2JqZWN0L1dlYktp dERPTUN1c3RvbS5oCkBAIC00MSw2ICs0MSwxOCBAQCBXRUJLSVRfQVBJIGdib29sZWFuIHdlYmtp dF9kb21faHRtbF90ZXh0X2FyZWFfZWxlbWVudF9pc19lZGl0ZWQoV2ViS2l0RE9NSFRNTFRleAog ICovCiBXRUJLSVRfQVBJIGdib29sZWFuIHdlYmtpdF9kb21faHRtbF9pbnB1dF9lbGVtZW50X2lz X2VkaXRlZChXZWJLaXRET01IVE1MSW5wdXRFbGVtZW50KiBpbnB1dCk7CiAKKy8qKgorICogd2Vi a2l0X2RvbV9kb21fd2luZG93X3Bvc3RfdXNlcl9tZXNzYWdlOgorICogQHdpbmRvdzogQSAjV2Vi S2l0RE9NRE9NV2luZG93CisgKiBAaGFuZGxlcjogTmFtZSBvZiB0aGUgdXNlciBtZXNzYWdlIGhh bmRsZXIuCisgKiBAbWVzc2FnZTogSmF2YVNjcmlwdCB2YWx1ZSB0byBiZSBzZW50LgorICoKKyAq IFJldHVybnM6IFdoZXRoZXIgdGhlIG1lc3NhZ2Ugd2FzIHN1Y2Nlc3NmdWxseSBzZW50LgorICoK KyAqIFNpbmNlOiAyLjgKKyAqLworZ2Jvb2xlYW4gd2Via2l0X2RvbV9kb21fd2luZG93X3dlYmtp dF9tZXNzYWdlX2hhbmRsZXJzX3Bvc3RfbWVzc2FnZShXZWJLaXRET01ET01XaW5kb3cqIHdpbmRv dywgY29uc3QgZ2NoYXIqIGhhbmRsZXIsIGNvbnN0IGdjaGFyKiBtZXNzYWdlKTsKKwogR19FTkRf REVDTFMKIAogI2VuZGlmCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9nb2Jq ZWN0L1dlYktpdERPTUN1c3RvbS5zeW1ib2xzIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvZ29i amVjdC9XZWJLaXRET01DdXN0b20uc3ltYm9scwppbmRleCAyODZjMTc1NTM4NTc4ODE2OThlOTlh YzhhNzUwOTBjZWM2M2FmZTZhLi5iZmRmYTNlNTk2ODc0MWRhNGZmMDhiOGZmNWEzMzkwN2VhNjdi NmMwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9nb2JqZWN0L1dlYktpdERP TUN1c3RvbS5zeW1ib2xzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2dvYmplY3QvV2Vi S2l0RE9NQ3VzdG9tLnN5bWJvbHMKQEAgLTEsMiArMSwzIEBACiBnYm9vbGVhbiB3ZWJraXRfZG9t X2h0bWxfdGV4dF9hcmVhX2VsZW1lbnRfaXNfZWRpdGVkKFdlYktpdERPTUhUTUxUZXh0QXJlYUVs ZW1lbnQqKQogZ2Jvb2xlYW4gd2Via2l0X2RvbV9odG1sX2lucHV0X2VsZW1lbnRfaXNfZWRpdGVk KFdlYktpdERPTUhUTUxJbnB1dEVsZW1lbnQqKQorZ2Jvb2xlYW4gd2Via2l0X2RvbV9kb21fd2lu ZG93X3dlYmtpdF9tZXNzYWdlX2hhbmRsZXJzX3Bvc3RfbWVzc2FnZShXZWJLaXRET01ET01XaW5k b3cqLCBjb25zdCBnY2hhciosIGNvbnN0IGdjaGFyKikKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL2JpbmRpbmdzL2dvYmplY3Qvd2Via2l0ZG9tLnN5bWJvbHMgYi9Tb3VyY2UvV2ViQ29yZS9i aW5kaW5ncy9nb2JqZWN0L3dlYmtpdGRvbS5zeW1ib2xzCmluZGV4IDRkYTE2MTk3YTU2ZDczMmQx OTA3NWUxZjczM2VmMGU1ZWUzYmZhZmMuLmQwMmM2N2FjYTNmNGJmOGZiYzNlMWI3ODVjMjRjZGUy ODY1YmU0NTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2dvYmplY3Qvd2Vi a2l0ZG9tLnN5bWJvbHMKKysrIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvZ29iamVjdC93ZWJr aXRkb20uc3ltYm9scwpAQCAtMjIsNiArMjIsNyBAQCBXZWJLaXRET01Eb2N1bWVudCogd2Via2l0 X2RvbV9kb21faW1wbGVtZW50YXRpb25fY3JlYXRlX2RvY3VtZW50KFdlYktpdERPTURPTUltcAog V2ViS2l0RE9NQ1NTU3R5bGVTaGVldCogd2Via2l0X2RvbV9kb21faW1wbGVtZW50YXRpb25fY3Jl YXRlX2Nzc19zdHlsZV9zaGVldChXZWJLaXRET01ET01JbXBsZW1lbnRhdGlvbiosIGNvbnN0IGdj aGFyKiwgY29uc3QgZ2NoYXIqLCBHRXJyb3IqKikKIFdlYktpdERPTUhUTUxEb2N1bWVudCogd2Vi a2l0X2RvbV9kb21faW1wbGVtZW50YXRpb25fY3JlYXRlX2h0bWxfZG9jdW1lbnQoV2ViS2l0RE9N RE9NSW1wbGVtZW50YXRpb24qLCBjb25zdCBnY2hhciopCiBHVHlwZSB3ZWJraXRfZG9tX2RvbV93 aW5kb3dfZ2V0X3R5cGUodm9pZCkKK2dib29sZWFuIHdlYmtpdF9kb21fZG9tX3dpbmRvd193ZWJr aXRfbWVzc2FnZV9oYW5kbGVyc19wb3N0X21lc3NhZ2UoV2ViS2l0RE9NRE9NV2luZG93KiwgY29u c3QgZ2NoYXIqLCBjb25zdCBnY2hhciopCiBHVHlwZSB3ZWJraXRfZG9tX2RvY3VtZW50X2dldF90 eXBlKHZvaWQpCiBXZWJLaXRET01Eb2N1bWVudFR5cGUqIHdlYmtpdF9kb21fZG9jdW1lbnRfZ2V0 X2RvY3R5cGUoV2ViS2l0RE9NRG9jdW1lbnQqKQogV2ViS2l0RE9NSFRNTENvbGxlY3Rpb24qIHdl YmtpdF9kb21fZG9jdW1lbnRfZ2V0X2ltYWdlcyhXZWJLaXRET01Eb2N1bWVudCopCmRpZmYgLS1n aXQgYS9Ub29scy9DaGFuZ2VMb2cgYi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZWU3ZjA0ZjIxMmNm MDVmZTk1YTQwMWJhYjFhZGQ1ZDk5N2MzOWY0Ny4uN2EwZTRlOTJhODIyOGRjYTk0NDJkODRmYTYx MDgzMGEwNjcxN2FhZCAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0No YW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDE0LTExLTE5ICBBZHJpYW4gUGVyZXogZGUgQ2Fz dHJvICA8YXBlcmV6QGlnYWxpYS5jb20+CisKKyAgICAgICAgW0dUS10gUHJvdmlkZSBjb252ZW5p ZW5jZSBBUEkgaW4gRE9NIGJpbmRpbmdzIHRvIHBvc3QgbWVzc2FnZXMgdG8gdXNlciBtZXNzYWdl IGhhbmRsZXJzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0xMzg4NzEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBBZGQgYSB0ZXN0IGNhc2UgZm9yIHRoZSBjb252ZW5pZW5jZSBBUEkgZm9yIHBvc3RpbmcgdXNl ciBtZXNzYWdlcworICAgICAgICBhZGRlZCB0byB0aGUgRE9NIGJpbmRpbmdzLgorCisgICAgICAg ICogVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXQyR3RrL1Rlc3RXZWJLaXRVc2VyQ29udGVudE1h bmFnZXIuY3BwOgorICAgICAgICAodGVzdFVzZXJDb250ZW50TWFuYWdlck1lc3NhZ2VGcm9tQ29u dmVuaWVuY2VET01CaW5kaW5ncyk6CisgICAgICAgIChiZWZvcmVBbGwpOgorICAgICAgICAqIFRl c3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Mkd0ay9XZWJFeHRlbnNpb25UZXN0LmNwcDoKKyAgICAg ICAgKGRvY3VtZW50TG9hZGVkQ2FsbGJhY2spOgorCiAyMDE0LTExLTE5ICBDaHJpcyBGbGVpemFj aCAgPGNmbGVpemFjaEBhcHBsZS5jb20+CiAKICAgICAgICAgQVg6IFNjcmVlbiBicmFpbGxlIGlu cHV0IGRvZXNuJ3Qgd29yayBvbiBmb3Jtcy4KZGlmZiAtLWdpdCBhL1Rvb2xzL1Rlc3RXZWJLaXRB UEkvVGVzdHMvV2ViS2l0Mkd0ay9UZXN0V2ViS2l0VXNlckNvbnRlbnRNYW5hZ2VyLmNwcCBiL1Rv b2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Mkd0ay9UZXN0V2ViS2l0VXNlckNvbnRlbnRN YW5hZ2VyLmNwcAppbmRleCBjMjQwYTViYTQ0YTg5NDk1MjYzYTU1ZmJjOTY4MjBmZGM2ZTRlNTFi Li45ZjQ5ZDFkMWZhM2UxMTI1YzNiNTI0YjcyNThhMGYyYjQ5ZjBhNjIwIDEwMDY0NAotLS0gYS9U b29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdDJHdGsvVGVzdFdlYktpdFVzZXJDb250ZW50 TWFuYWdlci5jcHAKKysrIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXQyR3RrL1Rl c3RXZWJLaXRVc2VyQ29udGVudE1hbmFnZXIuY3BwCkBAIC0zNDksMTMgKzM0OSwyMyBAQCBzdGF0 aWMgdm9pZCB0ZXN0VXNlckNvbnRlbnRNYW5hZ2VyU2NyaXB0TWVzc2FnZUZyb21ET01CaW5kaW5n cyhVc2VyU2NyaXB0TWVzc2FnZQogewogICAgIGdfYXNzZXJ0KHRlc3QtPnJlZ2lzdGVySGFuZGxl cigiZG9tIikpOwogCi0gICAgdGVzdC0+bG9hZEh0bWwoIjxodG1sPjwvaHRtbD4iLCBudWxscHRy KTsKKyAgICB0ZXN0LT5sb2FkSHRtbCgiPGh0bWw+MTwvaHRtbD4iLCBudWxscHRyKTsKICAgICBX ZWJLaXRKYXZhc2NyaXB0UmVzdWx0KiBqYXZhc2NyaXB0UmVzdWx0ID0gdGVzdC0+d2FpdFVudGls TWVzc2FnZVJlY2VpdmVkKCJkb20iKTsKICAgICBnX2Fzc2VydChqYXZhc2NyaXB0UmVzdWx0KTsK ICAgICBHVW5pcXVlUHRyPGNoYXI+IHZhbHVlU3RyaW5nKFdlYlZpZXdUZXN0OjpqYXZhc2NyaXB0 UmVzdWx0VG9DU3RyaW5nKGphdmFzY3JpcHRSZXN1bHQpKTsKICAgICBnX2Fzc2VydF9jbXBzdHIo dmFsdWVTdHJpbmcuZ2V0KCksID09LCAiRG9jdW1lbnRMb2FkZWQiKTsKIAogICAgIHRlc3QtPnVu cmVnaXN0ZXJIYW5kbGVyKCJkb20iKTsKKworICAgIGdfYXNzZXJ0KHRlc3QtPnJlZ2lzdGVySGFu ZGxlcigiZG9tLWNvbnZlbmllbmNlIikpOworCisgICAgdGVzdC0+bG9hZEh0bWwoIjxodG1sPjI8 L2h0bWw+IiwgbnVsbHB0cik7CisgICAgamF2YXNjcmlwdFJlc3VsdCA9IHRlc3QtPndhaXRVbnRp bE1lc3NhZ2VSZWNlaXZlZCgiZG9tLWNvbnZlbmllbmNlIik7CisgICAgZ19hc3NlcnQoamF2YXNj cmlwdFJlc3VsdCk7CisgICAgdmFsdWVTdHJpbmcucmVzZXQoV2ViVmlld1Rlc3Q6OmphdmFzY3Jp cHRSZXN1bHRUb0NTdHJpbmcoamF2YXNjcmlwdFJlc3VsdCkpOworICAgIGdfYXNzZXJ0X2NtcHN0 cih2YWx1ZVN0cmluZy5nZXQoKSwgPT0sICJEb2N1bWVudExvYWRlZCIpOworCisgICAgdGVzdC0+ dW5yZWdpc3RlckhhbmRsZXIoImRvbS1jb252ZW5pZW5jZSIpOwogfQogCiBzdGF0aWMgdm9pZCBz ZXJ2ZXJDYWxsYmFjayhTb3VwU2VydmVyKiBzZXJ2ZXIsIFNvdXBNZXNzYWdlKiBtZXNzYWdlLCBj b25zdCBjaGFyKiBwYXRoLCBHSGFzaFRhYmxlKiwgU291cENsaWVudENvbnRleHQqLCBncG9pbnRl cikKZGlmZiAtLWdpdCBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Mkd0ay9XZWJF eHRlbnNpb25UZXN0LmNwcCBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Mkd0ay9X ZWJFeHRlbnNpb25UZXN0LmNwcAppbmRleCA1NGI1NDM4NTQwNjRjZWI0Y2E5Y2VkZjQzN2ZkMTJi MjQ1MmM4NDdmLi5mZDA5NTk2Y2Q5MDBkNmY1N2YyZGI2NGY2ZjZjYjY1ZmZmMTAwZGE1IDEwMDY0 NAotLS0gYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdDJHdGsvV2ViRXh0ZW5zaW9u VGVzdC5jcHAKKysrIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXQyR3RrL1dlYkV4 dGVuc2lvblRlc3QuY3BwCkBAIC0xMDksNiArMTA5LDcgQEAgc3RhdGljIHZvaWQgZG9jdW1lbnRM b2FkZWRDYWxsYmFjayhXZWJLaXRXZWJQYWdlKiB3ZWJQYWdlLCBXZWJLaXRXZWJFeHRlbnNpb24q IGUKICAgICAgICAgICAgIHdlYmtpdF9kb21fdXNlcl9tZXNzYWdlX2hhbmRsZXJfcG9zdF9tZXNz YWdlKGhhbmRsZXIsICJEb2N1bWVudExvYWRlZCIpOwogICAgIH0KIAorICAgIHdlYmtpdF9kb21f ZG9tX3dpbmRvd193ZWJraXRfbWVzc2FnZV9oYW5kbGVyc19wb3N0X21lc3NhZ2Uod2luZG93LCAi ZG9tLWNvbnZlbmllbmNlIiwgIkRvY3VtZW50TG9hZGVkIik7CiAKICAgICBncG9pbnRlciBkYXRh ID0gZ19vYmplY3RfZ2V0X2RhdGEoR19PQkpFQ1QoZXh0ZW5zaW9uKSwgImRidXMtY29ubmVjdGlv biIpOwogICAgIGlmIChkYXRhKQo=