90822 2012-07-09 14:12:04 -0700 IndexedDB: deleteDatabase fails if transaction running in other database 2012-07-09 18:46:59 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 jsbell jsbell alecflett dgrogan jochen tony webkit.review.bot oldest_to_newest 665158 0 jsbell 2012-07-09 14:12:04 -0700 If a transaction is running in any database when deleteDatabase() is called, an error event will be fired at the IDBVersionChangeRequest and the delete will fail. At the start of IDBLevelDBBackingStore.cpp there's a test: if (m_currentTransaction) return false; This guards against the deleteDatabase() logic which creates a transaction for the deletion itself - most of the WebKit IDB implementation is currently predicated on only one transaction running at a time. However, nothing outside of the IDBLevelDBBackingStore code treats the delete request as requiring a transaction, so it doesn't defer the delete until there are no transactions against any database. It *should* be safe to allow the IDBLevelDBBackingStore::deleteDatabase() call to run even if there is another transaction running since there will be no overlap in key ranges, as long as m_currentTransaction is either not modified or is restored afterwards. 665170 1 151319 jsbell 2012-07-09 14:25:55 -0700 Created attachment 151319 Patch 665173 2 jsbell 2012-07-09 14:27:01 -0700 dgrogan@, alecflett@ - take a look? 665177 3 jsbell 2012-07-09 14:28:49 -0700 +jochen@, in case he remembers a reason it wasn't done like this in the first place. 665188 4 151319 dgrogan 2012-07-09 14:37:11 -0700 Comment on attachment 151319 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=151319&action=review Interested to see if Jochen remembers anything. Not like he's been busy since or anything :) > LayoutTests/storage/indexeddb/deletedatabase-transaction.html:39 > + request.onerror = unexpectedErrorCallback; Could you add request.onblocked = unexpectedBlockedCallback ? 665201 5 151319 jochen 2012-07-09 14:55:52 -0700 Comment on attachment 151319 Patch IIRC a prior version of the patch used some methods that just used the default transaction. That patch looks good View in context: https://bugs.webkit.org/attachment.cgi?id=151319&action=review > LayoutTests/storage/indexeddb/deletedatabase-transaction.html:31 > + debug(""); nit. indent 4 spaces 665295 6 151349 jsbell 2012-07-09 16:29:24 -0700 Created attachment 151349 Patch 665302 7 151352 jsbell 2012-07-09 16:37:17 -0700 Created attachment 151352 Patch 665303 8 jsbell 2012-07-09 16:38:14 -0700 (In reply to comment #4) > Could you add request.onblocked = unexpectedBlockedCallback ? Done. (In reply to comment #5) > nit. indent 4 spaces Fixed. tony@ - r? 665395 9 151352 webkit.review.bot 2012-07-09 18:46:54 -0700 Comment on attachment 151352 Patch Clearing flags on attachment: 151352 Committed r122179: <http://trac.webkit.org/changeset/122179> 665396 10 webkit.review.bot 2012-07-09 18:46:59 -0700 All reviewed patches have been landed. Closing bug. 151319 2012-07-09 14:25:55 -0700 2012-07-09 16:29:21 -0700 Patch bug-90822-20120709142554.patch text/plain 6510 jsbell U3VidmVyc2lvbiBSZXZpc2lvbjogMTIyMTEzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjI2NGUwNTRhYmU5NGI4 Nzc2MDhmYjAzZTdkOTkyZTYyMjU4MGJhZi4uMWE4YjEwYTg0ZmM5MzRjOWMxZDNiMjJkMDYxMzAz Y2QxNDI4ZDRjZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDEyLTA3LTA5ICBKb3No dWEgQmVsbCAgPGpzYmVsbEBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgSW5kZXhlZERCOiBkZWxl dGVEYXRhYmFzZSBmYWlscyBpZiB0cmFuc2FjdGlvbiBydW5uaW5nIGluIG90aGVyIGRhdGFiYXNl CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05MDgyMgor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoZSBJREJM ZXZlbERCQmFja2luZ1N0b3JlIHdhcyBwcmV2ZW50aW5nIGEgZGVsZXRlRGF0YWJhc2UoKSBmcm9t IHJ1bm5pbmcKKyAgICAgICAgaWYgYW55IG90aGVyIGRhdGFiYXNlIHdhcyBydW5uaW5nIGEgdHJh bnNhY3Rpb24uIEZpeCBieSBqdXN0IGNyZWF0aW5nIGEgc2NyYXRjaAorICAgICAgICBMZXZlbERC VHJhbnNhY3Rpb24gZm9yIHRoZSBkZWxldGUgc3RlcHMuCisKKyAgICAgICAgVGVzdDogc3RvcmFn ZS9pbmRleGVkZGIvZGVsZXRlZGF0YWJhc2UtdHJhbnNhY3Rpb24uaHRtbAorCisgICAgICAgICog TW9kdWxlcy9pbmRleGVkZGIvSURCTGV2ZWxEQkJhY2tpbmdTdG9yZS5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpJREJMZXZlbERCQmFja2luZ1N0b3JlOjpkZWxldGVEYXRhYmFzZSk6IFVzZSBhIExl dmVsREJUcmFuc2FjdGlvbgorICAgICAgICBkaXJlY3RseS4KKwogMjAxMi0wNy0wOSAgU2hlcmlm ZiBCb3QgIDx3ZWJraXQucmV2aWV3LmJvdEBnbWFpbC5jb20+CiAKICAgICAgICAgVW5yZXZpZXdl ZCwgcm9sbGluZyBvdXQgcjEyMjEwNy4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVs ZXMvaW5kZXhlZGRiL0lEQkxldmVsREJCYWNraW5nU3RvcmUuY3BwIGIvU291cmNlL1dlYkNvcmUv TW9kdWxlcy9pbmRleGVkZGIvSURCTGV2ZWxEQkJhY2tpbmdTdG9yZS5jcHAKaW5kZXggYzQ0YTRj OWRlNTg1YzIzYWFlYWEwZGM0MjQzN2Q5YTVkOTM2NTI2ZC4uYWI4MjkzZjBmYTQ3Y2VjMDg1OTEx YTU1NDRlYWIxM2M1NGE3NDQ1OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9p bmRleGVkZGIvSURCTGV2ZWxEQkJhY2tpbmdTdG9yZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv TW9kdWxlcy9pbmRleGVkZGIvSURCTGV2ZWxEQkJhY2tpbmdTdG9yZS5jcHAKQEAgLTI5OCwxMSAr Mjk4LDcgQEAgc3RhdGljIGJvb2wgZGVsZXRlUmFuZ2UoTGV2ZWxEQlRyYW5zYWN0aW9uKiB0cmFu c2FjdGlvbiwgY29uc3QgVmVjdG9yPGNoYXI+JiBiZWcKIAogYm9vbCBJREJMZXZlbERCQmFja2lu Z1N0b3JlOjpkZWxldGVEYXRhYmFzZShjb25zdCBTdHJpbmcmIG5hbWUpCiB7Ci0gICAgaWYgKG1f Y3VycmVudFRyYW5zYWN0aW9uKQotICAgICAgICByZXR1cm4gZmFsc2U7Ci0KLSAgICBSZWZQdHI8 SURCTGV2ZWxEQkJhY2tpbmdTdG9yZTo6VHJhbnNhY3Rpb24+IHRyYW5zYWN0aW9uID0gSURCTGV2 ZWxEQkJhY2tpbmdTdG9yZTo6VHJhbnNhY3Rpb246OmNyZWF0ZSh0aGlzKTsKLSAgICB0cmFuc2Fj dGlvbi0+YmVnaW4oKTsKKyAgICBSZWZQdHI8TGV2ZWxEQlRyYW5zYWN0aW9uPiB0cmFuc2FjdGlv biA9IExldmVsREJUcmFuc2FjdGlvbjo6Y3JlYXRlKG1fZGIuZ2V0KCkpOwogCiAgICAgaW50NjRf dCBkYXRhYmFzZUlkOwogICAgIFN0cmluZyB2ZXJzaW9uOwpAQCAtMzEzLDEzICszMDksMTMgQEAg Ym9vbCBJREJMZXZlbERCQmFja2luZ1N0b3JlOjpkZWxldGVEYXRhYmFzZShjb25zdCBTdHJpbmcm IG5hbWUpCiAKICAgICBjb25zdCBWZWN0b3I8Y2hhcj4gc3RhcnRLZXkgPSBEYXRhYmFzZU1ldGFE YXRhS2V5OjplbmNvZGUoZGF0YWJhc2VJZCwgRGF0YWJhc2VNZXRhRGF0YUtleTo6a09yaWdpbk5h bWUpOwogICAgIGNvbnN0IFZlY3RvcjxjaGFyPiBzdG9wS2V5ID0gRGF0YWJhc2VNZXRhRGF0YUtl eTo6ZW5jb2RlKGRhdGFiYXNlSWQgKyAxLCBEYXRhYmFzZU1ldGFEYXRhS2V5OjprT3JpZ2luTmFt ZSk7Ci0gICAgaWYgKCFkZWxldGVSYW5nZShtX2N1cnJlbnRUcmFuc2FjdGlvbi5nZXQoKSwgc3Rh cnRLZXksIHN0b3BLZXkpKSB7CisgICAgaWYgKCFkZWxldGVSYW5nZSh0cmFuc2FjdGlvbi5nZXQo KSwgc3RhcnRLZXksIHN0b3BLZXkpKSB7CiAgICAgICAgIHRyYW5zYWN0aW9uLT5yb2xsYmFjaygp OwogICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgfQogCiAgICAgY29uc3QgVmVjdG9yPGNoYXI+ IGtleSA9IERhdGFiYXNlTmFtZUtleTo6ZW5jb2RlKG1faWRlbnRpZmllciwgbmFtZSk7Ci0gICAg bV9jdXJyZW50VHJhbnNhY3Rpb24tPnJlbW92ZShrZXkpOworICAgIHRyYW5zYWN0aW9uLT5yZW1v dmUoa2V5KTsKIAogICAgIHJldHVybiB0cmFuc2FjdGlvbi0+Y29tbWl0KCk7CiB9CmRpZmYgLS1n aXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXgg NDBlZDc3ZjY5YWRjN2Y3ZTE3ODE3YWExNmFiY2Q2NzViMzExMjVjOS4uOTUzYWQ0Nzg3Zjg1MDEw OGIzZDA3NDQwMzZiM2QzMjI1MTEyMmM5ZiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdl TG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEzIEBACisyMDEyLTA3 LTA5ICBKb3NodWEgQmVsbCAgPGpzYmVsbEBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgSW5kZXhl ZERCOiBkZWxldGVEYXRhYmFzZSBmYWlscyBpZiB0cmFuc2FjdGlvbiBydW5uaW5nIGluIG90aGVy IGRhdGFiYXNlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD05MDgyMgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg ICogc3RvcmFnZS9pbmRleGVkZGIvZGVsZXRlZGF0YWJhc2UtdHJhbnNhY3Rpb24tZXhwZWN0ZWQu dHh0OiBBZGRlZC4KKyAgICAgICAgKiBzdG9yYWdlL2luZGV4ZWRkYi9kZWxldGVkYXRhYmFzZS10 cmFuc2FjdGlvbi5odG1sOiBBZGRlZC4KKwogMjAxMi0wNy0wOSAgWmFuIERvYmVyc2VrICA8emFu ZG9iZXJzZWtAZ21haWwuY29tPgogCiAgICAgICAgIFtHdGtdIFVuc2tpcCB0aGUgQ1NTIFJlZ2lv bnMgbGF5b3V0IHRlc3RzCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9zdG9yYWdlL2luZGV4ZWRk Yi9kZWxldGVkYXRhYmFzZS10cmFuc2FjdGlvbi1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9z dG9yYWdlL2luZGV4ZWRkYi9kZWxldGVkYXRhYmFzZS10cmFuc2FjdGlvbi1leHBlY3RlZC50eHQK bmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMC4uOTFmOWNmMDBmYzkxYWVlZWJlODI2MWUxMWExYjE0ZWI2NzQzNTliYQotLS0g L2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL3N0b3JhZ2UvaW5kZXhlZGRiL2RlbGV0ZWRhdGFi YXNlLXRyYW5zYWN0aW9uLWV4cGVjdGVkLnR4dApAQCAtMCwwICsxLDI4IEBACitFbnN1cmUgZGVs ZXRlRGF0YWJhc2UoKSBjYW4gcnVuIGNvbmN1cnJlbnRseSB3aXRoIHRyYW5zYWN0aW9ucyBpbiBv dGhlciBkYXRhYmFzZXMKKworT24gc3VjY2VzcywgeW91IHdpbGwgc2VlIGEgc2VyaWVzIG9mICJQ QVNTIiBtZXNzYWdlcywgZm9sbG93ZWQgYnkgIlRFU1QgQ09NUExFVEUiLgorCisKK2luZGV4ZWRE QiA9IHNlbGYuaW5kZXhlZERCIHx8IHNlbGYud2Via2l0SW5kZXhlZERCIHx8IHNlbGYubW96SW5k ZXhlZERCIHx8IHNlbGYubXNJbmRleGVkREIgfHwgc2VsZi5PSW5kZXhlZERCOworCitkYm5hbWUx ID0gJ2RlbGV0ZWRhdGFiYXNlLXRyYW5zYWN0aW9uJworZGJuYW1lMiA9ICdkZWxldGVkYXRhYmFz ZS10cmFuc2FjdGlvbjInCisKK1ByZXBhcmUgZGF0YWJhc2U6CitpbmRleGVkREIuZGVsZXRlRGF0 YWJhc2UoZGJuYW1lMSkKK3JlcXVlc3QgPSBpbmRleGVkREIub3BlbihkYm5hbWUxKQorZGIgPSBy ZXF1ZXN0LnJlc3VsdAorZGIuc2V0VmVyc2lvbignMScpCitkYi5jcmVhdGVPYmplY3RTdG9yZSgn c3RvcmUnKQorCitTdGFydCBhIHRyYW5zYWN0aW9uIGFnYWluc3QgdGhlIGZpcnN0IGRhdGFiYXNl OgordHJhbnMgPSBkYi50cmFuc2FjdGlvbignc3RvcmUnLCAncmVhZG9ubHknKQordHJhbnMub2Jq ZWN0U3RvcmUoJ3N0b3JlJykuZ2V0KDApCisKK0RlbGV0ZSBhIGRpZmZlcmVudCBkYXRhYmFzZToK K2luZGV4ZWREQi5kZWxldGVEYXRhYmFzZShkYm5hbWUyKQorUEFTUyBzdWNjZXNzIGV2ZW50IHdh cyBmaXJlZCBhdCBkZWxldGUgcmVxdWVzdAorUEFTUyBzdWNjZXNzZnVsbHlQYXJzZWQgaXMgdHJ1 ZQorCitURVNUIENPTVBMRVRFCisKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3N0b3JhZ2UvaW5k ZXhlZGRiL2RlbGV0ZWRhdGFiYXNlLXRyYW5zYWN0aW9uLmh0bWwgYi9MYXlvdXRUZXN0cy9zdG9y YWdlL2luZGV4ZWRkYi9kZWxldGVkYXRhYmFzZS10cmFuc2FjdGlvbi5odG1sCm5ldyBmaWxlIG1v ZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAu LmYzYWE5NTBkY2MyMjlmNjY3ZjdkNzQ0YmEyZDgwOTliZGFmZDg3MjMKLS0tIC9kZXYvbnVsbAor KysgYi9MYXlvdXRUZXN0cy9zdG9yYWdlL2luZGV4ZWRkYi9kZWxldGVkYXRhYmFzZS10cmFuc2Fj dGlvbi5odG1sCkBAIC0wLDAgKzEsNDkgQEAKKzwhRE9DVFlQRSBodG1sPgorPHNjcmlwdCBzcmM9 Ii4uLy4uL2Zhc3QvanMvcmVzb3VyY2VzL2pzLXRlc3QtcHJlLmpzIj48L3NjcmlwdD4KKzxzY3Jp cHQgc3JjPSJyZXNvdXJjZXMvc2hhcmVkLmpzIj48L3NjcmlwdD4KKzxzY3JpcHQ+CitkZXNjcmlw dGlvbigiRW5zdXJlIGRlbGV0ZURhdGFiYXNlKCkgY2FuIHJ1biBjb25jdXJyZW50bHkgd2l0aCB0 cmFuc2FjdGlvbnMgaW4gb3RoZXIgZGF0YWJhc2VzIik7CitmdW5jdGlvbiB0ZXN0KCkKK3sKKyAg ICByZW1vdmVWZW5kb3JQcmVmaXhlcygpOworCisgICAgZXZhbEFuZExvZygiZGJuYW1lMSA9ICdk ZWxldGVkYXRhYmFzZS10cmFuc2FjdGlvbiciKTsKKyAgICBldmFsQW5kTG9nKCJkYm5hbWUyID0g J2RlbGV0ZWRhdGFiYXNlLXRyYW5zYWN0aW9uMiciKTsKKyAgICBkZWJ1ZygiIik7CisgICAgZGVi dWcoIlByZXBhcmUgZGF0YWJhc2U6Iik7CisKKyAgICByZXF1ZXN0ID0gZXZhbEFuZExvZygiaW5k ZXhlZERCLmRlbGV0ZURhdGFiYXNlKGRibmFtZTEpIik7CisgICAgcmVxdWVzdC5vbnN1Y2Nlc3Mg PSBmdW5jdGlvbigpIHsKKyAgICAgICAgcmVxdWVzdCA9IGV2YWxBbmRMb2coInJlcXVlc3QgPSBp bmRleGVkREIub3BlbihkYm5hbWUxKSIpOworICAgICAgICByZXF1ZXN0Lm9uc3VjY2VzcyA9IGZ1 bmN0aW9uKCkgeworICAgICAgICAgICAgZXZhbEFuZExvZygiZGIgPSByZXF1ZXN0LnJlc3VsdCIp OworICAgICAgICAgICAgcmVxdWVzdCA9IGV2YWxBbmRMb2coImRiLnNldFZlcnNpb24oJzEnKSIp OworICAgICAgICAgICAgcmVxdWVzdC5vbnN1Y2Nlc3MgPSBmdW5jdGlvbiAoKSB7CisgICAgICAg ICAgICAgICAgdHJhbnMgPSByZXF1ZXN0LnJlc3VsdDsKKyAgICAgICAgICAgICAgICBldmFsQW5k TG9nKCJkYi5jcmVhdGVPYmplY3RTdG9yZSgnc3RvcmUnKSIpOworICAgICAgICAgICAgICAgIHRy YW5zLm9uY29tcGxldGUgPSBzdGFydFRyYW5zYWN0aW9uOworICAgICAgICAgICAgfTsKKyAgICAg ICAgfTsKKyAgICB9OworfQorCitmdW5jdGlvbiBzdGFydFRyYW5zYWN0aW9uKCkgeworICBkZWJ1 ZygiIik7CisgIGRlYnVnKCJTdGFydCBhIHRyYW5zYWN0aW9uIGFnYWluc3QgdGhlIGZpcnN0IGRh dGFiYXNlOiIpOworICBldmFsQW5kTG9nKCJ0cmFucyA9IGRiLnRyYW5zYWN0aW9uKCdzdG9yZScs ICdyZWFkb25seScpIik7CisgIGV2YWxBbmRMb2coInRyYW5zLm9iamVjdFN0b3JlKCdzdG9yZScp LmdldCgwKSIpOworCisgIGRlYnVnKCIiKTsKKyAgZGVidWcoIkRlbGV0ZSBhIGRpZmZlcmVudCBk YXRhYmFzZToiKTsKKyAgcmVxdWVzdCA9IGV2YWxBbmRMb2coImluZGV4ZWREQi5kZWxldGVEYXRh YmFzZShkYm5hbWUyKSIpOworICByZXF1ZXN0Lm9uZXJyb3IgPSB1bmV4cGVjdGVkRXJyb3JDYWxs YmFjazsKKyAgcmVxdWVzdC5vbnN1Y2Nlc3MgPSBmdW5jdGlvbigpIHsKKyAgICAgIHRlc3RQYXNz ZWQoInN1Y2Nlc3MgZXZlbnQgd2FzIGZpcmVkIGF0IGRlbGV0ZSByZXF1ZXN0Iik7CisgIH07CisK KyAgdHJhbnMub25jb21wbGV0ZSA9IGZpbmlzaEpTVGVzdDsKK30KKwordGVzdCgpOworPC9zY3Jp cHQ+Cis8c2NyaXB0IHNyYz0iLi4vLi4vZmFzdC9qcy9yZXNvdXJjZXMvanMtdGVzdC1wb3N0Lmpz Ij48L3NjcmlwdD4K 151349 2012-07-09 16:29:24 -0700 2012-07-09 16:37:15 -0700 Patch bug-90822-20120709162923.patch text/plain 6534 jsbell U3VidmVyc2lvbiBSZXZpc2lvbjogMTIyMTEzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjI2NGUwNTRhYmU5NGI4 Nzc2MDhmYjAzZTdkOTkyZTYyMjU4MGJhZi4uMWE4YjEwYTg0ZmM5MzRjOWMxZDNiMjJkMDYxMzAz Y2QxNDI4ZDRjZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDEyLTA3LTA5ICBKb3No dWEgQmVsbCAgPGpzYmVsbEBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgSW5kZXhlZERCOiBkZWxl dGVEYXRhYmFzZSBmYWlscyBpZiB0cmFuc2FjdGlvbiBydW5uaW5nIGluIG90aGVyIGRhdGFiYXNl CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05MDgyMgor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoZSBJREJM ZXZlbERCQmFja2luZ1N0b3JlIHdhcyBwcmV2ZW50aW5nIGEgZGVsZXRlRGF0YWJhc2UoKSBmcm9t IHJ1bm5pbmcKKyAgICAgICAgaWYgYW55IG90aGVyIGRhdGFiYXNlIHdhcyBydW5uaW5nIGEgdHJh bnNhY3Rpb24uIEZpeCBieSBqdXN0IGNyZWF0aW5nIGEgc2NyYXRjaAorICAgICAgICBMZXZlbERC VHJhbnNhY3Rpb24gZm9yIHRoZSBkZWxldGUgc3RlcHMuCisKKyAgICAgICAgVGVzdDogc3RvcmFn ZS9pbmRleGVkZGIvZGVsZXRlZGF0YWJhc2UtdHJhbnNhY3Rpb24uaHRtbAorCisgICAgICAgICog TW9kdWxlcy9pbmRleGVkZGIvSURCTGV2ZWxEQkJhY2tpbmdTdG9yZS5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpJREJMZXZlbERCQmFja2luZ1N0b3JlOjpkZWxldGVEYXRhYmFzZSk6IFVzZSBhIExl dmVsREJUcmFuc2FjdGlvbgorICAgICAgICBkaXJlY3RseS4KKwogMjAxMi0wNy0wOSAgU2hlcmlm ZiBCb3QgIDx3ZWJraXQucmV2aWV3LmJvdEBnbWFpbC5jb20+CiAKICAgICAgICAgVW5yZXZpZXdl ZCwgcm9sbGluZyBvdXQgcjEyMjEwNy4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVs ZXMvaW5kZXhlZGRiL0lEQkxldmVsREJCYWNraW5nU3RvcmUuY3BwIGIvU291cmNlL1dlYkNvcmUv TW9kdWxlcy9pbmRleGVkZGIvSURCTGV2ZWxEQkJhY2tpbmdTdG9yZS5jcHAKaW5kZXggYzQ0YTRj OWRlNTg1YzIzYWFlYWEwZGM0MjQzN2Q5YTVkOTM2NTI2ZC4uYWI4MjkzZjBmYTQ3Y2VjMDg1OTEx YTU1NDRlYWIxM2M1NGE3NDQ1OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9p bmRleGVkZGIvSURCTGV2ZWxEQkJhY2tpbmdTdG9yZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv TW9kdWxlcy9pbmRleGVkZGIvSURCTGV2ZWxEQkJhY2tpbmdTdG9yZS5jcHAKQEAgLTI5OCwxMSAr Mjk4LDcgQEAgc3RhdGljIGJvb2wgZGVsZXRlUmFuZ2UoTGV2ZWxEQlRyYW5zYWN0aW9uKiB0cmFu c2FjdGlvbiwgY29uc3QgVmVjdG9yPGNoYXI+JiBiZWcKIAogYm9vbCBJREJMZXZlbERCQmFja2lu Z1N0b3JlOjpkZWxldGVEYXRhYmFzZShjb25zdCBTdHJpbmcmIG5hbWUpCiB7Ci0gICAgaWYgKG1f Y3VycmVudFRyYW5zYWN0aW9uKQotICAgICAgICByZXR1cm4gZmFsc2U7Ci0KLSAgICBSZWZQdHI8 SURCTGV2ZWxEQkJhY2tpbmdTdG9yZTo6VHJhbnNhY3Rpb24+IHRyYW5zYWN0aW9uID0gSURCTGV2 ZWxEQkJhY2tpbmdTdG9yZTo6VHJhbnNhY3Rpb246OmNyZWF0ZSh0aGlzKTsKLSAgICB0cmFuc2Fj dGlvbi0+YmVnaW4oKTsKKyAgICBSZWZQdHI8TGV2ZWxEQlRyYW5zYWN0aW9uPiB0cmFuc2FjdGlv biA9IExldmVsREJUcmFuc2FjdGlvbjo6Y3JlYXRlKG1fZGIuZ2V0KCkpOwogCiAgICAgaW50NjRf dCBkYXRhYmFzZUlkOwogICAgIFN0cmluZyB2ZXJzaW9uOwpAQCAtMzEzLDEzICszMDksMTMgQEAg Ym9vbCBJREJMZXZlbERCQmFja2luZ1N0b3JlOjpkZWxldGVEYXRhYmFzZShjb25zdCBTdHJpbmcm IG5hbWUpCiAKICAgICBjb25zdCBWZWN0b3I8Y2hhcj4gc3RhcnRLZXkgPSBEYXRhYmFzZU1ldGFE YXRhS2V5OjplbmNvZGUoZGF0YWJhc2VJZCwgRGF0YWJhc2VNZXRhRGF0YUtleTo6a09yaWdpbk5h bWUpOwogICAgIGNvbnN0IFZlY3RvcjxjaGFyPiBzdG9wS2V5ID0gRGF0YWJhc2VNZXRhRGF0YUtl eTo6ZW5jb2RlKGRhdGFiYXNlSWQgKyAxLCBEYXRhYmFzZU1ldGFEYXRhS2V5OjprT3JpZ2luTmFt ZSk7Ci0gICAgaWYgKCFkZWxldGVSYW5nZShtX2N1cnJlbnRUcmFuc2FjdGlvbi5nZXQoKSwgc3Rh cnRLZXksIHN0b3BLZXkpKSB7CisgICAgaWYgKCFkZWxldGVSYW5nZSh0cmFuc2FjdGlvbi5nZXQo KSwgc3RhcnRLZXksIHN0b3BLZXkpKSB7CiAgICAgICAgIHRyYW5zYWN0aW9uLT5yb2xsYmFjaygp OwogICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgfQogCiAgICAgY29uc3QgVmVjdG9yPGNoYXI+ IGtleSA9IERhdGFiYXNlTmFtZUtleTo6ZW5jb2RlKG1faWRlbnRpZmllciwgbmFtZSk7Ci0gICAg bV9jdXJyZW50VHJhbnNhY3Rpb24tPnJlbW92ZShrZXkpOworICAgIHRyYW5zYWN0aW9uLT5yZW1v dmUoa2V5KTsKIAogICAgIHJldHVybiB0cmFuc2FjdGlvbi0+Y29tbWl0KCk7CiB9CmRpZmYgLS1n aXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXgg NDBlZDc3ZjY5YWRjN2Y3ZTE3ODE3YWExNmFiY2Q2NzViMzExMjVjOS4uOTUzYWQ0Nzg3Zjg1MDEw OGIzZDA3NDQwMzZiM2QzMjI1MTEyMmM5ZiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdl TG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEzIEBACisyMDEyLTA3 LTA5ICBKb3NodWEgQmVsbCAgPGpzYmVsbEBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgSW5kZXhl ZERCOiBkZWxldGVEYXRhYmFzZSBmYWlscyBpZiB0cmFuc2FjdGlvbiBydW5uaW5nIGluIG90aGVy IGRhdGFiYXNlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD05MDgyMgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg ICogc3RvcmFnZS9pbmRleGVkZGIvZGVsZXRlZGF0YWJhc2UtdHJhbnNhY3Rpb24tZXhwZWN0ZWQu dHh0OiBBZGRlZC4KKyAgICAgICAgKiBzdG9yYWdlL2luZGV4ZWRkYi9kZWxldGVkYXRhYmFzZS10 cmFuc2FjdGlvbi5odG1sOiBBZGRlZC4KKwogMjAxMi0wNy0wOSAgWmFuIERvYmVyc2VrICA8emFu ZG9iZXJzZWtAZ21haWwuY29tPgogCiAgICAgICAgIFtHdGtdIFVuc2tpcCB0aGUgQ1NTIFJlZ2lv bnMgbGF5b3V0IHRlc3RzCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9zdG9yYWdlL2luZGV4ZWRk Yi9kZWxldGVkYXRhYmFzZS10cmFuc2FjdGlvbi1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9z dG9yYWdlL2luZGV4ZWRkYi9kZWxldGVkYXRhYmFzZS10cmFuc2FjdGlvbi1leHBlY3RlZC50eHQK bmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMC4uOTFmOWNmMDBmYzkxYWVlZWJlODI2MWUxMWExYjE0ZWI2NzQzNTliYQotLS0g L2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL3N0b3JhZ2UvaW5kZXhlZGRiL2RlbGV0ZWRhdGFi YXNlLXRyYW5zYWN0aW9uLWV4cGVjdGVkLnR4dApAQCAtMCwwICsxLDI4IEBACitFbnN1cmUgZGVs ZXRlRGF0YWJhc2UoKSBjYW4gcnVuIGNvbmN1cnJlbnRseSB3aXRoIHRyYW5zYWN0aW9ucyBpbiBv dGhlciBkYXRhYmFzZXMKKworT24gc3VjY2VzcywgeW91IHdpbGwgc2VlIGEgc2VyaWVzIG9mICJQ QVNTIiBtZXNzYWdlcywgZm9sbG93ZWQgYnkgIlRFU1QgQ09NUExFVEUiLgorCisKK2luZGV4ZWRE QiA9IHNlbGYuaW5kZXhlZERCIHx8IHNlbGYud2Via2l0SW5kZXhlZERCIHx8IHNlbGYubW96SW5k ZXhlZERCIHx8IHNlbGYubXNJbmRleGVkREIgfHwgc2VsZi5PSW5kZXhlZERCOworCitkYm5hbWUx ID0gJ2RlbGV0ZWRhdGFiYXNlLXRyYW5zYWN0aW9uJworZGJuYW1lMiA9ICdkZWxldGVkYXRhYmFz ZS10cmFuc2FjdGlvbjInCisKK1ByZXBhcmUgZGF0YWJhc2U6CitpbmRleGVkREIuZGVsZXRlRGF0 YWJhc2UoZGJuYW1lMSkKK3JlcXVlc3QgPSBpbmRleGVkREIub3BlbihkYm5hbWUxKQorZGIgPSBy ZXF1ZXN0LnJlc3VsdAorZGIuc2V0VmVyc2lvbignMScpCitkYi5jcmVhdGVPYmplY3RTdG9yZSgn c3RvcmUnKQorCitTdGFydCBhIHRyYW5zYWN0aW9uIGFnYWluc3QgdGhlIGZpcnN0IGRhdGFiYXNl OgordHJhbnMgPSBkYi50cmFuc2FjdGlvbignc3RvcmUnLCAncmVhZG9ubHknKQordHJhbnMub2Jq ZWN0U3RvcmUoJ3N0b3JlJykuZ2V0KDApCisKK0RlbGV0ZSBhIGRpZmZlcmVudCBkYXRhYmFzZToK K2luZGV4ZWREQi5kZWxldGVEYXRhYmFzZShkYm5hbWUyKQorUEFTUyBzdWNjZXNzIGV2ZW50IHdh cyBmaXJlZCBhdCBkZWxldGUgcmVxdWVzdAorUEFTUyBzdWNjZXNzZnVsbHlQYXJzZWQgaXMgdHJ1 ZQorCitURVNUIENPTVBMRVRFCisKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3N0b3JhZ2UvaW5k ZXhlZGRiL2RlbGV0ZWRhdGFiYXNlLXRyYW5zYWN0aW9uLmh0bWwgYi9MYXlvdXRUZXN0cy9zdG9y YWdlL2luZGV4ZWRkYi9kZWxldGVkYXRhYmFzZS10cmFuc2FjdGlvbi5odG1sCm5ldyBmaWxlIG1v ZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAu LmI1NjBjMTNkYjA3NjliY2RjMTkyNTNkN2FhMDE5ZWYwYTc5YWJmYjEKLS0tIC9kZXYvbnVsbAor KysgYi9MYXlvdXRUZXN0cy9zdG9yYWdlL2luZGV4ZWRkYi9kZWxldGVkYXRhYmFzZS10cmFuc2Fj dGlvbi5odG1sCkBAIC0wLDAgKzEsNDkgQEAKKzwhRE9DVFlQRSBodG1sPgorPHNjcmlwdCBzcmM9 Ii4uLy4uL2Zhc3QvanMvcmVzb3VyY2VzL2pzLXRlc3QtcHJlLmpzIj48L3NjcmlwdD4KKzxzY3Jp cHQgc3JjPSJyZXNvdXJjZXMvc2hhcmVkLmpzIj48L3NjcmlwdD4KKzxzY3JpcHQ+CitkZXNjcmlw dGlvbigiRW5zdXJlIGRlbGV0ZURhdGFiYXNlKCkgY2FuIHJ1biBjb25jdXJyZW50bHkgd2l0aCB0 cmFuc2FjdGlvbnMgaW4gb3RoZXIgZGF0YWJhc2VzIik7CitmdW5jdGlvbiB0ZXN0KCkKK3sKKyAg ICByZW1vdmVWZW5kb3JQcmVmaXhlcygpOworCisgICAgZXZhbEFuZExvZygiZGJuYW1lMSA9ICdk ZWxldGVkYXRhYmFzZS10cmFuc2FjdGlvbiciKTsKKyAgICBldmFsQW5kTG9nKCJkYm5hbWUyID0g J2RlbGV0ZWRhdGFiYXNlLXRyYW5zYWN0aW9uMiciKTsKKyAgICBkZWJ1ZygiIik7CisgICAgZGVi dWcoIlByZXBhcmUgZGF0YWJhc2U6Iik7CisKKyAgICByZXF1ZXN0ID0gZXZhbEFuZExvZygiaW5k ZXhlZERCLmRlbGV0ZURhdGFiYXNlKGRibmFtZTEpIik7CisgICAgcmVxdWVzdC5vbnN1Y2Nlc3Mg PSBmdW5jdGlvbigpIHsKKyAgICAgICAgcmVxdWVzdCA9IGV2YWxBbmRMb2coInJlcXVlc3QgPSBp bmRleGVkREIub3BlbihkYm5hbWUxKSIpOworICAgICAgICByZXF1ZXN0Lm9uc3VjY2VzcyA9IGZ1 bmN0aW9uKCkgeworICAgICAgICAgICAgZXZhbEFuZExvZygiZGIgPSByZXF1ZXN0LnJlc3VsdCIp OworICAgICAgICAgICAgcmVxdWVzdCA9IGV2YWxBbmRMb2coImRiLnNldFZlcnNpb24oJzEnKSIp OworICAgICAgICAgICAgcmVxdWVzdC5vbnN1Y2Nlc3MgPSBmdW5jdGlvbiAoKSB7CisgICAgICAg ICAgICAgICAgdHJhbnMgPSByZXF1ZXN0LnJlc3VsdDsKKyAgICAgICAgICAgICAgICBldmFsQW5k TG9nKCJkYi5jcmVhdGVPYmplY3RTdG9yZSgnc3RvcmUnKSIpOworICAgICAgICAgICAgICAgIHRy YW5zLm9uY29tcGxldGUgPSBzdGFydFRyYW5zYWN0aW9uOworICAgICAgICAgICAgfTsKKyAgICAg ICAgfTsKKyAgICB9OworfQorCitmdW5jdGlvbiBzdGFydFRyYW5zYWN0aW9uKCkgeworICAgIGRl YnVnKCIiKTsKKyAgICBkZWJ1ZygiU3RhcnQgYSB0cmFuc2FjdGlvbiBhZ2FpbnN0IHRoZSBmaXJz dCBkYXRhYmFzZToiKTsKKyAgICBldmFsQW5kTG9nKCJ0cmFucyA9IGRiLnRyYW5zYWN0aW9uKCdz dG9yZScsICdyZWFkb25seScpIik7CisgICAgZXZhbEFuZExvZygidHJhbnMub2JqZWN0U3RvcmUo J3N0b3JlJykuZ2V0KDApIik7CisKKyAgICBkZWJ1ZygiIik7CisgICAgZGVidWcoIkRlbGV0ZSBh IGRpZmZlcmVudCBkYXRhYmFzZToiKTsKKyAgICByZXF1ZXN0ID0gZXZhbEFuZExvZygiaW5kZXhl ZERCLmRlbGV0ZURhdGFiYXNlKGRibmFtZTIpIik7CisgICAgcmVxdWVzdC5vbmVycm9yID0gdW5l eHBlY3RlZEVycm9yQ2FsbGJhY2s7CisgICAgcmVxdWVzdC5vbnN1Y2Nlc3MgPSBmdW5jdGlvbigp IHsKKyAgICAgICAgdGVzdFBhc3NlZCgic3VjY2VzcyBldmVudCB3YXMgZmlyZWQgYXQgZGVsZXRl IHJlcXVlc3QiKTsKKyAgICB9OworCisgICAgdHJhbnMub25jb21wbGV0ZSA9IGZpbmlzaEpTVGVz dDsKK30KKwordGVzdCgpOworPC9zY3JpcHQ+Cis8c2NyaXB0IHNyYz0iLi4vLi4vZmFzdC9qcy9y ZXNvdXJjZXMvanMtdGVzdC1wb3N0LmpzIj48L3NjcmlwdD4K 151352 2012-07-09 16:37:17 -0700 2012-07-09 18:46:54 -0700 Patch bug-90822-20120709163717.patch text/plain 6586 jsbell U3VidmVyc2lvbiBSZXZpc2lvbjogMTIyMTEzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjI2NGUwNTRhYmU5NGI4 Nzc2MDhmYjAzZTdkOTkyZTYyMjU4MGJhZi4uMWE4YjEwYTg0ZmM5MzRjOWMxZDNiMjJkMDYxMzAz Y2QxNDI4ZDRjZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDEyLTA3LTA5ICBKb3No dWEgQmVsbCAgPGpzYmVsbEBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgSW5kZXhlZERCOiBkZWxl dGVEYXRhYmFzZSBmYWlscyBpZiB0cmFuc2FjdGlvbiBydW5uaW5nIGluIG90aGVyIGRhdGFiYXNl CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05MDgyMgor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoZSBJREJM ZXZlbERCQmFja2luZ1N0b3JlIHdhcyBwcmV2ZW50aW5nIGEgZGVsZXRlRGF0YWJhc2UoKSBmcm9t IHJ1bm5pbmcKKyAgICAgICAgaWYgYW55IG90aGVyIGRhdGFiYXNlIHdhcyBydW5uaW5nIGEgdHJh bnNhY3Rpb24uIEZpeCBieSBqdXN0IGNyZWF0aW5nIGEgc2NyYXRjaAorICAgICAgICBMZXZlbERC VHJhbnNhY3Rpb24gZm9yIHRoZSBkZWxldGUgc3RlcHMuCisKKyAgICAgICAgVGVzdDogc3RvcmFn ZS9pbmRleGVkZGIvZGVsZXRlZGF0YWJhc2UtdHJhbnNhY3Rpb24uaHRtbAorCisgICAgICAgICog TW9kdWxlcy9pbmRleGVkZGIvSURCTGV2ZWxEQkJhY2tpbmdTdG9yZS5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpJREJMZXZlbERCQmFja2luZ1N0b3JlOjpkZWxldGVEYXRhYmFzZSk6IFVzZSBhIExl dmVsREJUcmFuc2FjdGlvbgorICAgICAgICBkaXJlY3RseS4KKwogMjAxMi0wNy0wOSAgU2hlcmlm ZiBCb3QgIDx3ZWJraXQucmV2aWV3LmJvdEBnbWFpbC5jb20+CiAKICAgICAgICAgVW5yZXZpZXdl ZCwgcm9sbGluZyBvdXQgcjEyMjEwNy4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVs ZXMvaW5kZXhlZGRiL0lEQkxldmVsREJCYWNraW5nU3RvcmUuY3BwIGIvU291cmNlL1dlYkNvcmUv TW9kdWxlcy9pbmRleGVkZGIvSURCTGV2ZWxEQkJhY2tpbmdTdG9yZS5jcHAKaW5kZXggYzQ0YTRj OWRlNTg1YzIzYWFlYWEwZGM0MjQzN2Q5YTVkOTM2NTI2ZC4uYWI4MjkzZjBmYTQ3Y2VjMDg1OTEx YTU1NDRlYWIxM2M1NGE3NDQ1OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9p bmRleGVkZGIvSURCTGV2ZWxEQkJhY2tpbmdTdG9yZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv TW9kdWxlcy9pbmRleGVkZGIvSURCTGV2ZWxEQkJhY2tpbmdTdG9yZS5jcHAKQEAgLTI5OCwxMSAr Mjk4LDcgQEAgc3RhdGljIGJvb2wgZGVsZXRlUmFuZ2UoTGV2ZWxEQlRyYW5zYWN0aW9uKiB0cmFu c2FjdGlvbiwgY29uc3QgVmVjdG9yPGNoYXI+JiBiZWcKIAogYm9vbCBJREJMZXZlbERCQmFja2lu Z1N0b3JlOjpkZWxldGVEYXRhYmFzZShjb25zdCBTdHJpbmcmIG5hbWUpCiB7Ci0gICAgaWYgKG1f Y3VycmVudFRyYW5zYWN0aW9uKQotICAgICAgICByZXR1cm4gZmFsc2U7Ci0KLSAgICBSZWZQdHI8 SURCTGV2ZWxEQkJhY2tpbmdTdG9yZTo6VHJhbnNhY3Rpb24+IHRyYW5zYWN0aW9uID0gSURCTGV2 ZWxEQkJhY2tpbmdTdG9yZTo6VHJhbnNhY3Rpb246OmNyZWF0ZSh0aGlzKTsKLSAgICB0cmFuc2Fj dGlvbi0+YmVnaW4oKTsKKyAgICBSZWZQdHI8TGV2ZWxEQlRyYW5zYWN0aW9uPiB0cmFuc2FjdGlv biA9IExldmVsREJUcmFuc2FjdGlvbjo6Y3JlYXRlKG1fZGIuZ2V0KCkpOwogCiAgICAgaW50NjRf dCBkYXRhYmFzZUlkOwogICAgIFN0cmluZyB2ZXJzaW9uOwpAQCAtMzEzLDEzICszMDksMTMgQEAg Ym9vbCBJREJMZXZlbERCQmFja2luZ1N0b3JlOjpkZWxldGVEYXRhYmFzZShjb25zdCBTdHJpbmcm IG5hbWUpCiAKICAgICBjb25zdCBWZWN0b3I8Y2hhcj4gc3RhcnRLZXkgPSBEYXRhYmFzZU1ldGFE YXRhS2V5OjplbmNvZGUoZGF0YWJhc2VJZCwgRGF0YWJhc2VNZXRhRGF0YUtleTo6a09yaWdpbk5h bWUpOwogICAgIGNvbnN0IFZlY3RvcjxjaGFyPiBzdG9wS2V5ID0gRGF0YWJhc2VNZXRhRGF0YUtl eTo6ZW5jb2RlKGRhdGFiYXNlSWQgKyAxLCBEYXRhYmFzZU1ldGFEYXRhS2V5OjprT3JpZ2luTmFt ZSk7Ci0gICAgaWYgKCFkZWxldGVSYW5nZShtX2N1cnJlbnRUcmFuc2FjdGlvbi5nZXQoKSwgc3Rh cnRLZXksIHN0b3BLZXkpKSB7CisgICAgaWYgKCFkZWxldGVSYW5nZSh0cmFuc2FjdGlvbi5nZXQo KSwgc3RhcnRLZXksIHN0b3BLZXkpKSB7CiAgICAgICAgIHRyYW5zYWN0aW9uLT5yb2xsYmFjaygp OwogICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgfQogCiAgICAgY29uc3QgVmVjdG9yPGNoYXI+ IGtleSA9IERhdGFiYXNlTmFtZUtleTo6ZW5jb2RlKG1faWRlbnRpZmllciwgbmFtZSk7Ci0gICAg bV9jdXJyZW50VHJhbnNhY3Rpb24tPnJlbW92ZShrZXkpOworICAgIHRyYW5zYWN0aW9uLT5yZW1v dmUoa2V5KTsKIAogICAgIHJldHVybiB0cmFuc2FjdGlvbi0+Y29tbWl0KCk7CiB9CmRpZmYgLS1n aXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXgg NDBlZDc3ZjY5YWRjN2Y3ZTE3ODE3YWExNmFiY2Q2NzViMzExMjVjOS4uOTUzYWQ0Nzg3Zjg1MDEw OGIzZDA3NDQwMzZiM2QzMjI1MTEyMmM5ZiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdl TG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEzIEBACisyMDEyLTA3 LTA5ICBKb3NodWEgQmVsbCAgPGpzYmVsbEBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgSW5kZXhl ZERCOiBkZWxldGVEYXRhYmFzZSBmYWlscyBpZiB0cmFuc2FjdGlvbiBydW5uaW5nIGluIG90aGVy IGRhdGFiYXNlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD05MDgyMgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg ICogc3RvcmFnZS9pbmRleGVkZGIvZGVsZXRlZGF0YWJhc2UtdHJhbnNhY3Rpb24tZXhwZWN0ZWQu dHh0OiBBZGRlZC4KKyAgICAgICAgKiBzdG9yYWdlL2luZGV4ZWRkYi9kZWxldGVkYXRhYmFzZS10 cmFuc2FjdGlvbi5odG1sOiBBZGRlZC4KKwogMjAxMi0wNy0wOSAgWmFuIERvYmVyc2VrICA8emFu ZG9iZXJzZWtAZ21haWwuY29tPgogCiAgICAgICAgIFtHdGtdIFVuc2tpcCB0aGUgQ1NTIFJlZ2lv bnMgbGF5b3V0IHRlc3RzCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9zdG9yYWdlL2luZGV4ZWRk Yi9kZWxldGVkYXRhYmFzZS10cmFuc2FjdGlvbi1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9z dG9yYWdlL2luZGV4ZWRkYi9kZWxldGVkYXRhYmFzZS10cmFuc2FjdGlvbi1leHBlY3RlZC50eHQK bmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMC4uOTFmOWNmMDBmYzkxYWVlZWJlODI2MWUxMWExYjE0ZWI2NzQzNTliYQotLS0g L2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL3N0b3JhZ2UvaW5kZXhlZGRiL2RlbGV0ZWRhdGFi YXNlLXRyYW5zYWN0aW9uLWV4cGVjdGVkLnR4dApAQCAtMCwwICsxLDI4IEBACitFbnN1cmUgZGVs ZXRlRGF0YWJhc2UoKSBjYW4gcnVuIGNvbmN1cnJlbnRseSB3aXRoIHRyYW5zYWN0aW9ucyBpbiBv dGhlciBkYXRhYmFzZXMKKworT24gc3VjY2VzcywgeW91IHdpbGwgc2VlIGEgc2VyaWVzIG9mICJQ QVNTIiBtZXNzYWdlcywgZm9sbG93ZWQgYnkgIlRFU1QgQ09NUExFVEUiLgorCisKK2luZGV4ZWRE QiA9IHNlbGYuaW5kZXhlZERCIHx8IHNlbGYud2Via2l0SW5kZXhlZERCIHx8IHNlbGYubW96SW5k ZXhlZERCIHx8IHNlbGYubXNJbmRleGVkREIgfHwgc2VsZi5PSW5kZXhlZERCOworCitkYm5hbWUx ID0gJ2RlbGV0ZWRhdGFiYXNlLXRyYW5zYWN0aW9uJworZGJuYW1lMiA9ICdkZWxldGVkYXRhYmFz ZS10cmFuc2FjdGlvbjInCisKK1ByZXBhcmUgZGF0YWJhc2U6CitpbmRleGVkREIuZGVsZXRlRGF0 YWJhc2UoZGJuYW1lMSkKK3JlcXVlc3QgPSBpbmRleGVkREIub3BlbihkYm5hbWUxKQorZGIgPSBy ZXF1ZXN0LnJlc3VsdAorZGIuc2V0VmVyc2lvbignMScpCitkYi5jcmVhdGVPYmplY3RTdG9yZSgn c3RvcmUnKQorCitTdGFydCBhIHRyYW5zYWN0aW9uIGFnYWluc3QgdGhlIGZpcnN0IGRhdGFiYXNl OgordHJhbnMgPSBkYi50cmFuc2FjdGlvbignc3RvcmUnLCAncmVhZG9ubHknKQordHJhbnMub2Jq ZWN0U3RvcmUoJ3N0b3JlJykuZ2V0KDApCisKK0RlbGV0ZSBhIGRpZmZlcmVudCBkYXRhYmFzZToK K2luZGV4ZWREQi5kZWxldGVEYXRhYmFzZShkYm5hbWUyKQorUEFTUyBzdWNjZXNzIGV2ZW50IHdh cyBmaXJlZCBhdCBkZWxldGUgcmVxdWVzdAorUEFTUyBzdWNjZXNzZnVsbHlQYXJzZWQgaXMgdHJ1 ZQorCitURVNUIENPTVBMRVRFCisKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3N0b3JhZ2UvaW5k ZXhlZGRiL2RlbGV0ZWRhdGFiYXNlLXRyYW5zYWN0aW9uLmh0bWwgYi9MYXlvdXRUZXN0cy9zdG9y YWdlL2luZGV4ZWRkYi9kZWxldGVkYXRhYmFzZS10cmFuc2FjdGlvbi5odG1sCm5ldyBmaWxlIG1v ZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAu LmNlNDJhMWY5Zjc1OTM1NmM3ZjA0MDEzMmFiNjY3MDc5YWFiMTQ3NzEKLS0tIC9kZXYvbnVsbAor KysgYi9MYXlvdXRUZXN0cy9zdG9yYWdlL2luZGV4ZWRkYi9kZWxldGVkYXRhYmFzZS10cmFuc2Fj dGlvbi5odG1sCkBAIC0wLDAgKzEsNTAgQEAKKzwhRE9DVFlQRSBodG1sPgorPHNjcmlwdCBzcmM9 Ii4uLy4uL2Zhc3QvanMvcmVzb3VyY2VzL2pzLXRlc3QtcHJlLmpzIj48L3NjcmlwdD4KKzxzY3Jp cHQgc3JjPSJyZXNvdXJjZXMvc2hhcmVkLmpzIj48L3NjcmlwdD4KKzxzY3JpcHQ+CitkZXNjcmlw dGlvbigiRW5zdXJlIGRlbGV0ZURhdGFiYXNlKCkgY2FuIHJ1biBjb25jdXJyZW50bHkgd2l0aCB0 cmFuc2FjdGlvbnMgaW4gb3RoZXIgZGF0YWJhc2VzIik7CitmdW5jdGlvbiB0ZXN0KCkKK3sKKyAg ICByZW1vdmVWZW5kb3JQcmVmaXhlcygpOworCisgICAgZXZhbEFuZExvZygiZGJuYW1lMSA9ICdk ZWxldGVkYXRhYmFzZS10cmFuc2FjdGlvbiciKTsKKyAgICBldmFsQW5kTG9nKCJkYm5hbWUyID0g J2RlbGV0ZWRhdGFiYXNlLXRyYW5zYWN0aW9uMiciKTsKKyAgICBkZWJ1ZygiIik7CisgICAgZGVi dWcoIlByZXBhcmUgZGF0YWJhc2U6Iik7CisKKyAgICByZXF1ZXN0ID0gZXZhbEFuZExvZygiaW5k ZXhlZERCLmRlbGV0ZURhdGFiYXNlKGRibmFtZTEpIik7CisgICAgcmVxdWVzdC5vbnN1Y2Nlc3Mg PSBmdW5jdGlvbigpIHsKKyAgICAgICAgcmVxdWVzdCA9IGV2YWxBbmRMb2coInJlcXVlc3QgPSBp bmRleGVkREIub3BlbihkYm5hbWUxKSIpOworICAgICAgICByZXF1ZXN0Lm9uc3VjY2VzcyA9IGZ1 bmN0aW9uKCkgeworICAgICAgICAgICAgZXZhbEFuZExvZygiZGIgPSByZXF1ZXN0LnJlc3VsdCIp OworICAgICAgICAgICAgcmVxdWVzdCA9IGV2YWxBbmRMb2coImRiLnNldFZlcnNpb24oJzEnKSIp OworICAgICAgICAgICAgcmVxdWVzdC5vbnN1Y2Nlc3MgPSBmdW5jdGlvbiAoKSB7CisgICAgICAg ICAgICAgICAgdHJhbnMgPSByZXF1ZXN0LnJlc3VsdDsKKyAgICAgICAgICAgICAgICBldmFsQW5k TG9nKCJkYi5jcmVhdGVPYmplY3RTdG9yZSgnc3RvcmUnKSIpOworICAgICAgICAgICAgICAgIHRy YW5zLm9uY29tcGxldGUgPSBzdGFydFRyYW5zYWN0aW9uOworICAgICAgICAgICAgfTsKKyAgICAg ICAgfTsKKyAgICB9OworfQorCitmdW5jdGlvbiBzdGFydFRyYW5zYWN0aW9uKCkgeworICAgIGRl YnVnKCIiKTsKKyAgICBkZWJ1ZygiU3RhcnQgYSB0cmFuc2FjdGlvbiBhZ2FpbnN0IHRoZSBmaXJz dCBkYXRhYmFzZToiKTsKKyAgICBldmFsQW5kTG9nKCJ0cmFucyA9IGRiLnRyYW5zYWN0aW9uKCdz dG9yZScsICdyZWFkb25seScpIik7CisgICAgZXZhbEFuZExvZygidHJhbnMub2JqZWN0U3RvcmUo J3N0b3JlJykuZ2V0KDApIik7CisKKyAgICBkZWJ1ZygiIik7CisgICAgZGVidWcoIkRlbGV0ZSBh IGRpZmZlcmVudCBkYXRhYmFzZToiKTsKKyAgICByZXF1ZXN0ID0gZXZhbEFuZExvZygiaW5kZXhl ZERCLmRlbGV0ZURhdGFiYXNlKGRibmFtZTIpIik7CisgICAgcmVxdWVzdC5vbmJsb2NrZWQgPSB1 bmV4cGVjdGVkQmxvY2tlZENhbGxiYWNrOworICAgIHJlcXVlc3Qub25lcnJvciA9IHVuZXhwZWN0 ZWRFcnJvckNhbGxiYWNrOworICAgIHJlcXVlc3Qub25zdWNjZXNzID0gZnVuY3Rpb24oKSB7Cisg ICAgICAgIHRlc3RQYXNzZWQoInN1Y2Nlc3MgZXZlbnQgd2FzIGZpcmVkIGF0IGRlbGV0ZSByZXF1 ZXN0Iik7CisgICAgfTsKKworICAgIHRyYW5zLm9uY29tcGxldGUgPSBmaW5pc2hKU1Rlc3Q7Cit9 CisKK3Rlc3QoKTsKKzwvc2NyaXB0PgorPHNjcmlwdCBzcmM9Ii4uLy4uL2Zhc3QvanMvcmVzb3Vy Y2VzL2pzLXRlc3QtcG9zdC5qcyI+PC9zY3JpcHQ+Cg==