145928 2015-06-12 06:37:00 -0700 Network Cache: Use SHA1 for header checksum 2015-06-12 10:44:59 -0700 1 1 1 Unclassified WebKit Page Loading 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 koivisto webkit-unassigned cdumez cgarcia commit-queue oldest_to_newest 1101578 0 koivisto 2015-06-12 06:37:00 -0700 Use SHA1 everywhere for consistency and robustness. 1101587 1 254801 koivisto 2015-06-12 08:19:13 -0700 Created attachment 254801 patch 1101592 2 254801 cdumez 2015-06-12 09:09:13 -0700 Comment on attachment 254801 patch r=me 1101643 3 koivisto 2015-06-12 10:44:59 -0700 https://trac.webkit.org/r185513 254801 2015-06-12 08:19:13 -0700 2015-06-12 09:09:13 -0700 patch disk-cache-header-sha1.patch text/plain 4330 koivisto SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE4NTUwMykKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIzIEBACisyMDE1LTA2LTEyICBBbnR0aSBL b2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KKworICAgICAgICBOZXR3b3JrIENhY2hlOiBVc2Ug U0hBMSBmb3IgaGVhZGVyIGNoZWNrc3VtCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0xNDU5MjgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBVc2UgU0hBMSBldmVyeXdoZXJlIGZvciBjb25zaXN0ZW5jeSBhbmQg cm9idXN0bmVzcy4KKworICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL2NhY2hlL05ldHdvcmtDYWNo ZVN0b3JhZ2UuY3BwOgorICAgICAgICAoV2ViS2l0OjpOZXR3b3JrQ2FjaGU6OlN0b3JhZ2U6OmJv ZHlQYXRoRm9yS2V5KToKKyAgICAgICAgKFdlYktpdDo6TmV0d29ya0NhY2hlOjpSZWNvcmRNZXRh RGF0YTo6UmVjb3JkTWV0YURhdGEpOgorICAgICAgICAoV2ViS2l0OjpOZXR3b3JrQ2FjaGU6OmRl Y29kZVJlY29yZE1ldGFEYXRhKToKKyAgICAgICAgKFdlYktpdDo6TmV0d29ya0NhY2hlOjpkZWNv ZGVSZWNvcmRIZWFkZXIpOgorICAgICAgICAoV2ViS2l0OjpOZXR3b3JrQ2FjaGU6OmVuY29kZVJl Y29yZE1ldGFEYXRhKToKKyAgICAgICAgKFdlYktpdDo6TmV0d29ya0NhY2hlOjpTdG9yYWdlOjpl bmNvZGVSZWNvcmQpOgorICAgICAgICAoV2ViS2l0OjpOZXR3b3JrQ2FjaGU6Omhhc2hEYXRhKTog RGVsZXRlZC4KKworICAgICAgICAgICAgVGhpcyB3YXMgdGhlIGxhc3QgdXNlciBvZiAzMiBiaXQg aGFzaGVzIGluIGNhY2hlIGNvZGUuCisKIDIwMTUtMDYtMTIgIFphbiBEb2JlcnNlayAgPHpkb2Jl cnNla0BpZ2FsaWEuY29tPgogCiAgICAgICAgIFtHTGliXSBNb3ZlIGZpbGVzIHVuZGVyIFNvdXJj ZS9XVEYvd3RmL2dvYmplY3QgdG8gU291cmNlL1dURi93dGYvZ2xpYgpJbmRleDogU291cmNlL1dl YktpdDIvTmV0d29ya1Byb2Nlc3MvY2FjaGUvTmV0d29ya0NhY2hlU3RvcmFnZS5jcHAKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvY2FjaGUvTmV0d29ya0NhY2hl U3RvcmFnZS5jcHAJKHJldmlzaW9uIDE4NTUwMCkKKysrIFNvdXJjZS9XZWJLaXQyL05ldHdvcmtQ cm9jZXNzL2NhY2hlL05ldHdvcmtDYWNoZVN0b3JhZ2UuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0z Miw3ICszMiw2IEBACiAjaW5jbHVkZSAiTmV0d29ya0NhY2hlQ29kZXJzLmgiCiAjaW5jbHVkZSAi TmV0d29ya0NhY2hlRmlsZVN5c3RlbS5oIgogI2luY2x1ZGUgIk5ldHdvcmtDYWNoZUlPQ2hhbm5l bC5oIgotI2luY2x1ZGUgPHd0Zi9QYWdlQmxvY2suaD4KICNpbmNsdWRlIDx3dGYvUmFuZG9tTnVt YmVyLmg+CiAjaW5jbHVkZSA8d3RmL1J1bkxvb3AuaD4KICNpbmNsdWRlIDx3dGYvdGV4dC9DU3Ry aW5nLmg+CkBAIC0yNzIsMTYgKzI3MSw2IEBAIFN0cmluZyBTdG9yYWdlOjpib2R5UGF0aEZvcktl eShjb25zdCBLZXkKICAgICByZXR1cm4gYm9keVBhdGhGb3JSZWNvcmRQYXRoKHJlY29yZFBhdGhG b3JLZXkoa2V5KSk7CiB9CiAKLXN0YXRpYyB1bnNpZ25lZCBoYXNoRGF0YShjb25zdCBEYXRhJiBk YXRhKQotewotICAgIFN0cmluZ0hhc2hlciBoYXNoZXI7Ci0gICAgZGF0YS5hcHBseShbJmhhc2hl cl0oY29uc3QgdWludDhfdCogZGF0YSwgc2l6ZV90IHNpemUpIHsKLSAgICAgICAgaGFzaGVyLmFk ZENoYXJhY3RlcnMoZGF0YSwgc2l6ZSk7Ci0gICAgICAgIHJldHVybiB0cnVlOwotICAgIH0pOwot ICAgIHJldHVybiBoYXNoZXIuaGFzaCgpOwotfQotCiBzdHJ1Y3QgUmVjb3JkTWV0YURhdGEgewog ICAgIFJlY29yZE1ldGFEYXRhKCkgeyB9CiAgICAgZXhwbGljaXQgUmVjb3JkTWV0YURhdGEoY29u c3QgS2V5JiBrZXkpCkBAIC0yOTMsMTIgKzI4MiwxNCBAQCBzdHJ1Y3QgUmVjb3JkTWV0YURhdGEg ewogICAgIEtleSBrZXk7CiAgICAgLy8gRklYTUU6IEFkZCBlbmNvZGVyL2RlY29kZXIgZm9yIHRp bWVfcG9pbnQuCiAgICAgc3RkOjpjaHJvbm86Om1pbGxpc2Vjb25kcyBlcG9jaFJlbGF0aXZlVGlt ZVN0YW1wOwotICAgIHVuc2lnbmVkIGhlYWRlckNoZWNrc3VtOwotICAgIHVpbnQ2NF90IGhlYWRl ck9mZnNldDsKKyAgICBTSEExOjpEaWdlc3QgaGVhZGVySGFzaDsKICAgICB1aW50NjRfdCBoZWFk ZXJTaXplOwogICAgIFNIQTE6OkRpZ2VzdCBib2R5SGFzaDsKICAgICB1aW50NjRfdCBib2R5U2l6 ZTsKICAgICBib29sIGlzQm9keUlubGluZTsKKworICAgIC8vIE5vdCBlbmNvZGVkIGFzIGEgZmll bGQuIEhlYWRlciBzdGFydHMgaW1tZWRpYXRlbHkgYWZ0ZXIgbWV0YSBkYXRhLgorICAgIHVpbnQ2 NF90IGhlYWRlck9mZnNldDsKIH07CiAKIHN0YXRpYyBib29sIGRlY29kZVJlY29yZE1ldGFEYXRh KFJlY29yZE1ldGFEYXRhJiBtZXRhRGF0YSwgY29uc3QgRGF0YSYgZmlsZURhdGEpCkBAIC0zMTIs NyArMzAzLDcgQEAgc3RhdGljIGJvb2wgZGVjb2RlUmVjb3JkTWV0YURhdGEoUmVjb3JkTQogICAg ICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgICAgICBpZiAoIWRlY29kZXIuZGVjb2RlKG1ldGFE YXRhLmVwb2NoUmVsYXRpdmVUaW1lU3RhbXApKQogICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwot ICAgICAgICBpZiAoIWRlY29kZXIuZGVjb2RlKG1ldGFEYXRhLmhlYWRlckNoZWNrc3VtKSkKKyAg ICAgICAgaWYgKCFkZWNvZGVyLmRlY29kZShtZXRhRGF0YS5oZWFkZXJIYXNoKSkKICAgICAgICAg ICAgIHJldHVybiBmYWxzZTsKICAgICAgICAgaWYgKCFkZWNvZGVyLmRlY29kZShtZXRhRGF0YS5o ZWFkZXJTaXplKSkKICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKQEAgLTM0NCw3ICszMzUsNyBA QCBzdGF0aWMgYm9vbCBkZWNvZGVSZWNvcmRIZWFkZXIoY29uc3QgRGF0CiAgICAgfQogCiAgICAg aGVhZGVyRGF0YSA9IGZpbGVEYXRhLnN1YnJhbmdlKG1ldGFEYXRhLmhlYWRlck9mZnNldCwgbWV0 YURhdGEuaGVhZGVyU2l6ZSk7Ci0gICAgaWYgKG1ldGFEYXRhLmhlYWRlckNoZWNrc3VtICE9IGhh c2hEYXRhKGhlYWRlckRhdGEpKSB7CisgICAgaWYgKG1ldGFEYXRhLmhlYWRlckhhc2ggIT0gY29t cHV0ZVNIQTEoaGVhZGVyRGF0YSkpIHsKICAgICAgICAgTE9HKE5ldHdvcmtDYWNoZVN0b3JhZ2Us ICIoTmV0d29ya1Byb2Nlc3MpIGhlYWRlciBjaGVja3N1bSBtaXNtYXRjaCIpOwogICAgICAgICBy ZXR1cm4gZmFsc2U7CiAgICAgfQpAQCAtMzk0LDcgKzM4NSw3IEBAIHN0YXRpYyBEYXRhIGVuY29k ZVJlY29yZE1ldGFEYXRhKGNvbnN0IFIKICAgICBlbmNvZGVyIDw8IG1ldGFEYXRhLmNhY2hlU3Rv cmFnZVZlcnNpb247CiAgICAgZW5jb2RlciA8PCBtZXRhRGF0YS5rZXk7CiAgICAgZW5jb2RlciA8 PCBtZXRhRGF0YS5lcG9jaFJlbGF0aXZlVGltZVN0YW1wOwotICAgIGVuY29kZXIgPDwgbWV0YURh dGEuaGVhZGVyQ2hlY2tzdW07CisgICAgZW5jb2RlciA8PCBtZXRhRGF0YS5oZWFkZXJIYXNoOwog ICAgIGVuY29kZXIgPDwgbWV0YURhdGEuaGVhZGVyU2l6ZTsKICAgICBlbmNvZGVyIDw8IG1ldGFE YXRhLmJvZHlIYXNoOwogICAgIGVuY29kZXIgPDwgbWV0YURhdGEuYm9keVNpemU7CkBAIC00MzYs NyArNDI3LDcgQEAgRGF0YSBTdG9yYWdlOjplbmNvZGVSZWNvcmQoY29uc3QgUmVjb3JkJgogCiAg ICAgUmVjb3JkTWV0YURhdGEgbWV0YURhdGEocmVjb3JkLmtleSk7CiAgICAgbWV0YURhdGEuZXBv Y2hSZWxhdGl2ZVRpbWVTdGFtcCA9IHN0ZDo6Y2hyb25vOjpkdXJhdGlvbl9jYXN0PHN0ZDo6Y2hy b25vOjptaWxsaXNlY29uZHM+KHJlY29yZC50aW1lU3RhbXAudGltZV9zaW5jZV9lcG9jaCgpKTsK LSAgICBtZXRhRGF0YS5oZWFkZXJDaGVja3N1bSA9IGhhc2hEYXRhKHJlY29yZC5oZWFkZXIpOwor ICAgIG1ldGFEYXRhLmhlYWRlckhhc2ggPSBjb21wdXRlU0hBMShyZWNvcmQuaGVhZGVyKTsKICAg ICBtZXRhRGF0YS5oZWFkZXJTaXplID0gcmVjb3JkLmhlYWRlci5zaXplKCk7CiAgICAgbWV0YURh dGEuYm9keUhhc2ggPSBibG9iID8gYmxvYi52YWx1ZSgpLmhhc2ggOiBjb21wdXRlU0hBMShyZWNv cmQuYm9keSk7CiAgICAgbWV0YURhdGEuYm9keVNpemUgPSByZWNvcmQuYm9keS5zaXplKCk7Cg==