129911 2014-03-07 13:49:05 -0800 Better JSContext API for named evaluations (other than //# sourceURL) 2014-03-10 19:35:06 -0700 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) All All RESOLVED FIXED InRadar P2 Normal --- 1 joepeck webkit-unassigned ggaren joepeck mhahnenberg timothy oldest_to_newest 988323 0 joepeck 2014-03-07 13:49:05 -0800 Useful for getting named evaluations in a JSContext Inspector. 988324 1 joepeck 2014-03-07 13:49:18 -0800 <rdar://problem/16257330> 988328 2 226162 joepeck 2014-03-07 13:51:34 -0800 Created attachment 226162 [PATCH] Proposed Fix 989099 3 226162 ggaren 2014-03-10 16:15:44 -0700 Comment on attachment 226162 [PATCH] Proposed Fix View in context: https://bugs.webkit.org/attachment.cgi?id=226162&action=review r=me, but I think you can do a bit better here. > Source/JavaScriptCore/API/JSContext.h:87 > +@param sourceURL A URL for the script's source path and name. Used by debuggers and when reporting exceptions. I think I would just say "source file" instead of "source path and name". I didn't immediately understand what you meant by "path and name". I would also say "This parameter is informative only: it does not change the behavior of the script." > Source/JavaScriptCore/API/JSContext.mm:113 > - (JSValue *)evaluateScript:(NSString *)script > { > - JSValueRef exceptionValue = 0; > + JSValueRef exceptionValue = nullptr; > JSStringRef scriptJS = JSStringCreateWithCFString((CFStringRef)script); > - JSValueRef result = JSEvaluateScript(m_context, scriptJS, 0, 0, 0, &exceptionValue); > + JSValueRef result = JSEvaluateScript(m_context, scriptJS, nullptr, nullptr, 0, &exceptionValue); > + JSStringRelease(scriptJS); > + > + if (exceptionValue) > + return [self valueFromNotifyException:exceptionValue]; > + > + return [JSValue valueWithJSValueRef:result inContext:self]; > +} > + > +- (JSValue *)evaluateScript:(NSString *)script withSourceURL:(NSURL *)sourceURL > +{ > + if (!sourceURL) > + return [self evaluateScript:script]; > + > + JSValueRef exceptionValue = nullptr; > + JSStringRef scriptJS = JSStringCreateWithCFString((CFStringRef)script); > + JSStringRef sourceURLJS = JSStringCreateWithCFString((CFStringRef)[sourceURL absoluteString]); > + JSValueRef result = JSEvaluateScript(m_context, scriptJS, nullptr, sourceURLJS, 0, &exceptionValue); > + JSStringRelease(sourceURLJS); > JSStringRelease(scriptJS); I would have done this the other way around, and had -evaluateScript: call -evaluateScript:withURL: passing a null or empty URL. That way, there's only one copy of the string creation, script evaluation, and exception handling code. 989183 4 joepeck 2014-03-10 19:35:06 -0700 <http://trac.webkit.org/changeset/165424> 226162 2014-03-07 13:51:34 -0800 2014-03-10 16:15:43 -0700 [PATCH] Proposed Fix API.patch text/plain 8037 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9BUEkvSlNCYXNlLmggYi9Tb3VyY2Uv SmF2YVNjcmlwdENvcmUvQVBJL0pTQmFzZS5oCmluZGV4IDE1M2QzNTkuLmU1NzU2ZDQgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9BUEkvSlNCYXNlLmgKKysrIGIvU291cmNlL0ph dmFTY3JpcHRDb3JlL0FQSS9KU0Jhc2UuaApAQCAtMTAxLDcgKzEwMSw3IEBAIGV4dGVybiAiQyIg ewogQHBhcmFtIGN0eCBUaGUgZXhlY3V0aW9uIGNvbnRleHQgdG8gdXNlLgogQHBhcmFtIHNjcmlw dCBBIEpTU3RyaW5nIGNvbnRhaW5pbmcgdGhlIHNjcmlwdCB0byBldmFsdWF0ZS4KIEBwYXJhbSB0 aGlzT2JqZWN0IFRoZSBvYmplY3QgdG8gdXNlIGFzICJ0aGlzLCIgb3IgTlVMTCB0byB1c2UgdGhl IGdsb2JhbCBvYmplY3QgYXMgInRoaXMuIgotQHBhcmFtIHNvdXJjZVVSTCBBIEpTU3RyaW5nIGNv bnRhaW5pbmcgYSBVUkwgZm9yIHRoZSBzY3JpcHQncyBzb3VyY2UgZmlsZS4gVGhpcyBpcyBvbmx5 IHVzZWQgd2hlbiByZXBvcnRpbmcgZXhjZXB0aW9ucy4gUGFzcyBOVUxMIGlmIHlvdSBkbyBub3Qg Y2FyZSB0byBpbmNsdWRlIHNvdXJjZSBmaWxlIGluZm9ybWF0aW9uIGluIGV4Y2VwdGlvbnMuCitA cGFyYW0gc291cmNlVVJMIEEgSlNTdHJpbmcgY29udGFpbmluZyBhIFVSTCBmb3IgdGhlIHNjcmlw dCdzIHNvdXJjZSBmaWxlLiBUaGlzIGlzIHVzZWQgYnkgZGVidWdnZXJzIGFuZCB3aGVuIHJlcG9y dGluZyBleGNlcHRpb25zLiBQYXNzIE5VTEwgaWYgeW91IGRvIG5vdCBjYXJlIHRvIGluY2x1ZGUg c291cmNlIGZpbGUgaW5mb3JtYXRpb24uCiBAcGFyYW0gc3RhcnRpbmdMaW5lTnVtYmVyIEFuIGlu dGVnZXIgdmFsdWUgc3BlY2lmeWluZyB0aGUgc2NyaXB0J3Mgc3RhcnRpbmcgbGluZSBudW1iZXIg aW4gdGhlIGZpbGUgbG9jYXRlZCBhdCBzb3VyY2VVUkwuIFRoaXMgaXMgb25seSB1c2VkIHdoZW4g cmVwb3J0aW5nIGV4Y2VwdGlvbnMuIFRoZSB2YWx1ZSBpcyBvbmUtYmFzZWQsIHNvIHRoZSBmaXJz dCBsaW5lIGlzIGxpbmUgMSBhbmQgaW52YWxpZCB2YWx1ZXMgYXJlIGNsYW1wZWQgdG8gMS4KIEBw YXJhbSBleGNlcHRpb24gQSBwb2ludGVyIHRvIGEgSlNWYWx1ZVJlZiBpbiB3aGljaCB0byBzdG9y ZSBhbiBleGNlcHRpb24sIGlmIGFueS4gUGFzcyBOVUxMIGlmIHlvdSBkbyBub3QgY2FyZSB0byBz dG9yZSBhbiBleGNlcHRpb24uCiBAcmVzdWx0IFRoZSBKU1ZhbHVlIHRoYXQgcmVzdWx0cyBmcm9t IGV2YWx1YXRpbmcgc2NyaXB0LCBvciBOVUxMIGlmIGFuIGV4Y2VwdGlvbiBpcyB0aHJvd24uCmRp ZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvQVBJL0pTQ29udGV4dC5oIGIvU291cmNl L0phdmFTY3JpcHRDb3JlL0FQSS9KU0NvbnRleHQuaAppbmRleCAxZTg1YTcxLi5kZjkxOWI4IDEw MDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvQVBJL0pTQ29udGV4dC5oCisrKyBiL1Nv dXJjZS9KYXZhU2NyaXB0Q29yZS9BUEkvSlNDb250ZXh0LmgKQEAgLTgxLDYgKzgxLDE1IEBAIE9C SkNfVklTSUJMRQogLSAoSlNWYWx1ZSAqKWV2YWx1YXRlU2NyaXB0OihOU1N0cmluZyAqKXNjcmlw dDsKIAogLyohCitAbWV0aG9kCitAYWJzdHJhY3QgRXZhbHVhdGUgYSBzdHJpbmcgb2YgSmF2YVNj cmlwdCBjb2RlLCB3aXRoIGEgVVJMIGZvciB0aGUgc2NyaXB0J3Mgc291cmNlIHBhdGggYW5kIG5h bWUuCitAcGFyYW0gc2NyaXB0IEEgc3RyaW5nIGNvbnRhaW5pbmcgdGhlIEphdmFTY3JpcHQgY29k ZSB0byBldmFsdWF0ZS4KK0BwYXJhbSBzb3VyY2VVUkwgQSBVUkwgZm9yIHRoZSBzY3JpcHQncyBz b3VyY2UgcGF0aCBhbmQgbmFtZS4gVXNlZCBieSBkZWJ1Z2dlcnMgYW5kIHdoZW4gcmVwb3J0aW5n IGV4Y2VwdGlvbnMuCitAcmVzdWx0IFRoZSBsYXN0IHZhbHVlIGdlbmVyYXRlZCBieSB0aGUgc2Ny aXB0LgorKi8KKy0gKEpTVmFsdWUgKilldmFsdWF0ZVNjcmlwdDooTlNTdHJpbmcgKilzY3JpcHQg d2l0aFNvdXJjZVVSTDooTlNVUkwgKilzb3VyY2VVUkwgTlNfQVZBSUxBQkxFKDEwXzEwLCA4XzAp OworCisvKiEKIEBtZXRob2Rncm91cCBDYWxsYmFjayBBY2Nlc3NvcnMKICovCiAvKiEKZGlmZiAt LWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9BUEkvSlNDb250ZXh0Lm1tIGIvU291cmNlL0ph dmFTY3JpcHRDb3JlL0FQSS9KU0NvbnRleHQubW0KaW5kZXggYTliYjNlNC4uNjdhYjAzNCAxMDA2 NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL0FQSS9KU0NvbnRleHQubW0KKysrIGIvU291 cmNlL0phdmFTY3JpcHRDb3JlL0FQSS9KU0NvbnRleHQubW0KQEAgLTIwLDcgKzIwLDcgQEAKICAq IFBST0ZJVFM7IE9SIEJVU0lORVNTIElOVEVSUlVQVElPTikgSE9XRVZFUiBDQVVTRUQgQU5EIE9O IEFOWSBUSEVPUlkKICAqIE9GIExJQUJJTElUWSwgV0hFVEhFUiBJTiBDT05UUkFDVCwgU1RSSUNU IExJQUJJTElUWSwgT1IgVE9SVAogICogKElOQ0xVRElORyBORUdMSUdFTkNFIE9SIE9USEVSV0lT RSkgQVJJU0lORyBJTiBBTlkgV0FZIE9VVCBPRiBUSEUgVVNFCi0gKiBPRiBUSElTIFNPRlRXQVJF LCBFVkVOIElGIEFEVklTRUQgT0YgVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLiAKKyAq IE9GIFRISVMgU09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRiBUSEUgUE9TU0lCSUxJVFkgT0Yg U1VDSCBEQU1BR0UuCiAgKi8KIAogI2luY2x1ZGUgImNvbmZpZy5oIgpAQCAtODksOSArODksMjcg QEAKIAogLSAoSlNWYWx1ZSAqKWV2YWx1YXRlU2NyaXB0OihOU1N0cmluZyAqKXNjcmlwdAogewot ICAgIEpTVmFsdWVSZWYgZXhjZXB0aW9uVmFsdWUgPSAwOworICAgIEpTVmFsdWVSZWYgZXhjZXB0 aW9uVmFsdWUgPSBudWxscHRyOwogICAgIEpTU3RyaW5nUmVmIHNjcmlwdEpTID0gSlNTdHJpbmdD cmVhdGVXaXRoQ0ZTdHJpbmcoKENGU3RyaW5nUmVmKXNjcmlwdCk7Ci0gICAgSlNWYWx1ZVJlZiBy ZXN1bHQgPSBKU0V2YWx1YXRlU2NyaXB0KG1fY29udGV4dCwgc2NyaXB0SlMsIDAsIDAsIDAsICZl eGNlcHRpb25WYWx1ZSk7CisgICAgSlNWYWx1ZVJlZiByZXN1bHQgPSBKU0V2YWx1YXRlU2NyaXB0 KG1fY29udGV4dCwgc2NyaXB0SlMsIG51bGxwdHIsIG51bGxwdHIsIDAsICZleGNlcHRpb25WYWx1 ZSk7CisgICAgSlNTdHJpbmdSZWxlYXNlKHNjcmlwdEpTKTsKKworICAgIGlmIChleGNlcHRpb25W YWx1ZSkKKyAgICAgICAgcmV0dXJuIFtzZWxmIHZhbHVlRnJvbU5vdGlmeUV4Y2VwdGlvbjpleGNl cHRpb25WYWx1ZV07CisKKyAgICByZXR1cm4gW0pTVmFsdWUgdmFsdWVXaXRoSlNWYWx1ZVJlZjpy ZXN1bHQgaW5Db250ZXh0OnNlbGZdOworfQorCistIChKU1ZhbHVlICopZXZhbHVhdGVTY3JpcHQ6 KE5TU3RyaW5nICopc2NyaXB0IHdpdGhTb3VyY2VVUkw6KE5TVVJMICopc291cmNlVVJMCit7Cisg ICAgaWYgKCFzb3VyY2VVUkwpCisgICAgICAgIHJldHVybiBbc2VsZiBldmFsdWF0ZVNjcmlwdDpz Y3JpcHRdOworCisgICAgSlNWYWx1ZVJlZiBleGNlcHRpb25WYWx1ZSA9IG51bGxwdHI7CisgICAg SlNTdHJpbmdSZWYgc2NyaXB0SlMgPSBKU1N0cmluZ0NyZWF0ZVdpdGhDRlN0cmluZygoQ0ZTdHJp bmdSZWYpc2NyaXB0KTsKKyAgICBKU1N0cmluZ1JlZiBzb3VyY2VVUkxKUyA9IEpTU3RyaW5nQ3Jl YXRlV2l0aENGU3RyaW5nKChDRlN0cmluZ1JlZilbc291cmNlVVJMIGFic29sdXRlU3RyaW5nXSk7 CisgICAgSlNWYWx1ZVJlZiByZXN1bHQgPSBKU0V2YWx1YXRlU2NyaXB0KG1fY29udGV4dCwgc2Ny aXB0SlMsIG51bGxwdHIsIHNvdXJjZVVSTEpTLCAwLCAmZXhjZXB0aW9uVmFsdWUpOworICAgIEpT U3RyaW5nUmVsZWFzZShzb3VyY2VVUkxKUyk7CiAgICAgSlNTdHJpbmdSZWxlYXNlKHNjcmlwdEpT KTsKIAogICAgIGlmIChleGNlcHRpb25WYWx1ZSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2Ny aXB0Q29yZS9BUEkvdGVzdHMvdGVzdGFwaS5jIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0FQSS90 ZXN0cy90ZXN0YXBpLmMKaW5kZXggYzBjMTNkOC4uZWRmYjJjZCAxMDA2NDQKLS0tIGEvU291cmNl L0phdmFTY3JpcHRDb3JlL0FQSS90ZXN0cy90ZXN0YXBpLmMKKysrIGIvU291cmNlL0phdmFTY3Jp cHRDb3JlL0FQSS90ZXN0cy90ZXN0YXBpLmMKQEAgLTE4MTAsNiArMTgxMCwxOCBAQCBpbnQgbWFp bihpbnQgYXJnYywgY2hhciogYXJndltdKQogICAgIEFTU0VSVChKU1ZhbHVlSXNFcXVhbChjb250 ZXh0LCB2LCBvLCBOVUxMKSk7CiAgICAgSlNTdHJpbmdSZWxlYXNlKHNjcmlwdCk7CiAKKyAgICBl eGNlcHRpb24gPSBOVUxMOworICAgIHNjcmlwdCA9IEpTU3RyaW5nQ3JlYXRlV2l0aFVURjhDU3Ry aW5nKCJycmV0dXJuIEFycmF5OyIpOworICAgIEpTU3RyaW5nUmVmIHNvdXJjZVVSTCA9IEpTU3Ry aW5nQ3JlYXRlV2l0aFVURjhDU3RyaW5nKCJmaWxlOi8vL2Zvby9iYXIuanMiKTsKKyAgICBKU1N0 cmluZ1JlZiBzb3VyY2VVUkxLZXkgPSBKU1N0cmluZ0NyZWF0ZVdpdGhVVEY4Q1N0cmluZygic291 cmNlVVJMIik7CisgICAgSlNFdmFsdWF0ZVNjcmlwdChjb250ZXh0LCBzY3JpcHQsIE5VTEwsIHNv dXJjZVVSTCwgMSwgJmV4Y2VwdGlvbik7CisgICAgQVNTRVJUKGV4Y2VwdGlvbik7CisgICAgdiA9 IEpTT2JqZWN0R2V0UHJvcGVydHkoY29udGV4dCwgSlNWYWx1ZVRvT2JqZWN0KGNvbnRleHQsIGV4 Y2VwdGlvbiwgTlVMTCksIHNvdXJjZVVSTEtleSwgTlVMTCk7CisgICAgYXNzZXJ0RXF1YWxzQXNV VEY4U3RyaW5nKHYsICJmaWxlOi8vL2Zvby9iYXIuanMiKTsKKyAgICBKU1N0cmluZ1JlbGVhc2Uo c2NyaXB0KTsKKyAgICBKU1N0cmluZ1JlbGVhc2Uoc291cmNlVVJMKTsKKyAgICBKU1N0cmluZ1Jl bGVhc2Uoc291cmNlVVJMS2V5KTsKKwogICAgIC8vIFZlcmlmeSB0aGF0IGNyZWF0aW5nIGEgY29u c3RydWN0b3IgZm9yIGEgY2xhc3Mgd2l0aCBubyBzdGF0aWMgZnVuY3Rpb25zIGRvZXMgbm90IHRy aWdnZXIKICAgICAvLyBhbiBhc3NlcnQgaW5zaWRlIHB1dERpcmVjdCBvciBsZWFkIHRvIGEgY3Jh c2ggZHVyaW5nIEdDLiA8aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTI1 Nzg1PgogICAgIG51bGxEZWZpbml0aW9uID0ga0pTQ2xhc3NEZWZpbml0aW9uRW1wdHk7CkBAIC0x ODM4LDYgKzE4NTAsNyBAQCBpbnQgbWFpbihpbnQgYXJnYywgY2hhciogYXJndltdKQogICAgICAg ICB9CiAKICAgICAgICAgSlNTdHJpbmdSZWxlYXNlKHNjcmlwdCk7CisgICAgICAgIGV4Y2VwdGlv biA9IE5VTEw7CiAgICAgICAgIHJlc3VsdCA9IHNjcmlwdE9iamVjdCA/IEpTU2NyaXB0RXZhbHVh dGUoY29udGV4dCwgc2NyaXB0T2JqZWN0LCAwLCAmZXhjZXB0aW9uKSA6IDA7CiAgICAgICAgIGlm IChyZXN1bHQgJiYgSlNWYWx1ZUlzVW5kZWZpbmVkKGNvbnRleHQsIHJlc3VsdCkpCiAgICAgICAg ICAgICBwcmludGYoIlBBU1M6IFRlc3Qgc2NyaXB0IGV4ZWN1dGVkIHN1Y2Nlc3NmdWxseS5cbiIp OwpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL0FQSS90ZXN0cy90ZXN0YXBpLm1t IGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0FQSS90ZXN0cy90ZXN0YXBpLm1tCmluZGV4IDFhMDlk NTQuLjVhZGE5ZmIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9BUEkvdGVzdHMv dGVzdGFwaS5tbQorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvQVBJL3Rlc3RzL3Rlc3RhcGku bW0KQEAgLTYxNyw2ICs2MTcsMjQgQEAgdm9pZCB0ZXN0T2JqZWN0aXZlQ0FQSSgpCiAKICAgICBA YXV0b3JlbGVhc2Vwb29sIHsKICAgICAgICAgSlNDb250ZXh0ICpjb250ZXh0ID0gW1tKU0NvbnRl eHQgYWxsb2NdIGluaXRdOworICAgICAgICBfX2Jsb2NrIGJvb2wgZW1wdHlFeGNlcHRpb25Tb3Vy Y2VVUkwgPSBmYWxzZTsKKyAgICAgICAgY29udGV4dC5leGNlcHRpb25IYW5kbGVyID0gXihKU0Nv bnRleHQgKiwgSlNWYWx1ZSAqZXhjZXB0aW9uKSB7CisgICAgICAgICAgICBlbXB0eUV4Y2VwdGlv blNvdXJjZVVSTCA9IFtleGNlcHRpb25bQCJzb3VyY2VVUkwiXSBpc1VuZGVmaW5lZF07CisgICAg ICAgIH07CisgICAgICAgIFtjb250ZXh0IGV2YWx1YXRlU2NyaXB0OkAiIUAjJCVeJiooKSBUSElT IElTIE5PVCBWQUxJRCBKQVZBU0NSSVBUIFNZTlRBWCAhQCMkJV4mKigpIl07CisgICAgICAgIGNo ZWNrUmVzdWx0KEAiZXZhbHV0ZVNjcmlwdDogZXhjZXB0aW9uIGhhcyBubyBzb3VyY2VVUkwiLCBl bXB0eUV4Y2VwdGlvblNvdXJjZVVSTCk7CisKKyAgICAgICAgX19ibG9jayBOU1N0cmluZyAqZXhj ZXB0aW9uU291cmNlVVJMID0gbmlsOworICAgICAgICBjb250ZXh0LmV4Y2VwdGlvbkhhbmRsZXIg PSBeKEpTQ29udGV4dCAqLCBKU1ZhbHVlICpleGNlcHRpb24pIHsKKyAgICAgICAgICAgIGV4Y2Vw dGlvblNvdXJjZVVSTCA9IFtleGNlcHRpb25bQCJzb3VyY2VVUkwiXSB0b1N0cmluZ107CisgICAg ICAgIH07CisgICAgICAgIE5TVVJMICp1cmwgPSBbTlNVUkwgZmlsZVVSTFdpdGhQYXRoOkAiL2Zv by9iYXIuanMiXTsKKyAgICAgICAgW2NvbnRleHQgZXZhbHVhdGVTY3JpcHQ6QCIhQCMkJV4mKigp IFRISVMgSVMgTk9UIFZBTElEIEpBVkFTQ1JJUFQgU1lOVEFYICFAIyQlXiYqKCkiIHdpdGhTb3Vy Y2VVUkw6dXJsXTsKKyAgICAgICAgY2hlY2tSZXN1bHQoQCJldmFsdWF0ZVNjcmlwdDp3aXRoU291 cmNlVVJMOiBleGNlcHRpb24gaGFzIGV4cGVjdGVkIHNvdXJjZVVSTCIsIFtleGNlcHRpb25Tb3Vy Y2VVUkwgaXNFcXVhbFRvU3RyaW5nOlt1cmwgYWJzb2x1dGVTdHJpbmddXSk7CisgICAgfQorCisg ICAgQGF1dG9yZWxlYXNlcG9vbCB7CisgICAgICAgIEpTQ29udGV4dCAqY29udGV4dCA9IFtbSlND b250ZXh0IGFsbG9jXSBpbml0XTsKICAgICAgICAgY29udGV4dFtAImNhbGxiYWNrIl0gPSBeewog ICAgICAgICAgICAgSlNDb250ZXh0ICpjb250ZXh0ID0gW0pTQ29udGV4dCBjdXJyZW50Q29udGV4 dF07CiAgICAgICAgICAgICBjb250ZXh0LmV4Y2VwdGlvbiA9IFtKU1ZhbHVlIHZhbHVlV2l0aE5l d0Vycm9yRnJvbU1lc3NhZ2U6QCJTb21ldGhpbmcgd2VudCB3cm9uZy4iIGluQ29udGV4dDpjb250 ZXh0XTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cgYi9Tb3Vy Y2UvSmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9nCmluZGV4IDg5ZGM4OTQuLmRlMjBiNjggMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL0phdmFT Y3JpcHRDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDE0LTAzLTA3ICBKb3NlcGgg UGVjb3Jhcm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CisKKyAgICAgICAgQmV0dGVyIEpTQ29udGV4 dCBBUEkgZm9yIG5hbWVkIGV2YWx1YXRpb25zIChvdGhlciB0aGFuIC8vIyBzb3VyY2VVUkwpCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjk5MTEKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIEFQSS9KU0Jh c2UuaDoKKyAgICAgICAgKiBBUEkvSlNDb250ZXh0Lmg6CisgICAgICAgICogQVBJL0pTQ29udGV4 dC5tbToKKyAgICAgICAgKC1bSlNDb250ZXh0IGV2YWx1YXRlU2NyaXB0Ol0pOgorICAgICAgICAo LVtKU0NvbnRleHQgZXZhbHVhdGVTY3JpcHQ6d2l0aFNvdXJjZVVSTDpdKToKKyAgICAgICAgQWRk IG5ldyBldmFsdWF0ZVNjcmlwdDp3aXRoU291cmNlVVJMOi4KKworICAgICAgICAqIEFQSS90ZXN0 cy90ZXN0YXBpLmM6CisgICAgICAgIChtYWluKToKKyAgICAgICAgKiBBUEkvdGVzdHMvdGVzdGFw aS5tbToKKyAgICAgICAgKHRlc3RPYmplY3RpdmVDQVBJKToKKyAgICAgICAgQWRkIHRlc3RzIGZv ciBzb3VyY2VVUkwgaW4gZXZhbHVhdGUgQVBJcy4gSXQgc2hvdWxkCisgICAgICAgIGFmZmVjdCB0 aGUgZXhjZXB0aW9uIG9iamVjdHMuCisKIDIwMTQtMDMtMDMgIE9saXZlciBIdW50ICA8b2xpdmVy QGFwcGxlLmNvbT4KIAogICAgICAgICBTdXBwb3J0IGNhY2hpbmcgb2YgY3VzdG9tIHNldHRlcnMK