128389 2014-02-07 12:39:58 -0800 [GTK] Make process model names properly meaningful 2014-02-08 00:20:30 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 aperez webkit-unassigned andersca berto cgarcia commit-queue gustavo mrobinson oldest_to_newest 977990 0 aperez 2014-02-07 12:39:58 -0800 [GTK] Make process model names properly meaningful 978008 1 223492 aperez 2014-02-07 13:30:45 -0800 Created attachment 223492 Patch 978009 2 commit-queue 2014-02-07 13:31:22 -0800 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 978016 3 223492 mrobinson 2014-02-07 13:39:51 -0800 Comment on attachment 223492 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=223492&action=review Looks good to me. Needs one more GTK+ reviewer to be committed. > Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.cpp:935 > + if (newProcessModel != context->priv->context->processModel()) { > + context->priv->context->setUsesNetworkProcess(newProcessModel == ProcessModelMultipleSecondaryProcesses); > + context->priv->context->setProcessModel(newProcessModel); Nit: This should probably be an early return. 978032 4 223496 aperez 2014-02-07 14:03:50 -0800 Created attachment 223496 Patch 978034 5 aperez 2014-02-07 14:05:20 -0800 (In reply to comment #3) > (From update of attachment 223492 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=223492& > > > Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.cpp:935 > > + if (newProcessModel != context->priv->context->processModel()) { > > + context->priv->context->setUsesNetworkProcess(newProcessModel == ProcessModelMultipleSecondaryProcesses); > > + context->priv->context->setProcessModel(newProcessModel); > > Nit: This should probably be an early return. Updated patch, now there is an early return there :-) 978330 6 223496 commit-queue 2014-02-08 00:20:27 -0800 Comment on attachment 223496 Patch Clearing flags on attachment: 223496 Committed r163698: <http://trac.webkit.org/changeset/163698> 978331 7 commit-queue 2014-02-08 00:20:30 -0800 All reviewed patches have been landed. Closing bug. 223492 2014-02-07 13:30:45 -0800 2014-02-07 14:02:57 -0800 Patch bug-128389-20140207233126.patch text/plain 10375 aperez U3VidmVyc2lvbiBSZXZpc2lvbjogMTYzNjQwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggNDhiMDRkMjczOWFmZGQz M2RjNTA2NGY3YTZiZWI4MWM4ZjAwZTJjYS4uOGIwNzI4NjNhNjJjOWEyMjI2NjRhY2I1OTM2MzA5 ZjI4ODQ0NWM5YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDE0LTAyLTA3ICBBZHJp YW4gUGVyZXogZGUgQ2FzdHJvICA8YXBlcmV6QGlnYWxpYS5jb20+CisKKyAgICAgICAgW0dUS10g TWFrZSBwcm9jZXNzIG1vZGVsIG5hbWVzIHByb3Blcmx5IG1lYW5pbmdmdWwKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyODM4OQorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoZSBuYW1lIFdFQktJVF9QUk9D RVNTX01PREVMX09ORV9TRUNPTkRBUllfUFJPQ0VTU19QRVJfV0VCX1ZJRVcKKyAgICAgICAgaXMg bWlzbGVhZGluZyBiZWNhdXNlIHRoZXJlIGFyZSBzaXR1YXRpb25zIGluIHdoaWNoIHdlYiB2aWV3 cyBtYXkKKyAgICAgICAgc2hhcmUgdGhlIHNhbWUgd2ViIHByb2Nlc3MgZXZlbiB3aGVuIG11bHRp LXByb2Nlc3MgbW9kZSBpcyBlbmFibGVkOworICAgICAgICBmb3IgZXhhbXBsZSB3aGVuIG9wZW5p bmcgYSByZWxhdGVkIHZpZXcgYW5kIGJvdGggaW50ZXJhY3QgdXNpbmcgSlMuCisKKyAgICAgICAg KiBVSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJDb250ZXh0LmNwcDoKKyAgICAgICAgKHdlYmtp dF93ZWJfY29udGV4dF9zZXRfcHJvY2Vzc19tb2RlbCk6CisgICAgICAgICh3ZWJraXRfd2ViX2Nv bnRleHRfZ2V0X3Byb2Nlc3NfbW9kZWwpOgorICAgICAgICBVcGRhdGUgbmFtZXMgb2YgV2ViS2l0 UHJvY2Vzc01vZGVsIGVudW0gdmFsdWVzLgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZ3RrL1dl YktpdFdlYkNvbnRleHQuaDoKKyAgICAgICAgRGl0dG8uCisKIDIwMTQtMDItMDcgIFRpbSBIb3J0 b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CiAKICAgICAgICAgUmVuYW1lIFZpZXdHZXN0 dXJlQ29udHJvbGxlci5tbSB0byBWaWV3R2VzdHVyZUNvbnRyb2xsZXJNYWMubW0KZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYkNvbnRleHQuY3Bw IGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0V2ViQ29udGV4dC5jcHAK aW5kZXggZDVkNjAxOTMyMjkyM2EyYmZkNWU1NGEyODE5NmM5YmNkOWM3NDY5Zi4uNjQzYzgzNDUw YWQ2NTk3MWYxYmIzNzM1ODBmZGEwMzI3MWFiMGE3NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0V2ViQ29udGV4dC5jcHAKKysrIGIvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0V2ViQ29udGV4dC5jcHAKQEAgLTE2Myw5ICsx NjMsNiBAQCBzdHJ1Y3QgX1dlYktpdFdlYkNvbnRleHRQcml2YXRlIHsKIAogc3RhdGljIGd1aW50 IHNpZ25hbHNbTEFTVF9TSUdOQUxdID0geyAwLCB9OwogCi1DT01QSUxFX0FTU0VSVF9NQVRDSElO R19FTlVNKFdFQktJVF9QUk9DRVNTX01PREVMX1NIQVJFRF9TRUNPTkRBUllfUFJPQ0VTUywgUHJv Y2Vzc01vZGVsU2hhcmVkU2Vjb25kYXJ5UHJvY2Vzcyk7Ci1DT01QSUxFX0FTU0VSVF9NQVRDSElO R19FTlVNKFdFQktJVF9QUk9DRVNTX01PREVMX09ORV9TRUNPTkRBUllfUFJPQ0VTU19QRVJfV0VC X1ZJRVcsIFByb2Nlc3NNb2RlbE11bHRpcGxlU2Vjb25kYXJ5UHJvY2Vzc2VzKTsKLQogV0VCS0lU X0RFRklORV9UWVBFKFdlYktpdFdlYkNvbnRleHQsIHdlYmtpdF93ZWJfY29udGV4dCwgR19UWVBF X09CSkVDVCkKIAogc3RhdGljIHZvaWQgd2Via2l0X3dlYl9jb250ZXh0X2NsYXNzX2luaXQoV2Vi S2l0V2ViQ29udGV4dENsYXNzKiB3ZWJDb250ZXh0Q2xhc3MpCkBAIC04OTgsMTUgKzg5NSwxOSBA QCB2b2lkIHdlYmtpdF93ZWJfY29udGV4dF9hbGxvd190bHNfY2VydGlmaWNhdGVfZm9yX2hvc3Qo V2ViS2l0V2ViQ29udGV4dCogY29udGV4dAogICogZGV0ZXJtaW5lIGhvdyBhdXhpbGlhcnkgcHJv Y2Vzc2VzIGFyZSBoYW5kbGVkLiBUaGUgZGVmYXVsdCBzZXR0aW5nCiAgKiAoJVdFQktJVF9QUk9D RVNTX01PREVMX1NIQVJFRF9TRUNPTkRBUllfUFJPQ0VTUykgaXMgc3VpdGFibGUgZm9yIG1vc3QK ICAqIGFwcGxpY2F0aW9ucyB3aGljaCBlbWJlZCBhIHNtYWxsIGFtb3VudCBvZiBXZWJWaWV3cywg b3IgYXJlIHVzZWQgdG8KLSAqIGRpc3BsYXkgZG9jdW1lbnRzIHdoaWNoIGFyZSBjb25zaWRlcmVk IHNhZmUgLS0gbGlrZSBsb2NhbCBmaWxlcy4KKyAqIGRpc3BsYXkgZG9jdW1lbnRzIHdoaWNoIGFy ZSBjb25zaWRlcmVkIHNhZmUg4oCUIGxpa2UgbG9jYWwgZmlsZXMuCiAgKgotICogQXBwbGljYXRp b25zIHdoaWNoIG1heSBwb3RlbnRpYWxseSB1c2UgYSBsYXJnZSBhbW91bnQgb2YgV2ViVmlld3Mg LS1mb3IKLSAqIGV4YW1wbGUgYSBtdWx0aS10YWJiZWQgd2ViIGJyb3dzZXItLSBtYXkgd2FudCB0 byB1c2UKLSAqICVXRUJLSVRfUFJPQ0VTU19NT0RFTF9PTkVfU0VDT05EQVJZX1BST0NFU1NfUEVS X1dFQl9WSUVXIHRvIHVzZSBvbmUKLSAqIHByb2Nlc3MgcGVyIHZpZXcuIFVzaW5nIHRoaXMgbW9k ZWwsIHdoZW4gYSBXZWJWaWV3IGhhbmdzIG9yIGNyYXNoZXMsCi0gKiB0aGUgcmVzdCBvZiB0aGUg V2ViVmlld3MgaW4gdGhlIGFwcGxpY2F0aW9uIHdpbGwgc3RpbGwgd29yayBub3JtYWxseS4KKyAq IEFwcGxpY2F0aW9ucyB3aGljaCBtYXkgcG90ZW50aWFsbHkgdXNlIGEgbGFyZ2UgYW1vdW50IG9m IFdlYlZpZXdzCisgKiDigJRmb3IgZXhhbXBsZSBhIG11bHRpLXRhYmJlZCB3ZWIgYnJvd3NlcuKA lCBtYXkgd2FudCB0byB1c2UKKyAqICVXRUJLSVRfUFJPQ0VTU19NT0RFTF9NVUxUSVBMRV9TRUNP TkRBUllfUFJPQ0VTU0VTLCB3aGljaCB3aWxsIHVzZQorICogb25lIHByb2Nlc3MgcGVyIHZpZXcg bW9zdCBvZiB0aGUgdGltZSwgd2hpbGUgc3RpbGwgYWxsb3dpbmcgZm9yIHdlYgorICogdmlld3Mg dG8gc2hhcmUgYSBwcm9jZXNzIHdoZW4gbmVlZGVkIChmb3IgZXhhbXBsZSB3aGVuIGRpZmZlcmVu dAorICogdmlld3MgaW50ZXJhY3Qgd2l0aCBlYWNoIG90aGVyKS4gVXNpbmcgdGhpcyBtb2RlbCwg d2hlbiBhIHByb2Nlc3MKKyAqIGhhbmdzIG9yIGNyYXNoZXMsIG9ubHkgdGhlIFdlYlZpZXdzIHVz aW5nIGl0IHN0b3Agd29ya2luZywgd2hpbGUKKyAqIHRoZSByZXN0IG9mIHRoZSBXZWJWaWV3cyBp biB0aGUgYXBwbGljYXRpb24gd2lsbCBzdGlsbCBmdW5jdGlvbgorICogbm9ybWFsbHkuCiAgKgot ICogVGhpcyBtZXRob2QgPHN0cm9uZz5tdXN0IGJlIGNhbGxlZCBiZWZvcmUgYW55IG90aGVyIGZ1 bmN0aW9uczwvc3Ryb25nPiwKKyAqIFRoaXMgbWV0aG9kICoqbXVzdCBiZSBjYWxsZWQgYmVmb3Jl IGFueSBvdGhlciBmdW5jdGlvbnMqKiwKICAqIGFzIGVhcmx5IGFzIHBvc3NpYmxlIGluIHlvdXIg YXBwbGljYXRpb24uIENhbGxpbmcgaXQgbGF0ZXIgd2lsbCBtYWtlCiAgKiB5b3VyIGFwcGxpY2F0 aW9uIGNyYXNoLgogICoKQEAgLTkxNiw5ICs5MTcsMjIgQEAgdm9pZCB3ZWJraXRfd2ViX2NvbnRl eHRfc2V0X3Byb2Nlc3NfbW9kZWwoV2ViS2l0V2ViQ29udGV4dCogY29udGV4dCwgV2ViS2l0UHJv Y2UKIHsKICAgICBnX3JldHVybl9pZl9mYWlsKFdFQktJVF9JU19XRUJfQ09OVEVYVChjb250ZXh0 KSk7CiAKLSAgICBpZiAocHJvY2Vzc01vZGVsICE9IGNvbnRleHQtPnByaXYtPmNvbnRleHQtPnBy b2Nlc3NNb2RlbCgpKSB7Ci0gICAgICAgIGNvbnRleHQtPnByaXYtPmNvbnRleHQtPnNldFVzZXNO ZXR3b3JrUHJvY2Vzcyhwcm9jZXNzTW9kZWwgPT0gUHJvY2Vzc01vZGVsTXVsdGlwbGVTZWNvbmRh cnlQcm9jZXNzZXMpOwotICAgICAgICBjb250ZXh0LT5wcml2LT5jb250ZXh0LT5zZXRQcm9jZXNz TW9kZWwoc3RhdGljX2Nhc3Q8UHJvY2Vzc01vZGVsPihwcm9jZXNzTW9kZWwpKTsKKyAgICBQcm9j ZXNzTW9kZWwgbmV3UHJvY2Vzc01vZGVsOworCisgICAgc3dpdGNoIChwcm9jZXNzTW9kZWwpIHsK KyAgICBjYXNlIFdFQktJVF9QUk9DRVNTX01PREVMX1NIQVJFRF9TRUNPTkRBUllfUFJPQ0VTUzoK KyAgICAgICAgbmV3UHJvY2Vzc01vZGVsID0gUHJvY2Vzc01vZGVsU2hhcmVkU2Vjb25kYXJ5UHJv Y2VzczsKKyAgICAgICAgYnJlYWs7CisgICAgY2FzZSBXRUJLSVRfUFJPQ0VTU19NT0RFTF9NVUxU SVBMRV9TRUNPTkRBUllfUFJPQ0VTU0VTOgorICAgICAgICBuZXdQcm9jZXNzTW9kZWwgPSBQcm9j ZXNzTW9kZWxNdWx0aXBsZVNlY29uZGFyeVByb2Nlc3NlczsKKyAgICAgICAgYnJlYWs7CisgICAg ZGVmYXVsdDoKKyAgICAgICAgZ19hc3NlcnRfbm90X3JlYWNoZWQoKTsKKyAgICB9CisKKyAgICBp ZiAobmV3UHJvY2Vzc01vZGVsICE9IGNvbnRleHQtPnByaXYtPmNvbnRleHQtPnByb2Nlc3NNb2Rl bCgpKSB7CisgICAgICAgIGNvbnRleHQtPnByaXYtPmNvbnRleHQtPnNldFVzZXNOZXR3b3JrUHJv Y2VzcyhuZXdQcm9jZXNzTW9kZWwgPT0gUHJvY2Vzc01vZGVsTXVsdGlwbGVTZWNvbmRhcnlQcm9j ZXNzZXMpOworICAgICAgICBjb250ZXh0LT5wcml2LT5jb250ZXh0LT5zZXRQcm9jZXNzTW9kZWwo bmV3UHJvY2Vzc01vZGVsKTsKICAgICB9CiB9CiAKQEAgLTkzNiw3ICs5NTAsMTUgQEAgdm9pZCB3 ZWJraXRfd2ViX2NvbnRleHRfc2V0X3Byb2Nlc3NfbW9kZWwoV2ViS2l0V2ViQ29udGV4dCogY29u dGV4dCwgV2ViS2l0UHJvY2UKIFdlYktpdFByb2Nlc3NNb2RlbCB3ZWJraXRfd2ViX2NvbnRleHRf Z2V0X3Byb2Nlc3NfbW9kZWwoV2ViS2l0V2ViQ29udGV4dCogY29udGV4dCkKIHsKICAgICBnX3Jl dHVybl92YWxfaWZfZmFpbChXRUJLSVRfSVNfV0VCX0NPTlRFWFQoY29udGV4dCksIFdFQktJVF9Q Uk9DRVNTX01PREVMX1NIQVJFRF9TRUNPTkRBUllfUFJPQ0VTUyk7Ci0gICAgcmV0dXJuIHN0YXRp Y19jYXN0PFdlYktpdFByb2Nlc3NNb2RlbD4oY29udGV4dC0+cHJpdi0+Y29udGV4dC0+cHJvY2Vz c01vZGVsKCkpOworCisgICAgc3dpdGNoIChjb250ZXh0LT5wcml2LT5jb250ZXh0LT5wcm9jZXNz TW9kZWwoKSkgeworICAgIGNhc2UgUHJvY2Vzc01vZGVsU2hhcmVkU2Vjb25kYXJ5UHJvY2VzczoK KyAgICAgICAgcmV0dXJuIFdFQktJVF9QUk9DRVNTX01PREVMX1NIQVJFRF9TRUNPTkRBUllfUFJP Q0VTUzsKKyAgICBjYXNlIFByb2Nlc3NNb2RlbE11bHRpcGxlU2Vjb25kYXJ5UHJvY2Vzc2VzOgor ICAgICAgICByZXR1cm4gV0VCS0lUX1BST0NFU1NfTU9ERUxfTVVMVElQTEVfU0VDT05EQVJZX1BS T0NFU1NFUzsKKyAgICBkZWZhdWx0OgorICAgICAgICBnX2Fzc2VydF9ub3RfcmVhY2hlZCgpOwor ICAgIH0KIH0KIAogV2ViS2l0RG93bmxvYWQqIHdlYmtpdFdlYkNvbnRleHRHZXRPckNyZWF0ZURv d25sb2FkKERvd25sb2FkUHJveHkqIGRvd25sb2FkUHJveHkpCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJDb250ZXh0LmggYi9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJDb250ZXh0LmgKaW5kZXggZDNlMTJiMzU1 MDQ2ZDdjOGU1ZmIyYjZkYThjYmE3NDQ5YjRiZjljNC4uM2NlMjgxYjliMTAzYTcyNzk0MjZmOTgy MzU1MGEzY2E1MThlZjUzNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQ SS9ndGsvV2ViS2l0V2ViQ29udGV4dC5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9B UEkvZ3RrL1dlYktpdFdlYkNvbnRleHQuaApAQCAtNjksMTMgKzY5LDE1IEBAIHR5cGVkZWYgZW51 bSB7CiAgKiAgICNXZWJLaXRXZWJWaWV3IGluc3RhbmNlcyBjcmVhdGVkIGJ5IHRoZSBhcHBsaWNh dGlvbjogaWYgdGhlIHByb2Nlc3MKICAqICAgaGFuZ3Mgb3IgY3Jhc2hlcyBhbGwgdGhlIHdlYiB2 aWV3cyBpbiB0aGUgYXBwbGljYXRpb24gd2lsbCBiZSBhZmZlY3RlZC4KICAqICAgVGhpcyBpcyB0 aGUgZGVmYXVsdCBwcm9jZXNzIG1vZGVsLCBhbmQgaXQgc2hvdWxkIHN1ZmZpY2UgZm9yIG1vc3Qg Y2FzZXMuCi0gKiBAV0VCS0lUX1BST0NFU1NfTU9ERUxfT05FX1NFQ09OREFSWV9QUk9DRVNTX1BF Ul9XRUJfVklFVzogVXNlIG9uZSBwcm9jZXNzCi0gKiAgIGZvciBlYWNoICNXZWJLaXRXZWJWaWV3 LiBUaGUgbWFpbiBhZHZhbnRhZ2Ugb2YgdGhpcyBwcm9jZXNzIG1vZGVsIGlzIHRoYXQKLSAqICAg dGhlIHJlbmRlcmluZyBwcm9jZXNzIGZvciBhIHdlYiB2aWV3IGNhbiBjcmFzaCB3aGlsZSB0aGUg cmVzdCBvZiB0aGUKLSAqICAgdmlld3Mga2VlcCB3b3JraW5nIG5vcm1hbGx5LiBUaGlzIHByb2Nl c3MgbW9kZWwgaXMgaW5kaWNhdGVkIGZvcgotICogICBhcHBsaWNhdGlvbnMgd2hpY2ggbWF5IHVz ZSBhIG51bWJlciBvZiB3ZWIgdmlld3MgYW5kIHRoZSBjb250ZW50IG9mCi0gKiAgIGluIGVhY2gg bXVzdCBub3QgaW50ZXJmZXJlIHdpdGggdGhlIHJlc3QgLS0gZm9yIGV4YW1wbGUgYSBmdWxsLWZs ZWRnZWQKLSAqICAgd2ViIGJyb3dzZXIgd2l0aCBzdXBwb3J0IGZvciBtdWx0aXBsZSB0YWJzLgor ICogQFdFQktJVF9QUk9DRVNTX01PREVMX01VTFRJUExFX1NFQ09OREFSWV9QUk9DRVNTRVM6IFVz ZSBvbmUgcHJvY2VzcworICogICBmb3IgZWFjaCAjV2ViS2l0V2ViVmlldywgd2hpbGUgc3RpbGwg YWxsb3dpbmcgZm9yIHNvbWUgb2YgdGhlbSB0bworICogICBzaGFyZSBhIHByb2Nlc3MgaW4gY2Vy dGFpbiBzaXR1YXRpb25zLiBUaGUgbWFpbiBhZHZhbnRhZ2UKKyAqICAgb2YgdGhpcyBwcm9jZXNz IG1vZGVsIGlzIHRoYXQgdGhlIHJlbmRlcmluZyBwcm9jZXNzIGZvciBhIHdlYiB2aWV3CisgKiAg IGNhbiBjcmFzaCB3aGlsZSB0aGUgcmVzdCBvZiB0aGUgdmlld3Mga2VlcCB3b3JraW5nIG5vcm1h bGx5LiBUaGlzCisgKiAgIHByb2Nlc3MgbW9kZWwgaXMgaW5kaWNhdGVkIGZvciBhcHBsaWNhdGlv bnMgd2hpY2ggbWF5IHVzZSBhIG51bWJlcgorICogICBvZiB3ZWIgdmlld3MgYW5kIHRoZSBjb250 ZW50IG9mIGluIGVhY2ggbXVzdCBub3QgaW50ZXJmZXJlIHdpdGggdGhlCisgKiAgIHJlc3Qg4oCU IGZvciBleGFtcGxlIGEgZnVsbC1mbGVkZ2VkIHdlYiBicm93c2VyIHdpdGggc3VwcG9ydCBmb3IK KyAqICAgbXVsdGlwbGUgdGFicy4KICAqCiAgKiBFbnVtIHZhbHVlcyB1c2VkIGZvciBkZXRlcm1p bmluZyB0aGUgI1dlYktpdFdlYkNvbnRleHQgcHJvY2VzcyBtb2RlbC4KICAqCkBAIC04Myw3ICs4 NSw3IEBAIHR5cGVkZWYgZW51bSB7CiAgKi8KIHR5cGVkZWYgZW51bSB7CiAgICAgV0VCS0lUX1BS T0NFU1NfTU9ERUxfU0hBUkVEX1NFQ09OREFSWV9QUk9DRVNTLAotICAgIFdFQktJVF9QUk9DRVNT X01PREVMX09ORV9TRUNPTkRBUllfUFJPQ0VTU19QRVJfV0VCX1ZJRVcsCisgICAgV0VCS0lUX1BS T0NFU1NfTU9ERUxfTVVMVElQTEVfU0VDT05EQVJZX1BST0NFU1NFUywKIH0gV2ViS2l0UHJvY2Vz c01vZGVsOwogCiAvKioKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5n ZUxvZwppbmRleCAxZDliNjllMDk1NGVkMWQ5OTNiZWFhZGFjN2E5YWJmNmU3MTBmZjI3Li5hZTZk OTdlMThmYjQyOGExODUyMDYxZWUwYjgwMjg3NjEyY2E4ZDI5IDEwMDY0NAotLS0gYS9Ub29scy9D aGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIgQEAKKzIwMTQtMDIt MDcgIEFkcmlhbiBQZXJleiBkZSBDYXN0cm8gIDxhcGVyZXpAaWdhbGlhLmNvbT4KKworICAgICAg ICBbR1RLXSBNYWtlIHByb2Nlc3MgbW9kZWwgbmFtZXMgcHJvcGVybHkgbWVhbmluZ2Z1bAorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTI4Mzg5CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhlIG5hbWUgV0VC S0lUX1BST0NFU1NfTU9ERUxfT05FX1NFQ09OREFSWV9QUk9DRVNTX1BFUl9XRUJfVklFVworICAg ICAgICBpcyBtaXNsZWFkaW5nIGJlY2F1c2UgdGhlcmUgYXJlIHNpdHVhdGlvbnMgaW4gd2hpY2gg d2ViIHZpZXdzIG1heQorICAgICAgICBzaGFyZSB0aGUgc2FtZSB3ZWIgcHJvY2VzcyBldmVuIHdo ZW4gbXVsdGktcHJvY2VzcyBtb2RlIGlzIGVuYWJsZWQ7CisgICAgICAgIGZvciBleGFtcGxlIHdo ZW4gb3BlbmluZyBhIHJlbGF0ZWQgdmlldyBhbmQgYm90aCBpbnRlcmFjdCB1c2luZyBKUy4KKwor ICAgICAgICAqIE1pbmlCcm93c2VyL2d0ay9tYWluLmM6CisgICAgICAgIChtYWluKToKKyAgICAg ICAgVXBkYXRlIHVzYWdlIG9mIFdlYktpdFByb2Nlc3NNb2RlbCBlbnVtIHZhbHVlcy4KKyAgICAg ICAgKiBUZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdDJHdGsvVGVzdE11bHRpcHJvY2Vzcy5jcHA6 CisgICAgICAgIChiZWZvcmVBbGwpOgorICAgICAgICBEaXR0by4KKwogMjAxNC0wMi0wNyAgU2Ft dWVsIFdoaXRlICA8c2FtdWVsX3doaXRlQGFwcGxlLmNvbT4KIAogICAgICAgICBBWDogRmluZCBh bmQgc2VsZWN0IHRleHQgd2l0aCByZXNwZWN0IHRvIGluc2VydGlvbiBwb2ludCB1c2luZyBhY2Nl c3NpYmlsaXR5IEFQSS4KZGlmZiAtLWdpdCBhL1Rvb2xzL01pbmlCcm93c2VyL2d0ay9tYWluLmMg Yi9Ub29scy9NaW5pQnJvd3Nlci9ndGsvbWFpbi5jCmluZGV4IDkyODM2MDUzMWM4OWEwZGMyMGYz YWJlNWUzMjIyYWFlOTcxNzliYmQuLmY2OWE0ZjY0YmIyNTQzMjhkYWQ1ZGQ4YWQ0ZmMxOGY4NWEy NTRiMDMgMTAwNjQ0Ci0tLSBhL1Rvb2xzL01pbmlCcm93c2VyL2d0ay9tYWluLmMKKysrIGIvVG9v bHMvTWluaUJyb3dzZXIvZ3RrL21haW4uYwpAQCAtMjQ0LDcgKzI0NCw3IEBAIGludCBtYWluKGlu dCBhcmdjLCBjaGFyICphcmd2W10pCiAgICAgY29uc3QgZ2NoYXIgKm11bHRpcHJvY2VzcyA9IGdf Z2V0ZW52KCJNSU5JQlJPV1NFUl9NVUxUSVBST0NFU1MiKTsKICAgICBpZiAobXVsdGlwcm9jZXNz ICYmICptdWx0aXByb2Nlc3MpIHsKICAgICAgICAgd2Via2l0X3dlYl9jb250ZXh0X3NldF9wcm9j ZXNzX21vZGVsKHdlYmtpdF93ZWJfY29udGV4dF9nZXRfZGVmYXVsdCgpLAotICAgICAgICAgICAg V0VCS0lUX1BST0NFU1NfTU9ERUxfT05FX1NFQ09OREFSWV9QUk9DRVNTX1BFUl9XRUJfVklFVyk7 CisgICAgICAgICAgICBXRUJLSVRfUFJPQ0VTU19NT0RFTF9NVUxUSVBMRV9TRUNPTkRBUllfUFJP Q0VTU0VTKTsKICAgICB9CiAKICAgICBHT3B0aW9uQ29udGV4dCAqY29udGV4dCA9IGdfb3B0aW9u X2NvbnRleHRfbmV3KE5VTEwpOwpkaWZmIC0tZ2l0IGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0 cy9XZWJLaXQyR3RrL1Rlc3RNdWx0aXByb2Nlc3MuY3BwIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9U ZXN0cy9XZWJLaXQyR3RrL1Rlc3RNdWx0aXByb2Nlc3MuY3BwCmluZGV4IDE2YmNiNDU4MmViOGU3 OTMzOGIyNjcxNGZjNGQ3MGU2ZTdhYjgyZjguLjBkYWQ1ZGNmZTA0MzllNTIwOGRhODQ0MWU0YzM3 OWIwNzI2YmZiNzMgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0 Mkd0ay9UZXN0TXVsdGlwcm9jZXNzLmNwcAorKysgYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3Rz L1dlYktpdDJHdGsvVGVzdE11bHRpcHJvY2Vzcy5jcHAKQEAgLTEyMiwxMSArMTIyLDExIEBAIHZv aWQgYmVmb3JlQWxsKCkKICAgICAgICAgPT0sIFdFQktJVF9QUk9DRVNTX01PREVMX1NIQVJFRF9T RUNPTkRBUllfUFJPQ0VTUyk7CiAKICAgICB3ZWJraXRfd2ViX2NvbnRleHRfc2V0X3Byb2Nlc3Nf bW9kZWwod2Via2l0X3dlYl9jb250ZXh0X2dldF9kZWZhdWx0KCksCi0gICAgICAgIFdFQktJVF9Q Uk9DRVNTX01PREVMX09ORV9TRUNPTkRBUllfUFJPQ0VTU19QRVJfV0VCX1ZJRVcpOworICAgICAg ICBXRUJLSVRfUFJPQ0VTU19NT0RFTF9NVUxUSVBMRV9TRUNPTkRBUllfUFJPQ0VTU0VTKTsKIAog ICAgIC8vIENoZWNrIHRoYXQgdGhlIGdldHRlciByZXR1cm5zIHRoZSBuZXdseS1zZXQgdmFsdWUK ICAgICBnX2Fzc2VydF9jbXB1aW50KHdlYmtpdF93ZWJfY29udGV4dF9nZXRfcHJvY2Vzc19tb2Rl bCh3ZWJraXRfd2ViX2NvbnRleHRfZ2V0X2RlZmF1bHQoKSksCi0gICAgICAgID09LCBXRUJLSVRf UFJPQ0VTU19NT0RFTF9PTkVfU0VDT05EQVJZX1BST0NFU1NfUEVSX1dFQl9WSUVXKTsKKyAgICAg ICAgPT0sIFdFQktJVF9QUk9DRVNTX01PREVMX01VTFRJUExFX1NFQ09OREFSWV9QUk9DRVNTRVMp OwogCiAgICAgYnVzID0gbmV3IFdlYktpdFRlc3RCdXMoKTsKICAgICBpZiAoIWJ1cy0+cnVuKCkp Cg== 223496 2014-02-07 14:03:50 -0800 2014-02-08 00:20:27 -0800 Patch bug-128389-20140208000431.patch text/plain 10325 aperez U3VidmVyc2lvbiBSZXZpc2lvbjogMTYzNjQyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggNDhiMDRkMjczOWFmZGQz M2RjNTA2NGY3YTZiZWI4MWM4ZjAwZTJjYS4uOGIwNzI4NjNhNjJjOWEyMjI2NjRhY2I1OTM2MzA5 ZjI4ODQ0NWM5YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDE0LTAyLTA3ICBBZHJp YW4gUGVyZXogZGUgQ2FzdHJvICA8YXBlcmV6QGlnYWxpYS5jb20+CisKKyAgICAgICAgW0dUS10g TWFrZSBwcm9jZXNzIG1vZGVsIG5hbWVzIHByb3Blcmx5IG1lYW5pbmdmdWwKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyODM4OQorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoZSBuYW1lIFdFQktJVF9QUk9D RVNTX01PREVMX09ORV9TRUNPTkRBUllfUFJPQ0VTU19QRVJfV0VCX1ZJRVcKKyAgICAgICAgaXMg bWlzbGVhZGluZyBiZWNhdXNlIHRoZXJlIGFyZSBzaXR1YXRpb25zIGluIHdoaWNoIHdlYiB2aWV3 cyBtYXkKKyAgICAgICAgc2hhcmUgdGhlIHNhbWUgd2ViIHByb2Nlc3MgZXZlbiB3aGVuIG11bHRp LXByb2Nlc3MgbW9kZSBpcyBlbmFibGVkOworICAgICAgICBmb3IgZXhhbXBsZSB3aGVuIG9wZW5p bmcgYSByZWxhdGVkIHZpZXcgYW5kIGJvdGggaW50ZXJhY3QgdXNpbmcgSlMuCisKKyAgICAgICAg KiBVSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJDb250ZXh0LmNwcDoKKyAgICAgICAgKHdlYmtp dF93ZWJfY29udGV4dF9zZXRfcHJvY2Vzc19tb2RlbCk6CisgICAgICAgICh3ZWJraXRfd2ViX2Nv bnRleHRfZ2V0X3Byb2Nlc3NfbW9kZWwpOgorICAgICAgICBVcGRhdGUgbmFtZXMgb2YgV2ViS2l0 UHJvY2Vzc01vZGVsIGVudW0gdmFsdWVzLgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZ3RrL1dl YktpdFdlYkNvbnRleHQuaDoKKyAgICAgICAgRGl0dG8uCisKIDIwMTQtMDItMDcgIFRpbSBIb3J0 b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CiAKICAgICAgICAgUmVuYW1lIFZpZXdHZXN0 dXJlQ29udHJvbGxlci5tbSB0byBWaWV3R2VzdHVyZUNvbnRyb2xsZXJNYWMubW0KZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYkNvbnRleHQuY3Bw IGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0V2ViQ29udGV4dC5jcHAK aW5kZXggZDVkNjAxOTMyMjkyM2EyYmZkNWU1NGEyODE5NmM5YmNkOWM3NDY5Zi4uZmU2MjZjNDlm MDdhZGFmNDhiZGI4MTA1NGY4NjJlNzkwMTY4MTlkNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0V2ViQ29udGV4dC5jcHAKKysrIGIvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0V2ViQ29udGV4dC5jcHAKQEAgLTE2Myw5ICsx NjMsNiBAQCBzdHJ1Y3QgX1dlYktpdFdlYkNvbnRleHRQcml2YXRlIHsKIAogc3RhdGljIGd1aW50 IHNpZ25hbHNbTEFTVF9TSUdOQUxdID0geyAwLCB9OwogCi1DT01QSUxFX0FTU0VSVF9NQVRDSElO R19FTlVNKFdFQktJVF9QUk9DRVNTX01PREVMX1NIQVJFRF9TRUNPTkRBUllfUFJPQ0VTUywgUHJv Y2Vzc01vZGVsU2hhcmVkU2Vjb25kYXJ5UHJvY2Vzcyk7Ci1DT01QSUxFX0FTU0VSVF9NQVRDSElO R19FTlVNKFdFQktJVF9QUk9DRVNTX01PREVMX09ORV9TRUNPTkRBUllfUFJPQ0VTU19QRVJfV0VC X1ZJRVcsIFByb2Nlc3NNb2RlbE11bHRpcGxlU2Vjb25kYXJ5UHJvY2Vzc2VzKTsKLQogV0VCS0lU X0RFRklORV9UWVBFKFdlYktpdFdlYkNvbnRleHQsIHdlYmtpdF93ZWJfY29udGV4dCwgR19UWVBF X09CSkVDVCkKIAogc3RhdGljIHZvaWQgd2Via2l0X3dlYl9jb250ZXh0X2NsYXNzX2luaXQoV2Vi S2l0V2ViQ29udGV4dENsYXNzKiB3ZWJDb250ZXh0Q2xhc3MpCkBAIC04OTgsMTUgKzg5NSwxOSBA QCB2b2lkIHdlYmtpdF93ZWJfY29udGV4dF9hbGxvd190bHNfY2VydGlmaWNhdGVfZm9yX2hvc3Qo V2ViS2l0V2ViQ29udGV4dCogY29udGV4dAogICogZGV0ZXJtaW5lIGhvdyBhdXhpbGlhcnkgcHJv Y2Vzc2VzIGFyZSBoYW5kbGVkLiBUaGUgZGVmYXVsdCBzZXR0aW5nCiAgKiAoJVdFQktJVF9QUk9D RVNTX01PREVMX1NIQVJFRF9TRUNPTkRBUllfUFJPQ0VTUykgaXMgc3VpdGFibGUgZm9yIG1vc3QK ICAqIGFwcGxpY2F0aW9ucyB3aGljaCBlbWJlZCBhIHNtYWxsIGFtb3VudCBvZiBXZWJWaWV3cywg b3IgYXJlIHVzZWQgdG8KLSAqIGRpc3BsYXkgZG9jdW1lbnRzIHdoaWNoIGFyZSBjb25zaWRlcmVk IHNhZmUgLS0gbGlrZSBsb2NhbCBmaWxlcy4KKyAqIGRpc3BsYXkgZG9jdW1lbnRzIHdoaWNoIGFy ZSBjb25zaWRlcmVkIHNhZmUg4oCUIGxpa2UgbG9jYWwgZmlsZXMuCiAgKgotICogQXBwbGljYXRp b25zIHdoaWNoIG1heSBwb3RlbnRpYWxseSB1c2UgYSBsYXJnZSBhbW91bnQgb2YgV2ViVmlld3Mg LS1mb3IKLSAqIGV4YW1wbGUgYSBtdWx0aS10YWJiZWQgd2ViIGJyb3dzZXItLSBtYXkgd2FudCB0 byB1c2UKLSAqICVXRUJLSVRfUFJPQ0VTU19NT0RFTF9PTkVfU0VDT05EQVJZX1BST0NFU1NfUEVS X1dFQl9WSUVXIHRvIHVzZSBvbmUKLSAqIHByb2Nlc3MgcGVyIHZpZXcuIFVzaW5nIHRoaXMgbW9k ZWwsIHdoZW4gYSBXZWJWaWV3IGhhbmdzIG9yIGNyYXNoZXMsCi0gKiB0aGUgcmVzdCBvZiB0aGUg V2ViVmlld3MgaW4gdGhlIGFwcGxpY2F0aW9uIHdpbGwgc3RpbGwgd29yayBub3JtYWxseS4KKyAq IEFwcGxpY2F0aW9ucyB3aGljaCBtYXkgcG90ZW50aWFsbHkgdXNlIGEgbGFyZ2UgYW1vdW50IG9m IFdlYlZpZXdzCisgKiDigJRmb3IgZXhhbXBsZSBhIG11bHRpLXRhYmJlZCB3ZWIgYnJvd3NlcuKA lCBtYXkgd2FudCB0byB1c2UKKyAqICVXRUJLSVRfUFJPQ0VTU19NT0RFTF9NVUxUSVBMRV9TRUNP TkRBUllfUFJPQ0VTU0VTLCB3aGljaCB3aWxsIHVzZQorICogb25lIHByb2Nlc3MgcGVyIHZpZXcg bW9zdCBvZiB0aGUgdGltZSwgd2hpbGUgc3RpbGwgYWxsb3dpbmcgZm9yIHdlYgorICogdmlld3Mg dG8gc2hhcmUgYSBwcm9jZXNzIHdoZW4gbmVlZGVkIChmb3IgZXhhbXBsZSB3aGVuIGRpZmZlcmVu dAorICogdmlld3MgaW50ZXJhY3Qgd2l0aCBlYWNoIG90aGVyKS4gVXNpbmcgdGhpcyBtb2RlbCwg d2hlbiBhIHByb2Nlc3MKKyAqIGhhbmdzIG9yIGNyYXNoZXMsIG9ubHkgdGhlIFdlYlZpZXdzIHVz aW5nIGl0IHN0b3Agd29ya2luZywgd2hpbGUKKyAqIHRoZSByZXN0IG9mIHRoZSBXZWJWaWV3cyBp biB0aGUgYXBwbGljYXRpb24gd2lsbCBzdGlsbCBmdW5jdGlvbgorICogbm9ybWFsbHkuCiAgKgot ICogVGhpcyBtZXRob2QgPHN0cm9uZz5tdXN0IGJlIGNhbGxlZCBiZWZvcmUgYW55IG90aGVyIGZ1 bmN0aW9uczwvc3Ryb25nPiwKKyAqIFRoaXMgbWV0aG9kICoqbXVzdCBiZSBjYWxsZWQgYmVmb3Jl IGFueSBvdGhlciBmdW5jdGlvbnMqKiwKICAqIGFzIGVhcmx5IGFzIHBvc3NpYmxlIGluIHlvdXIg YXBwbGljYXRpb24uIENhbGxpbmcgaXQgbGF0ZXIgd2lsbCBtYWtlCiAgKiB5b3VyIGFwcGxpY2F0 aW9uIGNyYXNoLgogICoKQEAgLTkxNiwxMCArOTE3LDI0IEBAIHZvaWQgd2Via2l0X3dlYl9jb250 ZXh0X3NldF9wcm9jZXNzX21vZGVsKFdlYktpdFdlYkNvbnRleHQqIGNvbnRleHQsIFdlYktpdFBy b2NlCiB7CiAgICAgZ19yZXR1cm5faWZfZmFpbChXRUJLSVRfSVNfV0VCX0NPTlRFWFQoY29udGV4 dCkpOwogCi0gICAgaWYgKHByb2Nlc3NNb2RlbCAhPSBjb250ZXh0LT5wcml2LT5jb250ZXh0LT5w cm9jZXNzTW9kZWwoKSkgewotICAgICAgICBjb250ZXh0LT5wcml2LT5jb250ZXh0LT5zZXRVc2Vz TmV0d29ya1Byb2Nlc3MocHJvY2Vzc01vZGVsID09IFByb2Nlc3NNb2RlbE11bHRpcGxlU2Vjb25k YXJ5UHJvY2Vzc2VzKTsKLSAgICAgICAgY29udGV4dC0+cHJpdi0+Y29udGV4dC0+c2V0UHJvY2Vz c01vZGVsKHN0YXRpY19jYXN0PFByb2Nlc3NNb2RlbD4ocHJvY2Vzc01vZGVsKSk7CisgICAgUHJv Y2Vzc01vZGVsIG5ld1Byb2Nlc3NNb2RlbDsKKworICAgIHN3aXRjaCAocHJvY2Vzc01vZGVsKSB7 CisgICAgY2FzZSBXRUJLSVRfUFJPQ0VTU19NT0RFTF9TSEFSRURfU0VDT05EQVJZX1BST0NFU1M6 CisgICAgICAgIG5ld1Byb2Nlc3NNb2RlbCA9IFByb2Nlc3NNb2RlbFNoYXJlZFNlY29uZGFyeVBy b2Nlc3M7CisgICAgICAgIGJyZWFrOworICAgIGNhc2UgV0VCS0lUX1BST0NFU1NfTU9ERUxfTVVM VElQTEVfU0VDT05EQVJZX1BST0NFU1NFUzoKKyAgICAgICAgbmV3UHJvY2Vzc01vZGVsID0gUHJv Y2Vzc01vZGVsTXVsdGlwbGVTZWNvbmRhcnlQcm9jZXNzZXM7CisgICAgICAgIGJyZWFrOworICAg IGRlZmF1bHQ6CisgICAgICAgIGdfYXNzZXJ0X25vdF9yZWFjaGVkKCk7CiAgICAgfQorCisgICAg aWYgKG5ld1Byb2Nlc3NNb2RlbCA9PSBjb250ZXh0LT5wcml2LT5jb250ZXh0LT5wcm9jZXNzTW9k ZWwoKSkKKyAgICAgICAgcmV0dXJuOworCisgICAgY29udGV4dC0+cHJpdi0+Y29udGV4dC0+c2V0 VXNlc05ldHdvcmtQcm9jZXNzKG5ld1Byb2Nlc3NNb2RlbCA9PSBQcm9jZXNzTW9kZWxNdWx0aXBs ZVNlY29uZGFyeVByb2Nlc3Nlcyk7CisgICAgY29udGV4dC0+cHJpdi0+Y29udGV4dC0+c2V0UHJv Y2Vzc01vZGVsKG5ld1Byb2Nlc3NNb2RlbCk7CiB9CiAKIC8qKgpAQCAtOTM2LDcgKzk1MSwxNSBA QCB2b2lkIHdlYmtpdF93ZWJfY29udGV4dF9zZXRfcHJvY2Vzc19tb2RlbChXZWJLaXRXZWJDb250 ZXh0KiBjb250ZXh0LCBXZWJLaXRQcm9jZQogV2ViS2l0UHJvY2Vzc01vZGVsIHdlYmtpdF93ZWJf Y29udGV4dF9nZXRfcHJvY2Vzc19tb2RlbChXZWJLaXRXZWJDb250ZXh0KiBjb250ZXh0KQogewog ICAgIGdfcmV0dXJuX3ZhbF9pZl9mYWlsKFdFQktJVF9JU19XRUJfQ09OVEVYVChjb250ZXh0KSwg V0VCS0lUX1BST0NFU1NfTU9ERUxfU0hBUkVEX1NFQ09OREFSWV9QUk9DRVNTKTsKLSAgICByZXR1 cm4gc3RhdGljX2Nhc3Q8V2ViS2l0UHJvY2Vzc01vZGVsPihjb250ZXh0LT5wcml2LT5jb250ZXh0 LT5wcm9jZXNzTW9kZWwoKSk7CisKKyAgICBzd2l0Y2ggKGNvbnRleHQtPnByaXYtPmNvbnRleHQt PnByb2Nlc3NNb2RlbCgpKSB7CisgICAgY2FzZSBQcm9jZXNzTW9kZWxTaGFyZWRTZWNvbmRhcnlQ cm9jZXNzOgorICAgICAgICByZXR1cm4gV0VCS0lUX1BST0NFU1NfTU9ERUxfU0hBUkVEX1NFQ09O REFSWV9QUk9DRVNTOworICAgIGNhc2UgUHJvY2Vzc01vZGVsTXVsdGlwbGVTZWNvbmRhcnlQcm9j ZXNzZXM6CisgICAgICAgIHJldHVybiBXRUJLSVRfUFJPQ0VTU19NT0RFTF9NVUxUSVBMRV9TRUNP TkRBUllfUFJPQ0VTU0VTOworICAgIGRlZmF1bHQ6CisgICAgICAgIGdfYXNzZXJ0X25vdF9yZWFj aGVkKCk7CisgICAgfQogfQogCiBXZWJLaXREb3dubG9hZCogd2Via2l0V2ViQ29udGV4dEdldE9y Q3JlYXRlRG93bmxvYWQoRG93bmxvYWRQcm94eSogZG93bmxvYWRQcm94eSkKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYkNvbnRleHQuaCBiL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYkNvbnRleHQuaAppbmRleCBk M2UxMmIzNTUwNDZkN2M4ZTVmYjJiNmRhOGNiYTc0NDliNGJmOWM0Li4zY2UyODFiOWIxMDNhNzI3 OTQyNmY5ODIzNTUwYTNjYTUxOGVmNTM2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJDb250ZXh0LmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL0FQSS9ndGsvV2ViS2l0V2ViQ29udGV4dC5oCkBAIC02OSwxMyArNjksMTUgQEAgdHlw ZWRlZiBlbnVtIHsKICAqICAgI1dlYktpdFdlYlZpZXcgaW5zdGFuY2VzIGNyZWF0ZWQgYnkgdGhl IGFwcGxpY2F0aW9uOiBpZiB0aGUgcHJvY2VzcwogICogICBoYW5ncyBvciBjcmFzaGVzIGFsbCB0 aGUgd2ViIHZpZXdzIGluIHRoZSBhcHBsaWNhdGlvbiB3aWxsIGJlIGFmZmVjdGVkLgogICogICBU aGlzIGlzIHRoZSBkZWZhdWx0IHByb2Nlc3MgbW9kZWwsIGFuZCBpdCBzaG91bGQgc3VmZmljZSBm b3IgbW9zdCBjYXNlcy4KLSAqIEBXRUJLSVRfUFJPQ0VTU19NT0RFTF9PTkVfU0VDT05EQVJZX1BS T0NFU1NfUEVSX1dFQl9WSUVXOiBVc2Ugb25lIHByb2Nlc3MKLSAqICAgZm9yIGVhY2ggI1dlYktp dFdlYlZpZXcuIFRoZSBtYWluIGFkdmFudGFnZSBvZiB0aGlzIHByb2Nlc3MgbW9kZWwgaXMgdGhh dAotICogICB0aGUgcmVuZGVyaW5nIHByb2Nlc3MgZm9yIGEgd2ViIHZpZXcgY2FuIGNyYXNoIHdo aWxlIHRoZSByZXN0IG9mIHRoZQotICogICB2aWV3cyBrZWVwIHdvcmtpbmcgbm9ybWFsbHkuIFRo aXMgcHJvY2VzcyBtb2RlbCBpcyBpbmRpY2F0ZWQgZm9yCi0gKiAgIGFwcGxpY2F0aW9ucyB3aGlj aCBtYXkgdXNlIGEgbnVtYmVyIG9mIHdlYiB2aWV3cyBhbmQgdGhlIGNvbnRlbnQgb2YKLSAqICAg aW4gZWFjaCBtdXN0IG5vdCBpbnRlcmZlcmUgd2l0aCB0aGUgcmVzdCAtLSBmb3IgZXhhbXBsZSBh IGZ1bGwtZmxlZGdlZAotICogICB3ZWIgYnJvd3NlciB3aXRoIHN1cHBvcnQgZm9yIG11bHRpcGxl IHRhYnMuCisgKiBAV0VCS0lUX1BST0NFU1NfTU9ERUxfTVVMVElQTEVfU0VDT05EQVJZX1BST0NF U1NFUzogVXNlIG9uZSBwcm9jZXNzCisgKiAgIGZvciBlYWNoICNXZWJLaXRXZWJWaWV3LCB3aGls ZSBzdGlsbCBhbGxvd2luZyBmb3Igc29tZSBvZiB0aGVtIHRvCisgKiAgIHNoYXJlIGEgcHJvY2Vz cyBpbiBjZXJ0YWluIHNpdHVhdGlvbnMuIFRoZSBtYWluIGFkdmFudGFnZQorICogICBvZiB0aGlz IHByb2Nlc3MgbW9kZWwgaXMgdGhhdCB0aGUgcmVuZGVyaW5nIHByb2Nlc3MgZm9yIGEgd2ViIHZp ZXcKKyAqICAgY2FuIGNyYXNoIHdoaWxlIHRoZSByZXN0IG9mIHRoZSB2aWV3cyBrZWVwIHdvcmtp bmcgbm9ybWFsbHkuIFRoaXMKKyAqICAgcHJvY2VzcyBtb2RlbCBpcyBpbmRpY2F0ZWQgZm9yIGFw cGxpY2F0aW9ucyB3aGljaCBtYXkgdXNlIGEgbnVtYmVyCisgKiAgIG9mIHdlYiB2aWV3cyBhbmQg dGhlIGNvbnRlbnQgb2YgaW4gZWFjaCBtdXN0IG5vdCBpbnRlcmZlcmUgd2l0aCB0aGUKKyAqICAg cmVzdCDigJQgZm9yIGV4YW1wbGUgYSBmdWxsLWZsZWRnZWQgd2ViIGJyb3dzZXIgd2l0aCBzdXBw b3J0IGZvcgorICogICBtdWx0aXBsZSB0YWJzLgogICoKICAqIEVudW0gdmFsdWVzIHVzZWQgZm9y IGRldGVybWluaW5nIHRoZSAjV2ViS2l0V2ViQ29udGV4dCBwcm9jZXNzIG1vZGVsLgogICoKQEAg LTgzLDcgKzg1LDcgQEAgdHlwZWRlZiBlbnVtIHsKICAqLwogdHlwZWRlZiBlbnVtIHsKICAgICBX RUJLSVRfUFJPQ0VTU19NT0RFTF9TSEFSRURfU0VDT05EQVJZX1BST0NFU1MsCi0gICAgV0VCS0lU X1BST0NFU1NfTU9ERUxfT05FX1NFQ09OREFSWV9QUk9DRVNTX1BFUl9XRUJfVklFVywKKyAgICBX RUJLSVRfUFJPQ0VTU19NT0RFTF9NVUxUSVBMRV9TRUNPTkRBUllfUFJPQ0VTU0VTLAogfSBXZWJL aXRQcm9jZXNzTW9kZWw7CiAKIC8qKgpkaWZmIC0tZ2l0IGEvVG9vbHMvQ2hhbmdlTG9nIGIvVG9v bHMvQ2hhbmdlTG9nCmluZGV4IDY3ZTY0ODcwMmRhYTlmNWMzMDkxNjcwNjgxNzk4ZDU3NGRhY2Fk ODEuLjc3YjQ5MTVjMTdmY2MwN2JkZWQwZTQwYjQ1MmJiZDk0ZGJjMjUxMTEgMTAwNjQ0Ci0tLSBh L1Rvb2xzL0NoYW5nZUxvZworKysgYi9Ub29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMiBAQAor MjAxNC0wMi0wNyAgQWRyaWFuIFBlcmV6IGRlIENhc3RybyAgPGFwZXJlekBpZ2FsaWEuY29tPgor CisgICAgICAgIFtHVEtdIE1ha2UgcHJvY2VzcyBtb2RlbCBuYW1lcyBwcm9wZXJseSBtZWFuaW5n ZnVsCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjgz ODkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGUg bmFtZSBXRUJLSVRfUFJPQ0VTU19NT0RFTF9PTkVfU0VDT05EQVJZX1BST0NFU1NfUEVSX1dFQl9W SUVXCisgICAgICAgIGlzIG1pc2xlYWRpbmcgYmVjYXVzZSB0aGVyZSBhcmUgc2l0dWF0aW9ucyBp biB3aGljaCB3ZWIgdmlld3MgbWF5CisgICAgICAgIHNoYXJlIHRoZSBzYW1lIHdlYiBwcm9jZXNz IGV2ZW4gd2hlbiBtdWx0aS1wcm9jZXNzIG1vZGUgaXMgZW5hYmxlZDsKKyAgICAgICAgZm9yIGV4 YW1wbGUgd2hlbiBvcGVuaW5nIGEgcmVsYXRlZCB2aWV3IGFuZCBib3RoIGludGVyYWN0IHVzaW5n IEpTLgorCisgICAgICAgICogTWluaUJyb3dzZXIvZ3RrL21haW4uYzoKKyAgICAgICAgKG1haW4p OgorICAgICAgICBVcGRhdGUgdXNhZ2Ugb2YgV2ViS2l0UHJvY2Vzc01vZGVsIGVudW0gdmFsdWVz LgorICAgICAgICAqIFRlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Mkd0ay9UZXN0TXVsdGlwcm9j ZXNzLmNwcDoKKyAgICAgICAgKGJlZm9yZUFsbCk6CisgICAgICAgIERpdHRvLgorCiAyMDE0LTAy LTA3ICBLcnp5c3p0b2YgQ3plY2ggIDxrLmN6ZWNoQHNhbXN1bmcuY29tPgogCiAgICAgICAgIEJ1 aWxkIGZpeCBhZnRlciByMTYzNjMyCmRpZmYgLS1naXQgYS9Ub29scy9NaW5pQnJvd3Nlci9ndGsv bWFpbi5jIGIvVG9vbHMvTWluaUJyb3dzZXIvZ3RrL21haW4uYwppbmRleCA5MjgzNjA1MzFjODlh MGRjMjBmM2FiZTVlMzIyMmFhZTk3MTc5YmJkLi5mNjlhNGY2NGJiMjU0MzI4ZGFkNWRkOGFkNGZj MThmODVhMjU0YjAzIDEwMDY0NAotLS0gYS9Ub29scy9NaW5pQnJvd3Nlci9ndGsvbWFpbi5jCisr KyBiL1Rvb2xzL01pbmlCcm93c2VyL2d0ay9tYWluLmMKQEAgLTI0NCw3ICsyNDQsNyBAQCBpbnQg bWFpbihpbnQgYXJnYywgY2hhciAqYXJndltdKQogICAgIGNvbnN0IGdjaGFyICptdWx0aXByb2Nl c3MgPSBnX2dldGVudigiTUlOSUJST1dTRVJfTVVMVElQUk9DRVNTIik7CiAgICAgaWYgKG11bHRp cHJvY2VzcyAmJiAqbXVsdGlwcm9jZXNzKSB7CiAgICAgICAgIHdlYmtpdF93ZWJfY29udGV4dF9z ZXRfcHJvY2Vzc19tb2RlbCh3ZWJraXRfd2ViX2NvbnRleHRfZ2V0X2RlZmF1bHQoKSwKLSAgICAg ICAgICAgIFdFQktJVF9QUk9DRVNTX01PREVMX09ORV9TRUNPTkRBUllfUFJPQ0VTU19QRVJfV0VC X1ZJRVcpOworICAgICAgICAgICAgV0VCS0lUX1BST0NFU1NfTU9ERUxfTVVMVElQTEVfU0VDT05E QVJZX1BST0NFU1NFUyk7CiAgICAgfQogCiAgICAgR09wdGlvbkNvbnRleHQgKmNvbnRleHQgPSBn X29wdGlvbl9jb250ZXh0X25ldyhOVUxMKTsKZGlmZiAtLWdpdCBhL1Rvb2xzL1Rlc3RXZWJLaXRB UEkvVGVzdHMvV2ViS2l0Mkd0ay9UZXN0TXVsdGlwcm9jZXNzLmNwcCBiL1Rvb2xzL1Rlc3RXZWJL aXRBUEkvVGVzdHMvV2ViS2l0Mkd0ay9UZXN0TXVsdGlwcm9jZXNzLmNwcAppbmRleCAxNmJjYjQ1 ODJlYjhlNzkzMzhiMjY3MTRmYzRkNzBlNmU3YWI4MmY4Li4wZGFkNWRjZmUwNDM5ZTUyMDhkYTg0 NDFlNGMzNzliMDcyNmJmYjczIDEwMDY0NAotLS0gYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3Rz L1dlYktpdDJHdGsvVGVzdE11bHRpcHJvY2Vzcy5jcHAKKysrIGIvVG9vbHMvVGVzdFdlYktpdEFQ SS9UZXN0cy9XZWJLaXQyR3RrL1Rlc3RNdWx0aXByb2Nlc3MuY3BwCkBAIC0xMjIsMTEgKzEyMiwx MSBAQCB2b2lkIGJlZm9yZUFsbCgpCiAgICAgICAgID09LCBXRUJLSVRfUFJPQ0VTU19NT0RFTF9T SEFSRURfU0VDT05EQVJZX1BST0NFU1MpOwogCiAgICAgd2Via2l0X3dlYl9jb250ZXh0X3NldF9w cm9jZXNzX21vZGVsKHdlYmtpdF93ZWJfY29udGV4dF9nZXRfZGVmYXVsdCgpLAotICAgICAgICBX RUJLSVRfUFJPQ0VTU19NT0RFTF9PTkVfU0VDT05EQVJZX1BST0NFU1NfUEVSX1dFQl9WSUVXKTsK KyAgICAgICAgV0VCS0lUX1BST0NFU1NfTU9ERUxfTVVMVElQTEVfU0VDT05EQVJZX1BST0NFU1NF Uyk7CiAKICAgICAvLyBDaGVjayB0aGF0IHRoZSBnZXR0ZXIgcmV0dXJucyB0aGUgbmV3bHktc2V0 IHZhbHVlCiAgICAgZ19hc3NlcnRfY21wdWludCh3ZWJraXRfd2ViX2NvbnRleHRfZ2V0X3Byb2Nl c3NfbW9kZWwod2Via2l0X3dlYl9jb250ZXh0X2dldF9kZWZhdWx0KCkpLAotICAgICAgICA9PSwg V0VCS0lUX1BST0NFU1NfTU9ERUxfT05FX1NFQ09OREFSWV9QUk9DRVNTX1BFUl9XRUJfVklFVyk7 CisgICAgICAgID09LCBXRUJLSVRfUFJPQ0VTU19NT0RFTF9NVUxUSVBMRV9TRUNPTkRBUllfUFJP Q0VTU0VTKTsKIAogICAgIGJ1cyA9IG5ldyBXZWJLaXRUZXN0QnVzKCk7CiAgICAgaWYgKCFidXMt PnJ1bigpKQo=