189669 2018-09-17 11:18:50 -0700 [Curl] Add schema version and enable auto vacuum for cookie database. 2018-09-17 14:42:34 -0700 1 1 1 Unclassified WebKit Platform WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 basuke webkit-unassigned achristensen basuke commit-queue ews-watchlist galpeter webkit-bug-importer oldest_to_newest 1460235 0 basuke 2018-09-17 11:18:50 -0700 Turning on auto incremental vacuuming and adding versioning to the database. Right now we reset tables if there's an unknown schema or if the none is set. There is placeholder logic in place to upgrade databases as the schema changes in the future. 1460247 1 349914 basuke 2018-09-17 11:28:13 -0700 Created attachment 349914 PATCH 1460322 2 349914 basuke 2018-09-17 14:14:40 -0700 Comment on attachment 349914 PATCH Thanks Alex. 1460328 3 349914 commit-queue 2018-09-17 14:41:19 -0700 Comment on attachment 349914 PATCH Clearing flags on attachment: 349914 Committed r236085: <https://trac.webkit.org/changeset/236085> 1460329 4 commit-queue 2018-09-17 14:41:21 -0700 All reviewed patches have been landed. Closing bug. 1460330 5 webkit-bug-importer 2018-09-17 14:42:34 -0700 <rdar://problem/44535048> 349914 2018-09-17 11:28:13 -0700 2018-09-17 14:41:19 -0700 PATCH 189669.diff text/plain 8914 basuke ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCAwZjA0N2VmYzNlMi4uNDYyOTQzMDJiMTcgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyOSBAQAorMjAxOC0wOS0xNyAgQ2hyaXN0b3BoZXIgUmVpZCAgPGNocmlzLnJlaWRAc29u eS5jb20+CisKKyAgICAgICAgW0N1cmxdIEFkZCBzY2hlbWEgdmVyc2lvbiBhbmQgZW5hYmxlIGF1 dG8gdmFjdXVtIGZvciBjb29raWUgZGF0YWJhc2UuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xODk2NjkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBUdXJuaW5nIG9uIGF1dG8gaW5jcmVtZW50YWwgdmFjdXVt aW5nIGFuZCBhZGRpbmcgdmVyc2lvbmluZyB0byB0aGUgZGF0YWJhc2UuIFJpZ2h0IG5vdyB3ZQor ICAgICAgICByZXNldCB0YWJsZXMgaWYgdGhlcmUncyBhbiB1bmtub3duIHNjaGVtYSBvciBpZiB0 aGUgbm9uZSBpcyBzZXQuIFRoZXJlIGlzIHBsYWNlaG9sZGVyIGxvZ2ljCisgICAgICAgIGluIHBs YWNlIHRvIHVwZ3JhZGUgZGF0YWJhc2VzIGFzIHRoZSBzY2hlbWEgY2hhbmdlcyBpbiB0aGUgZnV0 dXJlLgorCisgICAgICAgIFRlc3RlZCBieSBjaGVja2luZyB0aGUgZGF0YWJhc2UgbWFudWFsbHkg YWZ0ZXIgbGF1bmNoaW5nIE1pbmlCcm93c2VyLgorCisgICAgICAgICogcGxhdGZvcm0vbmV0d29y ay9jdXJsL0Nvb2tpZUphckRCLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNvb2tpZUphckRCOjpv cGVuRGF0YWJhc2UpOgorICAgICAgICAoV2ViQ29yZTo6Q29va2llSmFyREI6OnZlcmlmeVNjaGVt YVZlcnNpb24pOgorICAgICAgICAoV2ViQ29yZTo6Q29va2llSmFyREI6OmRlbGV0ZUFsbFRhYmxl cyk6CisgICAgICAgIChXZWJDb3JlOjpDb29raWVKYXJEQjo6Y3JlYXRlUHJlcGFyZVN0YXRlbWVu dCk6CisgICAgICAgIChXZWJDb3JlOjpDb29raWVKYXJEQjo6Z2V0UHJlcGFyZVN0YXRlbWVudCk6 CisgICAgICAgIChXZWJDb3JlOjpDb29raWVKYXJEQjo6ZXhlY3V0ZVNpbXBsZVNxbCk6CisgICAg ICAgICogcGxhdGZvcm0vbmV0d29yay9jdXJsL0Nvb2tpZUphckRCLmg6CisgICAgICAgICogcGxh dGZvcm0vbmV0d29yay9jdXJsL05ldHdvcmtTdG9yYWdlU2Vzc2lvbkN1cmwuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6ZGVmYXVsdFNlc3Npb24pOgorICAgICAgICAqIHBsYXRmb3JtL3NxbC9TUUxp dGVEYXRhYmFzZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTUUxpdGVEYXRhYmFzZTo6dHVybk9u SW5jcmVtZW50YWxBdXRvVmFjdXVtKTogZml4ZWQgYSBidWcuCisKIDIwMTgtMDktMTcgIFlvdWVu biBGYWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgogCiAgICAgICAgIEVuYWJsZSBWQ1AgZm9yIGlP UyBhbmQgcmVlbmFibGUgaXQgZm9yIE1hY09TCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9uZXR3b3JrL2N1cmwvQ29va2llSmFyREIuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vbmV0d29yay9jdXJsL0Nvb2tpZUphckRCLmNwcAppbmRleCAyMDRlMzEwNWNmZC4uM2Mw NjA5MjczNjYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY3Vy bC9Db29raWVKYXJEQi5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9j dXJsL0Nvb2tpZUphckRCLmNwcApAQCAtNzEsNiArNzEsMTMgQEAgbmFtZXNwYWNlIFdlYkNvcmUg ewogI2RlZmluZSBERUxFVEVfQUxMX0NPT0tJRV9TUUwgXAogICAgICJERUxFVEUgRlJPTSBDb29r aWU7IgogCisKKy8vIElmIHRoZSBkYXRhYmFzZSBzY2hlbWEgaXMgdXBkYXRlZDoKKy8vIC0gSW5j cmVtZW50IHNjaGVtYVZlcnNpb24KKy8vIC0gQWRkIHVwZ3JhZGUgbG9naWMgaW4gdmVyaWZ5U2No ZW1hVmVyc2lvbiB0byBtaWdyYXRlIGRhdGFiYXNlcyBmcm9tIHRoZSBwcmV2aW91cyBzY2hlbWEg dmVyc2lvbgorc3RhdGljIGNvbnN0ZXhwciBpbnQgc2NoZW1hVmVyc2lvbiA9IDE7CisKKwogdm9p ZCBDb29raWVKYXJEQjo6c2V0RW5hYmxlZChib29sIGVuYWJsZSkKIHsKICAgICBtX2lzRW5hYmxl ZCA9IGVuYWJsZTsKQEAgLTEyNSwyMiArMTMyLDMxIEBAIGJvb2wgQ29va2llSmFyREI6Om9wZW5E YXRhYmFzZSgpCiAgICAgICAgIGlmICghRmlsZVN5c3RlbTo6bWFrZUFsbERpcmVjdG9yaWVzKEZp bGVTeXN0ZW06OmRpcmVjdG9yeU5hbWUobV9kYXRhYmFzZVBhdGgpKSkKICAgICAgICAgICAgIExP R19FUlJPUigiVW5hYmxlIHRvIGNyZWF0ZSB0aGUgQ29va2llIERhdGFiYXNlIHBhdGggJXMiLCBt X2RhdGFiYXNlUGF0aC51dGY4KCkuZGF0YSgpKTsKIAotICAgICAgICBpZiAobV9kYXRhYmFzZS5v cGVuKG1fZGF0YWJhc2VQYXRoLCBmYWxzZSkpIHsKLSAgICAgICAgICAgIGJvb2wgZGF0YWJhc2VW YWxpZGl0eSA9IHRydWU7Ci0gICAgICAgICAgICBkYXRhYmFzZVZhbGlkaXR5ICY9IChleGVjdXRl U2ltcGxlU3FsKENSRUFURV9DT09LSUVfVEFCTEVfU1FMKSA9PSBTUUxJVEVfRE9ORSk7Ci0gICAg ICAgICAgICBkYXRhYmFzZVZhbGlkaXR5ICY9IChleGVjdXRlU2ltcGxlU3FsKENSRUFURV9ET01B SU5fSU5ERVhfU1FMKSA9PSBTUUxJVEVfRE9ORSk7Ci0gICAgICAgICAgICBkYXRhYmFzZVZhbGlk aXR5ICY9IChleGVjdXRlU2ltcGxlU3FsKENSRUFURV9QQVRIX0lOREVYX1NRTCkgPT0gU1FMSVRF X0RPTkUpOwotICAgICAgICAgICAgaWYgKCFkYXRhYmFzZVZhbGlkaXR5KSB7Ci0gICAgICAgICAg ICAgICAgLy8gZ2l2ZSB1cCBjcmVhdGUgZGF0YWJhc2UgYXQgdGhpcyB0aW1lIChhbGwgY29va2ll cyBvbiByZXF1ZXN0L3Jlc3BvbnNlIGFyZSBpZ25vcmVkKQotICAgICAgICAgICAgICAgIG1fZGF0 YWJhc2UuY2xvc2UoKTsKLSAgICAgICAgICAgICAgICBkZWxldGVBbGxEYXRhYmFzZUZpbGVzKCk7 Ci0gICAgICAgICAgICB9Ci0gICAgICAgIH0KKyAgICAgICAgbV9kYXRhYmFzZS5vcGVuKG1fZGF0 YWJhc2VQYXRoLCBmYWxzZSk7CiAgICAgfQogCiAgICAgaWYgKCFtX2RhdGFiYXNlLmlzT3Blbigp KQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKKyAgICBpZiAoIWlzT25NZW1vcnkoKSAmJiAhbV9k YXRhYmFzZS50dXJuT25JbmNyZW1lbnRhbEF1dG9WYWN1dW0oKSkKKyAgICAgICAgTE9HX0VSUk9S KCJVbmFibGUgdG8gdHVybiBvbiBpbmNyZW1lbnRhbCBhdXRvLXZhY3V1bSAoJWQgJXMpIiwgbV9k YXRhYmFzZS5sYXN0RXJyb3IoKSwgbV9kYXRhYmFzZS5sYXN0RXJyb3JNc2coKSk7CisKKyAgICB2 ZXJpZnlTY2hlbWFWZXJzaW9uKCk7CisKKyAgICBib29sIGRhdGFiYXNlVmFsaWRpdHkgPSB0cnVl OworICAgIGlmICghZXhpc3RzRGF0YWJhc2VGaWxlIHx8ICFtX2RhdGFiYXNlLnRhYmxlRXhpc3Rz KCJDb29raWUiKSkgeworICAgICAgICBkYXRhYmFzZVZhbGlkaXR5ICY9IChleGVjdXRlU2ltcGxl U3FsKENSRUFURV9DT09LSUVfVEFCTEVfU1FMKSA9PSBTUUxJVEVfRE9ORSk7CisgICAgICAgIGRh dGFiYXNlVmFsaWRpdHkgJj0gKGV4ZWN1dGVTaW1wbGVTcWwoQ1JFQVRFX0RPTUFJTl9JTkRFWF9T UUwpID09IFNRTElURV9ET05FKTsKKyAgICAgICAgZGF0YWJhc2VWYWxpZGl0eSAmPSAoZXhlY3V0 ZVNpbXBsZVNxbChDUkVBVEVfUEFUSF9JTkRFWF9TUUwpID09IFNRTElURV9ET05FKTsKKyAgICB9 CisKKyAgICBpZiAoIWRhdGFiYXNlVmFsaWRpdHkpIHsKKyAgICAgICAgLy8gZ2l2ZSB1cCBjcmVh dGUgZGF0YWJhc2UgYXQgdGhpcyB0aW1lIChhbGwgY29va2llcyBvbiByZXF1ZXN0L3Jlc3BvbnNl IGFyZSBpZ25vcmVkKQorICAgICAgICBtX2RhdGFiYXNlLmNsb3NlKCk7CisgICAgICAgIGRlbGV0 ZUFsbERhdGFiYXNlRmlsZXMoKTsKKyAgICAgICAgcmV0dXJuIGZhbHNlOworICAgIH0KKwogICAg IG1fZGF0YWJhc2Uuc2V0U3luY2hyb25vdXMoU1FMaXRlRGF0YWJhc2U6OlN5bmNOb3JtYWwpOwog CiAgICAgLy8gY3JlYXRlIHByZXBhcmVkIHN0YXRlbWVudHMKQEAgLTE2Miw2ICsxNzgsNDEgQEAg dm9pZCBDb29raWVKYXJEQjo6Y2xvc2VEYXRhYmFzZSgpCiAgICAgfQogfQogCit2b2lkIENvb2tp ZUphckRCOjp2ZXJpZnlTY2hlbWFWZXJzaW9uKCkKK3sKKyAgICBpZiAoaXNPbk1lbW9yeSgpKQor ICAgICAgICByZXR1cm47CisKKyAgICBpbnQgdmVyc2lvbiA9IFNRTGl0ZVN0YXRlbWVudChtX2Rh dGFiYXNlLCAiUFJBR01BIHVzZXJfdmVyc2lvbiIpLmdldENvbHVtbkludCgwKTsKKyAgICBpZiAo dmVyc2lvbiA9PSBzY2hlbWFWZXJzaW9uKQorICAgICAgICByZXR1cm47CisKKyAgICBzd2l0Y2gg KHZlcnNpb24pIHsKKyAgICAgICAgLy8gUGxhY2Vob2xkZXIgZm9yIHNjaGVtYSB2ZXJzaW9uIHVw Z3JhZGUgbG9naWMKKyAgICAgICAgLy8gRW5zdXJlIGNhc2VzIGZhbGwgdGhyb3VnaCB0byB0aGUg bmV4dCB2ZXJzaW9uJ3MgdXBncmFkZSBsb2dpYworCisgICAgY2FzZSAwOgorICAgICAgICBkZWxl dGVBbGxUYWJsZXMoKTsKKyAgICAgICAgYnJlYWs7CisgICAgZGVmYXVsdDoKKyAgICAgICAgLy8g VGhpcyBjYXNlIGNhbiBiZSByZWFjaGVkIHdoZW4gZG93bmdyYWRpbmcgdmVyc2lvbnMKKyAgICAg ICAgTE9HX0VSUk9SKCJVbmtub3duIGNvb2tpZSBkYXRhYmFzZSB2ZXJzaW9uOiAlZCIsIHZlcnNp b24pOworICAgICAgICBkZWxldGVBbGxUYWJsZXMoKTsKKyAgICAgICAgYnJlYWs7CisgICAgfQor CisgICAgLy8gVXBkYXRlIHZlcnNpb24KKyAgICBleGVjdXRlU2ltcGxlU3FsKFN0cmluZzo6Zm9y bWF0KCJQUkFHTUEgdXNlcl92ZXJzaW9uPSVkIiwgc2NoZW1hVmVyc2lvbikpOworfQorCit2b2lk IENvb2tpZUphckRCOjpkZWxldGVBbGxUYWJsZXMoKQoreworICAgIGlmICghbV9kYXRhYmFzZS5p c09wZW4oKSkKKyAgICAgICAgcmV0dXJuOworCisgICAgbV9kYXRhYmFzZS5jbGVhckFsbFRhYmxl cygpOworfQorCiBTdHJpbmcgQ29va2llSmFyREI6OmdldENvcnJ1cHRpb25NYXJrZXJQYXRoKCkg Y29uc3QKIHsKICAgICBBU1NFUlQoIWlzT25NZW1vcnkoKSk7CkBAIC00ODQsMjMgKzUzNSwyMyBA QCBpbnQgQ29va2llSmFyREI6OmRlbGV0ZUFsbENvb2tpZXMoKQogICAgIHJldHVybiBleGVjdXRl U2ltcGxlU3FsKERFTEVURV9BTExfQ09PS0lFX1NRTCk7CiB9CiAKLXZvaWQgQ29va2llSmFyREI6 OmNyZWF0ZVByZXBhcmVTdGF0ZW1lbnQoY29uc3QgY2hhciogc3FsKQordm9pZCBDb29raWVKYXJE Qjo6Y3JlYXRlUHJlcGFyZVN0YXRlbWVudChjb25zdCBTdHJpbmcmIHNxbCkKIHsKICAgICBhdXRv IHN0YXRlbWVudCA9IHN0ZDo6bWFrZV91bmlxdWU8U1FMaXRlU3RhdGVtZW50PihtX2RhdGFiYXNl LCBzcWwpOwogICAgIGludCByZXQgPSBzdGF0ZW1lbnQtPnByZXBhcmUoKTsKICAgICBBU1NFUlQo cmV0ID09IFNRTElURV9PSyk7Ci0gICAgbV9zdGF0ZW1lbnRzLmFkZChTdHJpbmcoc3FsKSwgV1RG TW92ZShzdGF0ZW1lbnQpKTsKKyAgICBtX3N0YXRlbWVudHMuYWRkKHNxbCwgV1RGTW92ZShzdGF0 ZW1lbnQpKTsKIH0KIAotU1FMaXRlU3RhdGVtZW50KiBDb29raWVKYXJEQjo6Z2V0UHJlcGFyZVN0 YXRlbWVudChjb25zdCBjaGFyKiBzcWwpCitTUUxpdGVTdGF0ZW1lbnQqIENvb2tpZUphckRCOjpn ZXRQcmVwYXJlU3RhdGVtZW50KGNvbnN0IFN0cmluZyYgc3FsKQogewotICAgIGNvbnN0IGF1dG8m IHN0YXRlbWVudCA9IG1fc3RhdGVtZW50cy5nZXQoU3RyaW5nKHNxbCkpOworICAgIGNvbnN0IGF1 dG8mIHN0YXRlbWVudCA9IG1fc3RhdGVtZW50cy5nZXQoc3FsKTsKICAgICBBU1NFUlQoc3RhdGVt ZW50KTsKICAgICBzdGF0ZW1lbnQtPnJlc2V0KCk7CiAgICAgcmV0dXJuIHN0YXRlbWVudDsKIH0K IAotaW50IENvb2tpZUphckRCOjpleGVjdXRlU2ltcGxlU3FsKGNvbnN0IGNoYXIqIHNxbCwgYm9v bCBpZ25vcmVFcnJvcikKK2ludCBDb29raWVKYXJEQjo6ZXhlY3V0ZVNpbXBsZVNxbChjb25zdCBT dHJpbmcmIHNxbCwgYm9vbCBpZ25vcmVFcnJvcikKIHsKICAgICBTUUxpdGVTdGF0ZW1lbnQgc3Rh dGVtZW50KG1fZGF0YWJhc2UsIHNxbCk7CiAgICAgaW50IHJldCA9IHN0YXRlbWVudC5wcmVwYXJl QW5kU3RlcCgpOwpAQCAtNTA4LDcgKzU1OSw3IEBAIGludCBDb29raWVKYXJEQjo6ZXhlY3V0ZVNp bXBsZVNxbChjb25zdCBjaGFyKiBzcWwsIGJvb2wgaWdub3JlRXJyb3IpCiAKICAgICBjaGVja1NR TGl0ZVJldHVybkNvZGUocmV0KTsKICAgICBpZiAocmV0ICE9IFNRTElURV9PSyAmJiByZXQgIT0g U1FMSVRFX0RPTkUgJiYgcmV0ICE9IFNRTElURV9ST1cgJiYgIWlnbm9yZUVycm9yKQotICAgICAg ICBMT0dfRVJST1IoIkZhaWxlZCB0byBleGVjdXRlICVzIGVycm9yOiAlcyIsIHNxbCwgbV9kYXRh YmFzZS5sYXN0RXJyb3JNc2coKSk7CisgICAgICAgIExPR19FUlJPUigiRmFpbGVkIHRvIGV4ZWN1 dGUgJXMgZXJyb3I6ICVzIiwgc3FsLmFzY2lpKCkuZGF0YSgpLCBtX2RhdGFiYXNlLmxhc3RFcnJv ck1zZygpKTsKIAogICAgIHJldHVybiByZXQ7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9uZXR3b3JrL2N1cmwvQ29va2llSmFyREIuaCBiL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL25ldHdvcmsvY3VybC9Db29raWVKYXJEQi5oCmluZGV4IDMyYmVhZDU1ZTAyLi42OTVi OTY3YTEyMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9jdXJs L0Nvb2tpZUphckRCLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9jdXJs L0Nvb2tpZUphckRCLmgKQEAgLTc1LDkgKzc1LDEyIEBAIHByaXZhdGU6CiAgICAgYm9vbCBjaGVj a0RhdGFiYXNlVmFsaWRpdHkoKTsKICAgICB2b2lkIGRlbGV0ZUFsbERhdGFiYXNlRmlsZXMoKTsK IAotICAgIHZvaWQgY3JlYXRlUHJlcGFyZVN0YXRlbWVudChjb25zdCBjaGFyKiBzcWwpOwotICAg IFNRTGl0ZVN0YXRlbWVudCogZ2V0UHJlcGFyZVN0YXRlbWVudChjb25zdCBjaGFyKiBzcWwpOwot ICAgIGludCBleGVjdXRlU2ltcGxlU3FsKGNvbnN0IGNoYXIqIHNxbCwgYm9vbCBpZ25vcmVFcnJv ciA9IGZhbHNlKTsKKyAgICB2b2lkIHZlcmlmeVNjaGVtYVZlcnNpb24oKTsKKyAgICB2b2lkIGRl bGV0ZUFsbFRhYmxlcygpOworCisgICAgdm9pZCBjcmVhdGVQcmVwYXJlU3RhdGVtZW50KGNvbnN0 IFN0cmluZyYgc3FsKTsKKyAgICBTUUxpdGVTdGF0ZW1lbnQqIGdldFByZXBhcmVTdGF0ZW1lbnQo Y29uc3QgU3RyaW5nJiBzcWwpOworICAgIGludCBleGVjdXRlU2ltcGxlU3FsKGNvbnN0IFN0cmlu ZyYgc3FsLCBib29sIGlnbm9yZUVycm9yID0gZmFsc2UpOwogCiAgICAgaW50IGRlbGV0ZUNvb2tp ZUludGVybmFsKGNvbnN0IFN0cmluZyYgbmFtZSwgY29uc3QgU3RyaW5nJiBkb21haW4sIGNvbnN0 IFN0cmluZyYgcGF0aCk7CiAgICAgYm9vbCBoYXNIdHRwT25seUNvb2tpZShjb25zdCBTdHJpbmcm IG5hbWUsIGNvbnN0IFN0cmluZyYgZG9tYWluLCBjb25zdCBTdHJpbmcmIHBhdGgpOwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9jdXJsL05ldHdvcmtTdG9yYWdl U2Vzc2lvbkN1cmwuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9jdXJsL05l dHdvcmtTdG9yYWdlU2Vzc2lvbkN1cmwuY3BwCmluZGV4IDg2YTQxZGY3MzJjLi5lMTEwYWQxNjQ5 MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9jdXJsL05ldHdv cmtTdG9yYWdlU2Vzc2lvbkN1cmwuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25l dHdvcmsvY3VybC9OZXR3b3JrU3RvcmFnZVNlc3Npb25DdXJsLmNwcApAQCAtODUsNyArODUsNyBA QCBDb29raWVKYXJEQiYgTmV0d29ya1N0b3JhZ2VTZXNzaW9uOjpjb29raWVEYXRhYmFzZSgpIGNv bnN0CiBzdGF0aWMgc3RkOjp1bmlxdWVfcHRyPE5ldHdvcmtTdG9yYWdlU2Vzc2lvbj4mIGRlZmF1 bHRTZXNzaW9uKCkKIHsKICAgICBBU1NFUlQoaXNNYWluVGhyZWFkKCkpOwotICAgIHN0YXRpYyBO ZXZlckRlc3Ryb3llZDxzdGQ6OnVuaXF1ZV9wdHI8TmV0d29ya1N0b3JhZ2VTZXNzaW9uPj4gc2Vz c2lvbjsKKyAgICBzdGF0aWMgc3RkOjp1bmlxdWVfcHRyPE5ldHdvcmtTdG9yYWdlU2Vzc2lvbj4g c2Vzc2lvbjsKICAgICByZXR1cm4gc2Vzc2lvbjsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vc3FsL1NRTGl0ZURhdGFiYXNlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL3NxbC9TUUxpdGVEYXRhYmFzZS5jcHAKaW5kZXggYTE2MDUwYWNlYTUuLjBkNDM2YmU2 NjcyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9zcWwvU1FMaXRlRGF0YWJh c2UuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3NxbC9TUUxpdGVEYXRhYmFzZS5j cHAKQEAgLTQ4OCw2ICs0ODgsNyBAQCBib29sIFNRTGl0ZURhdGFiYXNlOjp0dXJuT25JbmNyZW1l bnRhbEF1dG9WYWN1dW0oKQogICAgIFNRTGl0ZVN0YXRlbWVudCBzdGF0ZW1lbnQoKnRoaXMsICJQ UkFHTUEgYXV0b192YWN1dW0iX3MpOwogICAgIGludCBhdXRvVmFjdXVtTW9kZSA9IHN0YXRlbWVu dC5nZXRDb2x1bW5JbnQoMCk7CiAgICAgaW50IGVycm9yID0gbGFzdEVycm9yKCk7CisgICAgc3Rh dGVtZW50LmZpbmFsaXplKCk7CiAKICAgICAvLyBDaGVjayBpZiB3ZSBnb3QgYW4gZXJyb3Igd2hp bGUgdHJ5aW5nIHRvIGdldCB0aGUgdmFsdWUgb2YgdGhlIGF1dG9fdmFjdXVtIGZsYWcuCiAgICAg Ly8gSWYgd2UgZ290IGEgU1FMSVRFX0JVU1kgZXJyb3IsIHRoZW4gdGhlcmUncyBwcm9iYWJseSBh bm90aGVyIHRyYW5zYWN0aW9uIGluCg==