125410 2013-12-08 05:55:01 -0800 [Soup] Send original encoded data size to didReceiveBuffer 2013-12-10 02:04:40 -0800 1 1 1 Unclassified WebKit Platform 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 mrobinson gustavo cdumez commit-queue danw gustavo rakuco oldest_to_newest 957604 0 mrobinson 2013-12-08 05:55:01 -0800 didReceiveBuffer/didReceiveData accepts the original (encoded) data size, but the libsoup backend is always sending the decoded data size. 957613 1 218687 gustavo 2013-12-08 07:07:11 -0800 Created attachment 218687 Patch 957773 2 218687 danw 2013-12-08 23:53:36 -0800 Comment on attachment 218687 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=218687&action=review > Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp:607 > + while (!G_IS_SEEKABLE(baseStream)) > + baseStream = g_filter_input_stream_get_base_stream(G_FILTER_INPUT_STREAM(baseStream)); This assumes you will always eventually find a seekable stream... does this code get used for non-http requests as well? (eg, data: URIs) Also, be sure to test that it works right with resources returned from cache 957864 3 gustavo 2013-12-09 05:51:30 -0800 I'm going to run the tests in debug mode and test that it's working with cached resources (though I think the inspector treats those specially). I'm pretty sure the data: URIs use that code indeed, good catch! 957992 4 218778 gustavo 2013-12-09 11:01:59 -0800 Created attachment 218778 Patch 958010 5 218778 mrobinson 2013-12-09 11:26:49 -0800 Comment on attachment 218778 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=218778&action=review > Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp:739 > + d->m_previousPosition = handle->currentStreamPosition(); > + Maybe try removing this... 958249 6 gustavo 2013-12-10 02:04:40 -0800 Committed r160352: <http://trac.webkit.org/changeset/160352> 218687 2013-12-08 07:07:11 -0800 2013-12-09 11:01:53 -0800 Patch bug-125410-20131208160710.patch text/plain 5308 gustavo U3VidmVyc2lvbiBSZXZpc2lvbjogMTYwMjc0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZGY0ZjNjYzk3YWY2YWJk ZWFjNWJhMzU3NjgwYjFjYjMyZTQwZWZjZC4uZTU0YmUxMjhiNWYzOTI0ZDdjZTE4ZTBlYTJhNDYw NzYwYjNmOTk4NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDEzLTEyLTA4ICBHdXN0 YXZvIE5vcm9uaGEgU2lsdmEgIDxnbnNAZ25vbWUub3JnPgorCisgICAgICAgIFtTb3VwXSBTZW5k IG9yaWdpbmFsIGVuY29kZWQgZGF0YSBzaXplIHRvIGRpZFJlY2VpdmVCdWZmZXIKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyNTQxMAorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE5vIHRlc3RzLCB0aGUgb25s eSB3YXkgdG8gdGVzdCB0aGlzIHNlZW1zIHRvIGJlIHRocm91Z2ggdGhlIGluc3BlY3RvciBVSS4K KworICAgICAgICAqIHBsYXRmb3JtL25ldHdvcmsvUmVzb3VyY2VIYW5kbGUuaDoKKyAgICAgICAg KiBwbGF0Zm9ybS9uZXR3b3JrL1Jlc291cmNlSGFuZGxlSW50ZXJuYWwuaDoKKyAgICAgICAgKFdl YkNvcmU6OlJlc291cmNlSGFuZGxlSW50ZXJuYWw6OlJlc291cmNlSGFuZGxlSW50ZXJuYWwpOiBk YXRhIG1lbWJlciB0byB0cmFjayBzdHJlYW0KKyAgICAgICAgcG9zaXRpb24uCisgICAgICAgICog cGxhdGZvcm0vbmV0d29yay9zb3VwL1Jlc291cmNlSGFuZGxlU291cC5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpSZXNvdXJjZUhhbmRsZTo6Y3VycmVudFN0cmVhbVBvc2l0aW9uKTogb2J0YWlucyB0 aGUgY3VycmVudCBzdHJlYW0gcG9zaXRpb24gYnkgcXVlcnlpbmcKKyAgICAgICAgdGhlIGZpcnN0 IHNlZWthYmxlIGlucHV0IHN0cmVhbSB3ZSBmaW5kLgorICAgICAgICAoV2ViQ29yZTo6bmV4dE11 bHRpcGFydFJlc3BvbnNlUGFydENhbGxiYWNrKTogc3RvcmUgdGhlIHBvc2l0aW9uIGJlZm9yZSB3 ZSBzdGFydCByZWFkaW5nIGEgbmV3IHBhcnQuCisgICAgICAgIChXZWJDb3JlOjpzZW5kUmVxdWVz dENhbGxiYWNrKTogc3RvcmUgdGhlIHBvc2l0aW9uIGJlZm9yZSB3ZSBzdGFydCByZWFkaW5nIHRo ZSByZXNwb25zZSBib2R5LgorICAgICAgICAoV2ViQ29yZTo6cmVhZENhbGxiYWNrKTogcGFzcyB0 aGUgcG9zaXRpb24gZGVsdGEgdG8gZGlkUmVjZWl2ZURhdGEuCisKIDIwMTMtMTItMDcgIENoYW5n U2VvayBPaCAgPGNoYW5nc2Vvay5vaEBjb2xsYWJvcmEuY29tPgogCiAgICAgICAgIFVucmV2aWV3 ZWQuIEJ1aWxkIGZpeCBmb3IgZ3RrIHBvcnQgYWZ0ZXIgcjE2MDI2MC4KZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvUmVzb3VyY2VIYW5kbGUuaCBiL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvUmVzb3VyY2VIYW5kbGUuaAppbmRleCBmZjgwNjc0OWE2 MWIzNjZlN2FiZjgyNmI5NGIwMmM3NGQ4YWNiMDJhLi40YTA4NTU3OTcyZTA4OWYzY2RiZWFlMmRj N2MxN2ZkODgxMTA5NjMyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3 b3JrL1Jlc291cmNlSGFuZGxlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29y ay9SZXNvdXJjZUhhbmRsZS5oCkBAIC0xODAsNiArMTgwLDcgQEAgcHVibGljOgogICAgIHZvaWQg c2VuZFBlbmRpbmdSZXF1ZXN0KCk7CiAgICAgYm9vbCBjYW5jZWxsZWRPckNsaWVudGxlc3MoKTsK ICAgICB2b2lkIGVuc3VyZVJlYWRCdWZmZXIoKTsKKyAgICBzaXplX3QgY3VycmVudFN0cmVhbVBv c2l0aW9uKCkgY29uc3Q7CiAgICAgc3RhdGljIFNvdXBTZXNzaW9uKiBkZWZhdWx0U2Vzc2lvbigp OwogICAgIHN0YXRpYyBTb3VwU2Vzc2lvbiogY3JlYXRlVGVzdGluZ1Nlc3Npb24oKTsKICAgICBz dGF0aWMgU291cFNlc3Npb24qIGNyZWF0ZVByaXZhdGVCcm93c2luZ1Nlc3Npb24oKTsKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvUmVzb3VyY2VIYW5kbGVJbnRl cm5hbC5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9SZXNvdXJjZUhhbmRsZUlu dGVybmFsLmgKaW5kZXggNzVlMjI3YjY2NzI5ZTQwZmIyOTVjMTZhNWFlZTE1YjcwNWYwNzBkMi4u NjhmMmIwODViZmVjMTY4NmI3YWZiZmNmYTAwZjI3OWNkZDQyNWU1NiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9SZXNvdXJjZUhhbmRsZUludGVybmFsLmgKKysr IGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9SZXNvdXJjZUhhbmRsZUludGVybmFs LmgKQEAgLTExMSw2ICsxMTEsNyBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgICAgICAgICAs IG1fYm9keVNpemUoMCkKICAgICAgICAgICAgICwgbV9ib2R5RGF0YVNlbnQoMCkKICAgICAgICAg ICAgICwgbV9yZWRpcmVjdENvdW50KDApCisgICAgICAgICAgICAsIG1fcHJldmlvdXNQb3NpdGlv bigwKQogI2VuZGlmCiAjaWYgUExBVEZPUk0oTUFDKQogICAgICAgICAgICAgLCBtX3N0YXJ0V2hl blNjaGVkdWxlZChmYWxzZSkKQEAgLTIwMyw2ICsyMDQsNyBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7 CiAgICAgICAgIHVuc2lnbmVkIGxvbmcgbV9ib2R5RGF0YVNlbnQ7CiAgICAgICAgIFNvdXBTZXNz aW9uKiBzb3VwU2Vzc2lvbigpOwogICAgICAgICBpbnQgbV9yZWRpcmVjdENvdW50OworICAgICAg ICBzaXplX3QgbV9wcmV2aW91c1Bvc2l0aW9uOwogI2VuZGlmCiAjaWYgUExBVEZPUk0oR1RLKQog ICAgICAgICBzdHJ1Y3QgewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0 d29yay9zb3VwL1Jlc291cmNlSGFuZGxlU291cC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9uZXR3b3JrL3NvdXAvUmVzb3VyY2VIYW5kbGVTb3VwLmNwcAppbmRleCBjMzJiMDFjY2FiYTNk ZTIyMTY4Y2Y3MWI4YWU1MGE4ZmRkNWNjMmI0Li5jN2ZiYjg5NjVhNjAyMzRmNWNmNDM3ZDc1NTE4 YjdjNDc1MmUwOWMyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3Jr L3NvdXAvUmVzb3VyY2VIYW5kbGVTb3VwLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9uZXR3b3JrL3NvdXAvUmVzb3VyY2VIYW5kbGVTb3VwLmNwcApAQCAtNjAwLDYgKzYwMCwxNCBA QCBzdGF0aWMgYm9vbCBoYW5kbGVVbmlnbm9yZWRUTFNFcnJvcnMoUmVzb3VyY2VIYW5kbGUqIGhh bmRsZSkKICAgICByZXR1cm4gdHJ1ZTsKIH0KIAorc2l6ZV90IFJlc291cmNlSGFuZGxlOjpjdXJy ZW50U3RyZWFtUG9zaXRpb24oKSBjb25zdAoreworICAgIEdJbnB1dFN0cmVhbSogYmFzZVN0cmVh bSA9IGQtPm1faW5wdXRTdHJlYW0uZ2V0KCk7CisgICAgd2hpbGUgKCFHX0lTX1NFRUtBQkxFKGJh c2VTdHJlYW0pKQorICAgICAgICBiYXNlU3RyZWFtID0gZ19maWx0ZXJfaW5wdXRfc3RyZWFtX2dl dF9iYXNlX3N0cmVhbShHX0ZJTFRFUl9JTlBVVF9TVFJFQU0oYmFzZVN0cmVhbSkpOworICAgIHJl dHVybiBnX3NlZWthYmxlX3RlbGwoR19TRUVLQUJMRShiYXNlU3RyZWFtKSk7Cit9CisKIHN0YXRp YyB2b2lkIG5leHRNdWx0aXBhcnRSZXNwb25zZVBhcnRDYWxsYmFjayhHT2JqZWN0KiAvKnNvdXJj ZSovLCBHQXN5bmNSZXN1bHQqIHJlc3VsdCwgZ3BvaW50ZXIgZGF0YSkKIHsKICAgICBSZWZQdHI8 UmVzb3VyY2VIYW5kbGU+IGhhbmRsZSA9IHN0YXRpY19jYXN0PFJlc291cmNlSGFuZGxlKj4oZGF0 YSk7CkBAIC02MzgsNiArNjQ2LDggQEAgc3RhdGljIHZvaWQgbmV4dE11bHRpcGFydFJlc3BvbnNl UGFydENhbGxiYWNrKEdPYmplY3QqIC8qc291cmNlKi8sIEdBc3luY1Jlc3VsdCoKICAgICAgICAg cmV0dXJuOwogICAgIH0KIAorICAgIGQtPm1fcHJldmlvdXNQb3NpdGlvbiA9IGhhbmRsZS0+Y3Vy cmVudFN0cmVhbVBvc2l0aW9uKCk7CisKICAgICBoYW5kbGUtPmVuc3VyZVJlYWRCdWZmZXIoKTsK ICAgICBnX2lucHV0X3N0cmVhbV9yZWFkX2FzeW5jKGQtPm1faW5wdXRTdHJlYW0uZ2V0KCksIGQt Pm1fcmVhZEJ1ZmZlclB0ciwgZC0+bV9yZWFkQnVmZmVyU2l6ZSwKICAgICAgICAgR19QUklPUklU WV9ERUZBVUxULCBkLT5tX2NhbmNlbGxhYmxlLmdldCgpLCByZWFkQ2FsbGJhY2ssIGhhbmRsZS5n ZXQoKSk7CkBAIC03MTQsNiArNzI0LDggQEAgc3RhdGljIHZvaWQgc2VuZFJlcXVlc3RDYWxsYmFj ayhHT2JqZWN0KiwgR0FzeW5jUmVzdWx0KiByZXN1bHQsIGdwb2ludGVyIGRhdGEpCiAKICAgICBk LT5tX2lucHV0U3RyZWFtID0gaW5wdXRTdHJlYW07CiAKKyAgICBkLT5tX3ByZXZpb3VzUG9zaXRp b24gPSBoYW5kbGUtPmN1cnJlbnRTdHJlYW1Qb3NpdGlvbigpOworCiAgICAgaGFuZGxlLT5lbnN1 cmVSZWFkQnVmZmVyKCk7CiAgICAgZ19pbnB1dF9zdHJlYW1fcmVhZF9hc3luYyhkLT5tX2lucHV0 U3RyZWFtLmdldCgpLCBkLT5tX3JlYWRCdWZmZXJQdHIsIGQtPm1fcmVhZEJ1ZmZlclNpemUsCiAg ICAgICAgIEdfUFJJT1JJVFlfREVGQVVMVCwgZC0+bV9jYW5jZWxsYWJsZS5nZXQoKSwgcmVhZENh bGxiYWNrLCBoYW5kbGUuZ2V0KCkpOwpAQCAtMTMzMiw3ICsxMzQ0LDExIEBAIHN0YXRpYyB2b2lk IHJlYWRDYWxsYmFjayhHT2JqZWN0KiwgR0FzeW5jUmVzdWx0KiBhc3luY1Jlc3VsdCwgZ3BvaW50 ZXIgZGF0YSkKICAgICAvLyBJdCdzIG1hbmRhdG9yeSB0byBoYXZlIHNlbnQgYSByZXNwb25zZSBi ZWZvcmUgc2VuZGluZyBkYXRhCiAgICAgQVNTRVJUKCFkLT5tX3Jlc3BvbnNlLmlzTnVsbCgpKTsK IAotICAgIGhhbmRsZS0+Y2xpZW50KCktPmRpZFJlY2VpdmVEYXRhKGhhbmRsZS5nZXQoKSwgZC0+ bV9yZWFkQnVmZmVyUHRyLCBieXRlc1JlYWQsIGJ5dGVzUmVhZCk7CisgICAgc2l6ZV90IGN1cnJl bnRQb3NpdGlvbiA9IGhhbmRsZS0+Y3VycmVudFN0cmVhbVBvc2l0aW9uKCk7CisKKyAgICBoYW5k bGUtPmNsaWVudCgpLT5kaWRSZWNlaXZlRGF0YShoYW5kbGUuZ2V0KCksIGQtPm1fcmVhZEJ1ZmZl clB0ciwgYnl0ZXNSZWFkLCBjdXJyZW50UG9zaXRpb24gLSBkLT5tX3ByZXZpb3VzUG9zaXRpb24p OworCisgICAgZC0+bV9wcmV2aW91c1Bvc2l0aW9uID0gY3VycmVudFBvc2l0aW9uOwogCiAgICAg Ly8gZGlkUmVjZWl2ZURhdGEgbWF5IGNhbmNlbCB0aGUgbG9hZCwgd2hpY2ggbWF5IHJlbGVhc2Ug dGhlIGxhc3QgcmVmZXJlbmNlLgogICAgIGlmIChoYW5kbGUtPmNhbmNlbGxlZE9yQ2xpZW50bGVz cygpKSB7Cg== 218778 2013-12-09 11:01:59 -0800 2013-12-09 11:26:49 -0800 Patch bug-125410-20131209200158.patch text/plain 5994 gustavo U3VidmVyc2lvbiBSZXZpc2lvbjogMTYwMzEyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzFkZTc4MWQ4ZTcyNTFh MjdmODYwZTJmMTcwNjdkN2VjZWY1MTUxOC4uNDA2YzNkMTY0OWI5YTI5NTUxZjFjMTllMzI1YTYw MjM0NmZmZGU0NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDEzLTEyLTA5ICBHdXN0 YXZvIE5vcm9uaGEgU2lsdmEgIDxnbnNAZ25vbWUub3JnPgorCisgICAgICAgIFtTb3VwXSBTZW5k IG9yaWdpbmFsIGVuY29kZWQgZGF0YSBzaXplIHRvIGRpZFJlY2VpdmVCdWZmZXIKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyNTQxMAorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE5vIHRlc3RzLCB0aGUgb25s eSB3YXkgdG8gdGVzdCB0aGlzIHNlZW1zIHRvIGJlIHRocm91Z2ggdGhlIGluc3BlY3RvciBVSS4K KworICAgICAgICAqIHBsYXRmb3JtL25ldHdvcmsvUmVzb3VyY2VIYW5kbGUuaDoKKyAgICAgICAg KiBwbGF0Zm9ybS9uZXR3b3JrL1Jlc291cmNlSGFuZGxlSW50ZXJuYWwuaDoKKyAgICAgICAgKFdl YkNvcmU6OlJlc291cmNlSGFuZGxlSW50ZXJuYWw6OlJlc291cmNlSGFuZGxlSW50ZXJuYWwpOiBk YXRhIG1lbWJlciB0byB0cmFjayBzdHJlYW0KKyAgICAgICAgcG9zaXRpb24uCisgICAgICAgICog cGxhdGZvcm0vbmV0d29yay9zb3VwL1Jlc291cmNlSGFuZGxlU291cC5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpSZXNvdXJjZUhhbmRsZTo6Y3VycmVudFN0cmVhbVBvc2l0aW9uKTogb2J0YWlucyB0 aGUgY3VycmVudCBzdHJlYW0gcG9zaXRpb24gYnkgcXVlcnlpbmcKKyAgICAgICAgdGhlIGZpcnN0 IHNlZWthYmxlIGlucHV0IHN0cmVhbSB3ZSBmaW5kLgorICAgICAgICAoV2ViQ29yZTo6bmV4dE11 bHRpcGFydFJlc3BvbnNlUGFydENhbGxiYWNrKTogc3RvcmUgdGhlIHBvc2l0aW9uIGJlZm9yZSB3 ZSBzdGFydCByZWFkaW5nIGEgbmV3IHBhcnQuCisgICAgICAgIChXZWJDb3JlOjpzZW5kUmVxdWVz dENhbGxiYWNrKTogc3RvcmUgdGhlIHBvc2l0aW9uIGJlZm9yZSB3ZSBzdGFydCByZWFkaW5nIHRo ZSByZXNwb25zZSBib2R5LgorICAgICAgICAoV2ViQ29yZTo6cmVhZENhbGxiYWNrKTogcGFzcyB0 aGUgcG9zaXRpb24gZGVsdGEgdG8gZGlkUmVjZWl2ZURhdGEuCisKIDIwMTMtMTItMDkgIEJyZW5k YW4gTG9uZyAgPGIubG9uZ0BjYWJsZWxhYnMuY29tPgogCiAgICAgICAgIFtHU3RyZWFtZXJdIE1l bW9yeSBsZWFrIGR1ZSB0byBpbmNvcnJlY3QgdXNlIG9mIGdzdF90YWdfbGlzdF9tZXJnZSBpbiBU ZXh0Q29tYmluZXJHU3RyZWFtZXIKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L25ldHdvcmsvUmVzb3VyY2VIYW5kbGUuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdv cmsvUmVzb3VyY2VIYW5kbGUuaAppbmRleCBmZjgwNjc0OWE2MWIzNjZlN2FiZjgyNmI5NGIwMmM3 NGQ4YWNiMDJhLi40YTA4NTU3OTcyZTA4OWYzY2RiZWFlMmRjN2MxN2ZkODgxMTA5NjMyIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL1Jlc291cmNlSGFuZGxlLmgK KysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9SZXNvdXJjZUhhbmRsZS5oCkBA IC0xODAsNiArMTgwLDcgQEAgcHVibGljOgogICAgIHZvaWQgc2VuZFBlbmRpbmdSZXF1ZXN0KCk7 CiAgICAgYm9vbCBjYW5jZWxsZWRPckNsaWVudGxlc3MoKTsKICAgICB2b2lkIGVuc3VyZVJlYWRC dWZmZXIoKTsKKyAgICBzaXplX3QgY3VycmVudFN0cmVhbVBvc2l0aW9uKCkgY29uc3Q7CiAgICAg c3RhdGljIFNvdXBTZXNzaW9uKiBkZWZhdWx0U2Vzc2lvbigpOwogICAgIHN0YXRpYyBTb3VwU2Vz c2lvbiogY3JlYXRlVGVzdGluZ1Nlc3Npb24oKTsKICAgICBzdGF0aWMgU291cFNlc3Npb24qIGNy ZWF0ZVByaXZhdGVCcm93c2luZ1Nlc3Npb24oKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL25ldHdvcmsvUmVzb3VyY2VIYW5kbGVJbnRlcm5hbC5oIGIvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vbmV0d29yay9SZXNvdXJjZUhhbmRsZUludGVybmFsLmgKaW5kZXggMzYxY2Rh YThmNzFmYmVlNjk1NWExNjViN2UwMTA0YmNjOGQ3NTJjNi4uMzhiYTY2MzZhYTAxZGRlMDBmNTY2 YjFlYThjYTlhMmZlNzA1ZDY0NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v bmV0d29yay9SZXNvdXJjZUhhbmRsZUludGVybmFsLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vbmV0d29yay9SZXNvdXJjZUhhbmRsZUludGVybmFsLmgKQEAgLTEwOSw2ICsxMDksNyBA QCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgICAgICAgICAsIG1fYm9keVNpemUoMCkKICAgICAg ICAgICAgICwgbV9ib2R5RGF0YVNlbnQoMCkKICAgICAgICAgICAgICwgbV9yZWRpcmVjdENvdW50 KDApCisgICAgICAgICAgICAsIG1fcHJldmlvdXNQb3NpdGlvbigwKQogI2VuZGlmCiAjaWYgUExB VEZPUk0oTUFDKQogICAgICAgICAgICAgLCBtX3N0YXJ0V2hlblNjaGVkdWxlZChmYWxzZSkKQEAg LTE5OSw2ICsyMDAsNyBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgICAgIHVuc2lnbmVkIGxv bmcgbV9ib2R5RGF0YVNlbnQ7CiAgICAgICAgIFNvdXBTZXNzaW9uKiBzb3VwU2Vzc2lvbigpOwog ICAgICAgICBpbnQgbV9yZWRpcmVjdENvdW50OworICAgICAgICBzaXplX3QgbV9wcmV2aW91c1Bv c2l0aW9uOwogI2VuZGlmCiAjaWYgUExBVEZPUk0oR1RLKQogICAgICAgICBzdHJ1Y3QgewpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9zb3VwL1Jlc291cmNlSGFu ZGxlU291cC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL3NvdXAvUmVzb3Vy Y2VIYW5kbGVTb3VwLmNwcAppbmRleCBiNDgwMDQ0ODZiZTQyYmU5OTg0N2VlMWJkMGIyMTY1Yjg1 Y2FlMDYyLi5lM2I0NmY1MzVkNTdmMTQ4YjE5Yzg1MmUwOTU0MTNjMTBkZWNhZmE3IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL3NvdXAvUmVzb3VyY2VIYW5kbGVT b3VwLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL3NvdXAvUmVzb3Vy Y2VIYW5kbGVTb3VwLmNwcApAQCAtNjA2LDYgKzYwNiwyMSBAQCBzdGF0aWMgYm9vbCBoYW5kbGVV bmlnbm9yZWRUTFNFcnJvcnMoUmVzb3VyY2VIYW5kbGUqIGhhbmRsZSkKICAgICByZXR1cm4gdHJ1 ZTsKIH0KIAorc2l6ZV90IFJlc291cmNlSGFuZGxlOjpjdXJyZW50U3RyZWFtUG9zaXRpb24oKSBj b25zdAoreworICAgIEdJbnB1dFN0cmVhbSogYmFzZVN0cmVhbSA9IGQtPm1faW5wdXRTdHJlYW0u Z2V0KCk7CisgICAgd2hpbGUgKCFHX0lTX1NFRUtBQkxFKGJhc2VTdHJlYW0pKSB7CisgICAgICAg IGlmICghR19JU19GSUxURVJfSU5QVVRfU1RSRUFNKGJhc2VTdHJlYW0pKQorICAgICAgICAgICAg YnJlYWs7CisgICAgICAgIGJhc2VTdHJlYW0gPSBnX2ZpbHRlcl9pbnB1dF9zdHJlYW1fZ2V0X2Jh c2Vfc3RyZWFtKEdfRklMVEVSX0lOUFVUX1NUUkVBTShiYXNlU3RyZWFtKSk7CisgICAgfQorCisg ICAgaWYgKCFHX0lTX1NFRUtBQkxFKGJhc2VTdHJlYW0pKQorICAgICAgICByZXR1cm4gMDsKKwor ICAgIHJldHVybiBnX3NlZWthYmxlX3RlbGwoR19TRUVLQUJMRShiYXNlU3RyZWFtKSk7Cit9CisK IHN0YXRpYyB2b2lkIG5leHRNdWx0aXBhcnRSZXNwb25zZVBhcnRDYWxsYmFjayhHT2JqZWN0KiAv KnNvdXJjZSovLCBHQXN5bmNSZXN1bHQqIHJlc3VsdCwgZ3BvaW50ZXIgZGF0YSkKIHsKICAgICBS ZWZQdHI8UmVzb3VyY2VIYW5kbGU+IGhhbmRsZSA9IHN0YXRpY19jYXN0PFJlc291cmNlSGFuZGxl Kj4oZGF0YSk7CkBAIC02NDQsNiArNjU5LDggQEAgc3RhdGljIHZvaWQgbmV4dE11bHRpcGFydFJl c3BvbnNlUGFydENhbGxiYWNrKEdPYmplY3QqIC8qc291cmNlKi8sIEdBc3luY1Jlc3VsdCoKICAg ICAgICAgcmV0dXJuOwogICAgIH0KIAorICAgIGQtPm1fcHJldmlvdXNQb3NpdGlvbiA9IGhhbmRs ZS0+Y3VycmVudFN0cmVhbVBvc2l0aW9uKCk7CisKICAgICBoYW5kbGUtPmVuc3VyZVJlYWRCdWZm ZXIoKTsKICAgICBnX2lucHV0X3N0cmVhbV9yZWFkX2FzeW5jKGQtPm1faW5wdXRTdHJlYW0uZ2V0 KCksIGNvbnN0X2Nhc3Q8Y2hhcio+KGQtPm1fc291cEJ1ZmZlci0+ZGF0YSksIGQtPm1fc291cEJ1 ZmZlci0+bGVuZ3RoLAogICAgICAgICBHX1BSSU9SSVRZX0RFRkFVTFQsIGQtPm1fY2FuY2VsbGFi bGUuZ2V0KCksIHJlYWRDYWxsYmFjaywgaGFuZGxlLmdldCgpKTsKQEAgLTcxOCw2ICs3MzUsOCBA QCBzdGF0aWMgdm9pZCBzZW5kUmVxdWVzdENhbGxiYWNrKEdPYmplY3QqLCBHQXN5bmNSZXN1bHQq IHJlc3VsdCwgZ3BvaW50ZXIgZGF0YSkKIAogICAgIGQtPm1faW5wdXRTdHJlYW0gPSBpbnB1dFN0 cmVhbTsKIAorICAgIGQtPm1fcHJldmlvdXNQb3NpdGlvbiA9IGhhbmRsZS0+Y3VycmVudFN0cmVh bVBvc2l0aW9uKCk7CisKICAgICBoYW5kbGUtPmVuc3VyZVJlYWRCdWZmZXIoKTsKICAgICBnX2lu cHV0X3N0cmVhbV9yZWFkX2FzeW5jKGQtPm1faW5wdXRTdHJlYW0uZ2V0KCksIGNvbnN0X2Nhc3Q8 Y2hhcio+KGQtPm1fc291cEJ1ZmZlci0+ZGF0YSksIGQtPm1fc291cEJ1ZmZlci0+bGVuZ3RoLAog ICAgICAgICBHX1BSSU9SSVRZX0RFRkFVTFQsIGQtPm1fY2FuY2VsbGFibGUuZ2V0KCksIHJlYWRD YWxsYmFjaywgaGFuZGxlLmdldCgpKTsKQEAgLTEzMzYsMTEgKzEzNTUsMTQgQEAgc3RhdGljIHZv aWQgcmVhZENhbGxiYWNrKEdPYmplY3QqLCBHQXN5bmNSZXN1bHQqIGFzeW5jUmVzdWx0LCBncG9p bnRlciBkYXRhKQogICAgIC8vIEl0J3MgbWFuZGF0b3J5IHRvIGhhdmUgc2VudCBhIHJlc3BvbnNl IGJlZm9yZSBzZW5kaW5nIGRhdGEKICAgICBBU1NFUlQoIWQtPm1fcmVzcG9uc2UuaXNOdWxsKCkp OwogCi0gICAgLy8gRklYTUU6IFdlIHNob3VsZCBzZW5kIHRoZSBlbmNvZGVkIGRhdGEgc2l6ZSBo ZXJlIGFuZCBub3QgdGhlIGRlY29kZWQgc2l6ZQotICAgIC8vIFNlZSBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTI1NDEwCisgICAgc2l6ZV90IGN1cnJlbnRQb3NpdGlv biA9IGhhbmRsZS0+Y3VycmVudFN0cmVhbVBvc2l0aW9uKCk7CisgICAgc2l6ZV90IGVuY29kZWRE YXRhTGVuZ3RoID0gY3VycmVudFBvc2l0aW9uID8gY3VycmVudFBvc2l0aW9uIC0gZC0+bV9wcmV2 aW91c1Bvc2l0aW9uIDogYnl0ZXNSZWFkOworCiAgICAgQVNTRVJUKGQtPm1fc291cEJ1ZmZlcik7 CiAgICAgZC0+bV9zb3VwQnVmZmVyLT5sZW5ndGggPSBieXRlc1JlYWQ7IC8vIFRoZSBidWZmZXIg bWlnaHQgYmUgbGFyZ2VyIHRoYW4gdGhlIG51bWJlciBvZiBieXRlcyByZWFkLiBTaGFyZWRCdWZm ZXIgbG9va3MgYXQgdGhlIGxlbmd0aCBwcm9wZXJ0eS4KLSAgICBoYW5kbGUtPmNsaWVudCgpLT5k aWRSZWNlaXZlQnVmZmVyKGhhbmRsZS5nZXQoKSwgU2hhcmVkQnVmZmVyOjp3cmFwU291cEJ1ZmZl cihkLT5tX3NvdXBCdWZmZXIucmVsZWFzZSgpKSwgYnl0ZXNSZWFkKTsKKyAgICBoYW5kbGUtPmNs aWVudCgpLT5kaWRSZWNlaXZlQnVmZmVyKGhhbmRsZS5nZXQoKSwgU2hhcmVkQnVmZmVyOjp3cmFw U291cEJ1ZmZlcihkLT5tX3NvdXBCdWZmZXIucmVsZWFzZSgpKSwgZW5jb2RlZERhdGFMZW5ndGgp OworCisgICAgZC0+bV9wcmV2aW91c1Bvc2l0aW9uID0gY3VycmVudFBvc2l0aW9uOwogCiAgICAg Ly8gZGlkUmVjZWl2ZUJ1ZmZlciBtYXkgY2FuY2VsIHRoZSBsb2FkLCB3aGljaCBtYXkgcmVsZWFz ZSB0aGUgbGFzdCByZWZlcmVuY2UuCiAgICAgaWYgKGhhbmRsZS0+Y2FuY2VsbGVkT3JDbGllbnRs ZXNzKCkpIHsK