16589 2007-12-23 15:19:02 -0800 WebCore::cookies, WebCore::setCookies and WebCore::cookiesEnabled need access to the WebCore::Document 2008-01-17 03:38:46 -0800 1 1 1 Unclassified WebKit Platform 528+ (Nightly build) PC OS X 10.4 RESOLVED FIXED Qt P2 Normal --- 1 zecke webkit-unassigned ap hausmann mjs oldest_to_newest 65138 0 zecke 2007-12-23 15:19:02 -0800 Similar to the bug #16588 we need to access the QNetworkAccessManager that the QWebPage is using to return and set the cookies. The information that is always available when calling the function is the WebCore::Document. This allows us to access the WebCore::Frame->FrameLoader->FrameLoaderClient->QWebFrame->QWebPage. 65139 1 18078 zecke 2007-12-23 15:22:12 -0800 Created attachment 18078 add WebCore::Document to the cookie functions This adds WebCore::Document as the first parameter to the WebCore cookie functions. This allows the Qt port to access the QNetworkAccessManager. 65189 2 18078 mjs 2007-12-24 02:34:10 -0800 Comment on attachment 18078 add WebCore::Document to the cookie functions r=me 65195 3 ap 2007-12-24 07:38:51 -0800 Not really disagreeing with Maciej's r+ here, but seeing Document* as a setCookie() parameter is rather confusing to me. Perhaps it would be better to pass FrameLoader or even FrameLoaderClient? 66104 4 darin 2008-01-03 00:19:13 -0800 (In reply to comment #3) > Not really disagreeing with Maciej's r+ here, but seeing Document* as a > setCookie() parameter is rather confusing to me. Perhaps it would be better to > pass FrameLoader or even FrameLoaderClient? When it comes to the Frame constellation of objects, we never want to pass around sub-objects like FrameLoader. FrameLoader is really only the loader aspect of the frame. So you'd want to pass either Frame or Document. I think Document is the right one. 67139 5 18078 darin 2008-01-13 11:58:53 -0800 Comment on attachment 18078 add WebCore::Document to the cookie functions This patch no longer applies cleanly, and since it's a git patch and not Subversion, I can't easily figure out what Subversion version it's based on. So I'm not landing it today. I would have landed it otherwise. I know it's easier for the Qt hackers to supply git patches since you are using git, but perhaps you could do the additional work to supply them in a form that identifies the base Subversion revision. I know that's possible because the folks here at Apple using git are posting patches that don't show any sign of their git origins. 67471 6 hausmann 2008-01-17 03:38:46 -0800 Landed in revision 29566 18078 2007-12-23 15:22:12 -0800 2007-12-24 02:34:10 -0800 add WebCore::Document to the cookie functions Cookie_get_set_API_Changes.diff text/plain 12669 zecke Y29tbWl0IDk4Y2RiMjEyZTYxOTgyYzNjMGQzMDMzNzk0YmQxNjQ4NzI5Y2FlZWYKQXV0aG9yOiBT aW1vbiBIYXVzbWFubiA8aGF1c21hbm5Ad2Via2l0Lm9yZz4KRGF0ZTogICBXZWQgRGVjIDEyIDEw OjIyOjIyIDIwMDcgKzAxMDAKCiAgICBQb3J0ZWQgdGhlIERPTSBjb29raWUgaW50ZXJmYWNlcyB0 byBRdCA0LjQncyBRTmV0d29ya0Nvb2tpZSBBUEkuCiAgICAKICAgIFRoaXMgcmVxdWlyZWQgYWRk aW5nIGEgRG9jdW1lbnQgYXJndW1lbnQgdG8gdGhlIFdlYkNvcmUgY29va2llIGZ1bmN0aW9ucywg c28gd2UgY2FuIGZpbmQgdGhlCiAgICBjb3JyZXNwb25kaW5nIFFOZXR3b3JrQWNjZXNzTWFuYWdl ciBhbmQgaXRzIFFOZXR3b3JrQ29va2llSmFyCiAgICAKICAgIFNpZ25lZC1vZmYtYnk6IExhcnMg YW5kIEhvbGdlcgoKZGlmZiAtLWdpdCBhL1dlYkNvcmUvV2ViQ29yZS5wcm8gYi9XZWJDb3JlL1dl YkNvcmUucHJvCmluZGV4IGEyNjQ1NDkuLjU2ZWFkZjAgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvV2Vi Q29yZS5wcm8KKysrIGIvV2ViQ29yZS9XZWJDb3JlLnBybwpAQCAtODEwLDcgKzgxMCw2IEBAIHF0 LXBvcnQgewogICAgICQkUFdELy4uL1dlYktpdC9xdC9BcGkvcXdlYnBhZ2UuaCBcCiAgICAgJCRQ V0QvLi4vV2ViS2l0L3F0L0FwaS9xd2Vidmlldy5oIFwKICAgICAkJFBXRC8uLi9XZWJLaXQvcXQv QXBpL3F3ZWJoaXN0b3J5aW50ZXJmYWNlLmggXAotICAgICQkUFdELy4uL1dlYktpdC9xdC9BcGkv cWNvb2tpZWphci5oIFwKICAgICAkJFBXRC8uLi9XZWJLaXQvcXQvV2ViQ29yZVN1cHBvcnQvRnJh bWVMb2FkZXJDbGllbnRRdC5oIFwKICAgICAkJFBXRC9wbGF0Zm9ybS9uZXR3b3JrL3F0L1FOZXR3 b3JrUmVwbHlIYW5kbGVyLmgKIApAQCAtODgwLDcgKzg3OSw2IEBAIHF0LXBvcnQgewogICAgIC4u L1dlYktpdC9xdC9XZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRlckNsaWVudFF0LmNwcCBcCiAgICAg Li4vV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0L0luc3BlY3RvckNsaWVudFF0LmNwcCBcCiAgICAg Li4vV2ViS2l0L3F0L0FwaS9xd2ViZnJhbWUuY3BwIFwKLSAgICAuLi9XZWJLaXQvcXQvQXBpL3Fj b29raWVqYXIuY3BwIFwKICAgICAuLi9XZWJLaXQvcXQvQXBpL3F3ZWJwYWdlLmNwcCBcCiAgICAg Li4vV2ViS2l0L3F0L0FwaS9xd2Vidmlldy5jcHAgXAogICAgIC4uL1dlYktpdC9xdC9BcGkvcXdl Ymhpc3RvcnkuY3BwIFwKQEAgLTg5NywxMiArODk1LDE0IEBAIHF0LXBvcnQgewogICAgICAgICAg ICAgJCRQV0QvLi4vV2ViS2l0L3F0L0FwaS9xd2VibmV0d29ya2ludGVyZmFjZV9wLmggXAogICAg ICAgICAgICAgJCRQV0QvLi4vV2ViS2l0L3F0L0FwaS9xd2Vib2JqZWN0cGx1Z2luLmggXAogICAg ICAgICAgICAgJCRQV0QvLi4vV2ViS2l0L3F0L0FwaS9xd2Vib2JqZWN0cGx1Z2luX3AuaCBcCi0g ICAgICAgICAgICAkJFBXRC8uLi9XZWJLaXQvcXQvQXBpL3F3ZWJvYmplY3RwbHVnaW5jb25uZWN0 b3IuaAorICAgICAgICAgICAgJCRQV0QvLi4vV2ViS2l0L3F0L0FwaS9xd2Vib2JqZWN0cGx1Z2lu Y29ubmVjdG9yLmggXAorICAgICAgICAgICAgJCRQV0QvLi4vV2ViS2l0L3F0L0FwaS9xY29va2ll amFyLmgKIAogICAgICAgICBTT1VSQ0VTICs9IFwKICAgICAgICAgICAgIC4uL1dlYktpdC9xdC9B cGkvcXdlYm5ldHdvcmtpbnRlcmZhY2UuY3BwIFwKICAgICAgICAgICAgIC4uL1dlYktpdC9xdC9B cGkvcXdlYm9iamVjdHBsdWdpbi5jcHAgXAotICAgICAgICAgICAgLi4vV2ViS2l0L3F0L0FwaS9x d2Vib2JqZWN0cGx1Z2luY29ubmVjdG9yLmNwcAorICAgICAgICAgICAgLi4vV2ViS2l0L3F0L0Fw aS9xd2Vib2JqZWN0cGx1Z2luY29ubmVjdG9yLmNwcCBcCisgICAgICAgICAgICAuLi9XZWJLaXQv cXQvQXBpL3Fjb29raWVqYXIuY3BwCiAKICAgICAgfQogfQpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9i aW5kaW5ncy9qcy9ranNfbmF2aWdhdG9yLmNwcCBiL1dlYkNvcmUvYmluZGluZ3MvanMva2pzX25h dmlnYXRvci5jcHAKaW5kZXggN2IwMzBlNC4uMTJkYjIxMCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9i aW5kaW5ncy9qcy9ranNfbmF2aWdhdG9yLmNwcAorKysgYi9XZWJDb3JlL2JpbmRpbmdzL2pzL2tq c19uYXZpZ2F0b3IuY3BwCkBAIC0yMTQsNyArMjE0LDcgQEAgSlNWYWx1ZSogTmF2aWdhdG9yOjpn ZXRWYWx1ZVByb3BlcnR5KEV4ZWNTdGF0ZSogZXhlYywgaW50IHRva2VuKSBjb25zdAogICBjYXNl IF9NaW1lVHlwZXM6CiAgICAgcmV0dXJuIG5ldyBNaW1lVHlwZXMoZXhlYyk7CiAgIGNhc2UgQ29v a2llRW5hYmxlZDoKLSAgICByZXR1cm4ganNCb29sZWFuKGNvb2tpZXNFbmFibGVkKCkpOworICAg IHJldHVybiBqc0Jvb2xlYW4oY29va2llc0VuYWJsZWQobV9mcmFtZS0+ZG9jdW1lbnQoKSkpOwog ICB9CiAgIHJldHVybiAwOwogfQpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9odG1sL0hUTUxEb2N1bWVu dC5jcHAgYi9XZWJDb3JlL2h0bWwvSFRNTERvY3VtZW50LmNwcAppbmRleCA3Mjc4MjdlLi5mYjJl ZjQ3IDEwMDY0NAotLS0gYS9XZWJDb3JlL2h0bWwvSFRNTERvY3VtZW50LmNwcAorKysgYi9XZWJD b3JlL2h0bWwvSFRNTERvY3VtZW50LmNwcApAQCAtOTksMTIgKzk5LDEyIEBAIFN0cmluZyBIVE1M RG9jdW1lbnQ6Omxhc3RNb2RpZmllZCgpIGNvbnN0CiAKIFN0cmluZyBIVE1MRG9jdW1lbnQ6OmNv b2tpZSgpIGNvbnN0CiB7Ci0gICAgcmV0dXJuIGNvb2tpZXMoVVJMKCkpOworICAgIHJldHVybiBj b29raWVzKHRoaXMsIFVSTCgpKTsKIH0KIAogdm9pZCBIVE1MRG9jdW1lbnQ6OnNldENvb2tpZShj b25zdCBTdHJpbmcmIHZhbHVlKQogewotICAgIHNldENvb2tpZXMoVVJMKCksIHBvbGljeUJhc2VV UkwoKS5kZXByZWNhdGVkU3RyaW5nKCksIHZhbHVlKTsKKyAgICBzZXRDb29raWVzKHRoaXMsIFVS TCgpLCBwb2xpY3lCYXNlVVJMKCkuZGVwcmVjYXRlZFN0cmluZygpLCB2YWx1ZSk7CiB9CiAKIHZv aWQgSFRNTERvY3VtZW50OjpzZXRCb2R5KEhUTUxFbGVtZW50KiBuZXdCb2R5LCBFeGNlcHRpb25D b2RlJiBlYykKZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGxhdGZvcm0vQ29va2llSmFyLmggYi9XZWJD b3JlL3BsYXRmb3JtL0Nvb2tpZUphci5oCmluZGV4IDhlM2RmYWEuLjM4ZWZkMDQgMTAwNjQ0Ci0t LSBhL1dlYkNvcmUvcGxhdGZvcm0vQ29va2llSmFyLmgKKysrIGIvV2ViQ29yZS9wbGF0Zm9ybS9D b29raWVKYXIuaApAQCAtMzAsMTAgKzMwLDExIEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogICAg IGNsYXNzIEtVUkw7CiAgICAgY2xhc3MgU3RyaW5nOworICAgIGNsYXNzIERvY3VtZW50OwogCi0g ICAgU3RyaW5nIGNvb2tpZXMoY29uc3QgS1VSTCYpOwotICAgIHZvaWQgc2V0Q29va2llcyhjb25z dCBLVVJMJiwgY29uc3QgS1VSTCYgcG9saWN5QmFzZVVSTCwgY29uc3QgU3RyaW5nJik7Ci0gICAg Ym9vbCBjb29raWVzRW5hYmxlZCgpOworICAgIFN0cmluZyBjb29raWVzKGNvbnN0IERvY3VtZW50 KiBkb2N1bWVudCwgY29uc3QgS1VSTCYpOworICAgIHZvaWQgc2V0Q29va2llcyhEb2N1bWVudCog ZG9jdW1lbnQsIGNvbnN0IEtVUkwmLCBjb25zdCBLVVJMJiBwb2xpY3lCYXNlVVJMLCBjb25zdCBT dHJpbmcmKTsKKyAgICBib29sIGNvb2tpZXNFbmFibGVkKGNvbnN0IERvY3VtZW50KiBkb2N1bWVu dCk7CiAKIH0KIApkaWZmIC0tZ2l0IGEvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvQ29va2llSmFyR3Rr LmNwcCBiL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL0Nvb2tpZUphckd0ay5jcHAKaW5kZXggNjcwMTUw Ny4uMDI0ODA1OSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvQ29va2llSmFyR3Rr LmNwcAorKysgYi9XZWJDb3JlL3BsYXRmb3JtL2d0ay9Db29raWVKYXJHdGsuY3BwCkBAIC0zOCwx NyArMzgsMTcgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogCiBzdGF0aWMgSGFzaE1hcDxTdHJpbmcs IFN0cmluZz4gY29va2llSmFyOwogCi12b2lkIHNldENvb2tpZXMoY29uc3QgS1VSTCYgdXJsLCBj b25zdCBLVVJMJiAvKnBvbGljeVVSTCovLCBjb25zdCBTdHJpbmcmIHZhbHVlKQordm9pZCBzZXRD b29raWVzKERvY3VtZW50KiAvKmRvY3VtZW50Ki8sIGNvbnN0IEtVUkwmIHVybCwgY29uc3QgS1VS TCYgLypwb2xpY3lVUkwqLywgY29uc3QgU3RyaW5nJiB2YWx1ZSkKIHsKICAgICBjb29raWVKYXIu c2V0KHVybC51cmwoKSwgdmFsdWUpOwogfQogCi1TdHJpbmcgY29va2llcyhjb25zdCBLVVJMJiB1 cmwpCitTdHJpbmcgY29va2llcyhjb25zdCBEb2N1bWVudCogLypkb2N1bWVudCovLCBjb25zdCBL VVJMJiB1cmwpCiB7CiAgICAgcmV0dXJuIGNvb2tpZUphci5nZXQodXJsLnVybCgpKTsKIH0KIAot Ym9vbCBjb29raWVzRW5hYmxlZCgpCitib29sIGNvb2tpZXNFbmFibGVkKGNvbnN0IERvY3VtZW50 KiAvKmRvY3VtZW50Ki8pCiB7CiAgICAgcmV0dXJuIHRydWU7CiB9CmRpZmYgLS1naXQgYS9XZWJD b3JlL3BsYXRmb3JtL21hYy9Db29raWVKYXIubW0gYi9XZWJDb3JlL3BsYXRmb3JtL21hYy9Db29r aWVKYXIubW0KaW5kZXggOTExN2ViYy4uNTJlZDI5MyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9wbGF0 Zm9ybS9tYWMvQ29va2llSmFyLm1tCisrKyBiL1dlYkNvcmUvcGxhdGZvcm0vbWFjL0Nvb2tpZUph ci5tbQpAQCAtMzIsNyArMzIsNyBAQAogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKLVN0cmluZyBj b29raWVzKGNvbnN0IEtVUkwmIHVybCkKK1N0cmluZyBjb29raWVzKGNvbnN0IERvY3VtZW50KiAv KmRvY3VtZW50Ki8sIGNvbnN0IEtVUkwmIHVybCkKIHsKICAgICBCRUdJTl9CTE9DS19PQkpDX0VY Q0VQVElPTlM7CiAKQEAgLTQ1LDcgKzQ1LDcgQEAgU3RyaW5nIGNvb2tpZXMoY29uc3QgS1VSTCYg dXJsKQogICAgIHJldHVybiBTdHJpbmcoKTsKIH0KIAotdm9pZCBzZXRDb29raWVzKGNvbnN0IEtV UkwmIHVybCwgY29uc3QgS1VSTCYgcG9saWN5QmFzZVVSTCwgY29uc3QgU3RyaW5nJiBjb29raWVT dHIpCit2b2lkIHNldENvb2tpZXMoRG9jdW1lbnQqIC8qZG9jdW1lbnQqLywgY29uc3QgS1VSTCYg dXJsLCBjb25zdCBLVVJMJiBwb2xpY3lCYXNlVVJMLCBjb25zdCBTdHJpbmcmIGNvb2tpZVN0cikK IHsKICAgICBCRUdJTl9CTE9DS19PQkpDX0VYQ0VQVElPTlM7CiAKQEAgLTYxLDcgKzYxLDcgQEAg dm9pZCBzZXRDb29raWVzKGNvbnN0IEtVUkwmIHVybCwgY29uc3QgS1VSTCYgcG9saWN5QmFzZVVS TCwgY29uc3QgU3RyaW5nJiBjb29raWUKICAgICBFTkRfQkxPQ0tfT0JKQ19FWENFUFRJT05TOwog fQogCi1ib29sIGNvb2tpZXNFbmFibGVkKCkKK2Jvb2wgY29va2llc0VuYWJsZWQoY29uc3QgRG9j dW1lbnQqIC8qZG9jdW1lbnQqLykKIHsKICAgICBCRUdJTl9CTE9DS19PQkpDX0VYQ0VQVElPTlM7 CiAKZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay93aW4vQ29va2llSmFyV2lu LmNwcCBiL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay93aW4vQ29va2llSmFyV2luLmNwcAppbmRl eCA2NjM0MjA3Li5iNmZhM2ZjIDEwMDY0NAotLS0gYS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsv d2luL0Nvb2tpZUphcldpbi5jcHAKKysrIGIvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL3dpbi9D b29raWVKYXJXaW4uY3BwCkBAIC00Niw3ICs0Niw3IEBAIG5hbWVzcGFjZSBXZWJDb3JlCiAjZW5k aWYKIAogCi12b2lkIHNldENvb2tpZXMoY29uc3QgS1VSTCYgdXJsLCBjb25zdCBLVVJMJiBwb2xp Y3lVUkwsIGNvbnN0IFN0cmluZyYgdmFsdWUpCit2b2lkIHNldENvb2tpZXMoY29uc3QgRG9jdW1l bnQqIC8qZG9jdW1lbnQqLywgY29uc3QgS1VSTCYgdXJsLCBjb25zdCBLVVJMJiBwb2xpY3lVUkws IGNvbnN0IFN0cmluZyYgdmFsdWUpCiB7CiAjaWYgVVNFKENGTkVUV09SSykKICAgICBDRkhUVFBD b29raWVTdG9yYWdlUmVmIGRlZmF1bHRDb29raWVTdG9yYWdlID0gd2tHZXREZWZhdWx0SFRUUENv b2tpZVN0b3JhZ2UoKTsKQEAgLTc4LDcgKzc4LDcgQEAgdm9pZCBzZXRDb29raWVzKGNvbnN0IEtV UkwmIHVybCwgY29uc3QgS1VSTCYgcG9saWN5VVJMLCBjb25zdCBTdHJpbmcmIHZhbHVlKQogI2Vu ZGlmCiB9CiAKLVN0cmluZyBjb29raWVzKGNvbnN0IEtVUkwmIHVybCkKK1N0cmluZyBjb29raWVz KGNvbnN0IERvY3VtZW50KiAvKmRvY3VtZW50Ki8sIGNvbnN0IEtVUkwmIHVybCkKIHsKICNpZiBV U0UoQ0ZORVRXT1JLKQogICAgIENGSFRUUENvb2tpZVN0b3JhZ2VSZWYgZGVmYXVsdENvb2tpZVN0 b3JhZ2UgPSB3a0dldERlZmF1bHRIVFRQQ29va2llU3RvcmFnZSgpOwpAQCAtMTExLDcgKzExMSw3 IEBAIFN0cmluZyBjb29raWVzKGNvbnN0IEtVUkwmIHVybCkKICNlbmRpZgogfQogCi1ib29sIGNv b2tpZXNFbmFibGVkKCkKK2Jvb2wgY29va2llc0VuYWJsZWQoY29uc3QgRG9jdW1lbnQqIC8qZG9j dW1lbnQqLykKIHsKICAgICBDRkhUVFBDb29raWVTdG9yYWdlQWNjZXB0UG9saWN5IHBvbGljeSA9 IENGSFRUUENvb2tpZVN0b3JhZ2VBY2NlcHRQb2xpY3lPbmx5RnJvbU1haW5Eb2N1bWVudERvbWFp bjsKICAgICBpZiAoQ0ZIVFRQQ29va2llU3RvcmFnZVJlZiBkZWZhdWx0Q29va2llU3RvcmFnZSA9 IHdrR2V0RGVmYXVsdEhUVFBDb29raWVTdG9yYWdlKCkpCmRpZmYgLS1naXQgYS9XZWJDb3JlL3Bs YXRmb3JtL3F0L0Nvb2tpZUphclF0LmNwcCBiL1dlYkNvcmUvcGxhdGZvcm0vcXQvQ29va2llSmFy UXQuY3BwCmluZGV4IDYzNDQzMDQuLjAwZjNlMjEgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGxhdGZv cm0vcXQvQ29va2llSmFyUXQuY3BwCisrKyBiL1dlYkNvcmUvcGxhdGZvcm0vcXQvQ29va2llSmFy UXQuY3BwCkBAIC0zMiwzMCArMzIsNjcgQEAKICNpbmNsdWRlICJLVVJMLmgiCiAjaW5jbHVkZSAi UGxhdGZvcm1TdHJpbmcuaCIKIAorI2lmIFFUX1ZFUlNJT04gPj0gMHgwNDA0MDAKKyNpbmNsdWRl ICJEb2N1bWVudC5oIgorI2luY2x1ZGUgInF3ZWJwYWdlLmgiCisjaW5jbHVkZSAicXdlYmZyYW1l LmgiCisjaW5jbHVkZSAiRnJhbWVMb2FkZXJDbGllbnRRdC5oIgorI2luY2x1ZGUgPFFOZXR3b3Jr QWNjZXNzTWFuYWdlcj4KKyNpbmNsdWRlIDxRTmV0d29ya0Nvb2tpZT4KKyNlbHNlCiAjaW5jbHVk ZSA8cWNvb2tpZWphci5oPgorI2VuZGlmCiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAotdm9pZCBz ZXRDb29raWVzKGNvbnN0IEtVUkwmIHVybCwgY29uc3QgS1VSTCYgcG9saWN5VVJMLCBjb25zdCBT dHJpbmcmIHZhbHVlKQordm9pZCBzZXRDb29raWVzKERvY3VtZW50KiBkb2N1bWVudCwgY29uc3Qg S1VSTCYgdXJsLCBjb25zdCBLVVJMJiBwb2xpY3lVUkwsIGNvbnN0IFN0cmluZyYgdmFsdWUpCiB7 Ci0gICAgUVVybCB1KChRU3RyaW5nKXVybC51cmwoKSk7Ci0gICAgUVVybCBwKChRU3RyaW5nKXBv bGljeVVSTC51cmwoKSk7CisgICAgUVVybCB1KHVybCk7CisgICAgUVVybCBwKHBvbGljeVVSTCk7 CisjaWYgUVRfVkVSU0lPTiA+PSAweDA0MDQwMAorICAgIFFXZWJGcmFtZSogZnJhbWUgPSBzdGF0 aWNfY2FzdDxGcmFtZUxvYWRlckNsaWVudFF0Kj4oZG9jdW1lbnQtPmZyYW1lKCktPmxvYWRlcigp LT5jbGllbnQoKSktPndlYkZyYW1lKCk7CisgICAgUVdlYlBhZ2UqIHBhZ2UgPSBmcmFtZS0+cGFn ZSgpOworICAgIFFOZXR3b3JrQWNjZXNzTWFuYWdlciogbWFuYWdlciA9IHBhZ2UtPm5ldHdvcmtB Y2Nlc3NNYW5hZ2VyKCk7CisgICAgUU5ldHdvcmtDb29raWVKYXIqIGphciA9IG1hbmFnZXItPmNv b2tpZUphcigpOworCisgICAgUUxpc3Q8UU5ldHdvcmtDb29raWU+IGNvb2tpZXMgPSBRTmV0d29y a0Nvb2tpZTo6cGFyc2VDb29raWVzKFFTdHJpbmcodmFsdWUpLnRvQXNjaWkoKSk7CisgICAgamFy LT5zZXRDb29raWVzRnJvbVVybChjb29raWVzLCBwKTsKKyNlbHNlCiAgICAgUUNvb2tpZUphcjo6 Y29va2llSmFyKCktPnNldENvb2tpZXModSwgcCwgKFFTdHJpbmcpdmFsdWUpOworI2VuZGlmCiB9 CiAKLVN0cmluZyBjb29raWVzKGNvbnN0IEtVUkwmIHVybCkKK1N0cmluZyBjb29raWVzKGNvbnN0 IERvY3VtZW50KiBkb2N1bWVudCwgY29uc3QgS1VSTCYgdXJsKQogewotICAgIFFVcmwgdSgoUVN0 cmluZyl1cmwudXJsKCkpOworICAgIFFVcmwgdSh1cmwpOworI2lmIFFUX1ZFUlNJT04gPj0gMHgw NDA0MDAKKyAgICBRV2ViRnJhbWUqIGZyYW1lID0gc3RhdGljX2Nhc3Q8RnJhbWVMb2FkZXJDbGll bnRRdCo+KGRvY3VtZW50LT5mcmFtZSgpLT5sb2FkZXIoKS0+Y2xpZW50KCkpLT53ZWJGcmFtZSgp OworICAgIFFXZWJQYWdlKiBwYWdlID0gZnJhbWUtPnBhZ2UoKTsKKyAgICBRTmV0d29ya0FjY2Vz c01hbmFnZXIqIG1hbmFnZXIgPSBwYWdlLT5uZXR3b3JrQWNjZXNzTWFuYWdlcigpOworICAgIFFO ZXR3b3JrQ29va2llSmFyKiBqYXIgPSBtYW5hZ2VyLT5jb29raWVKYXIoKTsKKworICAgIFFMaXN0 PFFOZXR3b3JrQ29va2llPiBjb29raWVzID0gamFyLT5jb29raWVzRm9yVXJsKHUpOworICAgIGlm IChjb29raWVzLmlzRW1wdHkoKSkKKyAgICAgICAgcmV0dXJuIFN0cmluZygpOworCisgICAgcmV0 dXJuIFFTdHJpbmc6OmZyb21Bc2NpaShjb29raWVzLmZpcnN0KCkudG9SYXdGb3JtKCkpOworI2Vs c2UKICAgICBRU3RyaW5nIGNvb2tpZXMgPSBRQ29va2llSmFyOjpjb29raWVKYXIoKS0+Y29va2ll cyh1KTsKICAgICBpbnQgaWR4ID0gY29va2llcy5pbmRleE9mKFFMYXRpbjFDaGFyKCc7JykpOwog ICAgIGlmIChpZHggPiAwKQogICAgICAgICBjb29raWVzID0gY29va2llcy5sZWZ0KGlkeCk7CiAg ICAgcmV0dXJuIGNvb2tpZXM7CisjZW5kaWYKIH0KIAotYm9vbCBjb29raWVzRW5hYmxlZCgpCiti b29sIGNvb2tpZXNFbmFibGVkKGNvbnN0IERvY3VtZW50KiBkb2N1bWVudCkKIHsKKyNpZiBRVF9W RVJTSU9OID49IDB4MDQwNDAwCisgICAgLy8gIyMjCisgICAgcmV0dXJuIHRydWU7CisjZWxzZQog ICAgIHJldHVybiBRQ29va2llSmFyOjpjb29raWVKYXIoKS0+aXNFbmFibGVkKCk7CisjZW5kaWYK IH0KIAogfQpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9wbGF0Zm9ybS93aW4vQ29va2llSmFyV2luLmNw cCBiL1dlYkNvcmUvcGxhdGZvcm0vd2luL0Nvb2tpZUphcldpbi5jcHAKaW5kZXggMDQxYTA5My4u MWYzZTk4YiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9wbGF0Zm9ybS93aW4vQ29va2llSmFyV2luLmNw cAorKysgYi9XZWJDb3JlL3BsYXRmb3JtL3dpbi9Db29raWVKYXJXaW4uY3BwCkBAIC0zMyw3ICsz Myw3IEBACiBuYW1lc3BhY2UgV2ViQ29yZQogewogCi12b2lkIHNldENvb2tpZXMoY29uc3QgS1VS TCYgdXJsLCBjb25zdCBLVVJMJiBwb2xpY3lVUkwsIGNvbnN0IFN0cmluZyYgdmFsdWUpCit2b2lk IHNldENvb2tpZXMoRG9jdW1lbnQqIC8qZG9jdW1lbnQqLywgY29uc3QgS1VSTCYgdXJsLCBjb25z dCBLVVJMJiBwb2xpY3lVUkwsIGNvbnN0IFN0cmluZyYgdmFsdWUpCiB7CiAgICAgLy8gRklYTUU6 IERlYWwgd2l0aCB0aGUgcG9saWN5IFVSTC4KICAgICBEZXByZWNhdGVkU3RyaW5nIHN0ciA9IHVy bC51cmwoKTsKQEAgLTQzLDcgKzQzLDcgQEAgdm9pZCBzZXRDb29raWVzKGNvbnN0IEtVUkwmIHVy bCwgY29uc3QgS1VSTCYgcG9saWN5VVJMLCBjb25zdCBTdHJpbmcmIHZhbHVlKQogICAgIEludGVy bmV0U2V0Q29va2llKChVQ2hhciopc3RyLnVuaWNvZGUoKSwgMCwgKFVDaGFyKil2YWwudW5pY29k ZSgpKTsKIH0KIAotU3RyaW5nIGNvb2tpZXMoY29uc3QgS1VSTCYgdXJsKQorU3RyaW5nIGNvb2tp ZXMoY29uc3QgRG9jdW1lbnQqIC8qZG9jdW1lbnQqLywgY29uc3QgS1VSTCYgdXJsKQogewogICAg IERlcHJlY2F0ZWRTdHJpbmcgc3RyID0gdXJsLnVybCgpOwogICAgIHN0ci5hcHBlbmQoKFVDaGFy KSdcMCcpOwpAQCAtNjAsNyArNjAsNyBAQCBTdHJpbmcgY29va2llcyhjb25zdCBLVVJMJiB1cmwp CiAgICAgcmV0dXJuIHJlc3VsdDsKIH0KIAotYm9vbCBjb29raWVzRW5hYmxlZCgpCitib29sIGNv b2tpZXNFbmFibGVkKGNvbnN0IERvY3VtZW50KiAvKmRvY3VtZW50Ki8pCiB7CiAgICAgLy8gRklY TUU6IEZvciBub3cganVzdCBhc3N1bWUgY29va2llcyBhcmUgYWx3YXlzIG9uLgogICAgIHJldHVy biB0cnVlOwpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9wbGF0Zm9ybS93eC9UZW1wb3JhcnlMaW5rU3R1 YnMuY3BwIGIvV2ViQ29yZS9wbGF0Zm9ybS93eC9UZW1wb3JhcnlMaW5rU3R1YnMuY3BwCmluZGV4 IDMzMTAzMGYuLjM2ZDAwYjggMTAwNzU1Ci0tLSBhL1dlYkNvcmUvcGxhdGZvcm0vd3gvVGVtcG9y YXJ5TGlua1N0dWJzLmNwcAorKysgYi9XZWJDb3JlL3BsYXRmb3JtL3d4L1RlbXBvcmFyeUxpbmtT dHVicy5jcHAKQEAgLTExOCw5ICsxMTgsOSBAQCB2b2lkIEdyYXBoaWNzQ29udGV4dDo6YWRkUm91 bmRlZFJlY3RDbGlwKGNvbnN0IEludFJlY3QmIHJlY3QsIGNvbnN0IEludFNpemUmIHRvcAogdm9p ZCBHcmFwaGljc0NvbnRleHQ6OmFkZElubmVyUm91bmRlZFJlY3RDbGlwKGNvbnN0IEludFJlY3Qm IHJlY3QsIGludCB0aGlja25lc3MpIHsgbm90SW1wbGVtZW50ZWQoKTsgfQogCiAvLyBjb29raWVz ICh3ZSdsbCBuZWVkIGEgcGxhY2UgdG8gc3RvcmUgdGhlc2UKLXZvaWQgV2ViQ29yZTo6c2V0Q29v a2llcyhjb25zdCBLVVJMJiB1cmwsIGNvbnN0IEtVUkwmIHBvbGljeVVSTCwgY29uc3QgU3RyaW5n JiB2YWx1ZSkgeyBub3RJbXBsZW1lbnRlZCgpOyB9Ci1TdHJpbmcgV2ViQ29yZTo6Y29va2llcyhj b25zdCBLVVJMJiB1cmwpIHsgbm90SW1wbGVtZW50ZWQoKTsgcmV0dXJuIFN0cmluZygpOyB9Ci1i b29sIFdlYkNvcmU6OmNvb2tpZXNFbmFibGVkKCkgeyBub3RJbXBsZW1lbnRlZCgpOyByZXR1cm4g ZmFsc2U7IH0KK3ZvaWQgV2ViQ29yZTo6c2V0Q29va2llcyhEb2N1bWVudCogZG9jdW1lbnQsIGNv bnN0IEtVUkwmIHVybCwgY29uc3QgS1VSTCYgcG9saWN5VVJMLCBjb25zdCBTdHJpbmcmIHZhbHVl KSB7IG5vdEltcGxlbWVudGVkKCk7IH0KK1N0cmluZyBXZWJDb3JlOjpjb29raWVzKGNvbnN0IERv Y3VtZW50KiBkb2N1bWVudCwgY29uc3QgS1VSTCYgdXJsKSB7IG5vdEltcGxlbWVudGVkKCk7IHJl dHVybiBTdHJpbmcoKTsgfQorYm9vbCBXZWJDb3JlOjpjb29raWVzRW5hYmxlZChjb25zdCBEb2N1 bWVudCogZG9jdW1lbnQpIHsgbm90SW1wbGVtZW50ZWQoKTsgcmV0dXJuIGZhbHNlOyB9CiAKIC8q KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8K IC8qIENvbXBsZXRlbHkgZW1wdHkgc3R1YnMgKG1vc3RseSB0byBhbGxvdyBEUlQgdG8gcnVuKTog Ki8KZGlmZiAtLWdpdCBhL1dlYktpdC9xdC9BcGkvcXdlYm5ldHdvcmtpbnRlcmZhY2UuY3BwIGIv V2ViS2l0L3F0L0FwaS9xd2VibmV0d29ya2ludGVyZmFjZS5jcHAKaW5kZXggODE3MTgyNS4uZTc0 MTU2MiAxMDA2NDQKLS0tIGEvV2ViS2l0L3F0L0FwaS9xd2VibmV0d29ya2ludGVyZmFjZS5jcHAK KysrIGIvV2ViS2l0L3F0L0FwaS9xd2VibmV0d29ya2ludGVyZmFjZS5jcHAKQEAgLTI4LDYgKzI4 LDcgQEAKICNpbmNsdWRlICJxd2VibmV0d29ya2ludGVyZmFjZV9wLmgiCiAjaW5jbHVkZSAicXdl Ym9iamVjdHBsdWdpbmNvbm5lY3Rvci5oIgogI2luY2x1ZGUgInF3ZWJwYWdlLmgiCisjaW5jbHVk ZSAicWNvb2tpZWphci5oIgogI2luY2x1ZGUgPHFkZWJ1Zy5oPgogI2luY2x1ZGUgPHFmaWxlLmg+ CiAjaW5jbHVkZSA8cW5ldHdvcmtwcm94eS5oPgpAQCAtMTIzLDcgKzEyNCw3IEBAIHZvaWQgUVdl Yk5ldHdvcmtSZXF1ZXN0UHJpdmF0ZTo6aW5pdChjb25zdCBRU3RyaW5nICZtZXRob2QsIGNvbnN0 IFFVcmwgJnVybCwgY29uCiAgICAgICAgIGh0dHBIZWFkZXIuc2V0VmFsdWUoUUxhdGluMVN0cmlu ZygiVXNlci1BZ2VudCIpLCByZXNvdXJjZVJlcXVlc3QtPmh0dHBVc2VyQWdlbnQoKSk7CiAgICAg ICAgIGNvbnN0IFFTdHJpbmcgc2NoZW1lID0gdXJsLnNjaGVtZSgpLnRvTG93ZXIoKTsKICAgICAg ICAgaWYgKHNjaGVtZSA9PSBRTGF0aW4xU3RyaW5nKCJodHRwIikgfHwgc2NoZW1lID09IFFMYXRp bjFTdHJpbmcoImh0dHBzIikpIHsKLSAgICAgICAgICAgIFFTdHJpbmcgY29va2llcyA9IFdlYkNv cmU6OmNvb2tpZXMocmVzb3VyY2VSZXF1ZXN0LT51cmwoKSk7CisgICAgICAgICAgICBRU3RyaW5n IGNvb2tpZXMgPSBRQ29va2llSmFyOjpjb29raWVKYXIoKS0+Y29va2llcyhyZXNvdXJjZVJlcXVl c3QtPnVybCgpKTsKICAgICAgICAgICAgIGlmICghY29va2llcy5pc0VtcHR5KCkpCiAgICAgICAg ICAgICAgICAgaHR0cEhlYWRlci5zZXRWYWx1ZShRTGF0aW4xU3RyaW5nKCJDb29raWUiKSwgY29v a2llcyk7CiAgICAgICAgIH0KQEAgLTUwNiw3ICs1MDcsNyBAQCB2b2lkIFFXZWJOZXR3b3JrTWFu YWdlcjo6c3RhcnRlZChRV2ViTmV0d29ya0pvYiAqam9iKQogICAgIFFTdHJpbmdMaXN0IGNvb2tp ZXMgPSBqb2ItPmQtPnJlc3BvbnNlLmFsbFZhbHVlcygiU2V0LUNvb2tpZSIpOwogICAgIEtVUkwg dXJsKGpvYi0+dXJsKCkpOwogICAgIGZvcmVhY2ggKFFTdHJpbmcgYywgY29va2llcykgewotICAg ICAgICBzZXRDb29raWVzKHVybCwgdXJsLCBjKTsKKyAgICAgICAgUUNvb2tpZUphcjo6Y29va2ll SmFyKCktPnNldENvb2tpZXModXJsLCB1cmwsIGMpOwogICAgIH0KICAgICBRU3RyaW5nIGNvbnRl bnRUeXBlID0gam9iLT5kLT5yZXNwb25zZS52YWx1ZSgiQ29udGVudC1UeXBlIik7CiAgICAgUVN0 cmluZyBlbmNvZGluZzsK