136782 2014-09-12 09:30:14 -0700 [GTK] String changes for the HTTP authentication dialog 2014-12-13 02:26:37 -0800 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) PC Linux RESOLVED FIXED P2 Normal --- 1 mcatanzaro webkit-unassigned berto cgarcia commit-queue gustavo mrobinson sun.shin oldest_to_newest 1034875 0 mcatanzaro 2014-09-12 09:30:14 -0700 There are a few more changes I want to make for our HTTP authentication dialog. These should not be committed until after 2.6 has been branched, since there are string changes. 1034878 1 238034 mcatanzaro 2014-09-12 09:40:46 -0700 Created attachment 238034 Patch 1034879 2 commit-queue 2014-09-12 09:41:37 -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 1034880 3 238035 mcatanzaro 2014-09-12 09:47:47 -0700 Created attachment 238035 Patch Make it easier to translate the server message string 1054556 4 238035 commit-queue 2014-12-11 11:22:56 -0800 Comment on attachment 238035 Patch Clearing flags on attachment: 238035 Committed r177161: <http://trac.webkit.org/changeset/177161> 1054557 5 commit-queue 2014-12-11 11:22:59 -0800 All reviewed patches have been landed. Closing bug. 1055420 6 sun.shin 2014-12-13 02:26:37 -0800 I have GTK build error after this change. I have created fix for it on <https://bugs.webkit.org/show_bug.cgi?id=139620>. 238034 2014-09-12 09:40:46 -0700 2014-09-12 09:47:42 -0700 Patch bug-136782-20140912114042.patch text/plain 6307 mcatanzaro U3VidmVyc2lvbiBSZXZpc2lvbjogMTczNTYwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggMTQwMzM5M2JjOTYxOTAy MWVhOGExNWIyNjYyNWQyYmQ5ZDRiMDEwNi4uMTRkYzhjOTEwYWQwNzVhMDY0OWZkZjA1MjI2YTMx NjFmYjI0MmU2ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDE2IEBACiAyMDE0LTA5LTEyICBNaWNo YWVsIENhdGFuemFybyAgPG1jYXRhbnphcm9AaWdhbGlhLmNvbT4KIAorICAgICAgICBbR1RLXSBT dHJpbmcgY2hhbmdlcyBmb3IgdGhlIEhUVFAgYXV0aGVudGljYXRpb24gZGlhbG9nCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzY3ODIKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkv Z3RrL1dlYktpdEF1dGhlbnRpY2F0aW9uRGlhbG9nLmNwcDogCisgICAgICAgICh3ZWJraXRBdXRo ZW50aWNhdGlvbkRpYWxvZ0luaXRpYWxpemUpOiBBZGQgYSB0aXRsZSB0byB0aGUgZGlhbG9nLCBh ZGQKKyAgICAgICAgc29tZSBtaXNzaW5nIG1uZW1vbmljcywgYW5kIHR3ZWFrIGEgZmV3IHN0cmlu Z3MuCisKKzIwMTQtMDktMTIgIE1pY2hhZWwgQ2F0YW56YXJvICA8bWNhdGFuemFyb0BpZ2FsaWEu Y29tPgorCiAgICAgICAgIFtHVEtdIFVzZSBhIG5pY2VyIEhUVFAgYXV0aGVudGljYXRpb24gZGlh bG9nCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzY2 MTUKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0 QXV0aGVudGljYXRpb25EaWFsb2cuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9n dGsvV2ViS2l0QXV0aGVudGljYXRpb25EaWFsb2cuY3BwCmluZGV4IGNkMWM4OWE5ZmUwMzZiMTU1 N2VjZDdjNzA0ZmU0MDM3ODU4YjAwYzIuLjJkYWMyMjIzZjI4OTVjOWUzOWFlYzFhNzgyOTRlMDNh Yjc0MTE2YzcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dl YktpdEF1dGhlbnRpY2F0aW9uRGlhbG9nLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvQVBJL2d0ay9XZWJLaXRBdXRoZW50aWNhdGlvbkRpYWxvZy5jcHAKQEAgLTg4LDE4ICs4OCwy NiBAQCBzdGF0aWMgdm9pZCB3ZWJraXRBdXRoZW50aWNhdGlvbkRpYWxvZ0luaXRpYWxpemUoV2Vi S2l0QXV0aGVudGljYXRpb25EaWFsb2cqIGF1dAogICAgIEd0a1dpZGdldCogdkJveCA9IGd0a19i b3hfbmV3KEdUS19PUklFTlRBVElPTl9WRVJUSUNBTCwgNik7CiAgICAgZ3RrX2NvbnRhaW5lcl9z ZXRfYm9yZGVyX3dpZHRoKEdUS19DT05UQUlORVIodkJveCksIDEyKTsKIAorICAgIEd0a1dpZGdl dCogbGFiZWwgPSBndGtfbGFiZWxfbmV3KG51bGxwdHIpOworICAgIC8vIFRpdGxlIG9mIHRoZSBI VFRQIGF1dGhlbnRpY2F0aW9uIGRpYWxvZy4KKyAgICBHVW5pcXVlUHRyPGNoYXI+IHRpdGxlKGdf c3RyZHVwX3ByaW50ZigiPGI+JXM8L2I+IiwgXygiQXV0aGVudGljYXRpb24gUmVxdWlyZWQiKSkp OworICAgIGd0a19sYWJlbF9zZXRfbWFya3VwKEdUS19MQUJFTChsYWJlbCksIHRpdGxlLmdldCgp KTsKKyAgICBndGtfd2lkZ2V0X3NldF9oYWxpZ24obGFiZWwsIEdUS19BTElHTl9DRU5URVIpOwor ICAgIGd0a193aWRnZXRfc2hvdyhsYWJlbCk7CisgICAgZ3RrX2JveF9wYWNrX3N0YXJ0KEdUS19C T1godkJveCksIGxhYmVsLCBGQUxTRSwgRkFMU0UsIDApOworCiAgICAgR3RrV2lkZ2V0KiBidXR0 b25Cb3ggPSBndGtfYnV0dG9uX2JveF9uZXcoR1RLX09SSUVOVEFUSU9OX0hPUklaT05UQUwpOwog ICAgIGd0a19idXR0b25fYm94X3NldF9sYXlvdXQoR1RLX0JVVFRPTl9CT1goYnV0dG9uQm94KSwg R1RLX0JVVFRPTkJPWF9FTkQpOwogICAgIGd0a19jb250YWluZXJfc2V0X2JvcmRlcl93aWR0aChH VEtfQ09OVEFJTkVSKGJ1dHRvbkJveCksIDUpOwogICAgIGd0a19ib3hfc2V0X3NwYWNpbmcoR1RL X0JPWChidXR0b25Cb3gpLCA2KTsKIAotICAgIEd0a1dpZGdldCogYnV0dG9uID0gZ3RrX2J1dHRv bl9uZXdfZnJvbV9zdG9jayhHVEtfU1RPQ0tfQ0FOQ0VMKTsKKyAgICBHdGtXaWRnZXQqIGJ1dHRv biA9IGd0a19idXR0b25fbmV3X3dpdGhfbW5lbW9uaWMoXygiX0NhbmNlbCIpKTsKICAgICBnX3Np Z25hbF9jb25uZWN0KGJ1dHRvbiwgImNsaWNrZWQiLCBHX0NBTExCQUNLKGNhbmNlbEJ1dHRvbkNs aWNrZWQpLCBhdXRoRGlhbG9nKTsKICAgICBndGtfYm94X3BhY2tfZW5kKEdUS19CT1goYnV0dG9u Qm94KSwgYnV0dG9uLCBGQUxTRSwgVFJVRSwgMCk7CiAgICAgZ3RrX3dpZGdldF9zaG93KGJ1dHRv bik7CiAKICAgICBXZWJLaXRBdXRoZW50aWNhdGlvbkRpYWxvZ1ByaXZhdGUqIHByaXYgPSBhdXRo RGlhbG9nLT5wcml2OwotICAgIGJ1dHRvbiA9IGd0a19idXR0b25fbmV3X2Zyb21fc3RvY2soR1RL X1NUT0NLX09LKTsKKyAgICBidXR0b24gPSBndGtfYnV0dG9uX25ld193aXRoX21uZW1vbmljKF8o Il9BdXRoZW50aWNhdGUiKSk7CiAgICAgcHJpdi0+ZGVmYXVsdEJ1dHRvbiA9IGJ1dHRvbjsKICAg ICBnX3NpZ25hbF9jb25uZWN0KGJ1dHRvbiwgImNsaWNrZWQiLCBHX0NBTExCQUNLKG9rQnV0dG9u Q2xpY2tlZCksIGF1dGhEaWFsb2cpOwogICAgIGd0a193aWRnZXRfc2V0X2Nhbl9kZWZhdWx0KGJ1 dHRvbiwgVFJVRSk7CkBAIC0xMTEsMTUgKzExOSwxNSBAQCBzdGF0aWMgdm9pZCB3ZWJraXRBdXRo ZW50aWNhdGlvbkRpYWxvZ0luaXRpYWxpemUoV2ViS2l0QXV0aGVudGljYXRpb25EaWFsb2cqIGF1 dAogCiAgICAgY29uc3QgV2ViQ29yZTo6QXV0aGVudGljYXRpb25DaGFsbGVuZ2UmIGNoYWxsZW5n ZSA9IHdlYmtpdEF1dGhlbnRpY2F0aW9uUmVxdWVzdEdldEF1dGhlbnRpY2F0aW9uQ2hhbGxlbmdl KHByaXYtPnJlcXVlc3QuZ2V0KCkpLT5jb3JlKCk7CiAgICAgLy8gUHJvbXB0IG9uIHRoZSBIVFRQ IGF1dGhlbnRpY2F0aW9uIGRpYWxvZy4KLSAgICBHVW5pcXVlUHRyPGNoYXI+IHByb21wdChnX3N0 cmR1cF9wcmludGYoXygiVGhlIHNpdGUgJXM6JWkgcmVxdWVzdHMgYSB1c2VybmFtZSBhbmQgcGFz c3dvcmQiKSwKKyAgICBHVW5pcXVlUHRyPGNoYXI+IHByb21wdChnX3N0cmR1cF9wcmludGYoXygi QXV0aGVudGljYXRpb24gcmVxdWlyZWQgYnkgJXM6JWkiKSwKICAgICAgICAgY2hhbGxlbmdlLnBy b3RlY3Rpb25TcGFjZSgpLmhvc3QoKS51dGY4KCkuZGF0YSgpLCBjaGFsbGVuZ2UucHJvdGVjdGlv blNwYWNlKCkucG9ydCgpKSk7Ci0gICAgR3RrV2lkZ2V0KiBsYWJlbCA9IGNyZWF0ZUxhYmVsV2l0 aExpbmVXcmFwKHByb21wdC5nZXQoKSk7CisgICAgbGFiZWwgPSBjcmVhdGVMYWJlbFdpdGhMaW5l V3JhcChwcm9tcHQuZ2V0KCkpOwogICAgIGd0a193aWRnZXRfc2hvdyhsYWJlbCk7CiAgICAgZ3Rr X2JveF9wYWNrX3N0YXJ0KEdUS19CT1goYXV0aEJveCksIGxhYmVsLCBGQUxTRSwgRkFMU0UsIDAp OwogCiAgICAgU3RyaW5nIHJlYWxtID0gY2hhbGxlbmdlLnByb3RlY3Rpb25TcGFjZSgpLnJlYWxt KCk7CiAgICAgaWYgKCFyZWFsbS5pc0VtcHR5KCkpIHsKLSAgICAgICAgR1VuaXF1ZVB0cjxjaGFy PiBtZXNzYWdlKGdfc3RyZHVwX3ByaW50ZigiJXMg4oCcJXPigJ0iLCBfKCJTZXJ2ZXIgbWVzc2Fn ZToiKSwgcmVhbG0udXRmOCgpLmRhdGEoKSkpOworICAgICAgICBHVW5pcXVlUHRyPGNoYXI+IG1l c3NhZ2UoZ19zdHJkdXBfcHJpbnRmKCIlcyDigJwlc+KAnSIsIF8oIlRoZSBzaXRlIHNheXM6Iiks IHJlYWxtLnV0ZjgoKS5kYXRhKCkpKTsKICAgICAgICAgbGFiZWwgPSBjcmVhdGVMYWJlbFdpdGhM aW5lV3JhcChtZXNzYWdlLmdldCgpKTsKICAgICAgICAgZ3RrX3dpZGdldF9zaG93KGxhYmVsKTsK ICAgICAgICAgZ3RrX2JveF9wYWNrX3N0YXJ0KEdUS19CT1goYXV0aEJveCksIGxhYmVsLCBGQUxT RSwgRkFMU0UsIDApOwpAQCAtMTI5LDI4ICsxMzcsMzAgQEAgc3RhdGljIHZvaWQgd2Via2l0QXV0 aGVudGljYXRpb25EaWFsb2dJbml0aWFsaXplKFdlYktpdEF1dGhlbnRpY2F0aW9uRGlhbG9nKiBh dXQKICAgICBwcml2LT5yZW1lbWJlckNoZWNrQnV0dG9uID0gZ3RrX2NoZWNrX2J1dHRvbl9uZXdf d2l0aF9tbmVtb25pYyhfKCJfUmVtZW1iZXIgcGFzc3dvcmQiKSk7CiAgICAgZ3RrX2xhYmVsX3Nl dF9saW5lX3dyYXAoR1RLX0xBQkVMKGd0a19iaW5fZ2V0X2NoaWxkKEdUS19CSU4ocHJpdi0+cmVt ZW1iZXJDaGVja0J1dHRvbikpKSwgVFJVRSk7CiAKLSAgICAvLyBFbnRyeSBvbiB0aGUgSFRUUCBh dXRoZW50aWNhdGlvbiBkaWFsb2cuCi0gICAgR3RrV2lkZ2V0KiBsb2dpbkxhYmVsID0gZ3RrX2xh YmVsX25ldyhfKCJVc2VybmFtZToiKSk7Ci0gICAgZ3RrX3dpZGdldF9zZXRfaGFsaWduKGxvZ2lu TGFiZWwsIEdUS19BTElHTl9FTkQpOwotICAgIGd0a19zdHlsZV9jb250ZXh0X2FkZF9jbGFzcyhn dGtfd2lkZ2V0X2dldF9zdHlsZV9jb250ZXh0KGxvZ2luTGFiZWwpLCBHVEtfU1RZTEVfQ0xBU1Nf RElNX0xBQkVMKTsKLSAgICBndGtfd2lkZ2V0X3Nob3cobG9naW5MYWJlbCk7Ci0KICAgICBwcml2 LT5sb2dpbkVudHJ5ID0gZ3RrX2VudHJ5X25ldygpOwogICAgIGd0a193aWRnZXRfc2V0X2hleHBh bmQocHJpdi0+bG9naW5FbnRyeSwgVFJVRSk7CiAgICAgZ3RrX2VudHJ5X3NldF9hY3RpdmF0ZXNf ZGVmYXVsdChHVEtfRU5UUlkocHJpdi0+bG9naW5FbnRyeSksIFRSVUUpOwogICAgIGd0a193aWRn ZXRfc2hvdyhwcml2LT5sb2dpbkVudHJ5KTsKIAogICAgIC8vIEVudHJ5IG9uIHRoZSBIVFRQIGF1 dGhlbnRpY2F0aW9uIGRpYWxvZy4KLSAgICBHdGtXaWRnZXQqIHBhc3N3b3JkTGFiZWwgPSBndGtf bGFiZWxfbmV3KF8oIlBhc3N3b3JkOiIpKTsKLSAgICBndGtfd2lkZ2V0X3NldF9oYWxpZ24ocGFz c3dvcmRMYWJlbCwgR1RLX0FMSUdOX0VORCk7Ci0gICAgZ3RrX3N0eWxlX2NvbnRleHRfYWRkX2Ns YXNzKGd0a193aWRnZXRfZ2V0X3N0eWxlX2NvbnRleHQocGFzc3dvcmRMYWJlbCksIEdUS19TVFlM RV9DTEFTU19ESU1fTEFCRUwpOwotICAgIGd0a193aWRnZXRfc2hvdyhwYXNzd29yZExhYmVsKTsK KyAgICBHdGtXaWRnZXQqIGxvZ2luTGFiZWwgPSBndGtfbGFiZWxfbmV3X3dpdGhfbW5lbW9uaWMo XygiX1VzZXJuYW1lIikpOworICAgIGd0a19sYWJlbF9zZXRfbW5lbW9uaWNfd2lkZ2V0KEdUS19M QUJFTChsb2dpbkxhYmVsKSwgcHJpdi0+bG9naW5FbnRyeSk7CisgICAgZ3RrX3dpZGdldF9zZXRf aGFsaWduKGxvZ2luTGFiZWwsIEdUS19BTElHTl9FTkQpOworICAgIGd0a19zdHlsZV9jb250ZXh0 X2FkZF9jbGFzcyhndGtfd2lkZ2V0X2dldF9zdHlsZV9jb250ZXh0KGxvZ2luTGFiZWwpLCBHVEtf U1RZTEVfQ0xBU1NfRElNX0xBQkVMKTsKKyAgICBndGtfd2lkZ2V0X3Nob3cobG9naW5MYWJlbCk7 CiAKICAgICBwcml2LT5wYXNzd29yZEVudHJ5ID0gZ3RrX2VudHJ5X25ldygpOwogICAgIGd0a193 aWRnZXRfc2V0X2hleHBhbmQocHJpdi0+cGFzc3dvcmRFbnRyeSwgVFJVRSk7CiAgICAgZ3RrX2Vu dHJ5X3NldF9hY3RpdmF0ZXNfZGVmYXVsdChHVEtfRU5UUlkocHJpdi0+cGFzc3dvcmRFbnRyeSks IFRSVUUpOwogICAgIGd0a193aWRnZXRfc2hvdyhwcml2LT5wYXNzd29yZEVudHJ5KTsKIAorICAg IC8vIEVudHJ5IG9uIHRoZSBIVFRQIGF1dGhlbnRpY2F0aW9uIGRpYWxvZy4KKyAgICBHdGtXaWRn ZXQqIHBhc3N3b3JkTGFiZWwgPSBndGtfbGFiZWxfbmV3X3dpdGhfbW5lbW9uaWMoXygiX1Bhc3N3 b3JkIikpOworICAgIGd0a19sYWJlbF9zZXRfbW5lbW9uaWNfd2lkZ2V0KEdUS19MQUJFTChwYXNz d29yZExhYmVsKSwgcHJpdi0+cGFzc3dvcmRFbnRyeSk7CisgICAgZ3RrX3dpZGdldF9zZXRfaGFs aWduKHBhc3N3b3JkTGFiZWwsIEdUS19BTElHTl9FTkQpOworICAgIGd0a19zdHlsZV9jb250ZXh0 X2FkZF9jbGFzcyhndGtfd2lkZ2V0X2dldF9zdHlsZV9jb250ZXh0KHBhc3N3b3JkTGFiZWwpLCBH VEtfU1RZTEVfQ0xBU1NfRElNX0xBQkVMKTsKKyAgICBndGtfd2lkZ2V0X3Nob3cocGFzc3dvcmRM YWJlbCk7CisKICAgICBHdGtXaWRnZXQqIGdyaWQgPSBndGtfZ3JpZF9uZXcoKTsKICAgICBndGtf Z3JpZF9zZXRfY29sdW1uX3NwYWNpbmcoR1RLX0dSSUQoZ3JpZCksIDYpOwogICAgIGd0a19ncmlk X3NldF9yb3dfc3BhY2luZyhHVEtfR1JJRChncmlkKSwgNik7Cg== 238035 2014-09-12 09:47:47 -0700 2014-12-11 11:22:56 -0800 Patch bug-136782-20140912114743.patch text/plain 6406 mcatanzaro U3VidmVyc2lvbiBSZXZpc2lvbjogMTczNTYwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggMTQwMzM5M2JjOTYxOTAy MWVhOGExNWIyNjYyNWQyYmQ5ZDRiMDEwNi4uNTQ5NGIwZThiNTNiZjVmNTk5YjFlMmZhODVlOWVh MjIxZDlkYzY2ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDE2IEBACiAyMDE0LTA5LTEyICBNaWNo YWVsIENhdGFuemFybyAgPG1jYXRhbnphcm9AaWdhbGlhLmNvbT4KIAorICAgICAgICBbR1RLXSBT dHJpbmcgY2hhbmdlcyBmb3IgdGhlIEhUVFAgYXV0aGVudGljYXRpb24gZGlhbG9nCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzY3ODIKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkv Z3RrL1dlYktpdEF1dGhlbnRpY2F0aW9uRGlhbG9nLmNwcDoKKyAgICAgICAgKHdlYmtpdEF1dGhl bnRpY2F0aW9uRGlhbG9nSW5pdGlhbGl6ZSk6IEFkZCBhIHRpdGxlIHRvIHRoZSBkaWFsb2csIGFk ZAorICAgICAgICBzb21lIG1pc3NpbmcgbW5lbW9uaWNzLCBhbmQgdHdlYWsgYSBmZXcgc3RyaW5n cy4KKworMjAxNC0wOS0xMiAgTWljaGFlbCBDYXRhbnphcm8gIDxtY2F0YW56YXJvQGlnYWxpYS5j b20+CisKICAgICAgICAgW0dUS10gVXNlIGEgbmljZXIgSFRUUCBhdXRoZW50aWNhdGlvbiBkaWFs b2cKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzNjYx NQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRB dXRoZW50aWNhdGlvbkRpYWxvZy5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0 ay9XZWJLaXRBdXRoZW50aWNhdGlvbkRpYWxvZy5jcHAKaW5kZXggY2QxYzg5YTlmZTAzNmIxNTU3 ZWNkN2M3MDRmZTQwMzc4NThiMDBjMi4uYWRkN2QzMmI0YzlmNDRlYmZjMDA3ZGM4NDg2NmJkZTBi NmE3MzFlYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2Vi S2l0QXV0aGVudGljYXRpb25EaWFsb2cuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9BUEkvZ3RrL1dlYktpdEF1dGhlbnRpY2F0aW9uRGlhbG9nLmNwcApAQCAtODgsMTggKzg4LDI2 IEBAIHN0YXRpYyB2b2lkIHdlYmtpdEF1dGhlbnRpY2F0aW9uRGlhbG9nSW5pdGlhbGl6ZShXZWJL aXRBdXRoZW50aWNhdGlvbkRpYWxvZyogYXV0CiAgICAgR3RrV2lkZ2V0KiB2Qm94ID0gZ3RrX2Jv eF9uZXcoR1RLX09SSUVOVEFUSU9OX1ZFUlRJQ0FMLCA2KTsKICAgICBndGtfY29udGFpbmVyX3Nl dF9ib3JkZXJfd2lkdGgoR1RLX0NPTlRBSU5FUih2Qm94KSwgMTIpOwogCisgICAgR3RrV2lkZ2V0 KiBsYWJlbCA9IGd0a19sYWJlbF9uZXcobnVsbHB0cik7CisgICAgLy8gVGl0bGUgb2YgdGhlIEhU VFAgYXV0aGVudGljYXRpb24gZGlhbG9nLgorICAgIEdVbmlxdWVQdHI8Y2hhcj4gdGl0bGUoZ19z dHJkdXBfcHJpbnRmKCI8Yj4lczwvYj4iLCBfKCJBdXRoZW50aWNhdGlvbiBSZXF1aXJlZCIpKSk7 CisgICAgZ3RrX2xhYmVsX3NldF9tYXJrdXAoR1RLX0xBQkVMKGxhYmVsKSwgdGl0bGUuZ2V0KCkp OworICAgIGd0a193aWRnZXRfc2V0X2hhbGlnbihsYWJlbCwgR1RLX0FMSUdOX0NFTlRFUik7Cisg ICAgZ3RrX3dpZGdldF9zaG93KGxhYmVsKTsKKyAgICBndGtfYm94X3BhY2tfc3RhcnQoR1RLX0JP WCh2Qm94KSwgbGFiZWwsIEZBTFNFLCBGQUxTRSwgMCk7CisKICAgICBHdGtXaWRnZXQqIGJ1dHRv bkJveCA9IGd0a19idXR0b25fYm94X25ldyhHVEtfT1JJRU5UQVRJT05fSE9SSVpPTlRBTCk7CiAg ICAgZ3RrX2J1dHRvbl9ib3hfc2V0X2xheW91dChHVEtfQlVUVE9OX0JPWChidXR0b25Cb3gpLCBH VEtfQlVUVE9OQk9YX0VORCk7CiAgICAgZ3RrX2NvbnRhaW5lcl9zZXRfYm9yZGVyX3dpZHRoKEdU S19DT05UQUlORVIoYnV0dG9uQm94KSwgNSk7CiAgICAgZ3RrX2JveF9zZXRfc3BhY2luZyhHVEtf Qk9YKGJ1dHRvbkJveCksIDYpOwogCi0gICAgR3RrV2lkZ2V0KiBidXR0b24gPSBndGtfYnV0dG9u X25ld19mcm9tX3N0b2NrKEdUS19TVE9DS19DQU5DRUwpOworICAgIEd0a1dpZGdldCogYnV0dG9u ID0gZ3RrX2J1dHRvbl9uZXdfd2l0aF9tbmVtb25pYyhfKCJfQ2FuY2VsIikpOwogICAgIGdfc2ln bmFsX2Nvbm5lY3QoYnV0dG9uLCAiY2xpY2tlZCIsIEdfQ0FMTEJBQ0soY2FuY2VsQnV0dG9uQ2xp Y2tlZCksIGF1dGhEaWFsb2cpOwogICAgIGd0a19ib3hfcGFja19lbmQoR1RLX0JPWChidXR0b25C b3gpLCBidXR0b24sIEZBTFNFLCBUUlVFLCAwKTsKICAgICBndGtfd2lkZ2V0X3Nob3coYnV0dG9u KTsKIAogICAgIFdlYktpdEF1dGhlbnRpY2F0aW9uRGlhbG9nUHJpdmF0ZSogcHJpdiA9IGF1dGhE aWFsb2ctPnByaXY7Ci0gICAgYnV0dG9uID0gZ3RrX2J1dHRvbl9uZXdfZnJvbV9zdG9jayhHVEtf U1RPQ0tfT0spOworICAgIGJ1dHRvbiA9IGd0a19idXR0b25fbmV3X3dpdGhfbW5lbW9uaWMoXygi X0F1dGhlbnRpY2F0ZSIpKTsKICAgICBwcml2LT5kZWZhdWx0QnV0dG9uID0gYnV0dG9uOwogICAg IGdfc2lnbmFsX2Nvbm5lY3QoYnV0dG9uLCAiY2xpY2tlZCIsIEdfQ0FMTEJBQ0sob2tCdXR0b25D bGlja2VkKSwgYXV0aERpYWxvZyk7CiAgICAgZ3RrX3dpZGdldF9zZXRfY2FuX2RlZmF1bHQoYnV0 dG9uLCBUUlVFKTsKQEAgLTExMSwxNSArMTE5LDE2IEBAIHN0YXRpYyB2b2lkIHdlYmtpdEF1dGhl bnRpY2F0aW9uRGlhbG9nSW5pdGlhbGl6ZShXZWJLaXRBdXRoZW50aWNhdGlvbkRpYWxvZyogYXV0 CiAKICAgICBjb25zdCBXZWJDb3JlOjpBdXRoZW50aWNhdGlvbkNoYWxsZW5nZSYgY2hhbGxlbmdl ID0gd2Via2l0QXV0aGVudGljYXRpb25SZXF1ZXN0R2V0QXV0aGVudGljYXRpb25DaGFsbGVuZ2Uo cHJpdi0+cmVxdWVzdC5nZXQoKSktPmNvcmUoKTsKICAgICAvLyBQcm9tcHQgb24gdGhlIEhUVFAg YXV0aGVudGljYXRpb24gZGlhbG9nLgotICAgIEdVbmlxdWVQdHI8Y2hhcj4gcHJvbXB0KGdfc3Ry ZHVwX3ByaW50ZihfKCJUaGUgc2l0ZSAlczolaSByZXF1ZXN0cyBhIHVzZXJuYW1lIGFuZCBwYXNz d29yZCIpLAorICAgIEdVbmlxdWVQdHI8Y2hhcj4gcHJvbXB0KGdfc3RyZHVwX3ByaW50ZihfKCJB dXRoZW50aWNhdGlvbiByZXF1aXJlZCBieSAlczolaSIpLAogICAgICAgICBjaGFsbGVuZ2UucHJv dGVjdGlvblNwYWNlKCkuaG9zdCgpLnV0ZjgoKS5kYXRhKCksIGNoYWxsZW5nZS5wcm90ZWN0aW9u U3BhY2UoKS5wb3J0KCkpKTsKLSAgICBHdGtXaWRnZXQqIGxhYmVsID0gY3JlYXRlTGFiZWxXaXRo TGluZVdyYXAocHJvbXB0LmdldCgpKTsKKyAgICBsYWJlbCA9IGNyZWF0ZUxhYmVsV2l0aExpbmVX cmFwKHByb21wdC5nZXQoKSk7CiAgICAgZ3RrX3dpZGdldF9zaG93KGxhYmVsKTsKICAgICBndGtf Ym94X3BhY2tfc3RhcnQoR1RLX0JPWChhdXRoQm94KSwgbGFiZWwsIEZBTFNFLCBGQUxTRSwgMCk7 CiAKICAgICBTdHJpbmcgcmVhbG0gPSBjaGFsbGVuZ2UucHJvdGVjdGlvblNwYWNlKCkucmVhbG0o KTsKICAgICBpZiAoIXJlYWxtLmlzRW1wdHkoKSkgewotICAgICAgICBHVW5pcXVlUHRyPGNoYXI+ IG1lc3NhZ2UoZ19zdHJkdXBfcHJpbnRmKCIlcyDigJwlc+KAnSIsIF8oIlNlcnZlciBtZXNzYWdl OiIpLCByZWFsbS51dGY4KCkuZGF0YSgpKSk7CisgICAgICAgIC8vIExhYmVsIG9uIHRoZSBIVFRQ IGF1dGhlbnRpY2F0aW9uIGRpYWxvZy4gJXMgaXMgYSAocHJvYmFibHkgRW5nbGlzaCkgbWVzc2Fn ZSBmcm9tIHRoZSB3ZWJzaXRlLgorICAgICAgICBHVW5pcXVlUHRyPGNoYXI+IG1lc3NhZ2UoZ19z dHJkdXBfcHJpbnRmKF8oIlRoZSBzaXRlIHNheXM6IOKAnCVz4oCdIiksIHJlYWxtLnV0ZjgoKS5k YXRhKCkpKTsKICAgICAgICAgbGFiZWwgPSBjcmVhdGVMYWJlbFdpdGhMaW5lV3JhcChtZXNzYWdl LmdldCgpKTsKICAgICAgICAgZ3RrX3dpZGdldF9zaG93KGxhYmVsKTsKICAgICAgICAgZ3RrX2Jv eF9wYWNrX3N0YXJ0KEdUS19CT1goYXV0aEJveCksIGxhYmVsLCBGQUxTRSwgRkFMU0UsIDApOwpA QCAtMTI5LDI4ICsxMzgsMzAgQEAgc3RhdGljIHZvaWQgd2Via2l0QXV0aGVudGljYXRpb25EaWFs b2dJbml0aWFsaXplKFdlYktpdEF1dGhlbnRpY2F0aW9uRGlhbG9nKiBhdXQKICAgICBwcml2LT5y ZW1lbWJlckNoZWNrQnV0dG9uID0gZ3RrX2NoZWNrX2J1dHRvbl9uZXdfd2l0aF9tbmVtb25pYyhf KCJfUmVtZW1iZXIgcGFzc3dvcmQiKSk7CiAgICAgZ3RrX2xhYmVsX3NldF9saW5lX3dyYXAoR1RL X0xBQkVMKGd0a19iaW5fZ2V0X2NoaWxkKEdUS19CSU4ocHJpdi0+cmVtZW1iZXJDaGVja0J1dHRv bikpKSwgVFJVRSk7CiAKLSAgICAvLyBFbnRyeSBvbiB0aGUgSFRUUCBhdXRoZW50aWNhdGlvbiBk aWFsb2cuCi0gICAgR3RrV2lkZ2V0KiBsb2dpbkxhYmVsID0gZ3RrX2xhYmVsX25ldyhfKCJVc2Vy bmFtZToiKSk7Ci0gICAgZ3RrX3dpZGdldF9zZXRfaGFsaWduKGxvZ2luTGFiZWwsIEdUS19BTElH Tl9FTkQpOwotICAgIGd0a19zdHlsZV9jb250ZXh0X2FkZF9jbGFzcyhndGtfd2lkZ2V0X2dldF9z dHlsZV9jb250ZXh0KGxvZ2luTGFiZWwpLCBHVEtfU1RZTEVfQ0xBU1NfRElNX0xBQkVMKTsKLSAg ICBndGtfd2lkZ2V0X3Nob3cobG9naW5MYWJlbCk7Ci0KICAgICBwcml2LT5sb2dpbkVudHJ5ID0g Z3RrX2VudHJ5X25ldygpOwogICAgIGd0a193aWRnZXRfc2V0X2hleHBhbmQocHJpdi0+bG9naW5F bnRyeSwgVFJVRSk7CiAgICAgZ3RrX2VudHJ5X3NldF9hY3RpdmF0ZXNfZGVmYXVsdChHVEtfRU5U UlkocHJpdi0+bG9naW5FbnRyeSksIFRSVUUpOwogICAgIGd0a193aWRnZXRfc2hvdyhwcml2LT5s b2dpbkVudHJ5KTsKIAogICAgIC8vIEVudHJ5IG9uIHRoZSBIVFRQIGF1dGhlbnRpY2F0aW9uIGRp YWxvZy4KLSAgICBHdGtXaWRnZXQqIHBhc3N3b3JkTGFiZWwgPSBndGtfbGFiZWxfbmV3KF8oIlBh c3N3b3JkOiIpKTsKLSAgICBndGtfd2lkZ2V0X3NldF9oYWxpZ24ocGFzc3dvcmRMYWJlbCwgR1RL X0FMSUdOX0VORCk7Ci0gICAgZ3RrX3N0eWxlX2NvbnRleHRfYWRkX2NsYXNzKGd0a193aWRnZXRf Z2V0X3N0eWxlX2NvbnRleHQocGFzc3dvcmRMYWJlbCksIEdUS19TVFlMRV9DTEFTU19ESU1fTEFC RUwpOwotICAgIGd0a193aWRnZXRfc2hvdyhwYXNzd29yZExhYmVsKTsKKyAgICBHdGtXaWRnZXQq IGxvZ2luTGFiZWwgPSBndGtfbGFiZWxfbmV3X3dpdGhfbW5lbW9uaWMoXygiX1VzZXJuYW1lIikp OworICAgIGd0a19sYWJlbF9zZXRfbW5lbW9uaWNfd2lkZ2V0KEdUS19MQUJFTChsb2dpbkxhYmVs KSwgcHJpdi0+bG9naW5FbnRyeSk7CisgICAgZ3RrX3dpZGdldF9zZXRfaGFsaWduKGxvZ2luTGFi ZWwsIEdUS19BTElHTl9FTkQpOworICAgIGd0a19zdHlsZV9jb250ZXh0X2FkZF9jbGFzcyhndGtf d2lkZ2V0X2dldF9zdHlsZV9jb250ZXh0KGxvZ2luTGFiZWwpLCBHVEtfU1RZTEVfQ0xBU1NfRElN X0xBQkVMKTsKKyAgICBndGtfd2lkZ2V0X3Nob3cobG9naW5MYWJlbCk7CiAKICAgICBwcml2LT5w YXNzd29yZEVudHJ5ID0gZ3RrX2VudHJ5X25ldygpOwogICAgIGd0a193aWRnZXRfc2V0X2hleHBh bmQocHJpdi0+cGFzc3dvcmRFbnRyeSwgVFJVRSk7CiAgICAgZ3RrX2VudHJ5X3NldF9hY3RpdmF0 ZXNfZGVmYXVsdChHVEtfRU5UUlkocHJpdi0+cGFzc3dvcmRFbnRyeSksIFRSVUUpOwogICAgIGd0 a193aWRnZXRfc2hvdyhwcml2LT5wYXNzd29yZEVudHJ5KTsKIAorICAgIC8vIEVudHJ5IG9uIHRo ZSBIVFRQIGF1dGhlbnRpY2F0aW9uIGRpYWxvZy4KKyAgICBHdGtXaWRnZXQqIHBhc3N3b3JkTGFi ZWwgPSBndGtfbGFiZWxfbmV3X3dpdGhfbW5lbW9uaWMoXygiX1Bhc3N3b3JkIikpOworICAgIGd0 a19sYWJlbF9zZXRfbW5lbW9uaWNfd2lkZ2V0KEdUS19MQUJFTChwYXNzd29yZExhYmVsKSwgcHJp di0+cGFzc3dvcmRFbnRyeSk7CisgICAgZ3RrX3dpZGdldF9zZXRfaGFsaWduKHBhc3N3b3JkTGFi ZWwsIEdUS19BTElHTl9FTkQpOworICAgIGd0a19zdHlsZV9jb250ZXh0X2FkZF9jbGFzcyhndGtf d2lkZ2V0X2dldF9zdHlsZV9jb250ZXh0KHBhc3N3b3JkTGFiZWwpLCBHVEtfU1RZTEVfQ0xBU1Nf RElNX0xBQkVMKTsKKyAgICBndGtfd2lkZ2V0X3Nob3cocGFzc3dvcmRMYWJlbCk7CisKICAgICBH dGtXaWRnZXQqIGdyaWQgPSBndGtfZ3JpZF9uZXcoKTsKICAgICBndGtfZ3JpZF9zZXRfY29sdW1u X3NwYWNpbmcoR1RLX0dSSUQoZ3JpZCksIDYpOwogICAgIGd0a19ncmlkX3NldF9yb3dfc3BhY2lu ZyhHVEtfR1JJRChncmlkKSwgNik7Cg==