138828 2014-11-18 03:17:57 -0800 [GTK] Add API to override the default local storage directory 2014-11-23 23:23:52 -0800 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED Gtk P2 Normal --- 138826 1 cgarcia webkit-unassigned berto commit-queue gustavo mrobinson oldest_to_newest 1049442 0 cgarcia 2014-11-18 03:17:57 -0800 It's currently not possible to override the default local storage directory, so that all webkitgtk applications are storing the local storage data in the same directory. This is particularly problematic for private instances like incognito mode. See https://bugzilla.gnome.org/show_bug.cgi?id=738720. This depends on bug #138826, since the local storage directory path is a construct only configuration, it's not possible to override that for the default web context. 1049444 1 241778 cgarcia 2014-11-18 03:22:05 -0800 Created attachment 241778 Patch 1049471 2 241787 cgarcia 2014-11-18 06:39:31 -0800 Created attachment 241787 It should apply now 1049473 3 commit-queue 2014-11-18 06:42:21 -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 1050432 4 241787 gustavo 2014-11-21 05:31:54 -0800 Comment on attachment 241787 It should apply now View in context: https://bugs.webkit.org/attachment.cgi?id=241787&action=review So no convenience _new? I think that is ok, but worth noting so you can consider =) > Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.cpp:255 > + WebKitWebContext* webContext = WEBKIT_WEB_CONTEXT(object); > + WebKitWebContextPrivate* priv = webContext->priv; It doesn't hurt my eyes, but this should move to before the priv->localStorageDictory.isNull check in theory. > Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitWebContext.cpp:42 > + // Local Sorage Directory. This doesn't add much information, I'd do away with it - the variable name is enough documentation. 1050811 5 cgarcia 2014-11-23 23:23:52 -0800 Committed r176512: <http://trac.webkit.org/changeset/176512> 241778 2014-11-18 03:22:05 -0800 2014-11-18 06:39:31 -0800 Patch wk2-local-storage-directory.diff text/plain 8255 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCA4ODMzYTBlLi5mZjhlMWE2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMjEg QEAKIDIwMTQtMTEtMTggIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29t PgogCisgICAgICAgIFtHVEtdIEFkZCBBUEkgdG8gb3ZlcnJpZGUgdGhlIGRlZmF1bHQgbG9jYWwg c3RvcmFnZSBkaXJlY3RvcnkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTEzODgyOAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIEFkZCBXZWJLaXRXZWJDb250ZXh0OmxvY2FsLXN0b3JhZ2UtZGlyZWN0b3J5IGNv bnN0cnVjdC1vbmx5CisgICAgICAgIHByb3BlcnR5LiBJZiBub3QgcHJvdmlkZWQgdGhlIGRlZmF1 bHQgd2lsbCBiZSB1c2VkLgorCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0V2Vi Q29udGV4dC5jcHA6CisgICAgICAgICh3ZWJraXRXZWJDb250ZXh0R2V0UHJvcGVydHkpOgorICAg ICAgICAod2Via2l0V2ViQ29udGV4dFNldFByb3BlcnR5KToKKyAgICAgICAgKHdlYmtpdFdlYkNv bnRleHRDb25zdHJ1Y3RlZCk6CisgICAgICAgICh3ZWJraXRfd2ViX2NvbnRleHRfY2xhc3NfaW5p dCk6CisKKzIwMTQtMTEtMTggIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEu Y29tPgorCiAgICAgICAgIFtHVEtdIEFkZCBBUEkgdG8gY3JlYXRlIGEgV2ViS2l0V2ViQ29udGV4 dAogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTM4ODI2 CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdl YkNvbnRleHQuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0V2Vi Q29udGV4dC5jcHAKaW5kZXggZDIwM2Q3Yi4uZjkxOTcyYiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0V2ViQ29udGV4dC5jcHAKKysrIGIvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0V2ViQ29udGV4dC5jcHAKQEAgLTQ4LDYg KzQ4LDcgQEAKICNpbmNsdWRlIDxXZWJDb3JlL0ZpbGVTeXN0ZW0uaD4KICNpbmNsdWRlIDxXZWJD b3JlL0ljb25EYXRhYmFzZS5oPgogI2luY2x1ZGUgPFdlYkNvcmUvTGFuZ3VhZ2UuaD4KKyNpbmNs dWRlIDxnbGliL2dpMThuLWxpYi5oPgogI2luY2x1ZGUgPGxpYmludGwuaD4KICNpbmNsdWRlIDxt ZW1vcnk+CiAjaW5jbHVkZSA8d3RmL0hhc2hNYXAuaD4KQEAgLTk1LDYgKzk2LDEyIEBAIHVzaW5n IG5hbWVzcGFjZSBXZWJLaXQ7CiAgKi8KIAogZW51bSB7CisgICAgUFJPUF8wLAorCisgICAgUFJP UF9MT0NBTF9TVE9SQUdFX0RJUkVDVE9SWQorfTsKKworZW51bSB7CiAgICAgRE9XTkxPQURfU1RB UlRFRCwKICAgICBJTklUSUFMSVpFX1dFQl9FWFRFTlNJT05TLAogCkBAIC0xNjksNiArMTc2LDgg QEAgc3RydWN0IF9XZWJLaXRXZWJDb250ZXh0UHJpdmF0ZSB7CiAKICAgICBDU3RyaW5nIHdlYkV4 dGVuc2lvbnNEaXJlY3Rvcnk7CiAgICAgR1JlZlB0cjxHVmFyaWFudD4gd2ViRXh0ZW5zaW9uc0lu aXRpYWxpemF0aW9uVXNlckRhdGE7CisKKyAgICBDU3RyaW5nIGxvY2FsU3RvcmFnZURpcmVjdG9y eTsKIH07CiAKIHN0YXRpYyBndWludCBzaWduYWxzW0xBU1RfU0lHTkFMXSA9IHsgMCwgfTsKQEAg LTIxMiwxNyArMjIxLDQ1IEBAIHN0YXRpYyBjb25zdCBjaGFyKiBpbmplY3RlZEJ1bmRsZURpcmVj dG9yeSgpCiAgICAgcmV0dXJuIGluamVjdGVkQnVuZGxlUGF0aDsKIH0KIAorc3RhdGljIHZvaWQg d2Via2l0V2ViQ29udGV4dEdldFByb3BlcnR5KEdPYmplY3QqIG9iamVjdCwgZ3VpbnQgcHJvcElE LCBHVmFsdWUqIHZhbHVlLCBHUGFyYW1TcGVjKiBwYXJhbVNwZWMpCit7CisgICAgV2ViS2l0V2Vi Q29udGV4dCogY29udGV4dCA9IFdFQktJVF9XRUJfQ09OVEVYVChvYmplY3QpOworCisgICAgc3dp dGNoIChwcm9wSUQpIHsKKyAgICBjYXNlIFBST1BfTE9DQUxfU1RPUkFHRV9ESVJFQ1RPUlk6Cisg ICAgICAgIGdfdmFsdWVfc2V0X3N0cmluZyh2YWx1ZSwgY29udGV4dC0+cHJpdi0+bG9jYWxTdG9y YWdlRGlyZWN0b3J5LmRhdGEoKSk7CisgICAgICAgIGJyZWFrOworICAgIGRlZmF1bHQ6CisgICAg ICAgIEdfT0JKRUNUX1dBUk5fSU5WQUxJRF9QUk9QRVJUWV9JRChvYmplY3QsIHByb3BJRCwgcGFy YW1TcGVjKTsKKyAgICB9Cit9CisKK3N0YXRpYyB2b2lkIHdlYmtpdFdlYkNvbnRleHRTZXRQcm9w ZXJ0eShHT2JqZWN0KiBvYmplY3QsIGd1aW50IHByb3BJRCwgY29uc3QgR1ZhbHVlKiB2YWx1ZSwg R1BhcmFtU3BlYyogcGFyYW1TcGVjKQoreworICAgIFdlYktpdFdlYkNvbnRleHQqIGNvbnRleHQg PSBXRUJLSVRfV0VCX0NPTlRFWFQob2JqZWN0KTsKKworICAgIHN3aXRjaCAocHJvcElEKSB7Cisg ICAgY2FzZSBQUk9QX0xPQ0FMX1NUT1JBR0VfRElSRUNUT1JZOgorICAgICAgICBjb250ZXh0LT5w cml2LT5sb2NhbFN0b3JhZ2VEaXJlY3RvcnkgPSBnX3ZhbHVlX2dldF9zdHJpbmcodmFsdWUpOwor ICAgICAgICBicmVhazsKKyAgICBkZWZhdWx0OgorICAgICAgICBHX09CSkVDVF9XQVJOX0lOVkFM SURfUFJPUEVSVFlfSUQob2JqZWN0LCBwcm9wSUQsIHBhcmFtU3BlYyk7CisgICAgfQorfQorCiBz dGF0aWMgdm9pZCB3ZWJraXRXZWJDb250ZXh0Q29uc3RydWN0ZWQoR09iamVjdCogb2JqZWN0KQog ewogICAgIEdfT0JKRUNUX0NMQVNTKHdlYmtpdF93ZWJfY29udGV4dF9wYXJlbnRfY2xhc3MpLT5j b25zdHJ1Y3RlZChvYmplY3QpOwogCisgICAgV2ViS2l0V2ViQ29udGV4dCogd2ViQ29udGV4dCA9 IFdFQktJVF9XRUJfQ09OVEVYVChvYmplY3QpOworICAgIFdlYktpdFdlYkNvbnRleHRQcml2YXRl KiBwcml2ID0gd2ViQ29udGV4dC0+cHJpdjsKICAgICBHVW5pcXVlUHRyPGNoYXI+IGJ1bmRsZUZp bGVuYW1lKGdfYnVpbGRfZmlsZW5hbWUoaW5qZWN0ZWRCdW5kbGVEaXJlY3RvcnkoKSwgImxpYndl YmtpdDJndGtpbmplY3RlZGJ1bmRsZS5zbyIsIG51bGxwdHIpKTsKICAgICBXZWJDb250ZXh0Q29u ZmlndXJhdGlvbiB3ZWJDb250ZXh0Q29uZmlndXJhdGlvbjsKICAgICB3ZWJDb250ZXh0Q29uZmln dXJhdGlvbi5pbmplY3RlZEJ1bmRsZVBhdGggPSBXZWJDb3JlOjpmaWxlbmFtZVRvU3RyaW5nKGJ1 bmRsZUZpbGVuYW1lLmdldCgpKTsKICAgICBXZWJDb250ZXh0OjphcHBseVBsYXRmb3JtU3BlY2lm aWNDb25maWd1cmF0aW9uRGVmYXVsdHMod2ViQ29udGV4dENvbmZpZ3VyYXRpb24pOworICAgIGlm ICghcHJpdi0+bG9jYWxTdG9yYWdlRGlyZWN0b3J5LmlzTnVsbCgpKQorICAgICAgICB3ZWJDb250 ZXh0Q29uZmlndXJhdGlvbi5sb2NhbFN0b3JhZ2VEaXJlY3RvcnkgPSBXZWJDb3JlOjpmaWxlbmFt ZVRvU3RyaW5nKHByaXYtPmxvY2FsU3RvcmFnZURpcmVjdG9yeS5kYXRhKCkpOwogCi0gICAgV2Vi S2l0V2ViQ29udGV4dCogd2ViQ29udGV4dCA9IFdFQktJVF9XRUJfQ09OVEVYVChvYmplY3QpOwot ICAgIFdlYktpdFdlYkNvbnRleHRQcml2YXRlKiBwcml2ID0gd2ViQ29udGV4dC0+cHJpdjsKICAg ICBwcml2LT5jb250ZXh0ID0gV2ViQ29udGV4dDo6Y3JlYXRlKFdURjo6bW92ZSh3ZWJDb250ZXh0 Q29uZmlndXJhdGlvbikpOwogCiAgICAgcHJpdi0+cmVxdWVzdE1hbmFnZXIgPSBwcml2LT5jb250 ZXh0LT5zdXBwbGVtZW50PFdlYlNvdXBDdXN0b21Qcm90b2NvbFJlcXVlc3RNYW5hZ2VyPigpOwpA QCAtMjY1LDEwICszMDIsMjkgQEAgc3RhdGljIHZvaWQgd2Via2l0X3dlYl9jb250ZXh0X2NsYXNz X2luaXQoV2ViS2l0V2ViQ29udGV4dENsYXNzKiB3ZWJDb250ZXh0Q2xhc3MKICAgICBiaW5kdGV4 dGRvbWFpbihHRVRURVhUX1BBQ0tBR0UsIFBBQ0tBR0VfTE9DQUxFX0RJUik7CiAgICAgYmluZF90 ZXh0ZG9tYWluX2NvZGVzZXQoR0VUVEVYVF9QQUNLQUdFLCAiVVRGLTgiKTsKIAorICAgIGdPYmpl Y3RDbGFzcy0+Z2V0X3Byb3BlcnR5ID0gd2Via2l0V2ViQ29udGV4dEdldFByb3BlcnR5OworICAg IGdPYmplY3RDbGFzcy0+c2V0X3Byb3BlcnR5ID0gd2Via2l0V2ViQ29udGV4dFNldFByb3BlcnR5 OwogICAgIGdPYmplY3RDbGFzcy0+Y29uc3RydWN0ZWQgPSB3ZWJraXRXZWJDb250ZXh0Q29uc3Ry dWN0ZWQ7CiAgICAgZ09iamVjdENsYXNzLT5kaXNwb3NlID0gd2Via2l0V2ViQ29udGV4dERpc3Bv c2U7CiAKICAgICAvKioKKyAgICAgKiBXZWJLaXRXZWJDb250ZXh0OmxvY2FsLXN0b3JhZ2UtZGly ZWN0b3J5OgorICAgICAqCisgICAgICogVGhlIGRpcmVjdG9yeSB3aGVyZSBsb2NhbCBzdG9yYWdl IGRhdGEgd2lsbCBiZSBzYXZlZC4KKyAgICAgKgorICAgICAqIFNpbmNlOiAyLjgKKyAgICAgKi8K KyAgICBnX29iamVjdF9jbGFzc19pbnN0YWxsX3Byb3BlcnR5KAorICAgICAgICBnT2JqZWN0Q2xh c3MsCisgICAgICAgIFBST1BfTE9DQUxfU1RPUkFHRV9ESVJFQ1RPUlksCisgICAgICAgIGdfcGFy YW1fc3BlY19zdHJpbmcoCisgICAgICAgICAgICAibG9jYWwtc3RvcmFnZS1kaXJlY3RvcnkiLAor ICAgICAgICAgICAgXygiTG9jYWwgU3RvcmFnZSBEaXJlY3RvcnkiKSwKKyAgICAgICAgICAgIF8o IlRoZSBkaXJlY3Rvcnkgd2hlcmUgbG9jYWwgc3RvcmFnZSBkYXRhIHdpbGwgYmUgc2F2ZWQiKSwK KyAgICAgICAgICAgIG51bGxwdHIsCisgICAgICAgICAgICBzdGF0aWNfY2FzdDxHUGFyYW1GbGFn cz4oV0VCS0lUX1BBUkFNX1JFQURXUklURSB8IEdfUEFSQU1fQ09OU1RSVUNUX09OTFkpKSk7CisK KyAgICAvKioKICAgICAgKiBXZWJLaXRXZWJDb250ZXh0Ojpkb3dubG9hZC1zdGFydGVkOgogICAg ICAqIEBjb250ZXh0OiB0aGUgI1dlYktpdFdlYkNvbnRleHQKICAgICAgKiBAZG93bmxvYWQ6IHRo ZSAjV2ViS2l0RG93bmxvYWQgYXNzb2NpYXRlZCB3aXRoIHRoaXMgZXZlbnQKZGlmZiAtLWdpdCBh L1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCAwNjZjZWU5Li4yMGFmZTY4 IDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0x LDUgKzEsMjIgQEAKIDIwMTQtMTEtMTggIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBp Z2FsaWEuY29tPgogCisgICAgICAgIFtHVEtdIEFkZCBBUEkgdG8gb3ZlcnJpZGUgdGhlIGRlZmF1 bHQgbG9jYWwgc3RvcmFnZSBkaXJlY3RvcnkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTEzODgyOAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIEFkZCB0ZXN0IHRvIGNoZWNrIHRoYXQgdGhlIGxvY2FsIHN0b3Jh Z2UgZGlyZWN0b3J5IGlzIGNyZWF0ZWQgYXQKKyAgICAgICAgdGhlIHBhdGggZ2l2ZW4gb24gY29u c3RydWN0aW9uLgorCisgICAgICAgICogVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXQyR3RrL1Rl c3RXZWJLaXRXZWJDb250ZXh0LmNwcDoKKyAgICAgICAgKHRlc3RXZWJDb250ZXh0Q29uZmlndXJh dGlvbik6CisgICAgICAgIChiZWZvcmVBbGwpOgorICAgICAgICAqIFRlc3RXZWJLaXRBUEkvZ3Rr L1dlYktpdDJHdGsvVGVzdE1haW4uaDoKKyAgICAgICAgKFRlc3Q6OlRlc3QpOgorICAgICAgICAo VGVzdDo6flRlc3QpOiBEZWxldGVkLgorCisyMDE0LTExLTE4ICBDYXJsb3MgR2FyY2lhIENhbXBv cyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4KKwogICAgICAgICBbR1RLXSBBZGQgQVBJIHRvIGNyZWF0 ZSBhIFdlYktpdFdlYkNvbnRleHQKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTEzODgyNgogCmRpZmYgLS1naXQgYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rl c3RzL1dlYktpdDJHdGsvVGVzdFdlYktpdFdlYkNvbnRleHQuY3BwIGIvVG9vbHMvVGVzdFdlYktp dEFQSS9UZXN0cy9XZWJLaXQyR3RrL1Rlc3RXZWJLaXRXZWJDb250ZXh0LmNwcAppbmRleCA5MTg0 YzBlLi41MjA2MjU5IDEwMDY0NAotLS0gYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktp dDJHdGsvVGVzdFdlYktpdFdlYkNvbnRleHQuY3BwCisrKyBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkv VGVzdHMvV2ViS2l0Mkd0ay9UZXN0V2ViS2l0V2ViQ29udGV4dC5jcHAKQEAgLTM3LDYgKzM3LDEz IEBAIHN0YXRpYyB2b2lkIHRlc3RXZWJDb250ZXh0RGVmYXVsdChUZXN0KiB0ZXN0LCBnY29uc3Rw b2ludGVyKQogICAgIGdfYXNzZXJ0KHdlYmtpdF93ZWJfY29udGV4dF9nZXRfZGVmYXVsdCgpICE9 IHRlc3QtPm1fd2ViQ29udGV4dC5nZXQoKSk7CiB9CiAKK3N0YXRpYyB2b2lkIHRlc3RXZWJDb250 ZXh0Q29uZmlndXJhdGlvbihXZWJWaWV3VGVzdCogdGVzdCwgZ2NvbnN0cG9pbnRlcikKK3sKKyAg ICAvLyBMb2NhbCBTb3JhZ2UgRGlyZWN0b3J5LgorICAgIEdVbmlxdWVQdHI8Y2hhcj4gbG9jYWxT dG9yYWdlRGlyZWN0b3J5KGdfYnVpbGRfZmlsZW5hbWUoVGVzdDo6ZGF0YURpcmVjdG9yeSgpLCAi bG9jYWwtc3RvcmFnZSIsIG51bGxwdHIpKTsKKyAgICBnX2Fzc2VydChnX2ZpbGVfdGVzdChsb2Nh bFN0b3JhZ2VEaXJlY3RvcnkuZ2V0KCksIEdfRklMRV9URVNUX0lTX0RJUikpOworfQorCiBjbGFz cyBQbHVnaW5zVGVzdDogcHVibGljIFRlc3QgewogcHVibGljOgogICAgIE1BS0VfR0xJQl9URVNU X0ZJWFRVUkUoUGx1Z2luc1Rlc3QpOwpAQCAtNDExLDYgKzQxOCw3IEBAIHZvaWQgYmVmb3JlQWxs KCkKICAgICBrU2VydmVyLT5ydW4oc2VydmVyQ2FsbGJhY2spOwogCiAgICAgVGVzdDo6YWRkKCJX ZWJLaXRXZWJDb250ZXh0IiwgImRlZmF1bHQtY29udGV4dCIsIHRlc3RXZWJDb250ZXh0RGVmYXVs dCk7CisgICAgV2ViVmlld1Rlc3Q6OmFkZCgiV2ViS2l0V2ViQ29udGV4dCIsICJjb25maWd1cmF0 aW9uIiwgdGVzdFdlYkNvbnRleHRDb25maWd1cmF0aW9uKTsKICAgICBQbHVnaW5zVGVzdDo6YWRk KCJXZWJLaXRXZWJDb250ZXh0IiwgImdldC1wbHVnaW5zIiwgdGVzdFdlYkNvbnRleHRHZXRQbHVn aW5zKTsKICAgICBVUklTY2hlbWVUZXN0OjphZGQoIldlYktpdFdlYkNvbnRleHQiLCAidXJpLXNj aGVtZSIsIHRlc3RXZWJDb250ZXh0VVJJU2NoZW1lKTsKICAgICBUZXN0OjphZGQoIldlYktpdFdl YkNvbnRleHQiLCAic3BlbGwtY2hlY2tlciIsIHRlc3RXZWJDb250ZXh0U3BlbGxDaGVja2VyKTsK ZGlmZiAtLWdpdCBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvZ3RrL1dlYktpdDJHdGsvVGVzdE1haW4u aCBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvZ3RrL1dlYktpdDJHdGsvVGVzdE1haW4uaAppbmRleCAz MmUzZDIxLi4wMTE4NTEwIDEwMDY0NAotLS0gYS9Ub29scy9UZXN0V2ViS2l0QVBJL2d0ay9XZWJL aXQyR3RrL1Rlc3RNYWluLmgKKysrIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9ndGsvV2ViS2l0Mkd0 ay9UZXN0TWFpbi5oCkBAIC02Niw4ICs2NiwxMCBAQCBwdWJsaWM6CiAgICAgfQogCiAgICAgVGVz dCgpCi0gICAgICAgIDogbV93ZWJDb250ZXh0KGFkb3B0R1JlZih3ZWJraXRfd2ViX2NvbnRleHRf bmV3KCkpKQogICAgIHsKKyAgICAgICAgR1VuaXF1ZVB0cjxjaGFyPiBsb2NhbFN0b3JhZ2VEaXJl Y3RvcnkoZ19idWlsZF9maWxlbmFtZShkYXRhRGlyZWN0b3J5KCksICJsb2NhbC1zdG9yYWdlIiwg bnVsbHB0cikpOworICAgICAgICBtX3dlYkNvbnRleHQgPSBhZG9wdEdSZWYoV0VCS0lUX1dFQl9D T05URVhUKGdfb2JqZWN0X25ldyhXRUJLSVRfVFlQRV9XRUJfQ09OVEVYVCwgImxvY2FsLXN0b3Jh Z2UtZGlyZWN0b3J5IiwgbG9jYWxTdG9yYWdlRGlyZWN0b3J5LmdldCgpLCBudWxscHRyKSkpOwor CiAgICAgICAgIGdfc2lnbmFsX2Nvbm5lY3QobV93ZWJDb250ZXh0LmdldCgpLCAiaW5pdGlhbGl6 ZS13ZWItZXh0ZW5zaW9ucyIsIEdfQ0FMTEJBQ0soaW5pdGlhbGl6ZVdlYkV4dGVuc2lvbnNDYWxs YmFjayksIHRoaXMpOwogICAgICAgICBHVW5pcXVlUHRyPGNoYXI+IGRpc2tDYWNoZURpcmVjdG9y eShnX2J1aWxkX2ZpbGVuYW1lKGRhdGFEaXJlY3RvcnkoKSwgImRpc2stY2FjaGUiLCBudWxscHRy KSk7CiAgICAgICAgIHdlYmtpdF93ZWJfY29udGV4dF9zZXRfZGlza19jYWNoZV9kaXJlY3Rvcnko bV93ZWJDb250ZXh0LmdldCgpLCBkaXNrQ2FjaGVEaXJlY3RvcnkuZ2V0KCkpOwo= 241787 2014-11-18 06:39:31 -0800 2014-11-21 05:31:54 -0800 It should apply now wk2-local-storage-directory.diff text/plain 8255 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCA4ODMzYTBlLi5mZjhlMWE2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMjEg QEAKIDIwMTQtMTEtMTggIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29t PgogCisgICAgICAgIFtHVEtdIEFkZCBBUEkgdG8gb3ZlcnJpZGUgdGhlIGRlZmF1bHQgbG9jYWwg c3RvcmFnZSBkaXJlY3RvcnkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTEzODgyOAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIEFkZCBXZWJLaXRXZWJDb250ZXh0OmxvY2FsLXN0b3JhZ2UtZGlyZWN0b3J5IGNv bnN0cnVjdC1vbmx5CisgICAgICAgIHByb3BlcnR5LiBJZiBub3QgcHJvdmlkZWQgdGhlIGRlZmF1 bHQgd2lsbCBiZSB1c2VkLgorCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0V2Vi Q29udGV4dC5jcHA6CisgICAgICAgICh3ZWJraXRXZWJDb250ZXh0R2V0UHJvcGVydHkpOgorICAg ICAgICAod2Via2l0V2ViQ29udGV4dFNldFByb3BlcnR5KToKKyAgICAgICAgKHdlYmtpdFdlYkNv bnRleHRDb25zdHJ1Y3RlZCk6CisgICAgICAgICh3ZWJraXRfd2ViX2NvbnRleHRfY2xhc3NfaW5p dCk6CisKKzIwMTQtMTEtMTggIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEu Y29tPgorCiAgICAgICAgIFtHVEtdIEFkZCBBUEkgdG8gY3JlYXRlIGEgV2ViS2l0V2ViQ29udGV4 dAogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTM4ODI2 CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdl YkNvbnRleHQuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0V2Vi Q29udGV4dC5jcHAKaW5kZXggZDIwM2Q3Yi4uZjkxOTcyYiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0V2ViQ29udGV4dC5jcHAKKysrIGIvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0V2ViQ29udGV4dC5jcHAKQEAgLTQ4LDYg KzQ4LDcgQEAKICNpbmNsdWRlIDxXZWJDb3JlL0ZpbGVTeXN0ZW0uaD4KICNpbmNsdWRlIDxXZWJD b3JlL0ljb25EYXRhYmFzZS5oPgogI2luY2x1ZGUgPFdlYkNvcmUvTGFuZ3VhZ2UuaD4KKyNpbmNs dWRlIDxnbGliL2dpMThuLWxpYi5oPgogI2luY2x1ZGUgPGxpYmludGwuaD4KICNpbmNsdWRlIDxt ZW1vcnk+CiAjaW5jbHVkZSA8d3RmL0hhc2hNYXAuaD4KQEAgLTk1LDYgKzk2LDEyIEBAIHVzaW5n IG5hbWVzcGFjZSBXZWJLaXQ7CiAgKi8KIAogZW51bSB7CisgICAgUFJPUF8wLAorCisgICAgUFJP UF9MT0NBTF9TVE9SQUdFX0RJUkVDVE9SWQorfTsKKworZW51bSB7CiAgICAgRE9XTkxPQURfU1RB UlRFRCwKICAgICBJTklUSUFMSVpFX1dFQl9FWFRFTlNJT05TLAogCkBAIC0xNjksNiArMTc2LDgg QEAgc3RydWN0IF9XZWJLaXRXZWJDb250ZXh0UHJpdmF0ZSB7CiAKICAgICBDU3RyaW5nIHdlYkV4 dGVuc2lvbnNEaXJlY3Rvcnk7CiAgICAgR1JlZlB0cjxHVmFyaWFudD4gd2ViRXh0ZW5zaW9uc0lu aXRpYWxpemF0aW9uVXNlckRhdGE7CisKKyAgICBDU3RyaW5nIGxvY2FsU3RvcmFnZURpcmVjdG9y eTsKIH07CiAKIHN0YXRpYyBndWludCBzaWduYWxzW0xBU1RfU0lHTkFMXSA9IHsgMCwgfTsKQEAg LTIxMiwxNyArMjIxLDQ1IEBAIHN0YXRpYyBjb25zdCBjaGFyKiBpbmplY3RlZEJ1bmRsZURpcmVj dG9yeSgpCiAgICAgcmV0dXJuIGluamVjdGVkQnVuZGxlUGF0aDsKIH0KIAorc3RhdGljIHZvaWQg d2Via2l0V2ViQ29udGV4dEdldFByb3BlcnR5KEdPYmplY3QqIG9iamVjdCwgZ3VpbnQgcHJvcElE LCBHVmFsdWUqIHZhbHVlLCBHUGFyYW1TcGVjKiBwYXJhbVNwZWMpCit7CisgICAgV2ViS2l0V2Vi Q29udGV4dCogY29udGV4dCA9IFdFQktJVF9XRUJfQ09OVEVYVChvYmplY3QpOworCisgICAgc3dp dGNoIChwcm9wSUQpIHsKKyAgICBjYXNlIFBST1BfTE9DQUxfU1RPUkFHRV9ESVJFQ1RPUlk6Cisg ICAgICAgIGdfdmFsdWVfc2V0X3N0cmluZyh2YWx1ZSwgY29udGV4dC0+cHJpdi0+bG9jYWxTdG9y YWdlRGlyZWN0b3J5LmRhdGEoKSk7CisgICAgICAgIGJyZWFrOworICAgIGRlZmF1bHQ6CisgICAg ICAgIEdfT0JKRUNUX1dBUk5fSU5WQUxJRF9QUk9QRVJUWV9JRChvYmplY3QsIHByb3BJRCwgcGFy YW1TcGVjKTsKKyAgICB9Cit9CisKK3N0YXRpYyB2b2lkIHdlYmtpdFdlYkNvbnRleHRTZXRQcm9w ZXJ0eShHT2JqZWN0KiBvYmplY3QsIGd1aW50IHByb3BJRCwgY29uc3QgR1ZhbHVlKiB2YWx1ZSwg R1BhcmFtU3BlYyogcGFyYW1TcGVjKQoreworICAgIFdlYktpdFdlYkNvbnRleHQqIGNvbnRleHQg PSBXRUJLSVRfV0VCX0NPTlRFWFQob2JqZWN0KTsKKworICAgIHN3aXRjaCAocHJvcElEKSB7Cisg ICAgY2FzZSBQUk9QX0xPQ0FMX1NUT1JBR0VfRElSRUNUT1JZOgorICAgICAgICBjb250ZXh0LT5w cml2LT5sb2NhbFN0b3JhZ2VEaXJlY3RvcnkgPSBnX3ZhbHVlX2dldF9zdHJpbmcodmFsdWUpOwor ICAgICAgICBicmVhazsKKyAgICBkZWZhdWx0OgorICAgICAgICBHX09CSkVDVF9XQVJOX0lOVkFM SURfUFJPUEVSVFlfSUQob2JqZWN0LCBwcm9wSUQsIHBhcmFtU3BlYyk7CisgICAgfQorfQorCiBz dGF0aWMgdm9pZCB3ZWJraXRXZWJDb250ZXh0Q29uc3RydWN0ZWQoR09iamVjdCogb2JqZWN0KQog ewogICAgIEdfT0JKRUNUX0NMQVNTKHdlYmtpdF93ZWJfY29udGV4dF9wYXJlbnRfY2xhc3MpLT5j b25zdHJ1Y3RlZChvYmplY3QpOwogCisgICAgV2ViS2l0V2ViQ29udGV4dCogd2ViQ29udGV4dCA9 IFdFQktJVF9XRUJfQ09OVEVYVChvYmplY3QpOworICAgIFdlYktpdFdlYkNvbnRleHRQcml2YXRl KiBwcml2ID0gd2ViQ29udGV4dC0+cHJpdjsKICAgICBHVW5pcXVlUHRyPGNoYXI+IGJ1bmRsZUZp bGVuYW1lKGdfYnVpbGRfZmlsZW5hbWUoaW5qZWN0ZWRCdW5kbGVEaXJlY3RvcnkoKSwgImxpYndl YmtpdDJndGtpbmplY3RlZGJ1bmRsZS5zbyIsIG51bGxwdHIpKTsKICAgICBXZWJDb250ZXh0Q29u ZmlndXJhdGlvbiB3ZWJDb250ZXh0Q29uZmlndXJhdGlvbjsKICAgICB3ZWJDb250ZXh0Q29uZmln dXJhdGlvbi5pbmplY3RlZEJ1bmRsZVBhdGggPSBXZWJDb3JlOjpmaWxlbmFtZVRvU3RyaW5nKGJ1 bmRsZUZpbGVuYW1lLmdldCgpKTsKICAgICBXZWJDb250ZXh0OjphcHBseVBsYXRmb3JtU3BlY2lm aWNDb25maWd1cmF0aW9uRGVmYXVsdHMod2ViQ29udGV4dENvbmZpZ3VyYXRpb24pOworICAgIGlm ICghcHJpdi0+bG9jYWxTdG9yYWdlRGlyZWN0b3J5LmlzTnVsbCgpKQorICAgICAgICB3ZWJDb250 ZXh0Q29uZmlndXJhdGlvbi5sb2NhbFN0b3JhZ2VEaXJlY3RvcnkgPSBXZWJDb3JlOjpmaWxlbmFt ZVRvU3RyaW5nKHByaXYtPmxvY2FsU3RvcmFnZURpcmVjdG9yeS5kYXRhKCkpOwogCi0gICAgV2Vi S2l0V2ViQ29udGV4dCogd2ViQ29udGV4dCA9IFdFQktJVF9XRUJfQ09OVEVYVChvYmplY3QpOwot ICAgIFdlYktpdFdlYkNvbnRleHRQcml2YXRlKiBwcml2ID0gd2ViQ29udGV4dC0+cHJpdjsKICAg ICBwcml2LT5jb250ZXh0ID0gV2ViQ29udGV4dDo6Y3JlYXRlKFdURjo6bW92ZSh3ZWJDb250ZXh0 Q29uZmlndXJhdGlvbikpOwogCiAgICAgcHJpdi0+cmVxdWVzdE1hbmFnZXIgPSBwcml2LT5jb250 ZXh0LT5zdXBwbGVtZW50PFdlYlNvdXBDdXN0b21Qcm90b2NvbFJlcXVlc3RNYW5hZ2VyPigpOwpA QCAtMjY1LDEwICszMDIsMjkgQEAgc3RhdGljIHZvaWQgd2Via2l0X3dlYl9jb250ZXh0X2NsYXNz X2luaXQoV2ViS2l0V2ViQ29udGV4dENsYXNzKiB3ZWJDb250ZXh0Q2xhc3MKICAgICBiaW5kdGV4 dGRvbWFpbihHRVRURVhUX1BBQ0tBR0UsIFBBQ0tBR0VfTE9DQUxFX0RJUik7CiAgICAgYmluZF90 ZXh0ZG9tYWluX2NvZGVzZXQoR0VUVEVYVF9QQUNLQUdFLCAiVVRGLTgiKTsKIAorICAgIGdPYmpl Y3RDbGFzcy0+Z2V0X3Byb3BlcnR5ID0gd2Via2l0V2ViQ29udGV4dEdldFByb3BlcnR5OworICAg IGdPYmplY3RDbGFzcy0+c2V0X3Byb3BlcnR5ID0gd2Via2l0V2ViQ29udGV4dFNldFByb3BlcnR5 OwogICAgIGdPYmplY3RDbGFzcy0+Y29uc3RydWN0ZWQgPSB3ZWJraXRXZWJDb250ZXh0Q29uc3Ry dWN0ZWQ7CiAgICAgZ09iamVjdENsYXNzLT5kaXNwb3NlID0gd2Via2l0V2ViQ29udGV4dERpc3Bv c2U7CiAKICAgICAvKioKKyAgICAgKiBXZWJLaXRXZWJDb250ZXh0OmxvY2FsLXN0b3JhZ2UtZGly ZWN0b3J5OgorICAgICAqCisgICAgICogVGhlIGRpcmVjdG9yeSB3aGVyZSBsb2NhbCBzdG9yYWdl IGRhdGEgd2lsbCBiZSBzYXZlZC4KKyAgICAgKgorICAgICAqIFNpbmNlOiAyLjgKKyAgICAgKi8K KyAgICBnX29iamVjdF9jbGFzc19pbnN0YWxsX3Byb3BlcnR5KAorICAgICAgICBnT2JqZWN0Q2xh c3MsCisgICAgICAgIFBST1BfTE9DQUxfU1RPUkFHRV9ESVJFQ1RPUlksCisgICAgICAgIGdfcGFy YW1fc3BlY19zdHJpbmcoCisgICAgICAgICAgICAibG9jYWwtc3RvcmFnZS1kaXJlY3RvcnkiLAor ICAgICAgICAgICAgXygiTG9jYWwgU3RvcmFnZSBEaXJlY3RvcnkiKSwKKyAgICAgICAgICAgIF8o IlRoZSBkaXJlY3Rvcnkgd2hlcmUgbG9jYWwgc3RvcmFnZSBkYXRhIHdpbGwgYmUgc2F2ZWQiKSwK KyAgICAgICAgICAgIG51bGxwdHIsCisgICAgICAgICAgICBzdGF0aWNfY2FzdDxHUGFyYW1GbGFn cz4oV0VCS0lUX1BBUkFNX1JFQURXUklURSB8IEdfUEFSQU1fQ09OU1RSVUNUX09OTFkpKSk7CisK KyAgICAvKioKICAgICAgKiBXZWJLaXRXZWJDb250ZXh0Ojpkb3dubG9hZC1zdGFydGVkOgogICAg ICAqIEBjb250ZXh0OiB0aGUgI1dlYktpdFdlYkNvbnRleHQKICAgICAgKiBAZG93bmxvYWQ6IHRo ZSAjV2ViS2l0RG93bmxvYWQgYXNzb2NpYXRlZCB3aXRoIHRoaXMgZXZlbnQKZGlmZiAtLWdpdCBh L1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCAwNjZjZWU5Li4yMGFmZTY4 IDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0x LDUgKzEsMjIgQEAKIDIwMTQtMTEtMTggIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBp Z2FsaWEuY29tPgogCisgICAgICAgIFtHVEtdIEFkZCBBUEkgdG8gb3ZlcnJpZGUgdGhlIGRlZmF1 bHQgbG9jYWwgc3RvcmFnZSBkaXJlY3RvcnkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTEzODgyOAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIEFkZCB0ZXN0IHRvIGNoZWNrIHRoYXQgdGhlIGxvY2FsIHN0b3Jh Z2UgZGlyZWN0b3J5IGlzIGNyZWF0ZWQgYXQKKyAgICAgICAgdGhlIHBhdGggZ2l2ZW4gb24gY29u c3RydWN0aW9uLgorCisgICAgICAgICogVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXQyR3RrL1Rl c3RXZWJLaXRXZWJDb250ZXh0LmNwcDoKKyAgICAgICAgKHRlc3RXZWJDb250ZXh0Q29uZmlndXJh dGlvbik6CisgICAgICAgIChiZWZvcmVBbGwpOgorICAgICAgICAqIFRlc3RXZWJLaXRBUEkvZ3Rr L1dlYktpdDJHdGsvVGVzdE1haW4uaDoKKyAgICAgICAgKFRlc3Q6OlRlc3QpOgorICAgICAgICAo VGVzdDo6flRlc3QpOiBEZWxldGVkLgorCisyMDE0LTExLTE4ICBDYXJsb3MgR2FyY2lhIENhbXBv cyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4KKwogICAgICAgICBbR1RLXSBBZGQgQVBJIHRvIGNyZWF0 ZSBhIFdlYktpdFdlYkNvbnRleHQKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTEzODgyNgogCmRpZmYgLS1naXQgYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rl c3RzL1dlYktpdDJHdGsvVGVzdFdlYktpdFdlYkNvbnRleHQuY3BwIGIvVG9vbHMvVGVzdFdlYktp dEFQSS9UZXN0cy9XZWJLaXQyR3RrL1Rlc3RXZWJLaXRXZWJDb250ZXh0LmNwcAppbmRleCA5MTg0 YzBlLi41MjA2MjU5IDEwMDY0NAotLS0gYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktp dDJHdGsvVGVzdFdlYktpdFdlYkNvbnRleHQuY3BwCisrKyBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkv VGVzdHMvV2ViS2l0Mkd0ay9UZXN0V2ViS2l0V2ViQ29udGV4dC5jcHAKQEAgLTM3LDYgKzM3LDEz IEBAIHN0YXRpYyB2b2lkIHRlc3RXZWJDb250ZXh0RGVmYXVsdChUZXN0KiB0ZXN0LCBnY29uc3Rw b2ludGVyKQogICAgIGdfYXNzZXJ0KHdlYmtpdF93ZWJfY29udGV4dF9nZXRfZGVmYXVsdCgpICE9 IHRlc3QtPm1fd2ViQ29udGV4dC5nZXQoKSk7CiB9CiAKK3N0YXRpYyB2b2lkIHRlc3RXZWJDb250 ZXh0Q29uZmlndXJhdGlvbihXZWJWaWV3VGVzdCogdGVzdCwgZ2NvbnN0cG9pbnRlcikKK3sKKyAg ICAvLyBMb2NhbCBTb3JhZ2UgRGlyZWN0b3J5LgorICAgIEdVbmlxdWVQdHI8Y2hhcj4gbG9jYWxT dG9yYWdlRGlyZWN0b3J5KGdfYnVpbGRfZmlsZW5hbWUoVGVzdDo6ZGF0YURpcmVjdG9yeSgpLCAi bG9jYWwtc3RvcmFnZSIsIG51bGxwdHIpKTsKKyAgICBnX2Fzc2VydChnX2ZpbGVfdGVzdChsb2Nh bFN0b3JhZ2VEaXJlY3RvcnkuZ2V0KCksIEdfRklMRV9URVNUX0lTX0RJUikpOworfQorCiBjbGFz cyBQbHVnaW5zVGVzdDogcHVibGljIFRlc3QgewogcHVibGljOgogICAgIE1BS0VfR0xJQl9URVNU X0ZJWFRVUkUoUGx1Z2luc1Rlc3QpOwpAQCAtNDExLDYgKzQxOCw3IEBAIHZvaWQgYmVmb3JlQWxs KCkKICAgICBrU2VydmVyLT5ydW4oc2VydmVyQ2FsbGJhY2spOwogCiAgICAgVGVzdDo6YWRkKCJX ZWJLaXRXZWJDb250ZXh0IiwgImRlZmF1bHQtY29udGV4dCIsIHRlc3RXZWJDb250ZXh0RGVmYXVs dCk7CisgICAgV2ViVmlld1Rlc3Q6OmFkZCgiV2ViS2l0V2ViQ29udGV4dCIsICJjb25maWd1cmF0 aW9uIiwgdGVzdFdlYkNvbnRleHRDb25maWd1cmF0aW9uKTsKICAgICBQbHVnaW5zVGVzdDo6YWRk KCJXZWJLaXRXZWJDb250ZXh0IiwgImdldC1wbHVnaW5zIiwgdGVzdFdlYkNvbnRleHRHZXRQbHVn aW5zKTsKICAgICBVUklTY2hlbWVUZXN0OjphZGQoIldlYktpdFdlYkNvbnRleHQiLCAidXJpLXNj aGVtZSIsIHRlc3RXZWJDb250ZXh0VVJJU2NoZW1lKTsKICAgICBUZXN0OjphZGQoIldlYktpdFdl YkNvbnRleHQiLCAic3BlbGwtY2hlY2tlciIsIHRlc3RXZWJDb250ZXh0U3BlbGxDaGVja2VyKTsK ZGlmZiAtLWdpdCBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvZ3RrL1dlYktpdDJHdGsvVGVzdE1haW4u aCBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvZ3RrL1dlYktpdDJHdGsvVGVzdE1haW4uaAppbmRleCAz MmUzZDIxLi4wMTE4NTEwIDEwMDY0NAotLS0gYS9Ub29scy9UZXN0V2ViS2l0QVBJL2d0ay9XZWJL aXQyR3RrL1Rlc3RNYWluLmgKKysrIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9ndGsvV2ViS2l0Mkd0 ay9UZXN0TWFpbi5oCkBAIC02Niw4ICs2NiwxMCBAQCBwdWJsaWM6CiAgICAgfQogCiAgICAgVGVz dCgpCi0gICAgICAgIDogbV93ZWJDb250ZXh0KGFkb3B0R1JlZih3ZWJraXRfd2ViX2NvbnRleHRf bmV3KCkpKQogICAgIHsKKyAgICAgICAgR1VuaXF1ZVB0cjxjaGFyPiBsb2NhbFN0b3JhZ2VEaXJl Y3RvcnkoZ19idWlsZF9maWxlbmFtZShkYXRhRGlyZWN0b3J5KCksICJsb2NhbC1zdG9yYWdlIiwg bnVsbHB0cikpOworICAgICAgICBtX3dlYkNvbnRleHQgPSBhZG9wdEdSZWYoV0VCS0lUX1dFQl9D T05URVhUKGdfb2JqZWN0X25ldyhXRUJLSVRfVFlQRV9XRUJfQ09OVEVYVCwgImxvY2FsLXN0b3Jh Z2UtZGlyZWN0b3J5IiwgbG9jYWxTdG9yYWdlRGlyZWN0b3J5LmdldCgpLCBudWxscHRyKSkpOwor CiAgICAgICAgIGdfc2lnbmFsX2Nvbm5lY3QobV93ZWJDb250ZXh0LmdldCgpLCAiaW5pdGlhbGl6 ZS13ZWItZXh0ZW5zaW9ucyIsIEdfQ0FMTEJBQ0soaW5pdGlhbGl6ZVdlYkV4dGVuc2lvbnNDYWxs YmFjayksIHRoaXMpOwogICAgICAgICBHVW5pcXVlUHRyPGNoYXI+IGRpc2tDYWNoZURpcmVjdG9y eShnX2J1aWxkX2ZpbGVuYW1lKGRhdGFEaXJlY3RvcnkoKSwgImRpc2stY2FjaGUiLCBudWxscHRy KSk7CiAgICAgICAgIHdlYmtpdF93ZWJfY29udGV4dF9zZXRfZGlza19jYWNoZV9kaXJlY3Rvcnko bV93ZWJDb250ZXh0LmdldCgpLCBkaXNrQ2FjaGVEaXJlY3RvcnkuZ2V0KCkpOwo=