111845 2013-03-08 04:28:25 -0800 [SOUP] Soup disk cache should respect the diskCacheDirectory from the process initial parameters 2013-04-22 08:56:25 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED Gtk, Soup P2 Normal --- 111848 1 cgarcia webkit-unassigned andersca ap benjamin cdumez danw gyuyoung.kim rakuco svillar tmpsantos webkit.review.bot xan.lopez oldest_to_newest 851069 0 cgarcia 2013-03-08 04:28:25 -0800 We currently set the disk cache directory in the web process unconditionally in both GTK and EFL. 851071 1 192199 cgarcia 2013-03-08 04:34:00 -0800 Created attachment 192199 Patch 851072 2 cgarcia 2013-03-08 04:34:23 -0800 Adding WebKit2 owners. 851075 3 192199 cdumez 2013-03-08 04:43:18 -0800 Comment on attachment 192199 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=192199&action=review Looks good, thanks. > Source/WebKit2/WebProcess/soup/WebProcessSoup.cpp:167 > + ASSERT(!parameters.diskCacheDirectory.isEmpty() && !parameters.diskCacheDirectory.isNull()); The isNull() check is superfluous here as it is already checked inside isEmpty(). 851077 4 192199 xan.lopez 2013-03-08 04:43:52 -0800 Comment on attachment 192199 Patch Looks good to me. 851080 5 192202 cgarcia 2013-03-08 04:47:59 -0800 Created attachment 192202 Updated patch Removed the redundant isNull from assert and added a check before flushing the cache for the case when the web process finishes too early before the platformInitializeWebProcess is called. 851134 6 192202 tmpsantos 2013-03-08 06:30:11 -0800 Comment on attachment 192202 Updated patch LGTM, thanks! 851446 7 192202 benjamin 2013-03-08 12:46:12 -0800 Comment on attachment 192202 Updated patch There are two ways to set this: WebContext::platformDefaultDiskCacheDirectory and WKContextSetDiskCacheDirectory. From a quick look, it looks like we should get rid of platformDefaultDiskCacheDirectory and unify something around WKContextSetDiskCacheDirectory. It is silly to have two path. Any opinion? 851749 8 cgarcia 2013-03-09 01:07:14 -0800 (In reply to comment #7) > (From update of attachment 192202 [details]) > There are two ways to set this: WebContext::platformDefaultDiskCacheDirectory and WKContextSetDiskCacheDirectory. > > From a quick look, it looks like we should get rid of platformDefaultDiskCacheDirectory and unify something around WKContextSetDiskCacheDirectory. It is silly to have two path. Any opinion? For me they are not two ways, platformDefaultDiskCacheDirectory() defines the default disk cache directory for the platform. WKContextSetDiskCacheDirectory overrides the default directory. The good thing of having a default disk cache directory defined in the WebContext is that you don't need to explicitly set a disk cache from the API or from apps, unless you want to override the default. Note that platformDefaultDiskCacheDirectory() is private, so it's not supposed to be a way for the API layer to set a disck cache directory, but to define an internal default. All other directories (database, local storage, cookie storage, etc.) use the same approach. 874376 9 cgarcia 2013-04-11 23:35:47 -0700 ping owners 879189 10 cgarcia 2013-04-22 08:56:25 -0700 Committed r148886: <http://trac.webkit.org/changeset/148886> 192199 2013-03-08 04:34:00 -0800 2013-03-08 04:47:59 -0800 Patch wk2-soup-cache-dir.diff text/plain 5933 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCA3Mzk2OWNmLi5lYTVhMmNlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjgg QEAKKzIwMTMtMDMtMDggIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29t PgorCisgICAgICAgIFtTT1VQXSBTb3VwIGRpc2sgY2FjaGUgc2hvdWxkIHJlc3BlY3QgdGhlIGRp c2tDYWNoZURpcmVjdG9yeSBmcm9tIHRoZSBwcm9jZXNzIGluaXRpYWwgcGFyYW1ldGVycworICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTExODQ1CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTW92ZSB0aGUgY2Fj aGUgaW5pdGlhbGl6YXRpb24gdG8gcGxhdGZvcm1Jbml0aWFsaXplV2ViUHJvY2VzcygpIHRvCisg ICAgICAgIGNyZWF0ZSB0aGUgY2FjaGUgdXNpbmcgdGhlIGRpcmVjdG9yeSByZWNlaXZlZCBmcm9t IHRoZSBVSQorICAgICAgICBwcm9jZXNzLiBUaGlzIGFsbG93cyB0byBhZGQgcHVibGljIEFQSSB0 byBzZXQgYSBkaWZmZXJlbnQgZGlzaworICAgICAgICBjYWNoZSBkaXJlY3RvcnkgZnJvbSB0aGUg VUkgcHJvY2Vzcy4KKworICAgICAgICAqIFVJUHJvY2Vzcy9lZmwvV2ViQ29udGV4dEVmbC5jcHA6 CisgICAgICAgIChXZWJLaXQ6OldlYkNvbnRleHQ6OnBsYXRmb3JtRGVmYXVsdERpc2tDYWNoZURp cmVjdG9yeSk6IFJldHVybgorICAgICAgICBkZWZhdWx0IGRpc2sgY2FjaGUgZGlyZWN0b3J5Lgor ICAgICAgICAqIFVJUHJvY2Vzcy9ndGsvV2ViQ29udGV4dEd0ay5jcHA6CisgICAgICAgIChXZWJL aXQ6OldlYkNvbnRleHQ6OnBsYXRmb3JtRGVmYXVsdERpc2tDYWNoZURpcmVjdG9yeSk6IERpdHRv LgorICAgICAgICAqIFdlYlByb2Nlc3MvZWZsL1dlYlByb2Nlc3NNYWluRWZsLmNwcDoKKyAgICAg ICAgKFdlYktpdDo6V2ViUHJvY2Vzc01haW5FZmwpOiBSZW1vdmUgc291cCBjYWNoZSBpbml0aWFs aXphdGlvbi4KKyAgICAgICAgKiBXZWJQcm9jZXNzL2d0ay9XZWJQcm9jZXNzTWFpbkd0ay5jcHA6 CisgICAgICAgIChXZWJLaXQ6OldlYlByb2Nlc3NNYWluR3RrKTogRGl0dG8uCisgICAgICAgICog V2ViUHJvY2Vzcy9zb3VwL1dlYlByb2Nlc3NTb3VwLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2Vi UHJvY2Vzczo6cGxhdGZvcm1Jbml0aWFsaXplV2ViUHJvY2Vzcyk6IEluaXRpYWxpemUKKyAgICAg ICAgc291cCBjYWNoZS4KKwogMjAxMy0wMy0wNiAgU3VkYXJzYW5hIE5hZ2luZW5pICA8c3VkYXJz YW5hLm5hZ2luZW5pQGludGVsLmNvbT4KIAogICAgICAgICBbR1RLXVtXSzJdIEltcGxlbWVudCBX ZWJJbnNwZWN0b3I6OmxvY2FsaXplZFN0cmluZ3NVUkwoKSB0byByZXR1cm4gdGhlIGZpbGUgVVJM IG9mIGxvY2FsaXplZFN0cmluZ3MuanMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9lZmwvV2ViQ29udGV4dEVmbC5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvZWZs L1dlYkNvbnRleHRFZmwuY3BwCmluZGV4IDY5ZWI2NmIuLjkyMjkxZDQgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9lZmwvV2ViQ29udGV4dEVmbC5jcHAKKysrIGIvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL2VmbC9XZWJDb250ZXh0RWZsLmNwcApAQCAtMTE3LDggKzExNyw3 IEBAIFN0cmluZyBXZWJDb250ZXh0OjpwbGF0Zm9ybURlZmF1bHRMb2NhbFN0b3JhZ2VEaXJlY3Rv cnkoKSBjb25zdAogCiBTdHJpbmcgV2ViQ29udGV4dDo6cGxhdGZvcm1EZWZhdWx0RGlza0NhY2hl RGlyZWN0b3J5KCkgY29uc3QKIHsKLSAgICBub3RJbXBsZW1lbnRlZCgpOwotICAgIHJldHVybiBT dHJpbmcoKTsKKyAgICByZXR1cm4gU3RyaW5nOjpmcm9tVVRGOChlZnJlZXRfY2FjaGVfaG9tZV9n ZXQoKSkgKyAiL1dlYktpdEVmbCI7CiB9CiAKIFN0cmluZyBXZWJDb250ZXh0OjpwbGF0Zm9ybURl ZmF1bHRDb29raWVTdG9yYWdlRGlyZWN0b3J5KCkgY29uc3QKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9ndGsvV2ViQ29udGV4dEd0ay5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvZ3RrL1dlYkNvbnRleHRHdGsuY3BwCmluZGV4IGQ4M2RmMTIuLjkyODVjMGQgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9ndGsvV2ViQ29udGV4dEd0ay5jcHAK KysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2d0ay9XZWJDb250ZXh0R3RrLmNwcApAQCAt MTE4LDggKzExOCw4IEBAIFN0cmluZyBXZWJDb250ZXh0OjpwbGF0Zm9ybURlZmF1bHRMb2NhbFN0 b3JhZ2VEaXJlY3RvcnkoKSBjb25zdAogCiBTdHJpbmcgV2ViQ29udGV4dDo6cGxhdGZvcm1EZWZh dWx0RGlza0NhY2hlRGlyZWN0b3J5KCkgY29uc3QKIHsKLSAgICBub3RJbXBsZW1lbnRlZCgpOwot ICAgIHJldHVybiBTdHJpbmcoKTsKKyAgICBHT3duUHRyPGNoYXI+IGRpc2tDYWNoZURpcmVjdG9y eShnX2J1aWxkX2ZpbGVuYW1lKGdfZ2V0X3VzZXJfY2FjaGVfZGlyKCksIGdfZ2V0X3ByZ25hbWUo KSwgTlVMTCkpOworICAgIHJldHVybiBXZWJDb3JlOjpmaWxlbmFtZVRvU3RyaW5nKGRpc2tDYWNo ZURpcmVjdG9yeS5nZXQoKSk7CiB9CiAKIFN0cmluZyBXZWJDb250ZXh0OjpwbGF0Zm9ybURlZmF1 bHRDb29raWVTdG9yYWdlRGlyZWN0b3J5KCkgY29uc3QKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQyL1dlYlByb2Nlc3MvZWZsL1dlYlByb2Nlc3NNYWluRWZsLmNwcCBiL1NvdXJjZS9XZWJLaXQy L1dlYlByb2Nlc3MvZWZsL1dlYlByb2Nlc3NNYWluRWZsLmNwcAppbmRleCBiNTRmOWRiLi5lNWFk NDhkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL2VmbC9XZWJQcm9jZXNz TWFpbkVmbC5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9lZmwvV2ViUHJvY2Vz c01haW5FZmwuY3BwCkBAIC0xMjksMTIgKzEyOSw2IEBAIFdLX0VYUE9SVCBpbnQgV2ViUHJvY2Vz c01haW5FZmwoaW50IGFyZ2MsIGNoYXIqIGFyZ3ZbXSkKICAgICAgICAgZ19vYmplY3RfdW5yZWYo cmVzb2x2ZXJFZmwpOwogICAgIH0KIAotICAgIC8vIFNldCBTT1VQIGNhY2hlLgotICAgIFN0cmlu ZyBzb3VwQ2FjaGVEaXJlY3RvcnkgPSBTdHJpbmc6OmZyb21VVEY4KGVmcmVldF9jYWNoZV9ob21l X2dldCgpKSArICIvV2ViS2l0RWZsIjsKLSAgICBTb3VwQ2FjaGUqIHNvdXBDYWNoZSA9IHNvdXBf Y2FjaGVfbmV3KHNvdXBDYWNoZURpcmVjdG9yeS51dGY4KCkuZGF0YSgpLCBTT1VQX0NBQ0hFX1NJ TkdMRV9VU0VSKTsKLSAgICBzb3VwX3Nlc3Npb25fYWRkX2ZlYXR1cmUoc2Vzc2lvbiwgU09VUF9T RVNTSU9OX0ZFQVRVUkUoc291cENhY2hlKSk7Ci0gICAgc291cF9jYWNoZV9sb2FkKHNvdXBDYWNo ZSk7Ci0KICAgICBpbnQgc29ja2V0ID0gYXRvaShhcmd2WzFdKTsKIAogICAgIENoaWxkUHJvY2Vz c0luaXRpYWxpemF0aW9uUGFyYW1ldGVycyBwYXJhbWV0ZXJzOwpAQCAtMTQ0LDkgKzEzOCw5IEBA IFdLX0VYUE9SVCBpbnQgV2ViUHJvY2Vzc01haW5FZmwoaW50IGFyZ2MsIGNoYXIqIGFyZ3ZbXSkK IAogICAgIFJ1bkxvb3A6OnJ1bigpOwogCisgICAgU291cENhY2hlKiBzb3VwQ2FjaGUgPSBTT1VQ X0NBQ0hFKHNvdXBfc2Vzc2lvbl9nZXRfZmVhdHVyZShzZXNzaW9uLCBTT1VQX1RZUEVfQ0FDSEUp KTsKICAgICBzb3VwX2NhY2hlX2ZsdXNoKHNvdXBDYWNoZSk7CiAgICAgc291cF9jYWNoZV9kdW1w KHNvdXBDYWNoZSk7Ci0gICAgZ19vYmplY3RfdW5yZWYoc291cENhY2hlKTsKIAogICAgIGVkamVf c2h1dGRvd24oKTsKICAgICBlY29yZV9ldmFzX3NodXRkb3duKCk7CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0Mi9XZWJQcm9jZXNzL2d0ay9XZWJQcm9jZXNzTWFpbkd0ay5jcHAgYi9Tb3VyY2Uv V2ViS2l0Mi9XZWJQcm9jZXNzL2d0ay9XZWJQcm9jZXNzTWFpbkd0ay5jcHAKaW5kZXggNzI2ZTlk ZC4uYjRkYjJiZDQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvZ3RrL1dl YlByb2Nlc3NNYWluR3RrLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL2d0ay9X ZWJQcm9jZXNzTWFpbkd0ay5jcHAKQEAgLTgwLDE1ICs4MCwxMSBAQCBXS19FWFBPUlQgaW50IFdl YlByb2Nlc3NNYWluR3RrKGludCBhcmdjLCBjaGFyKiBhcmd2W10pCiAgICAgZ19vYmplY3Rfc2V0 KHNlc3Npb24sIFNPVVBfU0VTU0lPTl9TU0xfVVNFX1NZU1RFTV9DQV9GSUxFLCBUUlVFLAogICAg ICAgICAgICAgICAgICBTT1VQX1NFU1NJT05fU1NMX1NUUklDVCwgRkFMU0UsIE5VTEwpOwogCi0g ICAgR093blB0cjxjaGFyPiBzb3VwQ2FjaGVEaXJlY3RvcnkoZ19idWlsZF9maWxlbmFtZShnX2dl dF91c2VyX2NhY2hlX2RpcigpLCBnX2dldF9wcmduYW1lKCksIE5VTEwpKTsKLSAgICBHUmVmUHRy PFNvdXBDYWNoZT4gc291cENhY2hlID0gYWRvcHRHUmVmKHNvdXBfY2FjaGVfbmV3KHNvdXBDYWNo ZURpcmVjdG9yeS5nZXQoKSwgU09VUF9DQUNIRV9TSU5HTEVfVVNFUikpOwotICAgIHNvdXBfc2Vz c2lvbl9hZGRfZmVhdHVyZShzZXNzaW9uLCBTT1VQX1NFU1NJT05fRkVBVFVSRShzb3VwQ2FjaGUu Z2V0KCkpKTsKLSAgICBzb3VwX2NhY2hlX2xvYWQoc291cENhY2hlLmdldCgpKTsKLQogICAgIFJ1 bkxvb3A6OnJ1bigpOwogCi0gICAgc291cF9jYWNoZV9mbHVzaChzb3VwQ2FjaGUuZ2V0KCkpOwot ICAgIHNvdXBfY2FjaGVfZHVtcChzb3VwQ2FjaGUuZ2V0KCkpOworICAgIFNvdXBDYWNoZSogc291 cENhY2hlID0gU09VUF9DQUNIRShzb3VwX3Nlc3Npb25fZ2V0X2ZlYXR1cmUoc2Vzc2lvbiwgU09V UF9UWVBFX0NBQ0hFKSk7CisgICAgc291cF9jYWNoZV9mbHVzaChzb3VwQ2FjaGUpOworICAgIHNv dXBfY2FjaGVfZHVtcChzb3VwQ2FjaGUpOwogCiAgICAgcmV0dXJuIDA7CiB9CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL3NvdXAvV2ViUHJvY2Vzc1NvdXAuY3BwIGIvU291 cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9zb3VwL1dlYlByb2Nlc3NTb3VwLmNwcAppbmRleCBhYWVm OTY1Li4xZWNkNjdkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL3NvdXAv V2ViUHJvY2Vzc1NvdXAuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3Mvc291cC9X ZWJQcm9jZXNzU291cC5jcHAKQEAgLTE2NCw2ICsxNjQsMTEgQEAgc3RhdGljIHZvaWQgbGFuZ3Vh Z2VDaGFuZ2VkKHZvaWQqKQogCiB2b2lkIFdlYlByb2Nlc3M6OnBsYXRmb3JtSW5pdGlhbGl6ZVdl YlByb2Nlc3MoY29uc3QgV2ViUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVycyYgcGFyYW1ldGVycywg Q29yZUlQQzo6TWVzc2FnZURlY29kZXImKQogeworICAgIEFTU0VSVCghcGFyYW1ldGVycy5kaXNr Q2FjaGVEaXJlY3RvcnkuaXNFbXB0eSgpICYmICFwYXJhbWV0ZXJzLmRpc2tDYWNoZURpcmVjdG9y eS5pc051bGwoKSk7CisgICAgR1JlZlB0cjxTb3VwQ2FjaGU+IHNvdXBDYWNoZSA9IGFkb3B0R1Jl Zihzb3VwX2NhY2hlX25ldyhwYXJhbWV0ZXJzLmRpc2tDYWNoZURpcmVjdG9yeS51dGY4KCkuZGF0 YSgpLCBTT1VQX0NBQ0hFX1NJTkdMRV9VU0VSKSk7CisgICAgc291cF9zZXNzaW9uX2FkZF9mZWF0 dXJlKFdlYkNvcmU6OlJlc291cmNlSGFuZGxlOjpkZWZhdWx0U2Vzc2lvbigpLCBTT1VQX1NFU1NJ T05fRkVBVFVSRShzb3VwQ2FjaGUuZ2V0KCkpKTsKKyAgICBzb3VwX2NhY2hlX2xvYWQoc291cENh Y2hlLmdldCgpKTsKKwogICAgIGlmICghcGFyYW1ldGVycy5sYW5ndWFnZXMuaXNFbXB0eSgpKQog ICAgICAgICBzZXRTb3VwU2Vzc2lvbkFjY2VwdExhbmd1YWdlKHBhcmFtZXRlcnMubGFuZ3VhZ2Vz KTsKIAo= 192202 2013-03-08 04:47:59 -0800 2013-04-22 08:02:34 -0700 Updated patch wk2-soup-cache-dir2.diff text/plain 6041 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCA3Mzk2OWNmLi5lYTVhMmNlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjgg QEAKKzIwMTMtMDMtMDggIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29t PgorCisgICAgICAgIFtTT1VQXSBTb3VwIGRpc2sgY2FjaGUgc2hvdWxkIHJlc3BlY3QgdGhlIGRp c2tDYWNoZURpcmVjdG9yeSBmcm9tIHRoZSBwcm9jZXNzIGluaXRpYWwgcGFyYW1ldGVycworICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTExODQ1CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTW92ZSB0aGUgY2Fj aGUgaW5pdGlhbGl6YXRpb24gdG8gcGxhdGZvcm1Jbml0aWFsaXplV2ViUHJvY2VzcygpIHRvCisg ICAgICAgIGNyZWF0ZSB0aGUgY2FjaGUgdXNpbmcgdGhlIGRpcmVjdG9yeSByZWNlaXZlZCBmcm9t IHRoZSBVSQorICAgICAgICBwcm9jZXNzLiBUaGlzIGFsbG93cyB0byBhZGQgcHVibGljIEFQSSB0 byBzZXQgYSBkaWZmZXJlbnQgZGlzaworICAgICAgICBjYWNoZSBkaXJlY3RvcnkgZnJvbSB0aGUg VUkgcHJvY2Vzcy4KKworICAgICAgICAqIFVJUHJvY2Vzcy9lZmwvV2ViQ29udGV4dEVmbC5jcHA6 CisgICAgICAgIChXZWJLaXQ6OldlYkNvbnRleHQ6OnBsYXRmb3JtRGVmYXVsdERpc2tDYWNoZURp cmVjdG9yeSk6IFJldHVybgorICAgICAgICBkZWZhdWx0IGRpc2sgY2FjaGUgZGlyZWN0b3J5Lgor ICAgICAgICAqIFVJUHJvY2Vzcy9ndGsvV2ViQ29udGV4dEd0ay5jcHA6CisgICAgICAgIChXZWJL aXQ6OldlYkNvbnRleHQ6OnBsYXRmb3JtRGVmYXVsdERpc2tDYWNoZURpcmVjdG9yeSk6IERpdHRv LgorICAgICAgICAqIFdlYlByb2Nlc3MvZWZsL1dlYlByb2Nlc3NNYWluRWZsLmNwcDoKKyAgICAg ICAgKFdlYktpdDo6V2ViUHJvY2Vzc01haW5FZmwpOiBSZW1vdmUgc291cCBjYWNoZSBpbml0aWFs aXphdGlvbi4KKyAgICAgICAgKiBXZWJQcm9jZXNzL2d0ay9XZWJQcm9jZXNzTWFpbkd0ay5jcHA6 CisgICAgICAgIChXZWJLaXQ6OldlYlByb2Nlc3NNYWluR3RrKTogRGl0dG8uCisgICAgICAgICog V2ViUHJvY2Vzcy9zb3VwL1dlYlByb2Nlc3NTb3VwLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2Vi UHJvY2Vzczo6cGxhdGZvcm1Jbml0aWFsaXplV2ViUHJvY2Vzcyk6IEluaXRpYWxpemUKKyAgICAg ICAgc291cCBjYWNoZS4KKwogMjAxMy0wMy0wNiAgU3VkYXJzYW5hIE5hZ2luZW5pICA8c3VkYXJz YW5hLm5hZ2luZW5pQGludGVsLmNvbT4KIAogICAgICAgICBbR1RLXVtXSzJdIEltcGxlbWVudCBX ZWJJbnNwZWN0b3I6OmxvY2FsaXplZFN0cmluZ3NVUkwoKSB0byByZXR1cm4gdGhlIGZpbGUgVVJM IG9mIGxvY2FsaXplZFN0cmluZ3MuanMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9lZmwvV2ViQ29udGV4dEVmbC5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvZWZs L1dlYkNvbnRleHRFZmwuY3BwCmluZGV4IDY5ZWI2NmIuLjkyMjkxZDQgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9lZmwvV2ViQ29udGV4dEVmbC5jcHAKKysrIGIvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL2VmbC9XZWJDb250ZXh0RWZsLmNwcApAQCAtMTE3LDggKzExNyw3 IEBAIFN0cmluZyBXZWJDb250ZXh0OjpwbGF0Zm9ybURlZmF1bHRMb2NhbFN0b3JhZ2VEaXJlY3Rv cnkoKSBjb25zdAogCiBTdHJpbmcgV2ViQ29udGV4dDo6cGxhdGZvcm1EZWZhdWx0RGlza0NhY2hl RGlyZWN0b3J5KCkgY29uc3QKIHsKLSAgICBub3RJbXBsZW1lbnRlZCgpOwotICAgIHJldHVybiBT dHJpbmcoKTsKKyAgICByZXR1cm4gU3RyaW5nOjpmcm9tVVRGOChlZnJlZXRfY2FjaGVfaG9tZV9n ZXQoKSkgKyAiL1dlYktpdEVmbCI7CiB9CiAKIFN0cmluZyBXZWJDb250ZXh0OjpwbGF0Zm9ybURl ZmF1bHRDb29raWVTdG9yYWdlRGlyZWN0b3J5KCkgY29uc3QKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9ndGsvV2ViQ29udGV4dEd0ay5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvZ3RrL1dlYkNvbnRleHRHdGsuY3BwCmluZGV4IGQ4M2RmMTIuLjkyODVjMGQgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9ndGsvV2ViQ29udGV4dEd0ay5jcHAK KysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2d0ay9XZWJDb250ZXh0R3RrLmNwcApAQCAt MTE4LDggKzExOCw4IEBAIFN0cmluZyBXZWJDb250ZXh0OjpwbGF0Zm9ybURlZmF1bHRMb2NhbFN0 b3JhZ2VEaXJlY3RvcnkoKSBjb25zdAogCiBTdHJpbmcgV2ViQ29udGV4dDo6cGxhdGZvcm1EZWZh dWx0RGlza0NhY2hlRGlyZWN0b3J5KCkgY29uc3QKIHsKLSAgICBub3RJbXBsZW1lbnRlZCgpOwot ICAgIHJldHVybiBTdHJpbmcoKTsKKyAgICBHT3duUHRyPGNoYXI+IGRpc2tDYWNoZURpcmVjdG9y eShnX2J1aWxkX2ZpbGVuYW1lKGdfZ2V0X3VzZXJfY2FjaGVfZGlyKCksIGdfZ2V0X3ByZ25hbWUo KSwgTlVMTCkpOworICAgIHJldHVybiBXZWJDb3JlOjpmaWxlbmFtZVRvU3RyaW5nKGRpc2tDYWNo ZURpcmVjdG9yeS5nZXQoKSk7CiB9CiAKIFN0cmluZyBXZWJDb250ZXh0OjpwbGF0Zm9ybURlZmF1 bHRDb29raWVTdG9yYWdlRGlyZWN0b3J5KCkgY29uc3QKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQyL1dlYlByb2Nlc3MvZWZsL1dlYlByb2Nlc3NNYWluRWZsLmNwcCBiL1NvdXJjZS9XZWJLaXQy L1dlYlByb2Nlc3MvZWZsL1dlYlByb2Nlc3NNYWluRWZsLmNwcAppbmRleCBiNTRmOWRiLi45Njlj ZDgzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL2VmbC9XZWJQcm9jZXNz TWFpbkVmbC5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9lZmwvV2ViUHJvY2Vz c01haW5FZmwuY3BwCkBAIC0xMjksMTIgKzEyOSw2IEBAIFdLX0VYUE9SVCBpbnQgV2ViUHJvY2Vz c01haW5FZmwoaW50IGFyZ2MsIGNoYXIqIGFyZ3ZbXSkKICAgICAgICAgZ19vYmplY3RfdW5yZWYo cmVzb2x2ZXJFZmwpOwogICAgIH0KIAotICAgIC8vIFNldCBTT1VQIGNhY2hlLgotICAgIFN0cmlu ZyBzb3VwQ2FjaGVEaXJlY3RvcnkgPSBTdHJpbmc6OmZyb21VVEY4KGVmcmVldF9jYWNoZV9ob21l X2dldCgpKSArICIvV2ViS2l0RWZsIjsKLSAgICBTb3VwQ2FjaGUqIHNvdXBDYWNoZSA9IHNvdXBf Y2FjaGVfbmV3KHNvdXBDYWNoZURpcmVjdG9yeS51dGY4KCkuZGF0YSgpLCBTT1VQX0NBQ0hFX1NJ TkdMRV9VU0VSKTsKLSAgICBzb3VwX3Nlc3Npb25fYWRkX2ZlYXR1cmUoc2Vzc2lvbiwgU09VUF9T RVNTSU9OX0ZFQVRVUkUoc291cENhY2hlKSk7Ci0gICAgc291cF9jYWNoZV9sb2FkKHNvdXBDYWNo ZSk7Ci0KICAgICBpbnQgc29ja2V0ID0gYXRvaShhcmd2WzFdKTsKIAogICAgIENoaWxkUHJvY2Vz c0luaXRpYWxpemF0aW9uUGFyYW1ldGVycyBwYXJhbWV0ZXJzOwpAQCAtMTQ0LDkgKzEzOCwxMCBA QCBXS19FWFBPUlQgaW50IFdlYlByb2Nlc3NNYWluRWZsKGludCBhcmdjLCBjaGFyKiBhcmd2W10p CiAKICAgICBSdW5Mb29wOjpydW4oKTsKIAotICAgIHNvdXBfY2FjaGVfZmx1c2goc291cENhY2hl KTsKLSAgICBzb3VwX2NhY2hlX2R1bXAoc291cENhY2hlKTsKLSAgICBnX29iamVjdF91bnJlZihz b3VwQ2FjaGUpOworICAgIGlmIChTb3VwU2Vzc2lvbkZlYXR1cmUqIHNvdXBDYWNoZSA9IHNvdXBf c2Vzc2lvbl9nZXRfZmVhdHVyZShzZXNzaW9uLCBTT1VQX1RZUEVfQ0FDSEUpKSB7CisgICAgICAg IHNvdXBfY2FjaGVfZmx1c2goU09VUF9DQUNIRShzb3VwQ2FjaGUpKTsKKyAgICAgICAgc291cF9j YWNoZV9kdW1wKFNPVVBfQ0FDSEUoc291cENhY2hlKSk7CisgICAgfQogCiAgICAgZWRqZV9zaHV0 ZG93bigpOwogICAgIGVjb3JlX2V2YXNfc2h1dGRvd24oKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQyL1dlYlByb2Nlc3MvZ3RrL1dlYlByb2Nlc3NNYWluR3RrLmNwcCBiL1NvdXJjZS9XZWJL aXQyL1dlYlByb2Nlc3MvZ3RrL1dlYlByb2Nlc3NNYWluR3RrLmNwcAppbmRleCA3MjZlOWRkLi42 NDY0ZmZhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL2d0ay9XZWJQcm9j ZXNzTWFpbkd0ay5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9ndGsvV2ViUHJv Y2Vzc01haW5HdGsuY3BwCkBAIC04MCwxNSArODAsMTIgQEAgV0tfRVhQT1JUIGludCBXZWJQcm9j ZXNzTWFpbkd0ayhpbnQgYXJnYywgY2hhciogYXJndltdKQogICAgIGdfb2JqZWN0X3NldChzZXNz aW9uLCBTT1VQX1NFU1NJT05fU1NMX1VTRV9TWVNURU1fQ0FfRklMRSwgVFJVRSwKICAgICAgICAg ICAgICAgICAgU09VUF9TRVNTSU9OX1NTTF9TVFJJQ1QsIEZBTFNFLCBOVUxMKTsKIAotICAgIEdP d25QdHI8Y2hhcj4gc291cENhY2hlRGlyZWN0b3J5KGdfYnVpbGRfZmlsZW5hbWUoZ19nZXRfdXNl cl9jYWNoZV9kaXIoKSwgZ19nZXRfcHJnbmFtZSgpLCBOVUxMKSk7Ci0gICAgR1JlZlB0cjxTb3Vw Q2FjaGU+IHNvdXBDYWNoZSA9IGFkb3B0R1JlZihzb3VwX2NhY2hlX25ldyhzb3VwQ2FjaGVEaXJl Y3RvcnkuZ2V0KCksIFNPVVBfQ0FDSEVfU0lOR0xFX1VTRVIpKTsKLSAgICBzb3VwX3Nlc3Npb25f YWRkX2ZlYXR1cmUoc2Vzc2lvbiwgU09VUF9TRVNTSU9OX0ZFQVRVUkUoc291cENhY2hlLmdldCgp KSk7Ci0gICAgc291cF9jYWNoZV9sb2FkKHNvdXBDYWNoZS5nZXQoKSk7Ci0KICAgICBSdW5Mb29w OjpydW4oKTsKIAotICAgIHNvdXBfY2FjaGVfZmx1c2goc291cENhY2hlLmdldCgpKTsKLSAgICBz b3VwX2NhY2hlX2R1bXAoc291cENhY2hlLmdldCgpKTsKKyAgICBpZiAoU291cFNlc3Npb25GZWF0 dXJlKiBzb3VwQ2FjaGUgPSBzb3VwX3Nlc3Npb25fZ2V0X2ZlYXR1cmUoc2Vzc2lvbiwgU09VUF9U WVBFX0NBQ0hFKSkgeworICAgICAgICBzb3VwX2NhY2hlX2ZsdXNoKFNPVVBfQ0FDSEUoc291cENh Y2hlKSk7CisgICAgICAgIHNvdXBfY2FjaGVfZHVtcChTT1VQX0NBQ0hFKHNvdXBDYWNoZSkpOwor ICAgIH0KIAogICAgIHJldHVybiAwOwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2Vi UHJvY2Vzcy9zb3VwL1dlYlByb2Nlc3NTb3VwLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nl c3Mvc291cC9XZWJQcm9jZXNzU291cC5jcHAKaW5kZXggYWFlZjk2NS4uY2ZiY2IzNyAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9zb3VwL1dlYlByb2Nlc3NTb3VwLmNwcAor KysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL3NvdXAvV2ViUHJvY2Vzc1NvdXAuY3BwCkBA IC0xNjQsNiArMTY0LDExIEBAIHN0YXRpYyB2b2lkIGxhbmd1YWdlQ2hhbmdlZCh2b2lkKikKIAog dm9pZCBXZWJQcm9jZXNzOjpwbGF0Zm9ybUluaXRpYWxpemVXZWJQcm9jZXNzKGNvbnN0IFdlYlBy b2Nlc3NDcmVhdGlvblBhcmFtZXRlcnMmIHBhcmFtZXRlcnMsIENvcmVJUEM6Ok1lc3NhZ2VEZWNv ZGVyJikKIHsKKyAgICBBU1NFUlQoIXBhcmFtZXRlcnMuZGlza0NhY2hlRGlyZWN0b3J5LmlzRW1w dHkoKSk7CisgICAgR1JlZlB0cjxTb3VwQ2FjaGU+IHNvdXBDYWNoZSA9IGFkb3B0R1JlZihzb3Vw X2NhY2hlX25ldyhwYXJhbWV0ZXJzLmRpc2tDYWNoZURpcmVjdG9yeS51dGY4KCkuZGF0YSgpLCBT T1VQX0NBQ0hFX1NJTkdMRV9VU0VSKSk7CisgICAgc291cF9zZXNzaW9uX2FkZF9mZWF0dXJlKFdl YkNvcmU6OlJlc291cmNlSGFuZGxlOjpkZWZhdWx0U2Vzc2lvbigpLCBTT1VQX1NFU1NJT05fRkVB VFVSRShzb3VwQ2FjaGUuZ2V0KCkpKTsKKyAgICBzb3VwX2NhY2hlX2xvYWQoc291cENhY2hlLmdl dCgpKTsKKwogICAgIGlmICghcGFyYW1ldGVycy5sYW5ndWFnZXMuaXNFbXB0eSgpKQogICAgICAg ICBzZXRTb3VwU2Vzc2lvbkFjY2VwdExhbmd1YWdlKHBhcmFtZXRlcnMubGFuZ3VhZ2VzKTsKIAo=