124051 2013-11-08 10:19:40 -0800 Encode and decode NSURLRequests using NSCoder 2013-11-08 10:26:20 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 948716 0 andersca 2013-11-08 10:19:40 -0800 Encode and decode NSURLRequests using NSCoder 948717 1 216408 andersca 2013-11-08 10:20:38 -0800 Created attachment 216408 Patch 948724 2 andersca 2013-11-08 10:26:20 -0800 Committed r158927: <http://trac.webkit.org/changeset/158927> 216408 2013-11-08 10:20:38 -0800 2013-11-08 10:23:12 -0800 Patch bug-124051-20131108102037.patch text/plain 7542 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTU4OTIzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggOTdkODhlMDk3ZTlhYzc2 ZWEwNjc2NmEwY2NhYTljNjBiODZlMWY3MS4uMmUwYWY3N2VjMmYwOTQwNGYxMzE1M2UzYmNmZjMw MjBjNTEwOGEwOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDEzLTExLTA4ICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKKyAgICAgICAgRW5jb2RlIGFuZCBk ZWNvZGUgTlNVUkxSZXF1ZXN0cyB1c2luZyBOU0NvZGVyCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjQwNTEKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFNoYXJlZC9tYWMvV2ViQ29yZUFyZ3VtZW50Q29k ZXJzTWFjLm1tOgorICAgICAgICAoQ29yZUlQQzo6YXJjaGl2ZUFuZEVuY29kZU9iamVjdCk6Cisg ICAgICAgIChDb3JlSVBDOjpkZWNvZGVBbmRVbmFyY2hpdmVPYmplY3QpOgorICAgICAgICAoQ29y ZUlQQzo6OjplbmNvZGVQbGF0Zm9ybURhdGEpOgorICAgICAgICAoQ29yZUlQQzo6OjpkZWNvZGVQ bGF0Zm9ybURhdGEpOgorCiAyMDEzLTExLTA3ICBBbmRlcnMgQ2FybHNzb24gIDxhbmRlcnNjYUBh cHBsZS5jb20+CiAKICAgICAgICAgRW5jb2RlIGFuZCBkZWNvZGUgTlNVUkxSZXNwb25zZSBvYmpl Y3RzIHVzaW5nIE5TQ29kZXIKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9tYWMv V2ViQ29yZUFyZ3VtZW50Q29kZXJzTWFjLm1tIGIvU291cmNlL1dlYktpdDIvU2hhcmVkL21hYy9X ZWJDb3JlQXJndW1lbnRDb2RlcnNNYWMubW0KaW5kZXggOGU4NWRlMWFkOTk4ZGRlYzE0ZjljOGZh MmJjYTk5ZmNiYTQ5ZmMwZS4uYmE0ZTg3OTY4YTk4YjdhYTY4NzlhOWRkODE3OTFjZGJiZGJlYzk1 ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvU2hhcmVkL21hYy9XZWJDb3JlQXJndW1lbnRD b2RlcnNNYWMubW0KKysrIGIvU291cmNlL1dlYktpdDIvU2hhcmVkL21hYy9XZWJDb3JlQXJndW1l bnRDb2RlcnNNYWMubW0KQEAgLTM5LDYgKzM5LDMzIEBAIHVzaW5nIG5hbWVzcGFjZSBXZWJLaXQ7 CiAKIG5hbWVzcGFjZSBDb3JlSVBDIHsKIAorI2lmIF9fTUFDX09TX1hfVkVSU0lPTl9NSU5fUkVR VUlSRUQgPj0gMTA5MAorc3RhdGljIHZvaWQgYXJjaGl2ZUFuZEVuY29kZU9iamVjdChBcmd1bWVu dEVuY29kZXImIGVuY29kZXIsIGlkIG9iamVjdCwgTlNTdHJpbmcgKmtleSkKK3sKKyAgICBSZXRh aW5QdHI8TlNNdXRhYmxlRGF0YT4gZGF0YSA9IGFkb3B0TlMoW1tOU011dGFibGVEYXRhIGFsbG9j XSBpbml0XSk7CisgICAgUmV0YWluUHRyPE5TS2V5ZWRBcmNoaXZlcj4gYXJjaGl2ZXIgPSBhZG9w dE5TKFtbTlNLZXllZEFyY2hpdmVyIGFsbG9jXSBpbml0Rm9yV3JpdGluZ1dpdGhNdXRhYmxlRGF0 YTpkYXRhLmdldCgpXSk7CisKKyAgICBbYXJjaGl2ZXIgc2V0UmVxdWlyZXNTZWN1cmVDb2Rpbmc6 WUVTXTsKKyAgICBbYXJjaGl2ZXIuZ2V0KCkgZW5jb2RlT2JqZWN0Om9iamVjdCBmb3JLZXk6a2V5 XTsKKyAgICBbYXJjaGl2ZXIgZmluaXNoRW5jb2RpbmddOworICAgIGVuY29kZXIgPDwgQ29yZUlQ Qzo6RGF0YVJlZmVyZW5jZShzdGF0aWNfY2FzdDxjb25zdCB1aW50OF90Kj4oW2RhdGEgYnl0ZXNd KSwgW2RhdGEgbGVuZ3RoXSk7Cit9CisKK3RlbXBsYXRlPHR5cGVuYW1lIFQ+CitzdGF0aWMgYm9v bCBkZWNvZGVBbmRVbmFyY2hpdmVPYmplY3QoQXJndW1lbnREZWNvZGVyJiBkZWNvZGVyLCBOU1N0 cmluZyAqa2V5LCBSZXRhaW5QdHI8VD4mIHJlc3VsdCkKK3sKKyAgICBDb3JlSVBDOjpEYXRhUmVm ZXJlbmNlIGRhdGFSZWZlcmVuY2U7CisgICAgaWYgKCFkZWNvZGVyLmRlY29kZShkYXRhUmVmZXJl bmNlKSkKKyAgICAgICAgcmV0dXJuIGZhbHNlOworCisgICAgUmV0YWluUHRyPE5TRGF0YT4gZGF0 YSA9IGFkb3B0TlMoW1tOU0RhdGEgYWxsb2NdIGluaXRXaXRoQnl0ZXNOb0NvcHk6Y29uc3RfY2Fz dDx1aW50OF90Kj4oZGF0YVJlZmVyZW5jZS5kYXRhKCkpIGxlbmd0aDpkYXRhUmVmZXJlbmNlLnNp emUoKSBmcmVlV2hlbkRvbmU6Tk9dKTsKKyAgICBSZXRhaW5QdHI8TlNLZXllZFVuYXJjaGl2ZXI+ IHVuYXJjaGl2ZXIgPSBhZG9wdE5TKFtbTlNLZXllZFVuYXJjaGl2ZXIgYWxsb2NdIGluaXRGb3JS ZWFkaW5nV2l0aERhdGE6ZGF0YS5nZXQoKV0pOworICAgIFt1bmFyY2hpdmVyIHNldFJlcXVpcmVz U2VjdXJlQ29kaW5nOllFU107CisgICAgcmVzdWx0ID0gW3VuYXJjaGl2ZXIgZGVjb2RlT2JqZWN0 T2ZDbGFzczpbVCBjbGFzc10gZm9yS2V5OmtleV07CisgICAgcmV0dXJuIHRydWU7Cit9CisjZW5k aWYKKwogdm9pZCBBcmd1bWVudENvZGVyPFJlc291cmNlUmVxdWVzdD46OmVuY29kZVBsYXRmb3Jt RGF0YShBcmd1bWVudEVuY29kZXImIGVuY29kZXIsIGNvbnN0IFJlc291cmNlUmVxdWVzdCYgcmVz b3VyY2VSZXF1ZXN0KQogewogICAgIFJldGFpblB0cjxOU1VSTFJlcXVlc3Q+IHJlcXVlc3RUb1Nl cmlhbGl6ZSA9IHJlc291cmNlUmVxdWVzdC5uc1VSTFJlcXVlc3QoRG9Ob3RVcGRhdGVIVFRQQm9k eSk7CkBAIC01MSwxNCArNzgsMTggQEAgdm9pZCBBcmd1bWVudENvZGVyPFJlc291cmNlUmVxdWVz dD46OmVuY29kZVBsYXRmb3JtRGF0YShBcmd1bWVudEVuY29kZXImIGVuY29kZXIKIAogICAgIC8v IFdlIGRvbid0IHNlbmQgSFRUUCBib2R5IG92ZXIgSVBDIGZvciBiZXR0ZXIgcGVyZm9ybWFuY2Uu CiAgICAgLy8gQWxzbywgaXQncyBub3QgYWx3YXlzIHBvc3NpYmxlIHRvIGRvLCBhcyBzdHJlYW1z IGNhbiBvbmx5IGJlIGNyZWF0ZWQgaW4gcHJvY2VzcyB0aGF0IGRvZXMgbmV0d29ya2luZy4KLSAg ICBpZiAoW3JlcXVlc3RUb1NlcmlhbGl6ZS5nZXQoKSBIVFRQQm9keV0gfHwgW3JlcXVlc3RUb1Nl cmlhbGl6ZS5nZXQoKSBIVFRQQm9keVN0cmVhbV0pIHsKLSAgICAgICAgcmVxdWVzdFRvU2VyaWFs aXplID0gYWRvcHROUyhbcmVxdWVzdFRvU2VyaWFsaXplLmdldCgpIG11dGFibGVDb3B5XSk7Ci0g ICAgICAgIFsoTlNNdXRhYmxlVVJMUmVxdWVzdCAqKXJlcXVlc3RUb1NlcmlhbGl6ZS5nZXQoKSBz ZXRIVFRQQm9keTpuaWxdOwotICAgICAgICBbKE5TTXV0YWJsZVVSTFJlcXVlc3QgKilyZXF1ZXN0 VG9TZXJpYWxpemUuZ2V0KCkgc2V0SFRUUEJvZHlTdHJlYW06bmlsXTsKKyAgICBpZiAoW3JlcXVl c3RUb1NlcmlhbGl6ZSBIVFRQQm9keV0gfHwgW3JlcXVlc3RUb1NlcmlhbGl6ZSBIVFRQQm9keVN0 cmVhbV0pIHsKKyAgICAgICAgcmVxdWVzdFRvU2VyaWFsaXplID0gYWRvcHROUyhbcmVxdWVzdFRv U2VyaWFsaXplIG11dGFibGVDb3B5XSk7CisgICAgICAgIFsoTlNNdXRhYmxlVVJMUmVxdWVzdCAq KXJlcXVlc3RUb1NlcmlhbGl6ZSBzZXRIVFRQQm9keTpuaWxdOworICAgICAgICBbKE5TTXV0YWJs ZVVSTFJlcXVlc3QgKilyZXF1ZXN0VG9TZXJpYWxpemUgc2V0SFRUUEJvZHlTdHJlYW06bmlsXTsK ICAgICB9CiAKKyNpZiBfX01BQ19PU19YX1ZFUlNJT05fTUlOX1JFUVVJUkVEID49IDEwOTAKKyAg ICBhcmNoaXZlQW5kRW5jb2RlT2JqZWN0KGVuY29kZXIsIHJlcXVlc3RUb1NlcmlhbGl6ZS5nZXQo KSwgQCJyZXF1ZXN0Iik7CisjZWxzZQogICAgIFJldGFpblB0cjxDRkRpY3Rpb25hcnlSZWY+IGRp Y3Rpb25hcnkgPSBhZG9wdENGKFdLTlNVUkxSZXF1ZXN0Q3JlYXRlU2VyaWFsaXphYmxlUmVwcmVz ZW50YXRpb24ocmVxdWVzdFRvU2VyaWFsaXplLmdldCgpLCBDb3JlSVBDOjp0b2tlbk51bGxUeXBl UmVmKCkpKTsKICAgICBDb3JlSVBDOjplbmNvZGUoZW5jb2RlciwgZGljdGlvbmFyeS5nZXQoKSk7 CisjZW5kaWYKIAogICAgIC8vIFRoZSBmYWxsYmFjayBhcnJheSBpcyBwYXJ0IG9mIE5TVVJMUmVx dWVzdCwgYnV0IGl0IGlzIG5vdCBlbmNvZGVkIGJ5IFdLTlNVUkxSZXF1ZXN0Q3JlYXRlU2VyaWFs aXphYmxlUmVwcmVzZW50YXRpb24uCiAgICAgZW5jb2RlciA8PCByZXNvdXJjZVJlcXVlc3QucmVz cG9uc2VDb250ZW50RGlzcG9zaXRpb25FbmNvZGluZ0ZhbGxiYWNrQXJyYXkoKTsKQEAgLTc1LDE1 ICsxMDYsMjEgQEAgYm9vbCBBcmd1bWVudENvZGVyPFJlc291cmNlUmVxdWVzdD46OmRlY29kZVBs YXRmb3JtRGF0YShBcmd1bWVudERlY29kZXImIGRlY29kZXIKICAgICAgICAgcmV0dXJuIHRydWU7 CiAgICAgfQogCisjaWYgX19NQUNfT1NfWF9WRVJTSU9OX01JTl9SRVFVSVJFRCA+PSAxMDkwCisg ICAgUmV0YWluUHRyPE5TVVJMUmVxdWVzdD4gbnNVUkxSZXF1ZXN0OworICAgIGlmICghZGVjb2Rl QW5kVW5hcmNoaXZlT2JqZWN0KGRlY29kZXIsIEAicmVxdWVzdCIsIG5zVVJMUmVxdWVzdCkpCisg ICAgICAgIHJldHVybiBmYWxzZTsKKyNlbHNlCiAgICAgUmV0YWluUHRyPENGRGljdGlvbmFyeVJl Zj4gZGljdGlvbmFyeTsKICAgICBpZiAoIUNvcmVJUEM6OmRlY29kZShkZWNvZGVyLCBkaWN0aW9u YXJ5KSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCi0gICAgTlNVUkxSZXF1ZXN0ICpuc1VSTFJl cXVlc3QgPSBXS05TVVJMUmVxdWVzdEZyb21TZXJpYWxpemFibGVSZXByZXNlbnRhdGlvbihkaWN0 aW9uYXJ5LmdldCgpLCBDb3JlSVBDOjp0b2tlbk51bGxUeXBlUmVmKCkpOworICAgIFJldGFpblB0 cjxOU1VSTFJlcXVlc3Q+IG5zVVJMUmVxdWVzdCA9IFdLTlNVUkxSZXF1ZXN0RnJvbVNlcmlhbGl6 YWJsZVJlcHJlc2VudGF0aW9uKGRpY3Rpb25hcnkuZ2V0KCksIENvcmVJUEM6OnRva2VuTnVsbFR5 cGVSZWYoKSk7CiAgICAgaWYgKCFuc1VSTFJlcXVlc3QpCiAgICAgICAgIHJldHVybiBmYWxzZTsK KyNlbmRpZgogCi0gICAgcmVzb3VyY2VSZXF1ZXN0ID0gUmVzb3VyY2VSZXF1ZXN0KG5zVVJMUmVx dWVzdCk7CisgICAgcmVzb3VyY2VSZXF1ZXN0ID0gUmVzb3VyY2VSZXF1ZXN0KG5zVVJMUmVxdWVz dC5nZXQoKSk7CiAgICAgCiAgICAgVmVjdG9yPFN0cmluZz4gcmVzcG9uc2VDb250ZW50RGlzcG9z aXRpb25FbmNvZGluZ0ZhbGxiYWNrQXJyYXk7CiAgICAgaWYgKCFkZWNvZGVyLmRlY29kZShyZXNw b25zZUNvbnRlbnREaXNwb3NpdGlvbkVuY29kaW5nRmFsbGJhY2tBcnJheSkpCkBAIC0xMDcsMTQg KzE0NCw3IEBAIHZvaWQgQXJndW1lbnRDb2RlcjxSZXNvdXJjZVJlc3BvbnNlPjo6ZW5jb2RlUGxh dGZvcm1EYXRhKEFyZ3VtZW50RW5jb2RlciYgZW5jb2RlCiAgICAgICAgIHJldHVybjsKIAogI2lm IF9fTUFDX09TX1hfVkVSU0lPTl9NSU5fUkVRVUlSRUQgPj0gMTA5MAotICAgIFJldGFpblB0cjxO U011dGFibGVEYXRhPiBkYXRhID0gYWRvcHROUyhbW05TTXV0YWJsZURhdGEgYWxsb2NdIGluaXRd KTsKLSAgICBSZXRhaW5QdHI8TlNLZXllZEFyY2hpdmVyPiBhcmNoaXZlciA9IGFkb3B0TlMoW1tO U0tleWVkQXJjaGl2ZXIgYWxsb2NdIGluaXRGb3JXcml0aW5nV2l0aE11dGFibGVEYXRhOmRhdGEu Z2V0KCldKTsKLQotICAgIFthcmNoaXZlciBzZXRSZXF1aXJlc1NlY3VyZUNvZGluZzpZRVNdOwot ICAgIFthcmNoaXZlci5nZXQoKSBlbmNvZGVPYmplY3Q6cmVzb3VyY2VSZXNwb25zZS5uc1VSTFJl c3BvbnNlKCkgZm9yS2V5OkAicmVzcG9uc2UiXTsKLSAgICBbYXJjaGl2ZXIgZmluaXNoRW5jb2Rp bmddOwotCi0gICAgZW5jb2RlciA8PCBDb3JlSVBDOjpEYXRhUmVmZXJlbmNlKHN0YXRpY19jYXN0 PGNvbnN0IHVpbnQ4X3QqPihbZGF0YSBieXRlc10pLCBbZGF0YSBsZW5ndGhdKTsKKyAgICBhcmNo aXZlQW5kRW5jb2RlT2JqZWN0KGVuY29kZXIsIHJlc291cmNlUmVzcG9uc2UubnNVUkxSZXNwb25z ZSgpLCBAInJlc3BvbnNlIik7CiAjZWxzZQogICAgIFJldGFpblB0cjxDRkRpY3Rpb25hcnlSZWY+ IGRpY3Rpb25hcnkgPSBhZG9wdENGKFdLTlNVUkxSZXNwb25zZUNyZWF0ZVNlcmlhbGl6YWJsZVJl cHJlc2VudGF0aW9uKHJlc291cmNlUmVzcG9uc2UubnNVUkxSZXNwb25zZSgpLCBDb3JlSVBDOjp0 b2tlbk51bGxUeXBlUmVmKCkpKTsKICAgICBDb3JlSVBDOjplbmNvZGUoZW5jb2RlciwgZGljdGlv bmFyeS5nZXQoKSk7CkBAIC0xMzMsMjcgKzE2MywyMSBAQCBib29sIEFyZ3VtZW50Q29kZXI8UmVz b3VyY2VSZXNwb25zZT46OmRlY29kZVBsYXRmb3JtRGF0YShBcmd1bWVudERlY29kZXImIGRlY29k ZQogICAgIH0KIAogI2lmIF9fTUFDX09TX1hfVkVSU0lPTl9NSU5fUkVRVUlSRUQgPj0gMTA5MAot ICAgIENvcmVJUEM6OkRhdGFSZWZlcmVuY2UgZGF0YVJlZmVyZW5jZTsKLSAgICBpZiAoIWRlY29k ZXIuZGVjb2RlKGRhdGFSZWZlcmVuY2UpKQorICAgIFJldGFpblB0cjxOU1VSTFJlc3BvbnNlPiBu c1VSTFJlc3BvbnNlOworICAgIGlmICghZGVjb2RlQW5kVW5hcmNoaXZlT2JqZWN0KGRlY29kZXIs IEAicmVzcG9uc2UiLCBuc1VSTFJlc3BvbnNlKSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwotCi0g ICAgUmV0YWluUHRyPE5TRGF0YT4gZGF0YSA9IGFkb3B0TlMoW1tOU0RhdGEgYWxsb2NdIGluaXRX aXRoQnl0ZXNOb0NvcHk6Y29uc3RfY2FzdDx1aW50OF90Kj4oZGF0YVJlZmVyZW5jZS5kYXRhKCkp IGxlbmd0aDpkYXRhUmVmZXJlbmNlLnNpemUoKSBmcmVlV2hlbkRvbmU6Tk9dKTsKLSAgICBSZXRh aW5QdHI8TlNLZXllZFVuYXJjaGl2ZXI+IHVuYXJjaGl2ZXIgPSBhZG9wdE5TKFtbTlNLZXllZFVu YXJjaGl2ZXIgYWxsb2NdIGluaXRGb3JSZWFkaW5nV2l0aERhdGE6ZGF0YS5nZXQoKV0pOwotCi0g ICAgW3VuYXJjaGl2ZXIgc2V0UmVxdWlyZXNTZWN1cmVDb2Rpbmc6WUVTXTsKLSAgICBOU1VSTFJl c3BvbnNlICpuc1VSTFJlc3BvbnNlID0gW3VuYXJjaGl2ZXIuZ2V0KCkgZGVjb2RlT2JqZWN0T2ZD bGFzczpbTlNVUkxSZXNwb25zZSBjbGFzc10gZm9yS2V5OkAicmVzcG9uc2UiXTsKICNlbHNlCiAg ICAgUmV0YWluUHRyPENGRGljdGlvbmFyeVJlZj4gZGljdGlvbmFyeTsKICAgICBpZiAoIUNvcmVJ UEM6OmRlY29kZShkZWNvZGVyLCBkaWN0aW9uYXJ5KSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwog Ci0gICAgTlNVUkxSZXNwb25zZSAqbnNVUkxSZXNwb25zZSA9IFdLTlNVUkxSZXNwb25zZUZyb21T ZXJpYWxpemFibGVSZXByZXNlbnRhdGlvbihkaWN0aW9uYXJ5LmdldCgpLCBDb3JlSVBDOjp0b2tl bk51bGxUeXBlUmVmKCkpOworICAgIFJldGFpblB0cjxOU1VSTFJlc3BvbnNlPiBuc1VSTFJlc3Bv bnNlID0gV0tOU1VSTFJlc3BvbnNlRnJvbVNlcmlhbGl6YWJsZVJlcHJlc2VudGF0aW9uKGRpY3Rp b25hcnkuZ2V0KCksIENvcmVJUEM6OnRva2VuTnVsbFR5cGVSZWYoKSk7CiAjZW5kaWYKIAogICAg IGlmICghbnNVUkxSZXNwb25zZSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCi0gICAgcmVzb3Vy Y2VSZXNwb25zZSA9IFJlc291cmNlUmVzcG9uc2UobnNVUkxSZXNwb25zZSk7CisgICAgcmVzb3Vy Y2VSZXNwb25zZSA9IFJlc291cmNlUmVzcG9uc2UobnNVUkxSZXNwb25zZS5nZXQoKSk7CiAgICAg cmV0dXJuIHRydWU7CiB9CiAK