63286 2011-06-23 14:01:38 -0700 Add NSURLResponse wrapper in ResourceResponse when USE(CFNETWORK) is enabled 2011-07-12 10:51:39 -0700 1 1 1 Unclassified WebKit Platform 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 51836 1 psolanki psolanki ap beidson darin ddkilzer jberlin koivisto psolanki oldest_to_newest 426433 0 psolanki 2011-06-23 14:01:38 -0700 This is part of the move to the CFNetwork based loader on Mac - bug 51836. In order to send back NSURLResponse objects to WebKit on Mac, we need to have a wrapper NSURLResponse in ResourceResponse. 426441 1 98396 psolanki 2011-06-23 14:05:10 -0700 Created attachment 98396 Patch 426452 2 98399 psolanki 2011-06-23 14:14:03 -0700 Created attachment 98399 Patch 429000 3 98943 psolanki 2011-06-28 11:08:13 -0700 Created attachment 98943 Patch v3 - fixes some layout tests by creating correct NSURLResponses 435036 4 98943 jberlin 2011-07-11 11:25:16 -0700 Comment on attachment 98943 Patch v3 - fixes some layout tests by creating correct NSURLResponses Unofficial r=me! 435054 5 98943 ddkilzer 2011-07-11 11:42:10 -0700 Comment on attachment 98943 Patch v3 - fixes some layout tests by creating correct NSURLResponses View in context: https://bugs.webkit.org/attachment.cgi?id=98943&action=review r=me > Source/WebCore/platform/network/mac/ResourceResponseMac.mm:56 > + // Work around a mistake in the NSURLResponse class. Would be nice to document this as <rdar://problem/3346574> (per our discussion on IRC). > Source/WebCore/platform/network/mac/ResourceResponseMac.mm:77 > + if (!m_cfResponse) > + return nil; Is there ever a case where you have an m_nsResponse but not a m_cfResponse (in which case you could make the m_cfResponse from the m_nsResponse)? Or is this ASSERT-ed elsewhere during construction so it's not possible to get into this state? Could some of this logic be simplified by doing an early return if m_isNull is true: if (m_isNull) return nil; 435484 6 98943 psolanki 2011-07-11 22:31:28 -0700 Comment on attachment 98943 Patch v3 - fixes some layout tests by creating correct NSURLResponses View in context: https://bugs.webkit.org/attachment.cgi?id=98943&action=review >> Source/WebCore/platform/network/mac/ResourceResponseMac.mm:77 >> + return nil; > > Is there ever a case where you have an m_nsResponse but not a m_cfResponse (in which case you could make the m_cfResponse from the m_nsResponse)? Or is this ASSERT-ed elsewhere during construction so it's not possible to get into this state? > > Could some of this logic be simplified by doing an early return if m_isNull is true: > > if (m_isNull) > return nil; Hmm. I can't recall the exact reasons for the way the code is. I know I had updated this part of the patch because of some failures in layout tests. But this does feel a bit more complicated than it needs to be. I should be able to simplify this I think. I'll check this in right now and look into simplification in bug 64342. 435746 7 psolanki 2011-07-12 10:51:39 -0700 Committed r90825: <http://trac.webkit.org/changeset/90825> 98396 2011-06-23 14:05:10 -0700 2011-06-23 14:13:59 -0700 Patch bug-63286-20110623140508.patch text/plain 6601 psolanki U3VidmVyc2lvbiBSZXZpc2lvbjogODk2MDgKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA1OTRiZjViNTFkM2Y3MGQ3 NGI1OTI2NmVmMWUwNTllYTAxODQyYjU3Li41MjIzYTM3ZDNkNDNkNTY2OTQxNWI0YWFlZTljMmY5 OTkwZWMyOTIxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0yLDYgKzIsMjUgQEAKIAogICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KIAorICAgICAgICBBZGQgTlNVUkxSZXNwb25zZSB3cmFwcGVy IGluIFJlc291cmNlUmVzcG9uc2Ugd2hlbiBVU0UoQ0ZORVRXT1JLKSBpcyBlbmFibGVkCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02MzI4NgorCisgICAg ICAgIFdoZW4gVVNFKENGTkVUV09SSykgaXMgZW5hYmxlZCBvbiBNYWMsIGtlZXAgYW4gTlNVUkxS ZXNwb25zZSBvYmplY3QgYWxvbmcgd2l0aCB0aGUKKyAgICAgICAgQ0ZVUkxSZXNwb25zZVJlZiBz byB0aGF0IFdlYktpdCBjYW4gY29udGludWUgdXNpbmcgdGhlIE5TVVJMUmVzcG9uc2UuCisKKyAg ICAgICAgTm8gbmV3IHRlc3RzIGJlY2F1c2Ugbm8gY2hhbmdlIGluIGZ1bmN0aW9uYWxpdHkgYW5k IG9wdGlvbiBpcyBub3QgZW5hYmxlZCBvbiBNYWMuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9uZXR3 b3JrL2NmL1Jlc291cmNlUmVzcG9uc2UuaDoKKyAgICAgICAgKFdlYkNvcmU6OlJlc291cmNlUmVz cG9uc2U6OlJlc291cmNlUmVzcG9uc2UpOgorICAgICAgICAqIHBsYXRmb3JtL25ldHdvcmsvbWFj L1Jlc291cmNlUmVzcG9uc2VNYWMubW06CisgICAgICAgIChXZWJDb3JlOjpSZXNvdXJjZVJlc3Bv bnNlOjppbml0TlNVUkxSZXNwb25zZSk6CisgICAgICAgIChXZWJDb3JlOjpSZXNvdXJjZVJlc3Bv bnNlOjpuc1VSTFJlc3BvbnNlKToKKyAgICAgICAgKFdlYkNvcmU6OlJlc291cmNlUmVzcG9uc2U6 OlJlc291cmNlUmVzcG9uc2UpOgorCisyMDExLTA2LTIzICBQcmF0aWsgU29sYW5raSAgPHBzb2xh bmtpQGFwcGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwog ICAgICAgICBBZGQgTlNVUkxSZXF1ZXN0IHdyYXBwZXIgaW4gUmVzb3VyY2VSZXF1ZXN0IHdoZW4g VVNFKENGTkVUV09SSykgaXMgZW5hYmxlZAogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9NjMyNzYKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vbmV0d29yay9jZi9SZXNvdXJjZVJlc3BvbnNlLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9uZXR3b3JrL2NmL1Jlc291cmNlUmVzcG9uc2UuaAppbmRleCAwNjE2NjEyMzU5ZTFkZTgy YmYxZTBhMGQ0Yzc4YTk1ZGNjMTNhMDcwLi45NDZlZWUwODMzYmVkMjdiOWNmNjUxY2NjNjg0N2M2 MzM3NjdkZDFhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2Nm L1Jlc291cmNlUmVzcG9uc2UuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3Jr L2NmL1Jlc291cmNlUmVzcG9uc2UuaApAQCAtMzEsMTMgKzMxLDEzIEBACiAKICNpZiBVU0UoQ0ZO RVRXT1JLKQogdHlwZWRlZiBzdHJ1Y3QgX0NGVVJMUmVzcG9uc2UqIENGVVJMUmVzcG9uc2VSZWY7 Ci0jZWxzZQorI2VuZGlmCisKICNpZmRlZiBfX09CSkNfXwogQGNsYXNzIE5TVVJMUmVzcG9uc2U7 CiAjZWxzZQogY2xhc3MgTlNVUkxSZXNwb25zZTsKICNlbmRpZgotI2VuZGlmCiAKIG5hbWVzcGFj ZSBXZWJDb3JlIHsKIApAQCAtNTUsOCArNTUsMTEgQEAgcHVibGljOgogICAgIHsKICAgICAgICAg bV9pc051bGwgPSAhY2ZSZXNwb25zZTsKICAgICB9CisjaWYgUExBVEZPUk0oTUFDKQorICAgIFJl c291cmNlUmVzcG9uc2UoTlNVUkxSZXNwb25zZSAqKTsKKyNlbmRpZgogI2Vsc2UKLSAgICBSZXNv dXJjZVJlc3BvbnNlKE5TVVJMUmVzcG9uc2UqIG5zUmVzcG9uc2UpCisgICAgUmVzb3VyY2VSZXNw b25zZShOU1VSTFJlc3BvbnNlICpuc1Jlc3BvbnNlKQogICAgICAgICA6IG1fbnNSZXNwb25zZShu c1Jlc3BvbnNlKQogICAgICAgICAsIG1faW5pdExldmVsKFVuaW5pdGlhbGl6ZWQpCiAgICAgewpA QCAtODQsNyArODcsOCBAQCBwdWJsaWM6CiAKICNpZiBVU0UoQ0ZORVRXT1JLKQogICAgIENGVVJM UmVzcG9uc2VSZWYgY2ZVUkxSZXNwb25zZSgpIGNvbnN0OwotI2Vsc2UKKyNlbmRpZgorI2lmIFBM QVRGT1JNKE1BQykKICAgICBOU1VSTFJlc3BvbnNlICpuc1VSTFJlc3BvbnNlKCkgY29uc3Q7CiAj ZW5kaWYKIApAQCAtOTQsMTIgKzk4LDE2IEBAIHByaXZhdGU6CiAgICAgdm9pZCBwbGF0Zm9ybUxh enlJbml0KEluaXRMZXZlbCk7CiAgICAgUGFzc093blB0cjxDcm9zc1RocmVhZFJlc291cmNlUmVz cG9uc2VEYXRhPiBkb1BsYXRmb3JtQ29weURhdGEoUGFzc093blB0cjxDcm9zc1RocmVhZFJlc291 cmNlUmVzcG9uc2VEYXRhPiBkYXRhKSBjb25zdCB7IHJldHVybiBkYXRhOyB9CiAgICAgdm9pZCBk b1BsYXRmb3JtQWRvcHQoUGFzc093blB0cjxDcm9zc1RocmVhZFJlc291cmNlUmVzcG9uc2VEYXRh PikgeyB9CisjaWYgUExBVEZPUk0oTUFDKQorICAgIHZvaWQgaW5pdE5TVVJMUmVzcG9uc2UoKSBj b25zdDsKKyNlbmRpZgogCiAgICAgc3RhdGljIGJvb2wgcGxhdGZvcm1Db21wYXJlKGNvbnN0IFJl c291cmNlUmVzcG9uc2UmIGEsIGNvbnN0IFJlc291cmNlUmVzcG9uc2UmIGIpOwogCiAjaWYgVVNF KENGTkVUV09SSykKICAgICBtdXRhYmxlIFJldGFpblB0cjxDRlVSTFJlc3BvbnNlUmVmPiBtX2Nm UmVzcG9uc2U7Ci0jZWxzZQorI2VuZGlmCisjaWYgUExBVEZPUk0oTUFDKQogICAgIG11dGFibGUg UmV0YWluUHRyPE5TVVJMUmVzcG9uc2U+IG1fbnNSZXNwb25zZTsKICNlbmRpZgogICAgIEluaXRM ZXZlbCBtX2luaXRMZXZlbDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25l dHdvcmsvbWFjL1Jlc291cmNlUmVzcG9uc2VNYWMubW0gYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9uZXR3b3JrL21hYy9SZXNvdXJjZVJlc3BvbnNlTWFjLm1tCmluZGV4IDg4OWI1NWZjY2YxODFh MjNmZjk5ZjE4MGQwY2I1M2E0NDc3YTEwZTUuLmVkZjdlNTgwM2QxNGQyOTYxZTk0YjYwOGI3Yzhh NjFhYmFjYWUzZTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsv bWFjL1Jlc291cmNlUmVzcG9uc2VNYWMubW0KKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v bmV0d29yay9tYWMvUmVzb3VyY2VSZXNwb25zZU1hYy5tbQpAQCAtMjYsOCArMjYsNiBAQAogI2lt cG9ydCAiY29uZmlnLmgiCiAjaW1wb3J0ICJSZXNvdXJjZVJlc3BvbnNlLmgiCiAKLSNpZiAhVVNF KENGTkVUV09SSykKLQogI2ltcG9ydCAiSFRUUFBhcnNlcnMuaCIKICNpbXBvcnQgIldlYkNvcmVV UkxSZXNwb25zZS5oIgogI2ltcG9ydCAiV2ViQ29yZVN5c3RlbUludGVyZmFjZS5oIgpAQCAtMzYs OCArMzQsMTIgQEAKICNpbXBvcnQgPGxpbWl0cz4KICNpbmNsdWRlIDx3dGYvdGV4dC9DU3RyaW5n Lmg+CiAKLUBpbnRlcmZhY2UgTlNVUkxSZXNwb25zZSAoRm91bmRhdGlvblNlY3JldHNXZWJDb3Jl S25vd3NBYm91dCkKK3VzaW5nIG5hbWVzcGFjZSBzdGQ7CisKK0BpbnRlcmZhY2UgTlNVUkxSZXNw b25zZSAoV2ViTlNVUkxSZXNwb25zZURldGFpbHMpCiAtIChOU1RpbWVJbnRlcnZhbClfY2FsY3Vs YXRlZEV4cGlyYXRpb247CistIChpZClfaW5pdFdpdGhDRlVSTFJlc3BvbnNlOihDRlVSTFJlc3Bv bnNlUmVmKXJlc3BvbnNlOworLSAoQ0ZVUkxSZXNwb25zZVJlZikgX0NGVVJMUmVzcG9uc2U7CiBA ZW5kCiAKIApAQCAtNDgsMTkgKzUwLDUxIEBAIHN0YXRpYyBOU1N0cmluZyogY29uc3QgY29tbW9u SGVhZGVyRmllbGRzW10gPSB7CiB9Owogc3RhdGljIGNvbnN0IGludCBudW1Db21tb25IZWFkZXJG aWVsZHMgPSBzaXplb2YoY29tbW9uSGVhZGVyRmllbGRzKSAvIHNpemVvZihBdG9taWNTdHJpbmcq KTsKIAordm9pZCBSZXNvdXJjZVJlc3BvbnNlOjppbml0TlNVUkxSZXNwb25zZSgpIGNvbnN0Cit7 CisgICAgLy8gV29yayBhcm91bmQgYSBtaXN0YWtlIGluIHRoZSBOU1VSTFJlc3BvbnNlIGNsYXNz LgorICAgIC8vIFRoZSBpbml0IGZ1bmN0aW9uIHRha2VzIGFuIE5TSW50ZWdlciwgZXZlbiB0aG91 Z2ggdGhlIGFjY2Vzc29yIHJldHVybnMgYSBsb25nIGxvbmcuCisgICAgLy8gRm9yIHZhbHVlcyB0 aGF0IHdvbid0IGZpdCBpbiBhbiBOU0ludGVnZXIsIHBhc3MgLTEgaW5zdGVhZC4KKyAgICBOU0lu dGVnZXIgZXhwZWN0ZWRDb250ZW50TGVuZ3RoOworICAgIGlmIChtX2V4cGVjdGVkQ29udGVudExl bmd0aCA8IDAgfHwgbV9leHBlY3RlZENvbnRlbnRMZW5ndGggPiBudW1lcmljX2xpbWl0czxOU0lu dGVnZXI+OjptYXgoKSkKKyAgICAgICAgZXhwZWN0ZWRDb250ZW50TGVuZ3RoID0gLTE7CisgICAg ZWxzZQorICAgICAgICBleHBlY3RlZENvbnRlbnRMZW5ndGggPSBzdGF0aWNfY2FzdDxOU0ludGVn ZXI+KG1fZXhwZWN0ZWRDb250ZW50TGVuZ3RoKTsKKyAgICBtX25zUmVzcG9uc2UuYWRvcHROUyhb W05TVVJMUmVzcG9uc2UgYWxsb2NdIGluaXRXaXRoVVJMOm1fdXJsIE1JTUVUeXBlOm1fbWltZVR5 cGUgZXhwZWN0ZWRDb250ZW50TGVuZ3RoOmV4cGVjdGVkQ29udGVudExlbmd0aCB0ZXh0RW5jb2Rp bmdOYW1lOm1fdGV4dEVuY29kaW5nTmFtZV0pOworfQorCisjaWYgVVNFKENGTkVUV09SSykKKwog TlNVUkxSZXNwb25zZSAqUmVzb3VyY2VSZXNwb25zZTo6bnNVUkxSZXNwb25zZSgpIGNvbnN0CiB7 Ci0gICAgaWYgKCFtX25zUmVzcG9uc2UgJiYgIW1faXNOdWxsKSB7Ci0gICAgICAgIC8vIFdvcmsg YXJvdW5kIGEgbWlzdGFrZSBpbiB0aGUgTlNVUkxSZXNwb25zZSBjbGFzcy4KLSAgICAgICAgLy8g VGhlIGluaXQgZnVuY3Rpb24gdGFrZXMgYW4gTlNJbnRlZ2VyLCBldmVuIHRob3VnaCB0aGUgYWNj ZXNzb3IgcmV0dXJucyBhIGxvbmcgbG9uZy4KLSAgICAgICAgLy8gRm9yIHZhbHVlcyB0aGF0IHdv bid0IGZpdCBpbiBhbiBOU0ludGVnZXIsIHBhc3MgLTEgaW5zdGVhZC4KLSAgICAgICAgTlNJbnRl Z2VyIGV4cGVjdGVkQ29udGVudExlbmd0aDsKLSAgICAgICAgaWYgKG1fZXhwZWN0ZWRDb250ZW50 TGVuZ3RoIDwgMCB8fCBtX2V4cGVjdGVkQ29udGVudExlbmd0aCA+IHN0ZDo6bnVtZXJpY19saW1p dHM8TlNJbnRlZ2VyPjo6bWF4KCkpCi0gICAgICAgICAgICBleHBlY3RlZENvbnRlbnRMZW5ndGgg PSAtMTsKLSAgICAgICAgZWxzZQotICAgICAgICAgICAgZXhwZWN0ZWRDb250ZW50TGVuZ3RoID0g c3RhdGljX2Nhc3Q8TlNJbnRlZ2VyPihtX2V4cGVjdGVkQ29udGVudExlbmd0aCk7Ci0gICAgICAg IGNvbnN0X2Nhc3Q8UmVzb3VyY2VSZXNwb25zZSo+KHRoaXMpLT5tX25zUmVzcG9uc2UuYWRvcHRO UyhbW05TVVJMUmVzcG9uc2UgYWxsb2NdIGluaXRXaXRoVVJMOm1fdXJsIE1JTUVUeXBlOm1fbWlt ZVR5cGUgZXhwZWN0ZWRDb250ZW50TGVuZ3RoOmV4cGVjdGVkQ29udGVudExlbmd0aCB0ZXh0RW5j b2RpbmdOYW1lOm1fdGV4dEVuY29kaW5nTmFtZV0pOworICAgIGlmICghbV9uc1Jlc3BvbnNlICYm ICFtX2NmUmVzcG9uc2UgJiYgIW1faXNOdWxsKSB7CisgICAgICAgIGluaXROU1VSTFJlc3BvbnNl KCk7CisgICAgICAgIG1fY2ZSZXNwb25zZSA9IFttX25zUmVzcG9uc2UuZ2V0KCkgX0NGVVJMUmVz cG9uc2VdOwogICAgIH0KKworICAgIGlmICghbV9jZlJlc3BvbnNlKQorICAgICAgICByZXR1cm4g bmlsOworCisgICAgaWYgKCFtX25zUmVzcG9uc2UpCisgICAgICAgIG1fbnNSZXNwb25zZS5hZG9w dE5TKFtbTlNVUkxSZXNwb25zZSBhbGxvY10gX2luaXRXaXRoQ0ZVUkxSZXNwb25zZTptX2NmUmVz cG9uc2UuZ2V0KCldKTsKKworICAgIHJldHVybiBtX25zUmVzcG9uc2UuZ2V0KCk7Cit9CisKK1Jl c291cmNlUmVzcG9uc2U6OlJlc291cmNlUmVzcG9uc2UoTlNVUkxSZXNwb25zZSogbnNSZXNwb25z ZSkKKyAgICA6IG1fY2ZSZXNwb25zZShbbnNSZXNwb25zZSBfQ0ZVUkxSZXNwb25zZV0pCisgICAg LCBtX25zUmVzcG9uc2UobnNSZXNwb25zZSkKKyAgICAsIG1faXNVcFRvRGF0ZShmYWxzZSkKK3sK KyAgICBtX2lzTnVsbCA9ICFuc1Jlc3BvbnNlOworfQorCisjZWxzZQorCitOU1VSTFJlc3BvbnNl ICpSZXNvdXJjZVJlc3BvbnNlOjpuc1VSTFJlc3BvbnNlKCkgY29uc3QKK3sKKyAgICBpZiAoIW1f bnNSZXNwb25zZSAmJiAhbV9pc051bGwpCisgICAgICAgIGluaXROU1VSTFJlc3BvbnNlKCk7CiAg ICAgcmV0dXJuIG1fbnNSZXNwb25zZS5nZXQoKTsKIH0KIApAQCAtMTM2LDYgKzE3MCw3IEBAIGJv b2wgUmVzb3VyY2VSZXNwb25zZTo6cGxhdGZvcm1Db21wYXJlKGNvbnN0IFJlc291cmNlUmVzcG9u c2UmIGEsIGNvbnN0IFJlc291cmNlCiAgICAgcmV0dXJuIGEubnNVUkxSZXNwb25zZSgpID09IGIu bnNVUkxSZXNwb25zZSgpOwogfQogCisjZW5kaWYgLy8gVVNFKENGTkVUV09SSykKKwogfSAvLyBu YW1lc3BhY2UgV2ViQ29yZQogCi0jZW5kaWYgLy8gIVVTRShDRk5FVFdPUkspCg== 98399 2011-06-23 14:14:03 -0700 2011-06-28 11:08:09 -0700 Patch bug-63286-20110623141401.patch text/plain 6608 psolanki U3VidmVyc2lvbiBSZXZpc2lvbjogODk2MTEKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA3NTlmNDk4NjVmMGFhOWVi MTI2NDk3YjE0ZDFkZTM2NGM0NGVkNTY0Li5hNDRiZmUyMTgzYzExYjlmZGY3MjRlMTNlMDY3ZTVj NTExZDZmNDM1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0yLDYgKzIsMjUgQEAKIAogICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KIAorICAgICAgICBBZGQgTlNVUkxSZXNwb25zZSB3cmFwcGVy IGluIFJlc291cmNlUmVzcG9uc2Ugd2hlbiBVU0UoQ0ZORVRXT1JLKSBpcyBlbmFibGVkCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02MzI4NgorCisgICAg ICAgIFdoZW4gVVNFKENGTkVUV09SSykgaXMgZW5hYmxlZCBvbiBNYWMsIGtlZXAgYW4gTlNVUkxS ZXNwb25zZSBvYmplY3QgYWxvbmcgd2l0aCB0aGUKKyAgICAgICAgQ0ZVUkxSZXNwb25zZVJlZiBz byB0aGF0IFdlYktpdCBjYW4gY29udGludWUgdXNpbmcgdGhlIE5TVVJMUmVzcG9uc2UuCisKKyAg ICAgICAgTm8gbmV3IHRlc3RzIGJlY2F1c2Ugbm8gY2hhbmdlIGluIGZ1bmN0aW9uYWxpdHkgYW5k IG9wdGlvbiBpcyBub3QgZW5hYmxlZCBvbiBNYWMuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9uZXR3 b3JrL2NmL1Jlc291cmNlUmVzcG9uc2UuaDoKKyAgICAgICAgKFdlYkNvcmU6OlJlc291cmNlUmVz cG9uc2U6OlJlc291cmNlUmVzcG9uc2UpOgorICAgICAgICAqIHBsYXRmb3JtL25ldHdvcmsvbWFj L1Jlc291cmNlUmVzcG9uc2VNYWMubW06CisgICAgICAgIChXZWJDb3JlOjpSZXNvdXJjZVJlc3Bv bnNlOjppbml0TlNVUkxSZXNwb25zZSk6CisgICAgICAgIChXZWJDb3JlOjpSZXNvdXJjZVJlc3Bv bnNlOjpuc1VSTFJlc3BvbnNlKToKKyAgICAgICAgKFdlYkNvcmU6OlJlc291cmNlUmVzcG9uc2U6 OlJlc291cmNlUmVzcG9uc2UpOgorCisyMDExLTA2LTIzICBQcmF0aWsgU29sYW5raSAgPHBzb2xh bmtpQGFwcGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwog ICAgICAgICBBZGQgTlNVUkxSZXF1ZXN0IHdyYXBwZXIgaW4gUmVzb3VyY2VSZXF1ZXN0IHdoZW4g VVNFKENGTkVUV09SSykgaXMgZW5hYmxlZAogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9NjMyNzYKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vbmV0d29yay9jZi9SZXNvdXJjZVJlc3BvbnNlLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9uZXR3b3JrL2NmL1Jlc291cmNlUmVzcG9uc2UuaAppbmRleCAwNjE2NjEyMzU5ZTFkZTgy YmYxZTBhMGQ0Yzc4YTk1ZGNjMTNhMDcwLi45NDZlZWUwODMzYmVkMjdiOWNmNjUxY2NjNjg0N2M2 MzM3NjdkZDFhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2Nm L1Jlc291cmNlUmVzcG9uc2UuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3Jr L2NmL1Jlc291cmNlUmVzcG9uc2UuaApAQCAtMzEsMTMgKzMxLDEzIEBACiAKICNpZiBVU0UoQ0ZO RVRXT1JLKQogdHlwZWRlZiBzdHJ1Y3QgX0NGVVJMUmVzcG9uc2UqIENGVVJMUmVzcG9uc2VSZWY7 Ci0jZWxzZQorI2VuZGlmCisKICNpZmRlZiBfX09CSkNfXwogQGNsYXNzIE5TVVJMUmVzcG9uc2U7 CiAjZWxzZQogY2xhc3MgTlNVUkxSZXNwb25zZTsKICNlbmRpZgotI2VuZGlmCiAKIG5hbWVzcGFj ZSBXZWJDb3JlIHsKIApAQCAtNTUsOCArNTUsMTEgQEAgcHVibGljOgogICAgIHsKICAgICAgICAg bV9pc051bGwgPSAhY2ZSZXNwb25zZTsKICAgICB9CisjaWYgUExBVEZPUk0oTUFDKQorICAgIFJl c291cmNlUmVzcG9uc2UoTlNVUkxSZXNwb25zZSAqKTsKKyNlbmRpZgogI2Vsc2UKLSAgICBSZXNv dXJjZVJlc3BvbnNlKE5TVVJMUmVzcG9uc2UqIG5zUmVzcG9uc2UpCisgICAgUmVzb3VyY2VSZXNw b25zZShOU1VSTFJlc3BvbnNlICpuc1Jlc3BvbnNlKQogICAgICAgICA6IG1fbnNSZXNwb25zZShu c1Jlc3BvbnNlKQogICAgICAgICAsIG1faW5pdExldmVsKFVuaW5pdGlhbGl6ZWQpCiAgICAgewpA QCAtODQsNyArODcsOCBAQCBwdWJsaWM6CiAKICNpZiBVU0UoQ0ZORVRXT1JLKQogICAgIENGVVJM UmVzcG9uc2VSZWYgY2ZVUkxSZXNwb25zZSgpIGNvbnN0OwotI2Vsc2UKKyNlbmRpZgorI2lmIFBM QVRGT1JNKE1BQykKICAgICBOU1VSTFJlc3BvbnNlICpuc1VSTFJlc3BvbnNlKCkgY29uc3Q7CiAj ZW5kaWYKIApAQCAtOTQsMTIgKzk4LDE2IEBAIHByaXZhdGU6CiAgICAgdm9pZCBwbGF0Zm9ybUxh enlJbml0KEluaXRMZXZlbCk7CiAgICAgUGFzc093blB0cjxDcm9zc1RocmVhZFJlc291cmNlUmVz cG9uc2VEYXRhPiBkb1BsYXRmb3JtQ29weURhdGEoUGFzc093blB0cjxDcm9zc1RocmVhZFJlc291 cmNlUmVzcG9uc2VEYXRhPiBkYXRhKSBjb25zdCB7IHJldHVybiBkYXRhOyB9CiAgICAgdm9pZCBk b1BsYXRmb3JtQWRvcHQoUGFzc093blB0cjxDcm9zc1RocmVhZFJlc291cmNlUmVzcG9uc2VEYXRh PikgeyB9CisjaWYgUExBVEZPUk0oTUFDKQorICAgIHZvaWQgaW5pdE5TVVJMUmVzcG9uc2UoKSBj b25zdDsKKyNlbmRpZgogCiAgICAgc3RhdGljIGJvb2wgcGxhdGZvcm1Db21wYXJlKGNvbnN0IFJl c291cmNlUmVzcG9uc2UmIGEsIGNvbnN0IFJlc291cmNlUmVzcG9uc2UmIGIpOwogCiAjaWYgVVNF KENGTkVUV09SSykKICAgICBtdXRhYmxlIFJldGFpblB0cjxDRlVSTFJlc3BvbnNlUmVmPiBtX2Nm UmVzcG9uc2U7Ci0jZWxzZQorI2VuZGlmCisjaWYgUExBVEZPUk0oTUFDKQogICAgIG11dGFibGUg UmV0YWluUHRyPE5TVVJMUmVzcG9uc2U+IG1fbnNSZXNwb25zZTsKICNlbmRpZgogICAgIEluaXRM ZXZlbCBtX2luaXRMZXZlbDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25l dHdvcmsvbWFjL1Jlc291cmNlUmVzcG9uc2VNYWMubW0gYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9uZXR3b3JrL21hYy9SZXNvdXJjZVJlc3BvbnNlTWFjLm1tCmluZGV4IDg4OWI1NWZjY2YxODFh MjNmZjk5ZjE4MGQwY2I1M2E0NDc3YTEwZTUuLjI3ODczMmE1YmY4ZGFkYjk4MzgwN2E2MGFhMDRm NGNkOWEzOTNmZWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsv bWFjL1Jlc291cmNlUmVzcG9uc2VNYWMubW0KKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v bmV0d29yay9tYWMvUmVzb3VyY2VSZXNwb25zZU1hYy5tbQpAQCAtMjYsOCArMjYsNiBAQAogI2lt cG9ydCAiY29uZmlnLmgiCiAjaW1wb3J0ICJSZXNvdXJjZVJlc3BvbnNlLmgiCiAKLSNpZiAhVVNF KENGTkVUV09SSykKLQogI2ltcG9ydCAiSFRUUFBhcnNlcnMuaCIKICNpbXBvcnQgIldlYkNvcmVV UkxSZXNwb25zZS5oIgogI2ltcG9ydCAiV2ViQ29yZVN5c3RlbUludGVyZmFjZS5oIgpAQCAtMzYs OCArMzQsMTIgQEAKICNpbXBvcnQgPGxpbWl0cz4KICNpbmNsdWRlIDx3dGYvdGV4dC9DU3RyaW5n Lmg+CiAKLUBpbnRlcmZhY2UgTlNVUkxSZXNwb25zZSAoRm91bmRhdGlvblNlY3JldHNXZWJDb3Jl S25vd3NBYm91dCkKK3VzaW5nIG5hbWVzcGFjZSBzdGQ7CisKK0BpbnRlcmZhY2UgTlNVUkxSZXNw b25zZSAoV2ViTlNVUkxSZXNwb25zZURldGFpbHMpCiAtIChOU1RpbWVJbnRlcnZhbClfY2FsY3Vs YXRlZEV4cGlyYXRpb247CistIChpZClfaW5pdFdpdGhDRlVSTFJlc3BvbnNlOihDRlVSTFJlc3Bv bnNlUmVmKXJlc3BvbnNlOworLSAoQ0ZVUkxSZXNwb25zZVJlZikgX0NGVVJMUmVzcG9uc2U7CiBA ZW5kCiAKIApAQCAtNDgsMTkgKzUwLDUxIEBAIHN0YXRpYyBOU1N0cmluZyogY29uc3QgY29tbW9u SGVhZGVyRmllbGRzW10gPSB7CiB9Owogc3RhdGljIGNvbnN0IGludCBudW1Db21tb25IZWFkZXJG aWVsZHMgPSBzaXplb2YoY29tbW9uSGVhZGVyRmllbGRzKSAvIHNpemVvZihBdG9taWNTdHJpbmcq KTsKIAordm9pZCBSZXNvdXJjZVJlc3BvbnNlOjppbml0TlNVUkxSZXNwb25zZSgpIGNvbnN0Cit7 CisgICAgLy8gV29yayBhcm91bmQgYSBtaXN0YWtlIGluIHRoZSBOU1VSTFJlc3BvbnNlIGNsYXNz LgorICAgIC8vIFRoZSBpbml0IGZ1bmN0aW9uIHRha2VzIGFuIE5TSW50ZWdlciwgZXZlbiB0aG91 Z2ggdGhlIGFjY2Vzc29yIHJldHVybnMgYSBsb25nIGxvbmcuCisgICAgLy8gRm9yIHZhbHVlcyB0 aGF0IHdvbid0IGZpdCBpbiBhbiBOU0ludGVnZXIsIHBhc3MgLTEgaW5zdGVhZC4KKyAgICBOU0lu dGVnZXIgZXhwZWN0ZWRDb250ZW50TGVuZ3RoOworICAgIGlmIChtX2V4cGVjdGVkQ29udGVudExl bmd0aCA8IDAgfHwgbV9leHBlY3RlZENvbnRlbnRMZW5ndGggPiBudW1lcmljX2xpbWl0czxOU0lu dGVnZXI+OjptYXgoKSkKKyAgICAgICAgZXhwZWN0ZWRDb250ZW50TGVuZ3RoID0gLTE7CisgICAg ZWxzZQorICAgICAgICBleHBlY3RlZENvbnRlbnRMZW5ndGggPSBzdGF0aWNfY2FzdDxOU0ludGVn ZXI+KG1fZXhwZWN0ZWRDb250ZW50TGVuZ3RoKTsKKyAgICBtX25zUmVzcG9uc2UuYWRvcHROUyhb W05TVVJMUmVzcG9uc2UgYWxsb2NdIGluaXRXaXRoVVJMOm1fdXJsIE1JTUVUeXBlOm1fbWltZVR5 cGUgZXhwZWN0ZWRDb250ZW50TGVuZ3RoOmV4cGVjdGVkQ29udGVudExlbmd0aCB0ZXh0RW5jb2Rp bmdOYW1lOm1fdGV4dEVuY29kaW5nTmFtZV0pOworfQorCisjaWYgVVNFKENGTkVUV09SSykKKwog TlNVUkxSZXNwb25zZSAqUmVzb3VyY2VSZXNwb25zZTo6bnNVUkxSZXNwb25zZSgpIGNvbnN0CiB7 Ci0gICAgaWYgKCFtX25zUmVzcG9uc2UgJiYgIW1faXNOdWxsKSB7Ci0gICAgICAgIC8vIFdvcmsg YXJvdW5kIGEgbWlzdGFrZSBpbiB0aGUgTlNVUkxSZXNwb25zZSBjbGFzcy4KLSAgICAgICAgLy8g VGhlIGluaXQgZnVuY3Rpb24gdGFrZXMgYW4gTlNJbnRlZ2VyLCBldmVuIHRob3VnaCB0aGUgYWNj ZXNzb3IgcmV0dXJucyBhIGxvbmcgbG9uZy4KLSAgICAgICAgLy8gRm9yIHZhbHVlcyB0aGF0IHdv bid0IGZpdCBpbiBhbiBOU0ludGVnZXIsIHBhc3MgLTEgaW5zdGVhZC4KLSAgICAgICAgTlNJbnRl Z2VyIGV4cGVjdGVkQ29udGVudExlbmd0aDsKLSAgICAgICAgaWYgKG1fZXhwZWN0ZWRDb250ZW50 TGVuZ3RoIDwgMCB8fCBtX2V4cGVjdGVkQ29udGVudExlbmd0aCA+IHN0ZDo6bnVtZXJpY19saW1p dHM8TlNJbnRlZ2VyPjo6bWF4KCkpCi0gICAgICAgICAgICBleHBlY3RlZENvbnRlbnRMZW5ndGgg PSAtMTsKLSAgICAgICAgZWxzZQotICAgICAgICAgICAgZXhwZWN0ZWRDb250ZW50TGVuZ3RoID0g c3RhdGljX2Nhc3Q8TlNJbnRlZ2VyPihtX2V4cGVjdGVkQ29udGVudExlbmd0aCk7Ci0gICAgICAg IGNvbnN0X2Nhc3Q8UmVzb3VyY2VSZXNwb25zZSo+KHRoaXMpLT5tX25zUmVzcG9uc2UuYWRvcHRO UyhbW05TVVJMUmVzcG9uc2UgYWxsb2NdIGluaXRXaXRoVVJMOm1fdXJsIE1JTUVUeXBlOm1fbWlt ZVR5cGUgZXhwZWN0ZWRDb250ZW50TGVuZ3RoOmV4cGVjdGVkQ29udGVudExlbmd0aCB0ZXh0RW5j b2RpbmdOYW1lOm1fdGV4dEVuY29kaW5nTmFtZV0pOworICAgIGlmICghbV9uc1Jlc3BvbnNlICYm ICFtX2NmUmVzcG9uc2UgJiYgIW1faXNOdWxsKSB7CisgICAgICAgIGluaXROU1VSTFJlc3BvbnNl KCk7CisgICAgICAgIG1fY2ZSZXNwb25zZSA9IFttX25zUmVzcG9uc2UuZ2V0KCkgX0NGVVJMUmVz cG9uc2VdOwogICAgIH0KKworICAgIGlmICghbV9jZlJlc3BvbnNlKQorICAgICAgICByZXR1cm4g bmlsOworCisgICAgaWYgKCFtX25zUmVzcG9uc2UpCisgICAgICAgIG1fbnNSZXNwb25zZS5hZG9w dE5TKFtbTlNVUkxSZXNwb25zZSBhbGxvY10gX2luaXRXaXRoQ0ZVUkxSZXNwb25zZTptX2NmUmVz cG9uc2UuZ2V0KCldKTsKKworICAgIHJldHVybiBtX25zUmVzcG9uc2UuZ2V0KCk7Cit9CisKK1Jl c291cmNlUmVzcG9uc2U6OlJlc291cmNlUmVzcG9uc2UoTlNVUkxSZXNwb25zZSogbnNSZXNwb25z ZSkKKyAgICA6IG1fY2ZSZXNwb25zZShbbnNSZXNwb25zZSBfQ0ZVUkxSZXNwb25zZV0pCisgICAg LCBtX25zUmVzcG9uc2UobnNSZXNwb25zZSkKKyAgICAsIG1faW5pdExldmVsKFVuaW5pdGlhbGl6 ZWQpCit7CisgICAgbV9pc051bGwgPSAhbnNSZXNwb25zZTsKK30KKworI2Vsc2UKKworTlNVUkxS ZXNwb25zZSAqUmVzb3VyY2VSZXNwb25zZTo6bnNVUkxSZXNwb25zZSgpIGNvbnN0Cit7CisgICAg aWYgKCFtX25zUmVzcG9uc2UgJiYgIW1faXNOdWxsKQorICAgICAgICBpbml0TlNVUkxSZXNwb25z ZSgpOwogICAgIHJldHVybiBtX25zUmVzcG9uc2UuZ2V0KCk7CiB9CiAKQEAgLTEzNiw2ICsxNzAs NyBAQCBib29sIFJlc291cmNlUmVzcG9uc2U6OnBsYXRmb3JtQ29tcGFyZShjb25zdCBSZXNvdXJj ZVJlc3BvbnNlJiBhLCBjb25zdCBSZXNvdXJjZQogICAgIHJldHVybiBhLm5zVVJMUmVzcG9uc2Uo KSA9PSBiLm5zVVJMUmVzcG9uc2UoKTsKIH0KIAorI2VuZGlmIC8vIFVTRShDRk5FVFdPUkspCisK IH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKIAotI2VuZGlmIC8vICFVU0UoQ0ZORVRXT1JLKQo= 98943 2011-06-28 11:08:13 -0700 2011-07-11 22:31:28 -0700 Patch v3 - fixes some layout tests by creating correct NSURLResponses bug-63286-20110628110811.patch text/plain 6675 psolanki U3VidmVyc2lvbiBSZXZpc2lvbjogODk4NjkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA3YjhlODIxMjYwODg1NmUy ZDNmNjBkNWM5YTM0OGRiN2NlOWE0M2RlLi5hNmQ3OTcyNDFhZjdhZmM2MjVkMGQwYmZiODgyYmIw YzljOWJhNmEyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0yLDYgKzIsMjUgQEAKIAogICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KIAorICAgICAgICBBZGQgTlNVUkxSZXNwb25zZSB3cmFwcGVy IGluIFJlc291cmNlUmVzcG9uc2Ugd2hlbiBVU0UoQ0ZORVRXT1JLKSBpcyBlbmFibGVkCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02MzI4NgorCisgICAg ICAgIFdoZW4gVVNFKENGTkVUV09SSykgaXMgZW5hYmxlZCBvbiBNYWMsIGtlZXAgYW4gTlNVUkxS ZXNwb25zZSBvYmplY3QgYWxvbmcgd2l0aCB0aGUKKyAgICAgICAgQ0ZVUkxSZXNwb25zZVJlZiBz byB0aGF0IFdlYktpdCBjYW4gY29udGludWUgdXNpbmcgdGhlIE5TVVJMUmVzcG9uc2UuCisKKyAg ICAgICAgTm8gbmV3IHRlc3RzIGJlY2F1c2Ugbm8gY2hhbmdlIGluIGZ1bmN0aW9uYWxpdHkgYW5k IG9wdGlvbiBpcyBub3QgZW5hYmxlZCBvbiBNYWMuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9uZXR3 b3JrL2NmL1Jlc291cmNlUmVzcG9uc2UuaDoKKyAgICAgICAgKFdlYkNvcmU6OlJlc291cmNlUmVz cG9uc2U6OlJlc291cmNlUmVzcG9uc2UpOgorICAgICAgICAqIHBsYXRmb3JtL25ldHdvcmsvbWFj L1Jlc291cmNlUmVzcG9uc2VNYWMubW06CisgICAgICAgIChXZWJDb3JlOjpSZXNvdXJjZVJlc3Bv bnNlOjppbml0TlNVUkxSZXNwb25zZSk6CisgICAgICAgIChXZWJDb3JlOjpSZXNvdXJjZVJlc3Bv bnNlOjpuc1VSTFJlc3BvbnNlKToKKyAgICAgICAgKFdlYkNvcmU6OlJlc291cmNlUmVzcG9uc2U6 OlJlc291cmNlUmVzcG9uc2UpOgorCisyMDExLTA2LTIzICBQcmF0aWsgU29sYW5raSAgPHBzb2xh bmtpQGFwcGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwog ICAgICAgICBBZGQgTlNVUkxSZXF1ZXN0IHdyYXBwZXIgaW4gUmVzb3VyY2VSZXF1ZXN0IHdoZW4g VVNFKENGTkVUV09SSykgaXMgZW5hYmxlZAogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9NjMyNzYKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vbmV0d29yay9jZi9SZXNvdXJjZVJlc3BvbnNlLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9uZXR3b3JrL2NmL1Jlc291cmNlUmVzcG9uc2UuaAppbmRleCAwNjE2NjEyMzU5ZTFkZTgy YmYxZTBhMGQ0Yzc4YTk1ZGNjMTNhMDcwLi45NDZlZWUwODMzYmVkMjdiOWNmNjUxY2NjNjg0N2M2 MzM3NjdkZDFhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2Nm L1Jlc291cmNlUmVzcG9uc2UuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3Jr L2NmL1Jlc291cmNlUmVzcG9uc2UuaApAQCAtMzEsMTMgKzMxLDEzIEBACiAKICNpZiBVU0UoQ0ZO RVRXT1JLKQogdHlwZWRlZiBzdHJ1Y3QgX0NGVVJMUmVzcG9uc2UqIENGVVJMUmVzcG9uc2VSZWY7 Ci0jZWxzZQorI2VuZGlmCisKICNpZmRlZiBfX09CSkNfXwogQGNsYXNzIE5TVVJMUmVzcG9uc2U7 CiAjZWxzZQogY2xhc3MgTlNVUkxSZXNwb25zZTsKICNlbmRpZgotI2VuZGlmCiAKIG5hbWVzcGFj ZSBXZWJDb3JlIHsKIApAQCAtNTUsOCArNTUsMTEgQEAgcHVibGljOgogICAgIHsKICAgICAgICAg bV9pc051bGwgPSAhY2ZSZXNwb25zZTsKICAgICB9CisjaWYgUExBVEZPUk0oTUFDKQorICAgIFJl c291cmNlUmVzcG9uc2UoTlNVUkxSZXNwb25zZSAqKTsKKyNlbmRpZgogI2Vsc2UKLSAgICBSZXNv dXJjZVJlc3BvbnNlKE5TVVJMUmVzcG9uc2UqIG5zUmVzcG9uc2UpCisgICAgUmVzb3VyY2VSZXNw b25zZShOU1VSTFJlc3BvbnNlICpuc1Jlc3BvbnNlKQogICAgICAgICA6IG1fbnNSZXNwb25zZShu c1Jlc3BvbnNlKQogICAgICAgICAsIG1faW5pdExldmVsKFVuaW5pdGlhbGl6ZWQpCiAgICAgewpA QCAtODQsNyArODcsOCBAQCBwdWJsaWM6CiAKICNpZiBVU0UoQ0ZORVRXT1JLKQogICAgIENGVVJM UmVzcG9uc2VSZWYgY2ZVUkxSZXNwb25zZSgpIGNvbnN0OwotI2Vsc2UKKyNlbmRpZgorI2lmIFBM QVRGT1JNKE1BQykKICAgICBOU1VSTFJlc3BvbnNlICpuc1VSTFJlc3BvbnNlKCkgY29uc3Q7CiAj ZW5kaWYKIApAQCAtOTQsMTIgKzk4LDE2IEBAIHByaXZhdGU6CiAgICAgdm9pZCBwbGF0Zm9ybUxh enlJbml0KEluaXRMZXZlbCk7CiAgICAgUGFzc093blB0cjxDcm9zc1RocmVhZFJlc291cmNlUmVz cG9uc2VEYXRhPiBkb1BsYXRmb3JtQ29weURhdGEoUGFzc093blB0cjxDcm9zc1RocmVhZFJlc291 cmNlUmVzcG9uc2VEYXRhPiBkYXRhKSBjb25zdCB7IHJldHVybiBkYXRhOyB9CiAgICAgdm9pZCBk b1BsYXRmb3JtQWRvcHQoUGFzc093blB0cjxDcm9zc1RocmVhZFJlc291cmNlUmVzcG9uc2VEYXRh PikgeyB9CisjaWYgUExBVEZPUk0oTUFDKQorICAgIHZvaWQgaW5pdE5TVVJMUmVzcG9uc2UoKSBj b25zdDsKKyNlbmRpZgogCiAgICAgc3RhdGljIGJvb2wgcGxhdGZvcm1Db21wYXJlKGNvbnN0IFJl c291cmNlUmVzcG9uc2UmIGEsIGNvbnN0IFJlc291cmNlUmVzcG9uc2UmIGIpOwogCiAjaWYgVVNF KENGTkVUV09SSykKICAgICBtdXRhYmxlIFJldGFpblB0cjxDRlVSTFJlc3BvbnNlUmVmPiBtX2Nm UmVzcG9uc2U7Ci0jZWxzZQorI2VuZGlmCisjaWYgUExBVEZPUk0oTUFDKQogICAgIG11dGFibGUg UmV0YWluUHRyPE5TVVJMUmVzcG9uc2U+IG1fbnNSZXNwb25zZTsKICNlbmRpZgogICAgIEluaXRM ZXZlbCBtX2luaXRMZXZlbDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25l dHdvcmsvbWFjL1Jlc291cmNlUmVzcG9uc2VNYWMubW0gYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9uZXR3b3JrL21hYy9SZXNvdXJjZVJlc3BvbnNlTWFjLm1tCmluZGV4IDg4OWI1NWZjY2YxODFh MjNmZjk5ZjE4MGQwY2I1M2E0NDc3YTEwZTUuLjQ0MTc2ZjhhZTM5NDc2YzE2MTMyNjQ1MTE4MDJl NDhiNDZhOTQxZTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsv bWFjL1Jlc291cmNlUmVzcG9uc2VNYWMubW0KKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v bmV0d29yay9tYWMvUmVzb3VyY2VSZXNwb25zZU1hYy5tbQpAQCAtMjYsOCArMjYsNiBAQAogI2lt cG9ydCAiY29uZmlnLmgiCiAjaW1wb3J0ICJSZXNvdXJjZVJlc3BvbnNlLmgiCiAKLSNpZiAhVVNF KENGTkVUV09SSykKLQogI2ltcG9ydCAiSFRUUFBhcnNlcnMuaCIKICNpbXBvcnQgIldlYkNvcmVV UkxSZXNwb25zZS5oIgogI2ltcG9ydCAiV2ViQ29yZVN5c3RlbUludGVyZmFjZS5oIgpAQCAtMzYs OCArMzQsMTMgQEAKICNpbXBvcnQgPGxpbWl0cz4KICNpbmNsdWRlIDx3dGYvdGV4dC9DU3RyaW5n Lmg+CiAKLUBpbnRlcmZhY2UgTlNVUkxSZXNwb25zZSAoRm91bmRhdGlvblNlY3JldHNXZWJDb3Jl S25vd3NBYm91dCkKK3VzaW5nIG5hbWVzcGFjZSBzdGQ7CisKK0BpbnRlcmZhY2UgTlNVUkxSZXNw b25zZSAoV2ViTlNVUkxSZXNwb25zZURldGFpbHMpCiAtIChOU1RpbWVJbnRlcnZhbClfY2FsY3Vs YXRlZEV4cGlyYXRpb247CistIChpZClfaW5pdFdpdGhDRlVSTFJlc3BvbnNlOihDRlVSTFJlc3Bv bnNlUmVmKXJlc3BvbnNlOworLSAoQ0ZVUkxSZXNwb25zZVJlZikgX0NGVVJMUmVzcG9uc2U7Cisr IChpZClfcmVzcG9uc2VXaXRoQ0ZVUkxSZXNwb25zZTooQ0ZVUkxSZXNwb25zZVJlZilyZXNwb25z ZTsKIEBlbmQKIAogCkBAIC00OCwxOSArNTEsNTEgQEAgc3RhdGljIE5TU3RyaW5nKiBjb25zdCBj b21tb25IZWFkZXJGaWVsZHNbXSA9IHsKIH07CiBzdGF0aWMgY29uc3QgaW50IG51bUNvbW1vbkhl YWRlckZpZWxkcyA9IHNpemVvZihjb21tb25IZWFkZXJGaWVsZHMpIC8gc2l6ZW9mKEF0b21pY1N0 cmluZyopOwogCit2b2lkIFJlc291cmNlUmVzcG9uc2U6OmluaXROU1VSTFJlc3BvbnNlKCkgY29u c3QKK3sKKyAgICAvLyBXb3JrIGFyb3VuZCBhIG1pc3Rha2UgaW4gdGhlIE5TVVJMUmVzcG9uc2Ug Y2xhc3MuCisgICAgLy8gVGhlIGluaXQgZnVuY3Rpb24gdGFrZXMgYW4gTlNJbnRlZ2VyLCBldmVu IHRob3VnaCB0aGUgYWNjZXNzb3IgcmV0dXJucyBhIGxvbmcgbG9uZy4KKyAgICAvLyBGb3IgdmFs dWVzIHRoYXQgd29uJ3QgZml0IGluIGFuIE5TSW50ZWdlciwgcGFzcyAtMSBpbnN0ZWFkLgorICAg IE5TSW50ZWdlciBleHBlY3RlZENvbnRlbnRMZW5ndGg7CisgICAgaWYgKG1fZXhwZWN0ZWRDb250 ZW50TGVuZ3RoIDwgMCB8fCBtX2V4cGVjdGVkQ29udGVudExlbmd0aCA+IG51bWVyaWNfbGltaXRz PE5TSW50ZWdlcj46Om1heCgpKQorICAgICAgICBleHBlY3RlZENvbnRlbnRMZW5ndGggPSAtMTsK KyAgICBlbHNlCisgICAgICAgIGV4cGVjdGVkQ29udGVudExlbmd0aCA9IHN0YXRpY19jYXN0PE5T SW50ZWdlcj4obV9leHBlY3RlZENvbnRlbnRMZW5ndGgpOworICAgIG1fbnNSZXNwb25zZS5hZG9w dE5TKFtbTlNVUkxSZXNwb25zZSBhbGxvY10gaW5pdFdpdGhVUkw6bV91cmwgTUlNRVR5cGU6bV9t aW1lVHlwZSBleHBlY3RlZENvbnRlbnRMZW5ndGg6ZXhwZWN0ZWRDb250ZW50TGVuZ3RoIHRleHRF bmNvZGluZ05hbWU6bV90ZXh0RW5jb2RpbmdOYW1lXSk7Cit9CisKKyNpZiBVU0UoQ0ZORVRXT1JL KQorCiBOU1VSTFJlc3BvbnNlICpSZXNvdXJjZVJlc3BvbnNlOjpuc1VSTFJlc3BvbnNlKCkgY29u c3QKIHsKLSAgICBpZiAoIW1fbnNSZXNwb25zZSAmJiAhbV9pc051bGwpIHsKLSAgICAgICAgLy8g V29yayBhcm91bmQgYSBtaXN0YWtlIGluIHRoZSBOU1VSTFJlc3BvbnNlIGNsYXNzLgotICAgICAg ICAvLyBUaGUgaW5pdCBmdW5jdGlvbiB0YWtlcyBhbiBOU0ludGVnZXIsIGV2ZW4gdGhvdWdoIHRo ZSBhY2Nlc3NvciByZXR1cm5zIGEgbG9uZyBsb25nLgotICAgICAgICAvLyBGb3IgdmFsdWVzIHRo YXQgd29uJ3QgZml0IGluIGFuIE5TSW50ZWdlciwgcGFzcyAtMSBpbnN0ZWFkLgotICAgICAgICBO U0ludGVnZXIgZXhwZWN0ZWRDb250ZW50TGVuZ3RoOwotICAgICAgICBpZiAobV9leHBlY3RlZENv bnRlbnRMZW5ndGggPCAwIHx8IG1fZXhwZWN0ZWRDb250ZW50TGVuZ3RoID4gc3RkOjpudW1lcmlj X2xpbWl0czxOU0ludGVnZXI+OjptYXgoKSkKLSAgICAgICAgICAgIGV4cGVjdGVkQ29udGVudExl bmd0aCA9IC0xOwotICAgICAgICBlbHNlCi0gICAgICAgICAgICBleHBlY3RlZENvbnRlbnRMZW5n dGggPSBzdGF0aWNfY2FzdDxOU0ludGVnZXI+KG1fZXhwZWN0ZWRDb250ZW50TGVuZ3RoKTsKLSAg ICAgICAgY29uc3RfY2FzdDxSZXNvdXJjZVJlc3BvbnNlKj4odGhpcyktPm1fbnNSZXNwb25zZS5h ZG9wdE5TKFtbTlNVUkxSZXNwb25zZSBhbGxvY10gaW5pdFdpdGhVUkw6bV91cmwgTUlNRVR5cGU6 bV9taW1lVHlwZSBleHBlY3RlZENvbnRlbnRMZW5ndGg6ZXhwZWN0ZWRDb250ZW50TGVuZ3RoIHRl eHRFbmNvZGluZ05hbWU6bV90ZXh0RW5jb2RpbmdOYW1lXSk7CisgICAgaWYgKCFtX25zUmVzcG9u c2UgJiYgIW1fY2ZSZXNwb25zZSAmJiAhbV9pc051bGwpIHsKKyAgICAgICAgaW5pdE5TVVJMUmVz cG9uc2UoKTsKKyAgICAgICAgbV9jZlJlc3BvbnNlID0gW21fbnNSZXNwb25zZS5nZXQoKSBfQ0ZV UkxSZXNwb25zZV07CiAgICAgfQorCisgICAgaWYgKCFtX2NmUmVzcG9uc2UpCisgICAgICAgIHJl dHVybiBuaWw7CisKKyAgICBpZiAoIW1fbnNSZXNwb25zZSkKKyAgICAgICAgbV9uc1Jlc3BvbnNl LmFkb3B0TlMoW1tOU1VSTFJlc3BvbnNlIF9yZXNwb25zZVdpdGhDRlVSTFJlc3BvbnNlOm1fY2ZS ZXNwb25zZS5nZXQoKV0gcmV0YWluXSk7CisKKyAgICByZXR1cm4gbV9uc1Jlc3BvbnNlLmdldCgp OworfQorCitSZXNvdXJjZVJlc3BvbnNlOjpSZXNvdXJjZVJlc3BvbnNlKE5TVVJMUmVzcG9uc2Uq IG5zUmVzcG9uc2UpCisgICAgOiBtX2NmUmVzcG9uc2UoW25zUmVzcG9uc2UgX0NGVVJMUmVzcG9u c2VdKQorICAgICwgbV9uc1Jlc3BvbnNlKG5zUmVzcG9uc2UpCisgICAgLCBtX2luaXRMZXZlbChV bmluaXRpYWxpemVkKQoreworICAgIG1faXNOdWxsID0gIW5zUmVzcG9uc2U7Cit9CisKKyNlbHNl CisKK05TVVJMUmVzcG9uc2UgKlJlc291cmNlUmVzcG9uc2U6Om5zVVJMUmVzcG9uc2UoKSBjb25z dAoreworICAgIGlmICghbV9uc1Jlc3BvbnNlICYmICFtX2lzTnVsbCkKKyAgICAgICAgaW5pdE5T VVJMUmVzcG9uc2UoKTsKICAgICByZXR1cm4gbV9uc1Jlc3BvbnNlLmdldCgpOwogfQogCkBAIC0x MzYsNiArMTcxLDcgQEAgYm9vbCBSZXNvdXJjZVJlc3BvbnNlOjpwbGF0Zm9ybUNvbXBhcmUoY29u c3QgUmVzb3VyY2VSZXNwb25zZSYgYSwgY29uc3QgUmVzb3VyY2UKICAgICByZXR1cm4gYS5uc1VS TFJlc3BvbnNlKCkgPT0gYi5uc1VSTFJlc3BvbnNlKCk7CiB9CiAKKyNlbmRpZiAvLyBVU0UoQ0ZO RVRXT1JLKQorCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCiAKLSNlbmRpZiAvLyAhVVNFKENGTkVU V09SSykK