131513 2014-04-10 16:23:53 -0700 [iOS WebKit2]: Share NSURLCache directory for webkit processes 2014-04-11 13:34:44 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 psolanki psolanki psolanki oldest_to_newest 999682 0 psolanki 2014-04-10 16:23:53 -0700 [iOS WebKit2]: Share NSURLCache directory for webkit processes 999683 1 psolanki 2014-04-10 16:24:25 -0700 <rdar://problem/16420859> 999684 2 229087 psolanki 2014-04-10 16:26:11 -0700 Created attachment 229087 Patch 999685 3 229088 psolanki 2014-04-10 16:33:28 -0700 Created attachment 229088 Patch 999705 4 229088 ap 2014-04-10 17:23:42 -0700 Comment on attachment 229088 Patch I'd have put both branches in NetworkProcessCocoa.mm, matching WebProcessCocoa.mm - it's unfortunate that the code is structured differently between the two. r=me either way. 999927 5 psolanki 2014-04-11 10:44:25 -0700 (In reply to comment #4) > (From update of attachment 229088 [details]) > I'd have put both branches in NetworkProcessCocoa.mm, matching WebProcessCocoa.mm Okay. > - it's unfortunate that the code is structured differently between the two. Yeah. > r=me either way. Thanks! 1000002 6 psolanki 2014-04-11 13:34:44 -0700 Committed r167143: <http://trac.webkit.org/changeset/167143> 229087 2014-04-10 16:26:11 -0700 2014-04-10 16:33:27 -0700 Patch bug-131513-20140410162550.patch text/plain 4842 psolanki U3VidmVyc2lvbiBSZXZpc2lvbjogMTY3MDIwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggOGY3MDk1YzMxMDhiZDg0 MmU5MzFlNTI5NTIwODM2MDI2OGE0NjMzZS4uYTU2Mzc5NDFkMzM4OGI1MjlkOTQ5MTVjOGI1M2Rk ZDE4ODA1ZDUxMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDE0LTA0LTEwICBQcmF0 aWsgU29sYW5raSAgPHBzb2xhbmtpQGFwcGxlLmNvbT4KKworICAgICAgICBbaU9TIFdlYktpdDJd OiBTaGFyZSBOU1VSTENhY2hlIGRpcmVjdG9yeSBmb3Igd2Via2l0IHByb2Nlc3NlcworICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTMxNTEzCisgICAgICAg IDxyZGFyOi8vcHJvYmxlbS8xNjQyMDg1OT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBVc2UgaU9TIHNwZWNpZmljIE5TVVJMQ2FjaGUgQVBJIHRvIHNo YXJlIHRoZSBjYWNoZSBkaXJlY3RvcnkgdXNlZCBieSB0aGUgbmV0d29ya2luZyBwcm9jZXNzIGFu ZAorICAgICAgICBTYWZhcmkuCisKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9jb2NvYS9OZXR3 b3JrUHJvY2Vzc0NvY29hLm1tOgorICAgICAgICAoV2ViS2l0OjpOZXR3b3JrUHJvY2Vzczo6cGxh dGZvcm1Jbml0aWFsaXplTmV0d29ya1Byb2Nlc3NDb2NvYSk6CisgICAgICAgICogTmV0d29ya1By b2Nlc3MvaW9zL05ldHdvcmtQcm9jZXNzSU9TLm1tOgorICAgICAgICAoV2ViS2l0OjpOZXR3b3Jr UHJvY2Vzczo6cGxhdGZvcm1Jbml0aWFsaXplTmV0d29ya1Byb2Nlc3MpOgorICAgICAgICAqIE5l dHdvcmtQcm9jZXNzL21hYy9OZXR3b3JrUHJvY2Vzc01hYy5tbToKKyAgICAgICAgKFdlYktpdDo6 TmV0d29ya1Byb2Nlc3M6OnBsYXRmb3JtSW5pdGlhbGl6ZU5ldHdvcmtQcm9jZXNzKToKKwogMjAx NC0wNC0wOSAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CiAKICAg ICAgICAgVW5yZXZpZXdlZC4gRml4IEdUSysgYnVpbGQgYWZ0ZXIgcjE2Njk3NS4KZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL2NvY29hL05ldHdvcmtQcm9jZXNzQ29j b2EubW0gYi9Tb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9jb2NvYS9OZXR3b3JrUHJvY2Vz c0NvY29hLm1tCmluZGV4IGM0ODMzY2Q2OWViODZjOTg3NTM1MjEzZTU4MzEwOWNmMTkyMTc0Nzku LjU5MDY2ODczYzUwYzc2ZWM1MmMyOTRhZmE0YWM3ZWQ0NGFjZTJjODQgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL2NvY29hL05ldHdvcmtQcm9jZXNzQ29jb2EubW0K KysrIGIvU291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvY29jb2EvTmV0d29ya1Byb2Nlc3ND b2NvYS5tbQpAQCAtNTQsMjEgKzU0LDYgQEAgdm9pZCBOZXR3b3JrUHJvY2Vzczo6cGxhdGZvcm1M b3dNZW1vcnlIYW5kbGVyKGJvb2wpCiAKIHZvaWQgTmV0d29ya1Byb2Nlc3M6OnBsYXRmb3JtSW5p dGlhbGl6ZU5ldHdvcmtQcm9jZXNzQ29jb2EoY29uc3QgTmV0d29ya1Byb2Nlc3NDcmVhdGlvblBh cmFtZXRlcnMmIHBhcmFtZXRlcnMpCiB7Ci0gICAgbV9kaXNrQ2FjaGVEaXJlY3RvcnkgPSBwYXJh bWV0ZXJzLmRpc2tDYWNoZURpcmVjdG9yeTsKLQotICAgIGlmICghbV9kaXNrQ2FjaGVEaXJlY3Rv cnkuaXNOdWxsKCkpIHsKLSAgICAgICAgU2FuZGJveEV4dGVuc2lvbjo6Y29uc3VtZVBlcm1hbmVu dGx5KHBhcmFtZXRlcnMuZGlza0NhY2hlRGlyZWN0b3J5RXh0ZW5zaW9uSGFuZGxlKTsKLSNpZiBQ TEFURk9STShJT1MpCi0gICAgICAgIE5TU3RyaW5nICpkaXNrQ2FjaGVQYXRoID0gbmlsOwotI2Vs c2UKLSAgICAgICAgTlNTdHJpbmcgKmRpc2tDYWNoZVBhdGggPSBwYXJhbWV0ZXJzLmRpc2tDYWNo ZURpcmVjdG9yeTsKLSNlbmRpZgotICAgICAgICBbTlNVUkxDYWNoZSBzZXRTaGFyZWRVUkxDYWNo ZTphZG9wdE5TKFtbTlNVUkxDYWNoZSBhbGxvY10KLSAgICAgICAgICAgIGluaXRXaXRoTWVtb3J5 Q2FwYWNpdHk6cGFyYW1ldGVycy5uc1VSTENhY2hlTWVtb3J5Q2FwYWNpdHkKLSAgICAgICAgICAg IGRpc2tDYXBhY2l0eTpwYXJhbWV0ZXJzLm5zVVJMQ2FjaGVEaXNrQ2FwYWNpdHkKLSAgICAgICAg ICAgIGRpc2tQYXRoOmRpc2tDYWNoZVBhdGhdKS5nZXQoKV07Ci0gICAgfQotCiAjaWYgUExBVEZP Uk0oSU9TKSB8fCBfX01BQ19PU19YX1ZFUlNJT05fTUlOX1JFUVVJUkVEID49IDEwOTAKICAgICBS ZXRhaW5QdHI8Q0ZVUkxDYWNoZVJlZj4gY2FjaGUgPSBhZG9wdENGKENGVVJMQ2FjaGVDb3B5U2hh cmVkVVJMQ2FjaGUoKSk7CiAgICAgaWYgKCFjYWNoZSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQyL05ldHdvcmtQcm9jZXNzL2lvcy9OZXR3b3JrUHJvY2Vzc0lPUy5tbSBiL1NvdXJjZS9XZWJL aXQyL05ldHdvcmtQcm9jZXNzL2lvcy9OZXR3b3JrUHJvY2Vzc0lPUy5tbQppbmRleCA4ZGEzZjJj ZjhkMjg0ZjVhNzRiN2UyYThlNmQ2MTQ5OWFlZTAwZmIxLi40MWJkNmRjYjhiNTE1ZmNhYzQzOWEx OGFjNjJhYThjMWNjNDU2NjkyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJv Y2Vzcy9pb3MvTmV0d29ya1Byb2Nlc3NJT1MubW0KKysrIGIvU291cmNlL1dlYktpdDIvTmV0d29y a1Byb2Nlc3MvaW9zL05ldHdvcmtQcm9jZXNzSU9TLm1tCkBAIC0zNyw2ICszNywxMCBAQCBAaW50 ZXJmYWNlIE5TVVJMUmVxdWVzdCAoV0tEZXRhaWxzKQogKyAodm9pZClzZXRBbGxvd3NTcGVjaWZp Y0hUVFBTQ2VydGlmaWNhdGU6KE5TQXJyYXkgKiljZXJ0aWZpY2F0ZUNoYWluIGZvckhvc3Q6KE5T U3RyaW5nICopaG9zdDsKIEBlbmQKIAorQGludGVyZmFjZSBOU1VSTENhY2hlIChXS0RldGFpbHMp CistKGlkKV9pbml0V2l0aE1lbW9yeUNhcGFjaXR5OihOU1VJbnRlZ2VyKW1lbW9yeUNhcGFjaXR5 IGRpc2tDYXBhY2l0eTooTlNVSW50ZWdlcilkaXNrQ2FwYWNpdHkgcmVsYXRpdmVQYXRoOihOU1N0 cmluZyAqKXBhdGg7CitAZW5kCisKIHVzaW5nIG5hbWVzcGFjZSBXZWJDb3JlOwogCiBuYW1lc3Bh Y2UgV2ViS2l0IHsKQEAgLTY3LDYgKzcxLDEzIEBAIHZvaWQgTmV0d29ya1Byb2Nlc3M6OmNsZWFy Q2FjaGVGb3JBbGxPcmlnaW5zKHVpbnQzMl90KQogCiB2b2lkIE5ldHdvcmtQcm9jZXNzOjpwbGF0 Zm9ybUluaXRpYWxpemVOZXR3b3JrUHJvY2Vzcyhjb25zdCBOZXR3b3JrUHJvY2Vzc0NyZWF0aW9u UGFyYW1ldGVycyYgcGFyYW1ldGVycykKIHsKKyAgICBpZiAoIXBhcmFtZXRlcnMudWlQcm9jZXNz QnVuZGxlSWRlbnRpZmllci5pc051bGwoKSkgeworICAgICAgICBbTlNVUkxDYWNoZSBzZXRTaGFy ZWRVUkxDYWNoZTphZG9wdE5TKFtbTlNVUkxDYWNoZSBhbGxvY10KKyAgICAgICAgICAgIF9pbml0 V2l0aE1lbW9yeUNhcGFjaXR5OnBhcmFtZXRlcnMubnNVUkxDYWNoZU1lbW9yeUNhcGFjaXR5Cisg ICAgICAgICAgICBkaXNrQ2FwYWNpdHk6cGFyYW1ldGVycy5uc1VSTENhY2hlRGlza0NhcGFjaXR5 CisgICAgICAgICAgICByZWxhdGl2ZVBhdGg6cGFyYW1ldGVycy51aVByb2Nlc3NCdW5kbGVJZGVu dGlmaWVyXSkuZ2V0KCldOworICAgIH0KKwogICAgIHBsYXRmb3JtSW5pdGlhbGl6ZU5ldHdvcmtQ cm9jZXNzQ29jb2EocGFyYW1ldGVycyk7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQy L05ldHdvcmtQcm9jZXNzL21hYy9OZXR3b3JrUHJvY2Vzc01hYy5tbSBiL1NvdXJjZS9XZWJLaXQy L05ldHdvcmtQcm9jZXNzL21hYy9OZXR3b3JrUHJvY2Vzc01hYy5tbQppbmRleCAxYzlmZmYzMzYz YmNmMDYzNjIyNDhjZDIwYzQ3NjZiNjVlNzdmYTExLi4yYjE4NjhjNzMxZWNjZGM4M2QyMmMxZmU2 NGNjNGFlNzRmMjM5ZWRlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vz cy9tYWMvTmV0d29ya1Byb2Nlc3NNYWMubW0KKysrIGIvU291cmNlL1dlYktpdDIvTmV0d29ya1By b2Nlc3MvbWFjL05ldHdvcmtQcm9jZXNzTWFjLm1tCkBAIC05OSw2ICs5OSwxNiBAQCBzdGF0aWMg dm9pZCBvdmVycmlkZVN5c3RlbVByb3hpZXMoY29uc3QgU3RyaW5nJiBodHRwUHJveHksIGNvbnN0 IFN0cmluZyYgaHR0cHNQcgogCiB2b2lkIE5ldHdvcmtQcm9jZXNzOjpwbGF0Zm9ybUluaXRpYWxp emVOZXR3b3JrUHJvY2Vzcyhjb25zdCBOZXR3b3JrUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVycyYg cGFyYW1ldGVycykKIHsKKyAgICBtX2Rpc2tDYWNoZURpcmVjdG9yeSA9IHBhcmFtZXRlcnMuZGlz a0NhY2hlRGlyZWN0b3J5OworCisgICAgaWYgKCFtX2Rpc2tDYWNoZURpcmVjdG9yeS5pc051bGwo KSkgeworICAgICAgICBTYW5kYm94RXh0ZW5zaW9uOjpjb25zdW1lUGVybWFuZW50bHkocGFyYW1l dGVycy5kaXNrQ2FjaGVEaXJlY3RvcnlFeHRlbnNpb25IYW5kbGUpOworICAgICAgICBbTlNVUkxD YWNoZSBzZXRTaGFyZWRVUkxDYWNoZTphZG9wdE5TKFtbTlNVUkxDYWNoZSBhbGxvY10KKyAgICAg ICAgICAgIGluaXRXaXRoTWVtb3J5Q2FwYWNpdHk6cGFyYW1ldGVycy5uc1VSTENhY2hlTWVtb3J5 Q2FwYWNpdHkKKyAgICAgICAgICAgIGRpc2tDYXBhY2l0eTpwYXJhbWV0ZXJzLm5zVVJMQ2FjaGVE aXNrQ2FwYWNpdHkKKyAgICAgICAgICAgIGRpc2tQYXRoOnBhcmFtZXRlcnMuZGlza0NhY2hlRGly ZWN0b3J5XSkuZ2V0KCldOworICAgIH0KKwogICAgIHBsYXRmb3JtSW5pdGlhbGl6ZU5ldHdvcmtQ cm9jZXNzQ29jb2EocGFyYW1ldGVycyk7CiAKICNpZiBFTkFCTEUoU0VDX0lURU1fU0hJTSkK 229088 2014-04-10 16:33:28 -0700 2014-04-10 17:23:42 -0700 Patch bug-131513-20140410163308.patch text/plain 6938 psolanki U3VidmVyc2lvbiBSZXZpc2lvbjogMTY3MDIwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggOGY3MDk1YzMxMDhiZDg0 MmU5MzFlNTI5NTIwODM2MDI2OGE0NjMzZS4uZmIwODJlMGY1ZDRiY2E5Zjk1NjVhMjkwNGI2ZDVk OWQxMzYwZWFkMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDE0LTA0LTEwICBQcmF0 aWsgU29sYW5raSAgPHBzb2xhbmtpQGFwcGxlLmNvbT4KKworICAgICAgICBbaU9TIFdlYktpdDJd OiBTaGFyZSBOU1VSTENhY2hlIGRpcmVjdG9yeSBmb3Igd2Via2l0IHByb2Nlc3NlcworICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTMxNTEzCisgICAgICAg IDxyZGFyOi8vcHJvYmxlbS8xNjQyMDg1OT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBVc2UgaU9TIHNwZWNpZmljIE5TVVJMQ2FjaGUgQVBJIHRvIHNo YXJlIHRoZSBjYWNoZSBkaXJlY3RvcnkgdXNlZCBieSB0aGUgbmV0d29ya2luZyBwcm9jZXNzLAor ICAgICAgICB3ZWIgcHJvY2VzcyBhbmQgU2FmYXJpLgorCisgICAgICAgICogTmV0d29ya1Byb2Nl c3MvY29jb2EvTmV0d29ya1Byb2Nlc3NDb2NvYS5tbToKKyAgICAgICAgKFdlYktpdDo6TmV0d29y a1Byb2Nlc3M6OnBsYXRmb3JtSW5pdGlhbGl6ZU5ldHdvcmtQcm9jZXNzQ29jb2EpOgorICAgICAg ICAqIE5ldHdvcmtQcm9jZXNzL2lvcy9OZXR3b3JrUHJvY2Vzc0lPUy5tbToKKyAgICAgICAgKFdl YktpdDo6TmV0d29ya1Byb2Nlc3M6OnBsYXRmb3JtSW5pdGlhbGl6ZU5ldHdvcmtQcm9jZXNzKToK KyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9tYWMvTmV0d29ya1Byb2Nlc3NNYWMubW06CisgICAg ICAgIChXZWJLaXQ6Ok5ldHdvcmtQcm9jZXNzOjpwbGF0Zm9ybUluaXRpYWxpemVOZXR3b3JrUHJv Y2Vzcyk6CisgICAgICAgICogV2ViUHJvY2Vzcy9jb2NvYS9XZWJQcm9jZXNzQ29jb2EubW06Cisg ICAgICAgIChXZWJLaXQ6OldlYlByb2Nlc3M6OnBsYXRmb3JtSW5pdGlhbGl6ZVdlYlByb2Nlc3Mp OgorCiAyMDE0LTA0LTA5ICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNnYXJjaWFAaWdhbGlhLmNv bT4KIAogICAgICAgICBVbnJldmlld2VkLiBGaXggR1RLKyBidWlsZCBhZnRlciByMTY2OTc1Lgpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvY29jb2EvTmV0d29ya1By b2Nlc3NDb2NvYS5tbSBiL1NvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL2NvY29hL05ldHdv cmtQcm9jZXNzQ29jb2EubW0KaW5kZXggYzQ4MzNjZDY5ZWI4NmM5ODc1MzUyMTNlNTgzMTA5Y2Yx OTIxNzQ3OS4uNTkwNjY4NzNjNTBjNzZlYzUyYzI5NGFmYTRhYzdlZDQ0YWNlMmM4NCAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvY29jb2EvTmV0d29ya1Byb2Nlc3ND b2NvYS5tbQorKysgYi9Tb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9jb2NvYS9OZXR3b3Jr UHJvY2Vzc0NvY29hLm1tCkBAIC01NCwyMSArNTQsNiBAQCB2b2lkIE5ldHdvcmtQcm9jZXNzOjpw bGF0Zm9ybUxvd01lbW9yeUhhbmRsZXIoYm9vbCkKIAogdm9pZCBOZXR3b3JrUHJvY2Vzczo6cGxh dGZvcm1Jbml0aWFsaXplTmV0d29ya1Byb2Nlc3NDb2NvYShjb25zdCBOZXR3b3JrUHJvY2Vzc0Ny ZWF0aW9uUGFyYW1ldGVycyYgcGFyYW1ldGVycykKIHsKLSAgICBtX2Rpc2tDYWNoZURpcmVjdG9y eSA9IHBhcmFtZXRlcnMuZGlza0NhY2hlRGlyZWN0b3J5OwotCi0gICAgaWYgKCFtX2Rpc2tDYWNo ZURpcmVjdG9yeS5pc051bGwoKSkgewotICAgICAgICBTYW5kYm94RXh0ZW5zaW9uOjpjb25zdW1l UGVybWFuZW50bHkocGFyYW1ldGVycy5kaXNrQ2FjaGVEaXJlY3RvcnlFeHRlbnNpb25IYW5kbGUp OwotI2lmIFBMQVRGT1JNKElPUykKLSAgICAgICAgTlNTdHJpbmcgKmRpc2tDYWNoZVBhdGggPSBu aWw7Ci0jZWxzZQotICAgICAgICBOU1N0cmluZyAqZGlza0NhY2hlUGF0aCA9IHBhcmFtZXRlcnMu ZGlza0NhY2hlRGlyZWN0b3J5OwotI2VuZGlmCi0gICAgICAgIFtOU1VSTENhY2hlIHNldFNoYXJl ZFVSTENhY2hlOmFkb3B0TlMoW1tOU1VSTENhY2hlIGFsbG9jXQotICAgICAgICAgICAgaW5pdFdp dGhNZW1vcnlDYXBhY2l0eTpwYXJhbWV0ZXJzLm5zVVJMQ2FjaGVNZW1vcnlDYXBhY2l0eQotICAg ICAgICAgICAgZGlza0NhcGFjaXR5OnBhcmFtZXRlcnMubnNVUkxDYWNoZURpc2tDYXBhY2l0eQot ICAgICAgICAgICAgZGlza1BhdGg6ZGlza0NhY2hlUGF0aF0pLmdldCgpXTsKLSAgICB9Ci0KICNp ZiBQTEFURk9STShJT1MpIHx8IF9fTUFDX09TX1hfVkVSU0lPTl9NSU5fUkVRVUlSRUQgPj0gMTA5 MAogICAgIFJldGFpblB0cjxDRlVSTENhY2hlUmVmPiBjYWNoZSA9IGFkb3B0Q0YoQ0ZVUkxDYWNo ZUNvcHlTaGFyZWRVUkxDYWNoZSgpKTsKICAgICBpZiAoIWNhY2hlKQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvaW9zL05ldHdvcmtQcm9jZXNzSU9TLm1tIGIvU291 cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvaW9zL05ldHdvcmtQcm9jZXNzSU9TLm1tCmluZGV4 IDhkYTNmMmNmOGQyODRmNWE3NGI3ZTJhOGU2ZDYxNDk5YWVlMDBmYjEuLjQxYmQ2ZGNiOGI1MTVm Y2FjNDM5YTE4YWM2MmFhOGMxY2M0NTY2OTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL05l dHdvcmtQcm9jZXNzL2lvcy9OZXR3b3JrUHJvY2Vzc0lPUy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0 Mi9OZXR3b3JrUHJvY2Vzcy9pb3MvTmV0d29ya1Byb2Nlc3NJT1MubW0KQEAgLTM3LDYgKzM3LDEw IEBAIEBpbnRlcmZhY2UgTlNVUkxSZXF1ZXN0IChXS0RldGFpbHMpCiArICh2b2lkKXNldEFsbG93 c1NwZWNpZmljSFRUUFNDZXJ0aWZpY2F0ZTooTlNBcnJheSAqKWNlcnRpZmljYXRlQ2hhaW4gZm9y SG9zdDooTlNTdHJpbmcgKilob3N0OwogQGVuZAogCitAaW50ZXJmYWNlIE5TVVJMQ2FjaGUgKFdL RGV0YWlscykKKy0oaWQpX2luaXRXaXRoTWVtb3J5Q2FwYWNpdHk6KE5TVUludGVnZXIpbWVtb3J5 Q2FwYWNpdHkgZGlza0NhcGFjaXR5OihOU1VJbnRlZ2VyKWRpc2tDYXBhY2l0eSByZWxhdGl2ZVBh dGg6KE5TU3RyaW5nICopcGF0aDsKK0BlbmQKKwogdXNpbmcgbmFtZXNwYWNlIFdlYkNvcmU7CiAK IG5hbWVzcGFjZSBXZWJLaXQgewpAQCAtNjcsNiArNzEsMTMgQEAgdm9pZCBOZXR3b3JrUHJvY2Vz czo6Y2xlYXJDYWNoZUZvckFsbE9yaWdpbnModWludDMyX3QpCiAKIHZvaWQgTmV0d29ya1Byb2Nl c3M6OnBsYXRmb3JtSW5pdGlhbGl6ZU5ldHdvcmtQcm9jZXNzKGNvbnN0IE5ldHdvcmtQcm9jZXNz Q3JlYXRpb25QYXJhbWV0ZXJzJiBwYXJhbWV0ZXJzKQogeworICAgIGlmICghcGFyYW1ldGVycy51 aVByb2Nlc3NCdW5kbGVJZGVudGlmaWVyLmlzTnVsbCgpKSB7CisgICAgICAgIFtOU1VSTENhY2hl IHNldFNoYXJlZFVSTENhY2hlOmFkb3B0TlMoW1tOU1VSTENhY2hlIGFsbG9jXQorICAgICAgICAg ICAgX2luaXRXaXRoTWVtb3J5Q2FwYWNpdHk6cGFyYW1ldGVycy5uc1VSTENhY2hlTWVtb3J5Q2Fw YWNpdHkKKyAgICAgICAgICAgIGRpc2tDYXBhY2l0eTpwYXJhbWV0ZXJzLm5zVVJMQ2FjaGVEaXNr Q2FwYWNpdHkKKyAgICAgICAgICAgIHJlbGF0aXZlUGF0aDpwYXJhbWV0ZXJzLnVpUHJvY2Vzc0J1 bmRsZUlkZW50aWZpZXJdKS5nZXQoKV07CisgICAgfQorCiAgICAgcGxhdGZvcm1Jbml0aWFsaXpl TmV0d29ya1Byb2Nlc3NDb2NvYShwYXJhbWV0ZXJzKTsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvbWFjL05ldHdvcmtQcm9jZXNzTWFjLm1tIGIvU291cmNl L1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvbWFjL05ldHdvcmtQcm9jZXNzTWFjLm1tCmluZGV4IDFj OWZmZjMzNjNiY2YwNjM2MjI0OGNkMjBjNDc2NmI2NWU3N2ZhMTEuLjJiMTg2OGM3MzFlY2NkYzgz ZDIyYzFmZTY0Y2M0YWU3NGYyMzllZGUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL05ldHdv cmtQcm9jZXNzL21hYy9OZXR3b3JrUHJvY2Vzc01hYy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0Mi9O ZXR3b3JrUHJvY2Vzcy9tYWMvTmV0d29ya1Byb2Nlc3NNYWMubW0KQEAgLTk5LDYgKzk5LDE2IEBA IHN0YXRpYyB2b2lkIG92ZXJyaWRlU3lzdGVtUHJveGllcyhjb25zdCBTdHJpbmcmIGh0dHBQcm94 eSwgY29uc3QgU3RyaW5nJiBodHRwc1ByCiAKIHZvaWQgTmV0d29ya1Byb2Nlc3M6OnBsYXRmb3Jt SW5pdGlhbGl6ZU5ldHdvcmtQcm9jZXNzKGNvbnN0IE5ldHdvcmtQcm9jZXNzQ3JlYXRpb25QYXJh bWV0ZXJzJiBwYXJhbWV0ZXJzKQogeworICAgIG1fZGlza0NhY2hlRGlyZWN0b3J5ID0gcGFyYW1l dGVycy5kaXNrQ2FjaGVEaXJlY3Rvcnk7CisKKyAgICBpZiAoIW1fZGlza0NhY2hlRGlyZWN0b3J5 LmlzTnVsbCgpKSB7CisgICAgICAgIFNhbmRib3hFeHRlbnNpb246OmNvbnN1bWVQZXJtYW5lbnRs eShwYXJhbWV0ZXJzLmRpc2tDYWNoZURpcmVjdG9yeUV4dGVuc2lvbkhhbmRsZSk7CisgICAgICAg IFtOU1VSTENhY2hlIHNldFNoYXJlZFVSTENhY2hlOmFkb3B0TlMoW1tOU1VSTENhY2hlIGFsbG9j XQorICAgICAgICAgICAgaW5pdFdpdGhNZW1vcnlDYXBhY2l0eTpwYXJhbWV0ZXJzLm5zVVJMQ2Fj aGVNZW1vcnlDYXBhY2l0eQorICAgICAgICAgICAgZGlza0NhcGFjaXR5OnBhcmFtZXRlcnMubnNV UkxDYWNoZURpc2tDYXBhY2l0eQorICAgICAgICAgICAgZGlza1BhdGg6cGFyYW1ldGVycy5kaXNr Q2FjaGVEaXJlY3RvcnldKS5nZXQoKV07CisgICAgfQorCiAgICAgcGxhdGZvcm1Jbml0aWFsaXpl TmV0d29ya1Byb2Nlc3NDb2NvYShwYXJhbWV0ZXJzKTsKIAogI2lmIEVOQUJMRShTRUNfSVRFTV9T SElNKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9jb2NvYS9XZWJQcm9j ZXNzQ29jb2EubW0gYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL2NvY29hL1dlYlByb2Nlc3ND b2NvYS5tbQppbmRleCA0YzdlM2UxZTFiNDU3NDM1NWVkYzUxYjc0MDUxNmMxMjZhYjAzZDIzLi5l OTQ4OWU3ZGE2MzhlMWQ2ZWI5MTlhYWJkMGY4ZWY0YjQyNDBhYTA3IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0Mi9XZWJQcm9jZXNzL2NvY29hL1dlYlByb2Nlc3NDb2NvYS5tbQorKysgYi9Tb3Vy Y2UvV2ViS2l0Mi9XZWJQcm9jZXNzL2NvY29hL1dlYlByb2Nlc3NDb2NvYS5tbQpAQCAtNTMsNiAr NTMsMTIgQEAKICNpbXBvcnQgPG9iamMvcnVudGltZS5oPgogI2ltcG9ydCA8c3RkaW8uaD4KIAor I2lmIFBMQVRGT1JNKElPUykKK0BpbnRlcmZhY2UgTlNVUkxDYWNoZSAoV0tEZXRhaWxzKQorLShp ZClfaW5pdFdpdGhNZW1vcnlDYXBhY2l0eTooTlNVSW50ZWdlciltZW1vcnlDYXBhY2l0eSBkaXNr Q2FwYWNpdHk6KE5TVUludGVnZXIpZGlza0NhcGFjaXR5IHJlbGF0aXZlUGF0aDooTlNTdHJpbmcg KilwYXRoOworQGVuZAorI2VuZGlmCisKIHVzaW5nIG5hbWVzcGFjZSBXZWJDb3JlOwogCiBuYW1l c3BhY2UgV2ViS2l0IHsKQEAgLTE2NCwxNyArMTcwLDIxIEBAIHZvaWQgV2ViUHJvY2Vzczo6cGxh dGZvcm1Jbml0aWFsaXplV2ViUHJvY2Vzcyhjb25zdCBXZWJQcm9jZXNzQ3JlYXRpb25QYXJhbWV0 ZXJzCiAgICAgLy8gV2hlbiB0aGUgbmV0d29yayBwcm9jZXNzIGlzIGVuYWJsZWQsIGVhY2ggd2Vi IHByb2Nlc3Mgd2FudHMgYSBzdGFuZC1hbG9uZQogICAgIC8vIE5TVVJMQ2FjaGUsIHdoaWNoIGl0 IGNhbiBkaXNhYmxlIHRvIHNhdmUgbWVtb3J5LgogICAgIGlmICghdXNlc05ldHdvcmtQcm9jZXNz KCkpIHsKLSAgICAgICAgaWYgKCFwYXJhbWV0ZXJzLmRpc2tDYWNoZURpcmVjdG9yeS5pc051bGwo KSkgewogI2lmIFBMQVRGT1JNKElPUykKLSAgICAgICAgICAgIE5TU3RyaW5nICpkaXNrQ2FjaGVQ YXRoID0gbmlsOworICAgICAgICBpZiAoIXBhcmFtZXRlcnMudWlQcm9jZXNzQnVuZGxlSWRlbnRp Zmllci5pc051bGwoKSkgeworICAgICAgICAgICAgW05TVVJMQ2FjaGUgc2V0U2hhcmVkVVJMQ2Fj aGU6YWRvcHROUyhbW05TVVJMQ2FjaGUgYWxsb2NdCisgICAgICAgICAgICAgICAgX2luaXRXaXRo TWVtb3J5Q2FwYWNpdHk6cGFyYW1ldGVycy5uc1VSTENhY2hlTWVtb3J5Q2FwYWNpdHkKKyAgICAg ICAgICAgICAgICBkaXNrQ2FwYWNpdHk6cGFyYW1ldGVycy5uc1VSTENhY2hlRGlza0NhcGFjaXR5 CisgICAgICAgICAgICAgICAgcmVsYXRpdmVQYXRoOnBhcmFtZXRlcnMudWlQcm9jZXNzQnVuZGxl SWRlbnRpZmllcl0pLmdldCgpXTsKKyAgICAgICAgfQogI2Vsc2UKLSAgICAgICAgICAgIE5TU3Ry aW5nICpkaXNrQ2FjaGVQYXRoID0gcGFyYW1ldGVycy5kaXNrQ2FjaGVEaXJlY3Rvcnk7Ci0jZW5k aWYKKyAgICAgICAgaWYgKCFwYXJhbWV0ZXJzLmRpc2tDYWNoZURpcmVjdG9yeS5pc051bGwoKSkg ewogICAgICAgICAgICAgW05TVVJMQ2FjaGUgc2V0U2hhcmVkVVJMQ2FjaGU6YWRvcHROUyhbW05T VVJMQ2FjaGUgYWxsb2NdCiAgICAgICAgICAgICAgICAgaW5pdFdpdGhNZW1vcnlDYXBhY2l0eTpw YXJhbWV0ZXJzLm5zVVJMQ2FjaGVNZW1vcnlDYXBhY2l0eQogICAgICAgICAgICAgICAgIGRpc2tD YXBhY2l0eTpwYXJhbWV0ZXJzLm5zVVJMQ2FjaGVEaXNrQ2FwYWNpdHkKLSAgICAgICAgICAgICAg ICBkaXNrUGF0aDpkaXNrQ2FjaGVQYXRoXSkuZ2V0KCldOworICAgICAgICAgICAgICAgIGRpc2tQ YXRoOnBhcmFtZXRlcnMuZGlza0NhY2hlRGlyZWN0b3J5XSkuZ2V0KCldOwogICAgICAgICB9Cisj ZW5kaWYKICAgICB9CiAKICAgICBtX2NvbXBvc2l0aW5nUmVuZGVyU2VydmVyUG9ydCA9IHBhcmFt ZXRlcnMuYWNjZWxlcmF0ZWRDb21wb3NpdGluZ1BvcnQucG9ydCgpOwo=