105965 2013-01-02 16:03:00 -0800 [WK2 NetworkProcess] Uploading fails if a client modified the request 2013-01-02 16:28:03 -0800 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar, Regression P2 Normal --- 1 ap ap andersca beidson sam oldest_to_newest 799035 0 ap 2013-01-02 16:03:00 -0800 If a client has modified the request in willSendRequest, FormData becomes incorrect in WebCore::ResourceRequest. <rdar://problem/12916582> 799042 1 181099 ap 2013-01-02 16:09:11 -0800 Created attachment 181099 proposed fix 799061 2 ap 2013-01-02 16:28:03 -0800 Committed <http://trac.webkit.org/r138676>. 181099 2013-01-02 16:09:11 -0800 2013-01-02 16:24:35 -0800 proposed fix DNTUpload.txt text/plain 7005 ap SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDEzODY3MikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI2IEBACisyMDEzLTAxLTAyICBBbGV4ZXkg UHJvc2t1cnlha292ICA8YXBAYXBwbGUuY29tPgorCisgICAgICAgIFtXSzIgTmV0d29ya1Byb2Nl c3NdIFVwbG9hZGluZyBmYWlscyBpZiBhIGNsaWVudCBtb2RpZmllZCB0aGUgcmVxdWVzdAorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTA1OTY1CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQXNzb2NpYXRpbmcg c3RyZWFtcyB3aXRoIGFkZGl0aW9uYWwgaW5mb3JtYXRpb24gdmlhIGEgc2lkZSBIYXNoTWFwIGRv ZXMgbm90IHdvcmssCisgICAgICAgIGJlY2F1c2UgdGhlIHN0cmVhbSB3ZSBjYW4gc2VlIGlzIGFu IGludGVybmFsIG9uZSwgd2l0aCBhZGRyZXNzIGFuZCBvdGhlciBpbmZvcm1hdGlvbgorICAgICAg ICBub3QgbWF0Y2hpbmcgYSBzdHJlYW0gdGhhdCB3ZSBjcmVhdGVkLgorCisgICAgICAgIEl0J3Mg c3VycHJpc2luZyB0aGF0IHRoaXMgZGVzaWduIGlzc3VlIHdhcyBub3QgY2F1c2luZyBtYWpvciB0 cm91YmxlIHdpdGhvdXQgTmV0d29ya1Byb2Nlc3MuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9uZXR3 b3JrL2NmL0Zvcm1EYXRhU3RyZWFtQ0ZOZXQuY3BwOgorICAgICAgICAoV2ViQ29yZSk6IFJlbmFt ZWQgRm9ybUNvbnRleHQgdG8gRm9ybUNyZWF0aW9uQ29udGV4dCwgYmVjYXVzZSB0aGlzIHR5cGUg b25seSB1c2VkCisgICAgICAgIGZvciBjcmVhdGlvbi4gTGF0ZXIsIHdlIHVzZSBGb3JtU3RyZWFt RmllbGRzIGFzIGNvbnRleHQuCisgICAgICAgIChXZWJDb3JlOjpjbG9zZUN1cnJlbnRTdHJlYW0p OiBNb3ZlZCBhIHN0YXIuCisgICAgICAgIChXZWJDb3JlOjpmb3JtQ3JlYXRlKTogV2Ugbm8gbG9u Z2VyIGhhdmUgYSBzaWRlIG1hcCB0byBrZWVwIHVwZGF0ZWQuCisgICAgICAgIChXZWJDb3JlOjpm b3JtRmluYWxpemUpOiBEaXR0by4KKyAgICAgICAgKFdlYkNvcmU6OmZvcm1Db3B5UHJvcGVydHkp OiBBZGRlZCBhbiBhY2Nlc3NvciB0byBnZXQgRm9ybURhdGEgcG9pbnRlciBmcm9tIGEgc3RyZWFt LgorICAgICAgICAoV2ViQ29yZTo6c2V0SFRUUEJvZHkpOiBEaXR0by4KKyAgICAgICAgKFdlYkNv cmU6Omh0dHBCb2R5RnJvbVN0cmVhbSk6IFVzZSB0aGUgbmV3IHByb3BlcnR5IHRvIGdldCBGb3Jt RGF0YSBwb2ludGVyLgorCiAyMDEzLTAxLTAyICBEYXZpZCBHcm9nYW4gIDxkZ3JvZ2FuQGNocm9t aXVtLm9yZz4KIAogICAgICAgICBJbmRleGVkREI6IFN1cmZhY2UgYSBmZXcgbW9yZSBsZXZlbGRi IGVycm9ycy4KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY2YvRm9ybURh dGFTdHJlYW1DRk5ldC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v bmV0d29yay9jZi9Gb3JtRGF0YVN0cmVhbUNGTmV0LmNwcAkocmV2aXNpb24gMTM4NjIxKQorKysg U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9jZi9Gb3JtRGF0YVN0cmVhbUNGTmV0LmNw cAkod29ya2luZyBjb3B5KQpAQCAtODYsMTUgKzg2LDExIEBAIEVYVEVSTiBDRlJlYWRTdHJlYW1S ZWYgQ0ZSZWFkU3RyZWFtQ3JlYXQKIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCi1zdGF0aWMgTXV0 ZXgmIHN0cmVhbUZpZWxkc01hcE11dGV4KCkKLXsKLSAgICBERUZJTkVfU1RBVElDX0xPQ0FMKE11 dGV4LCBzdGF0aWNNdXRleCwgKCkpOwotICAgIHJldHVybiBzdGF0aWNNdXRleDsKLX0KLQogc3Rh dGljIHZvaWQgZm9ybUV2ZW50Q2FsbGJhY2soQ0ZSZWFkU3RyZWFtUmVmIHN0cmVhbSwgQ0ZTdHJl YW1FdmVudFR5cGUgdHlwZSwgdm9pZCogY29udGV4dCk7CiAKLXN0cnVjdCBGb3JtQ29udGV4dCB7 CitzdGF0aWMgQ0ZTdHJpbmdSZWYgZm9ybURhdGFQb2ludGVyUHJvcGVydHlOYW1lID0gQ0ZTVFIo IldlYktpdEZvcm1EYXRhUG9pbnRlciIpOworCitzdHJ1Y3QgRm9ybUNyZWF0aW9uQ29udGV4dCB7 CiAgICAgUmVmUHRyPEZvcm1EYXRhPiBmb3JtRGF0YTsKICAgICB1bnNpZ25lZCBsb25nIGxvbmcg c3RyZWFtTGVuZ3RoOwogfTsKQEAgLTExMywxNCArMTA5LDcgQEAgc3RydWN0IEZvcm1TdHJlYW1G aWVsZHMgewogICAgIHVuc2lnbmVkIGxvbmcgbG9uZyBieXRlc1NlbnQ7CiB9OwogCi10eXBlZGVm IEhhc2hNYXA8Q0ZSZWFkU3RyZWFtUmVmLCBGb3JtU3RyZWFtRmllbGRzKj4gU3RyZWFtRmllbGRz TWFwOwotc3RhdGljIFN0cmVhbUZpZWxkc01hcCYgc3RyZWFtRmllbGRzTWFwKCkKLXsKLSAgICBE RUZJTkVfU1RBVElDX0xPQ0FMKFN0cmVhbUZpZWxkc01hcCwgc3RyZWFtRmllbGRzTWFwLCAoKSk7 Ci0gICAgcmV0dXJuIHN0cmVhbUZpZWxkc01hcDsKLX0KLQotc3RhdGljIHZvaWQgY2xvc2VDdXJy ZW50U3RyZWFtKEZvcm1TdHJlYW1GaWVsZHMgKmZvcm0pCitzdGF0aWMgdm9pZCBjbG9zZUN1cnJl bnRTdHJlYW0oRm9ybVN0cmVhbUZpZWxkcyogZm9ybSkKIHsKICAgICBpZiAoZm9ybS0+Y3VycmVu dFN0cmVhbSkgewogICAgICAgICBDRlJlYWRTdHJlYW1DbG9zZShmb3JtLT5jdXJyZW50U3RyZWFt KTsKQEAgLTIwNSw3ICsxOTQsNyBAQCBzdGF0aWMgYm9vbCBvcGVuTmV4dFN0cmVhbShGb3JtU3Ry ZWFtRmllCiAKIHN0YXRpYyB2b2lkKiBmb3JtQ3JlYXRlKENGUmVhZFN0cmVhbVJlZiBzdHJlYW0s IHZvaWQqIGNvbnRleHQpCiB7Ci0gICAgRm9ybUNvbnRleHQqIGZvcm1Db250ZXh0ID0gc3RhdGlj X2Nhc3Q8Rm9ybUNvbnRleHQqPihjb250ZXh0KTsKKyAgICBGb3JtQ3JlYXRpb25Db250ZXh0KiBm b3JtQ29udGV4dCA9IHN0YXRpY19jYXN0PEZvcm1DcmVhdGlvbkNvbnRleHQqPihjb250ZXh0KTsK IAogICAgIEZvcm1TdHJlYW1GaWVsZHMqIG5ld0luZm8gPSBuZXcgRm9ybVN0cmVhbUZpZWxkczsK ICAgICBuZXdJbmZvLT5mb3JtRGF0YSA9IGZvcm1Db250ZXh0LT5mb3JtRGF0YS5yZWxlYXNlKCk7 CkBAIC0yMjQsMTAgKzIxMyw2IEBAIHN0YXRpYyB2b2lkKiBmb3JtQ3JlYXRlKENGUmVhZFN0cmVh bVJlZiAKICAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IHNpemU7ICsraSkKICAgICAgICAgbmV3 SW5mby0+cmVtYWluaW5nRWxlbWVudHMuYXBwZW5kKG5ld0luZm8tPmZvcm1EYXRhLT5lbGVtZW50 cygpW3NpemUgLSBpIC0gMV0pOwogCi0gICAgTXV0ZXhMb2NrZXIgbG9ja2VyKHN0cmVhbUZpZWxk c01hcE11dGV4KCkpOwotICAgIEFTU0VSVCghc3RyZWFtRmllbGRzTWFwKCkuY29udGFpbnMoc3Ry ZWFtKSk7Ci0gICAgc3RyZWFtRmllbGRzTWFwKCkuYWRkKHN0cmVhbSwgbmV3SW5mbyk7Ci0KICAg ICByZXR1cm4gbmV3SW5mbzsKIH0KIApAQCAtMjQxLDE3ICsyMjYsNyBAQCBzdGF0aWMgdm9pZCBm b3JtRmluaXNoRmluYWxpemF0aW9uT25NYWluCiBzdGF0aWMgdm9pZCBmb3JtRmluYWxpemUoQ0ZS ZWFkU3RyZWFtUmVmIHN0cmVhbSwgdm9pZCogY29udGV4dCkKIHsKICAgICBGb3JtU3RyZWFtRmll bGRzKiBmb3JtID0gc3RhdGljX2Nhc3Q8Rm9ybVN0cmVhbUZpZWxkcyo+KGNvbnRleHQpOwotCi0g ICAgTXV0ZXhMb2NrZXIgbG9ja2VyKHN0cmVhbUZpZWxkc01hcE11dGV4KCkpOwotCiAgICAgQVNT RVJUKGZvcm0tPmZvcm1TdHJlYW0gPT0gc3RyZWFtKTsKLSAgICBBU1NFUlQoc3RyZWFtRmllbGRz TWFwKCkuZ2V0KHN0cmVhbSkgPT0gY29udGV4dCk7Ci0KLSAgICAvLyBEbyB0aGlzIHJpZ2h0IGF3 YXkgYmVjYXVzZSB0aGUgQ0ZSZWFkU3RyZWFtUmVmIGlzIGJlaW5nIGRlYWxsb2NhdGVkLgotICAg IC8vIFdlIGNhbid0IHdhaXQgdG8gcmVtb3ZlIHRoaXMgZnJvbSB0aGUgbWFwIHVudGlsIHdlIGZp bmlzaCBmaW5hbGl6aW5nCi0gICAgLy8gb24gdGhlIG1haW4gdGhyZWFkIGJlY2F1c2UgaW4gdGhl b3J5IHRoZSBmcmVlZCBtZW1vcnkgY291bGQgYmUgcmV1c2VkCi0gICAgLy8gZm9yIGEgbmV3IENG UmVhZFN0cmVhbSBiZWZvcmUgdGhhdCBydW5zLgotICAgIHN0cmVhbUZpZWxkc01hcCgpLnJlbW92 ZShzdHJlYW0pOwogCiAgICAgY2FsbE9uTWFpblRocmVhZChmb3JtRmluaXNoRmluYWxpemF0aW9u T25NYWluVGhyZWFkLCBmb3JtKTsKIH0KQEAgLTMyNyw2ICszMDIsMTcgQEAgc3RhdGljIHZvaWQg Zm9ybUNsb3NlKENGUmVhZFN0cmVhbVJlZiwgdgogICAgIGNsb3NlQ3VycmVudFN0cmVhbShmb3Jt KTsKIH0KIAorc3RhdGljIENGVHlwZVJlZiBmb3JtQ29weVByb3BlcnR5KENGUmVhZFN0cmVhbVJl ZiwgQ0ZTdHJpbmdSZWYgcHJvcGVydHlOYW1lLCB2b2lkICpjb250ZXh0KQoreworICAgIEZvcm1T dHJlYW1GaWVsZHMqIGZvcm0gPSBzdGF0aWNfY2FzdDxGb3JtU3RyZWFtRmllbGRzKj4oY29udGV4 dCk7CisKKyAgICBpZiAoa0NGQ29tcGFyZUVxdWFsVG8gIT0gQ0ZTdHJpbmdDb21wYXJlKHByb3Bl cnR5TmFtZSwgZm9ybURhdGFQb2ludGVyUHJvcGVydHlOYW1lLCAwKSkKKyAgICAgICAgcmV0dXJu IDA7CisKKyAgICBsb25nIGZvcm1EYXRhQXNOdW1iZXIgPSBzdGF0aWNfY2FzdDxsb25nPihyZWlu dGVycHJldF9jYXN0PGludHB0cl90Pihmb3JtLT5mb3JtRGF0YS5nZXQoKSkpOworICAgIHJldHVy biBDRk51bWJlckNyZWF0ZSgwLCBrQ0ZOdW1iZXJMb25nVHlwZSwgJmZvcm1EYXRhQXNOdW1iZXIp OworfQorCiBzdGF0aWMgdm9pZCBmb3JtU2NoZWR1bGUoQ0ZSZWFkU3RyZWFtUmVmLCBDRlJ1bkxv b3BSZWYgcnVuTG9vcCwgQ0ZTdHJpbmdSZWYgcnVuTG9vcE1vZGUsIHZvaWQqIGNvbnRleHQpCiB7 CiAgICAgRm9ybVN0cmVhbUZpZWxkcyogZm9ybSA9IHN0YXRpY19jYXN0PEZvcm1TdHJlYW1GaWVs ZHMqPihjb250ZXh0KTsKQEAgLTQyNiw5ICs0MTIsOSBAQCB2b2lkIHNldEhUVFBCb2R5KENGTXV0 YWJsZVVSTFJlcXVlc3RSZWYgCiAgICAgLy8gQ3JlYXRlIGFuZCBzZXQgdGhlIHN0cmVhbS4KIAog ICAgIC8vIFBhc3MgdGhlIGxlbmd0aCBhbG9uZyB3aXRoIHRoZSBmb3JtRGF0YSBzbyBpdCBkb2Vz IG5vdCBoYXZlIHRvIGJlIHJlY29tcHV0ZWQuCi0gICAgRm9ybUNvbnRleHQgZm9ybUNvbnRleHQg PSB7IGZvcm1EYXRhLnJlbGVhc2UoKSwgbGVuZ3RoIH07CisgICAgRm9ybUNyZWF0aW9uQ29udGV4 dCBmb3JtQ29udGV4dCA9IHsgZm9ybURhdGEucmVsZWFzZSgpLCBsZW5ndGggfTsKIAotICAgIENG UmVhZFN0cmVhbUNhbGxCYWNrc1YxIGNhbGxCYWNrcyA9IHsgMSwgZm9ybUNyZWF0ZSwgZm9ybUZp bmFsaXplLCAwLCBmb3JtT3BlbiwgMCwgZm9ybVJlYWQsIDAsIGZvcm1DYW5SZWFkLCBmb3JtQ2xv c2UsIDAsIDAsIDAsIGZvcm1TY2hlZHVsZSwgZm9ybVVuc2NoZWR1bGUKKyAgICBDRlJlYWRTdHJl YW1DYWxsQmFja3NWMSBjYWxsQmFja3MgPSB7IDEsIGZvcm1DcmVhdGUsIGZvcm1GaW5hbGl6ZSwg MCwgZm9ybU9wZW4sIDAsIGZvcm1SZWFkLCAwLCBmb3JtQ2FuUmVhZCwgZm9ybUNsb3NlLCBmb3Jt Q29weVByb3BlcnR5LCAwLCAwLCBmb3JtU2NoZWR1bGUsIGZvcm1VbnNjaGVkdWxlCiAgICAgfTsK ICAgICBSZXRhaW5QdHI8Q0ZSZWFkU3RyZWFtUmVmPiBzdHJlYW0gPSBhZG9wdENGKENGUmVhZFN0 cmVhbUNyZWF0ZSgwLCBzdGF0aWNfY2FzdDxjb25zdCB2b2lkKj4oJmNhbGxCYWNrcyksICZmb3Jt Q29udGV4dCkpOwogCkBAIC00NDAsMTEgKzQyNiwyMCBAQCBGb3JtRGF0YSogaHR0cEJvZHlGcm9t U3RyZWFtKENGUmVhZFN0cmVhCiAgICAgaWYgKCFzdHJlYW0pCiAgICAgICAgIHJldHVybiAwOwog Ci0gICAgTXV0ZXhMb2NrZXIgbG9ja2VyKHN0cmVhbUZpZWxkc01hcE11dGV4KCkpOwotICAgIEZv cm1TdHJlYW1GaWVsZHMqIGZvcm1TdHJlYW0gPSBzdHJlYW1GaWVsZHNNYXAoKS5nZXQoc3RyZWFt KTsKLSAgICBpZiAoIWZvcm1TdHJlYW0pCisgICAgLy8gUGFzc2luZyB0aGUgcG9pbnRlciBhcyBw cm9wZXJ0eSBhcHBlYXJzIHRvIGJlIHRoZSBvbmx5IHdheSB0byBhc3NvY2lhdGUgYSBzdHJlYW0g d2l0aCBGb3JtRGF0YS4KKyAgICAvLyBBIG5ldyBzdHJlYW0gaXMgYWx3YXlzIGNyZWF0ZWQgaW4g Q0ZVUkxSZXF1ZXN0Q29weUhUVFBSZXF1ZXN0Qm9keVN0cmVhbSAob3IgLVtOU1VSTFJlcXVlc3Qg SFRUUEJvZHlTdHJlYW1dKSwKKyAgICAvLyBzbyBhIHNpZGUgSGFzaE1hcCB3b3VsZG4ndCB3b3Jr LgorICAgIC8vIEV2ZW4gdGhlIHN0cmVhbSdzIGNvbnRleHQgcG9pbnRlciBpcyBkaWZmZXJlbnQg ZnJvbSB0aGUgb25lIHdlIHJldHVybmVkIGZyb20gZm9ybUNyZWF0ZSgpLgorCisgICAgUmV0YWlu UHRyPENGTnVtYmVyUmVmPiBmb3JtRGF0YVBvaW50ZXJBc0NGTnVtYmVyID0gYWRvcHRDRihzdGF0 aWNfY2FzdDxDRk51bWJlclJlZj4oQ0ZSZWFkU3RyZWFtQ29weVByb3BlcnR5KHN0cmVhbSwgZm9y bURhdGFQb2ludGVyUHJvcGVydHlOYW1lKSkpOworICAgIGlmICghZm9ybURhdGFQb2ludGVyQXND Rk51bWJlcikKICAgICAgICAgcmV0dXJuIDA7Ci0gICAgcmV0dXJuIGZvcm1TdHJlYW0tPmZvcm1E YXRhLmdldCgpOworCisgICAgbG9uZyBmb3JtRGF0YVBvaW50ZXJBc051bWJlcjsKKyAgICBpZiAo IUNGTnVtYmVyR2V0VmFsdWUoZm9ybURhdGFQb2ludGVyQXNDRk51bWJlci5nZXQoKSwga0NGTnVt YmVyTG9uZ1R5cGUsICZmb3JtRGF0YVBvaW50ZXJBc051bWJlcikpCisgICAgICAgIHJldHVybiAw OworCisgICAgcmV0dXJuIHJlaW50ZXJwcmV0X2Nhc3Q8Rm9ybURhdGEqPihzdGF0aWNfY2FzdDxp bnRwdHJfdD4oZm9ybURhdGFQb2ludGVyQXNOdW1iZXIpKTsKIH0KIAogUGFzc1JlZlB0cjxGb3Jt RGF0YT4gaHR0cEJvZHlGcm9tUmVxdWVzdChDRlVSTFJlcXVlc3RSZWYgcmVxdWVzdCkK