24927 2009-03-29 16:43:41 -0700 Avoid empty ResourceError objects in CURL / wx ports 2009-05-09 15:42:03 -0700 1 1 1 Unclassified WebKit WebKit Misc. 528+ (Nightly build) All All RESOLVED FIXED Curl, Wx P2 Normal --- 1 kevino webkit-unassigned bfulgham mr.diggilin oldest_to_newest 115766 0 kevino 2009-03-29 16:43:41 -0700 WebCore::DocumentLoader::mainReceivedError now asserts if error.isNull(), and other places may start asserting too, so we need to fill out the ResourceError objects. 115767 1 29049 kevino 2009-03-29 16:44:20 -0700 Created attachment 29049 CURL fix for empty ResourceError object problem 115768 2 29050 kevino 2009-03-29 16:44:54 -0700 Created attachment 29050 wx fixes for empty ResourceError objects 120528 3 29049 mjs 2009-05-09 14:58:20 -0700 Comment on attachment 29049 CURL fix for empty ResourceError object problem r=me 120529 4 29050 mjs 2009-05-09 14:58:41 -0700 Comment on attachment 29050 wx fixes for empty ResourceError objects r=me 120531 5 kevino 2009-05-09 15:42:03 -0700 Landed in r43442, thanks! 29049 2009-03-29 16:44:20 -0700 2009-05-09 14:58:20 -0700 CURL fix for empty ResourceError object problem resource_error_curl.patch text/plain 1360 kevino SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA0MjA5MCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTMgQEAKKzIwMDktMDMtMjkgIEtldmluIE9sbGl2aWVyICA8a2V2aW5vQHRoZW9s bGl2aWVycy5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgV2ViQ29yZTo6RG9jdW1lbnRMb2FkZXI6Om1haW5SZWNlaXZlZEVycm9yIG5vdyBhc3Nl cnRzIGlmIGVycm9yLmlzTnVsbCgpLCBzbworICAgICAgICBtYWtlIHN1cmUgQ1VSTCBkb2VzIG5v dCBjcmVhdGUgZW1wdHkgUmVzb3VyY2VFcnJvcigpIG9iamVjdHMuCisKKyAgICAgICAgKiBwbGF0 Zm9ybS9uZXR3b3JrL2N1cmwvUmVzb3VyY2VIYW5kbGVNYW5hZ2VyLmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OlJlc291cmNlSGFuZGxlTWFuYWdlcjo6ZG93bmxvYWRUaW1lckNhbGxiYWNrKToKKwog MjAwOS0wMy0yOSAgRGFyaW4gQWRsZXIgIDxkYXJpbkBhcHBsZS5jb20+CiAKICAgICAgICAgVHJ5 IHRvIGZpeCB0aGUgV2luZG93cyBidWlsZC4KSW5kZXg6IFdlYkNvcmUvcGxhdGZvcm0vbmV0d29y ay9jdXJsL1Jlc291cmNlSGFuZGxlTWFuYWdlci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9w bGF0Zm9ybS9uZXR3b3JrL2N1cmwvUmVzb3VyY2VIYW5kbGVNYW5hZ2VyLmNwcAkocmV2aXNpb24g NDIwODcpCisrKyBXZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY3VybC9SZXNvdXJjZUhhbmRsZU1h bmFnZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zMjYsNyArMzI2LDcgQEAKICAgICAgICAgICAg IGZwcmludGYoc3RkZXJyLCAiQ3VybCBFUlJPUiBmb3IgdXJsPSclcycsIGVycm9yOiAnJXMnXG4i LCB1cmwsIGN1cmxfZWFzeV9zdHJlcnJvcihtc2ctPmRhdGEucmVzdWx0KSk7CiAjZW5kaWYKICAg ICAgICAgICAgIGlmIChkLT5jbGllbnQoKSkKLSAgICAgICAgICAgICAgICBkLT5jbGllbnQoKS0+ ZGlkRmFpbChqb2IsIFJlc291cmNlRXJyb3IoKSk7CisgICAgICAgICAgICAgICAgZC0+Y2xpZW50 KCktPmRpZEZhaWwoam9iLCBSZXNvdXJjZUVycm9yKFN0cmluZygpLCBtc2ctPmRhdGEucmVzdWx0 LCBTdHJpbmcodXJsKSwgU3RyaW5nKGN1cmxfZWFzeV9zdHJlcnJvcihtc2ctPmRhdGEucmVzdWx0 KSkpKTsKICAgICAgICAgfQogCiAgICAgICAgIHJlbW92ZUZyb21DdXJsKGpvYik7Cg== 29050 2009-03-29 16:44:54 -0700 2009-05-09 14:58:41 -0700 wx fixes for empty ResourceError objects resource_error_wx.patch text/plain 5815 kevino SW5kZXg6IFdlYktpdC93eC9XZWJLaXRTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50V3guY3BwCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFdlYktpdC93eC9XZWJLaXRTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50V3gu Y3BwCShyZXZpc2lvbiA0MjA4NykKKysrIFdlYktpdC93eC9XZWJLaXRTdXBwb3J0L0ZyYW1lTG9h ZGVyQ2xpZW50V3guY3BwCSh3b3JraW5nIGNvcHkpCkBAIC01NTQsNDAgKzU1NCwzOSBAQAogICAg IGZsLT5hZGREYXRhKGRhdGEsIGxlbmd0aCk7CiB9CiAKLVdlYkNvcmU6OlJlc291cmNlRXJyb3Ig RnJhbWVMb2FkZXJDbGllbnRXeDo6Y2FuY2VsbGVkRXJyb3IoY29uc3QgV2ViQ29yZTo6UmVzb3Vy Y2VSZXF1ZXN0JikKK1dlYkNvcmU6OlJlc291cmNlRXJyb3IgRnJhbWVMb2FkZXJDbGllbnRXeDo6 Y2FuY2VsbGVkRXJyb3IoY29uc3QgV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0JiByZXF1ZXN0KQog ewogICAgIG5vdEltcGxlbWVudGVkKCk7Ci0gICAgcmV0dXJuIFJlc291cmNlRXJyb3IoKTsKKyAg ICByZXR1cm4gUmVzb3VyY2VFcnJvcihTdHJpbmcoKSwgV2ViS2l0RXJyb3JDYW5ub3RTaG93VVJM LCByZXF1ZXN0LnVybCgpLnN0cmluZygpLCBTdHJpbmcoKSk7CiB9CiAKLVdlYkNvcmU6OlJlc291 cmNlRXJyb3IgRnJhbWVMb2FkZXJDbGllbnRXeDo6YmxvY2tlZEVycm9yKGNvbnN0IFJlc291cmNl UmVxdWVzdCYpCitXZWJDb3JlOjpSZXNvdXJjZUVycm9yIEZyYW1lTG9hZGVyQ2xpZW50V3g6OmJs b2NrZWRFcnJvcihjb25zdCBSZXNvdXJjZVJlcXVlc3QmIHJlcXVlc3QpCiB7CiAgICAgbm90SW1w bGVtZW50ZWQoKTsKLSAgICByZXR1cm4gUmVzb3VyY2VFcnJvcigpOworICAgIHJldHVybiBSZXNv dXJjZUVycm9yKFN0cmluZygpLCBXZWJLaXRFcnJvckNhbm5vdFNob3dVUkwsIHJlcXVlc3QudXJs KCkuc3RyaW5nKCksIFN0cmluZygpKTsKIH0KIAotV2ViQ29yZTo6UmVzb3VyY2VFcnJvciBGcmFt ZUxvYWRlckNsaWVudFd4OjpjYW5ub3RTaG93VVJMRXJyb3IoY29uc3QgV2ViQ29yZTo6UmVzb3Vy Y2VSZXF1ZXN0JikKK1dlYkNvcmU6OlJlc291cmNlRXJyb3IgRnJhbWVMb2FkZXJDbGllbnRXeDo6 Y2Fubm90U2hvd1VSTEVycm9yKGNvbnN0IFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdCYgcmVxdWVz dCkKIHsKLSAgICBub3RJbXBsZW1lbnRlZCgpOwotICAgIHJldHVybiBSZXNvdXJjZUVycm9yKCk7 CisgICAgcmV0dXJuIFJlc291cmNlRXJyb3IoU3RyaW5nKCksIFdlYktpdEVycm9yQ2Fubm90U2hv d1VSTCwgcmVxdWVzdC51cmwoKS5zdHJpbmcoKSwgU3RyaW5nKCkpOwogfQogCi1XZWJDb3JlOjpS ZXNvdXJjZUVycm9yIEZyYW1lTG9hZGVyQ2xpZW50V3g6OmludGVycnVwdEZvclBvbGljeUNoYW5n ZUVycm9yKGNvbnN0IFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdCYpCitXZWJDb3JlOjpSZXNvdXJj ZUVycm9yIEZyYW1lTG9hZGVyQ2xpZW50V3g6OmludGVycnVwdEZvclBvbGljeUNoYW5nZUVycm9y KGNvbnN0IFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdCYgcmVxdWVzdCkKIHsKICAgICBub3RJbXBs ZW1lbnRlZCgpOwotICAgIHJldHVybiBSZXNvdXJjZUVycm9yKCk7CisgICAgcmV0dXJuIFJlc291 cmNlRXJyb3IoU3RyaW5nKCksIFdlYktpdEVycm9yRnJhbWVMb2FkSW50ZXJydXB0ZWRCeVBvbGlj eUNoYW5nZSwgcmVxdWVzdC51cmwoKS5zdHJpbmcoKSwgU3RyaW5nKCkpOwogfQogCi1XZWJDb3Jl OjpSZXNvdXJjZUVycm9yIEZyYW1lTG9hZGVyQ2xpZW50V3g6OmNhbm5vdFNob3dNSU1FVHlwZUVy cm9yKGNvbnN0IFdlYkNvcmU6OlJlc291cmNlUmVzcG9uc2UmKQorV2ViQ29yZTo6UmVzb3VyY2VF cnJvciBGcmFtZUxvYWRlckNsaWVudFd4OjpjYW5ub3RTaG93TUlNRVR5cGVFcnJvcihjb25zdCBX ZWJDb3JlOjpSZXNvdXJjZVJlc3BvbnNlJiByZXNwb25zZSkKIHsKICAgICBub3RJbXBsZW1lbnRl ZCgpOwotICAgIHJldHVybiBSZXNvdXJjZUVycm9yKCk7CisgICAgcmV0dXJuIFJlc291cmNlRXJy b3IoU3RyaW5nKCksIFdlYktpdEVycm9yQ2Fubm90U2hvd01JTUVUeXBlLCByZXNwb25zZS51cmwo KS5zdHJpbmcoKSwgU3RyaW5nKCkpOwogfQogCi1XZWJDb3JlOjpSZXNvdXJjZUVycm9yIEZyYW1l TG9hZGVyQ2xpZW50V3g6OmZpbGVEb2VzTm90RXhpc3RFcnJvcihjb25zdCBXZWJDb3JlOjpSZXNv dXJjZVJlc3BvbnNlJikKK1dlYkNvcmU6OlJlc291cmNlRXJyb3IgRnJhbWVMb2FkZXJDbGllbnRX eDo6ZmlsZURvZXNOb3RFeGlzdEVycm9yKGNvbnN0IFdlYkNvcmU6OlJlc291cmNlUmVzcG9uc2Um IHJlc3BvbnNlKQogewogICAgIG5vdEltcGxlbWVudGVkKCk7Ci0gICAgcmV0dXJuIFJlc291cmNl RXJyb3IoKTsKKyAgICByZXR1cm4gUmVzb3VyY2VFcnJvcihTdHJpbmcoKSwgV2ViS2l0RXJyb3JD YW5ub3RTaG93VVJMLCByZXNwb25zZS51cmwoKS5zdHJpbmcoKSwgU3RyaW5nKCkpOwogfQogCiBi b29sIEZyYW1lTG9hZGVyQ2xpZW50V3g6OnNob3VsZEZhbGxCYWNrKGNvbnN0IFdlYkNvcmU6OlJl c291cmNlRXJyb3ImIGVycm9yKQpAQCAtNjUxLDcgKzY1MCwxMiBAQAogCiB2b2lkIEZyYW1lTG9h ZGVyQ2xpZW50V3g6OmRpc3BhdGNoRGlkRmFpbExvYWRpbmcoRG9jdW1lbnRMb2FkZXIqLCB1bnNp Z25lZCBsb25nLCBjb25zdCBSZXNvdXJjZUVycm9yJikKIHsKLSAgICBub3RJbXBsZW1lbnRlZCgp OworICAgIGlmIChtX3dlYlZpZXcpIHsKKyAgICAgICAgd3hXZWJWaWV3TG9hZEV2ZW50IHdrRXZl bnQobV93ZWJWaWV3KTsKKyAgICAgICAgd2tFdmVudC5TZXRTdGF0ZSh3eFdFQlZJRVdfTE9BRF9G QUlMRUQpOworICAgICAgICB3a0V2ZW50LlNldFVSTChtX2ZyYW1lLT5sb2FkZXIoKS0+ZG9jdW1l bnRMb2FkZXIoKS0+cmVxdWVzdCgpLnVybCgpLnN0cmluZygpKTsKKyAgICAgICAgbV93ZWJWaWV3 LT5HZXRFdmVudEhhbmRsZXIoKS0+UHJvY2Vzc0V2ZW50KHdrRXZlbnQpOworICAgIH0KIH0KIAog Ym9vbCBGcmFtZUxvYWRlckNsaWVudFd4OjpkaXNwYXRjaERpZExvYWRSZXNvdXJjZUZyb21NZW1v cnlDYWNoZShEb2N1bWVudExvYWRlciosIGNvbnN0IFJlc291cmNlUmVxdWVzdCYsIGNvbnN0IFJl c291cmNlUmVzcG9uc2UmLCBpbnQpCkBAIC03OTYsMTAgKzgwMCwxMCBAQAogICAgIHJldHVybjsK IH0KIAotUmVzb3VyY2VFcnJvciBGcmFtZUxvYWRlckNsaWVudFd4OjpwbHVnaW5XaWxsSGFuZGxl TG9hZEVycm9yKGNvbnN0IFJlc291cmNlUmVzcG9uc2UmKQorUmVzb3VyY2VFcnJvciBGcmFtZUxv YWRlckNsaWVudFd4OjpwbHVnaW5XaWxsSGFuZGxlTG9hZEVycm9yKGNvbnN0IFJlc291cmNlUmVz cG9uc2UmIHJlc3BvbnNlKQogewogICAgIG5vdEltcGxlbWVudGVkKCk7Ci0gICAgcmV0dXJuIFJl c291cmNlRXJyb3IoKTsKKyAgICByZXR1cm4gUmVzb3VyY2VFcnJvcihTdHJpbmcoKSwgV2ViS2l0 RXJyb3JDYW5ub3RMb2FkUGx1Z0luLCByZXNwb25zZS51cmwoKS5zdHJpbmcoKSwgU3RyaW5nKCkp OwogfQogCiBXaWRnZXQqIEZyYW1lTG9hZGVyQ2xpZW50V3g6OmNyZWF0ZUphdmFBcHBsZXRXaWRn ZXQoY29uc3QgSW50U2l6ZSYsIEhUTUxBcHBsZXRFbGVtZW50KiwgY29uc3QgS1VSTCYgYmFzZVVS TCwKSW5kZXg6IFdlYktpdC93eC9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L3d4L0No YW5nZUxvZwkocmV2aXNpb24gNDIwOTApCisrKyBXZWJLaXQvd3gvQ2hhbmdlTG9nCSh3b3JraW5n IGNvcHkpCkBAIC0xLDMgKzEsMjMgQEAKKzIwMDktMDMtMjkgIEtldmluIE9sbGl2aWVyICA8a2V2 aW5vQHRoZW9sbGl2aWVycy5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgV2ViQ29yZTo6RG9jdW1lbnRMb2FkZXI6Om1haW5SZWNlaXZlZEVycm9y IG5vdyBhc3NlcnRzIGlmIGVycm9yLmlzTnVsbCgpLCBzbworICAgICAgICBtYWtlIHN1cmUgd3gg ZG9lcyBub3QgY3JlYXRlIGVtcHR5IFJlc291cmNlRXJyb3IoKSBvYmplY3RzLgorICAgICAgICAK KyAgICAgICAgQWxzbyBtYWtlIHN1cmUgd2UgZmlyZSBhIHN0YXRlIGNoYW5nZWQgZXZlbnQgdG8g bm90aWZ5IHdoZW4gdGhlIGxvYWQgZmFpbHMuCisKKyAgICAgICAgKiBXZWJLaXRTdXBwb3J0L0Zy YW1lTG9hZGVyQ2xpZW50V3guY3BwOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVMb2FkZXJDbGll bnRXeDo6Y2FuY2VsbGVkRXJyb3IpOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVMb2FkZXJDbGll bnRXeDo6YmxvY2tlZEVycm9yKToKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lTG9hZGVyQ2xpZW50 V3g6OmNhbm5vdFNob3dVUkxFcnJvcik6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZUxvYWRlckNs aWVudFd4OjppbnRlcnJ1cHRGb3JQb2xpY3lDaGFuZ2VFcnJvcik6CisgICAgICAgIChXZWJDb3Jl OjpGcmFtZUxvYWRlckNsaWVudFd4OjpjYW5ub3RTaG93TUlNRVR5cGVFcnJvcik6CisgICAgICAg IChXZWJDb3JlOjpGcmFtZUxvYWRlckNsaWVudFd4OjpmaWxlRG9lc05vdEV4aXN0RXJyb3IpOgor ICAgICAgICAoV2ViQ29yZTo6RnJhbWVMb2FkZXJDbGllbnRXeDo6ZGlzcGF0Y2hEaWRGYWlsTG9h ZGluZyk6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZUxvYWRlckNsaWVudFd4OjpwbHVnaW5XaWxs SGFuZGxlTG9hZEVycm9yKToKKyAgICAgICAgKiBXZWJWaWV3Lmg6CisKIDIwMDktMDMtMjggIEtl dmluIE9sbGl2aWVyICA8a2V2aW5vQHRoZW9sbGl2aWVycy5jb20+CiAKICAgICAgICAgd3ggYnVp bGQgZml4LiBSZW1vdmUgY2FsbCB0byBub3cgcHJpdmF0ZSBtZXRob2QuCkluZGV4OiBXZWJLaXQv d3gvV2ViVmlldy5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC93eC9XZWJWaWV3LmgJKHJldmlzaW9u IDQyMDg3KQorKysgV2ViS2l0L3d4L1dlYlZpZXcuaAkod29ya2luZyBjb3B5KQpAQCAtNjIsNiAr NjIsMTcgQEAKIGV4dGVybiBXWERMTElNUEVYUF9XRUJLSVQgY29uc3Qgd3hDaGFyKiB3eFdlYlZp ZXdOYW1lU3RyOwogI2VuZGlmCiAKKy8vIGNvcGllZCBmcm9tIFdlYktpdC9tYWMvTWlzYy9XZWJL aXRFcnJvcnNbUHJpdmF0ZV0uaAorZW51bSB7CisgICAgV2ViS2l0RXJyb3JDYW5ub3RTaG93TUlN RVR5cGUgPSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgMTAwLAorICAgIFdlYktpdEVycm9y Q2Fubm90U2hvd1VSTCA9ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIDEwMSwKKyAg ICBXZWJLaXRFcnJvckZyYW1lTG9hZEludGVycnVwdGVkQnlQb2xpY3lDaGFuZ2UgPSAgICAgICAg ICAgICAxMDIsCisgICAgV2ViS2l0RXJyb3JDYW5ub3RVc2VSZXN0cmljdGVkUG9ydCA9IDEwMywK KyAgICBXZWJLaXRFcnJvckNhbm5vdEZpbmRQbHVnSW4gPSAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAyMDAsCisgICAgV2ViS2l0RXJyb3JDYW5ub3RMb2FkUGx1Z0luID0gICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgMjAxLAorICAgIFdlYktpdEVycm9ySmF2YVVuYXZhaWxhYmxl ID0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIDIwMiwKK307CisKIGNsYXNzIFdYRExM SU1QRVhQX1dFQktJVCB3eFdlYlZpZXcgOiBwdWJsaWMgd3hXaW5kb3cKIHsKICAgICAvLyBDaHJv bWVDbGllbnRXeCBuZWVkcyB0byBnZXQgdGhlIFBhZ2UqIHN0b3JlZCBieSB0aGUgd3hXZWJWaWV3 Cg==