178178 2017-10-11 11:37:59 -0700 [GLib] WebKitNavigationAction should tell whether it is a redirect 2017-10-14 17:03:39 -0700 1 1 1 Unclassified WebKit WebKitGTK WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 gustavo gustavo aperez berto bugs-noreply buildbot cgarcia mcatanzaro oldest_to_newest 1359282 0 gustavo 2017-10-11 11:37:59 -0700 [GLib] WebKitNavigationAction should tell whether it is a redirect 1359284 1 323435 gustavo 2017-10-11 11:41:26 -0700 Created attachment 323435 Patch 1359287 2 buildbot 2017-10-11 11:43:15 -0700 Thanks for the patch. If this patch contains new public API please make sure it follows the guidelines for new WebKit2 GTK+ API. See http://trac.webkit.org/wiki/WebKitGTK/AddingNewWebKit2API 1359336 3 323435 mcatanzaro 2017-10-11 12:32:49 -0700 Comment on attachment 323435 Patch LGTM. Carlos Garcia will surely want to do the final review, since it's new API. 1359556 4 323435 aperez 2017-10-12 02:39:53 -0700 Comment on attachment 323435 Patch Same opinion as Michael: Looks good to me, but I am not a reviewer yet so let's wait for Carlos to take a look. 1359956 5 323435 cgarcia 2017-10-13 01:58:54 -0700 Comment on attachment 323435 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=323435&action=review LGTM, thanks! > Source/WebKit/UIProcess/API/glib/WebKitNavigationAction.cpp:158 > + * Return whether the navigation had a redirect. @navigation I'm confused here about the use of "had". > Source/WebKit/UIProcess/API/glib/WebKitNavigationAction.cpp:160 > + * Returns: whether the original navigation was redirected. for boolean functions we normally use the pattern %TRUE if bla bla bla, or %FALSE otherwise. 1360052 6 gustavo 2017-10-13 10:07:40 -0700 Committed r223282: <https://trac.webkit.org/changeset/223282> 1360516 7 mcatanzaro 2017-10-14 17:03:39 -0700 (In reply to Carlos Garcia Campos from comment #5) > for boolean functions we normally use the pattern %TRUE if bla bla bla, or > %FALSE otherwise. Personally, I omit the "or %FALSE otherwise" because it's obvious. 323435 2017-10-11 11:41:26 -0700 2017-10-13 01:58:54 -0700 Patch bug-178178-20171011154124.patch text/plain 9136 gustavo U3VidmVyc2lvbiBSZXZpc2lvbjogMjIzMDg2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDFhMjZjMzMyZjA5OTE1Mzgw MjYzNjU3YWFiZmU2ZWI3MmNkMjZkZGIuLmQzOGEwMzY3Y2ZiZGU0NWY1OTcyMzQ3ZTIzZTNmMjc2 OTE0NjY1MTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIgQEAKKzIwMTctMTAtMTEgIEd1c3Rhdm8g Tm9yb25oYSBTaWx2YSAgPGd1c3Rhdm8ubm9yb25oYUBjb2xsYWJvcmEuY28udWs+CisKKyAgICAg ICAgW0dMaWJdIFdlYktpdE5hdmlnYXRpb25BY3Rpb24gc2hvdWxkIHRlbGwgd2hldGhlciBpdCBp cyBhIHJlZGlyZWN0CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0xNzgxNzgKKworICAgICAgICBUaGVyZSBpcyBubyBnb29kIHdheSB0byBrbm93IHdoZXRo ZXIgYSBnaXZlbiBuYXZpZ2F0aW9uIGFjdGlvbiBoYXMgYmVlbiBjYXVzZWQKKyAgICAgICAgYnkg YSByZWRpcmVjdCB0aHJvdWdoIHRoZSBnbGliIEFQSS4gVGhpcyBpcyBuZWNlc3NhcnkgdG8gaW1w bGVtZW50IHNvbWUgYXBwIG1vZGUKKyAgICAgICAgaGV1cmlzdGljcyBmb3IgRXBpcGhhbnkuCisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBVSVByb2Nl c3MvQVBJL2dsaWIvV2ViS2l0TmF2aWdhdGlvbkFjdGlvbi5jcHA6CisgICAgICAgICh3ZWJraXRf bmF2aWdhdGlvbl9hY3Rpb25faXNfcmVkaXJlY3QpOiByZXR1cm5zIHdoZXRoZXIgdGhlIG5hdmln YXRpb24gYWN0aW9uIGlzIGEgcmVkaXJlY3QuCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9nbGli L1dlYktpdE5hdmlnYXRpb25BY3Rpb25Qcml2YXRlLmg6IGFkZCBpc1JlZGlyZWN0IHRvIHRoZSB3 cmFwcGVyIG9iamVjdC4KKyAgICAgICAgKF9XZWJLaXROYXZpZ2F0aW9uQWN0aW9uOjpfV2ViS2l0 TmF2aWdhdGlvbkFjdGlvbik6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0TmF2 aWdhdGlvbkFjdGlvbi5oOiBhZGQgdGhlIG5ldyBBUEkuCisgICAgICAgICogVUlQcm9jZXNzL0FQ SS9ndGsvZG9jcy93ZWJraXQyZ3RrLTQuMC1zZWN0aW9ucy50eHQ6IGRpdHRvLgorICAgICAgICAq IFVJUHJvY2Vzcy9BUEkvd3BlL1dlYktpdE5hdmlnYXRpb25BY3Rpb24uaDogZGl0dG8uCisKIDIw MTctMTAtMDkgIEplcmVteSBKb25lcyAgPGplcmVteWpAYXBwbGUuY29tPgogCiAgICAgICAgIEZp eCB0eXBvIG9mIHZpcnR1YWwga2V5d29yZCBpbiBQYWdlQ2xpZW50SW1wbElPUy5oCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvZ2xpYi9XZWJLaXROYXZpZ2F0aW9uQWN0 aW9uLmNwcCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9nbGliL1dlYktpdE5hdmlnYXRp b25BY3Rpb24uY3BwCmluZGV4IDJmZjBmNzE5Nzg1ZGFiMjJkMzIwMjQ3MTExNDU5MmRkMjgyZTZm NGYuLjY2MTUxOTdlYjJkMzkzMjZjMzE0ZDA3NjVlNjUxMTRlYzQwMTA1NDkgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9nbGliL1dlYktpdE5hdmlnYXRpb25BY3Rpb24u Y3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9nbGliL1dlYktpdE5hdmlnYXRp b25BY3Rpb24uY3BwCkBAIC0xNTAsMyArMTUwLDE5IEBAIGdib29sZWFuIHdlYmtpdF9uYXZpZ2F0 aW9uX2FjdGlvbl9pc191c2VyX2dlc3R1cmUoV2ViS2l0TmF2aWdhdGlvbkFjdGlvbiogbmF2aWdh CiAgICAgZ19yZXR1cm5fdmFsX2lmX2ZhaWwobmF2aWdhdGlvbiwgRkFMU0UpOwogICAgIHJldHVy biBuYXZpZ2F0aW9uLT5pc1VzZXJHZXN0dXJlOwogfQorCisvKioKKyAqIHdlYmtpdF9uYXZpZ2F0 aW9uX2FjdGlvbl9pc19yZWRpcmVjdDoKKyAqIEBuYXZpZ2F0aW9uOiBhICNXZWJLaXROYXZpZ2F0 aW9uQWN0aW9uCisgKgorICogUmV0dXJuIHdoZXRoZXIgdGhlIG5hdmlnYXRpb24gaGFkIGEgcmVk aXJlY3QuCisgKgorICogUmV0dXJuczogd2hldGhlciB0aGUgb3JpZ2luYWwgbmF2aWdhdGlvbiB3 YXMgcmVkaXJlY3RlZC4KKyAqCisgKiBTaW5jZTogMi4yMAorICovCitnYm9vbGVhbiB3ZWJraXRf bmF2aWdhdGlvbl9hY3Rpb25faXNfcmVkaXJlY3QoV2ViS2l0TmF2aWdhdGlvbkFjdGlvbiogbmF2 aWdhdGlvbikKK3sKKyAgICBnX3JldHVybl92YWxfaWZfZmFpbChuYXZpZ2F0aW9uLCBGQUxTRSk7 CisgICAgcmV0dXJuIG5hdmlnYXRpb24tPmlzUmVkaXJlY3Q7Cit9CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvZ2xpYi9XZWJLaXROYXZpZ2F0aW9uQWN0aW9uUHJpdmF0 ZS5oIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL2dsaWIvV2ViS2l0TmF2aWdhdGlvbkFj dGlvblByaXZhdGUuaAppbmRleCBiZDVlMzY0YWVhNjU2ZGIyMGE2OTYyYTQ4MTE4YjEyYjdjNjBj ZjIwLi43NzhmMDA0MGQyYzQwMjk3MjBkMTExNTU4YjEyZDI0ODc2Njk2MDQ5IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvZ2xpYi9XZWJLaXROYXZpZ2F0aW9uQWN0aW9u UHJpdmF0ZS5oCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9nbGliL1dlYktpdE5h dmlnYXRpb25BY3Rpb25Qcml2YXRlLmgKQEAgLTMwLDYgKzMwLDcgQEAgc3RydWN0IF9XZWJLaXRO YXZpZ2F0aW9uQWN0aW9uIHsKICAgICAgICAgLCBtb3VzZUJ1dHRvbih0b1dlYktpdE1vdXNlQnV0 dG9uKG5hdmlnYXRpb25BY3Rpb25EYXRhLm1vdXNlQnV0dG9uKSkKICAgICAgICAgLCBtb2RpZmll cnModG9QbGF0Zm9ybU1vZGlmaWVycyhuYXZpZ2F0aW9uQWN0aW9uRGF0YS5tb2RpZmllcnMpKQog ICAgICAgICAsIGlzVXNlckdlc3R1cmUobmF2aWdhdGlvbkFjdGlvbkRhdGEudXNlckdlc3R1cmVU b2tlbklkZW50aWZpZXIpCisgICAgICAgICwgaXNSZWRpcmVjdChuYXZpZ2F0aW9uQWN0aW9uRGF0 YS5pc1JlZGlyZWN0KQogICAgICAgICAsIHJlcXVlc3QodXJpUmVxdWVzdCkKICAgICB7CiAgICAg fQpAQCAtNDcsNiArNDgsNyBAQCBzdHJ1Y3QgX1dlYktpdE5hdmlnYXRpb25BY3Rpb24gewogICAg IHVuc2lnbmVkIG1vdXNlQnV0dG9uOwogICAgIHVuc2lnbmVkIG1vZGlmaWVyczsKICAgICBib29s IGlzVXNlckdlc3R1cmUgOiAxOworICAgIGJvb2wgaXNSZWRpcmVjdCA6IDE7CiAgICAgR1JlZlB0 cjxXZWJLaXRVUklSZXF1ZXN0PiByZXF1ZXN0OwogfTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdC9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXROYXZpZ2F0aW9uQWN0aW9uLmggYi9Tb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdE5hdmlnYXRpb25BY3Rpb24uaAppbmRleCBh ZTk1NTg2YmM3ZTYyYzI1ZTg4OGJlMzkxMGU0Y2FkYjNmNzdiNzQyLi44ODQ4YWNiZDExMGYyNWQw ODQ1NThjZjQ2MGIwMDUxYjQ4YWRmMWNhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9BUEkvZ3RrL1dlYktpdE5hdmlnYXRpb25BY3Rpb24uaAorKysgYi9Tb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdE5hdmlnYXRpb25BY3Rpb24uaApAQCAtNzksNiArNzks OSBAQCB3ZWJraXRfbmF2aWdhdGlvbl9hY3Rpb25fZ2V0X3JlcXVlc3QgICAgICAgICAoV2ViS2l0 TmF2aWdhdGlvbkFjdGlvbiAqbmF2aWdhdGlvbgogV0VCS0lUX0FQSSBnYm9vbGVhbgogd2Via2l0 X25hdmlnYXRpb25fYWN0aW9uX2lzX3VzZXJfZ2VzdHVyZSAgICAgKFdlYktpdE5hdmlnYXRpb25B Y3Rpb24gKm5hdmlnYXRpb24pOwogCitXRUJLSVRfQVBJIGdib29sZWFuCit3ZWJraXRfbmF2aWdh dGlvbl9hY3Rpb25faXNfcmVkaXJlY3QgICAgICAgICAoV2ViS2l0TmF2aWdhdGlvbkFjdGlvbiAq bmF2aWdhdGlvbik7CisKIEdfRU5EX0RFQ0xTCiAKICNlbmRpZgpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdC9VSVByb2Nlc3MvQVBJL2d0ay9kb2NzL3dlYmtpdDJndGstNC4wLXNlY3Rpb25zLnR4 dCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9ndGsvZG9jcy93ZWJraXQyZ3RrLTQuMC1z ZWN0aW9ucy50eHQKaW5kZXggOWNjN2E2ZTFiMzU2OTMzNTU2OWUwMzhlMjA0YTlhZGUzMzk3NzY4 NS4uM2Y3ZDgyOGU1ZDczNGIyOTlkMDM5MzQ4NGUwMGY1NDkzY2I2NWZkMyAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL2d0ay9kb2NzL3dlYmtpdDJndGstNC4wLXNlY3Rp b25zLnR4dAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvZ3RrL2RvY3Mvd2Via2l0 Mmd0ay00LjAtc2VjdGlvbnMudHh0CkBAIC02NDksNiArNjQ5LDcgQEAgd2Via2l0X25hdmlnYXRp b25fYWN0aW9uX2dldF9tb3VzZV9idXR0b24KIHdlYmtpdF9uYXZpZ2F0aW9uX2FjdGlvbl9nZXRf bW9kaWZpZXJzCiB3ZWJraXRfbmF2aWdhdGlvbl9hY3Rpb25fZ2V0X3JlcXVlc3QKIHdlYmtpdF9u YXZpZ2F0aW9uX2FjdGlvbl9pc191c2VyX2dlc3R1cmUKK3dlYmtpdF9uYXZpZ2F0aW9uX2FjdGlv bl9pc19yZWRpcmVjdAogCiA8U1VCU0VDVElPTiBTdGFuZGFyZD4KIFdFQktJVF9UWVBFX05BVklH QVRJT05fQUNUSU9OCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvd3Bl L1dlYktpdE5hdmlnYXRpb25BY3Rpb24uaCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS93 cGUvV2ViS2l0TmF2aWdhdGlvbkFjdGlvbi5oCmluZGV4IDFhNGZmMTM4NTgxMTI0NmYxMjA3MWU1 ODZiOWVlM2MzOWY2NjRlN2YuLjBmZGVjMWRjMTgyZTk1ZDlmMzUyOWIzYzE4M2YyYTk1NDdkNTVl MTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS93cGUvV2ViS2l0TmF2 aWdhdGlvbkFjdGlvbi5oCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS93cGUvV2Vi S2l0TmF2aWdhdGlvbkFjdGlvbi5oCkBAIC03OSw2ICs3OSw5IEBAIHdlYmtpdF9uYXZpZ2F0aW9u X2FjdGlvbl9nZXRfcmVxdWVzdCAgICAgICAgIChXZWJLaXROYXZpZ2F0aW9uQWN0aW9uICpuYXZp Z2F0aW9uCiBXRUJLSVRfQVBJIGdib29sZWFuCiB3ZWJraXRfbmF2aWdhdGlvbl9hY3Rpb25faXNf dXNlcl9nZXN0dXJlICAgICAoV2ViS2l0TmF2aWdhdGlvbkFjdGlvbiAqbmF2aWdhdGlvbik7CiAK K1dFQktJVF9BUEkgZ2Jvb2xlYW4KK3dlYmtpdF9uYXZpZ2F0aW9uX2FjdGlvbl9pc19yZWRpcmVj dCAgICAgICAgIChXZWJLaXROYXZpZ2F0aW9uQWN0aW9uICpuYXZpZ2F0aW9uKTsKKwogR19FTkRf REVDTFMKIAogI2VuZGlmCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cgYi9Ub29scy9DaGFu Z2VMb2cKaW5kZXggZTM1MWQ0YTBjNTEzZDJmY2QwNjVkZjUwY2MxNDMzYjUwZjJiODIzMy4uNzkz NzMzNzVmOWM2ZGVjNGVhMzcxNDFkZjYwZTYzZTI1NmMyYjBmYyAxMDA2NDQKLS0tIGEvVG9vbHMv Q2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDE3LTEw LTExICBHdXN0YXZvIE5vcm9uaGEgU2lsdmEgIDxndXN0YXZvLm5vcm9uaGFAY29sbGFib3JhLmNv LnVrPgorCisgICAgICAgIFtHTGliXSBXZWJLaXROYXZpZ2F0aW9uQWN0aW9uIHNob3VsZCB0ZWxs IHdoZXRoZXIgaXQgaXMgYSByZWRpcmVjdAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTc4MTc4CisKKyAgICAgICAgVGVzdCB0aGF0IFdlYktpdE5hdmln YXRpb25BY3Rpb24gcHJvcGVybHkgcmVwb3J0cyBiZWluZyBhIHJlZGlyZWN0LgorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogVGVzdFdlYktpdEFQSS9U ZXN0cy9XZWJLaXRHTGliL1Rlc3RXZWJLaXRQb2xpY3lDbGllbnQuY3BwOgorICAgICAgICAodGVz dE5hdmlnYXRpb25Qb2xpY3kpOiB0ZXN0IHRoYXQgbG9hZGluZyAvcmVkaXJlY3QgbGVhZHMgdG8g YSByZWRpcmVjdCBXZWJLaXROYXZpZ2F0aW9uQWN0aW9uLgorICAgICAgICAoc2VydmVyQ2FsbGJh Y2spOiBhZGQgYSAvcmVkaXJlY3QgcGF0aCB0byB0aGUgc2VydmVyLCB3aGljaCBjYXVzZXMgYSBy ZWRpcmVjdC4KKwogMjAxNy0xMC0wOSAgQ29tbWl0IFF1ZXVlICA8Y29tbWl0LXF1ZXVlQHdlYmtp dC5vcmc+CiAKICAgICAgICAgVW5yZXZpZXdlZCwgcm9sbGluZyBvdXQgcjIyMzAxNSBhbmQgcjIy MzAyNS4KZGlmZiAtLWdpdCBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0R0xpYi9U ZXN0V2ViS2l0UG9saWN5Q2xpZW50LmNwcCBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2Vi S2l0R0xpYi9UZXN0V2ViS2l0UG9saWN5Q2xpZW50LmNwcAppbmRleCA5Zjk1MTUxMjNjMzk4OWQx OTI1Zjk0NTBlZDM3NWY3ZGUzNzFkYTVmLi5hOWZkOWRlMzNiZDFmNTQ2NjM0YWMzMTAyY2Y3MGU0 ODVmMzU0MzMzIDEwMDY0NAotLS0gYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdEdM aWIvVGVzdFdlYktpdFBvbGljeUNsaWVudC5jcHAKKysrIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9U ZXN0cy9XZWJLaXRHTGliL1Rlc3RXZWJLaXRQb2xpY3lDbGllbnQuY3BwCkBAIC0xMjEsNiArMTIx LDcgQEAgc3RhdGljIHZvaWQgdGVzdE5hdmlnYXRpb25Qb2xpY3koUG9saWN5Q2xpZW50VGVzdCog dGVzdCwgZ2NvbnN0cG9pbnRlcikKICAgICBnX2Fzc2VydF9jbXBpbnQod2Via2l0X25hdmlnYXRp b25fYWN0aW9uX2dldF9uYXZpZ2F0aW9uX3R5cGUobmF2aWdhdGlvbkFjdGlvbiksID09LCBXRUJL SVRfTkFWSUdBVElPTl9UWVBFX09USEVSKTsKICAgICBnX2Fzc2VydF9jbXBpbnQod2Via2l0X25h dmlnYXRpb25fYWN0aW9uX2dldF9tb3VzZV9idXR0b24obmF2aWdhdGlvbkFjdGlvbiksID09LCAw KTsKICAgICBnX2Fzc2VydF9jbXBpbnQod2Via2l0X25hdmlnYXRpb25fYWN0aW9uX2dldF9tb2Rp ZmllcnMobmF2aWdhdGlvbkFjdGlvbiksID09LCAwKTsKKyAgICBnX2Fzc2VydF9mYWxzZSh3ZWJr aXRfbmF2aWdhdGlvbl9hY3Rpb25faXNfcmVkaXJlY3QobmF2aWdhdGlvbkFjdGlvbikpOwogICAg IGdfYXNzZXJ0KCF3ZWJraXRfbmF2aWdhdGlvbl9wb2xpY3lfZGVjaXNpb25fZ2V0X2ZyYW1lX25h bWUoZGVjaXNpb24pKTsKICAgICBXZWJLaXRVUklSZXF1ZXN0KiByZXF1ZXN0ID0gd2Via2l0X25h dmlnYXRpb25fYWN0aW9uX2dldF9yZXF1ZXN0KG5hdmlnYXRpb25BY3Rpb24pOwogICAgIGdfYXNz ZXJ0X2NtcHN0cih3ZWJraXRfdXJpX3JlcXVlc3RfZ2V0X3VyaShyZXF1ZXN0KSwgPT0sICJodHRw Oi8vd2Via2l0Z3RrLm9yZy8iKTsKQEAgLTEzMSw2ICsxMzIsMTkgQEAgc3RhdGljIHZvaWQgdGVz dE5hdmlnYXRpb25Qb2xpY3koUG9saWN5Q2xpZW50VGVzdCogdGVzdCwgZ2NvbnN0cG9pbnRlcikK ICAgICB0ZXN0LT53YWl0VW50aWxMb2FkRmluaXNoZWQoKTsKICAgICBnX2Fzc2VydF9jbXBpbnQo dGVzdC0+bV9sb2FkRXZlbnRzLnNpemUoKSwgPT0sIDMpOwogCisgICAgdGVzdC0+bV9wb2xpY3lE ZWNpc2lvblJlc3BvbnNlID0gUG9saWN5Q2xpZW50VGVzdDo6VXNlOworICAgIHRlc3QtPm1fcmVz cG9uZFRvUG9saWN5RGVjaXNpb25Bc3luY2hyb25vdXNseSA9IGZhbHNlOworICAgIHRlc3QtPmxv YWRVUkkoa1NlcnZlci0+Z2V0VVJJRm9yUGF0aCgiL3JlZGlyZWN0IikuZGF0YSgpKTsKKyAgICB0 ZXN0LT53YWl0VW50aWxMb2FkRmluaXNoZWQoKTsKKyAgICBnX2Fzc2VydF9jbXBpbnQodGVzdC0+ bV9sb2FkRXZlbnRzLnNpemUoKSwgPT0sIDQpOworCisgICAgZGVjaXNpb24gPSBXRUJLSVRfTkFW SUdBVElPTl9QT0xJQ1lfREVDSVNJT04odGVzdC0+bV9wcmV2aW91c1BvbGljeURlY2lzaW9uLmdl dCgpKTsKKyAgICBuYXZpZ2F0aW9uQWN0aW9uID0gd2Via2l0X25hdmlnYXRpb25fcG9saWN5X2Rl Y2lzaW9uX2dldF9uYXZpZ2F0aW9uX2FjdGlvbihkZWNpc2lvbik7CisgICAgZ19hc3NlcnRfdHJ1 ZSh3ZWJraXRfbmF2aWdhdGlvbl9hY3Rpb25faXNfcmVkaXJlY3QobmF2aWdhdGlvbkFjdGlvbikp OworICAgIGdfYXNzZXJ0KCF3ZWJraXRfbmF2aWdhdGlvbl9wb2xpY3lfZGVjaXNpb25fZ2V0X2Zy YW1lX25hbWUoZGVjaXNpb24pKTsKKyAgICByZXF1ZXN0ID0gd2Via2l0X25hdmlnYXRpb25fYWN0 aW9uX2dldF9yZXF1ZXN0KG5hdmlnYXRpb25BY3Rpb24pOworICAgIGdfYXNzZXJ0X2NtcHN0cih3 ZWJraXRfdXJpX3JlcXVlc3RfZ2V0X3VyaShyZXF1ZXN0KSwgPT0sIGtTZXJ2ZXItPmdldFVSSUZv clBhdGgoIi8iKS5kYXRhKCkpOworCiAgICAgLy8gSWYgd2UgYXJlIHdhaXRpbmcgdW50aWwgbG9h ZCBjb21wbGV0aW9uLCBpdCB3aWxsIG5ldmVyIGNvbXBsZXRlIGlmIHdlIGlnbm9yZSB0aGUKICAg ICAvLyBuYXZpZ2F0aW9uLiBTbyB3ZSB0ZWxsIHRoZSBtYWluIGxvb3AgdG8gcXVpdCBzb21ldGlt ZSBsYXRlci4KICAgICB0ZXN0LT5tX3BvbGljeURlY2lzaW9uUmVzcG9uc2UgPSBQb2xpY3lDbGll bnRUZXN0OjpJZ25vcmU7CkBAIC0yNDgsNiArMjYyLDkgQEAgc3RhdGljIHZvaWQgc2VydmVyQ2Fs bGJhY2soU291cFNlcnZlciogc2VydmVyLCBTb3VwTWVzc2FnZSogbWVzc2FnZSwgY29uc3QgY2hh cioKICAgICAgICAgc291cF9tZXNzYWdlX3NldF9zdGF0dXMobWVzc2FnZSwgU09VUF9TVEFUVVNf T0spOwogICAgICAgICBzb3VwX21lc3NhZ2VfYm9keV9hcHBlbmQobWVzc2FnZS0+cmVzcG9uc2Vf Ym9keSwgU09VUF9NRU1PUllfU1RBVElDLCByZXNwb25zZVN0cmluZywgc3RybGVuKHJlc3BvbnNl U3RyaW5nKSk7CiAgICAgICAgIHNvdXBfbWVzc2FnZV9ib2R5X2NvbXBsZXRlKG1lc3NhZ2UtPnJl c3BvbnNlX2JvZHkpOworICAgIH0gZWxzZSBpZiAoZ19zdHJfZXF1YWwocGF0aCwgIi9yZWRpcmVj dCIpKSB7CisgICAgICAgIHNvdXBfbWVzc2FnZV9zZXRfc3RhdHVzKG1lc3NhZ2UsIFNPVVBfU1RB VFVTX01PVkVEX1BFUk1BTkVOVExZKTsKKyAgICAgICAgc291cF9tZXNzYWdlX2hlYWRlcnNfYXBw ZW5kKG1lc3NhZ2UtPnJlc3BvbnNlX2hlYWRlcnMsICJMb2NhdGlvbiIsICIvIik7CiAgICAgfSBl bHNlCiAgICAgICAgIHNvdXBfbWVzc2FnZV9zZXRfc3RhdHVzKG1lc3NhZ2UsIFNPVVBfU1RBVFVT X05PVF9GT1VORCk7CiB9Cg==