23012 2008-12-28 08:52:28 -0800 Bring application cache manifest parsing up to date 2008-12-28 09:19:33 -0800 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 ap ap oldest_to_newest 103590 0 ap 2008-12-28 08:52:28 -0800 There are several discrepancies between our implementation of manifest parsing and HTML. Most notably, we don't parse unknown sections correctly, not allowing for future extensions. Patch forthcoming. 103591 1 26280 ap 2008-12-28 08:59:16 -0800 Created attachment 26280 proposed patch 103592 2 26280 andersca 2008-12-28 09:03:07 -0800 Comment on attachment 26280 proposed patch Looks great! r=me! 103597 3 ap 2008-12-28 09:19:33 -0800 Committed revision 39492. 26280 2008-12-28 08:59:16 -0800 2008-12-28 09:03:07 -0800 proposed patch ManifestParser.txt text/plain 7558 ap SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiAzOTQ5MCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTggQEAKKzIwMDgtMTItMjggIEFsZXhleSBQcm9za3VyeWFrb3YgIDxhcEB3ZWJr aXQub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzAxMgorICAgICAgICBC cmluZyBhcHBsaWNhdGlvbiBjYWNoZSBtYW5pZmVzdCBwYXJzaW5nIHVwIHRvIGRhdGUKKworICAg ICAgICBUZXN0OiBodHRwL3Rlc3RzL2FwcGNhY2hlL21hbmlmZXN0LXBhcnNpbmcuaHRtbAorCisg ICAgICAgICogbG9hZGVyL2FwcGNhY2hlL01hbmlmZXN0UGFyc2VyLmNwcDoKKyAgICAgICAgKFdl YkNvcmU6Ok1vZGUpOiBBZGRlZCBhIGNvbnN0YW50IGZvciB1bmtub3duIHNlY3Rpb25zLCB3aGlj aCBhcmUgaWdub3JlZCB3aGVuIHBhcnNpbmcuIFRoaXMKKyAgICAgICAgaXMgbmVjZXNzYXJ5IGZv ciBmdXR1cmUgZXh0ZW5zaW9ucy4KKyAgICAgICAgKFdlYkNvcmU6OnBhcnNlTWFuaWZlc3QpOiBQ YXJzZSB1bmtub3duIHNlY3Rpb25zIGNvcnJlY3RseS4gSWdub3JlIHRyYWlsaW5nIHRva2VucyBp bgorICAgICAgICBzdXBwb3J0ZWQgc2VjdGlvbnMuCisKIDIwMDgtMTItMjggIE5pa29sYXMgWmlt bWVybWFubiAgPG5pa29sYXMuemltbWVybWFubkB0b3JjaG1vYmlsZS5jb20+CiAKICAgICAgICAg UmV2aWV3ZWQgYnkgRGFyaW4gQWRsZXIuCkluZGV4OiBXZWJDb3JlL2xvYWRlci9hcHBjYWNoZS9N YW5pZmVzdFBhcnNlci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9sb2FkZXIvYXBwY2FjaGUv TWFuaWZlc3RQYXJzZXIuY3BwCShyZXZpc2lvbiAzOTQ4OCkKKysrIFdlYkNvcmUvbG9hZGVyL2Fw cGNhY2hlL01hbmlmZXN0UGFyc2VyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzQsNyArMzQsNyBA QAogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKLWVudW0gTW9kZSB7IEV4cGxpY2l0LCBGYWxsYmFj aywgT25saW5lV2hpdGVsaXN0IH07CitlbnVtIE1vZGUgeyBFeHBsaWNpdCwgRmFsbGJhY2ssIE9u bGluZVdoaXRlbGlzdCwgVW5rbm93biB9OwogICAgIAogYm9vbCBwYXJzZU1hbmlmZXN0KGNvbnN0 IEtVUkwmIG1hbmlmZXN0VVJMLCBjb25zdCBjaGFyKiBkYXRhLCBpbnQgbGVuZ3RoLCBNYW5pZmVz dCYgbWFuaWZlc3QpCiB7CkBAIC0xMDQsOCArMTA0LDE5IEBAIGJvb2wgcGFyc2VNYW5pZmVzdChj b25zdCBLVVJMJiBtYW5pZmVzdFUKICAgICAgICAgICAgIG1vZGUgPSBGYWxsYmFjazsKICAgICAg ICAgZWxzZSBpZiAobGluZSA9PSAiTkVUV09SSzoiKQogICAgICAgICAgICAgbW9kZSA9IE9ubGlu ZVdoaXRlbGlzdDsKKyAgICAgICAgZWxzZSBpZiAobGluZS5lbmRzV2l0aCgiOiIpKQorICAgICAg ICAgICAgbW9kZSA9IFVua25vd247CisgICAgICAgIGVsc2UgaWYgKG1vZGUgPT0gVW5rbm93bikK KyAgICAgICAgICAgIGNvbnRpbnVlOwogICAgICAgICBlbHNlIGlmIChtb2RlID09IEV4cGxpY2l0 IHx8IG1vZGUgPT0gT25saW5lV2hpdGVsaXN0KSB7Ci0gICAgICAgICAgICBLVVJMIHVybChtYW5p ZmVzdFVSTCwgbGluZSk7CisgICAgICAgICAgICBjb25zdCBVQ2hhciogcCA9IGxpbmUuY2hhcmFj dGVycygpOworICAgICAgICAgICAgY29uc3QgVUNoYXIqIGxpbmVFbmQgPSBwICsgbGluZS5sZW5n dGgoKTsKKyAgICAgICAgICAgIAorICAgICAgICAgICAgLy8gTG9vayBmb3Igd2hpdGVzcGFjZSBz ZXBhcmF0aW5nIHRoZSBVUkwgZnJvbSBzdWJzZXF1ZW50IGlnbm9yZWQgdG9rZW5zLgorICAgICAg ICAgICAgd2hpbGUgKHAgPCBsaW5lRW5kICYmICpwICE9ICdcdCcgJiYgKnAgIT0gJyAnKSAKKyAg ICAgICAgICAgICAgICBwKys7CisKKyAgICAgICAgICAgIEtVUkwgdXJsKG1hbmlmZXN0VVJMLCBT dHJpbmcobGluZS5jaGFyYWN0ZXJzKCksIHAgLSBsaW5lLmNoYXJhY3RlcnMoKSkpOwogICAgICAg ICAgICAgCiAgICAgICAgICAgICBpZiAoIXVybC5pc1ZhbGlkKCkpCiAgICAgICAgICAgICAgICAg Y29udGludWU7CkBAIC0xMjIsOCArMTMzLDggQEAgYm9vbCBwYXJzZU1hbmlmZXN0KGNvbnN0IEtV UkwmIG1hbmlmZXN0VQogICAgICAgICAgICAgICAgIG1hbmlmZXN0Lm9ubGluZVdoaXRlbGlzdGVk VVJMcy5hZGQodXJsLnN0cmluZygpKTsKICAgICAgICAgICAgIAogICAgICAgICB9IGVsc2UgaWYg KG1vZGUgPT0gRmFsbGJhY2spIHsKLSAgICAgICAgICAgIGNvbnN0IFVDaGFyICpwID0gbGluZS5j aGFyYWN0ZXJzKCk7Ci0gICAgICAgICAgICBjb25zdCBVQ2hhciAqbGluZUVuZCA9IHAgKyBsaW5l Lmxlbmd0aCgpOworICAgICAgICAgICAgY29uc3QgVUNoYXIqIHAgPSBsaW5lLmNoYXJhY3RlcnMo KTsKKyAgICAgICAgICAgIGNvbnN0IFVDaGFyKiBsaW5lRW5kID0gcCArIGxpbmUubGVuZ3RoKCk7 CiAgICAgICAgICAgICAKICAgICAgICAgICAgIC8vIExvb2sgZm9yIHdoaXRlc3BhY2Ugc2VwYXJh dGluZyB0aGUgdHdvIFVSTHMKICAgICAgICAgICAgIHdoaWxlIChwIDwgbGluZUVuZCAmJiAqcCAh PSAnXHQnICYmICpwICE9ICcgJykgCkBAIC0xNDIsMTAgKzE1MywxNiBAQCBib29sIHBhcnNlTWFu aWZlc3QoY29uc3QgS1VSTCYgbWFuaWZlc3RVCiAgICAgICAgICAgICBpZiAoIXByb3RvY29sSG9z dEFuZFBvcnRBcmVFcXVhbChtYW5pZmVzdFVSTCwgbmFtZXNwYWNlVVJMKSkKICAgICAgICAgICAg ICAgICBjb250aW51ZTsKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCisgICAg ICAgICAgICAvLyBTa2lwIHdoaXRlc3BhY2Ugc2VwYXJhdGluZyBmYWxsYmFjayBuYW1lc3BhY2Ug ZnJvbSBVUkwuCiAgICAgICAgICAgICB3aGlsZSAocCA8IGxpbmVFbmQgJiYgKCpwID09ICdcdCcg fHwgKnAgPT0gJyAnKSkKICAgICAgICAgICAgICAgICBwKys7CiAKLSAgICAgICAgICAgIEtVUkwg ZmFsbGJhY2tVUkwoU3RyaW5nKHAsIGxpbmUubGVuZ3RoKCkgLSAocCAtIGxpbmUuY2hhcmFjdGVy cygpKSkpOworICAgICAgICAgICAgLy8gTG9vayBmb3Igd2hpdGVzcGFjZSBzZXBhcmF0aW5nIHRo ZSBVUkwgZnJvbSBzdWJzZXF1ZW50IGlnbm9yZWQgdG9rZW5zLgorICAgICAgICAgICAgY29uc3Qg VUNoYXIqIGZhbGxiYWNrU3RhcnQgPSBwOworICAgICAgICAgICAgd2hpbGUgKHAgPCBsaW5lRW5k ICYmICpwICE9ICdcdCcgJiYgKnAgIT0gJyAnKSAKKyAgICAgICAgICAgICAgICBwKys7CisKKyAg ICAgICAgICAgIEtVUkwgZmFsbGJhY2tVUkwoU3RyaW5nKGZhbGxiYWNrU3RhcnQsIGZhbGxiYWNr U3RhcnQgLSBwKSk7CiAKICAgICAgICAgICAgIGlmICghZmFsbGJhY2tVUkwuaXNWYWxpZCgpKQog ICAgICAgICAgICAgICAgIGNvbnRpbnVlOwpJbmRleDogTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIExheW91dFRlc3RzL0NoYW5nZUxvZwkocmV2aXNpb24gMzk0OTApCisrKyBM YXlvdXRUZXN0cy9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxNSBAQAorMjAw OC0xMi0yOCAgQWxleGV5IFByb3NrdXJ5YWtvdiAgPGFwQHdlYmtpdC5vcmc+CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTIzMDEyCisgICAgICAgIEJyaW5nIGFwcGxpY2F0aW9uIGNh Y2hlIG1hbmlmZXN0IHBhcnNpbmcgdXAgdG8gZGF0ZQorCisgICAgICAgICogaHR0cC90ZXN0cy9h cHBjYWNoZS9tYW5pZmVzdC1wYXJzaW5nLWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAgICAgICog aHR0cC90ZXN0cy9hcHBjYWNoZS9tYW5pZmVzdC1wYXJzaW5nLmh0bWw6IEFkZGVkLgorICAgICAg ICAqIGh0dHAvdGVzdHMvYXBwY2FjaGUvcmVzb3VyY2VzL1VOS05PV05fU0VDVElPTjo6IEFkZGVk LgorICAgICAgICAqIGh0dHAvdGVzdHMvYXBwY2FjaGUvcmVzb3VyY2VzL21hbmlmZXN0LXBhcnNp bmcubWFuaWZlc3Q6IEFkZGVkLgorCiAyMDA4LTEyLTI4ICBDYW1lcm9uIFp3YXJpY2ggIDx6d2Fy aWNoQGFwcGxlLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBPbGl2ZXIgSHVudC4KSW5kZXg6 IExheW91dFRlc3RzL2h0dHAvdGVzdHMvYXBwY2FjaGUvbWFuaWZlc3QtcGFyc2luZy1leHBlY3Rl ZC50eHQKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9hcHBjYWNoZS9tYW5p ZmVzdC1wYXJzaW5nLWV4cGVjdGVkLnR4dAkocmV2aXNpb24gMCkKKysrIExheW91dFRlc3RzL2h0 dHAvdGVzdHMvYXBwY2FjaGUvbWFuaWZlc3QtcGFyc2luZy1leHBlY3RlZC50eHQJKHJldmlzaW9u IDApCkBAIC0wLDAgKzEsNCBAQAorVGVzdCBhcHBsaWNhdGlvbiBjYWNoZSBtYW5pZmVzdCBwYXJz aW5nLgorCitTVUNDRVNTCisKClByb3BlcnR5IGNoYW5nZXMgb246IExheW91dFRlc3RzL2h0dHAv dGVzdHMvYXBwY2FjaGUvbWFuaWZlc3QtcGFyc2luZy1leHBlY3RlZC50eHQKX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpO YW1lOiBzdm46bWltZS10eXBlCiAgICsgdGV4dC9wbGFpbgpOYW1lOiBzdm46ZW9sLXN0eWxlCiAg ICsgbmF0aXZlCgpJbmRleDogTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9hcHBjYWNoZS9tYW5pZmVz dC1wYXJzaW5nLmh0bWwKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9hcHBj YWNoZS9tYW5pZmVzdC1wYXJzaW5nLmh0bWwJKHJldmlzaW9uIDApCisrKyBMYXlvdXRUZXN0cy9o dHRwL3Rlc3RzL2FwcGNhY2hlL21hbmlmZXN0LXBhcnNpbmcuaHRtbAkocmV2aXNpb24gMCkKQEAg LTAsMCArMSw2NCBAQAorPGh0bWwgbWFuaWZlc3Q9InJlc291cmNlcy9tYW5pZmVzdC1wYXJzaW5n Lm1hbmlmZXN0Ij4KKzxib2R5PgorPHA+VGVzdCBhcHBsaWNhdGlvbiBjYWNoZSBtYW5pZmVzdCBw YXJzaW5nLjwvcD4KKzxkaXYgaWQ9cmVzdWx0PjwvZGl2PgorCis8c2NyaXB0PgoraWYgKHdpbmRv dy5sYXlvdXRUZXN0Q29udHJvbGxlcikgeworICAgIGxheW91dFRlc3RDb250cm9sbGVyLmR1bXBB c1RleHQoKTsKKyAgICBsYXlvdXRUZXN0Q29udHJvbGxlci53YWl0VW50aWxEb25lKCk7Cit9CisK K2Z1bmN0aW9uIGxvZyhtZXNzYWdlKQoreworICAgIGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJy ZXN1bHQiKS5pbm5lckhUTUwgKz0gbWVzc2FnZSArICI8YnI+IjsKK30KKworZnVuY3Rpb24gY2Fu TG9hZCh1cmwpCit7CisgICAgdHJ5IHsKKyAgICAgICAgdmFyIHJlcSA9IG5ldyBYTUxIdHRwUmVx dWVzdCgpOworICAgICAgICByZXEub3BlbigiR0VUIiwgdXJsLCBmYWxzZSk7CisgICAgICAgIHJl cS5zZW5kKCk7CisgICAgICAgIHJldHVybiB0cnVlOworICAgIH0gY2F0Y2ggKGUpIHsKKyAgICAg ICAgcmV0dXJuIGZhbHNlOworICAgIH0KK30KKworZnVuY3Rpb24gdGVzdCgpCit7CisgICAgdmFy IGhhZEVycm9yID0gZmFsc2U7CisgICAgCisgICAgLy8gQ2hlY2sgdGhhdCBzZWN0aW9uIG5hbWUg d2Fzbid0IG1pc3BhcnNlZCBhcyByZXNvdXJjZSBVUkwuCisgICAgaWYgKGNhbkxvYWQoInJlc291 cmNlcy9VTktOT1dOOiIpKSB7CisgICAgICAgIGxvZygiTG9hZGVkICdVTktOT1dOOiciKTsKKyAg ICAgICAgaGFkRXJyb3IgPSB0cnVlOworICAgIH0KKworICAgIC8vIExvYWQgYSByZXNvdXJjZSB0 aGF0IHdhcyBpbiBVTktOT1dOIHNlY3Rpb24gLSBpbiBvdGhlciB3b3JkcywgdGhhdCBpcyBub3Qg aW4gY2FjaGUuCisgICAgaWYgKGNhbkxvYWQoInJlc291cmNlcy9ub3QtaW4tY2FjaGUudHh0Iikp IHsKKyAgICAgICAgbG9nKCJMb2FkZWQgJ25vdC1pbi1jYWNoZS50eHQnIik7CisgICAgICAgIGhh ZEVycm9yID0gdHJ1ZTsKKyAgICB9CisKKyAgICAvLyBMb2FkIHJlc291cmNlcyB3ZXJlIHNwZWNp ZmllZCB3aXRoIHRyaWNreSB3aGl0ZXNwYWNlLgorICAgIGlmICghY2FuTG9hZCgicmVzb3VyY2Vz L2VtcHR5LnR4dCIpKSB7CisgICAgICAgIGxvZygiQ291bGQgbm90IGxvYWQgJ2VtcHR5LnR4dCci KTsKKyAgICAgICAgaGFkRXJyb3IgPSB0cnVlOworICAgIH0KKyAgICBpZiAoIWNhbkxvYWQoInJl c291cmNlcy9zaW1wbGUudHh0IikpIHsKKyAgICAgICAgbG9nKCJDb3VsZCBub3QgbG9hZCAnc2lt cGxlLnR4dCciKTsKKyAgICAgICAgaGFkRXJyb3IgPSB0cnVlOworICAgIH0KKworICAgIGxvZyho YWRFcnJvciA/ICJGQUlMVVJFIiA6ICJTVUNDRVNTIik7CisgICAgaWYgKHdpbmRvdy5sYXlvdXRU ZXN0Q29udHJvbGxlcikKKyAgICAgICAgbGF5b3V0VGVzdENvbnRyb2xsZXIubm90aWZ5RG9uZSgp OworfQorCithcHBsaWNhdGlvbkNhY2hlLm9ubm91cGRhdGUgPSBmdW5jdGlvbigpIHsgdGVzdCgp IH0KK2FwcGxpY2F0aW9uQ2FjaGUub25jYWNoZWQgPSBmdW5jdGlvbigpIHsgdGVzdCgpIH0KKzwv c2NyaXB0PgorPC9ib2R5PgorPC9odG1sPgoKUHJvcGVydHkgY2hhbmdlcyBvbjogTGF5b3V0VGVz dHMvaHR0cC90ZXN0cy9hcHBjYWNoZS9tYW5pZmVzdC1wYXJzaW5nLmh0bWwKX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpO YW1lOiBzdm46bWltZS10eXBlCiAgICsgdGV4dC9odG1sCgpJbmRleDogTGF5b3V0VGVzdHMvaHR0 cC90ZXN0cy9hcHBjYWNoZS9yZXNvdXJjZXMvVU5LTk9XTl9TRUNUSU9OOgo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Cklu ZGV4OiBMYXlvdXRUZXN0cy9odHRwL3Rlc3RzL2FwcGNhY2hlL3Jlc291cmNlcy9tYW5pZmVzdC1w YXJzaW5nLm1hbmlmZXN0Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL2h0dHAvdGVzdHMvYXBw Y2FjaGUvcmVzb3VyY2VzL21hbmlmZXN0LXBhcnNpbmcubWFuaWZlc3QJKHJldmlzaW9uIDApCisr KyBMYXlvdXRUZXN0cy9odHRwL3Rlc3RzL2FwcGNhY2hlL3Jlc291cmNlcy9tYW5pZmVzdC1wYXJz aW5nLm1hbmlmZXN0CShyZXZpc2lvbiAwKQpAQCAtMCwwICsxLDYgQEAKK++7v0NBQ0hFIE1BTklG RVNUIAorIAkgZW1wdHkudHh0IAkgCisgCSAgCQorc2ltcGxlLnR4dCBpZ25vcmVkIHRleHQKK1VO S05PV05fU0VDVElPTjogCitub3QtaW4tY2FjaGUudHh0Cg==