53228 2011-01-27 01:04:06 -0800 [Gtk] Resource size is incorrectly reported to WebCore 2011-02-28 11:44:36 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 svillar svillar pfeldman oldest_to_newest 340761 0 svillar 2011-01-27 01:04:06 -0800 [Gtk] Resource size is incorrectly reported to WebCore 340767 1 80303 svillar 2011-01-27 01:10:30 -0800 Created attachment 80303 Patch 340769 2 svillar 2011-01-27 01:13:55 -0800 It's easy to see the problem in web inspector. Just open the resources tab when visiting http://www.csszengarden.com for example and check the actual and xfer sizes of some resources when using epiphany and chrome. 340868 3 80303 mrobinson 2011-01-27 07:44:34 -0800 Comment on attachment 80303 Patch This seems like a really good change, but we must be failing a test because of this. If not we should add a test somewhere. 340903 4 svillar 2011-01-27 09:43:33 -0800 most likely another version of bug #40049 359145 5 svillar 2011-02-28 10:23:38 -0800 Looks like the new test http/tests/inspector/network/network-size.html is the test we were looking for. It fails with current trunk and works with my patch. 359184 6 84085 svillar 2011-02-28 11:12:24 -0800 Created attachment 84085 Patch New rebased version. Updated the skipped list 359187 7 svillar 2011-02-28 11:15:40 -0800 *** Bug 55363 has been marked as a duplicate of this bug. *** 359192 8 84085 mrobinson 2011-02-28 11:24:56 -0800 Comment on attachment 84085 Patch Great work. 359207 9 svillar 2011-02-28 11:44:36 -0800 Committed r79889: <http://trac.webkit.org/changeset/79889> 80303 2011-01-27 01:10:30 -0800 2011-02-28 11:12:24 -0800 Patch bug-53228-20110127101028.patch text/plain 5054 svillar ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA2YjQxMmFiMDVkY2ZkMGM4Y2UyNTkwMGE0NmYxZDE3ZDllYzgxYTc5Li45 MjcxZjA3Mzc1YzI4MTc0ZWMzODg4NGQ3ZTMzMTFhM2JhMWJhZWM1IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0x LDMgKzEsMjMgQEAKKzIwMTEtMDEtMjcgIFNlcmdpbyBWaWxsYXIgU2VuaW4gIDxzdmlsbGFyQGln YWxpYS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgW0d0a10gUmVzb3VyY2Ugc2l6ZSBpcyBpbmNvcnJlY3RseSByZXBvcnRlZCB0byBXZWJDb3Jl CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01MzIyOAor CisgICAgICAgIFdoZW4gY2FsbGluZyBkaWRSZWNlaXZlRGF0YSB3ZSBhcmUgc2VuZGluZyBhbiBp bnZhbGlkIHZhbHVlIGZvcgorICAgICAgICBsZW5ndGhSZWNlaXZlZC4gU29tZXRpbWVzIHdlIHdl cmUgZXZlbiBwYXNzaW5nIGEgYm9vbGVhbiB2YWx1ZSBpbnN0ZWFkIG9mIHRoZQorICAgICAgICBl eHBlY3RlZCBpbnRlZ2VyLiBXZSBzaG91bGQgcGFzcyB0aGUgc2l6ZSBvZiB0aGUgcmVjZWl2ZWQg ZGF0YSBpbnN0ZWFkIG9mIHRoZQorICAgICAgICB0b3RhbCBhbW91bnQgb2YgZGF0YSByZWNlaXZl ZC4KKworICAgICAgICAqIHBsYXRmb3JtL25ldHdvcmsvUmVzb3VyY2VIYW5kbGVJbnRlcm5hbC5o OgorICAgICAgICAoV2ViQ29yZTo6UmVzb3VyY2VIYW5kbGVJbnRlcm5hbDo6UmVzb3VyY2VIYW5k bGVJbnRlcm5hbCk6CisgICAgICAgICogcGxhdGZvcm0vbmV0d29yay9zb3VwL1Jlc291cmNlSGFu ZGxlU291cC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpnb3RDaHVua0NhbGxiYWNrKToKKyAgICAg ICAgKFdlYkNvcmU6OnBhcnNlRGF0YVVybCk6CisgICAgICAgIChXZWJDb3JlOjpzZW5kUmVxdWVz dENhbGxiYWNrKToKKyAgICAgICAgKFdlYkNvcmU6OnJlYWRDYWxsYmFjayk6CisKIDIwMTEtMDEt MjQgIFBhdmVsIFBvZGl2aWxvdiAgPHBvZGl2aWxvdkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAg UmV2aWV3ZWQgYnkgUGF2ZWwgRmVsZG1hbi4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL25ldHdvcmsvUmVzb3VyY2VIYW5kbGVJbnRlcm5hbC5oIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vbmV0d29yay9SZXNvdXJjZUhhbmRsZUludGVybmFsLmgKaW5kZXggZWQ2Njk0NDUz YTk4ZGQ0YmU1YWM2ZDk1Y2RhYTVlMDRmZjE4MWRhMy4uZDExY2I3N2U0YmYxNmM5NWM0MTE2YTlm ODcxM2UzM2EyYzNkZTliOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0 d29yay9SZXNvdXJjZUhhbmRsZUludGVybmFsLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vbmV0d29yay9SZXNvdXJjZUhhbmRsZUludGVybmFsLmgKQEAgLTExMyw3ICsxMTMsNiBAQCBu YW1lc3BhY2UgV2ViQ29yZSB7CiAjaWYgVVNFKFNPVVApCiAgICAgICAgICAgICAsIG1fY2FuY2Vs bGVkKGZhbHNlKQogICAgICAgICAgICAgLCBtX2J1ZmZlcigwKQotICAgICAgICAgICAgLCBtX3Rv dGFsKDApCiAgICAgICAgICAgICAsIG1faWRsZUhhbmRsZXIoMCkKICAgICAgICAgICAgICwgbV9n b3RDaHVua0hhbmRsZXIoMCkKICNlbmRpZgpAQCAtMTk1LDcgKzE5NCw2IEBAIG5hbWVzcGFjZSBX ZWJDb3JlIHsKICAgICAgICAgR1JlZlB0cjxHSW5wdXRTdHJlYW0+IG1faW5wdXRTdHJlYW07CiAg ICAgICAgIEdSZWZQdHI8R0NhbmNlbGxhYmxlPiBtX2NhbmNlbGxhYmxlOwogICAgICAgICBjaGFy KiBtX2J1ZmZlcjsKLSAgICAgICAgZ3NpemUgbV90b3RhbDsKICAgICAgICAgZ3VpbnQgbV9pZGxl SGFuZGxlcjsKICAgICAgICAgUmVmUHRyPE5ldHdvcmtpbmdDb250ZXh0PiBtX2NvbnRleHQ7CiAg ICAgICAgIGd1bG9uZyBtX2dvdENodW5rSGFuZGxlcjsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL25ldHdvcmsvc291cC9SZXNvdXJjZUhhbmRsZVNvdXAuY3BwIGIvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9zb3VwL1Jlc291cmNlSGFuZGxlU291cC5jcHAKaW5k ZXggNDdhN2M1ODAyZTBiMTVlNGUyNTM5Y2M0ZWUwNzhiZmE0MjRmZjY1Zi4uOGJiM2Q3MWIyZjky YmY3OGU0MDdhYzFjNDYxMDUzODViYjFjN2Q0OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vbmV0d29yay9zb3VwL1Jlc291cmNlSGFuZGxlU291cC5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9zb3VwL1Jlc291cmNlSGFuZGxlU291cC5jcHAKQEAg LTMwOSw3ICszMDksNyBAQCBzdGF0aWMgdm9pZCBnb3RDaHVua0NhbGxiYWNrKFNvdXBNZXNzYWdl KiBtc2csIFNvdXBCdWZmZXIqIGNodW5rLCBncG9pbnRlciBkYXRhKQogCiAgICAgQVNTRVJUKCFk LT5tX3Jlc3BvbnNlLmlzTnVsbCgpKTsKIAotICAgIGNsaWVudC0+ZGlkUmVjZWl2ZURhdGEoaGFu ZGxlLmdldCgpLCBjaHVuay0+ZGF0YSwgY2h1bmstPmxlbmd0aCwgZmFsc2UpOworICAgIGNsaWVu dC0+ZGlkUmVjZWl2ZURhdGEoaGFuZGxlLmdldCgpLCBjaHVuay0+ZGF0YSwgY2h1bmstPmxlbmd0 aCwgY2h1bmstPmxlbmd0aCk7CiB9CiAKIHN0YXRpYyBnYm9vbGVhbiBwYXJzZURhdGFVcmwoZ3Bv aW50ZXIgY2FsbGJhY2tEYXRhKQpAQCAtMzgwLDcgKzM4MCw2IEBAIHN0YXRpYyBnYm9vbGVhbiBw YXJzZURhdGFVcmwoZ3BvaW50ZXIgY2FsbGJhY2tEYXRhKQogICAgIH0KIAogICAgIGQtPm1fYnVm ZmVyID0gc3RhdGljX2Nhc3Q8Y2hhcio+KGdfc2xpY2VfYWxsb2MwKFJFQURfQlVGRkVSX1NJWkUp KTsKLSAgICBkLT5tX3RvdGFsID0gMDsKIAogICAgIGdfb2JqZWN0X3NldF9kYXRhKEdfT0JKRUNU KGQtPm1faW5wdXRTdHJlYW0uZ2V0KCkpLCAid2Via2l0LXJlc291cmNlIiwgaGFuZGxlKTsKICAg ICAvLyBiYWxhbmNlZCBieSBhIGRlcmVmKCkgaW4gY2xlYW51cFNvdXBSZXF1ZXN0T3BlcmF0aW9u LCB3aGljaCBzaG91bGQgYWx3YXlzIHJ1bgpAQCAtNTI1LDcgKzUyNCw3IEBAIHN0YXRpYyB2b2lk IHNlbmRSZXF1ZXN0Q2FsbGJhY2soR09iamVjdCogc291cmNlLCBHQXN5bmNSZXN1bHQqIHJlcywg Z3BvaW50ZXIgdXNlCiAgICAgICAgICAgICAvLyByZXNwb25zZV9ib2R5LT5kYXRhIGFzIGxpYnNv dXAgYWx3YXlzIGNyZWF0ZXMgdGhlCiAgICAgICAgICAgICAvLyBTb3VwQnVmZmVyIGZvciB0aGUg Ym9keSBldmVuIGlmIHRoZSBsZW5ndGggaXMgMAogICAgICAgICAgICAgaWYgKCFkLT5tX2NhbmNl bGxlZCAmJiBzb3VwTXNnLT5yZXNwb25zZV9ib2R5LT5sZW5ndGgpCi0gICAgICAgICAgICAgICAg Y2xpZW50LT5kaWRSZWNlaXZlRGF0YShoYW5kbGUuZ2V0KCksIHNvdXBNc2ctPnJlc3BvbnNlX2Jv ZHktPmRhdGEsIHNvdXBNc2ctPnJlc3BvbnNlX2JvZHktPmxlbmd0aCwgdHJ1ZSk7CisgICAgICAg ICAgICAgICAgY2xpZW50LT5kaWRSZWNlaXZlRGF0YShoYW5kbGUuZ2V0KCksIHNvdXBNc2ctPnJl c3BvbnNlX2JvZHktPmRhdGEsIHNvdXBNc2ctPnJlc3BvbnNlX2JvZHktPmxlbmd0aCwgc291cE1z Zy0+cmVzcG9uc2VfYm9keS0+bGVuZ3RoKTsKICAgICAgICAgfQogCiAgICAgICAgIC8vIGRpZFJl Y2VpdmVEYXRhIGFib3ZlIG1pZ2h0IGhhdmUgY2FuY2VsbGVkIGl0CkBAIC01NDUsNyArNTQ0LDYg QEAgc3RhdGljIHZvaWQgc2VuZFJlcXVlc3RDYWxsYmFjayhHT2JqZWN0KiBzb3VyY2UsIEdBc3lu Y1Jlc3VsdCogcmVzLCBncG9pbnRlciB1c2UKIAogICAgIGQtPm1faW5wdXRTdHJlYW0gPSBhZG9w dEdSZWYoaW4pOwogICAgIGQtPm1fYnVmZmVyID0gc3RhdGljX2Nhc3Q8Y2hhcio+KGdfc2xpY2Vf YWxsb2MwKFJFQURfQlVGRkVSX1NJWkUpKTsKLSAgICBkLT5tX3RvdGFsID0gMDsKIAogICAgIC8v IHJlYWRDYWxsYmFjayBuZWVkcyBpdAogICAgIGdfb2JqZWN0X3NldF9kYXRhKEdfT0JKRUNUKGQt Pm1faW5wdXRTdHJlYW0uZ2V0KCkpLCAid2Via2l0LXJlc291cmNlIiwgaGFuZGxlLmdldCgpKTsK QEAgLTg2MCwxMyArODU4LDEyIEBAIHN0YXRpYyB2b2lkIHJlYWRDYWxsYmFjayhHT2JqZWN0KiBz b3VyY2UsIEdBc3luY1Jlc3VsdCogYXN5bmNSZXN1bHQsIGdwb2ludGVyIGRhCiAgICAgLy8gSXQn cyBtYW5kYXRvcnkgdG8gaGF2ZSBzZW50IGEgcmVzcG9uc2UgYmVmb3JlIHNlbmRpbmcgZGF0YQog ICAgIEFTU0VSVCghZC0+bV9yZXNwb25zZS5pc051bGwoKSk7CiAKLSAgICBkLT5tX3RvdGFsICs9 IGJ5dGVzUmVhZDsKICAgICBpZiAoR19MSUtFTFkoIWNvbnZlcnRUb1VURjE2KSkKLSAgICAgICAg Y2xpZW50LT5kaWRSZWNlaXZlRGF0YShoYW5kbGUuZ2V0KCksIGQtPm1fYnVmZmVyLCBieXRlc1Jl YWQsIGQtPm1fdG90YWwpOworICAgICAgICBjbGllbnQtPmRpZFJlY2VpdmVEYXRhKGhhbmRsZS5n ZXQoKSwgZC0+bV9idWZmZXIsIGJ5dGVzUmVhZCwgYnl0ZXNSZWFkKTsKICAgICBlbHNlIHsKICAg ICAgICAgLy8gV2UgaGF2ZSB0byBjb252ZXJ0IGl0IHRvIFVURi0xNiBkdWUgdG8gbGltaXRhdGlv bnMgaW4gS1VSTAogICAgICAgICBTdHJpbmcgZGF0YSA9IFN0cmluZzo6ZnJvbVVURjgoZC0+bV9i dWZmZXIsIGJ5dGVzUmVhZCk7Ci0gICAgICAgIGNsaWVudC0+ZGlkUmVjZWl2ZURhdGEoaGFuZGxl LmdldCgpLCByZWludGVycHJldF9jYXN0PGNvbnN0IGNoYXIqPihkYXRhLmNoYXJhY3RlcnMoKSks IGRhdGEubGVuZ3RoKCkgKiBzaXplb2YoVUNoYXIpLCAwKTsKKyAgICAgICAgY2xpZW50LT5kaWRS ZWNlaXZlRGF0YShoYW5kbGUuZ2V0KCksIHJlaW50ZXJwcmV0X2Nhc3Q8Y29uc3QgY2hhcio+KGRh dGEuY2hhcmFjdGVycygpKSwgZGF0YS5sZW5ndGgoKSAqIHNpemVvZihVQ2hhciksIGJ5dGVzUmVh ZCk7CiAgICAgfQogCiAgICAgLy8gZGlkUmVjZWl2ZURhdGEgbWF5IGNhbmNlbCB0aGUgbG9hZCwg d2hpY2ggbWF5IHJlbGVhc2UgdGhlIGxhc3QgcmVmZXJlbmNlLgo= 84085 2011-02-28 11:12:24 -0800 2011-02-28 11:24:55 -0800 Patch 53228.patch text/plain 5620 svillar ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCA5ZDNmNTM0Li44ZjBiYTNlIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTIgQEAKKzIwMTEtMDIt MjggIFNlcmdpbyBWaWxsYXIgU2VuaW4gIDxzdmlsbGFyQGlnYWxpYS5jb20+CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW0d0a10gUmVzb3VyY2Ugc2l6 ZSBpcyBpbmNvcnJlY3RseSByZXBvcnRlZCB0byBXZWJDb3JlCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01MzIyOAorCisgICAgICAgICogcGxhdGZvcm0v Z3RrL1NraXBwZWQ6IHVuc2tpcHBlZCBodHRwL3Rlc3RzL2luc3BlY3Rvci9uZXR3b3JrLXNpemUu aHRtbAorCiAyMDExLTAyLTI4ICBBZGFtIFJvYmVuICA8YXJvYmVuQGFwcGxlLmNvbT4KIAogICAg ICAgICBTa2lwIGEgc29tZXRpbWVzLWNyYXNoaW5nIHRlc3Qgb24gV2luZG93cwpkaWZmIC0tZ2l0 IGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vZ3RrL1NraXBwZWQgYi9MYXlvdXRUZXN0cy9wbGF0Zm9y bS9ndGsvU2tpcHBlZAppbmRleCAxYzllMDVmLi5hODA3MzkzIDEwMDY0NAotLS0gYS9MYXlvdXRU ZXN0cy9wbGF0Zm9ybS9ndGsvU2tpcHBlZAorKysgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9ndGsv U2tpcHBlZApAQCAtMTE4MSw5ICsxMTgxLDYgQEAgc3B1dG5pay9Vbmljb2RlL1VuaWNvZGVfNTEw L1M3LjZfQTUuM19UMi5odG1sCiAjIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD00MzMzMgogaW5zcGVjdG9yL2RlYnVnZ2VyL2RvbS1icmVha3BvaW50cy5odG1sCiAKLSMg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTU1MzYzCi1odHRwL3Rlc3Rz L2luc3BlY3Rvci9uZXR3b3JrL25ldHdvcmstc2l6ZS5odG1sCi0KICMgW0dUS10gcjY1NjgxIGJy b2tlIGEgY291cGxlIEdUSysgYTExeSB0ZXN0cwogIyBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9NDQzMTYKIHBsYXRmb3JtL2d0ay9hY2Nlc3NpYmlsaXR5L29iamVjdC1h dHRyaWJ1dGVzLmh0bWwKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBkNzZjNjljLi42MGFhMjkwIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9n CkBAIC0xLDMgKzEsMjIgQEAKKzIwMTEtMDItMjggIFNlcmdpbyBWaWxsYXIgU2VuaW4gIDxzdmls bGFyQGlnYWxpYS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgW0d0a10gUmVzb3VyY2Ugc2l6ZSBpcyBpbmNvcnJlY3RseSByZXBvcnRlZCB0byBX ZWJDb3JlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01 MzIyOAorCisgICAgICAgIFdoZW4gY2FsbGluZyBkaWRSZWNlaXZlRGF0YSB3ZSBhcmUgc2VuZGlu ZyBhbiBpbnZhbGlkIHZhbHVlIGZvcgorICAgICAgICBsZW5ndGhSZWNlaXZlZC4gU29tZXRpbWVz IHdlIHdlcmUgZXZlbiBwYXNzaW5nIGEgYm9vbGVhbiB2YWx1ZSBpbnN0ZWFkIG9mIHRoZQorICAg ICAgICBleHBlY3RlZCBpbnRlZ2VyLiBXZSBzaG91bGQgcGFzcyB0aGUgc2l6ZSBvZiB0aGUgcmVj ZWl2ZWQgZGF0YSBpbnN0ZWFkIG9mIHRoZQorICAgICAgICB0b3RhbCBhbW91bnQgb2YgZGF0YSBy ZWNlaXZlZC4KKworICAgICAgICAqIHBsYXRmb3JtL25ldHdvcmsvUmVzb3VyY2VIYW5kbGVJbnRl cm5hbC5oOgorICAgICAgICAoV2ViQ29yZTo6UmVzb3VyY2VIYW5kbGVJbnRlcm5hbDo6UmVzb3Vy Y2VIYW5kbGVJbnRlcm5hbCk6CisgICAgICAgICogcGxhdGZvcm0vbmV0d29yay9zb3VwL1Jlc291 cmNlSGFuZGxlU291cC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpnb3RDaHVua0NhbGxiYWNrKToK KyAgICAgICAgKFdlYkNvcmU6OnNlbmRSZXF1ZXN0Q2FsbGJhY2spOgorICAgICAgICAoV2ViQ29y ZTo6cmVhZENhbGxiYWNrKToKKwogMjAxMS0wMi0yOCAgUmVuYXRhIEhvZG92YW4gIDxyZW5pQHdl YmtpdC5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgQW5kcmVhcyBLbGluZy4KZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvUmVzb3VyY2VIYW5kbGVJbnRlcm5h bC5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9SZXNvdXJjZUhhbmRsZUludGVy bmFsLmgKaW5kZXggNTUxMjA2Mi4uYjYyMjgwMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vbmV0d29yay9SZXNvdXJjZUhhbmRsZUludGVybmFsLmgKKysrIGIvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vbmV0d29yay9SZXNvdXJjZUhhbmRsZUludGVybmFsLmgKQEAgLTExNCw3 ICsxMTQsNiBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAjaWYgVVNFKFNPVVApCiAgICAgICAgICAg ICAsIG1fY2FuY2VsbGVkKGZhbHNlKQogICAgICAgICAgICAgLCBtX2J1ZmZlcigwKQotICAgICAg ICAgICAgLCBtX3RvdGFsKDApCiAgICAgICAgICAgICAsIG1fYm9keVNpemUoMCkKICAgICAgICAg ICAgICwgbV9ib2R5RGF0YVNlbnQoMCkKICAgICAgICAgICAgICwgbV9pZGxlSGFuZGxlcigwKQpA QCAtMTk0LDcgKzE5Myw2IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAgICAgR1JlZlB0cjxH SW5wdXRTdHJlYW0+IG1faW5wdXRTdHJlYW07CiAgICAgICAgIEdSZWZQdHI8R0NhbmNlbGxhYmxl PiBtX2NhbmNlbGxhYmxlOwogICAgICAgICBjaGFyKiBtX2J1ZmZlcjsKLSAgICAgICAgZ3NpemUg bV90b3RhbDsKICAgICAgICAgdW5zaWduZWQgbG9uZyBtX2JvZHlTaXplOwogICAgICAgICB1bnNp Z25lZCBsb25nIG1fYm9keURhdGFTZW50OwogICAgICAgICBndWludCBtX2lkbGVIYW5kbGVyOwpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9zb3VwL1Jlc291cmNl SGFuZGxlU291cC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL3NvdXAvUmVz b3VyY2VIYW5kbGVTb3VwLmNwcAppbmRleCBhNTVmMzhmLi5jNTc5YzZlIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL3NvdXAvUmVzb3VyY2VIYW5kbGVTb3VwLmNw cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL3NvdXAvUmVzb3VyY2VIYW5k bGVTb3VwLmNwcApAQCAtMzYyLDcgKzM2Miw3IEBAIHN0YXRpYyB2b2lkIGdvdENodW5rQ2FsbGJh Y2soU291cE1lc3NhZ2UqIG1zZywgU291cEJ1ZmZlciogY2h1bmssIGdwb2ludGVyIGRhdGEpCiAK ICAgICBBU1NFUlQoIWQtPm1fcmVzcG9uc2UuaXNOdWxsKCkpOwogCi0gICAgY2xpZW50LT5kaWRS ZWNlaXZlRGF0YShoYW5kbGUuZ2V0KCksIGNodW5rLT5kYXRhLCBjaHVuay0+bGVuZ3RoLCBmYWxz ZSk7CisgICAgY2xpZW50LT5kaWRSZWNlaXZlRGF0YShoYW5kbGUuZ2V0KCksIGNodW5rLT5kYXRh LCBjaHVuay0+bGVuZ3RoLCBjaHVuay0+bGVuZ3RoKTsKIH0KIAogc3RhdGljIFNvdXBTZXNzaW9u KiBjcmVhdGVTb3VwU2Vzc2lvbigpCkBAIC00NTMsNyArNDUzLDcgQEAgc3RhdGljIHZvaWQgc2Vu ZFJlcXVlc3RDYWxsYmFjayhHT2JqZWN0KiBzb3VyY2UsIEdBc3luY1Jlc3VsdCogcmVzLCBncG9p bnRlciB1c2UKICAgICAgICAgICAgIC8vIHJlc3BvbnNlX2JvZHktPmRhdGEgYXMgbGlic291cCBh bHdheXMgY3JlYXRlcyB0aGUKICAgICAgICAgICAgIC8vIFNvdXBCdWZmZXIgZm9yIHRoZSBib2R5 IGV2ZW4gaWYgdGhlIGxlbmd0aCBpcyAwCiAgICAgICAgICAgICBpZiAoIWQtPm1fY2FuY2VsbGVk ICYmIHNvdXBNc2ctPnJlc3BvbnNlX2JvZHktPmxlbmd0aCkKLSAgICAgICAgICAgICAgICBjbGll bnQtPmRpZFJlY2VpdmVEYXRhKGhhbmRsZS5nZXQoKSwgc291cE1zZy0+cmVzcG9uc2VfYm9keS0+ ZGF0YSwgc291cE1zZy0+cmVzcG9uc2VfYm9keS0+bGVuZ3RoLCB0cnVlKTsKKyAgICAgICAgICAg ICAgICBjbGllbnQtPmRpZFJlY2VpdmVEYXRhKGhhbmRsZS5nZXQoKSwgc291cE1zZy0+cmVzcG9u c2VfYm9keS0+ZGF0YSwgc291cE1zZy0+cmVzcG9uc2VfYm9keS0+bGVuZ3RoLCBzb3VwTXNnLT5y ZXNwb25zZV9ib2R5LT5sZW5ndGgpOwogICAgICAgICB9CiAKICAgICAgICAgLy8gZGlkUmVjZWl2 ZURhdGEgYWJvdmUgbWlnaHQgaGF2ZSBjYW5jZWxsZWQgaXQKQEAgLTQ3Myw3ICs0NzMsNiBAQCBz dGF0aWMgdm9pZCBzZW5kUmVxdWVzdENhbGxiYWNrKEdPYmplY3QqIHNvdXJjZSwgR0FzeW5jUmVz dWx0KiByZXMsIGdwb2ludGVyIHVzZQogCiAgICAgZC0+bV9pbnB1dFN0cmVhbSA9IGFkb3B0R1Jl Zihpbik7CiAgICAgZC0+bV9idWZmZXIgPSBzdGF0aWNfY2FzdDxjaGFyKj4oZ19zbGljZV9hbGxv YzAoUkVBRF9CVUZGRVJfU0laRSkpOwotICAgIGQtPm1fdG90YWwgPSAwOwogCiAgICAgLy8gcmVh ZENhbGxiYWNrIG5lZWRzIGl0CiAgICAgZ19vYmplY3Rfc2V0X2RhdGEoR19PQkpFQ1QoZC0+bV9p bnB1dFN0cmVhbS5nZXQoKSksICJ3ZWJraXQtcmVzb3VyY2UiLCBoYW5kbGUuZ2V0KCkpOwpAQCAt Nzg3LDEzICs3ODYsMTIgQEAgc3RhdGljIHZvaWQgcmVhZENhbGxiYWNrKEdPYmplY3QqIHNvdXJj ZSwgR0FzeW5jUmVzdWx0KiBhc3luY1Jlc3VsdCwgZ3BvaW50ZXIgZGEKICAgICAvLyBJdCdzIG1h bmRhdG9yeSB0byBoYXZlIHNlbnQgYSByZXNwb25zZSBiZWZvcmUgc2VuZGluZyBkYXRhCiAgICAg QVNTRVJUKCFkLT5tX3Jlc3BvbnNlLmlzTnVsbCgpKTsKIAotICAgIGQtPm1fdG90YWwgKz0gYnl0 ZXNSZWFkOwogICAgIGlmIChHX0xJS0VMWSghY29udmVydFRvVVRGMTYpKQotICAgICAgICBjbGll bnQtPmRpZFJlY2VpdmVEYXRhKGhhbmRsZS5nZXQoKSwgZC0+bV9idWZmZXIsIGJ5dGVzUmVhZCwg ZC0+bV90b3RhbCk7CisgICAgICAgIGNsaWVudC0+ZGlkUmVjZWl2ZURhdGEoaGFuZGxlLmdldCgp LCBkLT5tX2J1ZmZlciwgYnl0ZXNSZWFkLCBieXRlc1JlYWQpOwogICAgIGVsc2UgewogICAgICAg ICAvLyBXZSBoYXZlIHRvIGNvbnZlcnQgaXQgdG8gVVRGLTE2IGR1ZSB0byBsaW1pdGF0aW9ucyBp biBLVVJMCiAgICAgICAgIFN0cmluZyBkYXRhID0gU3RyaW5nOjpmcm9tVVRGOChkLT5tX2J1ZmZl ciwgYnl0ZXNSZWFkKTsKLSAgICAgICAgY2xpZW50LT5kaWRSZWNlaXZlRGF0YShoYW5kbGUuZ2V0 KCksIHJlaW50ZXJwcmV0X2Nhc3Q8Y29uc3QgY2hhcio+KGRhdGEuY2hhcmFjdGVycygpKSwgZGF0 YS5sZW5ndGgoKSAqIHNpemVvZihVQ2hhciksIDApOworICAgICAgICBjbGllbnQtPmRpZFJlY2Vp dmVEYXRhKGhhbmRsZS5nZXQoKSwgcmVpbnRlcnByZXRfY2FzdDxjb25zdCBjaGFyKj4oZGF0YS5j aGFyYWN0ZXJzKCkpLCBkYXRhLmxlbmd0aCgpICogc2l6ZW9mKFVDaGFyKSwgYnl0ZXNSZWFkKTsK ICAgICB9CiAKICAgICAvLyBkaWRSZWNlaXZlRGF0YSBtYXkgY2FuY2VsIHRoZSBsb2FkLCB3aGlj aCBtYXkgcmVsZWFzZSB0aGUgbGFzdCByZWZlcmVuY2UuCg==