136889 2014-09-17 08:21:42 -0700 [GTK] WebKitWebView::load-failed-with-tls-errors should receive the failing URI instead of a host 2014-09-17 09:11:29 -0700 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 cgarcia webkit-unassigned gustavo mcatanzaro svillar oldest_to_newest 1035714 0 cgarcia 2014-09-17 08:21:42 -0700 We were passing a host for two different reasons, first because it's more convenient to add an exception with webkit_web_context_allow_tls_certificate_for_host(), but also because we were assuming the active URI is the failing URI in case of failure. This assumption is correct because our current code does that, but I'm not sure we are doing it on purpose. That behaviour is not documented anywhere (see http://webkitgtk.org/reference/webkit2gtk/stable/WebKitWebView.html#webkit-web-view-get-uri), it's not what WebKit2 does internaly (see https://bugs.webkit.org/show_bug.cgi?id=136526#c2) and it's not even what epiphany assumes (see https://git.gnome.org/browse/epiphany/tree/embed/ephy-web-view.c?id=3.13.91#n1986). WebKitWebView::load-failed passes the failing URI as parameter, that wouldn't be needed if the active URI was the failing URI. This API has already been changed in this cycle and it's considered to be new in 2.6, so this new change is not a problem. 1035715 1 238253 cgarcia 2014-09-17 08:29:42 -0700 Created attachment 238253 Patch 1035721 2 cgarcia 2014-09-17 09:11:29 -0700 Committed r173691: <http://trac.webkit.org/changeset/173691> 238253 2014-09-17 08:29:42 -0700 2014-09-17 09:07:08 -0700 Patch wk2-load-failed-with-tls.diff text/plain 13079 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCAwYjVjZGZmLi44N2IyYzVjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjQg QEAKKzIwMTQtMDktMTcgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29t PgorCisgICAgICAgIFtHVEtdIFdlYktpdFdlYlZpZXc6OmxvYWQtZmFpbGVkLXdpdGgtdGxzLWVy cm9ycyBzaG91bGQgcmVjZWl2ZSB0aGUgZmFpbGluZyBVUkkgaW5zdGVhZCBvZiBhIGhvc3QKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzNjg4OQorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdlIHdlcmUgcGFz c2luZyBhIGhvc3QgZm9yIHR3byBkaWZmZXJlbnQgcmVhc29ucywgZmlyc3QgYmVjYXVzZQorICAg ICAgICBpdCdzIG1vcmUgY29udmVuaWVudCB0byBhZGQgYW4gZXhjZXB0aW9uIHdpdGgKKyAgICAg ICAgd2Via2l0X3dlYl9jb250ZXh0X2FsbG93X3Rsc19jZXJ0aWZpY2F0ZV9mb3JfaG9zdCgpLCBi dXQgYWxzbworICAgICAgICBiZWNhdXNlIHdlIHdlcmUgYXNzdW1pbmcgdGhlIGFjdGl2ZSBVUkkg aXMgdGhlIGZhaWxpbmcgVVJJIGluIGNhc2UKKyAgICAgICAgb2YgZmFpbHVyZS4gVGhpcyBhc3N1 bXB0aW9uIGlzIGNvcnJlY3QgYmVjYXVzZSBvdXIgY3VycmVudCBjb2RlCisgICAgICAgIGRvZXMg dGhhdCwgYnV0IEknbSBub3Qgc3VyZSB3ZSBhcmUgZG9pbmcgaXQgb24gcHVycG9zZS4gVGhhdAor ICAgICAgICBiZWhhdmlvdXIgaXMgbm90IGRvY3VtZW50ZWQgYW55d2hlcmUgYW5kIGl0J3Mgbm90 IHdoYXQgV2ViS2l0MiBkb2VzCisgICAgICAgIGludGVybmFseS4KKworICAgICAgICAqIFVJUHJv Y2Vzcy9BUEkvZ3RrL1dlYktpdFdlYlZpZXcuY3BwOgorICAgICAgICAod2Via2l0X3dlYl92aWV3 X2NsYXNzX2luaXQpOgorICAgICAgICAod2Via2l0V2ViVmlld0xvYWRGYWlsZWRXaXRoVExTRXJy b3JzKToKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJWaWV3Lmg6CisKIDIw MTQtMDktMTYgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgogCiAg ICAgICAgIFtHVEtdIEZpeCBsYXllcmluZyB2aW9sYXRpb25zIGluIFBhc3RlYm9hcmRHdGsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYlZpZXcu Y3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0V2ViVmlldy5jcHAK aW5kZXggYThkZjRiYy4uOTA1N2MzNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL0FQSS9ndGsvV2ViS2l0V2ViVmlldy5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL0FQSS9ndGsvV2ViS2l0V2ViVmlldy5jcHAKQEAgLTg3MywxMyArODczLDEzIEBAIHN0YXRp YyB2b2lkIHdlYmtpdF93ZWJfdmlld19jbGFzc19pbml0KFdlYktpdFdlYlZpZXdDbGFzcyogd2Vi Vmlld0NsYXNzKQogICAgIC8qKgogICAgICAqIFdlYktpdFdlYlZpZXc6OmxvYWQtZmFpbGVkLXdp dGgtdGxzLWVycm9yczoKICAgICAgKiBAd2ViX3ZpZXc6IHRoZSAjV2ViS2l0V2ViVmlldyBvbiB3 aGljaCB0aGUgc2lnbmFsIGlzIGVtaXR0ZWQKKyAgICAgKiBAZmFpbGluZ191cmk6IHRoZSBVUkkg dGhhdCBmYWlsZWQgdG8gbG9hZAogICAgICAqIEBjZXJ0aWZpY2F0ZTogYSAjR1Rsc0NlcnRpZmlj YXRlCiAgICAgICogQGVycm9yczogYSAjR1Rsc0NlcnRpZmljYXRlRmxhZ3Mgd2l0aCB0aGUgdmVy aWZpY2F0aW9uIHN0YXR1cyBvZiBAY2VydGlmaWNhdGUKLSAgICAgKiBAaG9zdDogdGhlIGhvc3Qg b24gd2hpY2ggdGhlIGVycm9yIG9jY3VycmVkCiAgICAgICoKICAgICAgKiBFbWl0dGVkIHdoZW4g YSBUTFMgZXJyb3Igb2NjdXJzIGR1cmluZyBhIGxvYWQgb3BlcmF0aW9uLgotICAgICAqIFRvIGFs bG93IGFuIGV4Y2VwdGlvbiBmb3IgdGhpcyBjZXJ0aWZpY2F0ZQotICAgICAqIGFuZCB0aGlzIGhv c3QgdXNlIHdlYmtpdF93ZWJfY29udGV4dF9hbGxvd190bHNfY2VydGlmaWNhdGVfZm9yX2hvc3Qo KS4KKyAgICAgKiBUbyBhbGxvdyBhbiBleGNlcHRpb24gZm9yIHRoaXMgQGNlcnRpZmljYXRlCisg ICAgICogYW5kIHRoZSBob3N0IG9mIEBmYWlsaW5nX3VyaSB1c2Ugd2Via2l0X3dlYl9jb250ZXh0 X2FsbG93X3Rsc19jZXJ0aWZpY2F0ZV9mb3JfaG9zdCgpLgogICAgICAqCiAgICAgICogVG8gaGFu ZGxlIHRoaXMgc2lnbmFsIGFzeW5jaHJvbm91c2x5IHlvdSBzaG91bGQgY2FsbCBnX29iamVjdF9y ZWYoKSBvbiBAY2VydGlmaWNhdGUKICAgICAgKiBhbmQgcmV0dXJuICVUUlVFLgpAQCAtOTAwLDkg KzkwMCw5IEBAIHN0YXRpYyB2b2lkIHdlYmtpdF93ZWJfdmlld19jbGFzc19pbml0KFdlYktpdFdl YlZpZXdDbGFzcyogd2ViVmlld0NsYXNzKQogICAgICAgICAgICAgZ19zaWduYWxfYWNjdW11bGF0 b3JfdHJ1ZV9oYW5kbGVkLCAwIC8qIGFjY3VtdWxhdG9yIGRhdGEgKi8sCiAgICAgICAgICAgICBn X2NjbG9zdXJlX21hcnNoYWxfZ2VuZXJpYywKICAgICAgICAgICAgIEdfVFlQRV9CT09MRUFOLCAz LAorICAgICAgICAgICAgR19UWVBFX1NUUklORywKICAgICAgICAgICAgIEdfVFlQRV9UTFNfQ0VS VElGSUNBVEUsCi0gICAgICAgICAgICBHX1RZUEVfVExTX0NFUlRJRklDQVRFX0ZMQUdTLAotICAg ICAgICAgICAgR19UWVBFX1NUUklORyk7CisgICAgICAgICAgICBHX1RZUEVfVExTX0NFUlRJRklD QVRFX0ZMQUdTKTsKIAogICAgIC8qKgogICAgICAqIFdlYktpdFdlYlZpZXc6OmNyZWF0ZToKQEAg LTE1ODQsOSArMTU4NCw4IEBAIHZvaWQgd2Via2l0V2ViVmlld0xvYWRGYWlsZWRXaXRoVExTRXJy b3JzKFdlYktpdFdlYlZpZXcqIHdlYlZpZXcsIGNvbnN0IGNoYXIqIGZhCiAKICAgICBXZWJLaXRU TFNFcnJvcnNQb2xpY3kgdGxzRXJyb3JzUG9saWN5ID0gd2Via2l0X3dlYl9jb250ZXh0X2dldF90 bHNfZXJyb3JzX3BvbGljeSh3ZWJWaWV3LT5wcml2LT5jb250ZXh0KTsKICAgICBpZiAodGxzRXJy b3JzUG9saWN5ID09IFdFQktJVF9UTFNfRVJST1JTX1BPTElDWV9GQUlMKSB7Ci0gICAgICAgIEdV bmlxdWVQdHI8U291cFVSST4gc291cFVSSShzb3VwX3VyaV9uZXcoZmFpbGluZ1VSSSkpOwogICAg ICAgICBnYm9vbGVhbiByZXR1cm5WYWx1ZTsKLSAgICAgICAgZ19zaWduYWxfZW1pdCh3ZWJWaWV3 LCBzaWduYWxzW0xPQURfRkFJTEVEX1dJVEhfVExTX0VSUk9SU10sIDAsIGNlcnRpZmljYXRlLCB0 bHNFcnJvcnMsIHNvdXBVUkktPmhvc3QsICZyZXR1cm5WYWx1ZSk7CisgICAgICAgIGdfc2lnbmFs X2VtaXQod2ViVmlldywgc2lnbmFsc1tMT0FEX0ZBSUxFRF9XSVRIX1RMU19FUlJPUlNdLCAwLCBm YWlsaW5nVVJJLCBjZXJ0aWZpY2F0ZSwgdGxzRXJyb3JzLCAmcmV0dXJuVmFsdWUpOwogICAgICAg ICBpZiAoIXJldHVyblZhbHVlKQogICAgICAgICAgICAgZ19zaWduYWxfZW1pdCh3ZWJWaWV3LCBz aWduYWxzW0xPQURfRkFJTEVEXSwgMCwgV0VCS0lUX0xPQURfU1RBUlRFRCwgZmFpbGluZ1VSSSwg ZXJyb3IsICZyZXR1cm5WYWx1ZSk7CiAgICAgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0V2ViVmlldy5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL0FQSS9ndGsvV2ViS2l0V2ViVmlldy5oCmluZGV4IDRlYmEwY2IuLmYzZjA1OWMgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYlZpZXcuaAor KysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJWaWV3LmgKQEAg LTIzNSw5ICsyMzUsOSBAQCBzdHJ1Y3QgX1dlYktpdFdlYlZpZXdDbGFzcyB7CiAgICAgZ2Jvb2xl YW4gICAoKiBhdXRoZW50aWNhdGUpICAgICAgICAgICAgICAgIChXZWJLaXRXZWJWaWV3ICAgICAg ICAgICAgICAgKndlYl92aWV3LAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgV2ViS2l0QXV0aGVudGljYXRpb25SZXF1ZXN0ICpyZXF1ZXN0KTsKICAgICBn Ym9vbGVhbiAgICgqIGxvYWRfZmFpbGVkX3dpdGhfdGxzX2Vycm9ycykgKFdlYktpdFdlYlZpZXcg ICAgICAgICAgICAgICAqd2ViX3ZpZXcsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICBjb25zdCBnY2hhciAgICAgICAgICAgICAgICAgKmZhaWxpbmdfdXJp LAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgR1Rsc0Nl cnRpZmljYXRlICAgICAgICAgICAgICpjZXJ0aWZpY2F0ZSwKLSAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIEdUbHNDZXJ0aWZpY2F0ZUZsYWdzICAgICAgICAg ZXJyb3JzLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg Y29uc3QgZ2NoYXIgICAgICAgICAgICAgICAgICpob3N0KTsKKyAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIEdUbHNDZXJ0aWZpY2F0ZUZsYWdzICAgICAgICAg ZXJyb3JzKTsKICAgICB2b2lkICgqX3dlYmtpdF9yZXNlcnZlZDApICh2b2lkKTsKICAgICB2b2lk ICgqX3dlYmtpdF9yZXNlcnZlZDEpICh2b2lkKTsKICAgICB2b2lkICgqX3dlYmtpdF9yZXNlcnZl ZDIpICh2b2lkKTsKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxv ZwppbmRleCA5NGY0YjE4Li4xNzkxMWRkIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysr IGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjMgQEAKKzIwMTQtMDktMTcgIENhcmxvcyBH YXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgorCisgICAgICAgIFtHVEtdIFdlYktp dFdlYlZpZXc6OmxvYWQtZmFpbGVkLXdpdGgtdGxzLWVycm9ycyBzaG91bGQgcmVjZWl2ZSB0aGUg ZmFpbGluZyBVUkkgaW5zdGVhZCBvZiBhIGhvc3QKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTEzNjg4OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgICogVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXQyR3RrL1Rl c3RTU0wuY3BwOgorICAgICAgICAodGVzdExvYWRGYWlsZWRXaXRoVExTRXJyb3JzKTogQ2hlY2sg dGhhdCBMb2FkRmFpbGVkV2l0aFRMU0Vycm9ycworICAgICAgICBldmVudCB3YXMgYWRkZWQgdG8g dGhlIGV2ZW50cyB2ZWN0b3IuCisgICAgICAgICogVGVzdFdlYktpdEFQSS9ndGsvV2ViS2l0Mkd0 ay9Mb2FkVHJhY2tpbmdUZXN0LmNwcDoKKyAgICAgICAgKGxvYWRGYWlsZWRDYWxsYmFjayk6IERv IG5vdCBhc3N1bWUgdGhlIHdlYiB2aWV3IFVSSSBpcyB0aGUKKyAgICAgICAgZmFpbGluZyBVUkkg d2hlbiB0aGUgbG9hZCBmYWlscyBiZWZvcmUgdGhlIGNvbW1pdHRlZCBzdGF0ZS4KKyAgICAgICAg KGxvYWRGYWlsZWRXaXRoVExTRXJyb3JzQ2FsbGJhY2spOiBIYW5kbGUgdGhlIGNhc2Ugb2YgbG9h ZCBmYWlsdXJlCisgICAgICAgIGJlY2F1c2Ugb2YgVExTIGVycm9ycyBjYW4gY2FsbCBMb2FkVHJh Y2tpbmdUZXN0Ojpsb2FkRmFpbGVkV2l0aFRMU0Vycm9ycy4KKyAgICAgICAgKExvYWRUcmFja2lu Z1Rlc3Q6OkxvYWRUcmFja2luZ1Rlc3QpOiBDb25uZWN0IHRvIFdlYktpdFdlYlZpZXc6OmxvYWQt ZmFpbGVkLXdpdGgtdGxzLWVycm9ycy4KKyAgICAgICAgKExvYWRUcmFja2luZ1Rlc3Q6OmxvYWRG YWlsZWRXaXRoVExTRXJyb3JzKTogQWRkCisgICAgICAgIExvYWRGYWlsZWRXaXRoVExTRXJyb3Jz IGV2ZW50IHRvIHRoZSBldmVudHMgdmVjdG9yLgorICAgICAgICAqIFRlc3RXZWJLaXRBUEkvZ3Rr L1dlYktpdDJHdGsvTG9hZFRyYWNraW5nVGVzdC5oOgorCiAyMDE0LTA5LTE2ICBEYW5pZWwgQmF0 ZXMgIDxkYWJhdGVzQGFwcGxlLmNvbT4KIAogICAgICAgICBbaU9TXSBBZGQgaU9TIFNESyBuYW1l IGFuZCB2ZXJzaW9uIHN1ZmZpeCB0byBXZWJLaXRTeXN0ZW1JbnRlcmZhY2UgZGVidWcvcmVsZWFz ZSBwcm9kdWN0IG5hbWUKZGlmZiAtLWdpdCBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2Vi S2l0Mkd0ay9UZXN0U1NMLmNwcCBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Mkd0 ay9UZXN0U1NMLmNwcAppbmRleCBiMzUxNzI1Li5iMmFkNTQzIDEwMDY0NAotLS0gYS9Ub29scy9U ZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdDJHdGsvVGVzdFNTTC5jcHAKKysrIGIvVG9vbHMvVGVz dFdlYktpdEFQSS9UZXN0cy9XZWJLaXQyR3RrL1Rlc3RTU0wuY3BwCkBAIC0xNTAsNDMgKzE1MCwz NyBAQCBwdWJsaWM6CiAKICAgICBUTFNFcnJvcnNUZXN0KCkKICAgICAgICAgOiBtX3Rsc0Vycm9y cyhzdGF0aWNfY2FzdDxHVGxzQ2VydGlmaWNhdGVGbGFncz4oMCkpCisgICAgICAgICwgbV9mYWls aW5nVVJJKG51bGxwdHIpCiAgICAgewotICAgICAgICBnX3NpZ25hbF9jb25uZWN0KG1fd2ViVmll dywgImxvYWQtZmFpbGVkLXdpdGgtdGxzLWVycm9ycyIsIEdfQ0FMTEJBQ0socnVuTG9hZEZhaWxl ZFdpdGhUTFNFcnJvcnNDYWxsYmFjayksIHRoaXMpOwogICAgIH0KIAogICAgIH5UTFNFcnJvcnNU ZXN0KCkKICAgICB7Ci0gICAgICAgIGdfc2lnbmFsX2hhbmRsZXJzX2Rpc2Nvbm5lY3RfbWF0Y2hl ZChtX3dlYlZpZXcsIEdfU0lHTkFMX01BVENIX0RBVEEsIDAsIDAsIDAsIDAsIHRoaXMpOworICAg ICAgICBpZiAobV9mYWlsaW5nVVJJKQorICAgICAgICAgICAgc291cF91cmlfZnJlZShtX2ZhaWxp bmdVUkkpOwogICAgIH0KIAotICAgIHN0YXRpYyBnYm9vbGVhbiBydW5Mb2FkRmFpbGVkV2l0aFRM U0Vycm9yc0NhbGxiYWNrKFdlYktpdFdlYlZpZXcqLCBHVGxzQ2VydGlmaWNhdGUqIGNlcnRpZmlj YXRlLCBHVGxzQ2VydGlmaWNhdGVGbGFncyB0bHNFcnJvcnMsIGNvbnN0IGNoYXIqIGhvc3QsIFRM U0Vycm9yc1Rlc3QqIHRlc3QpCisgICAgYm9vbCBsb2FkRmFpbGVkV2l0aFRMU0Vycm9ycyhjb25z dCBjaGFyKiBmYWlsaW5nVVJJLCBHVGxzQ2VydGlmaWNhdGUqIGNlcnRpZmljYXRlLCBHVGxzQ2Vy dGlmaWNhdGVGbGFncyB0bHNFcnJvcnMpIG92ZXJyaWRlCiAgICAgewotICAgICAgICB0ZXN0LT5y dW5Mb2FkRmFpbGVkV2l0aFRMU0Vycm9ycyhjZXJ0aWZpY2F0ZSwgdGxzRXJyb3JzLCBob3N0KTsK LSAgICAgICAgcmV0dXJuIFRSVUU7Ci0gICAgfQorICAgICAgICBMb2FkVHJhY2tpbmdUZXN0Ojps b2FkRmFpbGVkV2l0aFRMU0Vycm9ycyhmYWlsaW5nVVJJLCBjZXJ0aWZpY2F0ZSwgdGxzRXJyb3Jz KTsKIAotICAgIHZvaWQgcnVuTG9hZEZhaWxlZFdpdGhUTFNFcnJvcnMoR1Rsc0NlcnRpZmljYXRl KiBjZXJ0aWZpY2F0ZSwgR1Rsc0NlcnRpZmljYXRlRmxhZ3MgdGxzRXJyb3JzLCBjb25zdCBjaGFy KiBob3N0KQotICAgIHsKICAgICAgICAgYXNzZXJ0T2JqZWN0SXNEZWxldGVkV2hlblRlc3RGaW5p c2hlcyhHX09CSkVDVChjZXJ0aWZpY2F0ZSkpOwogICAgICAgICBtX2NlcnRpZmljYXRlID0gY2Vy dGlmaWNhdGU7CiAgICAgICAgIG1fdGxzRXJyb3JzID0gdGxzRXJyb3JzOwotICAgICAgICBtX2hv c3QucmVzZXQoZ19zdHJkdXAoaG9zdCkpOwotICAgICAgICBnX21haW5fbG9vcF9xdWl0KG1fbWFp bkxvb3ApOwotICAgIH0KLQotICAgIHZvaWQgd2FpdFVudGlsTG9hZEZhaWxlZFdpdGhUTFNFcnJv cnMoKQotICAgIHsKLSAgICAgICAgZ19tYWluX2xvb3BfcnVuKG1fbWFpbkxvb3ApOworICAgICAg ICBpZiAobV9mYWlsaW5nVVJJKQorICAgICAgICAgICAgc291cF91cmlfZnJlZShtX2ZhaWxpbmdV UkkpOworICAgICAgICBtX2ZhaWxpbmdVUkkgPSBzb3VwX3VyaV9uZXcoZmFpbGluZ1VSSSk7Cisg ICAgICAgIHJldHVybiB0cnVlOwogICAgIH0KIAogICAgIEdUbHNDZXJ0aWZpY2F0ZSogY2VydGlm aWNhdGUoKSBjb25zdCB7IHJldHVybiBtX2NlcnRpZmljYXRlLmdldCgpOyB9CiAgICAgR1Rsc0Nl cnRpZmljYXRlRmxhZ3MgdGxzRXJyb3JzKCkgY29uc3QgeyByZXR1cm4gbV90bHNFcnJvcnM7IH0K LSAgICBjb25zdCBjaGFyKiBob3N0KCkgY29uc3QgeyByZXR1cm4gbV9ob3N0LmdldCgpOyB9Cisg ICAgY29uc3QgY2hhciogaG9zdCgpIGNvbnN0IHsgcmV0dXJuIG1fZmFpbGluZ1VSSS0+aG9zdDsg fQogCiBwcml2YXRlOgogICAgIEdSZWZQdHI8R1Rsc0NlcnRpZmljYXRlPiBtX2NlcnRpZmljYXRl OwogICAgIEdUbHNDZXJ0aWZpY2F0ZUZsYWdzIG1fdGxzRXJyb3JzOwotICAgIEdVbmlxdWVQdHI8 Y2hhcj4gbV9ob3N0OworICAgIFNvdXBVUkkqIG1fZmFpbGluZ1VSSTsKIH07CiAKIHN0YXRpYyB2 b2lkIHRlc3RMb2FkRmFpbGVkV2l0aFRMU0Vycm9ycyhUTFNFcnJvcnNUZXN0KiB0ZXN0LCBnY29u c3Rwb2ludGVyKQpAQCAtMTk2LDEzICsxOTAsMTMgQEAgc3RhdGljIHZvaWQgdGVzdExvYWRGYWls ZWRXaXRoVExTRXJyb3JzKFRMU0Vycm9yc1Rlc3QqIHRlc3QsIGdjb25zdHBvaW50ZXIpCiAKICAg ICAvLyBUaGUgbG9hZC1mYWlsZWQtd2l0aC10bHMtZXJyb3JzIHNpZ25hbCBzaG91bGQgYmUgZW1p dHRlZCB3aGVuIHRoZXJlIGlzIGEgVExTIGZhaWx1cmUuCiAgICAgdGVzdC0+bG9hZFVSSShrSHR0 cHNTZXJ2ZXItPmdldFVSSUZvclBhdGgoIi90ZXN0LXRscy8iKS5kYXRhKCkpOwotICAgIHRlc3Qt PndhaXRVbnRpbExvYWRGYWlsZWRXaXRoVExTRXJyb3JzKCk7Ci0gICAgLy8gVGVzdCB0aGUgV2Vi S2l0Q2VydGlmaWNhdGVJbmZvIEFQSS4KKyAgICB0ZXN0LT53YWl0VW50aWxMb2FkRmluaXNoZWQo KTsKICAgICBnX2Fzc2VydChHX0lTX1RMU19DRVJUSUZJQ0FURSh0ZXN0LT5jZXJ0aWZpY2F0ZSgp KSk7CiAgICAgZ19hc3NlcnRfY21wdWludCh0ZXN0LT50bHNFcnJvcnMoKSwgPT0sIEdfVExTX0NF UlRJRklDQVRFX1VOS05PV05fQ0EpOwogICAgIGdfYXNzZXJ0X2NtcHN0cih0ZXN0LT5ob3N0KCks ID09LCBzb3VwX3VyaV9nZXRfaG9zdChrSHR0cHNTZXJ2ZXItPmJhc2VVUkkoKSkpOwogICAgIGdf YXNzZXJ0X2NtcGludCh0ZXN0LT5tX2xvYWRFdmVudHNbMF0sID09LCBMb2FkVHJhY2tpbmdUZXN0 OjpQcm92aXNpb25hbExvYWRTdGFydGVkKTsKLSAgICBnX2Fzc2VydF9jbXBpbnQodGVzdC0+bV9s b2FkRXZlbnRzWzFdLCA9PSwgTG9hZFRyYWNraW5nVGVzdDo6TG9hZEZpbmlzaGVkKTsKKyAgICBn X2Fzc2VydF9jbXBpbnQodGVzdC0+bV9sb2FkRXZlbnRzWzFdLCA9PSwgTG9hZFRyYWNraW5nVGVz dDo6TG9hZEZhaWxlZFdpdGhUTFNFcnJvcnMpOworICAgIGdfYXNzZXJ0X2NtcGludCh0ZXN0LT5t X2xvYWRFdmVudHNbMl0sID09LCBMb2FkVHJhY2tpbmdUZXN0OjpMb2FkRmluaXNoZWQpOwogCiAg ICAgLy8gVGVzdCBhbGxvd2luZyBhbiBleGNlcHRpb24gZm9yIHRoaXMgY2VydGlmaWNhdGUgb24g dGhpcyBob3N0LgogICAgIHdlYmtpdF93ZWJfY29udGV4dF9hbGxvd190bHNfY2VydGlmaWNhdGVf Zm9yX2hvc3QoY29udGV4dCwgdGVzdC0+Y2VydGlmaWNhdGUoKSwgdGVzdC0+aG9zdCgpKTsKZGlm ZiAtLWdpdCBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvZ3RrL1dlYktpdDJHdGsvTG9hZFRyYWNraW5n VGVzdC5jcHAgYi9Ub29scy9UZXN0V2ViS2l0QVBJL2d0ay9XZWJLaXQyR3RrL0xvYWRUcmFja2lu Z1Rlc3QuY3BwCmluZGV4IDAyNmE3OWYuLjlhYTMyMzggMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Rlc3RX ZWJLaXRBUEkvZ3RrL1dlYktpdDJHdGsvTG9hZFRyYWNraW5nVGVzdC5jcHAKKysrIGIvVG9vbHMv VGVzdFdlYktpdEFQSS9ndGsvV2ViS2l0Mkd0ay9Mb2FkVHJhY2tpbmdUZXN0LmNwcApAQCAtNjgs NyArNjgsNyBAQCBzdGF0aWMgdm9pZCBsb2FkRmFpbGVkQ2FsbGJhY2soV2ViS2l0V2ViVmlldyog d2ViVmlldywgV2ViS2l0TG9hZEV2ZW50IGxvYWRFdmVudAogICAgIHN3aXRjaCAobG9hZEV2ZW50 KSB7CiAgICAgY2FzZSBXRUJLSVRfTE9BRF9TVEFSVEVEOgogICAgICAgICBnX2Fzc2VydCghd2Vi a2l0X3dlYl92aWV3X2lzX2xvYWRpbmcod2ViVmlldykpOwotICAgICAgICBnX2Fzc2VydF9jbXBz dHIodGVzdC0+bV9hY3RpdmVVUkkuZGF0YSgpLCA9PSwgd2Via2l0X3dlYl92aWV3X2dldF91cmko d2ViVmlldykpOworICAgICAgICBnX2Fzc2VydF9jbXBzdHIodGVzdC0+bV9hY3RpdmVVUkkuZGF0 YSgpLCA9PSwgZmFpbGluZ1VSSSk7CiAgICAgICAgIGdfYXNzZXJ0KGVycm9yKTsKICAgICAgICAg dGVzdC0+cHJvdmlzaW9uYWxMb2FkRmFpbGVkKGZhaWxpbmdVUkksIGVycm9yKTsKICAgICAgICAg YnJlYWs7CkBAIC04Myw2ICs4MywxNiBAQCBzdGF0aWMgdm9pZCBsb2FkRmFpbGVkQ2FsbGJhY2so V2ViS2l0V2ViVmlldyogd2ViVmlldywgV2ViS2l0TG9hZEV2ZW50IGxvYWRFdmVudAogICAgIH0K IH0KIAorc3RhdGljIGdib29sZWFuIGxvYWRGYWlsZWRXaXRoVExTRXJyb3JzQ2FsbGJhY2soV2Vi S2l0V2ViVmlldyogd2ViVmlldywgY29uc3QgY2hhciogZmFpbGluZ1VSSSwgR1Rsc0NlcnRpZmlj YXRlKiBjZXJ0aWZpY2F0ZSwgR1Rsc0NlcnRpZmljYXRlRmxhZ3MgdGxzRXJyb3JzLCBMb2FkVHJh Y2tpbmdUZXN0KiB0ZXN0KQoreworICAgIHRlc3QtPm1fbG9hZEZhaWxlZCA9IHRydWU7CisgICAg Z19hc3NlcnQoIXdlYmtpdF93ZWJfdmlld19pc19sb2FkaW5nKHdlYlZpZXcpKTsKKyAgICBnX2Fz c2VydF9jbXBzdHIodGVzdC0+bV9hY3RpdmVVUkkuZGF0YSgpLCA9PSwgZmFpbGluZ1VSSSk7Cisg ICAgZ19hc3NlcnQoR19JU19UTFNfQ0VSVElGSUNBVEUoY2VydGlmaWNhdGUpKTsKKyAgICBnX2Fz c2VydCh0bHNFcnJvcnMpOworICAgIHJldHVybiB0ZXN0LT5sb2FkRmFpbGVkV2l0aFRMU0Vycm9y cyhmYWlsaW5nVVJJLCBjZXJ0aWZpY2F0ZSwgdGxzRXJyb3JzKTsKK30KKwogc3RhdGljIHZvaWQg ZXN0aW1hdGVkUHJvZ3Jlc3NDaGFuZ2VkQ2FsbGJhY2soR09iamVjdCosIEdQYXJhbVNwZWMqLCBM b2FkVHJhY2tpbmdUZXN0KiB0ZXN0KQogewogICAgIHRlc3QtPmVzdGltYXRlZFByb2dyZXNzQ2hh bmdlZCgpOwpAQCAtOTQsNiArMTA0LDcgQEAgTG9hZFRyYWNraW5nVGVzdDo6TG9hZFRyYWNraW5n VGVzdCgpCiB7CiAgICAgZ19zaWduYWxfY29ubmVjdChtX3dlYlZpZXcsICJsb2FkLWNoYW5nZWQi LCBHX0NBTExCQUNLKGxvYWRDaGFuZ2VkQ2FsbGJhY2spLCB0aGlzKTsKICAgICBnX3NpZ25hbF9j b25uZWN0KG1fd2ViVmlldywgImxvYWQtZmFpbGVkIiwgR19DQUxMQkFDSyhsb2FkRmFpbGVkQ2Fs bGJhY2spLCB0aGlzKTsKKyAgICBnX3NpZ25hbF9jb25uZWN0KG1fd2ViVmlldywgImxvYWQtZmFp bGVkLXdpdGgtdGxzLWVycm9ycyIsIEdfQ0FMTEJBQ0sobG9hZEZhaWxlZFdpdGhUTFNFcnJvcnND YWxsYmFjayksIHRoaXMpOwogICAgIGdfc2lnbmFsX2Nvbm5lY3QobV93ZWJWaWV3LCAibm90aWZ5 Ojplc3RpbWF0ZWQtbG9hZC1wcm9ncmVzcyIsIEdfQ0FMTEJBQ0soZXN0aW1hdGVkUHJvZ3Jlc3ND aGFuZ2VkQ2FsbGJhY2spLCB0aGlzKTsKIAogICAgIGdfYXNzZXJ0KCF3ZWJraXRfd2ViX3ZpZXdf Z2V0X3VyaShtX3dlYlZpZXcpKTsKQEAgLTE0Myw2ICsxNTQsMTIgQEAgdm9pZCBMb2FkVHJhY2tp bmdUZXN0Ojpsb2FkRmFpbGVkKGNvbnN0IGdjaGFyKiBmYWlsaW5nVVJJLCBHRXJyb3IqIGVycm9y KQogICAgIG1fbG9hZEV2ZW50cy5hcHBlbmQoTG9hZEZhaWxlZCk7CiB9CiAKK2Jvb2wgTG9hZFRy YWNraW5nVGVzdDo6bG9hZEZhaWxlZFdpdGhUTFNFcnJvcnMoY29uc3QgZ2NoYXIqIC8qZmFpbGlu Z1VSSSovLCBHVGxzQ2VydGlmaWNhdGUqLCBHVGxzQ2VydGlmaWNhdGVGbGFncykKK3sKKyAgICBt X2xvYWRFdmVudHMuYXBwZW5kKExvYWRGYWlsZWRXaXRoVExTRXJyb3JzKTsKKyAgICByZXR1cm4g ZmFsc2U7Cit9CisKIHZvaWQgTG9hZFRyYWNraW5nVGVzdDo6ZXN0aW1hdGVkUHJvZ3Jlc3NDaGFu Z2VkKCkKIHsKICAgICBkb3VibGUgcHJvZ3Jlc3MgPSB3ZWJraXRfd2ViX3ZpZXdfZ2V0X2VzdGlt YXRlZF9sb2FkX3Byb2dyZXNzKG1fd2ViVmlldyk7CmRpZmYgLS1naXQgYS9Ub29scy9UZXN0V2Vi S2l0QVBJL2d0ay9XZWJLaXQyR3RrL0xvYWRUcmFja2luZ1Rlc3QuaCBiL1Rvb2xzL1Rlc3RXZWJL aXRBUEkvZ3RrL1dlYktpdDJHdGsvTG9hZFRyYWNraW5nVGVzdC5oCmluZGV4IGNhYjg4NGYuLmM5 MjE4NDcgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvZ3RrL1dlYktpdDJHdGsvTG9h ZFRyYWNraW5nVGVzdC5oCisrKyBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvZ3RrL1dlYktpdDJHdGsv TG9hZFRyYWNraW5nVGVzdC5oCkBAIC0zNCw2ICszNCw3IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFs IHZvaWQgcHJvdmlzaW9uYWxMb2FkU3RhcnRlZCgpOwogICAgIHZpcnR1YWwgdm9pZCBwcm92aXNp b25hbExvYWRSZWNlaXZlZFNlcnZlclJlZGlyZWN0KCk7CiAgICAgdmlydHVhbCB2b2lkIHByb3Zp c2lvbmFsTG9hZEZhaWxlZChjb25zdCBnY2hhciogZmFpbGluZ1VSSSwgR0Vycm9yKik7CisgICAg dmlydHVhbCBib29sIGxvYWRGYWlsZWRXaXRoVExTRXJyb3JzKGNvbnN0IGdjaGFyKiBmYWlsaW5n VVJJLCBHVGxzQ2VydGlmaWNhdGUqLCBHVGxzQ2VydGlmaWNhdGVGbGFncyk7CiAgICAgdmlydHVh bCB2b2lkIGxvYWRDb21taXR0ZWQoKTsKICAgICB2aXJ0dWFsIHZvaWQgbG9hZEZpbmlzaGVkKCk7 CiAgICAgdmlydHVhbCB2b2lkIGxvYWRGYWlsZWQoY29uc3QgY2hhciogZmFpbGluZ1VSSSwgR0Vy cm9yKik7CkBAIC01Niw3ICs1Nyw4IEBAIHB1YmxpYzoKICAgICAgICAgUHJvdmlzaW9uYWxMb2Fk RmFpbGVkLAogICAgICAgICBMb2FkQ29tbWl0dGVkLAogICAgICAgICBMb2FkRmluaXNoZWQsCi0g ICAgICAgIExvYWRGYWlsZWQKKyAgICAgICAgTG9hZEZhaWxlZCwKKyAgICAgICAgTG9hZEZhaWxl ZFdpdGhUTFNFcnJvcnMKICAgICB9OwogICAgIGJvb2wgbV9ydW5Mb2FkVW50aWxDb21wbGV0aW9u OwogICAgIGJvb2wgbV9sb2FkRmFpbGVkOwo=