16174 2007-11-28 10:46:18 -0800 [GTK] Use "URI" not "URL" in public API 2007-11-30 04:40:49 -0800 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) All All RESOLVED FIXED Gtk P2 Normal --- 15691 1 alp webkit-unassigned christian oldest_to_newest 62584 0 alp 2007-11-28 10:46:18 -0800 GLib/GTK+ convention favours "URI". 62585 1 17576 alp 2007-11-28 10:54:14 -0800 Created attachment 17576 Fix 62596 2 christian 2007-11-28 12:22:30 -0800 I give you my blessing towards a good api. :) 62779 3 alp 2007-11-30 04:40:49 -0800 Landed in r28231. 17576 2007-11-28 10:54:14 -0800 2007-11-29 22:08:27 -0800 Fix uri.patch text/plain 12801 alp SW5kZXg6IFdlYktpdC9ndGsvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9ndGsvQ2hh bmdlTG9nCShyZXZpc2lvbiAyODExMikKKysrIFdlYktpdC9ndGsvQ2hhbmdlTG9nCSh3b3JraW5n IGNvcHkpCkBAIC0xLDMgKzEsMjYgQEAKKzIwMDctMTEtMjggIEFscCBUb2tlciAgPGFscEBhdG9r ZXIuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IGh0dHA6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE2MTc0CisgICAgICAgIFtH VEtdIFVzZSAiVVJJIiBub3QgIlVSTCIgaW4gcHVibGljIEFQSQorCisgICAgICAgIFJlcGxhY2Ug dXNlIG9mIHRoZSB0ZXJtICJVUkwiIHdpdGggIlVSSSIgaW4gcHVibGljIGhlYWRlcnMsCisgICAg ICAgIGRvY3VtZW50YXRpb24gYW5kIHNvbWUgaW50ZXJuYWwgY29kZSB0byBtYXRjaCBHTGliL0dU SysgY29udmVudGlvbi4KKworICAgICAgICBUaGlzIGlzIG5vdyBtZW50aW9uZWQgaW4gdGhlIEFQ SSBndWlkZWxpbmVzOgorICAgICAgICAgIGh0dHA6Ly90cmFjLndlYmtpdC5vcmcvcHJvamVjdHMv d2Via2l0L3dpa2kvSGFja2luZ0d0aworCisgICAgICAgIEFQSS9BQkktYnJlYWtpbmcgY2hhbmdl LgorCisgICAgICAgICogQXBpL3dlYmtpdGd0a2ZyYW1lLmNwcDoKKyAgICAgICAgKiBBcGkvd2Vi a2l0Z3RrbmV0d29ya3JlcXVlc3QuY3BwOgorICAgICAgICAqIEFwaS93ZWJraXRndGtuZXR3b3Jr cmVxdWVzdC5oOgorICAgICAgICAqIEFwaS93ZWJraXRndGtwYWdlLmNwcDoKKyAgICAgICAgKiBB cGkvd2Via2l0Z3RrcGFnZS5oOgorICAgICAgICAqIEFwaS93ZWJraXRndGtwcml2YXRlLmg6Cisg ICAgICAgICogQXBpL3dlYmtpdGd0a3NldHRpbmdzLmg6CisKIDIwMDctMTEtMjYgIEFscCBUb2tl ciAgPGFscEBhdG9rZXIuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEFkYW0gUm9iZW4uCklu ZGV4OiBXZWJLaXQvZ3RrL0FwaS93ZWJraXRndGtmcmFtZS5jcHAKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2Vi S2l0L2d0ay9BcGkvd2Via2l0Z3RrZnJhbWUuY3BwCShyZXZpc2lvbiAyODExMSkKKysrIFdlYktp dC9ndGsvQXBpL3dlYmtpdGd0a2ZyYW1lLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjg2LDcgKzI4 Niw3IEBAIFdlYktpdEZyYW1lKiB3ZWJraXRfZnJhbWVfZ2V0X3BhcmVudChXZWIKICAqIEBmcmFt ZTogYSAjV2ViS2l0RnJhbWUKICAqIEByZXF1ZXN0OiBhICNXZWJLaXROZXR3b3JrUmVxdWVzdAog ICoKLSAqIENvbm5lY3RzIHRvIGEgZ2l2ZW4gVVJMIGJ5IGluaXRpYXRpbmcgYW4gYXN5bmNocm9u b3VzIGNsaWVudCByZXF1ZXN0LgorICogQ29ubmVjdHMgdG8gYSBnaXZlbiBVUkkgYnkgaW5pdGlh dGluZyBhbiBhc3luY2hyb25vdXMgY2xpZW50IHJlcXVlc3QuCiAgKgogICogQ3JlYXRlcyBhIHBy b3Zpc2lvbmFsIGRhdGEgc291cmNlIHRoYXQgd2lsbCB0cmFuc2l0aW9uIHRvIGEgY29tbWl0dGVk IGRhdGEKICAqIHNvdXJjZSBvbmNlIGFueSBkYXRhIGhhcyBiZWVuIHJlY2VpdmVkLiBVc2Ugd2Vi a2l0X2ZyYW1lX3N0b3BfbG9hZGluZygpIHRvCkBAIC0zMDEsNyArMzAxLDcgQEAgdm9pZCB3ZWJr aXRfZnJhbWVfbG9hZF9yZXF1ZXN0KFdlYktpdEZyYQogICAgIGdfcmV0dXJuX2lmX2ZhaWwoY29y ZUZyYW1lKTsKIAogICAgIC8vIFRPRE86IFVzZSB0aGUgUmVzb3VyY2VSZXF1ZXN0IGNhcnJpZWQg YnkgV2ViS2l0TmV0d29ya1JlcXVlc3Qgd2hlbiBpdCBnZXRzIGltcGxlbWVudGVkLgotICAgIERl cHJlY2F0ZWRTdHJpbmcgc3RyaW5nID0gRGVwcmVjYXRlZFN0cmluZzo6ZnJvbVV0Zjgod2Via2l0 X25ldHdvcmtfcmVxdWVzdF9nZXRfdXJsKHJlcXVlc3QpKTsKKyAgICBEZXByZWNhdGVkU3RyaW5n IHN0cmluZyA9IERlcHJlY2F0ZWRTdHJpbmc6OmZyb21VdGY4KHdlYmtpdF9uZXR3b3JrX3JlcXVl c3RfZ2V0X3VyaShyZXF1ZXN0KSk7CiAgICAgY29yZUZyYW1lLT5sb2FkZXIoKS0+bG9hZChSZXNv dXJjZVJlcXVlc3QoS1VSTChzdHJpbmcpKSk7CiB9CiAKSW5kZXg6IFdlYktpdC9ndGsvQXBpL3dl YmtpdGd0a25ldHdvcmtyZXF1ZXN0LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQvZ3RrL0FwaS93 ZWJraXRndGtuZXR3b3JrcmVxdWVzdC5jcHAJKHJldmlzaW9uIDI4MTExKQorKysgV2ViS2l0L2d0 ay9BcGkvd2Via2l0Z3RrbmV0d29ya3JlcXVlc3QuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC00Miw3 ICs0Miw3IEBAIHN0YXRpYyB2b2lkIHdlYmtpdF9uZXR3b3JrX3JlcXVlc3RfZmluYWwKIHsKICAg ICBXZWJLaXROZXR3b3JrUmVxdWVzdFByaXZhdGUqIHJlcXVlc3RQcml2YXRlID0gV0VCS0lUX05F VFdPUktfUkVRVUVTVF9HRVRfUFJJVkFURShvYmplY3QpOwogCi0gICAgZ19mcmVlKHJlcXVlc3RQ cml2YXRlLT51cmwpOworICAgIGdfZnJlZShyZXF1ZXN0UHJpdmF0ZS0+dXJpKTsKIAogICAgIEdf T0JKRUNUX0NMQVNTKHdlYmtpdF9uZXR3b3JrX3JlcXVlc3RfcGFyZW50X2NsYXNzKS0+ZmluYWxp emUob2JqZWN0KTsKIH0KQEAgLTU4LDE3ICs1OCwxNyBAQCBzdGF0aWMgdm9pZCB3ZWJraXRfbmV0 d29ya19yZXF1ZXN0X2luaXQoCiB7CiB9CiAKLVdlYktpdE5ldHdvcmtSZXF1ZXN0KiB3ZWJraXRf bmV0d29ya19yZXF1ZXN0X25ldyhjb25zdCBnY2hhciogdXJsKQorV2ViS2l0TmV0d29ya1JlcXVl c3QqIHdlYmtpdF9uZXR3b3JrX3JlcXVlc3RfbmV3KGNvbnN0IGdjaGFyKiB1cmkpCiB7CiAgICAg V2ViS2l0TmV0d29ya1JlcXVlc3QqIHJlcXVlc3QgPSBXRUJLSVRfTkVUV09SS19SRVFVRVNUKGdf b2JqZWN0X25ldyhXRUJLSVRfVFlQRV9ORVRXT1JLX1JFUVVFU1QsIE5VTEwpKTsKICAgICBXZWJL aXROZXR3b3JrUmVxdWVzdFByaXZhdGUqIHJlcXVlc3RQcml2YXRlID0gV0VCS0lUX05FVFdPUktf UkVRVUVTVF9HRVRfUFJJVkFURShyZXF1ZXN0KTsKIAotICAgIHJlcXVlc3RQcml2YXRlLT51cmwg PSBnX3N0cmR1cCh1cmwpOworICAgIHJlcXVlc3RQcml2YXRlLT51cmkgPSBnX3N0cmR1cCh1cmkp OwogCiAgICAgcmV0dXJuIHJlcXVlc3Q7CiB9CiAKLXZvaWQgd2Via2l0X25ldHdvcmtfcmVxdWVz dF9zZXRfdXJsKFdlYktpdE5ldHdvcmtSZXF1ZXN0KiByZXF1ZXN0LCBjb25zdCBnY2hhciogdXJs KQordm9pZCB3ZWJraXRfbmV0d29ya19yZXF1ZXN0X3NldF91cmkoV2ViS2l0TmV0d29ya1JlcXVl c3QqIHJlcXVlc3QsIGNvbnN0IGdjaGFyKiB1cmkpCiB7CiAgICAgV2ViS2l0TmV0d29ya1JlcXVl c3RQcml2YXRlKiByZXF1ZXN0UHJpdmF0ZTsKIApAQCAtNzYsMTEgKzc2LDExIEBAIHZvaWQgd2Vi a2l0X25ldHdvcmtfcmVxdWVzdF9zZXRfdXJsKFdlYksKIAogICAgIHJlcXVlc3RQcml2YXRlID0g V0VCS0lUX05FVFdPUktfUkVRVUVTVF9HRVRfUFJJVkFURShyZXF1ZXN0KTsKIAotICAgIGdfZnJl ZShyZXF1ZXN0UHJpdmF0ZS0+dXJsKTsKLSAgICByZXF1ZXN0UHJpdmF0ZS0+dXJsID0gZ19zdHJk dXAodXJsKTsKKyAgICBnX2ZyZWUocmVxdWVzdFByaXZhdGUtPnVyaSk7CisgICAgcmVxdWVzdFBy aXZhdGUtPnVyaSA9IGdfc3RyZHVwKHVyaSk7CiB9CiAKLWNvbnN0IGdjaGFyKiB3ZWJraXRfbmV0 d29ya19yZXF1ZXN0X2dldF91cmwoV2ViS2l0TmV0d29ya1JlcXVlc3QqIHJlcXVlc3QpCitjb25z dCBnY2hhciogd2Via2l0X25ldHdvcmtfcmVxdWVzdF9nZXRfdXJpKFdlYktpdE5ldHdvcmtSZXF1 ZXN0KiByZXF1ZXN0KQogewogICAgIFdlYktpdE5ldHdvcmtSZXF1ZXN0UHJpdmF0ZSogcmVxdWVz dFByaXZhdGU7CiAKQEAgLTg4LDcgKzg4LDcgQEAgY29uc3QgZ2NoYXIqIHdlYmtpdF9uZXR3b3Jr X3JlcXVlc3RfZ2V0XwogCiAgICAgcmVxdWVzdFByaXZhdGUgPSBXRUJLSVRfTkVUV09SS19SRVFV RVNUX0dFVF9QUklWQVRFKHJlcXVlc3QpOwogCi0gICAgcmV0dXJuIHJlcXVlc3RQcml2YXRlLT51 cmw7CisgICAgcmV0dXJuIHJlcXVlc3RQcml2YXRlLT51cmk7CiB9CiAKIH0KSW5kZXg6IFdlYktp dC9ndGsvQXBpL3dlYmtpdGd0a25ldHdvcmtyZXF1ZXN0LmgKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0 L2d0ay9BcGkvd2Via2l0Z3RrbmV0d29ya3JlcXVlc3QuaAkocmV2aXNpb24gMjgxMTEpCisrKyBX ZWJLaXQvZ3RrL0FwaS93ZWJraXRndGtuZXR3b3JrcmVxdWVzdC5oCSh3b3JraW5nIGNvcHkpCkBA IC01NSwxMyArNTUsMTMgQEAgV0VCS0lUX0FQSSBHVHlwZQogd2Via2l0X25ldHdvcmtfcmVxdWVz dF9nZXRfdHlwZSAodm9pZCk7CiAKIFdFQktJVF9BUEkgV2ViS2l0TmV0d29ya1JlcXVlc3QqCi13 ZWJraXRfbmV0d29ya19yZXF1ZXN0X25ldyAoY29uc3QgZ2NoYXIqIHVybCk7Cit3ZWJraXRfbmV0 d29ya19yZXF1ZXN0X25ldyAoY29uc3QgZ2NoYXIqIHVyaSk7CiAKIFdFQktJVF9BUEkgdm9pZAot d2Via2l0X25ldHdvcmtfcmVxdWVzdF9zZXRfdXJsIChXZWJLaXROZXR3b3JrUmVxdWVzdCogcmVx dWVzdCwgY29uc3QgZ2NoYXIqIHVybCk7Cit3ZWJraXRfbmV0d29ya19yZXF1ZXN0X3NldF91cmkg KFdlYktpdE5ldHdvcmtSZXF1ZXN0KiByZXF1ZXN0LCBjb25zdCBnY2hhciogdXJpKTsKIAogV0VC S0lUX0FQSSBjb25zdCBnY2hhcioKLXdlYmtpdF9uZXR3b3JrX3JlcXVlc3RfZ2V0X3VybCAoV2Vi S2l0TmV0d29ya1JlcXVlc3QqIHJlcXVlc3QpOword2Via2l0X25ldHdvcmtfcmVxdWVzdF9nZXRf dXJpIChXZWJLaXROZXR3b3JrUmVxdWVzdCogcmVxdWVzdCk7CiAKIEdfRU5EX0RFQ0xTCiAKSW5k ZXg6IFdlYktpdC9ndGsvQXBpL3dlYmtpdGd0a3BhZ2UuY3BwCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktp dC9ndGsvQXBpL3dlYmtpdGd0a3BhZ2UuY3BwCShyZXZpc2lvbiAyODExMSkKKysrIFdlYktpdC9n dGsvQXBpL3dlYmtpdGd0a3BhZ2UuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC03MjQsMTQgKzcyNCwx NCBAQCBnYm9vbGVhbiB3ZWJraXRfcGFnZV9jYW5fZ29fZm9yd2FyZChXZWJLCiAgICAgcmV0dXJu IGZyYW1lRGF0YS0+ZnJhbWUtPmxvYWRlcigpLT5jYW5Hb0JhY2tPckZvcndhcmQoMSk7CiB9CiAK LXZvaWQgd2Via2l0X3BhZ2Vfb3BlbihXZWJLaXRQYWdlKiBwYWdlLCBjb25zdCBnY2hhciogdXJs KQordm9pZCB3ZWJraXRfcGFnZV9vcGVuKFdlYktpdFBhZ2UqIHBhZ2UsIGNvbnN0IGdjaGFyKiB1 cmkpCiB7CiAgICAgZ19yZXR1cm5faWZfZmFpbChXRUJLSVRfSVNfUEFHRShwYWdlKSk7CiAKICAg ICBXZWJLaXRQYWdlUHJpdmF0ZSogcGFnZURhdGEgPSBXRUJLSVRfUEFHRV9HRVRfUFJJVkFURShw YWdlKTsKICAgICBXZWJLaXRGcmFtZVByaXZhdGUqIGZyYW1lRGF0YSA9IFdFQktJVF9GUkFNRV9H RVRfUFJJVkFURShwYWdlRGF0YS0+bWFpbkZyYW1lKTsKIAotICAgIERlcHJlY2F0ZWRTdHJpbmcg c3RyaW5nID0gRGVwcmVjYXRlZFN0cmluZzo6ZnJvbVV0ZjgodXJsKTsKKyAgICBEZXByZWNhdGVk U3RyaW5nIHN0cmluZyA9IERlcHJlY2F0ZWRTdHJpbmc6OmZyb21VdGY4KHVyaSk7CiAgICAgZnJh bWVEYXRhLT5mcmFtZS0+bG9hZGVyKCktPmxvYWQoUmVzb3VyY2VSZXF1ZXN0KEtVUkwoc3RyaW5n KSkpOwogfQogCkBAIC03NDQsMTQgKzc0NCwxNCBAQCB2b2lkIHdlYmtpdF9wYWdlX3JlbG9hZChX ZWJLaXRQYWdlKiBwYWdlCiAgICAgZnJhbWVEYXRhLT5mcmFtZS0+bG9hZGVyKCktPnJlbG9hZCgp OwogfQogCi12b2lkIHdlYmtpdF9wYWdlX2xvYWRfc3RyaW5nKFdlYktpdFBhZ2UqIHBhZ2UsIGNv bnN0IGdjaGFyKiBjb250ZW50LCBjb25zdCBnY2hhciogY29udGVudE1pbWVUeXBlLCBjb25zdCBn Y2hhciogY29udGVudEVuY29kaW5nLCBjb25zdCBnY2hhciogYmFzZVVybCkKK3ZvaWQgd2Via2l0 X3BhZ2VfbG9hZF9zdHJpbmcoV2ViS2l0UGFnZSogcGFnZSwgY29uc3QgZ2NoYXIqIGNvbnRlbnQs IGNvbnN0IGdjaGFyKiBjb250ZW50TWltZVR5cGUsIGNvbnN0IGdjaGFyKiBjb250ZW50RW5jb2Rp bmcsIGNvbnN0IGdjaGFyKiBiYXNlVXJpKQogewogICAgIGdfcmV0dXJuX2lmX2ZhaWwoV0VCS0lU X0lTX1BBR0UocGFnZSkpOwogCiAgICAgV2ViS2l0UGFnZVByaXZhdGUqIHBhZ2VEYXRhID0gV0VC S0lUX1BBR0VfR0VUX1BSSVZBVEUocGFnZSk7CiAgICAgV2ViS2l0RnJhbWVQcml2YXRlKiBmcmFt ZURhdGEgPSBXRUJLSVRfRlJBTUVfR0VUX1BSSVZBVEUocGFnZURhdGEtPm1haW5GcmFtZSk7CiAK LSAgICBLVVJMIHVybChEZXByZWNhdGVkU3RyaW5nOjpmcm9tVXRmOChiYXNlVXJsKSk7CisgICAg S1VSTCB1cmwoRGVwcmVjYXRlZFN0cmluZzo6ZnJvbVV0ZjgoYmFzZVVyaSkpOwogICAgIFJlZlB0 cjxTaGFyZWRCdWZmZXI+IHNoYXJlZEJ1ZmZlciA9IG5ldyBTaGFyZWRCdWZmZXIoc3RyZHVwKGNv bnRlbnQpLCBzdHJsZW4oY29udGVudCkpOwogICAgIFN1YnN0aXR1dGVEYXRhIHN1YnN0aXR1dGVE YXRhKHNoYXJlZEJ1ZmZlci5yZWxlYXNlKCksIFN0cmluZyhjb250ZW50TWltZVR5cGUpLCBTdHJp bmcoY29udGVudEVuY29kaW5nKSwgS1VSTCgiYWJvdXQ6YmxhbmsiKSwgdXJsKTsKIApJbmRleDog V2ViS2l0L2d0ay9BcGkvd2Via2l0Z3RrcGFnZS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9ndGsv QXBpL3dlYmtpdGd0a3BhZ2UuaAkocmV2aXNpb24gMjgxMTEpCisrKyBXZWJLaXQvZ3RrL0FwaS93 ZWJraXRndGtwYWdlLmgJKHdvcmtpbmcgY29weSkKQEAgLTEwNywxNiArMTA3LDE2IEBAIFdFQktJ VF9BUEkgdm9pZAogd2Via2l0X3BhZ2Vfc3RvcF9sb2FkaW5nIChXZWJLaXRQYWdlKiBwYWdlKTsK IAogV0VCS0lUX0FQSSB2b2lkCi13ZWJraXRfcGFnZV9vcGVuIChXZWJLaXRQYWdlKiBwYWdlLCBj b25zdCBnY2hhciogdXJsKTsKK3dlYmtpdF9wYWdlX29wZW4gKFdlYktpdFBhZ2UqIHBhZ2UsIGNv bnN0IGdjaGFyKiB1cmkpOwogCiBXRUJLSVRfQVBJIHZvaWQKIHdlYmtpdF9wYWdlX3JlbG9hZCAo V2ViS2l0UGFnZSAqcGFnZSk7CiAKIFdFQktJVF9BUEkgdm9pZAotd2Via2l0X3BhZ2VfbG9hZF9z dHJpbmcgKFdlYktpdFBhZ2UqIHBhZ2UsIGNvbnN0IGdjaGFyKiBjb250ZW50LCBjb25zdCBnY2hh ciogY29udGVudF9taW1lX3R5cGUsIGNvbnN0IGdjaGFyKiBjb250ZW50X2VuY29kaW5nLCBjb25z dCBnY2hhciogYmFzZV91cmwpOword2Via2l0X3BhZ2VfbG9hZF9zdHJpbmcgKFdlYktpdFBhZ2Uq IHBhZ2UsIGNvbnN0IGdjaGFyKiBjb250ZW50LCBjb25zdCBnY2hhciogY29udGVudF9taW1lX3R5 cGUsIGNvbnN0IGdjaGFyKiBjb250ZW50X2VuY29kaW5nLCBjb25zdCBnY2hhciogYmFzZV91cmkp OwogCiBXRUJLSVRfQVBJIHZvaWQKLXdlYmtpdF9wYWdlX2xvYWRfaHRtbF9zdHJpbmcgKFdlYktp dFBhZ2UqIHBhZ2UsIGNvbnN0IGdjaGFyKiBjb250ZW50LCBjb25zdCBnY2hhciogYmFzZV91cmwp Oword2Via2l0X3BhZ2VfbG9hZF9odG1sX3N0cmluZyAoV2ViS2l0UGFnZSogcGFnZSwgY29uc3Qg Z2NoYXIqIGNvbnRlbnQsIGNvbnN0IGdjaGFyKiBiYXNlX3VyaSk7CiAKIFdFQktJVF9BUEkgV2Vi S2l0RnJhbWUqCiB3ZWJraXRfcGFnZV9nZXRfbWFpbl9mcmFtZSAoV2ViS2l0UGFnZSogcGFnZSk7 CkluZGV4OiBXZWJLaXQvZ3RrL0FwaS93ZWJraXRndGtwcml2YXRlLmgKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g V2ViS2l0L2d0ay9BcGkvd2Via2l0Z3RrcHJpdmF0ZS5oCShyZXZpc2lvbiAyODExMSkKKysrIFdl YktpdC9ndGsvQXBpL3dlYmtpdGd0a3ByaXZhdGUuaAkod29ya2luZyBjb3B5KQpAQCAtODcsNyAr ODcsNyBAQCBleHRlcm4gIkMiIHsKICAgICAjZGVmaW5lIFdFQktJVF9ORVRXT1JLX1JFUVVFU1Rf R0VUX1BSSVZBVEUob2JqKSAgICAoR19UWVBFX0lOU1RBTkNFX0dFVF9QUklWQVRFKChvYmopLCBX RUJLSVRfVFlQRV9ORVRXT1JLX1JFUVVFU1QsIFdlYktpdE5ldHdvcmtSZXF1ZXN0UHJpdmF0ZSkp CiAgICAgdHlwZWRlZiBzdHJ1Y3QgX1dlYktpdE5ldHdvcmtSZXF1ZXN0UHJpdmF0ZSBXZWJLaXRO ZXR3b3JrUmVxdWVzdFByaXZhdGU7CiAgICAgc3RydWN0IF9XZWJLaXROZXR3b3JrUmVxdWVzdFBy aXZhdGUgewotICAgICAgICBnY2hhciogdXJsOworICAgICAgICBnY2hhciogdXJpOwogICAgIH07 CiAKICAgICBXZWJLaXRGcmFtZSogd2Via2l0X2ZyYW1lX2luaXRfd2l0aF9wYWdlKFdlYktpdFBh Z2UqLCBXZWJDb3JlOjpIVE1MRnJhbWVPd25lckVsZW1lbnQqKTsKSW5kZXg6IFdlYktpdC9ndGsv QXBpL3dlYmtpdGd0a3NldHRpbmdzLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L2d0ay9BcGkvd2Vi a2l0Z3Rrc2V0dGluZ3MuaAkocmV2aXNpb24gMjgxMTEpCisrKyBXZWJLaXQvZ3RrL0FwaS93ZWJr aXRndGtzZXR0aW5ncy5oCSh3b3JraW5nIGNvcHkpCkBAIC03NCw3ICs3NCw3IEBAIHN0cnVjdCBf V2ViS2l0U2V0dGluZ3MgewogICAgIFdlYktpdEVkaXRhYmxlTGlua0JlaGF2aW91ciBlZGl0YWJs ZV9saW5rX2JlaGF2aW91cjsKICAgICBnYm9vbGVhbiB1c2VzX3BhZ2VfY2FjaGU7CiAgICAgZ2Jv b2xlYW4gc2hyaW5rX3N0YW5kYWxvbmVfaW1hZ2VzX3RvX2ZpdDsKLSAgICBnYm9vbGVhbiBzaG93 X3VybHNfaW5fdG9vbF90aXBzOworICAgIGdib29sZWFuIHNob3dfdXJpc19pbl90b29sX3RpcHM7 CiAgICAgZ2NoYXIqIGZ0cF9kaXJlY3RvcnlfdGVtcGxhdGVfcGF0aDsKICAgICBnYm9vbGVhbiBm b3JjZV9mdHBfZGlyZWN0b3J5X2xpc3RpbmdzOwogICAgIGdib29sZWFuIGRldmVsb3Blcl9leHRy YXNfZW5hYmxlZDsKSW5kZXg6IFdlYktpdFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBX ZWJLaXRUb29scy9DaGFuZ2VMb2cJKHJldmlzaW9uIDI4MTEyKQorKysgV2ViS2l0VG9vbHMvQ2hh bmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjIgQEAKKzIwMDctMTEtMjggIEFscCBU b2tlciAgPGFscEBhdG9rZXIuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIGh0dHA6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE2 MTc0CisgICAgICAgIFtHVEtdIFVzZSAiVVJJIiBub3QgIlVSTCIgaW4gcHVibGljIEFQSQorCisg ICAgICAgIFJlcGxhY2UgdXNlIG9mIHRoZSB0ZXJtICJVUkwiIHdpdGggIlVSSSIgaW4gcHVibGlj IGhlYWRlcnMsCisgICAgICAgIGRvY3VtZW50YXRpb24gYW5kIHNvbWUgaW50ZXJuYWwgY29kZSB0 byBtYXRjaCBHTGliL0dUSysgY29udmVudGlvbi4KKworICAgICAgICBUaGlzIGlzIG5vdyBtZW50 aW9uZWQgaW4gdGhlIEFQSSBndWlkZWxpbmVzOgorICAgICAgICAgIGh0dHA6Ly90cmFjLndlYmtp dC5vcmcvcHJvamVjdHMvd2Via2l0L3dpa2kvSGFja2luZ0d0aworCisgICAgICAgICogR3RrTGF1 bmNoZXIvbWFpbi5jOgorICAgICAgICAoYWN0aXZhdGVfdXJpX2VudHJ5X2NiKToKKyAgICAgICAg KHRpdGxlX2NoYW5nZV9jYik6CisgICAgICAgIChjcmVhdGVfdG9vbGJhcik6CisgICAgICAgICht YWluKToKKwogMjAwNy0xMS0yNyAgTWFjaWVqIFN0YWNob3dpYWsgIDxtanNAYXBwbGUuY29tPgog CiAgICAgICAgIFJldmlld2VkIGJ5IERhcmluLgpJbmRleDogV2ViS2l0VG9vbHMvR3RrTGF1bmNo ZXIvbWFpbi5jCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdFRvb2xzL0d0a0xhdW5jaGVyL21haW4uYwko cmV2aXNpb24gMjgxMTEpCisrKyBXZWJLaXRUb29scy9HdGtMYXVuY2hlci9tYWluLmMJKHdvcmtp bmcgY29weSkKQEAgLTI5LDcgKzI5LDcgQEAKICNpbmNsdWRlIDxndGsvZ3RrLmg+CiAKIHN0YXRp YyBHdGtXaWRnZXQqIG1haW5fd2luZG93Owotc3RhdGljIEd0a1dpZGdldCogdXJsX2VudHJ5Owor c3RhdGljIEd0a1dpZGdldCogdXJpX2VudHJ5Owogc3RhdGljIEd0a1N0YXR1c2JhciogbWFpbl9z dGF0dXNiYXI7CiBzdGF0aWMgV2ViS2l0UGFnZSogd2ViX3BhZ2U7CiBzdGF0aWMgZ2NoYXIqIG1h aW5fdGl0bGU7CkBAIC0zNywxMSArMzcsMTEgQEAgc3RhdGljIGdpbnQgbG9hZF9wcm9ncmVzczsK IHN0YXRpYyBndWludCBzdGF0dXNfY29udGV4dF9pZDsKIAogc3RhdGljIHZvaWQKLWFjdGl2YXRl X3VybF9lbnRyeV9jYiAoR3RrV2lkZ2V0KiBlbnRyeSwgZ3BvaW50ZXIgZGF0YSkKK2FjdGl2YXRl X3VyaV9lbnRyeV9jYiAoR3RrV2lkZ2V0KiBlbnRyeSwgZ3BvaW50ZXIgZGF0YSkKIHsKLSAgICBj b25zdCBnY2hhciogdXJsID0gZ3RrX2VudHJ5X2dldF90ZXh0IChHVEtfRU5UUlkgKGVudHJ5KSk7 Ci0gICAgZ19hc3NlcnQgKHVybCk7Ci0gICAgd2Via2l0X3BhZ2Vfb3BlbiAod2ViX3BhZ2UsIHVy bCk7CisgICAgY29uc3QgZ2NoYXIqIHVyaSA9IGd0a19lbnRyeV9nZXRfdGV4dCAoR1RLX0VOVFJZ IChlbnRyeSkpOworICAgIGdfYXNzZXJ0ICh1cmkpOworICAgIHdlYmtpdF9wYWdlX29wZW4gKHdl Yl9wYWdlLCB1cmkpOwogfQogCiBzdGF0aWMgdm9pZApAQCAtNjYsOSArNjYsOSBAQCBsaW5rX2hv dmVyX2NiIChXZWJLaXRQYWdlKiBwYWdlLCBjb25zdCBnCiB9CiAKIHN0YXRpYyB2b2lkCi10aXRs ZV9jaGFuZ2VfY2IgKFdlYktpdFBhZ2UqIHBhZ2UsIGNvbnN0IGdjaGFyKiB0aXRsZSwgY29uc3Qg Z2NoYXIqIHVybCwgZ3BvaW50ZXIgZGF0YSkKK3RpdGxlX2NoYW5nZV9jYiAoV2ViS2l0UGFnZSog cGFnZSwgY29uc3QgZ2NoYXIqIHRpdGxlLCBjb25zdCBnY2hhciogdXJpLCBncG9pbnRlciBkYXRh KQogewotICAgIGd0a19lbnRyeV9zZXRfdGV4dCAoR1RLX0VOVFJZICh1cmxfZW50cnkpLCB1cmwp OworICAgIGd0a19lbnRyeV9zZXRfdGV4dCAoR1RLX0VOVFJZICh1cmlfZW50cnkpLCB1cmkpOwog CiAgICAgaWYgKG1haW5fdGl0bGUpCiAgICAgICAgIGdfZnJlZSAobWFpbl90aXRsZSk7CkBAIC0x NDksMTQgKzE0OSwxNCBAQCBjcmVhdGVfdG9vbGJhciAoKQogICAgIC8qIFRoZSBVUkwgZW50cnkg Ki8KICAgICBpdGVtID0gZ3RrX3Rvb2xfaXRlbV9uZXcgKCk7CiAgICAgZ3RrX3Rvb2xfaXRlbV9z ZXRfZXhwYW5kIChpdGVtLCBUUlVFKTsKLSAgICB1cmxfZW50cnkgPSBndGtfZW50cnlfbmV3ICgp OwotICAgIGd0a19jb250YWluZXJfYWRkIChHVEtfQ09OVEFJTkVSIChpdGVtKSwgdXJsX2VudHJ5 KTsKLSAgICBnX3NpZ25hbF9jb25uZWN0IChHX09CSkVDVCAodXJsX2VudHJ5KSwgImFjdGl2YXRl IiwgR19DQUxMQkFDSyAoYWN0aXZhdGVfdXJsX2VudHJ5X2NiKSwgTlVMTCk7CisgICAgdXJpX2Vu dHJ5ID0gZ3RrX2VudHJ5X25ldyAoKTsKKyAgICBndGtfY29udGFpbmVyX2FkZCAoR1RLX0NPTlRB SU5FUiAoaXRlbSksIHVyaV9lbnRyeSk7CisgICAgZ19zaWduYWxfY29ubmVjdCAoR19PQkpFQ1Qg KHVyaV9lbnRyeSksICJhY3RpdmF0ZSIsIEdfQ0FMTEJBQ0sgKGFjdGl2YXRlX3VyaV9lbnRyeV9j YiksIE5VTEwpOwogICAgIGd0a190b29sYmFyX2luc2VydCAoR1RLX1RPT0xCQVIgKHRvb2xiYXIp LCBpdGVtLCAtMSk7CiAKICAgICAvKiBUaGUgZ28gYnV0dG9uICovCiAgICAgaXRlbSA9IGd0a190 b29sX2J1dHRvbl9uZXdfZnJvbV9zdG9jayAoR1RLX1NUT0NLX09LKTsKLSAgICBnX3NpZ25hbF9j b25uZWN0X3N3YXBwZWQgKEdfT0JKRUNUIChpdGVtKSwgImNsaWNrZWQiLCBHX0NBTExCQUNLIChh Y3RpdmF0ZV91cmxfZW50cnlfY2IpLCAoZ3BvaW50ZXIpdXJsX2VudHJ5KTsKKyAgICBnX3NpZ25h bF9jb25uZWN0X3N3YXBwZWQgKEdfT0JKRUNUIChpdGVtKSwgImNsaWNrZWQiLCBHX0NBTExCQUNL IChhY3RpdmF0ZV91cmlfZW50cnlfY2IpLCAoZ3BvaW50ZXIpdXJpX2VudHJ5KTsKICAgICBndGtf dG9vbGJhcl9pbnNlcnQgKEdUS19UT09MQkFSICh0b29sYmFyKSwgaXRlbSwgLTEpOwogCiAgICAg cmV0dXJuIHRvb2xiYXI7CkBAIC0xODcsOCArMTg3LDggQEAgbWFpbiAoaW50IGFyZ2MsIGNoYXIq IGFyZ3ZbXSkKICAgICBtYWluX3dpbmRvdyA9IGNyZWF0ZV93aW5kb3cgKCk7CiAgICAgZ3RrX2Nv bnRhaW5lcl9hZGQgKEdUS19DT05UQUlORVIgKG1haW5fd2luZG93KSwgdmJveCk7CiAKLSAgICBn Y2hhciogdXJsID0gKGdjaGFyKikgKGFyZ2MgPiAxID8gYXJndlsxXSA6ICJodHRwOi8vd3d3Lmdv b2dsZS5jb20vIik7Ci0gICAgd2Via2l0X3BhZ2Vfb3BlbiAod2ViX3BhZ2UsIHVybCk7CisgICAg Z2NoYXIqIHVyaSA9IChnY2hhciopIChhcmdjID4gMSA/IGFyZ3ZbMV0gOiAiaHR0cDovL3d3dy5n b29nbGUuY29tLyIpOworICAgIHdlYmtpdF9wYWdlX29wZW4gKHdlYl9wYWdlLCB1cmkpOwogCiAg ICAgZ3RrX3dpZGdldF9ncmFiX2ZvY3VzIChHVEtfV0lER0VUICh3ZWJfcGFnZSkpOwogICAgIGd0 a193aWRnZXRfc2hvd19hbGwgKG1haW5fd2luZG93KTsK