109931 2013-02-15 05:49:38 -0800 [Soup] Leverage new soup_cookie_jar_get_cookie_list() API 2013-02-15 09:11:32 -0800 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED http://developer.gnome.org/libsoup/stable/SoupCookieJar.html#soup-cookie-jar-get-cookie-list P2 Normal --- 1 cdumez cdumez gustavo laszlo.gombos mrobinson webkit.review.bot oldest_to_newest 833934 0 cdumez 2013-02-15 05:49:38 -0800 In several cases, the CookieJarSoup implementation retrieves / copies ALL the cookies using soup_cookie_jar_all_cookies() and then uses soup_cookie_applies_to_uri() to filter out cookies it is not interested in. This is inefficient. In libsoup 2.40, soup_cookie_jar_get_cookie_list(SoupCookieJar *jar, SoupURI *uri, gboolean for_http) was introduced to retrieve only the cookies that apply to a given URI. We should leverage this new API as it would be much more efficient. libsoup internally stores cookies in a hash table using the host name as key. Therefore, it can retrieve the cookies for a given hostname in O(1). It still iterates over the list of cookies and calls soup_cookie_applies_to_uri() to do further filtering. However, it will iterate over a lot less cookies and it will NOT copy cookies we are not interested in. 833935 1 188548 cdumez 2013-02-15 05:55:58 -0800 Created attachment 188548 Patch 833936 2 188548 kenneth 2013-02-15 06:00:57 -0800 Comment on attachment 188548 Patch LGTM 833946 3 cdumez 2013-02-15 06:13:33 -0800 Martin, kov, could one of you please take a quick look before we land? 834085 4 188548 webkit.review.bot 2013-02-15 09:11:28 -0800 Comment on attachment 188548 Patch Clearing flags on attachment: 188548 Committed r143009: <http://trac.webkit.org/changeset/143009> 834086 5 webkit.review.bot 2013-02-15 09:11:32 -0800 All reviewed patches have been landed. Closing bug. 188548 2013-02-15 05:55:58 -0800 2013-02-15 09:11:28 -0800 Patch 109931_soup_cookies.patch text/plain 3608 cdumez ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBmYjI1MzMxLi5mZmExMWJkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjYg QEAKKzIwMTMtMDItMTUgIENocmlzdG9waGUgRHVtZXogIDxjaC5kdW1lekBzaXNhLnNhbXN1bmcu Y29tPgorCisgICAgICAgIFtTb3VwXSBMZXZlcmFnZSBuZXcgc291cF9jb29raWVfamFyX2dldF9j b29raWVfbGlzdCgpIEFQSQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTA5OTMxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgSW4gc2V2ZXJhbCBjYXNlcywgdGhlIENvb2tpZUphclNvdXAgaW1wbGVtZW50YXRp b24gd2FzIHJldHJpZXZpbmcgLyBjb3B5aW5nIEFMTCB0aGUKKyAgICAgICAgY29va2llcyB1c2lu ZyBzb3VwX2Nvb2tpZV9qYXJfYWxsX2Nvb2tpZXMoKSBhbmQgdGhlbiB1c2luZyBzb3VwX2Nvb2tp ZV9hcHBsaWVzX3RvX3VyaSgpCisgICAgICAgIHRvIGZpbHRlciBvdXQgY29va2llcyBpdCBpcyBu b3QgaW50ZXJlc3RlZCBpbi4gVGhpcyB3YXMgaW5lZmZpY2llbnQuCisKKyAgICAgICAgSW4gbGli c291cCAyLjQwLCBzb3VwX2Nvb2tpZV9qYXJfZ2V0X2Nvb2tpZV9saXN0KCkgd2FzIGludHJvZHVj ZWQgdG8gcmV0cmlldmUgb25seSB0aGUKKyAgICAgICAgY29va2llcyB0aGF0IGFwcGx5IHRvIGEg Z2l2ZW4gVVJJLiBUaGlzIHBhdGNoIGxldmVyYWdlcyB0aGlzIG5ldyBBUEkgaW4gQ29va2llSmFy U291cCdzCisgICAgICAgIGdldFJhd0Nvb2tpZXMoKSBhbmQgZGVsZXRlQ29va2llKCkuIFRoaXMg d2F5LCBvbmx5IHRoZSBjb29raWVzIHdlIGFyZSBpbnRlcmVzdGVkIGluCisgICAgICAgIGFyZSBy ZXRyaWV2ZWQgYW5kIGNvcGllZC4gTGlic291cCBkb2VzIG5vdCBuZWVkIHRvIGl0ZXJhdGUgb3Zl ciBhbGwgdGhlIGNvb2tpZXMgaXRzZWxmCisgICAgICAgIGJlY2F1c2UgaXQga2VlcHMgdGhlIGNv b2tpZXMgaW4gYSBoYXNoIHRhYmxlIHVzaW5nIHRoZSBob3N0IG5hbWVzIGFzIGtleS4KKworICAg ICAgICBObyBuZXcgdGVzdHMsIG5vIGJlaGF2aW9yIGNoYW5nZS4KKworICAgICAgICAqIHBsYXRm b3JtL25ldHdvcmsvc291cC9Db29raWVKYXJTb3VwLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Omdl dFJhd0Nvb2tpZXMpOgorICAgICAgICAoV2ViQ29yZTo6ZGVsZXRlQ29va2llKToKKwogMjAxMy0w Mi0xNCAgSGF5YXRvIEl0byAgPGhheWF0b0BjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgRmFjdG9y IEV2ZW50IHJldGFyZ2V0aW5nIGNvZGUuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9uZXR3b3JrL3NvdXAvQ29va2llSmFyU291cC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9uZXR3b3JrL3NvdXAvQ29va2llSmFyU291cC5jcHAKaW5kZXggZWNmNWE4My4uYWU1NGJj MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9zb3VwL0Nvb2tp ZUphclNvdXAuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvc291cC9D b29raWVKYXJTb3VwLmNwcApAQCAtMTQyLDE1ICsxNDIsMTMgQEAgYm9vbCBnZXRSYXdDb29raWVz KGNvbnN0IE5ldHdvcmtTdG9yYWdlU2Vzc2lvbiYgc2Vzc2lvbiwgY29uc3QgS1VSTCYgLypmaXJz dFBhcnQKICAgICBpZiAoIWphcikKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCi0gICAgR093blB0 cjxHU0xpc3Q+IGNvb2tpZXMoc291cF9jb29raWVfamFyX2FsbF9jb29raWVzKGphcikpOworICAg IEdPd25QdHI8U291cFVSST4gdXJpKHNvdXBfdXJpX25ldyh1cmwuc3RyaW5nKCkudXRmOCgpLmRh dGEoKSkpOworICAgIEdPd25QdHI8R1NMaXN0PiBjb29raWVzKHNvdXBfY29va2llX2phcl9nZXRf Y29va2llX2xpc3QoamFyLCB1cmkuZ2V0KCksIFRSVUUpKTsKICAgICBpZiAoIWNvb2tpZXMpCiAg ICAgICAgIHJldHVybiBmYWxzZTsKIAotICAgIEdPd25QdHI8U291cFVSST4gdXJpKHNvdXBfdXJp X25ldyh1cmwuc3RyaW5nKCkudXRmOCgpLmRhdGEoKSkpOwogICAgIGZvciAoR1NMaXN0KiBpdGVy ID0gY29va2llcy5nZXQoKTsgaXRlcjsgaXRlciA9IGdfc2xpc3RfbmV4dChpdGVyKSkgewogICAg ICAgICBHT3duUHRyPFNvdXBDb29raWU+IGNvb2tpZShzdGF0aWNfY2FzdDxTb3VwQ29va2llKj4o aXRlci0+ZGF0YSkpOwotICAgICAgICBpZiAoIXNvdXBfY29va2llX2FwcGxpZXNfdG9fdXJpKGNv b2tpZS5nZXQoKSwgdXJpLmdldCgpKSkKLSAgICAgICAgICAgIGNvbnRpbnVlOwogICAgICAgICBy YXdDb29raWVzLmFwcGVuZChDb29raWUoU3RyaW5nOjpmcm9tVVRGOChjb29raWUtPm5hbWUpLCBT dHJpbmc6OmZyb21VVEY4KGNvb2tpZS0+dmFsdWUpLCBTdHJpbmc6OmZyb21VVEY4KGNvb2tpZS0+ ZG9tYWluKSwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFN0cmluZzo6ZnJvbVVU RjgoY29va2llLT5wYXRoKSwgc3RhdGljX2Nhc3Q8ZG91YmxlPihzb3VwX2RhdGVfdG9fdGltZV90 KGNvb2tpZS0+ZXhwaXJlcykpICogMTAwMCwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIGNvb2tpZS0+aHR0cF9vbmx5LCBjb29raWUtPnNlY3VyZSwgc291cF9jb29raWVfamFyX2lz X3BlcnNpc3RlbnQoamFyKSkpOwpAQCAtMTY1LDE2ICsxNjMsMTQgQEAgdm9pZCBkZWxldGVDb29r aWUoY29uc3QgTmV0d29ya1N0b3JhZ2VTZXNzaW9uJiBzZXNzaW9uLCBjb25zdCBLVVJMJiB1cmws IGNvbnN0IFMKICAgICBpZiAoIWphcikKICAgICAgICAgcmV0dXJuOwogCi0gICAgR093blB0cjxH U0xpc3Q+IGNvb2tpZXMoc291cF9jb29raWVfamFyX2FsbF9jb29raWVzKGphcikpOworICAgIEdP d25QdHI8U291cFVSST4gdXJpKHNvdXBfdXJpX25ldyh1cmwuc3RyaW5nKCkudXRmOCgpLmRhdGEo KSkpOworICAgIEdPd25QdHI8R1NMaXN0PiBjb29raWVzKHNvdXBfY29va2llX2phcl9nZXRfY29v a2llX2xpc3QoamFyLCB1cmkuZ2V0KCksIFRSVUUpKTsKICAgICBpZiAoIWNvb2tpZXMpCiAgICAg ICAgIHJldHVybjsKIAogICAgIENTdHJpbmcgY29va2llTmFtZSA9IG5hbWUudXRmOCgpOwotICAg IEdPd25QdHI8U291cFVSST4gdXJpKHNvdXBfdXJpX25ldyh1cmwuc3RyaW5nKCkudXRmOCgpLmRh dGEoKSkpOwogICAgIGZvciAoR1NMaXN0KiBpdGVyID0gY29va2llcy5nZXQoKTsgaXRlcjsgaXRl ciA9IGdfc2xpc3RfbmV4dChpdGVyKSkgewogICAgICAgICBHT3duUHRyPFNvdXBDb29raWU+IGNv b2tpZShzdGF0aWNfY2FzdDxTb3VwQ29va2llKj4oaXRlci0+ZGF0YSkpOwotICAgICAgICBpZiAo IXNvdXBfY29va2llX2FwcGxpZXNfdG9fdXJpKGNvb2tpZS5nZXQoKSwgdXJpLmdldCgpKSkKLSAg ICAgICAgICAgIGNvbnRpbnVlOwogICAgICAgICBpZiAoY29va2llTmFtZSA9PSBjb29raWUtPm5h bWUpCiAgICAgICAgICAgICBzb3VwX2Nvb2tpZV9qYXJfZGVsZXRlX2Nvb2tpZShqYXIsIGNvb2tp ZS5nZXQoKSk7CiAgICAgfQo=