94482 2012-08-20 07:45:14 -0700 [BlackBerry] Persist cookies not from atexit() but the new onThreadFinished() 2012-08-20 12:23:59 -0700 1 1 1 Unclassified WebKit WebKit BlackBerry 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 jpetsovits jpetsovits anilsson mifenton staikos tonikitoo webkit.review.bot yong.li.webkit oldest_to_newest 699498 0 jpetsovits 2012-08-20 07:45:14 -0700 Our port is making some changes to shut down all threads correctly when the process exits. We're therefore introducing a new onThreadFinished() virtual for MessageClients, which is nicer than setting an atexit() handler from within WebKit. Here's the patch to make use of that functionality in WebKit. 699511 1 159428 jpetsovits 2012-08-20 07:53:40 -0700 Created attachment 159428 Patch 699536 2 159428 yong.li.webkit 2012-08-20 08:32:50 -0700 Comment on attachment 159428 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=159428&action=review > Source/WebCore/ChangeLog:9 > + Reviewed by NOBODY (OOPS!). > + > + No new functionality, no new tests. need some description between these 2 lines :) > Source/WebCore/platform/blackberry/CookieDatabaseBackingStore/CookieDatabaseBackingStore.cpp:89 > + CookieLog("CookieManager - flushing cookies to backingStore..."); should be cookieLog() according to webkit style? 699747 3 159481 jpetsovits 2012-08-20 11:47:14 -0700 Created attachment 159481 Patch 699748 4 jpetsovits 2012-08-20 11:48:51 -0700 I talked to Yong and he revoked his wish for renaming CookieLog(), as it affects a multitude of other lines in the same file and consequently would expand the scope of this patch significantly. 699787 5 159481 webkit.review.bot 2012-08-20 12:23:56 -0700 Comment on attachment 159481 Patch Clearing flags on attachment: 159481 Committed r126053: <http://trac.webkit.org/changeset/126053> 699789 6 webkit.review.bot 2012-08-20 12:23:59 -0700 All reviewed patches have been landed. Closing bug. 159428 2012-08-20 07:53:40 -0700 2012-08-20 11:47:07 -0700 Patch bug-94482-20120820105154.patch text/plain 6489 jpetsovits U3VidmVyc2lvbiBSZXZpc2lvbjogMTI1NjkwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTQyZWQzZDU0ZTQ0ZmY4 MjY4MDdjYWNiYjVjMDJkNjdlNjA2MmZmOC4uNWI0MDVhODJlMTA1N2IxNjI1ZjYxNTIwYjVkMDRk MzUyNjlkZDI3NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDEyLTA4LTIwICBKYWtv YiBQZXRzb3ZpdHMgIDxqcGV0c292aXRzQHJpbS5jb20+CisKKyAgICAgICAgW0JsYWNrQmVycnld IFBlcnNpc3QgY29va2llcyBub3QgZnJvbSBhdGV4aXQoKSBidXQgdGhlIG5ldyBvblRocmVhZEZp bmlzaGVkKCkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTk0NDgyCisgICAgICAgIFJJTSBQUiAxODQ5MjMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBObyBuZXcgZnVuY3Rpb25hbGl0eSwgbm8gbmV3IHRlc3Rz LgorCisgICAgICAgICogcGxhdGZvcm0vYmxhY2tiZXJyeS9Db29raWVEYXRhYmFzZUJhY2tpbmdT dG9yZS9Db29raWVEYXRhYmFzZUJhY2tpbmdTdG9yZS5jcHA6CisgICAgICAgIChXZWJDb3JlKToK KyAgICAgICAgKFdlYkNvcmU6OkNvb2tpZURhdGFiYXNlQmFja2luZ1N0b3JlOjpvblRocmVhZEZp bmlzaGVkKToKKyAgICAgICAgKFdlYkNvcmU6OkNvb2tpZURhdGFiYXNlQmFja2luZ1N0b3JlOjpz ZW5kQ2hhbmdlc1RvRGF0YWJhc2VTeW5jaHJvbm91c2x5KToKKyAgICAgICAgKiBwbGF0Zm9ybS9i bGFja2JlcnJ5L0Nvb2tpZURhdGFiYXNlQmFja2luZ1N0b3JlL0Nvb2tpZURhdGFiYXNlQmFja2lu Z1N0b3JlLmg6CisgICAgICAgIChDb29raWVEYXRhYmFzZUJhY2tpbmdTdG9yZSk6CisgICAgICAg ICogcGxhdGZvcm0vYmxhY2tiZXJyeS9Db29raWVNYW5hZ2VyLmNwcDoKKyAgICAgICAgKFdlYkNv cmUpOgorICAgICAgICAoV2ViQ29yZTo6Y29va2llTWFuYWdlcik6CisgICAgICAgICogcGxhdGZv cm0vYmxhY2tiZXJyeS9Db29raWVNYW5hZ2VyLmg6CisKIDIwMTItMDgtMTUgIEpvc2h1YSBOZXR0 ZXJmaWVsZCAgPGpuZXR0ZXJmaWVsZEByaW0uY29tPgogCiAgICAgICAgIFtCbGFja0JlcnJ5XSBV cHN0cmVhbSBCbGFja0JlcnJ5IGJ1aWxkIGZpeGVzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ibGFja2JlcnJ5L0Nvb2tpZURhdGFiYXNlQmFja2luZ1N0b3JlL0Nvb2tpZURh dGFiYXNlQmFja2luZ1N0b3JlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2JsYWNrYmVy cnkvQ29va2llRGF0YWJhc2VCYWNraW5nU3RvcmUvQ29va2llRGF0YWJhc2VCYWNraW5nU3RvcmUu Y3BwCmluZGV4IDc3MDg0MzU4NTkwMzQyZGJkNjlhNWRiY2EzODk2MDBiZTYxNzUyYjYuLmNlZDU2 MDIwNzkxYzAzNGFjYTdlOGI4YmNlMzg5NDgwMmY3NzJmNjQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2JsYWNrYmVycnkvQ29va2llRGF0YWJhc2VCYWNraW5nU3RvcmUvQ29v a2llRGF0YWJhc2VCYWNraW5nU3RvcmUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2JsYWNrYmVycnkvQ29va2llRGF0YWJhc2VCYWNraW5nU3RvcmUvQ29va2llRGF0YWJhc2VCYWNr aW5nU3RvcmUuY3BwCkBAIC00NCw2ICs0NCw3IEBACiAjZW5kaWYKIAogI2luY2x1ZGUgPEJsYWNr QmVycnlQbGF0Zm9ybUV4ZWN1dGFibGVNZXNzYWdlLmg+CisjaW5jbHVkZSA8QmxhY2tCZXJyeVBs YXRmb3JtTmF2aWdhdG9ySGFuZGxlci5oPgogCiB1c2luZyBCbGFja0JlcnJ5OjpQbGF0Zm9ybTo6 TWVzc2FnZUNsaWVudDsKIHVzaW5nIEJsYWNrQmVycnk6OlBsYXRmb3JtOjpUeXBlZFJlcGx5QnVm ZmVyOwpAQCAtODMsNiArODQsMTggQEAgQ29va2llRGF0YWJhc2VCYWNraW5nU3RvcmU6On5Db29r aWVEYXRhYmFzZUJhY2tpbmdTdG9yZSgpCiAjZW5kaWYKIH0KIAordm9pZCBDb29raWVEYXRhYmFz ZUJhY2tpbmdTdG9yZTo6b25UaHJlYWRGaW5pc2hlZCgpCit7CisgICAgQ29va2llTG9nKCJDb29r aWVNYW5hZ2VyIC0gZmx1c2hpbmcgY29va2llcyB0byBiYWNraW5nU3RvcmUuLi4iKTsKKyAgICAv LyBUaGlzIGlzIGNhbGxlZCBmcm9tIHNodXRkb3duLCBzbyB3ZSBuZWVkIHRvIGJlIHN1cmUgdGhl IE9TIGRvZXNuJ3Qga2lsbCB1cyBiZWZvcmUgdGhlIGRiIHdyaXRlIGZpbmlzaGVzLgorICAgIC8v IE9uY2Ugc2hvdWxkIGJlIGVub3VnaCBzaW5jZSB0aGlzIGV4dGVuZHMgdGVyaW1pbmF0aW9uIGJ5 IDIgc2Vjb25kcy4KKyAgICBCbGFja0JlcnJ5OjpQbGF0Zm9ybTo6TmF2aWdhdG9ySGFuZGxlcjo6 c2VuZEV4dGVuZFRlcm1pbmF0ZSgpOworICAgIHNlbmRDaGFuZ2VzVG9EYXRhYmFzZVN5bmNocm9u b3VzbHkoKTsKKyAgICBDb29raWVMb2coIkNvb2tpZU1hbmFnZXIgLSBmaW5pc2hlZCBmbHVzaGlu ZyBjb29raWVzIHRvIGJhY2tpbmdTdG9yZS4iKTsKKworICAgIE1lc3NhZ2VDbGllbnQ6Om9uVGhy ZWFkRmluaXNoZWQoKTsKK30KKwogdm9pZCBDb29raWVEYXRhYmFzZUJhY2tpbmdTdG9yZTo6dXBn cmFkZVRhYmxlSWZOZWVkZWQoY29uc3QgU3RyaW5nJiBkYXRhYmFzZUZpZWxkcywgY29uc3QgU3Ry aW5nJiBwcmltYXJ5S2V5RmllbGRzKQogewogICAgIEFTU0VSVChpc0N1cnJlbnRUaHJlYWQoKSk7 CkBAIC00MDksNyArNDIyLDEwIEBAIHZvaWQgQ29va2llRGF0YWJhc2VCYWNraW5nU3RvcmU6OnNl bmRDaGFuZ2VzVG9EYXRhYmFzZVN5bmNocm9ub3VzbHkoKQogICAgICAgICBpZiAobV9kYlRpbWVy LnN0YXJ0ZWQoKSkKICAgICAgICAgICAgIG1fZGJUaW1lci5zdG9wKCk7CiAgICAgfQotICAgIGRp c3BhdGNoU3luY01lc3NhZ2UoY3JlYXRlTWV0aG9kQ2FsbE1lc3NhZ2UoJkNvb2tpZURhdGFiYXNl QmFja2luZ1N0b3JlOjppbnZva2VTZW5kQ2hhbmdlc1RvRGF0YWJhc2UsIHRoaXMpKTsKKyAgICBp ZiAoaXNDdXJyZW50VGhyZWFkKCkpCisgICAgICAgIGludm9rZVNlbmRDaGFuZ2VzVG9EYXRhYmFz ZSgpOworICAgIGVsc2UKKyAgICAgICAgZGlzcGF0Y2hTeW5jTWVzc2FnZShjcmVhdGVNZXRob2RD YWxsTWVzc2FnZSgmQ29va2llRGF0YWJhc2VCYWNraW5nU3RvcmU6Omludm9rZVNlbmRDaGFuZ2Vz VG9EYXRhYmFzZSwgdGhpcykpOwogfQogCiB2b2lkIENvb2tpZURhdGFiYXNlQmFja2luZ1N0b3Jl OjpzZW5kQ2hhbmdlc1RvRGF0YWJhc2UoaW50IG5leHRJbnRlcnZhbCkKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2JsYWNrYmVycnkvQ29va2llRGF0YWJhc2VCYWNraW5nU3Rv cmUvQ29va2llRGF0YWJhc2VCYWNraW5nU3RvcmUuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2JsYWNrYmVycnkvQ29va2llRGF0YWJhc2VCYWNraW5nU3RvcmUvQ29va2llRGF0YWJhc2VCYWNr aW5nU3RvcmUuaAppbmRleCBiOWI3ZGVjZGQxZDY3OTk4NjdmMGM5MzE4ZWE2NDM5ODQ1OWUxMTIz Li45ODZkMjhmOGM3MzkzMTY0Yjg5NTFkNDI1OTJmNTdiMzI5MTljOTBkIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ibGFja2JlcnJ5L0Nvb2tpZURhdGFiYXNlQmFja2luZ1N0 b3JlL0Nvb2tpZURhdGFiYXNlQmFja2luZ1N0b3JlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vYmxhY2tiZXJyeS9Db29raWVEYXRhYmFzZUJhY2tpbmdTdG9yZS9Db29raWVEYXRhYmFz ZUJhY2tpbmdTdG9yZS5oCkBAIC02MSw2ICs2MSw5IEBAIHB1YmxpYzoKIAogICAgIHZvaWQgc2Vu ZENoYW5nZXNUb0RhdGFiYXNlU3luY2hyb25vdXNseSgpOwogCisgICAgLy8gTWVzc2FnZUNsaWVu dCBtZXRob2RzCisgICAgdmlydHVhbCB2b2lkIG9uVGhyZWFkRmluaXNoZWQoKTsKKwogICAgIC8v IFRocmVhZFRpbWVyQ2xpZW50IG1ldGhvZHMKICAgICB2aXJ0dWFsIGJvb2wgd2lsbEZpcmVUaW1l cigpIHsgcmV0dXJuIHRydWU7IH0KICAgICB2aXJ0dWFsIGludCBnZXRQdWxzZUNvZGUoKSBjb25z dCB7IHJldHVybiBwdWxzZUNvZGUoKTsgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vYmxhY2tiZXJyeS9Db29raWVNYW5hZ2VyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2JsYWNrYmVycnkvQ29va2llTWFuYWdlci5jcHAKaW5kZXggMWY1NzRlNGFiNjg0MGU2Zjcy NmU0NDlmYTZjZWIwMmFjMmY0ZTgzYS4uNDU0MGIzZmZjMTA4ODk0YmZjMDA2YTZjNDc0MjJhYWM3 MjIyZTI0OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vYmxhY2tiZXJyeS9D b29raWVNYW5hZ2VyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ibGFja2JlcnJ5 L0Nvb2tpZU1hbmFnZXIuY3BwCkBAIC03MCwxMSArNzAsNiBAQCBzdGF0aWMgY29uc3QgdW5zaWdu ZWQgc19tYXhDb29raWVDb3VudFBlckhvc3QgPSA2MDsKIHN0YXRpYyBjb25zdCB1bnNpZ25lZCBz X2Nvb2tpZXNUb0RlbGV0ZVdoZW5MaW1pdFJlYWNoZWQgPSA2MDsKIHN0YXRpYyBjb25zdCB1bnNp Z25lZCBzX2RlbGF5VG9TdGFydENvb2tpZUNsZWFudXAgPSAxMDsKIAotc3RhdGljIHZvaWQgZmx1 c2hDb29raWVzT25FeGl0KHZvaWQpCi17Ci0gICAgY29va2llTWFuYWdlcigpLmZsdXNoQ29va2ll c1RvQmFja2luZ1N0b3JlKCk7Ci19Ci0KIENvb2tpZU1hbmFnZXImIGNvb2tpZU1hbmFnZXIoKQog ewogICAgIHN0YXRpYyBDb29raWVNYW5hZ2VyICpjb29raWVNYW5hZ2VyID0gMDsKQEAgLTg0LDgg Kzc5LDYgQEAgQ29va2llTWFuYWdlciYgY29va2llTWFuYWdlcigpCiAgICAgICAgIGNvb2tpZU1h bmFnZXItPm1fY29va2llQmFja2luZ1N0b3JlLT5vcGVuKGNvb2tpZU1hbmFnZXItPmNvb2tpZUph cigpKTsKICAgICAgICAgY29va2llTWFuYWdlci0+Z2V0QmFja2luZ1N0b3JlQ29va2llcygpOwog ICAgICAgICBDb29raWVMb2coIkNvb2tpZU1hbmFnZXIgLSBCYWNraW5nc3RvcmUgbG9hZCBjb21w bGV0ZS5cbiIpOwotCi0gICAgICAgIGF0ZXhpdCgmZmx1c2hDb29raWVzT25FeGl0KTsKICAgICB9 CiAgICAgcmV0dXJuICpjb29raWVNYW5hZ2VyOwogfQpAQCAtNTc1LDE0ICs1NjgsNCBAQCB2b2lk IENvb2tpZU1hbmFnZXI6OmNvb2tpZUxpbWl0Q2xlYW5VcChUaW1lcjxDb29raWVNYW5hZ2VyPiog dGltZXIpCiAgICAgQ29va2llTGltaXRMb2coIkNvb2tpZU1hbmFnZXIgLSBDb29raWUgY2xlYW4g dXAgY29tcGxldGUuIik7CiB9CiAKLXZvaWQgQ29va2llTWFuYWdlcjo6Zmx1c2hDb29raWVzVG9C YWNraW5nU3RvcmUoKQotewotICAgIENvb2tpZUxvZygiQ29va2llTWFuYWdlciAtIGZsdXNoQ29v a2llc1RvQmFja2luZ1N0b3JlIHN0YXJ0aW5nLlxuIik7Ci0gICAgLy8gVGhpcyBpcyBjYWxsZWQg ZnJvbSBzaHV0ZG93biwgc28gd2UgbmVlZCB0byBiZSBzdXJlIHRoZSBPUyBkb2Vzbid0IGtpbGwg dXMgYmVmb3JlIHRoZSBkYiB3cml0ZSBmaW5pc2hlcy4KLSAgICAvLyBPbmNlIHNob3VsZCBiZSBl bm91Z2ggc2luY2UgdGhpcyBleHRlbmRzIHRlcmltaW5hdGlvbiBieSAyIHNlY29uZHMuCi0gICAg QmxhY2tCZXJyeTo6UGxhdGZvcm06Ok5hdmlnYXRvckhhbmRsZXI6OnNlbmRFeHRlbmRUZXJtaW5h dGUoKTsKLSAgICBtX2Nvb2tpZUJhY2tpbmdTdG9yZS0+c2VuZENoYW5nZXNUb0RhdGFiYXNlU3lu Y2hyb25vdXNseSgpOwotICAgIENvb2tpZUxvZygiQ29va2llTWFuYWdlciAtIGZsdXNoQ29va2ll c1RvQmFja2luZ1N0b3JlIGZpbmlzaGVkLlxuIik7Ci19Ci0KIH0gLy8gbmFtZXNwYWNlIFdlYkNv cmUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2JsYWNrYmVycnkvQ29va2ll TWFuYWdlci5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vYmxhY2tiZXJyeS9Db29raWVNYW5h Z2VyLmgKaW5kZXggYjAzNDA5ZDEwNTdhYzJkNjI0YmIzNTlkMjViNDgwNTQ3NDE4MTE4Yy4uZWFi NDQ3OGIyZTkzZGRkYjI1YzM3YmE1N2NhODk1Yjc0MThjYmUyYyAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vYmxhY2tiZXJyeS9Db29raWVNYW5hZ2VyLmgKKysrIGIvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vYmxhY2tiZXJyeS9Db29raWVNYW5hZ2VyLmgKQEAgLTEwNCw4ICsx MDQsNiBAQCBwdWJsaWM6CiAgICAgLy8gUmV0dXJucyBhbGwgY29va2llcyB0aGF0IGFyZSBhc3Nv Y2lhdGVkIHdpdGggdGhlIHNwZWNpZmllZCBVUkwgYXMgcmF3IGNvb2tpZXMuCiAgICAgdm9pZCBn ZXRSYXdDb29raWVzKFZlY3RvcjxQYXJzZWRDb29raWUqPiYgc3RhY2tPZkNvb2tpZXMsIGNvbnN0 IEtVUkwmIHJlcXVlc3RVUkwsIENvb2tpZUZpbHRlciA9IFdpdGhIdHRwT25seUNvb2tpZXMpIGNv bnN0OwogCi0gICAgdm9pZCBmbHVzaENvb2tpZXNUb0JhY2tpbmdTdG9yZSgpOwotCiBwcml2YXRl OgogICAgIGZyaWVuZCBDb29raWVNYW5hZ2VyJiBjb29raWVNYW5hZ2VyKCk7CiAK 159481 2012-08-20 11:47:14 -0700 2012-08-20 12:23:55 -0700 Patch bug-94482-20120820144527.patch text/plain 6855 jpetsovits U3VidmVyc2lvbiBSZXZpc2lvbjogMTI1NjkwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTQyZWQzZDU0ZTQ0ZmY4 MjY4MDdjYWNiYjVjMDJkNjdlNjA2MmZmOC4uZjEwYjhlOWI3Zjc5NDUzNzVlYzZlY2QxZWNlY2Qw MjlhNWQ3MDRjZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMxIEBACisyMDEyLTA4LTIwICBKYWtv YiBQZXRzb3ZpdHMgIDxqcGV0c292aXRzQHJpbS5jb20+CisKKyAgICAgICAgW0JsYWNrQmVycnld IFBlcnNpc3QgY29va2llcyBub3QgZnJvbSBhdGV4aXQoKSBidXQgdGhlIG5ldyBvblRocmVhZEZp bmlzaGVkKCkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTk0NDgyCisgICAgICAgIFJJTSBQUiAxODQ5MjMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBCbGFja0JlcnJ5OjpQbGF0Zm9ybSByZWNlbnRseSBtYWRl IGNoYW5nZXMgdGhhdCBlbnN1cmUKKyAgICAgICAgdGhhdCBNZXNzYWdlQ2xpZW50IHRocmVhZHMg YXJlIGJlaW5nIHNodXQgZG93biBjb3JyZWN0bHkuCisgICAgICAgIEEgbmV3IG9uVGhyZWFkRmlu aXNoZWQoKSB2aXJ0dWFsIHdhcyBpbnRyb2R1Y2VkIGZvcgorICAgICAgICBjdXN0b20gY2xlYW4t dXAgZnVuY3Rpb25hbGl0eSBhbmQgY2FuIHJlcGxhY2UgdGhlCisgICAgICAgIGF0ZXhpdCgpIGhh bmRsZXIgdGhhdCB3ZSBwcmV2aW91c2x5IHVzZWQgdG8gZmx1c2ggY29va2llcworICAgICAgICB0 byB0aGUgY29va2llIGRhdGFiYXNlIGJhY2tpbmdzdG9yZS4KKworICAgICAgICBObyBuZXcgZnVu Y3Rpb25hbGl0eSwgbm8gbmV3IHRlc3RzLgorCisgICAgICAgICogcGxhdGZvcm0vYmxhY2tiZXJy eS9Db29raWVEYXRhYmFzZUJhY2tpbmdTdG9yZS9Db29raWVEYXRhYmFzZUJhY2tpbmdTdG9yZS5j cHA6CisgICAgICAgIChXZWJDb3JlKToKKyAgICAgICAgKFdlYkNvcmU6OkNvb2tpZURhdGFiYXNl QmFja2luZ1N0b3JlOjpvblRocmVhZEZpbmlzaGVkKToKKyAgICAgICAgKFdlYkNvcmU6OkNvb2tp ZURhdGFiYXNlQmFja2luZ1N0b3JlOjpzZW5kQ2hhbmdlc1RvRGF0YWJhc2VTeW5jaHJvbm91c2x5 KToKKyAgICAgICAgKiBwbGF0Zm9ybS9ibGFja2JlcnJ5L0Nvb2tpZURhdGFiYXNlQmFja2luZ1N0 b3JlL0Nvb2tpZURhdGFiYXNlQmFja2luZ1N0b3JlLmg6CisgICAgICAgIChDb29raWVEYXRhYmFz ZUJhY2tpbmdTdG9yZSk6CisgICAgICAgICogcGxhdGZvcm0vYmxhY2tiZXJyeS9Db29raWVNYW5h Z2VyLmNwcDoKKyAgICAgICAgKFdlYkNvcmUpOgorICAgICAgICAoV2ViQ29yZTo6Y29va2llTWFu YWdlcik6CisgICAgICAgICogcGxhdGZvcm0vYmxhY2tiZXJyeS9Db29raWVNYW5hZ2VyLmg6CisK IDIwMTItMDgtMTUgIEpvc2h1YSBOZXR0ZXJmaWVsZCAgPGpuZXR0ZXJmaWVsZEByaW0uY29tPgog CiAgICAgICAgIFtCbGFja0JlcnJ5XSBVcHN0cmVhbSBCbGFja0JlcnJ5IGJ1aWxkIGZpeGVzCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ibGFja2JlcnJ5L0Nvb2tpZURhdGFi YXNlQmFja2luZ1N0b3JlL0Nvb2tpZURhdGFiYXNlQmFja2luZ1N0b3JlLmNwcCBiL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2JsYWNrYmVycnkvQ29va2llRGF0YWJhc2VCYWNraW5nU3RvcmUvQ29v a2llRGF0YWJhc2VCYWNraW5nU3RvcmUuY3BwCmluZGV4IDc3MDg0MzU4NTkwMzQyZGJkNjlhNWRi Y2EzODk2MDBiZTYxNzUyYjYuLmNlZDU2MDIwNzkxYzAzNGFjYTdlOGI4YmNlMzg5NDgwMmY3NzJm NjQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2JsYWNrYmVycnkvQ29va2ll RGF0YWJhc2VCYWNraW5nU3RvcmUvQ29va2llRGF0YWJhc2VCYWNraW5nU3RvcmUuY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2JsYWNrYmVycnkvQ29va2llRGF0YWJhc2VCYWNraW5n U3RvcmUvQ29va2llRGF0YWJhc2VCYWNraW5nU3RvcmUuY3BwCkBAIC00NCw2ICs0NCw3IEBACiAj ZW5kaWYKIAogI2luY2x1ZGUgPEJsYWNrQmVycnlQbGF0Zm9ybUV4ZWN1dGFibGVNZXNzYWdlLmg+ CisjaW5jbHVkZSA8QmxhY2tCZXJyeVBsYXRmb3JtTmF2aWdhdG9ySGFuZGxlci5oPgogCiB1c2lu ZyBCbGFja0JlcnJ5OjpQbGF0Zm9ybTo6TWVzc2FnZUNsaWVudDsKIHVzaW5nIEJsYWNrQmVycnk6 OlBsYXRmb3JtOjpUeXBlZFJlcGx5QnVmZmVyOwpAQCAtODMsNiArODQsMTggQEAgQ29va2llRGF0 YWJhc2VCYWNraW5nU3RvcmU6On5Db29raWVEYXRhYmFzZUJhY2tpbmdTdG9yZSgpCiAjZW5kaWYK IH0KIAordm9pZCBDb29raWVEYXRhYmFzZUJhY2tpbmdTdG9yZTo6b25UaHJlYWRGaW5pc2hlZCgp Cit7CisgICAgQ29va2llTG9nKCJDb29raWVNYW5hZ2VyIC0gZmx1c2hpbmcgY29va2llcyB0byBi YWNraW5nU3RvcmUuLi4iKTsKKyAgICAvLyBUaGlzIGlzIGNhbGxlZCBmcm9tIHNodXRkb3duLCBz byB3ZSBuZWVkIHRvIGJlIHN1cmUgdGhlIE9TIGRvZXNuJ3Qga2lsbCB1cyBiZWZvcmUgdGhlIGRi IHdyaXRlIGZpbmlzaGVzLgorICAgIC8vIE9uY2Ugc2hvdWxkIGJlIGVub3VnaCBzaW5jZSB0aGlz IGV4dGVuZHMgdGVyaW1pbmF0aW9uIGJ5IDIgc2Vjb25kcy4KKyAgICBCbGFja0JlcnJ5OjpQbGF0 Zm9ybTo6TmF2aWdhdG9ySGFuZGxlcjo6c2VuZEV4dGVuZFRlcm1pbmF0ZSgpOworICAgIHNlbmRD aGFuZ2VzVG9EYXRhYmFzZVN5bmNocm9ub3VzbHkoKTsKKyAgICBDb29raWVMb2coIkNvb2tpZU1h bmFnZXIgLSBmaW5pc2hlZCBmbHVzaGluZyBjb29raWVzIHRvIGJhY2tpbmdTdG9yZS4iKTsKKwor ICAgIE1lc3NhZ2VDbGllbnQ6Om9uVGhyZWFkRmluaXNoZWQoKTsKK30KKwogdm9pZCBDb29raWVE YXRhYmFzZUJhY2tpbmdTdG9yZTo6dXBncmFkZVRhYmxlSWZOZWVkZWQoY29uc3QgU3RyaW5nJiBk YXRhYmFzZUZpZWxkcywgY29uc3QgU3RyaW5nJiBwcmltYXJ5S2V5RmllbGRzKQogewogICAgIEFT U0VSVChpc0N1cnJlbnRUaHJlYWQoKSk7CkBAIC00MDksNyArNDIyLDEwIEBAIHZvaWQgQ29va2ll RGF0YWJhc2VCYWNraW5nU3RvcmU6OnNlbmRDaGFuZ2VzVG9EYXRhYmFzZVN5bmNocm9ub3VzbHko KQogICAgICAgICBpZiAobV9kYlRpbWVyLnN0YXJ0ZWQoKSkKICAgICAgICAgICAgIG1fZGJUaW1l ci5zdG9wKCk7CiAgICAgfQotICAgIGRpc3BhdGNoU3luY01lc3NhZ2UoY3JlYXRlTWV0aG9kQ2Fs bE1lc3NhZ2UoJkNvb2tpZURhdGFiYXNlQmFja2luZ1N0b3JlOjppbnZva2VTZW5kQ2hhbmdlc1Rv RGF0YWJhc2UsIHRoaXMpKTsKKyAgICBpZiAoaXNDdXJyZW50VGhyZWFkKCkpCisgICAgICAgIGlu dm9rZVNlbmRDaGFuZ2VzVG9EYXRhYmFzZSgpOworICAgIGVsc2UKKyAgICAgICAgZGlzcGF0Y2hT eW5jTWVzc2FnZShjcmVhdGVNZXRob2RDYWxsTWVzc2FnZSgmQ29va2llRGF0YWJhc2VCYWNraW5n U3RvcmU6Omludm9rZVNlbmRDaGFuZ2VzVG9EYXRhYmFzZSwgdGhpcykpOwogfQogCiB2b2lkIENv b2tpZURhdGFiYXNlQmFja2luZ1N0b3JlOjpzZW5kQ2hhbmdlc1RvRGF0YWJhc2UoaW50IG5leHRJ bnRlcnZhbCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2JsYWNrYmVycnkv Q29va2llRGF0YWJhc2VCYWNraW5nU3RvcmUvQ29va2llRGF0YWJhc2VCYWNraW5nU3RvcmUuaCBi L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2JsYWNrYmVycnkvQ29va2llRGF0YWJhc2VCYWNraW5n U3RvcmUvQ29va2llRGF0YWJhc2VCYWNraW5nU3RvcmUuaAppbmRleCBiOWI3ZGVjZGQxZDY3OTk4 NjdmMGM5MzE4ZWE2NDM5ODQ1OWUxMTIzLi45ODZkMjhmOGM3MzkzMTY0Yjg5NTFkNDI1OTJmNTdi MzI5MTljOTBkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ibGFja2JlcnJ5 L0Nvb2tpZURhdGFiYXNlQmFja2luZ1N0b3JlL0Nvb2tpZURhdGFiYXNlQmFja2luZ1N0b3JlLmgK KysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vYmxhY2tiZXJyeS9Db29raWVEYXRhYmFzZUJh Y2tpbmdTdG9yZS9Db29raWVEYXRhYmFzZUJhY2tpbmdTdG9yZS5oCkBAIC02MSw2ICs2MSw5IEBA IHB1YmxpYzoKIAogICAgIHZvaWQgc2VuZENoYW5nZXNUb0RhdGFiYXNlU3luY2hyb25vdXNseSgp OwogCisgICAgLy8gTWVzc2FnZUNsaWVudCBtZXRob2RzCisgICAgdmlydHVhbCB2b2lkIG9uVGhy ZWFkRmluaXNoZWQoKTsKKwogICAgIC8vIFRocmVhZFRpbWVyQ2xpZW50IG1ldGhvZHMKICAgICB2 aXJ0dWFsIGJvb2wgd2lsbEZpcmVUaW1lcigpIHsgcmV0dXJuIHRydWU7IH0KICAgICB2aXJ0dWFs IGludCBnZXRQdWxzZUNvZGUoKSBjb25zdCB7IHJldHVybiBwdWxzZUNvZGUoKTsgfQpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vYmxhY2tiZXJyeS9Db29raWVNYW5hZ2VyLmNw cCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2JsYWNrYmVycnkvQ29va2llTWFuYWdlci5jcHAK aW5kZXggMWY1NzRlNGFiNjg0MGU2ZjcyNmU0NDlmYTZjZWIwMmFjMmY0ZTgzYS4uNDU0MGIzZmZj MTA4ODk0YmZjMDA2YTZjNDc0MjJhYWM3MjIyZTI0OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vYmxhY2tiZXJyeS9Db29raWVNYW5hZ2VyLmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ibGFja2JlcnJ5L0Nvb2tpZU1hbmFnZXIuY3BwCkBAIC03MCwxMSArNzAs NiBAQCBzdGF0aWMgY29uc3QgdW5zaWduZWQgc19tYXhDb29raWVDb3VudFBlckhvc3QgPSA2MDsK IHN0YXRpYyBjb25zdCB1bnNpZ25lZCBzX2Nvb2tpZXNUb0RlbGV0ZVdoZW5MaW1pdFJlYWNoZWQg PSA2MDsKIHN0YXRpYyBjb25zdCB1bnNpZ25lZCBzX2RlbGF5VG9TdGFydENvb2tpZUNsZWFudXAg PSAxMDsKIAotc3RhdGljIHZvaWQgZmx1c2hDb29raWVzT25FeGl0KHZvaWQpCi17Ci0gICAgY29v a2llTWFuYWdlcigpLmZsdXNoQ29va2llc1RvQmFja2luZ1N0b3JlKCk7Ci19Ci0KIENvb2tpZU1h bmFnZXImIGNvb2tpZU1hbmFnZXIoKQogewogICAgIHN0YXRpYyBDb29raWVNYW5hZ2VyICpjb29r aWVNYW5hZ2VyID0gMDsKQEAgLTg0LDggKzc5LDYgQEAgQ29va2llTWFuYWdlciYgY29va2llTWFu YWdlcigpCiAgICAgICAgIGNvb2tpZU1hbmFnZXItPm1fY29va2llQmFja2luZ1N0b3JlLT5vcGVu KGNvb2tpZU1hbmFnZXItPmNvb2tpZUphcigpKTsKICAgICAgICAgY29va2llTWFuYWdlci0+Z2V0 QmFja2luZ1N0b3JlQ29va2llcygpOwogICAgICAgICBDb29raWVMb2coIkNvb2tpZU1hbmFnZXIg LSBCYWNraW5nc3RvcmUgbG9hZCBjb21wbGV0ZS5cbiIpOwotCi0gICAgICAgIGF0ZXhpdCgmZmx1 c2hDb29raWVzT25FeGl0KTsKICAgICB9CiAgICAgcmV0dXJuICpjb29raWVNYW5hZ2VyOwogfQpA QCAtNTc1LDE0ICs1NjgsNCBAQCB2b2lkIENvb2tpZU1hbmFnZXI6OmNvb2tpZUxpbWl0Q2xlYW5V cChUaW1lcjxDb29raWVNYW5hZ2VyPiogdGltZXIpCiAgICAgQ29va2llTGltaXRMb2coIkNvb2tp ZU1hbmFnZXIgLSBDb29raWUgY2xlYW4gdXAgY29tcGxldGUuIik7CiB9CiAKLXZvaWQgQ29va2ll TWFuYWdlcjo6Zmx1c2hDb29raWVzVG9CYWNraW5nU3RvcmUoKQotewotICAgIENvb2tpZUxvZygi Q29va2llTWFuYWdlciAtIGZsdXNoQ29va2llc1RvQmFja2luZ1N0b3JlIHN0YXJ0aW5nLlxuIik7 Ci0gICAgLy8gVGhpcyBpcyBjYWxsZWQgZnJvbSBzaHV0ZG93biwgc28gd2UgbmVlZCB0byBiZSBz dXJlIHRoZSBPUyBkb2Vzbid0IGtpbGwgdXMgYmVmb3JlIHRoZSBkYiB3cml0ZSBmaW5pc2hlcy4K LSAgICAvLyBPbmNlIHNob3VsZCBiZSBlbm91Z2ggc2luY2UgdGhpcyBleHRlbmRzIHRlcmltaW5h dGlvbiBieSAyIHNlY29uZHMuCi0gICAgQmxhY2tCZXJyeTo6UGxhdGZvcm06Ok5hdmlnYXRvckhh bmRsZXI6OnNlbmRFeHRlbmRUZXJtaW5hdGUoKTsKLSAgICBtX2Nvb2tpZUJhY2tpbmdTdG9yZS0+ c2VuZENoYW5nZXNUb0RhdGFiYXNlU3luY2hyb25vdXNseSgpOwotICAgIENvb2tpZUxvZygiQ29v a2llTWFuYWdlciAtIGZsdXNoQ29va2llc1RvQmFja2luZ1N0b3JlIGZpbmlzaGVkLlxuIik7Ci19 Ci0KIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2JsYWNrYmVycnkvQ29va2llTWFuYWdlci5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vYmxhY2tiZXJyeS9Db29raWVNYW5hZ2VyLmgKaW5kZXggYjAzNDA5ZDEwNTdhYzJkNjI0YmIz NTlkMjViNDgwNTQ3NDE4MTE4Yy4uZWFiNDQ3OGIyZTkzZGRkYjI1YzM3YmE1N2NhODk1Yjc0MThj YmUyYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vYmxhY2tiZXJyeS9Db29r aWVNYW5hZ2VyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vYmxhY2tiZXJyeS9Db29r aWVNYW5hZ2VyLmgKQEAgLTEwNCw4ICsxMDQsNiBAQCBwdWJsaWM6CiAgICAgLy8gUmV0dXJucyBh bGwgY29va2llcyB0aGF0IGFyZSBhc3NvY2lhdGVkIHdpdGggdGhlIHNwZWNpZmllZCBVUkwgYXMg cmF3IGNvb2tpZXMuCiAgICAgdm9pZCBnZXRSYXdDb29raWVzKFZlY3RvcjxQYXJzZWRDb29raWUq PiYgc3RhY2tPZkNvb2tpZXMsIGNvbnN0IEtVUkwmIHJlcXVlc3RVUkwsIENvb2tpZUZpbHRlciA9 IFdpdGhIdHRwT25seUNvb2tpZXMpIGNvbnN0OwogCi0gICAgdm9pZCBmbHVzaENvb2tpZXNUb0Jh Y2tpbmdTdG9yZSgpOwotCiBwcml2YXRlOgogICAgIGZyaWVuZCBDb29raWVNYW5hZ2VyJiBjb29r aWVNYW5hZ2VyKCk7CiAK