26982 2009-07-05 12:25:17 -0700 Use soup's content sniffing 2009-07-13 12:12:48 -0700 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) PC All RESOLVED FIXED Gtk, Soup P2 Normal --- 1 gustavo webkit-unassigned ht990332 jmalonzo oldest_to_newest 129875 0 gustavo 2009-07-05 12:25:17 -0700 Now that soup has a content sniffing feature, we should use it instead of our own limited implementation. 129877 1 32279 gustavo 2009-07-05 12:32:10 -0700 Created attachment 32279 Use soup's content sniffing WebCore/ChangeLog | 21 ++++++++ WebCore/platform/network/ResourceHandleInternal.h | 1 - .../platform/network/soup/ResourceHandleSoup.cpp | 54 ++++++++++--------- WebKit/gtk/ChangeLog | 12 ++++ WebKit/gtk/webkit/webkitprivate.cpp | 5 ++ 5 files changed, 66 insertions(+), 27 deletions(-) 129921 2 32279 gustavo 2009-07-06 04:02:49 -0700 Comment on attachment 32279 Use soup's content sniffing TODO: depend on 2.27.3 libsoup, when it is released =P. 129929 3 32279 jmalonzo 2009-07-06 04:47:33 -0700 Comment on attachment 32279 Use soup's content sniffing > - , m_reportedHeaders(false) Please don't forget to remove m_reportedHeaders decl too. > +static void contentSniffedCallback(SoupMessage* msg, const char* sniffedType, GHashTable *params, gpointer data) > +{ > + if (sniffedType) { > + const char* officialType = soup_message_headers_get_one(msg->response_headers, "Content-Type"); > + > + if (!officialType || strcmp(officialType, sniffedType)) > + soup_message_headers_set_content_type(msg->response_headers, sniffedType, params); > + } Ok. r=me. 129930 4 jmalonzo 2009-07-06 05:04:51 -0700 (In reply to comment #3) > (From update of attachment 32279 [details]) > > - , m_reportedHeaders(false) > > Please don't forget to remove m_reportedHeaders decl too. > > > +static void contentSniffedCallback(SoupMessage* msg, const char* sniffedType, GHashTable *params, gpointer data) > > +{ > > + if (sniffedType) { > > + const char* officialType = soup_message_headers_get_one(msg->response_headers, "Content-Type"); > > + > > + if (!officialType || strcmp(officialType, sniffedType)) > > + soup_message_headers_set_content_type(msg->response_headers, sniffedType, params); > > + } > > Ok. r=me. FYI, this regressed three XHR tests (Debian amd64, unstable, ToT + this patch) Running tests from /home/jmalonzo/OpenSource/WebKit/LayoutTests Testing 77 test cases. http/tests/xmlhttprequest ........ http/tests/xmlhttprequest/access-control-basic-allow-preflight-cache.html -> failed ............ http/tests/xmlhttprequest/cache-override.html -> failed ........................................... http/tests/xmlhttprequest/small-chunks-response-text.html -> failed .. http/tests/xmlhttprequest/web-apps ........... http/tests/xmlhttprequest/workers . 29.21s total testing time 74 test cases (96%) succeeded 3 test cases (3%) had incorrect layout 1 test case (1%) had stderr output zsh: exit 1 WEBKITOUTPUTDIR=~/OpenSource/WebKit/build --gtk --http --no-new-test-results 129960 5 gustavo 2009-07-06 09:34:51 -0700 Landed in r45558. (In reply to comment #4) > FYI, this regressed three XHR tests (Debian amd64, unstable, ToT + this patch) I'll take a look at this issue, I'm not sure what's going on, but it should be fixed before we release a version. We also need to require soup 2.27.3, like I said. I'll leave this bug open to track those. 129966 6 gustavo 2009-07-06 10:40:32 -0700 The regressions seem to be caused by a bug in soup. I reported my investigation there, and intend to fix the problem there: http://bugzilla.gnome.org/show_bug.cgi?id=587907 129983 7 32279 eric 2009-07-06 13:22:08 -0700 Comment on attachment 32279 Use soup's content sniffing This was landed, clearing flag. 130847 8 jmalonzo 2009-07-09 23:50:07 -0700 (In reply to comment #6) > The regressions seem to be caused by a bug in soup. I reported my investigation > there, and intend to fix the problem there: > http://bugzilla.gnome.org/show_bug.cgi?id=587907 Raised https://bugs.webkit.org/show_bug.cgi?id=27143 for the regression. Bug fixed in http://trac.webkit.org/changeset/45558. 131176 9 ht990332 2009-07-12 10:12:15 -0700 This change makes it fail to build with libsoup 2.26.x If 2.27.3 is the minimal dependency, should the configure script complain if I have 2.26 installed? 131372 10 gustavo 2009-07-13 12:12:48 -0700 (In reply to comment #9) > This change makes it fail to build with libsoup 2.26.x > If 2.27.3 is the minimal dependency, should the configure script complain if I > have 2.26 installed? The minimal dependency is 2.27.4 (danw decided to skip 2.27.3 to sync up with GNOME release numbering). The configure script was not complaining because libsoup had not yet updated its release numbering, so we couldn't check for it. 32279 2009-07-05 12:32:10 -0700 2009-07-06 13:22:08 -0700 Use soup's content sniffing Use-soup-s-content-sniffing.patch text/plain 7347 gustavo MWY1NTBmMmYyY2ZiNzJhN2QwZjc5Y2YwYzQ5MDg1NzM1ZDBlN2JmMwpkaWZmIC0tZ2l0IGEvV2Vi Q29yZS9DaGFuZ2VMb2cgYi9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCAwODQ5ZmMyLi44YWFmOGY1 IDEwMDY0NAotLS0gYS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9XZWJDb3JlL0NoYW5nZUxvZwpA QCAtMSwzICsxLDI0IEBACisyMDA5LTA3LTA1ICBHdXN0YXZvIE5vcm9uaGEgU2lsdmEgIDxndXN0 YXZvLm5vcm9uaGFAY29sbGFib3JhLmNvLnVrPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFVzZSBzb3VwJ3MgY29udGVudCBzbmlmZmluZworICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjY5ODIKKworICAgICAg ICBEcm9wIG91ciBoYWNraXNoIGNvbnRlbnQgc25pZmZpbmcgY29kZSwgYW5kIHVzZSB0aGUgbmV3 IGxpYnNvdXAKKyAgICAgICAgZmVhdHVyZSB0byBkbyB0aGF0IGpvYiBmb3IgdXMuCisKKyAgICAg ICAgVGVzdGluZyB0aGlzIGlzIGluIGEgY3Jvc3MtcGxhdGZvcm0gd2F5IGlzIG5vdCBvYnZpb3Vz IG9yIHBvc3NpYmxlCisgICAgICAgIHdoaWxlIHdlIGFyZSB1c2luZyBwbGF0Zm9ybS1zcGVjaWZp YyBjb2RlIGZvciBzbmlmZmluZy4KKworICAgICAgICAqIHBsYXRmb3JtL25ldHdvcmsvUmVzb3Vy Y2VIYW5kbGVJbnRlcm5hbC5oOgorICAgICAgICAoV2ViQ29yZTo6UmVzb3VyY2VIYW5kbGVJbnRl cm5hbDo6UmVzb3VyY2VIYW5kbGVJbnRlcm5hbCk6CisgICAgICAgICogcGxhdGZvcm0vbmV0d29y ay9zb3VwL1Jlc291cmNlSGFuZGxlU291cC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpnb3RIZWFk ZXJzQ2FsbGJhY2spOgorICAgICAgICAoV2ViQ29yZTo6Y29udGVudFNuaWZmZWRDYWxsYmFjayk6 CisgICAgICAgIChXZWJDb3JlOjpnb3RDaHVua0NhbGxiYWNrKToKKyAgICAgICAgKFdlYkNvcmU6 OlJlc291cmNlSGFuZGxlOjpzdGFydEh0dHApOgorCiAyMDA5LTA3LTAzICBEYXJpbiBBZGxlciAg PGRhcmluQGFwcGxlLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBBZGVsZSBQZXRlcnNvbi4K ZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9SZXNvdXJjZUhhbmRsZUludGVy bmFsLmggYi9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvUmVzb3VyY2VIYW5kbGVJbnRlcm5hbC5o CmluZGV4IDhiMGY0NzYuLmQ1MjRiYTUgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGxhdGZvcm0vbmV0 d29yay9SZXNvdXJjZUhhbmRsZUludGVybmFsLmgKKysrIGIvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3 b3JrL1Jlc291cmNlSGFuZGxlSW50ZXJuYWwuaApAQCAtMTExLDcgKzExMSw2IEBAIG5hbWVzcGFj ZSBXZWJDb3JlIHsKICNpZiBVU0UoU09VUCkKICAgICAgICAgICAgICwgbV9tc2coMCkKICAgICAg ICAgICAgICwgbV9jYW5jZWxsZWQoZmFsc2UpCi0gICAgICAgICAgICAsIG1fcmVwb3J0ZWRIZWFk ZXJzKGZhbHNlKQogICAgICAgICAgICAgLCBtX2dmaWxlKDApCiAgICAgICAgICAgICAsIG1faW5w dXRTdHJlYW0oMCkKICAgICAgICAgICAgICwgbV9jYW5jZWxsYWJsZSgwKQpkaWZmIC0tZ2l0IGEv V2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL3NvdXAvUmVzb3VyY2VIYW5kbGVTb3VwLmNwcCBiL1dl YkNvcmUvcGxhdGZvcm0vbmV0d29yay9zb3VwL1Jlc291cmNlSGFuZGxlU291cC5jcHAKaW5kZXgg NmJlMTNlMi4uZjU4YmZhZSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL3Nv dXAvUmVzb3VyY2VIYW5kbGVTb3VwLmNwcAorKysgYi9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsv c291cC9SZXNvdXJjZUhhbmRsZVNvdXAuY3BwCkBAIC0yNDIsMjEgKzI0MiwzOCBAQCBzdGF0aWMg dm9pZCBnb3RIZWFkZXJzQ2FsbGJhY2soU291cE1lc3NhZ2UqIG1zZywgZ3BvaW50ZXIgZGF0YSkK ICAgICAvLyB3ZSBnb3QsIHdoZW4gd2UgZmluaXNoIGRvd25sb2FkaW5nLgogICAgIHNvdXBfbWVz c2FnZV9ib2R5X3NldF9hY2N1bXVsYXRlKG1zZy0+cmVzcG9uc2VfYm9keSwgRkFMU0UpOwogCisg ICAgaWYgKG1zZy0+c3RhdHVzX2NvZGUgPT0gU09VUF9TVEFUVVNfTk9UX01PRElGSUVEKSB7Cisg ICAgICAgIFJlZlB0cjxSZXNvdXJjZUhhbmRsZT4gaGFuZGxlID0gc3RhdGljX2Nhc3Q8UmVzb3Vy Y2VIYW5kbGUqPihkYXRhKTsKKyAgICAgICAgaWYgKCFoYW5kbGUpCisgICAgICAgICAgICByZXR1 cm47CisgICAgICAgIFJlc291cmNlSGFuZGxlSW50ZXJuYWwqIGQgPSBoYW5kbGUtPmdldEludGVy bmFsKCk7CisgICAgICAgIGlmIChkLT5tX2NhbmNlbGxlZCkKKyAgICAgICAgICAgIHJldHVybjsK KyAgICAgICAgUmVzb3VyY2VIYW5kbGVDbGllbnQqIGNsaWVudCA9IGhhbmRsZS0+Y2xpZW50KCk7 CisgICAgICAgIGlmICghY2xpZW50KQorICAgICAgICAgICAgcmV0dXJuOworCisgICAgICAgIGZp bGxSZXNwb25zZUZyb21NZXNzYWdlKG1zZywgJmQtPm1fcmVzcG9uc2UpOworICAgICAgICBjbGll bnQtPmRpZFJlY2VpdmVSZXNwb25zZShoYW5kbGUuZ2V0KCksIGQtPm1fcmVzcG9uc2UpOworICAg IH0KK30KKworc3RhdGljIHZvaWQgY29udGVudFNuaWZmZWRDYWxsYmFjayhTb3VwTWVzc2FnZSog bXNnLCBjb25zdCBjaGFyKiBzbmlmZmVkVHlwZSwgR0hhc2hUYWJsZSAqcGFyYW1zLCBncG9pbnRl ciBkYXRhKQoreworICAgIGlmIChzbmlmZmVkVHlwZSkgeworICAgICAgICBjb25zdCBjaGFyKiBv ZmZpY2lhbFR5cGUgPSBzb3VwX21lc3NhZ2VfaGVhZGVyc19nZXRfb25lKG1zZy0+cmVzcG9uc2Vf aGVhZGVycywgIkNvbnRlbnQtVHlwZSIpOworCisgICAgICAgIGlmICghb2ZmaWNpYWxUeXBlIHx8 IHN0cmNtcChvZmZpY2lhbFR5cGUsIHNuaWZmZWRUeXBlKSkKKyAgICAgICAgICAgIHNvdXBfbWVz c2FnZV9oZWFkZXJzX3NldF9jb250ZW50X3R5cGUobXNnLT5yZXNwb25zZV9oZWFkZXJzLCBzbmlm ZmVkVHlwZSwgcGFyYW1zKTsKKyAgICB9CisKICAgICAvLyBUaGUgMzA0IHN0YXR1cyBjb2RlIChT T1VQX1NUQVRVU19OT1RfTU9ESUZJRUQpIG5lZWRzIHRvIGJlIGZlZAogICAgIC8vIGludG8gV2Vi Q29yZSwgYXMgb3Bwb3NlZCB0byBvdGhlciBraW5kcyBvZiByZWRpcmVjdGlvbnMsIHdoaWNoCiAg ICAgLy8gYXJlIGhhbmRsZWQgYnkgc291cCBkaXJlY3RseSwgc28gd2Ugc3BlY2lhbC1jYXNlIGl0 IGhlcmUgYW5kIGluCiAgICAgLy8gZ290Q2h1bmsuCiAgICAgaWYgKFNPVVBfU1RBVFVTX0lTX1RS QU5TUE9SVF9FUlJPUihtc2ctPnN0YXR1c19jb2RlKQotICAgICAgICB8fCAoU09VUF9TVEFUVVNf SVNfUkVESVJFQ1RJT04obXNnLT5zdGF0dXNfY29kZSkgJiYgKG1zZy0+c3RhdHVzX2NvZGUgIT0g U09VUF9TVEFUVVNfTk9UX01PRElGSUVEKSkpCi0gICAgICAgIHJldHVybjsKLQotICAgIC8vIFdl IHN0aWxsIGRvbid0IGtub3cgYW55dGhpbmcgYWJvdXQgQ29udGVudC1UeXBlLCBzbyB3ZSB3aWxs IHRyeQotICAgIC8vIHNuaWZmaW5nIHRoZSBjb250ZW50cyBvZiB0aGUgZmlsZSwgYW5kIHRoZW4g cmVwb3J0IHRoYXQgd2UgZ290Ci0gICAgLy8gaGVhZGVyczsgd2Ugd2lsbCBub3QgZG8gY29udGVu dCBzbmlmZmluZyBmb3IgMzA0IHJlc3BvbnNlcywKLSAgICAvLyB0aG91Z2gsIHNpbmNlIHRoZXkg ZG8gbm90IGhhdmUgYSBib2R5LgotICAgIGNvbnN0IGNoYXIqIGNvbnRlbnRUeXBlID0gc291cF9t ZXNzYWdlX2hlYWRlcnNfZ2V0X2NvbnRlbnRfdHlwZShtc2ctPnJlc3BvbnNlX2hlYWRlcnMsIE5V TEwpOwotICAgIGlmICgobXNnLT5zdGF0dXNfY29kZSAhPSBTT1VQX1NUQVRVU19OT1RfTU9ESUZJ RUQpCi0gICAgICAgICYmICghY29udGVudFR5cGUgfHwgIWdfYXNjaWlfc3RyY2FzZWNtcChjb250 ZW50VHlwZSwgInRleHQvcGxhaW4iKSkpCisgICAgICAgIHx8IChTT1VQX1NUQVRVU19JU19SRURJ UkVDVElPTihtc2ctPnN0YXR1c19jb2RlKSAmJiAobXNnLT5zdGF0dXNfY29kZSAhPSBTT1VQX1NU QVRVU19OT1RfTU9ESUZJRUQpKQorICAgICAgICB8fCAobXNnLT5zdGF0dXNfY29kZSA9PSBTT1VQ X1NUQVRVU19VTkFVVEhPUklaRUQpKQogICAgICAgICByZXR1cm47CiAKICAgICBSZWZQdHI8UmVz b3VyY2VIYW5kbGU+IGhhbmRsZSA9IHN0YXRpY19jYXN0PFJlc291cmNlSGFuZGxlKj4oZGF0YSk7 CkBAIC0yNzAsNyArMjg3LDYgQEAgc3RhdGljIHZvaWQgZ290SGVhZGVyc0NhbGxiYWNrKFNvdXBN ZXNzYWdlKiBtc2csIGdwb2ludGVyIGRhdGEpCiAgICAgICAgIHJldHVybjsKIAogICAgIGZpbGxS ZXNwb25zZUZyb21NZXNzYWdlKG1zZywgJmQtPm1fcmVzcG9uc2UpOwotICAgIGQtPm1fcmVwb3J0 ZWRIZWFkZXJzID0gdHJ1ZTsKICAgICBjbGllbnQtPmRpZFJlY2VpdmVSZXNwb25zZShoYW5kbGUu Z2V0KCksIGQtPm1fcmVzcG9uc2UpOwogfQogCkBAIC0yOTEsMjEgKzMwNyw2IEBAIHN0YXRpYyB2 b2lkIGdvdENodW5rQ2FsbGJhY2soU291cE1lc3NhZ2UqIG1zZywgU291cEJ1ZmZlciogY2h1bmss IGdwb2ludGVyIGRhdGEpCiAgICAgaWYgKCFjbGllbnQpCiAgICAgICAgIHJldHVybjsKIAotICAg IGlmICghZC0+bV9yZXBvcnRlZEhlYWRlcnMpIHsKLSAgICAgICAgZ2Jvb2xlYW4gdW5jZXJ0YWlu OwotICAgICAgICBjaGFyKiBjb250ZW50VHlwZSA9IGdfY29udGVudF90eXBlX2d1ZXNzKGQtPm1f cmVxdWVzdC51cmwoKS5sYXN0UGF0aENvbXBvbmVudCgpLnV0ZjgoKS5kYXRhKCksIHJlaW50ZXJw cmV0X2Nhc3Q8Y29uc3QgZ3VjaGFyKj4oY2h1bmstPmRhdGEpLCBjaHVuay0+bGVuZ3RoLCAmdW5j ZXJ0YWluKTsKLSAgICAgICAgc291cF9tZXNzYWdlX2hlYWRlcnNfc2V0X2NvbnRlbnRfdHlwZSht c2ctPnJlc3BvbnNlX2hlYWRlcnMsIGNvbnRlbnRUeXBlLCBOVUxMKTsKLSAgICAgICAgZ19mcmVl KGNvbnRlbnRUeXBlKTsKLQotICAgICAgICBmaWxsUmVzcG9uc2VGcm9tTWVzc2FnZShtc2csICZk LT5tX3Jlc3BvbnNlKTsKLSAgICAgICAgY2xpZW50LT5kaWRSZWNlaXZlUmVzcG9uc2UoaGFuZGxl LmdldCgpLCBkLT5tX3Jlc3BvbnNlKTsKLSAgICAgICAgZC0+bV9yZXBvcnRlZEhlYWRlcnMgPSB0 cnVlOwotCi0gICAgICAgIC8vIHRoZSBkaWRSZWNlaXZlUmVzcG9uc2UgY2FsbCBhYm92ZSBtYXkg aGF2ZSBjYW5jZWxsZWQgdGhlIHJlcXVlc3QKLSAgICAgICAgaWYgKGQtPm1fY2FuY2VsbGVkKQot ICAgICAgICAgICAgcmV0dXJuOwotICAgIH0KLQogICAgIGNsaWVudC0+ZGlkUmVjZWl2ZURhdGEo aGFuZGxlLmdldCgpLCBjaHVuay0+ZGF0YSwgY2h1bmstPmxlbmd0aCwgZmFsc2UpOwogfQogCkBA IC00NzEsNiArNDcyLDcgQEAgYm9vbCBSZXNvdXJjZUhhbmRsZTo6c3RhcnRIdHRwKFN0cmluZyB1 cmxTdHJpbmcpCiAgICAgZC0+bV9tc2cgPSByZXF1ZXN0KCkudG9Tb3VwTWVzc2FnZSgpOwogICAg IGdfc2lnbmFsX2Nvbm5lY3QoZC0+bV9tc2csICJyZXN0YXJ0ZWQiLCBHX0NBTExCQUNLKHJlc3Rh cnRlZENhbGxiYWNrKSwgdGhpcyk7CiAgICAgZ19zaWduYWxfY29ubmVjdChkLT5tX21zZywgImdv dC1oZWFkZXJzIiwgR19DQUxMQkFDSyhnb3RIZWFkZXJzQ2FsbGJhY2spLCB0aGlzKTsKKyAgICBn X3NpZ25hbF9jb25uZWN0KGQtPm1fbXNnLCAiY29udGVudC1zbmlmZmVkIiwgR19DQUxMQkFDSyhj b250ZW50U25pZmZlZENhbGxiYWNrKSwgdGhpcyk7CiAgICAgZ19zaWduYWxfY29ubmVjdChkLT5t X21zZywgImdvdC1jaHVuayIsIEdfQ0FMTEJBQ0soZ290Q2h1bmtDYWxsYmFjayksIHRoaXMpOwog CiAgICAgZ19vYmplY3Rfc2V0X2RhdGEoR19PQkpFQ1QoZC0+bV9tc2cpLCAicmVzb3VyY2VIYW5k bGUiLCByZWludGVycHJldF9jYXN0PHZvaWQqPih0aGlzKSk7CmRpZmYgLS1naXQgYS9XZWJLaXQv Z3RrL0NoYW5nZUxvZyBiL1dlYktpdC9ndGsvQ2hhbmdlTG9nCmluZGV4IGNhNzFkYjguLmQ4ZmQ3 ODggMTAwNjQ0Ci0tLSBhL1dlYktpdC9ndGsvQ2hhbmdlTG9nCisrKyBiL1dlYktpdC9ndGsvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMDktMDctMDUgIEd1c3Rhdm8gTm9yb25oYSBTaWx2 YSAgPGd1c3Rhdm8ubm9yb25oYUBjb2xsYWJvcmEuY28udWs+CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVXNlIHNvdXAncyBjb250ZW50IHNuaWZmaW5n CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yNjk4Mgor CisgICAgICAgIEFkZCB0aGUgbmV3IENvbnRlbnQgU25pZmZpbmcgZmVhdHVyZSBwcm92aWRlZCBi eSBsaWJzb3VwLgorCisgICAgICAgICogd2Via2l0L3dlYmtpdHByaXZhdGUuY3BwOgorICAgICAg ICAod2Via2l0X2luaXQpOgorCiAyMDA5LTA3LTAzICBKYW4gTWljaGFlbCBBbG9uem8gIDxqbWFs b256b0B3ZWJraXQub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IFhhbiBMb3BleiBhbmQgR3Vz dGF2byBOb3JvbmhhLgpkaWZmIC0tZ2l0IGEvV2ViS2l0L2d0ay93ZWJraXQvd2Via2l0cHJpdmF0 ZS5jcHAgYi9XZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXRwcml2YXRlLmNwcAppbmRleCBkOGM3OTZj Li5lOWIwMTExIDEwMDY0NAotLS0gYS9XZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXRwcml2YXRlLmNw cAorKysgYi9XZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXRwcml2YXRlLmNwcApAQCAtMTY2LDggKzE2 NiwxMyBAQCB2b2lkIHdlYmtpdF9pbml0KCkKICAgICBQYXN0ZWJvYXJkOjpnZW5lcmFsUGFzdGVi b2FyZCgpLT5zZXRIZWxwZXIobmV3IFdlYktpdDo6UGFzdGVib2FyZEhlbHBlckd0aygpKTsKIAog ICAgIFNvdXBTZXNzaW9uKiBzZXNzaW9uID0gd2Via2l0X2dldF9kZWZhdWx0X3Nlc3Npb24oKTsK KwogICAgIFNvdXBTZXNzaW9uRmVhdHVyZSogYXV0aERpYWxvZyA9IHN0YXRpY19jYXN0PFNvdXBT ZXNzaW9uRmVhdHVyZSo+KGdfb2JqZWN0X25ldyhXRUJLSVRfVFlQRV9TT1VQX0FVVEhfRElBTE9H LCBOVUxMKSk7CiAgICAgZ19zaWduYWxfY29ubmVjdChhdXRoRGlhbG9nLCAiY3VycmVudC10b3Bs ZXZlbCIsIEdfQ0FMTEJBQ0soY3VycmVudFRvcGxldmVsQ2FsbGJhY2spLCBOVUxMKTsKICAgICBz b3VwX3Nlc3Npb25fYWRkX2ZlYXR1cmUoc2Vzc2lvbiwgYXV0aERpYWxvZyk7CiAgICAgZ19vYmpl Y3RfdW5yZWYoYXV0aERpYWxvZyk7CisKKyAgICBTb3VwU2Vzc2lvbkZlYXR1cmUqIHNuaWZmZXIg PSBzdGF0aWNfY2FzdDxTb3VwU2Vzc2lvbkZlYXR1cmUqPihnX29iamVjdF9uZXcoU09VUF9UWVBF X0NPTlRFTlRfU05JRkZFUiwgTlVMTCkpOworICAgIHNvdXBfc2Vzc2lvbl9hZGRfZmVhdHVyZShz ZXNzaW9uLCBzbmlmZmVyKTsKKyAgICBnX29iamVjdF91bnJlZihzbmlmZmVyKTsKIH0K