24553 2009-03-12 11:56:22 -0700 [GTK] Improvements to WebKitDownload 2009-03-12 12:33:32 -0700 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) PC Linux RESOLVED FIXED Gtk P2 Normal --- 1 gustavo webkit-unassigned oldest_to_newest 113440 0 gustavo 2009-03-12 11:56:22 -0700 We need a small documentation fix for the download-requested signal, and we decided to rename state to 'status', and make it a property, to match the frame loader signals rework we plan to land soonish (https://bugs.webkit.org/show_bug.cgi?id=17066). 113441 1 28537 gustavo 2009-03-12 11:56:49 -0700 Created attachment 28537 the doc fix 113442 2 28538 gustavo 2009-03-12 11:57:19 -0700 Created attachment 28538 rename state to status and make it a property 113443 3 gustavo 2009-03-12 11:57:55 -0700 I've adapted the download support in Epiphany to these changes and Epiphany keeps working perfectly. 113444 4 28537 ap 2009-03-12 12:11:31 -0700 Comment on attachment 28537 the doc fix r=me 113445 5 28538 ap 2009-03-12 12:15:38 -0700 Comment on attachment 28538 rename state to status and make it a property Looks fine, r=me 113450 6 gustavo 2009-03-12 12:33:32 -0700 Landed as r41638 and r41639. 28537 2009-03-12 11:56:49 -0700 2009-03-12 12:11:31 -0700 the doc fix download-docfix.patch text/plain 2301 gustavo RnJvbSAwNTJhNmVhZDE4YjJiMzYwYzZlOGNmNWE3ODczZTEwNGFjNzZjODFhIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBHdXN0YXZvIE5vcm9uaGEgU2lsdmEgPGtvdkBrb3YuZXRpLmJy PgpEYXRlOiBUaHUsIDEyIE1hciAyMDA5IDE1OjE2OjQxIC0wMzAwClN1YmplY3Q6IFtQQVRDSCAx LzJdIDIwMDktMDMtMTIgIEd1c3Rhdm8gTm9yb25oYSBTaWx2YSAgPGduc0Bnbm9tZS5vcmc+Cgog ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgoKICAgICAgICBJbXByb3ZlZCBkb2N1 bWVudGF0aW9uIGZvciB0aGUgZG93bmxvYWQtcmVxdWVzdGVkIHNpZ25hbCwgdG8gbWFrZQogICAg ICAgIGl0cyB1c2FnZSBjbGVhci4KCiAgICAgICAgKiB3ZWJraXQvd2Via2l0d2Vidmlldy5jcHA6 Ci0tLQogV2ViS2l0L2d0ay9DaGFuZ2VMb2cgICAgICAgICAgICAgICAgfCAgICA5ICsrKysrKysr KwogV2ViS2l0L2d0ay93ZWJraXQvd2Via2l0d2Vidmlldy5jcHAgfCAgIDEzICsrKysrKysrKyst LS0KIDIgZmlsZXMgY2hhbmdlZCwgMTkgaW5zZXJ0aW9ucygrKSwgMyBkZWxldGlvbnMoLSkKCmRp ZmYgLS1naXQgYS9XZWJLaXQvZ3RrL0NoYW5nZUxvZyBiL1dlYktpdC9ndGsvQ2hhbmdlTG9nCmlu ZGV4IDZjMTgyN2UuLmY0ZmNkMmYgMTAwNjQ0Ci0tLSBhL1dlYktpdC9ndGsvQ2hhbmdlTG9nCisr KyBiL1dlYktpdC9ndGsvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMTQgQEAKIDIwMDktMDMtMTIgIEd1 c3Rhdm8gTm9yb25oYSBTaWx2YSAgPGduc0Bnbm9tZS5vcmc+CiAKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgSW1wcm92ZWQgZG9jdW1lbnRhdGlvbiBmb3Ig dGhlIGRvd25sb2FkLXJlcXVlc3RlZCBzaWduYWwsIHRvIG1ha2UKKyAgICAgICAgaXRzIHVzYWdl IGNsZWFyLgorCisgICAgICAgICogd2Via2l0L3dlYmtpdHdlYnZpZXcuY3BwOgorCisyMDA5LTAz LTEyICBHdXN0YXZvIE5vcm9uaGEgU2lsdmEgIDxnbnNAZ25vbWUub3JnPgorCiAgICAgICAgIFJl dmlld2VkIGJ5IEFscCBUb2tlci4KIAogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MjQ1NDEKZGlmZiAtLWdpdCBhL1dlYktpdC9ndGsvd2Via2l0L3dlYmtp dHdlYnZpZXcuY3BwIGIvV2ViS2l0L2d0ay93ZWJraXQvd2Via2l0d2Vidmlldy5jcHAKaW5kZXgg YmVkNDVkNS4uNDYxMzhlYyAxMDA2NDQKLS0tIGEvV2ViS2l0L2d0ay93ZWJraXQvd2Via2l0d2Vi dmlldy5jcHAKKysrIGIvV2ViS2l0L2d0ay93ZWJraXQvd2Via2l0d2Vidmlldy5jcHAKQEAgLTEx MzMsMTEgKzExMzMsMTggQEAgc3RhdGljIHZvaWQgd2Via2l0X3dlYl92aWV3X2NsYXNzX2luaXQo V2ViS2l0V2ViVmlld0NsYXNzKiB3ZWJWaWV3Q2xhc3MpCiAgICAgLyoqCiAgICAgICogV2ViS2l0 V2ViVmlldzo6ZG93bmxvYWQtcmVxdWVzdGVkOgogICAgICAqIEB3ZWJfdmlldzogdGhlIG9iamVj dCBvbiB3aGljaCB0aGUgc2lnbmFsIGlzIGVtaXR0ZWQKLSAgICAgKiBAZG93bmxvYWQ6IHRoZSBt ZXNzYWdlIHRleHQKLSAgICAgKiBAcmV0dXJuOiBUUlVFIGlmIHRoZSBkb3dubG9hZCB3YXMgaGFu ZGxlZC4KKyAgICAgKiBAZG93bmxvYWQ6IGEgI1dlYktpdERvd25sb2FkIG9iamVjdCB0aGF0IGxl dHMgeW91IGNvbnRyb2wgdGhlCisgICAgICogZG93bmxvYWQgcHJvY2VzcworICAgICAqIEByZXR1 cm46ICVUUlVFIGlmIHRoZSBkb3dubG9hZCBzaG91bGQgYmUgcGVyZm9ybWVkLCAlRkFMU0UgdG8g Y2FuY2VsIGl0LgogICAgICAqCiAgICAgICogQSBuZXcgRG93bmxvYWQgaXMgYmVpbmcgcmVxdWVz dGVkLiBCeSBkZWZhdWx0LCBpZiB0aGUgc2lnbmFsIGlzCi0gICAgICogbm90IGhhbmRsZWQsIHRo ZSBkb3dubG9hZCBpcyBjYW5jZWxsZWQuCisgICAgICogbm90IGhhbmRsZWQsIHRoZSBkb3dubG9h ZCBpcyBjYW5jZWxsZWQuIE5vdGljZSB0aGF0IHdoaWxlCisgICAgICogaGFuZGxpbmcgdGhpcyBz aWduYWwgeW91IG11c3Qgc2V0IHRoZSB0YXJnZXQgVVJJIHVzaW5nCisgICAgICogd2Via2l0X2Rv d25sb2FkX3NldF90YXJnZXRfdXJpKCkuCisgICAgICoKKyAgICAgKiBJZiB5b3UgaW50ZW5kIHRv IGhhbmRsZSBkb3dubG9hZHMgeW91cnNlbGYgcmF0aGVyIHRoYW4gdXNpbmcKKyAgICAgKiB0aGUg I1dlYktpdERvd25sb2FkIGhlbHBlciBvYmplY3QgeW91IG11c3QgaGFuZGxlIHRoaXMgc2lnbmFs LAorICAgICAqIGFuZCByZXR1cm4gJUZBTFNFLgogICAgICAqCiAgICAgICogU2luY2U6IDEuMS4y CiAgICAgICovCi0tIAoxLjYuMgoK 28538 2009-03-12 11:57:19 -0700 2009-03-12 12:15:38 -0700 rename state to status and make it a property download-state-status-rename.patch text/plain 12066 gustavo RnJvbSBjZWZhODkwNjIzNGNlNzJkMzRjYTA3YzllODg1Y2UyNmJmZjUxNjQyIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBHdXN0YXZvIE5vcm9uaGEgU2lsdmEgPGtvdkBrb3YuZXRpLmJy PgpEYXRlOiBUaHUsIDEyIE1hciAyMDA5IDE1OjUwOjI5IC0wMzAwClN1YmplY3Q6IFtQQVRDSCAy LzJdIDIwMDktMDMtMTIgIEd1c3Rhdm8gTm9yb25oYSBTaWx2YSAgPGduc0Bnbm9tZS5vcmc+Cgog ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgoKICAgICAgICBSZW5hbWUgJ3N0YXRl JyB0byAnc3RhdHVzJyB0byBtYXRjaCB0aGUgc2FtZSBuYW1pbmcgaW4gdGhlIGZyYW1lCiAgICAg ICAgbG9hZGVyIHJld29yayB0aGF0IHdlIHBsYW4gdG8gbGFuZCBzb29uaXNoLCBhbmQgbWFrZSBp dCBhCiAgICAgICAgcHJvcGVydHksIGZvciB0aGUgc2FtZSByZWFzb24uCgogICAgICAgICogd2Vi a2l0L3dlYmtpdGRvd25sb2FkLmNwcDoKICAgICAgICAoX1dlYktpdERvd25sb2FkUHJpdmF0ZTo6 KToKICAgICAgICAoX1dlYktpdERvd25sb2FkUHJpdmF0ZTo6d2Via2l0X2Rvd25sb2FkX2ZpbmFs aXplKToKICAgICAgICAoX1dlYktpdERvd25sb2FkUHJpdmF0ZTo6d2Via2l0X2Rvd25sb2FkX2dl dF9wcm9wZXJ0eSk6CiAgICAgICAgKF9XZWJLaXREb3dubG9hZFByaXZhdGU6OndlYmtpdF9kb3du bG9hZF9zZXRfcHJvcGVydHkpOgogICAgICAgIChfV2ViS2l0RG93bmxvYWRQcml2YXRlOjp3ZWJr aXRfZG93bmxvYWRfY2xhc3NfaW5pdCk6CiAgICAgICAgKF9XZWJLaXREb3dubG9hZFByaXZhdGU6 OndlYmtpdF9kb3dubG9hZF9pbml0KToKICAgICAgICAoX1dlYktpdERvd25sb2FkUHJpdmF0ZTo6 d2Via2l0X2Rvd25sb2FkX3N0YXJ0KToKICAgICAgICAoX1dlYktpdERvd25sb2FkUHJpdmF0ZTo6 d2Via2l0X2Rvd25sb2FkX2NhbmNlbCk6CiAgICAgICAgKF9XZWJLaXREb3dubG9hZFByaXZhdGU6 OndlYmtpdF9kb3dubG9hZF9zZXRfZGVzdGluYXRpb25fdXJpKToKICAgICAgICAoX1dlYktpdERv d25sb2FkUHJpdmF0ZTo6d2Via2l0X2Rvd25sb2FkX2dldF9zdGF0dXMpOgogICAgICAgIChfV2Vi S2l0RG93bmxvYWRQcml2YXRlOjp3ZWJraXRfZG93bmxvYWRfc2V0X3N0YXR1cyk6CiAgICAgICAg KF9XZWJLaXREb3dubG9hZFByaXZhdGU6OndlYmtpdF9kb3dubG9hZF9yZWNlaXZlZF9kYXRhKToK ICAgICAgICAoX1dlYktpdERvd25sb2FkUHJpdmF0ZTo6d2Via2l0X2Rvd25sb2FkX2ZpbmlzaGVk X2xvYWRpbmcpOgogICAgICAgIChfV2ViS2l0RG93bmxvYWRQcml2YXRlOjp3ZWJraXRfZG93bmxv YWRfZXJyb3IpOgogICAgICAgICogd2Via2l0L3dlYmtpdGRvd25sb2FkLmg6Ci0tLQogV2ViS2l0 L2d0ay9DaGFuZ2VMb2cgICAgICAgICAgICAgICAgIHwgICAyNSArKysrKysrKysrKysKIFdlYktp dC9ndGsvd2Via2l0L3dlYmtpdGRvd25sb2FkLmNwcCB8ICAgNjggKysrKysrKysrKysrKysrKysr KysrKysrKystLS0tLS0tLQogV2ViS2l0L2d0ay93ZWJraXQvd2Via2l0ZG93bmxvYWQuaCAgIHwg ICAxNiArKysrLS0tLQogMyBmaWxlcyBjaGFuZ2VkLCA4NSBpbnNlcnRpb25zKCspLCAyNCBkZWxl dGlvbnMoLSkKCmRpZmYgLS1naXQgYS9XZWJLaXQvZ3RrL0NoYW5nZUxvZyBiL1dlYktpdC9ndGsv Q2hhbmdlTG9nCmluZGV4IGY0ZmNkMmYuLjhjYzc3ZGUgMTAwNjQ0Ci0tLSBhL1dlYktpdC9ndGsv Q2hhbmdlTG9nCisrKyBiL1dlYktpdC9ndGsvQ2hhbmdlTG9nCkBAIC0yLDYgKzIsMzEgQEAKIAog ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KIAorICAgICAgICBSZW5hbWUgJ3N0 YXRlJyB0byAnc3RhdHVzJyB0byBtYXRjaCB0aGUgc2FtZSBuYW1pbmcgaW4gdGhlIGZyYW1lCisg ICAgICAgIGxvYWRlciByZXdvcmsgdGhhdCB3ZSBwbGFuIHRvIGxhbmQgc29vbmlzaCwgYW5kIG1h a2UgaXQgYQorICAgICAgICBwcm9wZXJ0eSwgZm9yIHRoZSBzYW1lIHJlYXNvbi4KKworICAgICAg ICAqIHdlYmtpdC93ZWJraXRkb3dubG9hZC5jcHA6CisgICAgICAgIChfV2ViS2l0RG93bmxvYWRQ cml2YXRlOjopOgorICAgICAgICAoX1dlYktpdERvd25sb2FkUHJpdmF0ZTo6d2Via2l0X2Rvd25s b2FkX2ZpbmFsaXplKToKKyAgICAgICAgKF9XZWJLaXREb3dubG9hZFByaXZhdGU6OndlYmtpdF9k b3dubG9hZF9nZXRfcHJvcGVydHkpOgorICAgICAgICAoX1dlYktpdERvd25sb2FkUHJpdmF0ZTo6 d2Via2l0X2Rvd25sb2FkX3NldF9wcm9wZXJ0eSk6CisgICAgICAgIChfV2ViS2l0RG93bmxvYWRQ cml2YXRlOjp3ZWJraXRfZG93bmxvYWRfY2xhc3NfaW5pdCk6CisgICAgICAgIChfV2ViS2l0RG93 bmxvYWRQcml2YXRlOjp3ZWJraXRfZG93bmxvYWRfaW5pdCk6CisgICAgICAgIChfV2ViS2l0RG93 bmxvYWRQcml2YXRlOjp3ZWJraXRfZG93bmxvYWRfc3RhcnQpOgorICAgICAgICAoX1dlYktpdERv d25sb2FkUHJpdmF0ZTo6d2Via2l0X2Rvd25sb2FkX2NhbmNlbCk6CisgICAgICAgIChfV2ViS2l0 RG93bmxvYWRQcml2YXRlOjp3ZWJraXRfZG93bmxvYWRfc2V0X2Rlc3RpbmF0aW9uX3VyaSk6Cisg ICAgICAgIChfV2ViS2l0RG93bmxvYWRQcml2YXRlOjp3ZWJraXRfZG93bmxvYWRfZ2V0X3N0YXR1 cyk6CisgICAgICAgIChfV2ViS2l0RG93bmxvYWRQcml2YXRlOjp3ZWJraXRfZG93bmxvYWRfc2V0 X3N0YXR1cyk6CisgICAgICAgIChfV2ViS2l0RG93bmxvYWRQcml2YXRlOjp3ZWJraXRfZG93bmxv YWRfcmVjZWl2ZWRfZGF0YSk6CisgICAgICAgIChfV2ViS2l0RG93bmxvYWRQcml2YXRlOjp3ZWJr aXRfZG93bmxvYWRfZmluaXNoZWRfbG9hZGluZyk6CisgICAgICAgIChfV2ViS2l0RG93bmxvYWRQ cml2YXRlOjp3ZWJraXRfZG93bmxvYWRfZXJyb3IpOgorICAgICAgICAqIHdlYmtpdC93ZWJraXRk b3dubG9hZC5oOgorCisyMDA5LTAzLTEyICBHdXN0YXZvIE5vcm9uaGEgU2lsdmEgIDxnbnNAZ25v bWUub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCiAgICAgICAg IEltcHJvdmVkIGRvY3VtZW50YXRpb24gZm9yIHRoZSBkb3dubG9hZC1yZXF1ZXN0ZWQgc2lnbmFs LCB0byBtYWtlCiAgICAgICAgIGl0cyB1c2FnZSBjbGVhci4KIApkaWZmIC0tZ2l0IGEvV2ViS2l0 L2d0ay93ZWJraXQvd2Via2l0ZG93bmxvYWQuY3BwIGIvV2ViS2l0L2d0ay93ZWJraXQvd2Via2l0 ZG93bmxvYWQuY3BwCmluZGV4IDFjMjNiODMuLjQ0ODgzMDQgMTAwNjQ0Ci0tLSBhL1dlYktpdC9n dGsvd2Via2l0L3dlYmtpdGRvd25sb2FkLmNwcAorKysgYi9XZWJLaXQvZ3RrL3dlYmtpdC93ZWJr aXRkb3dubG9hZC5jcHAKQEAgLTI3LDYgKzI3LDcgQEAKICNpbmNsdWRlICJSZXNvdXJjZVJlcXVl c3QuaCIKICNpbmNsdWRlICJSZXNvdXJjZVJlc3BvbnNlLmgiCiAjaW5jbHVkZSAid2Via2l0ZG93 bmxvYWQuaCIKKyNpbmNsdWRlICJ3ZWJraXRlbnVtdHlwZXMuaCIKICNpbmNsdWRlICJ3ZWJraXRt YXJzaGFsLmgiCiAjaW5jbHVkZSAid2Via2l0cHJpdmF0ZS5oIgogCkBAIC01OSw3ICs2MCw3IEBA IHN0cnVjdCBfV2ViS2l0RG93bmxvYWRQcml2YXRlIHsKICAgICBnY2hhciogc3VnZ2VzdGVkRmls ZW5hbWU7CiAgICAgZ3VpbnQgY3VycmVudFNpemU7CiAgICAgR1RpbWVyKiB0aW1lcjsKLSAgICBX ZWJLaXREb3dubG9hZFN0YXRlIHN0YXRlOworICAgIFdlYktpdERvd25sb2FkU3RhdHVzIHN0YXR1 czsKICAgICBHRmlsZU91dHB1dFN0cmVhbSogb3V0cHV0U3RyZWFtOwogICAgIERvd25sb2FkQ2xp ZW50KiBkb3dubG9hZENsaWVudDsKICAgICBXZWJLaXROZXR3b3JrUmVxdWVzdCogbmV0d29ya1Jl cXVlc3Q7CkBAIC04MiwxMiArODMsMTYgQEAgZW51bSB7CiAgICAgUFJPUF9ERVNUSU5BVElPTl9V UkksCiAgICAgUFJPUF9TVUdHRVNURURfRklMRU5BTUUsCiAgICAgUFJPUF9QUk9HUkVTUywKKyAg ICBQUk9QX1NUQVRVUywKICAgICBQUk9QX0NVUlJFTlRfU0laRSwKICAgICBQUk9QX1RPVEFMX1NJ WkUKIH07CiAKIEdfREVGSU5FX1RZUEUoV2ViS2l0RG93bmxvYWQsIHdlYmtpdF9kb3dubG9hZCwg R19UWVBFX09CSkVDVCk7CiAKKworc3RhdGljIHZvaWQgd2Via2l0X2Rvd25sb2FkX3NldF9zdGF0 dXMoV2ViS2l0RG93bmxvYWQqIGRvd25sb2FkLCBXZWJLaXREb3dubG9hZFN0YXR1cyBzdGF0dXMp OworCiBzdGF0aWMgdm9pZCB3ZWJraXRfZG93bmxvYWRfZGlzcG9zZShHT2JqZWN0KiBvYmplY3Qp CiB7CiAgICAgV2ViS2l0RG93bmxvYWQqIGRvd25sb2FkID0gV0VCS0lUX0RPV05MT0FEKG9iamVj dCk7CkBAIC0xMTQsNyArMTE5LDcgQEAgc3RhdGljIHZvaWQgd2Via2l0X2Rvd25sb2FkX2ZpbmFs aXplKEdPYmplY3QqIG9iamVjdCkKICAgICAvLyBXZSBkb24ndCBjYWxsIHdlYmtpdF9kb3dubG9h ZF9jYW5jZWwoKSBiZWNhdXNlIHdlIGRvbid0IHdhbnQgdG8gZW1pdAogICAgIC8vIHNpZ25hbHMg d2hlbiBmaW5hbGl6aW5nIGFuIG9iamVjdC4KICAgICBpZiAocHJpdi0+cmVzb3VyY2VIYW5kbGUp IHsKLSAgICAgICAgaWYgKHByaXYtPnN0YXRlID09IFdFQktJVF9ET1dOTE9BRF9TVEFURV9TVEFS VEVEKSB7CisgICAgICAgIGlmIChwcml2LT5zdGF0dXMgPT0gV0VCS0lUX0RPV05MT0FEX1NUQVRV U19TVEFSVEVEKSB7CiAgICAgICAgICAgICBwcml2LT5yZXNvdXJjZUhhbmRsZS0+c2V0Q2xpZW50 KDApOwogICAgICAgICAgICAgcHJpdi0+cmVzb3VyY2VIYW5kbGUtPmNhbmNlbCgpOwogICAgICAg ICB9CkBAIC0xNTIsNiArMTU3LDkgQEAgc3RhdGljIHZvaWQgd2Via2l0X2Rvd25sb2FkX2dldF9w cm9wZXJ0eShHT2JqZWN0KiBvYmplY3QsIGd1aW50IHByb3BfaWQsIEdWYWx1ZSoKICAgICBjYXNl IFBST1BfUFJPR1JFU1M6CiAgICAgICAgIGdfdmFsdWVfc2V0X2RvdWJsZSh2YWx1ZSwgd2Via2l0 X2Rvd25sb2FkX2dldF9wcm9ncmVzcyhkb3dubG9hZCkpOwogICAgICAgICBicmVhazsKKyAgICBj YXNlIFBST1BfU1RBVFVTOgorICAgICAgICBnX3ZhbHVlX3NldF9lbnVtKHZhbHVlLCB3ZWJraXRf ZG93bmxvYWRfZ2V0X3N0YXR1cyhkb3dubG9hZCkpOworICAgICAgICBicmVhazsKICAgICBjYXNl IFBST1BfQ1VSUkVOVF9TSVpFOgogICAgICAgICBnX3ZhbHVlX3NldF91aW50NjQodmFsdWUsIHdl YmtpdF9kb3dubG9hZF9nZXRfY3VycmVudF9zaXplKGRvd25sb2FkKSk7CiAgICAgICAgIGJyZWFr OwpAQCAtMTc4LDYgKzE4Niw5IEBAIHN0YXRpYyB2b2lkIHdlYmtpdF9kb3dubG9hZF9zZXRfcHJv cGVydHkoR09iamVjdCogb2JqZWN0LCBndWludCBwcm9wX2lkLCBjb25zdCBHCiAgICAgY2FzZSBQ Uk9QX0RFU1RJTkFUSU9OX1VSSToKICAgICAgICAgd2Via2l0X2Rvd25sb2FkX3NldF9kZXN0aW5h dGlvbl91cmkoZG93bmxvYWQsIGdfdmFsdWVfZ2V0X3N0cmluZyh2YWx1ZSkpOwogICAgICAgICBi cmVhazsKKyAgICBjYXNlIFBST1BfU1RBVFVTOgorICAgICAgICB3ZWJraXRfZG93bmxvYWRfc2V0 X3N0YXR1cyhkb3dubG9hZCwgc3RhdGljX2Nhc3Q8V2ViS2l0RG93bmxvYWRTdGF0dXM+KGdfdmFs dWVfZ2V0X2VudW0odmFsdWUpKSk7CisgICAgICAgIGJyZWFrOwogICAgIGRlZmF1bHQ6CiAgICAg ICAgIEdfT0JKRUNUX1dBUk5fSU5WQUxJRF9QUk9QRVJUWV9JRChvYmplY3QsIHByb3BfaWQsIHBz cGVjKTsKICAgICB9CkBAIC0yNzUsNiArMjg2LDIxIEBAIHN0YXRpYyB2b2lkIHdlYmtpdF9kb3du bG9hZF9jbGFzc19pbml0KFdlYktpdERvd25sb2FkQ2xhc3MqIGRvd25sb2FkQ2xhc3MpCiAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFdFQktJ VF9QQVJBTV9SRUFEQUJMRSkpOwogCiAgICAgLyoqCisgICAgICogV2ViS2l0RG93bmxvYWQ6c3Rh dHVzOgorICAgICAqCisgICAgICogRGV0ZXJtaW5lcyB0aGUgY3VycmVudCBzdGF0dXMgb2YgdGhl IGRvd25sb2FkLgorICAgICAqCisgICAgICogU2luY2U6IDEuMS4yCisgICAgICovCisgICAgZ19v YmplY3RfY2xhc3NfaW5zdGFsbF9wcm9wZXJ0eShvYmplY3RDbGFzcywgUFJPUF9TVEFUVVMsCisg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBnX3BhcmFtX3NwZWNfZW51bSgic3Rh dHVzIiwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICJTdGF0dXMiLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIkRldGVybWluZXMgdGhlIGN1cnJlbnQgc3RhdHVzIG9mIHRoZSBkb3dubG9h ZCIsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICBXRUJLSVRfVFlQRV9ET1dOTE9BRF9TVEFUVVMsCisgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBXRUJLSVRfRE9XTkxPQURfU1RBVFVTX0NSRUFU RUQsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICBXRUJLSVRfUEFSQU1fUkVBREFCTEUpKTsKKworICAgIC8qKgogICAgICAqIFdlYktpdERvd25s b2FkOmN1cnJlbnQtc2l6ZQogICAgICAqCiAgICAgICogVGhlIGxlbmd0aCBvZiB0aGUgZGF0YSBh bHJlYWR5IGRvd25sb2FkZWQKQEAgLTMxNCw3ICszNDAsNyBAQCBzdGF0aWMgdm9pZCB3ZWJraXRf ZG93bmxvYWRfaW5pdChXZWJLaXREb3dubG9hZCogZG93bmxvYWQpCiAKICAgICBwcml2LT5kb3du bG9hZENsaWVudCA9IG5ldyBEb3dubG9hZENsaWVudChkb3dubG9hZCk7CiAgICAgcHJpdi0+Y3Vy cmVudFNpemUgPSAwOwotICAgIHByaXYtPnN0YXRlID0gV0VCS0lUX0RPV05MT0FEX1NUQVRFX0NS RUFURUQ7CisgICAgcHJpdi0+c3RhdHVzID0gV0VCS0lUX0RPV05MT0FEX1NUQVRVU19DUkVBVEVE OwogfQogCiAvKioKQEAgLTM4NCw3ICs0MTAsNyBAQCB2b2lkIHdlYmtpdF9kb3dubG9hZF9zdGFy dChXZWJLaXREb3dubG9hZCogZG93bmxvYWQpCiAKICAgICBXZWJLaXREb3dubG9hZFByaXZhdGUq IHByaXYgPSBkb3dubG9hZC0+cHJpdjsKICAgICBnX3JldHVybl9pZl9mYWlsKHByaXYtPmRlc3Rp bmF0aW9uVVJJKTsKLSAgICBnX3JldHVybl9pZl9mYWlsKHByaXYtPnN0YXRlID09IFdFQktJVF9E T1dOTE9BRF9TVEFURV9DUkVBVEVEKTsKKyAgICBnX3JldHVybl9pZl9mYWlsKHByaXYtPnN0YXR1 cyA9PSBXRUJLSVRfRE9XTkxPQURfU1RBVFVTX0NSRUFURUQpOwogICAgIGdfcmV0dXJuX2lmX2Zh aWwocHJpdi0+dGltZXIgPT0gTlVMTCk7CiAKICAgICBpZiAocHJpdi0+cmVzb3VyY2VIYW5kbGUp CkBAIC00MjYsNyArNDUyLDcgQEAgdm9pZCB3ZWJraXRfZG93bmxvYWRfY2FuY2VsKFdlYktpdERv d25sb2FkKiBkb3dubG9hZCkKICAgICBpZiAocHJpdi0+cmVzb3VyY2VIYW5kbGUpCiAgICAgICAg IHByaXYtPnJlc291cmNlSGFuZGxlLT5jYW5jZWwoKTsKIAotICAgIHByaXYtPnN0YXRlID0gV0VC S0lUX0RPV05MT0FEX1NUQVRFX0NBTkNFTExFRDsKKyAgICB3ZWJraXRfZG93bmxvYWRfc2V0X3N0 YXR1cyhkb3dubG9hZCwgV0VCS0lUX0RPV05MT0FEX1NUQVRVU19DQU5DRUxMRUQpOwogCiAgICAg Z2Jvb2xlYW4gaGFuZGxlZDsKICAgICBnX3NpZ25hbF9lbWl0X2J5X25hbWUoZG93bmxvYWQsICJl cnJvciIsIDAsIFdFQktJVF9ET1dOTE9BRF9FUlJPUl9DQU5DRUxMRURfQllfVVNFUiwgIlVzZXIg Y2FuY2VsbGVkIHRoZSBkb3dubG9hZCIsICZoYW5kbGVkKTsKQEAgLTUzNCw3ICs1NjAsNyBAQCB2 b2lkIHdlYmtpdF9kb3dubG9hZF9zZXRfZGVzdGluYXRpb25fdXJpKFdlYktpdERvd25sb2FkKiBk b3dubG9hZCwgY29uc3QgZ2NoYXIqCiAgICAgaWYgKHByaXYtPmRlc3RpbmF0aW9uVVJJICYmICFz dHJjbXAocHJpdi0+ZGVzdGluYXRpb25VUkksIGRlc3RpbmF0aW9uX3VyaSkpCiAgICAgICAgIHJl dHVybjsKIAotICAgIGlmIChwcml2LT5zdGF0ZSAhPSBXRUJLSVRfRE9XTkxPQURfU1RBVEVfQ1JF QVRFRCAmJiBwcml2LT5zdGF0ZSAhPSBXRUJLSVRfRE9XTkxPQURfU1RBVEVfQ0FOQ0VMTEVEKSB7 CisgICAgaWYgKHByaXYtPnN0YXR1cyAhPSBXRUJLSVRfRE9XTkxPQURfU1RBVFVTX0NSRUFURUQg JiYgcHJpdi0+c3RhdHVzICE9IFdFQktJVF9ET1dOTE9BRF9TVEFUVVNfQ0FOQ0VMTEVEKSB7CiAg ICAgICAgIEFTU0VSVChwcml2LT5kZXN0aW5hdGlvblVSSSk7CiAKICAgICAgICAgZ2Jvb2xlYW4g ZG93bmxvYWRpbmcgPSBwcml2LT5vdXRwdXRTdHJlYW0gIT0gTlVMTDsKQEAgLTU3NiwyMiArNjAy LDMyIEBAIHZvaWQgd2Via2l0X2Rvd25sb2FkX3NldF9kZXN0aW5hdGlvbl91cmkoV2ViS2l0RG93 bmxvYWQqIGRvd25sb2FkLCBjb25zdCBnY2hhcioKIH0KIAogLyoqCi0gKiB3ZWJraXRfZG93bmxv YWRfZ2V0X3N0YXRlOgorICogd2Via2l0X2Rvd25sb2FkX2dldF9zdGF0dXM6CiAgKiBAZG93bmxv YWQ6IHRoZSAjV2ViS2l0RG93bmxvYWQKICAqCi0gKiBPYnRhaW5zIHRoZSBjdXJyZW50IHN0YXRl IG9mIHRoZSBkb3dubG9hZCwgYXMgYQotICogI1dlYktpdERvd25sb2FkU3RhdGUuCisgKiBPYnRh aW5zIHRoZSBjdXJyZW50IHN0YXR1cyBvZiB0aGUgZG93bmxvYWQsIGFzIGEKKyAqICNXZWJLaXRE b3dubG9hZFN0YXR1cy4KICAqCi0gKiBSZXR1cm5zOiB0aGUgY3VycmVudCAjV2ViS2l0RG93bmxv YWRTdGF0ZQorICogUmV0dXJuczogdGhlIGN1cnJlbnQgI1dlYktpdERvd25sb2FkU3RhdHVzCiAg KgogICogU2luY2U6IDEuMS4yCiAgKi8KLVdlYktpdERvd25sb2FkU3RhdGUgd2Via2l0X2Rvd25s b2FkX2dldF9zdGF0ZShXZWJLaXREb3dubG9hZCogZG93bmxvYWQpCitXZWJLaXREb3dubG9hZFN0 YXR1cyB3ZWJraXRfZG93bmxvYWRfZ2V0X3N0YXR1cyhXZWJLaXREb3dubG9hZCogZG93bmxvYWQp Cit7CisgICAgZ19yZXR1cm5fdmFsX2lmX2ZhaWwoV0VCS0lUX0lTX0RPV05MT0FEKGRvd25sb2Fk KSwgV0VCS0lUX0RPV05MT0FEX1NUQVRVU19FUlJPUik7CisKKyAgICBXZWJLaXREb3dubG9hZFBy aXZhdGUqIHByaXYgPSBkb3dubG9hZC0+cHJpdjsKKyAgICByZXR1cm4gcHJpdi0+c3RhdHVzOwor fQorCitzdGF0aWMgdm9pZCB3ZWJraXRfZG93bmxvYWRfc2V0X3N0YXR1cyhXZWJLaXREb3dubG9h ZCogZG93bmxvYWQsIFdlYktpdERvd25sb2FkU3RhdHVzIHN0YXR1cykKIHsKLSAgICBnX3JldHVy bl92YWxfaWZfZmFpbChXRUJLSVRfSVNfRE9XTkxPQUQoZG93bmxvYWQpLCBXRUJLSVRfRE9XTkxP QURfU1RBVEVfRVJST1IpOworICAgIGdfcmV0dXJuX2lmX2ZhaWwoV0VCS0lUX0lTX0RPV05MT0FE KGRvd25sb2FkKSk7CiAKICAgICBXZWJLaXREb3dubG9hZFByaXZhdGUqIHByaXYgPSBkb3dubG9h ZC0+cHJpdjsKLSAgICByZXR1cm4gcHJpdi0+c3RhdGU7CisgICAgcHJpdi0+c3RhdHVzID0gc3Rh dHVzOworCisgICAgZ19vYmplY3Rfbm90aWZ5KEdfT0JKRUNUKGRvd25sb2FkKSwgInN0YXR1cyIp OwogfQogCiAvKioKQEAgLTY4NSw3ICs3MjEsNyBAQCBzdGF0aWMgdm9pZCB3ZWJraXRfZG93bmxv YWRfcmVjZWl2ZWRfZGF0YShXZWJLaXREb3dubG9hZCogZG93bmxvYWQsIGNvbnN0IGdjaGFyKgog ICAgIFdlYktpdERvd25sb2FkUHJpdmF0ZSogcHJpdiA9IGRvd25sb2FkLT5wcml2OwogCiAgICAg aWYgKHByaXYtPmN1cnJlbnRTaXplID09IDApCi0gICAgICAgIHByaXYtPnN0YXRlID0gV0VCS0lU X0RPV05MT0FEX1NUQVRFX1NUQVJURUQ7CisgICAgICAgIHdlYmtpdF9kb3dubG9hZF9zZXRfc3Rh dHVzKGRvd25sb2FkLCBXRUJLSVRfRE9XTkxPQURfU1RBVFVTX1NUQVJURUQpOwogCiAgICAgQVNT RVJUKHByaXYtPm91dHB1dFN0cmVhbSk7CiAKQEAgLTcyMiw5ICs3NTgsOSBAQCBzdGF0aWMgdm9p ZCB3ZWJraXRfZG93bmxvYWRfZmluaXNoZWRfbG9hZGluZyhXZWJLaXREb3dubG9hZCogZG93bmxv YWQpCiAgICAgV2ViS2l0RG93bmxvYWRQcml2YXRlKiBwcml2ID0gZG93bmxvYWQtPnByaXY7CiAK ICAgICBnX3RpbWVyX3N0b3AocHJpdi0+dGltZXIpOwotICAgIHByaXYtPnN0YXRlID0gV0VCS0lU X0RPV05MT0FEX1NUQVRFX0ZJTklTSEVEOwogCiAgICAgZ19vYmplY3Rfbm90aWZ5KEdfT0JKRUNU KGRvd25sb2FkKSwgInByb2dyZXNzIik7CisgICAgd2Via2l0X2Rvd25sb2FkX3NldF9zdGF0dXMo ZG93bmxvYWQsIFdFQktJVF9ET1dOTE9BRF9TVEFUVVNfRklOSVNIRUQpOwogfQogCiBzdGF0aWMg dm9pZCB3ZWJraXRfZG93bmxvYWRfZXJyb3IoV2ViS2l0RG93bmxvYWQqIGRvd25sb2FkLCBjb25z dCBSZXNvdXJjZUVycm9yJiBlcnJvcikKQEAgLTczNCw3ICs3NzAsNyBAQCBzdGF0aWMgdm9pZCB3 ZWJraXRfZG93bmxvYWRfZXJyb3IoV2ViS2l0RG93bmxvYWQqIGRvd25sb2FkLCBjb25zdCBSZXNv dXJjZUVycm9yJgogICAgIFdlYktpdERvd25sb2FkUHJpdmF0ZSogcHJpdiA9IGRvd25sb2FkLT5w cml2OwogCiAgICAgZ190aW1lcl9zdG9wKHByaXYtPnRpbWVyKTsKLSAgICBwcml2LT5zdGF0ZSA9 IFdFQktJVF9ET1dOTE9BRF9TVEFURV9FUlJPUjsKKyAgICB3ZWJraXRfZG93bmxvYWRfc2V0X3N0 YXR1cyhkb3dubG9hZCwgV0VCS0lUX0RPV05MT0FEX1NUQVRVU19FUlJPUik7CiAKICAgICBnYm9v bGVhbiBoYW5kbGVkOwogICAgIGdfc2lnbmFsX2VtaXRfYnlfbmFtZShkb3dubG9hZCwgImVycm9y IiwgMCwgV0VCS0lUX0RPV05MT0FEX0VSUk9SX05FVFdPUkssIGVycm9yLmxvY2FsaXplZERlc2Ny aXB0aW9uKCkudXRmOCgpLmRhdGEoKSwgJmhhbmRsZWQpOwpkaWZmIC0tZ2l0IGEvV2ViS2l0L2d0 ay93ZWJraXQvd2Via2l0ZG93bmxvYWQuaCBiL1dlYktpdC9ndGsvd2Via2l0L3dlYmtpdGRvd25s b2FkLmgKaW5kZXggNzVlYTg5YS4uN2M4NmM2NSAxMDA2NDQKLS0tIGEvV2ViS2l0L2d0ay93ZWJr aXQvd2Via2l0ZG93bmxvYWQuaAorKysgYi9XZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXRkb3dubG9h ZC5oCkBAIC0zNSwxMiArMzUsMTIgQEAgR19CRUdJTl9ERUNMUwogI2RlZmluZSBXRUJLSVRfRE9X TkxPQURfR0VUX0NMQVNTKG9iaikgIChHX1RZUEVfSU5TVEFOQ0VfR0VUX0NMQVNTKChvYmopLCAg V0VCS0lUX1RZUEVfRE9XTkxPQUQsIFdlYktpdERvd25sb2FkQ2xhc3MpKQogCiB0eXBlZGVmIGVu dW0gewotICAgIFdFQktJVF9ET1dOTE9BRF9TVEFURV9FUlJPUiA9IC0xLAotICAgIFdFQktJVF9E T1dOTE9BRF9TVEFURV9DUkVBVEVEID0gMCwKLSAgICBXRUJLSVRfRE9XTkxPQURfU1RBVEVfU1RB UlRFRCwKLSAgICBXRUJLSVRfRE9XTkxPQURfU1RBVEVfQ0FOQ0VMTEVELAotICAgIFdFQktJVF9E T1dOTE9BRF9TVEFURV9GSU5JU0hFRAotfSBXZWJLaXREb3dubG9hZFN0YXRlOworICAgIFdFQktJ VF9ET1dOTE9BRF9TVEFUVVNfRVJST1IgPSAtMSwKKyAgICBXRUJLSVRfRE9XTkxPQURfU1RBVFVT X0NSRUFURUQgPSAwLAorICAgIFdFQktJVF9ET1dOTE9BRF9TVEFUVVNfU1RBUlRFRCwKKyAgICBX RUJLSVRfRE9XTkxPQURfU1RBVFVTX0NBTkNFTExFRCwKKyAgICBXRUJLSVRfRE9XTkxPQURfU1RB VFVTX0ZJTklTSEVECit9IFdlYktpdERvd25sb2FkU3RhdHVzOwogCiB0eXBlZGVmIGVudW0gewog ICAgIFdFQktJVF9ET1dOTE9BRF9FUlJPUl9DQU5DRUxMRURfQllfVVNFUiwKQEAgLTEwNiw4ICsx MDYsOCBAQCB3ZWJraXRfZG93bmxvYWRfZ2V0X3RvdGFsX3NpemUgICAgICAgICAgICAgIChXZWJL aXREb3dubG9hZCAgICAgICAqZG93bmxvYWQpOwogV0VCS0lUX0FQSSBndWludDY0CiB3ZWJraXRf ZG93bmxvYWRfZ2V0X2N1cnJlbnRfc2l6ZSAgICAgICAgICAgIChXZWJLaXREb3dubG9hZCAgICAg ICAqZG93bmxvYWQpOwogCi1XRUJLSVRfQVBJIFdlYktpdERvd25sb2FkU3RhdGUKLXdlYmtpdF9k b3dubG9hZF9nZXRfc3RhdGUgICAgICAgICAgICAgICAgICAgKFdlYktpdERvd25sb2FkICAgICAg ICpkb3dubG9hZCk7CitXRUJLSVRfQVBJIFdlYktpdERvd25sb2FkU3RhdHVzCit3ZWJraXRfZG93 bmxvYWRfZ2V0X3N0YXR1cyAgICAgICAgICAgICAgICAgIChXZWJLaXREb3dubG9hZCAgICAgICAq ZG93bmxvYWQpOwogCiBHX0VORF9ERUNMUwogCi0tIAoxLjYuMgoK