49628 2010-11-16 15:21:11 -0800 Set the original URL for downloads 2010-11-16 15:53:43 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 309968 0 andersca 2010-11-16 15:21:11 -0800 Set the original URL for downloads 309971 1 74047 andersca 2010-11-16 15:27:50 -0800 Created attachment 74047 Patch 309985 2 74047 sullivan 2010-11-16 15:46:53 -0800 Comment on attachment 74047 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=74047&action=review > WebKit2/WebProcess/Downloads/mac/DownloadMac.mm:68 > +} It's non-obvious why we can get the originating URL from the back/forward list. The old code in WebFrameLoaderClient.mm included a few comments and a FIXME that make this a little clearer. I think it's worthwhile to reproduce those comments and FIXME here. (I see one of them is now in setOriginalURLForDownload, but the others aren't.) It might also help to name this function originatingURLFromBackForwardList, since it's only used when there's no referrer. 309990 3 andersca 2010-11-16 15:53:43 -0800 Committed r72145: <http://trac.webkit.org/changeset/72145> 74047 2010-11-16 15:27:50 -0800 2010-11-16 15:46:53 -0800 Patch bug-49628-20101116152749.patch text/plain 10186 andersca ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg MWQwYzVkMzhmNjQxOGRkNjRhNTgyNTdiZjI3ZjAzZWIxMmQ5ZjFhOC4uMjUwYWViMjAwM2FlYTEx YWNiM2U4MmNjODBkYzA2NDM2ZDk1ZGE0NyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cK KysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNCBAQAorMjAxMC0xMS0xNiAgQW5k ZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFNldCB0aGUgb3JpZ2luYWwgVVJMIGZvciBkb3du bG9hZHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQ5 NjI4CisKKyAgICAgICAgRXhwb3J0IHN5bWJvbHMgbmVlZGVkIGJ5IFdlYktpdDIuCisKKyAgICAg ICAgKiBXZWJDb3JlLmV4cC5pbjoKKwogMjAxMC0xMS0xMiAgWmhlbnlhbyBNbyAgPHptb0Bnb29n bGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEtlbm5ldGggUnVzc2VsbC4KZGlmZiAtLWdp dCBhL1dlYkNvcmUvV2ViQ29yZS5leHAuaW4gYi9XZWJDb3JlL1dlYkNvcmUuZXhwLmluCmluZGV4 IGE3NWZiOTgyNzJiMTBlZjJmODY2MmNkMzQ1MzYxMjZiYzBiNTBjMGMuLmM3MTUwY2MzOGM2ZTk2 MTk5ZGYzMTY5YmIxOGMxNGY5MzUxNTZjZWEgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvV2ViQ29yZS5l eHAuaW4KKysrIGIvV2ViQ29yZS9XZWJDb3JlLmV4cC5pbgpAQCAtOTMyLDYgKzkzMiw3IEBAIF9f Wk5LN1dlYkNvcmUxMUhpc3RvcnlJdGVtMTB2aXNpdENvdW50RXYKIF9fWk5LN1dlYkNvcmUxMUhp c3RvcnlJdGVtMTFoYXNDaGlsZHJlbkV2CiBfX1pOSzdXZWJDb3JlMTFIaXN0b3J5SXRlbTExc2Ny b2xsUG9pbnRFdgogX19aTks3V2ViQ29yZTExSGlzdG9yeUl0ZW0xMmlzVGFyZ2V0SXRlbUV2Citf X1pOSzdXZWJDb3JlMTFIaXN0b3J5SXRlbTExb3JpZ2luYWxVUkxFdgogX19aTks3V2ViQ29yZTEx SGlzdG9yeUl0ZW0xMnJlZGlyZWN0VVJMc0V2CiBfX1pOSzdXZWJDb3JlMTFIaXN0b3J5SXRlbTE0 YWx0ZXJuYXRlVGl0bGVFdgogX19aTks3V2ViQ29yZTExSGlzdG9yeUl0ZW0xNWxhc3RWaXNpdGVk VGltZUV2CkBAIC0xMDIyLDYgKzEwMjMsNyBAQCBfX1pOSzdXZWJDb3JlMTZWaXNpYmxlU2VsZWN0 aW9uNWlzQWxsRU5TXzIxU3RheUluRWRpdGFibGVDb250ZW50RQogX19aTks3V2ViQ29yZTE3UmVz b3VyY2VFcnJvckJhc2U4bGF6eUluaXRFdgogX19aTks3V2ViQ29yZTE5QW5pbWF0aW9uQ29udHJv bGxlcjI0bnVtYmVyT2ZBY3RpdmVBbmltYXRpb25zRXYKIF9fWk5LN1dlYkNvcmUxOVJlc291cmNl UmVxdWVzdEJhc2UxMGh0dHBNZXRob2RFdgorX19aTks3V2ViQ29yZTE5UmVzb3VyY2VSZXF1ZXN0 QmFzZTE1aHR0cEhlYWRlckZpZWxkRVBLYwogX19aTks3V2ViQ29yZTE5UmVzb3VyY2VSZXF1ZXN0 QmFzZTN1cmxFdgogX19aTks3V2ViQ29yZTE5UmVzb3VyY2VSZXF1ZXN0QmFzZTdpc0VtcHR5RXYK IF9fWk5LN1dlYkNvcmUxOVNlbGVjdGlvbkNvbnRyb2xsZXIxMWN1cnJlbnRGb3JtRXYKZGlmZiAt LWdpdCBhL1dlYktpdDIvQ2hhbmdlTG9nIGIvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggN2YzZTk2 ZGU5YjNhMWY5NTMyNDgxOTlkZjViNTFjOGZhMGQ0OThmZS4uMjllMjBkZDllMzFkZmQ1NzdlZTU1 YzBlOWVjODM1ODE5ODVjZTE3ZiAxMDA2NDQKLS0tIGEvV2ViS2l0Mi9DaGFuZ2VMb2cKKysrIGIv V2ViS2l0Mi9DaGFuZ2VMb2cKQEAgLTEsNSArMSwzNyBAQAogMjAxMC0xMS0xNiAgQW5kZXJzIENh cmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgogCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFNldCB0aGUgb3JpZ2luYWwgVVJMIGZvciBkb3dubG9hZHMK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQ5NjI4CisK KyAgICAgICAgKiBXZWJQcm9jZXNzL0Rvd25sb2Fkcy9Eb3dubG9hZE1hbmFnZXIuY3BwOgorICAg ICAgICAoV2ViS2l0OjpEb3dubG9hZE1hbmFnZXI6OnN0YXJ0RG93bmxvYWQpOgorICAgICAgICAq IFdlYlByb2Nlc3MvRG93bmxvYWRzL0Rvd25sb2FkTWFuYWdlci5oOgorICAgICAgICBzdGFydERv d25sb2FkIG5vdyB0YWtlcyB0aGUgb3JpZ2luYXRpbmcgd2ViIHBhZ2UuCisKKyAgICAgICAgKiBX ZWJQcm9jZXNzL0Rvd25sb2Fkcy9jZi9Eb3dubG9hZENGTmV0LmNwcDoKKyAgICAgICAgKFdlYktp dDo6RG93bmxvYWQ6OnN0YXJ0KToKKyAgICAgICAgc3RhcnQgbm93IHRha2VzIHRoZSBvcmlnaW5h dGluZyB3ZWIgcGFnZS4KKworICAgICAgICAqIFdlYlByb2Nlc3MvRG93bmxvYWRzL21hYy9Eb3du bG9hZE1hYy5tbToKKyAgICAgICAgKFdlYktpdDo6b3JpZ2luYXRpbmdVUkwpOgorICAgICAgICAo V2ViS2l0OjpzZXRPcmlnaW5hbFVSTEZvckRvd25sb2FkKToKKyAgICAgICAgUG9ydCBjb2RlIG92 ZXIgZnJvbSBXZWJLaXQxIHRoYXQgc2V0cyB0aGUgZG93bmxvYWQgVVJMLgorCisgICAgICAgIChX ZWJLaXQ6OkRvd25sb2FkOjpzdGFydCk6CisgICAgICAgIENhbGwgc2V0T3JpZ2luYWxVUkxGb3JE b3dubG9hZC4KKworICAgICAgICAqIFdlYlByb2Nlc3MvRG93bmxvYWRzL3F0L0Rvd25sb2FkUXQu Y3BwOgorICAgICAgICAoV2ViS2l0OjpEb3dubG9hZDo6c3RhcnQpOgorICAgICAgICBzdGFydCBu b3cgdGFrZXMgdGhlIG9yaWdpbmF0aW5nIHdlYiBwYWdlLgorCisgICAgICAgICogV2ViUHJvY2Vz cy9XZWJQYWdlL1dlYkZyYW1lLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViRnJhbWU6OnN0YXJ0 RG93bmxvYWQpOgorICAgICAgICBQYXNzIHRoZSB3ZWIgcGFnZSB0byBEb3dubG9hZE1hbmFnZXI6 OnN0YXJ0RG93bmxvYWQuCisKKzIwMTAtMTEtMTYgIEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2Nh QGFwcGxlLmNvbT4KKwogICAgICAgICBSZXZpZXdlZCBieSBTYW0gV2VpbmlnLgogCiAgICAgICAg IEFkZCBXS1BhZ2VDYW5TaG93TUlNRVR5cGUKZGlmZiAtLWdpdCBhL1dlYktpdDIvV2ViUHJvY2Vz cy9Eb3dubG9hZHMvRG93bmxvYWQuaCBiL1dlYktpdDIvV2ViUHJvY2Vzcy9Eb3dubG9hZHMvRG93 bmxvYWQuaAppbmRleCBjNzBmMWY4OTdhY2I0MTA0YmFhNmM2MjMzNmQwNDU5NzcxYTFmYTQ1Li40 NWUyNzJjN2I1MDkxMTJlNTM3NGIwYjVlZjZjYzkyMDhkZTNhMDU2IDEwMDY0NAotLS0gYS9XZWJL aXQyL1dlYlByb2Nlc3MvRG93bmxvYWRzL0Rvd25sb2FkLmgKKysrIGIvV2ViS2l0Mi9XZWJQcm9j ZXNzL0Rvd25sb2Fkcy9Eb3dubG9hZC5oCkBAIC00OCw2ICs0OCw4IEBAIG5hbWVzcGFjZSBXZWJD b3JlIHsKIAogbmFtZXNwYWNlIFdlYktpdCB7CiAKK2NsYXNzIFdlYlBhZ2U7CisKIGNsYXNzIERv d25sb2FkIDogcHVibGljIENvcmVJUEM6Ok1lc3NhZ2VTZW5kZXI8RG93bmxvYWQ+IHsKICAgICBX VEZfTUFLRV9OT05DT1BZQUJMRShEb3dubG9hZCk7CiAKQEAgLTU5LDcgKzYxLDcgQEAgcHVibGlj OgogICAgIENvcmVJUEM6OkNvbm5lY3Rpb24qIGNvbm5lY3Rpb24oKSBjb25zdDsKICAgICB1aW50 NjRfdCBkZXN0aW5hdGlvbklEKCkgY29uc3QgeyByZXR1cm4gbV9kb3dubG9hZElEOyB9CiAKLSAg ICB2b2lkIHN0YXJ0KCk7CisgICAgdm9pZCBzdGFydChXZWJQYWdlKiBpbml0aWF0aW5nV2ViUGFn ZSk7CiAKICAgICB2b2lkIGRpZFN0YXJ0KCk7CiAgICAgdm9pZCBkaWRSZWNlaXZlUmVzcG9uc2Uo Y29uc3QgV2ViQ29yZTo6UmVzb3VyY2VSZXNwb25zZSYpOwpkaWZmIC0tZ2l0IGEvV2ViS2l0Mi9X ZWJQcm9jZXNzL0Rvd25sb2Fkcy9Eb3dubG9hZE1hbmFnZXIuY3BwIGIvV2ViS2l0Mi9XZWJQcm9j ZXNzL0Rvd25sb2Fkcy9Eb3dubG9hZE1hbmFnZXIuY3BwCmluZGV4IDJjODVmMTViOTZhZDhhZDVl MjVjOTcwODJkZDE4MmNmZjA4YTYwNzIuLmNmZTkwZTVkOGIyNWQ1MjZjODM4ZjA4MjdhYzFmNGI2 MTg2MDc1NmUgMTAwNjQ0Ci0tLSBhL1dlYktpdDIvV2ViUHJvY2Vzcy9Eb3dubG9hZHMvRG93bmxv YWRNYW5hZ2VyLmNwcAorKysgYi9XZWJLaXQyL1dlYlByb2Nlc3MvRG93bmxvYWRzL0Rvd25sb2Fk TWFuYWdlci5jcHAKQEAgLTQzLDEwICs0MywxMCBAQCBEb3dubG9hZE1hbmFnZXI6OkRvd25sb2Fk TWFuYWdlcigpCiB7CiB9CiAKLXZvaWQgRG93bmxvYWRNYW5hZ2VyOjpzdGFydERvd25sb2FkKHVp bnQ2NF90IGRvd25sb2FkSUQsIGNvbnN0IFJlc291cmNlUmVxdWVzdCYgcmVxdWVzdCkKK3ZvaWQg RG93bmxvYWRNYW5hZ2VyOjpzdGFydERvd25sb2FkKHVpbnQ2NF90IGRvd25sb2FkSUQsIFdlYlBh Z2UqIGluaXRpYXRpbmdQYWdlLCBjb25zdCBSZXNvdXJjZVJlcXVlc3QmIHJlcXVlc3QpCiB7CiAg ICAgT3duUHRyPERvd25sb2FkPiBkb3dubG9hZCA9IERvd25sb2FkOjpjcmVhdGUoZG93bmxvYWRJ RCwgcmVxdWVzdCk7Ci0gICAgZG93bmxvYWQtPnN0YXJ0KCk7CisgICAgZG93bmxvYWQtPnN0YXJ0 KGluaXRpYXRpbmdQYWdlKTsKIAogICAgIEFTU0VSVCghbV9kb3dubG9hZHMuY29udGFpbnMoZG93 bmxvYWRJRCkpOwogICAgIG1fZG93bmxvYWRzLnNldChkb3dubG9hZElELCBkb3dubG9hZC5sZWFr UHRyKCkpOwpkaWZmIC0tZ2l0IGEvV2ViS2l0Mi9XZWJQcm9jZXNzL0Rvd25sb2Fkcy9Eb3dubG9h ZE1hbmFnZXIuaCBiL1dlYktpdDIvV2ViUHJvY2Vzcy9Eb3dubG9hZHMvRG93bmxvYWRNYW5hZ2Vy LmgKaW5kZXggOWE1ZDczMGE0YmY3MzEzM2M0ZmU3NmJjZGM3YzNiNDNmNDgzYjc4ZS4uMWE0ODk0 NGIzN2ZkOTAwNDFkY2NhOTgxYzkwY2U1MDQ5YjVmMDA1ZiAxMDA2NDQKLS0tIGEvV2ViS2l0Mi9X ZWJQcm9jZXNzL0Rvd25sb2Fkcy9Eb3dubG9hZE1hbmFnZXIuaAorKysgYi9XZWJLaXQyL1dlYlBy b2Nlc3MvRG93bmxvYWRzL0Rvd25sb2FkTWFuYWdlci5oCkBAIC0zNiw2ICszNiw3IEBAIG5hbWVz cGFjZSBXZWJDb3JlIHsKIG5hbWVzcGFjZSBXZWJLaXQgewogCiBjbGFzcyBEb3dubG9hZDsKK2Ns YXNzIFdlYlBhZ2U7CiAKIGNsYXNzIERvd25sb2FkTWFuYWdlciB7CiAgICAgV1RGX01BS0VfTk9O Q09QWUFCTEUoRG93bmxvYWRNYW5hZ2VyKTsKQEAgLTQzLDcgKzQ0LDcgQEAgY2xhc3MgRG93bmxv YWRNYW5hZ2VyIHsKIHB1YmxpYzoKICAgICBzdGF0aWMgRG93bmxvYWRNYW5hZ2VyJiBzaGFyZWQo KTsKIAotICAgIHZvaWQgc3RhcnREb3dubG9hZCh1aW50NjRfdCBkb3dubG9hZElELCBjb25zdCBX ZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3QmKTsKKyAgICB2b2lkIHN0YXJ0RG93bmxvYWQodWludDY0 X3QgZG93bmxvYWRJRCwgV2ViUGFnZSogaW5pdGlhdGluZ1BhZ2UsIGNvbnN0IFdlYkNvcmU6OlJl c291cmNlUmVxdWVzdCYpOwogCiBwcml2YXRlOgogICAgIERvd25sb2FkTWFuYWdlcigpOwpkaWZm IC0tZ2l0IGEvV2ViS2l0Mi9XZWJQcm9jZXNzL0Rvd25sb2Fkcy9jZi9Eb3dubG9hZENGTmV0LmNw cCBiL1dlYktpdDIvV2ViUHJvY2Vzcy9Eb3dubG9hZHMvY2YvRG93bmxvYWRDRk5ldC5jcHAKaW5k ZXggOWExZDkyMWExNDUzYTBlY2M3YWVkMzY5MGIzMTBlNGViZWRiMTNkMy4uNTA1ZjA2OWRlMzU1 NDI3ZTBkMzg0YmFjNWYyZjFhMjI0YjY5MTExZSAxMDA2NDQKLS0tIGEvV2ViS2l0Mi9XZWJQcm9j ZXNzL0Rvd25sb2Fkcy9jZi9Eb3dubG9hZENGTmV0LmNwcAorKysgYi9XZWJLaXQyL1dlYlByb2Nl c3MvRG93bmxvYWRzL2NmL0Rvd25sb2FkQ0ZOZXQuY3BwCkBAIC0zMSw3ICszMSw3IEBAIHVzaW5n IG5hbWVzcGFjZSBXZWJDb3JlOwogCiBuYW1lc3BhY2UgV2ViS2l0IHsKIAotdm9pZCBEb3dubG9h ZDo6c3RhcnQoKQordm9pZCBEb3dubG9hZDo6c3RhcnQoV2ViUGFnZSogaW5pdGlhdGluZ1dlYlBh Z2UpCiB7CiAgICAgbm90SW1wbGVtZW50ZWQoKTsKIH0KZGlmZiAtLWdpdCBhL1dlYktpdDIvV2Vi UHJvY2Vzcy9Eb3dubG9hZHMvbWFjL0Rvd25sb2FkTWFjLm1tIGIvV2ViS2l0Mi9XZWJQcm9jZXNz L0Rvd25sb2Fkcy9tYWMvRG93bmxvYWRNYWMubW0KaW5kZXggOTFiMWExM2RkYTZlNmQxZjkwZjQ4 Y2M3ZTQzZTY3YTAzYWFhMDk3ZS4uYmYxMTcxOTA4ZjMwMjdiYjY5ZDUwZTUwODU0Y2E3ZTRkN2Iy Y2IzNyAxMDA2NDQKLS0tIGEvV2ViS2l0Mi9XZWJQcm9jZXNzL0Rvd25sb2Fkcy9tYWMvRG93bmxv YWRNYWMubW0KKysrIGIvV2ViS2l0Mi9XZWJQcm9jZXNzL0Rvd25sb2Fkcy9tYWMvRG93bmxvYWRN YWMubW0KQEAgLTI1LDggKzI1LDE2IEBACiAKICNpbmNsdWRlICJEb3dubG9hZC5oIgogCisjaW5j bHVkZSA8V2ViQ29yZS9CYWNrRm9yd2FyZENvbnRyb2xsZXIuaD4KKyNpbmNsdWRlIDxXZWJDb3Jl L0hpc3RvcnlJdGVtLmg+CisjaW5jbHVkZSA8V2ViQ29yZS9QYWdlLmg+CiAjaW5jbHVkZSA8V2Vi Q29yZS9SZXNvdXJjZVJlc3BvbnNlLmg+CiAjaW5jbHVkZSAiTm90SW1wbGVtZW50ZWQuaCIKKyNp bmNsdWRlICJXZWJQYWdlLmgiCisKK0BpbnRlcmZhY2UgTlNVUkxEb3dubG9hZCAoV2ViTlNVUkxE b3dubG9hZERldGFpbHMpCistICh2b2lkKV9zZXRPcmlnaW5hdGluZ1VSTDooTlNVUkwgKilvcmln aW5hdGluZ1VSTDsKK0BlbmQKIAogQGludGVyZmFjZSBXS0Rvd25sb2FkQXNEZWxlZ2F0ZSA6IE5T T2JqZWN0IDxOU1VSTENvbm5lY3Rpb25EZWxlZ2F0ZT4gewogICAgIFdlYktpdDo6RG93bmxvYWQq IF9kb3dubG9hZDsKQEAgLTM1LDEyICs0Myw2NCBAQCAtIChpZClpbml0V2l0aERvd25sb2FkOihX ZWJLaXQ6OkRvd25sb2FkKilkb3dubG9hZDsKIC0gKHZvaWQpaW52YWxpZGF0ZTsKIEBlbmQKIAot CiB1c2luZyBuYW1lc3BhY2UgV2ViQ29yZTsKIAogbmFtZXNwYWNlIFdlYktpdCB7CiAKLXZvaWQg RG93bmxvYWQ6OnN0YXJ0KCkKK3N0YXRpYyBLVVJMIG9yaWdpbmF0aW5nVVJMKFdlYlBhZ2UgKndl YlBhZ2UpCit7CisgICAgaWYgKCF3ZWJQYWdlKQorICAgICAgICByZXR1cm4gS1VSTCgpOworCisg ICAgUGFnZSogcGFnZSA9IHdlYlBhZ2UtPmNvcmVQYWdlKCk7CisgICAgaWYgKCFwYWdlKQorICAg ICAgICByZXR1cm4gS1VSTCgpOworCisgICAgS1VSTCBvcmlnaW5hbFVSTDsKKyAgICBpbnQgYmFj a0NvdW50ID0gcGFnZS0+YmFja0ZvcndhcmQoKS0+YmFja0NvdW50KCk7CisgICAgZm9yIChpbnQg YmFja0luZGV4ID0gMDsgYmFja0luZGV4IDw9IGJhY2tDb3VudDsgYmFja0luZGV4KyspIHsKKyAg ICAgICAgb3JpZ2luYWxVUkwgPSBwYWdlLT5iYWNrRm9yd2FyZCgpLT5pdGVtQXRJbmRleCgtYmFj a0luZGV4KS0+b3JpZ2luYWxVUkwoKTsKKyAgICAgICAgaWYgKCFvcmlnaW5hbFVSTC5pc051bGwo KSkKKyAgICAgICAgICAgIHJldHVybiBvcmlnaW5hbFVSTDsKKyAgICB9CisKKyAgICByZXR1cm4g S1VSTCgpOworfQorCitzdGF0aWMgdm9pZCBzZXRPcmlnaW5hbFVSTEZvckRvd25sb2FkKFdlYlBh Z2UgKndlYlBhZ2UsIE5TVVJMRG93bmxvYWQgKmRvd25sb2FkLCBjb25zdCBSZXNvdXJjZVJlcXVl c3QmIGluaXRpYWxSZXF1ZXN0KQoreworICAgIEtVUkwgb3JpZ2luYWxVUkw7CisgICAgCisgICAg Ly8gSWYgdGhlcmUgd2FzIG5vIHJlZmVycmVyLCBkb24ndCB0cmF2ZXJzZSB0aGUgYmFjay9mb3J3 YXJkIGhpc3RvcnkKKyAgICAvLyBzaW5jZSB0aGlzIGRvd25sb2FkIHdhcyBpbml0aWF0ZWQgZGly ZWN0bHkuIDxyZGFyOi8vcHJvYmxlbS81Mjk0NjkxPgorICAgIGlmICghaW5pdGlhbFJlcXVlc3Qu aHR0cFJlZmVycmVyKCkuaXNOdWxsKCkpCisgICAgICAgIG9yaWdpbmFsVVJMID0gb3JpZ2luYXRp bmdVUkwod2ViUGFnZSk7CisKKyAgICBpZiAob3JpZ2luYWxVUkwuaXNOdWxsKCkpCisgICAgICAg IG9yaWdpbmFsVVJMID0gaW5pdGlhbFJlcXVlc3QudXJsKCk7CisKKyAgICBOU1VSTCAqb3JpZ2lu YWxOU1VSTCA9IG9yaWdpbmFsVVJMOworCisgICAgTlNTdHJpbmcgKnNjaGVtZSA9IFtvcmlnaW5h bE5TVVJMIHNjaGVtZV07CisgICAgTlNTdHJpbmcgKmhvc3QgPSBbb3JpZ2luYWxOU1VSTCBob3N0 XTsKKyAgICBpZiAoc2NoZW1lICYmIGhvc3QgJiYgW3NjaGVtZSBsZW5ndGhdICYmIFtob3N0IGxl bmd0aF0pIHsKKyAgICAgICAgTlNOdW1iZXIgKnBvcnQgPSBbb3JpZ2luYWxOU1VSTCBwb3J0XTsK KyAgICAgICAgaWYgKHBvcnQgJiYgW3BvcnQgaW50VmFsdWVdIDwgMCkKKyAgICAgICAgICAgIHBv cnQgPSBuaWw7CisgICAgICAgIFJldGFpblB0cjxOU1N0cmluZz4gaG9zdE9ubHlVUkxTdHJpbmc7 CisgICAgICAgIGlmIChwb3J0KQorICAgICAgICAgICAgaG9zdE9ubHlVUkxTdHJpbmcuYWRvcHRO UyhbW05TU3RyaW5nIGFsbG9jXSBpbml0V2l0aEZvcm1hdDpAIiVAOi8vJUA6JWQiLCBzY2hlbWUs IGhvc3QsIFtwb3J0IGludFZhbHVlXV0pOworICAgICAgICBlbHNlCisgICAgICAgICAgICBob3N0 T25seVVSTFN0cmluZy5hZG9wdE5TKFtbTlNTdHJpbmcgYWxsb2NdIGluaXRXaXRoRm9ybWF0OkAi JUA6Ly8lQCIsIHNjaGVtZSwgaG9zdF0pOworCisgICAgICAgIFJldGFpblB0cjxOU1VSTD4gaG9z dE9ubHlVUkwgPSBbW05TVVJMIGFsbG9jXSBpbml0V2l0aFN0cmluZzpob3N0T25seVVSTFN0cmlu Zy5nZXQoKV07CisKKyAgICAgICAgQVNTRVJUKFtkb3dubG9hZCByZXNwb25kc1RvU2VsZWN0b3I6 QHNlbGVjdG9yKF9zZXRPcmlnaW5hdGluZ1VSTDopXSk7CisgICAgICAgIFtkb3dubG9hZCBfc2V0 T3JpZ2luYXRpbmdVUkw6aG9zdE9ubHlVUkwuZ2V0KCldOworICAgIH0KK30KKwordm9pZCBEb3du bG9hZDo6c3RhcnQoV2ViUGFnZSogaW5pdGlhdGluZ1BhZ2UpCiB7CiAgICAgQVNTRVJUKCFtX25z VVJMRG93bmxvYWQpOwogICAgIEFTU0VSVCghbV9kZWxlZ2F0ZSk7CkBAIC01MCw2ICsxMTAsOCBA QCB2b2lkIERvd25sb2FkOjpzdGFydCgpCiAKICAgICAvLyBGSVhNRTogQWxsb3cgdGhpcyB0byBi ZSBjaGFuZ2VkIGJ5IHRoZSBjbGllbnQuCiAgICAgW21fbnNVUkxEb3dubG9hZC5nZXQoKSBzZXRE ZWxldGVzRmlsZVVwb25GYWlsdXJlOk5PXTsKKworICAgIHNldE9yaWdpbmFsVVJMRm9yRG93bmxv YWQoaW5pdGlhdGluZ1BhZ2UsIG1fbnNVUkxEb3dubG9hZC5nZXQoKSwgbV9yZXF1ZXN0KTsKIH0K IAogdm9pZCBEb3dubG9hZDo6cGxhdGZvcm1JbnZhbGlkYXRlKCkKZGlmZiAtLWdpdCBhL1dlYktp dDIvV2ViUHJvY2Vzcy9Eb3dubG9hZHMvcXQvRG93bmxvYWRRdC5jcHAgYi9XZWJLaXQyL1dlYlBy b2Nlc3MvRG93bmxvYWRzL3F0L0Rvd25sb2FkUXQuY3BwCmluZGV4IDlhMWQ5MjFhMTQ1M2EwZWNj N2FlZDM2OTBiMzEwZTRlYmVkYjEzZDMuLjUwNWYwNjlkZTM1NTQyN2UwZDM4NGJhYzVmMmYxYTIy NGI2OTExMWUgMTAwNjQ0Ci0tLSBhL1dlYktpdDIvV2ViUHJvY2Vzcy9Eb3dubG9hZHMvcXQvRG93 bmxvYWRRdC5jcHAKKysrIGIvV2ViS2l0Mi9XZWJQcm9jZXNzL0Rvd25sb2Fkcy9xdC9Eb3dubG9h ZFF0LmNwcApAQCAtMzEsNyArMzEsNyBAQCB1c2luZyBuYW1lc3BhY2UgV2ViQ29yZTsKIAogbmFt ZXNwYWNlIFdlYktpdCB7CiAKLXZvaWQgRG93bmxvYWQ6OnN0YXJ0KCkKK3ZvaWQgRG93bmxvYWQ6 OnN0YXJ0KFdlYlBhZ2UqIGluaXRpYXRpbmdXZWJQYWdlKQogewogICAgIG5vdEltcGxlbWVudGVk KCk7CiB9CmRpZmYgLS1naXQgYS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJGcmFtZS5j cHAgYi9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJGcmFtZS5jcHAKaW5kZXggMTc1ZGEz ODY4MmYwN2U3YmI2YTY4YzlhMWQ5Y2Y0ZjUxYThiNGExMi4uYTcxY2UzMjAzY2E1ZTU5YzkxZDhl MGI4Mzc4OTU3ZTEzY2Y5YjgyYyAxMDA2NDQKLS0tIGEvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBh Z2UvV2ViRnJhbWUuY3BwCisrKyBiL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYkZyYW1l LmNwcApAQCAtMjEyLDcgKzIxMiw3IEBAIHZvaWQgV2ViRnJhbWU6OnN0YXJ0RG93bmxvYWQoY29u c3QgV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0JiByZXF1ZXN0KQogewogICAgIEFTU0VSVChtX3Bv bGljeURvd25sb2FkSUQpOwogCi0gICAgRG93bmxvYWRNYW5hZ2VyOjpzaGFyZWQoKS5zdGFydERv d25sb2FkKG1fcG9saWN5RG93bmxvYWRJRCwgcmVxdWVzdCk7CisgICAgRG93bmxvYWRNYW5hZ2Vy OjpzaGFyZWQoKS5zdGFydERvd25sb2FkKG1fcG9saWN5RG93bmxvYWRJRCwgcGFnZSgpLCByZXF1 ZXN0KTsKIAogICAgIG1fcG9saWN5RG93bmxvYWRJRCA9IDA7CiB9Cg==