90995 2012-07-11 11:23:20 -0700 IndexedDB: Verify internal "delete pending" flag on database 2012-07-12 10:11:15 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 jsbell jsbell alecflett dgrogan tony webkit.review.bot oldest_to_newest 666898 0 jsbell 2012-07-11 11:23:20 -0700 The IDB spec http://dvcs.w3.org/hg/IndexedDB/raw-file/tip/Overview.html says: Databases has a delete pending flag which is used during deletion. When a database is requested to be deleted the flag is set to true and all attempts at opening the database are stalled until the database can be deleted. This implies that calls open following delete should succeed, yielding a new database with the same name as the old one. Note that a delete may be delayed arbitrarily. We do queue up open calls after deletes, but it's unclear from code inspection what the open() call actually gets - pointer to the same IDBDatabaseBackendImpl object? A reset version? Is the backing store reference retained or dropped? 667174 1 151809 jsbell 2012-07-11 15:58:29 -0700 Created attachment 151809 Patch 667176 2 jsbell 2012-07-11 16:00:34 -0700 Turns out we already have the correct behavior here, so just adding a specific test for this. dgrogan@, alecflett@ - how's it look? 667190 3 151809 alecflett 2012-07-11 16:15:06 -0700 Comment on attachment 151809 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=151809&action=review > LayoutTests/storage/indexeddb/resources/database-deletepending-flag.js:33 > + shouldBe("String(connection.version)", "String(version)"); Why the "String()" ? Other than that, LGTM 667194 4 151809 jsbell 2012-07-11 16:19:23 -0700 Comment on attachment 151809 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=151809&action=review >> LayoutTests/storage/indexeddb/resources/database-deletepending-flag.js:33 >> + shouldBe("String(connection.version)", "String(version)"); > > Why the "String()" ? > > Other than that, LGTM I was being clever and had version be a number, but IDBDatabase.version will currently give back a string; I could do version = '10' instead and we can update this with all of the other tests. 667210 5 151815 jsbell 2012-07-11 16:58:38 -0700 Created attachment 151815 Patch 667211 6 jsbell 2012-07-11 16:58:57 -0700 tony@ - r? 667917 7 151815 webkit.review.bot 2012-07-12 10:11:02 -0700 Comment on attachment 151815 Patch Clearing flags on attachment: 151815 Committed r122475: <http://trac.webkit.org/changeset/122475> 667919 8 webkit.review.bot 2012-07-12 10:11:15 -0700 All reviewed patches have been landed. Closing bug. 151809 2012-07-11 15:58:29 -0700 2012-07-11 16:58:35 -0700 Patch bug-90995-20120711155829.patch text/plain 7274 jsbell U3VidmVyc2lvbiBSZXZpc2lvbjogMTIyMzA5CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFu Z2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggNzQ5YWNmNDk4NmY0MjZhNGRjMDEz MzZlYTllNGQyYmE4OTllNWRlMi4uNmIyZTUxNTgyYjk5NGYwNTdiYjBlOWRlYmMxZjRhYTgzZGRi ZWJhYyAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3Rz L0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDEyLTA3LTExICBKb3NodWEgQmVsbCAgPGpz YmVsbEBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgSW5kZXhlZERCOiBWZXJpZnkgaW50ZXJuYWwg ImRlbGV0ZSBwZW5kaW5nIiBmbGFnIG9uIGRhdGFiYXNlCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05MDk5NQorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIFZlcmlmeSB0aGUgYmVoYXZpb3IgcmVxdWlyZWQgYnkg dGhlIHNwZWMgdGhhdCBhbiBvcGVuKCkgZm9sbG93aW5nCisgICAgICAgIGEgZGVsZXRlRGF0YWJh c2UoKSBpcyBkZWxheWVkIGFuZCByZXR1cm5zIGEgbmV3IGRhdGFiYXNlLgorCisgICAgICAgICog c3RvcmFnZS9pbmRleGVkZGIvZGF0YWJhc2UtZGVsZXRlcGVuZGluZy1mbGFnLWV4cGVjdGVkLnR4 dDogQWRkZWQuCisgICAgICAgICogc3RvcmFnZS9pbmRleGVkZGIvZGF0YWJhc2UtZGVsZXRlcGVu ZGluZy1mbGFnLmh0bWw6IEFkZGVkLgorICAgICAgICAqIHN0b3JhZ2UvaW5kZXhlZGRiL3Jlc291 cmNlcy9kYXRhYmFzZS1kZWxldGVwZW5kaW5nLWZsYWcuanM6IEFkZGVkLgorICAgICAgICAodGVz dCk6CisgICAgICAgIChvcGVuQ29ubmVjdGlvbi5yZXF1ZXN0Lm9uc3VjY2Vzcy5yZXF1ZXN0Lm9u c3VjY2Vzcyk6CisgICAgICAgIChvcGVuQ29ubmVjdGlvbi5yZXF1ZXN0Lm9uc3VjY2Vzcyk6Cisg ICAgICAgIChvcGVuQ29ubmVjdGlvbik6CisgICAgICAgICh0ZXN0RGF0YWJhc2VEZWxldGUuY29u bmVjdGlvbi5vbnZlcnNpb25jaGFuZ2UpOgorICAgICAgICAodGVzdERhdGFiYXNlRGVsZXRlLmRl bGV0ZVJlcXVlc3Qub25ibG9ja2VkKToKKyAgICAgICAgKHRlc3REYXRhYmFzZURlbGV0ZS5kZWxl dGVSZXF1ZXN0Lm9uc3VjY2Vzcyk6CisgICAgICAgICh0ZXN0RGF0YWJhc2VEZWxldGUub3BlblJl cXVlc3Qub25zdWNjZXNzKToKKyAgICAgICAgKHRlc3REYXRhYmFzZURlbGV0ZSk6CisKIDIwMTIt MDctMTEgIFphbiBEb2JlcnNlayAgPHphbmRvYmVyc2VrQGdtYWlsLmNvbT4KIAogICAgICAgICBV bnJldmlld2VkIEdUSyBnYXJkZW5pbmcsIGFkZGluZyBhbiBpbWFnZSBleHBlY3RhdGlvbiBmb3Ig dGhlCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9zdG9yYWdlL2luZGV4ZWRkYi9kYXRhYmFzZS1k ZWxldGVwZW5kaW5nLWZsYWctZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvc3RvcmFnZS9pbmRl eGVkZGIvZGF0YWJhc2UtZGVsZXRlcGVuZGluZy1mbGFnLWV4cGVjdGVkLnR4dApuZXcgZmlsZSBt b2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw Li4xMTJiNjU0ZGFkNjVmMDVkN2E4OTg3ODk4YmIxYjFhNzdhZTUxOTE2Ci0tLSAvZGV2L251bGwK KysrIGIvTGF5b3V0VGVzdHMvc3RvcmFnZS9pbmRleGVkZGIvZGF0YWJhc2UtZGVsZXRlcGVuZGlu Zy1mbGFnLWV4cGVjdGVkLnR4dApAQCAtMCwwICsxLDQ5IEBACitUZXN0IEluZGV4ZWREQiBJREJE YXRhYmFzZSBpbnRlcm5hbCBkZWxldGUgcGVuZGluZyBmbGFnCisKK09uIHN1Y2Nlc3MsIHlvdSB3 aWxsIHNlZSBhIHNlcmllcyBvZiAiUEFTUyIgbWVzc2FnZXMsIGZvbGxvd2VkIGJ5ICJURVNUIENP TVBMRVRFIi4KKworCitpbmRleGVkREIgPSBzZWxmLmluZGV4ZWREQiB8fCBzZWxmLndlYmtpdElu ZGV4ZWREQiB8fCBzZWxmLm1vekluZGV4ZWREQiB8fCBzZWxmLm1zSW5kZXhlZERCIHx8IHNlbGYu T0luZGV4ZWREQjsKKworZGJuYW1lID0gc2VsZi5sb2NhdGlvbi5wYXRobmFtZQoraW5kZXhlZERC LmRlbGV0ZURhdGFiYXNlKGRibmFtZSkKKworT3BlbiBhIGNvbm5lY3Rpb24gYW5kIHNldCBhIHNl bnRpbmVsIHZlcnNpb246Cit2ZXJzaW9uID0gMTAKK3JlcXVlc3QgPSBpbmRleGVkREIub3Blbihk Ym5hbWUpCitjb25uZWN0aW9uID0gcmVxdWVzdC5yZXN1bHQKK3JlcXVlc3QgPSBjb25uZWN0aW9u LnNldFZlcnNpb24odmVyc2lvbikKK1BBU1MgU3RyaW5nKGNvbm5lY3Rpb24udmVyc2lvbikgaXMg U3RyaW5nKHZlcnNpb24pCitjb25uZWN0aW9uLmNyZWF0ZU9iamVjdFN0b3JlKCdzdG9yZScpCitQ QVNTIGNvbm5lY3Rpb24ub2JqZWN0U3RvcmVOYW1lcy5sZW5ndGggaXMgMQorCitJc3N1ZSBhIGRl bGV0ZSByZXF1ZXN0IGFnYWluc3QgdGhlIGRhdGFiYXNlIC0gc2hvdWxkIGJlIGJsb2NrZWQgYnkg dGhlIG9wZW4gY29ubmVjdGlvbjoKK2RlbGV0ZVJlcXVlc3QgPSBpbmRleGVkREIuZGVsZXRlRGF0 YWJhc2UoZGJuYW1lKQorc3RhdGUgPSAwCisKK09wZW4gYSBzZWNvbmQgY29ubmVjdGlvbiAtIHNo b3VsZCBiZSBkZWxheWVkOgorb3BlblJlcXVlc3QgPSBpbmRleGVkREIub3BlbihkYm5hbWUpCisK K2Nvbm5lY3Rpb24gcmVjZWl2ZWQgdmVyc2lvbmNoYW5nZSBldmVudCAtIGlnbm9yaW5nLgorUEFT UyArK3N0YXRlIGlzIDEKKworZGVsZXRlUmVxdWVzdCByZWNlaXZlZCBibG9ja2VkIGV2ZW50Lgor UEFTUyArK3N0YXRlIGlzIDIKK2Nvbm5lY3Rpb24uY2xvc2UoKQorZGVsZXRlUmVxdWVzdCBzaG91 bGQgbm93IGJlIHVuYmxvY2tlZC4KKworZGVsZXRlUmVxdWVzdCByZWNlaXZlZCBzdWNjZXNzIGV2 ZW50LgorUEFTUyArK3N0YXRlIGlzIDMKK29wZW5SZXF1ZXN0IHNob3VsZCBub3cgYmUgdW5ibG9j a2VkLgorCitQQVNTIG9wZW5SZXF1ZXN0IHJlY2VpdmVkIHN1Y2Nlc3MgZXZlbnQuCitQQVNTICsr c3RhdGUgaXMgNAorY29ubmVjdGlvbjIgPSBvcGVuUmVxdWVzdC5yZXN1bHQKK2Nvbm5lY3Rpb24y IHNob3VsZCByZWZlcmVuY2UgYSBkaWZmZXJlbnQgZGF0YWJhc2U6CitQQVNTIGNvbm5lY3Rpb24y LnZlcnNpb24gPT0gY29ubmVjdGlvbi52ZXJzaW9uIGlzIGZhbHNlCitQQVNTIGNvbm5lY3Rpb24y Lm9iamVjdFN0b3JlTmFtZXMubGVuZ3RoIGlzIDAKKworUEFTUyBzdWNjZXNzZnVsbHlQYXJzZWQg aXMgdHJ1ZQorCitURVNUIENPTVBMRVRFCisKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3N0b3Jh Z2UvaW5kZXhlZGRiL2RhdGFiYXNlLWRlbGV0ZXBlbmRpbmctZmxhZy5odG1sIGIvTGF5b3V0VGVz dHMvc3RvcmFnZS9pbmRleGVkZGIvZGF0YWJhc2UtZGVsZXRlcGVuZGluZy1mbGFnLmh0bWwKbmV3 IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMC4uNWU5MDA0ZmQwMjA0NDU2M2M2YzQ3M2M4MGE0MzIyZDExNDhiYTEwOAotLS0gL2Rl di9udWxsCisrKyBiL0xheW91dFRlc3RzL3N0b3JhZ2UvaW5kZXhlZGRiL2RhdGFiYXNlLWRlbGV0 ZXBlbmRpbmctZmxhZy5odG1sCkBAIC0wLDAgKzEsMTAgQEAKKzxodG1sPgorPGhlYWQ+Cis8c2Ny aXB0IHNyYz0iLi4vLi4vZmFzdC9qcy9yZXNvdXJjZXMvanMtdGVzdC1wcmUuanMiPjwvc2NyaXB0 PgorPHNjcmlwdCBzcmM9InJlc291cmNlcy9zaGFyZWQuanMiPjwvc2NyaXB0PgorPC9oZWFkPgor PGJvZHk+Cis8c2NyaXB0IHNyYz0icmVzb3VyY2VzL2RhdGFiYXNlLWRlbGV0ZXBlbmRpbmctZmxh Zy5qcyI+PC9zY3JpcHQ+Cis8c2NyaXB0IHNyYz0iLi4vLi4vZmFzdC9qcy9yZXNvdXJjZXMvanMt dGVzdC1wb3N0LmpzIj48L3NjcmlwdD4KKzwvYm9keT4KKzwvaHRtbD4KZGlmZiAtLWdpdCBhL0xh eW91dFRlc3RzL3N0b3JhZ2UvaW5kZXhlZGRiL3Jlc291cmNlcy9kYXRhYmFzZS1kZWxldGVwZW5k aW5nLWZsYWcuanMgYi9MYXlvdXRUZXN0cy9zdG9yYWdlL2luZGV4ZWRkYi9yZXNvdXJjZXMvZGF0 YWJhc2UtZGVsZXRlcGVuZGluZy1mbGFnLmpzCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjlmN2Y0MjUxMjlkMGJlYjA1 MzlmMDFkMjcxZDA1OWNlMGJhOTZkMjgKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9z dG9yYWdlL2luZGV4ZWRkYi9yZXNvdXJjZXMvZGF0YWJhc2UtZGVsZXRlcGVuZGluZy1mbGFnLmpz CkBAIC0wLDAgKzEsOTAgQEAKK2lmICh0aGlzLmltcG9ydFNjcmlwdHMpIHsKKyAgICBpbXBvcnRT Y3JpcHRzKCcuLi8uLi8uLi9mYXN0L2pzL3Jlc291cmNlcy9qcy10ZXN0LXByZS5qcycpOworICAg IGltcG9ydFNjcmlwdHMoJ3NoYXJlZC5qcycpOworfQorCitkZXNjcmlwdGlvbigiVGVzdCBJbmRl eGVkREIgSURCRGF0YWJhc2UgaW50ZXJuYWwgZGVsZXRlIHBlbmRpbmcgZmxhZyIpOworCitmdW5j dGlvbiB0ZXN0KCkKK3sKKyAgICByZW1vdmVWZW5kb3JQcmVmaXhlcygpOworCisgICAgZXZhbEFu ZExvZygiZGJuYW1lID0gc2VsZi5sb2NhdGlvbi5wYXRobmFtZSIpOworICAgIHJlcXVlc3QgPSBl dmFsQW5kTG9nKCJpbmRleGVkREIuZGVsZXRlRGF0YWJhc2UoZGJuYW1lKSIpOworICAgIHJlcXVl c3Qub25lcnJvciA9IHVuZXhwZWN0ZWRFcnJvckNhbGxiYWNrOworICAgIHJlcXVlc3Qub25zdWNj ZXNzID0gb3BlbkNvbm5lY3Rpb247Cit9CisKK2Z1bmN0aW9uIG9wZW5Db25uZWN0aW9uKCkKK3sK KyAgICBkZWJ1ZygiIik7CisgICAgZGVidWcoIk9wZW4gYSBjb25uZWN0aW9uIGFuZCBzZXQgYSBz ZW50aW5lbCB2ZXJzaW9uOiIpOworICAgIGV2YWxBbmRMb2coInZlcnNpb24gPSAxMCIpOworICAg IGV2YWxBbmRMb2coInJlcXVlc3QgPSBpbmRleGVkREIub3BlbihkYm5hbWUpIik7CisgICAgcmVx dWVzdC5vbmVycm9yID0gdW5leHBlY3RlZEVycm9yQ2FsbGJhY2s7CisgICAgcmVxdWVzdC5vbnN1 Y2Nlc3MgPSBmdW5jdGlvbigpIHsKKyAgICAgICAgZXZhbEFuZExvZygiY29ubmVjdGlvbiA9IHJl cXVlc3QucmVzdWx0Iik7CisgICAgICAgIGV2YWxBbmRMb2coInJlcXVlc3QgPSBjb25uZWN0aW9u LnNldFZlcnNpb24odmVyc2lvbikiKTsKKyAgICAgICAgcmVxdWVzdC5vbmVycm9yID0gdW5leHBl Y3RlZEVycm9yQ2FsbGJhY2s7CisgICAgICAgIHJlcXVlc3Qub25ibG9ja2VkID0gdW5leHBlY3Rl ZEJsb2NrZWRDYWxsYmFjazsKKyAgICAgICAgcmVxdWVzdC5vbnN1Y2Nlc3MgPSBmdW5jdGlvbigp IHsKKyAgICAgICAgICAgIHRyYW5zID0gcmVxdWVzdC5yZXN1bHQ7CisgICAgICAgICAgICB0cmFu cy5vbmFib3J0ID0gdW5leHBlY3RlZEFib3J0Q2FsbGJhY2s7CisgICAgICAgICAgICBzaG91bGRC ZSgiU3RyaW5nKGNvbm5lY3Rpb24udmVyc2lvbikiLCAiU3RyaW5nKHZlcnNpb24pIik7CisgICAg ICAgICAgICBldmFsQW5kTG9nKCJjb25uZWN0aW9uLmNyZWF0ZU9iamVjdFN0b3JlKCdzdG9yZScp Iik7CisgICAgICAgICAgICBzaG91bGRCZSgiY29ubmVjdGlvbi5vYmplY3RTdG9yZU5hbWVzLmxl bmd0aCIsICIxIik7CisgICAgICAgICAgICB0cmFucy5vbmNvbXBsZXRlID0gdGVzdERhdGFiYXNl RGVsZXRlOworICAgICAgICB9OworICAgIH07Cit9CisKK2Z1bmN0aW9uIHRlc3REYXRhYmFzZURl bGV0ZSgpCit7CisgICAgZGVidWcoIiIpOworICAgIGRlYnVnKCJJc3N1ZSBhIGRlbGV0ZSByZXF1 ZXN0IGFnYWluc3QgdGhlIGRhdGFiYXNlIC0gc2hvdWxkIGJlIGJsb2NrZWQgYnkgdGhlIG9wZW4g Y29ubmVjdGlvbjoiKTsKKyAgICBldmFsQW5kTG9nKCJkZWxldGVSZXF1ZXN0ID0gaW5kZXhlZERC LmRlbGV0ZURhdGFiYXNlKGRibmFtZSkiKTsKKyAgICBkZWxldGVSZXF1ZXN0Lm9uZXJyb3IgPSB1 bmV4cGVjdGVkRXJyb3JDYWxsYmFjazsKKyAgICBldmFsQW5kTG9nKCJzdGF0ZSA9IDAiKTsKKwor ICAgIGRlYnVnKCIiKTsKKyAgICBkZWJ1ZygiT3BlbiBhIHNlY29uZCBjb25uZWN0aW9uIC0gc2hv dWxkIGJlIGRlbGF5ZWQ6Iik7CisgICAgZXZhbEFuZExvZygib3BlblJlcXVlc3QgPSBpbmRleGVk REIub3BlbihkYm5hbWUpIik7CisgICAgb3BlblJlcXVlc3Qub25lcnJvciA9IHVuZXhwZWN0ZWRF cnJvckNhbGxiYWNrOworCisgICAgY29ubmVjdGlvbi5vbnZlcnNpb25jaGFuZ2UgPSBmdW5jdGlv bigpIHsKKyAgICAgICAgZGVidWcoIiIpOworICAgICAgICBkZWJ1ZygiY29ubmVjdGlvbiByZWNl aXZlZCB2ZXJzaW9uY2hhbmdlIGV2ZW50IC0gaWdub3JpbmcuIik7CisgICAgICAgIHNob3VsZEJl KCIrK3N0YXRlIiwgIjEiKTsKKyAgICB9OworCisgICAgZGVsZXRlUmVxdWVzdC5vbmJsb2NrZWQg PSBmdW5jdGlvbigpIHsKKyAgICAgICAgZGVidWcoIiIpOworICAgICAgICBkZWJ1ZygiZGVsZXRl UmVxdWVzdCByZWNlaXZlZCBibG9ja2VkIGV2ZW50LiIpOworICAgICAgICBzaG91bGRCZSgiKytz dGF0ZSIsICIyIik7CisgICAgICAgIGV2YWxBbmRMb2coImNvbm5lY3Rpb24uY2xvc2UoKSIpOwor ICAgICAgICBkZWJ1ZygiZGVsZXRlUmVxdWVzdCBzaG91bGQgbm93IGJlIHVuYmxvY2tlZC4iKTsK KyAgICB9OworCisgICAgZGVsZXRlUmVxdWVzdC5vbnN1Y2Nlc3MgPSBmdW5jdGlvbigpIHsKKyAg ICAgICAgZGVidWcoIiIpOworICAgICAgICBkZWJ1ZygiZGVsZXRlUmVxdWVzdCByZWNlaXZlZCBz dWNjZXNzIGV2ZW50LiIpOworICAgICAgICBzaG91bGRCZSgiKytzdGF0ZSIsICIzIik7CisgICAg ICAgIGRlYnVnKCJvcGVuUmVxdWVzdCBzaG91bGQgbm93IGJlIHVuYmxvY2tlZC4iKTsKKyAgICB9 OworCisgICAgb3BlblJlcXVlc3Qub25zdWNjZXNzID0gZnVuY3Rpb24oKSB7CisgICAgICAgIGRl YnVnKCIiKTsKKyAgICAgICAgdGVzdFBhc3NlZCgib3BlblJlcXVlc3QgcmVjZWl2ZWQgc3VjY2Vz cyBldmVudC4iKTsKKyAgICAgICAgc2hvdWxkQmUoIisrc3RhdGUiLCAiNCIpOworICAgICAgICBl dmFsQW5kTG9nKCJjb25uZWN0aW9uMiA9IG9wZW5SZXF1ZXN0LnJlc3VsdCIpOworCisgICAgICAg IGRlYnVnKCJjb25uZWN0aW9uMiBzaG91bGQgcmVmZXJlbmNlIGEgZGlmZmVyZW50IGRhdGFiYXNl OiIpOworICAgICAgICBzaG91bGRCZUZhbHNlKCJjb25uZWN0aW9uMi52ZXJzaW9uID09IGNvbm5l Y3Rpb24udmVyc2lvbiIpOworICAgICAgICBzaG91bGRCZSgiY29ubmVjdGlvbjIub2JqZWN0U3Rv cmVOYW1lcy5sZW5ndGgiLCAiMCIpOworCisgICAgICAgIGRlYnVnKCIiKTsKKyAgICAgICAgZmlu aXNoSlNUZXN0KCk7CisgICAgfTsKK30KKwordGVzdCgpOwo= 151815 2012-07-11 16:58:38 -0700 2012-07-12 10:11:02 -0700 Patch bug-90995-20120711165837.patch text/plain 7246 jsbell U3VidmVyc2lvbiBSZXZpc2lvbjogMTIyMzA5CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFu Z2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggNzQ5YWNmNDk4NmY0MjZhNGRjMDEz MzZlYTllNGQyYmE4OTllNWRlMi4uNmIyZTUxNTgyYjk5NGYwNTdiYjBlOWRlYmMxZjRhYTgzZGRi ZWJhYyAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3Rz L0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDEyLTA3LTExICBKb3NodWEgQmVsbCAgPGpz YmVsbEBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgSW5kZXhlZERCOiBWZXJpZnkgaW50ZXJuYWwg ImRlbGV0ZSBwZW5kaW5nIiBmbGFnIG9uIGRhdGFiYXNlCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05MDk5NQorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIFZlcmlmeSB0aGUgYmVoYXZpb3IgcmVxdWlyZWQgYnkg dGhlIHNwZWMgdGhhdCBhbiBvcGVuKCkgZm9sbG93aW5nCisgICAgICAgIGEgZGVsZXRlRGF0YWJh c2UoKSBpcyBkZWxheWVkIGFuZCByZXR1cm5zIGEgbmV3IGRhdGFiYXNlLgorCisgICAgICAgICog c3RvcmFnZS9pbmRleGVkZGIvZGF0YWJhc2UtZGVsZXRlcGVuZGluZy1mbGFnLWV4cGVjdGVkLnR4 dDogQWRkZWQuCisgICAgICAgICogc3RvcmFnZS9pbmRleGVkZGIvZGF0YWJhc2UtZGVsZXRlcGVu ZGluZy1mbGFnLmh0bWw6IEFkZGVkLgorICAgICAgICAqIHN0b3JhZ2UvaW5kZXhlZGRiL3Jlc291 cmNlcy9kYXRhYmFzZS1kZWxldGVwZW5kaW5nLWZsYWcuanM6IEFkZGVkLgorICAgICAgICAodGVz dCk6CisgICAgICAgIChvcGVuQ29ubmVjdGlvbi5yZXF1ZXN0Lm9uc3VjY2Vzcy5yZXF1ZXN0Lm9u c3VjY2Vzcyk6CisgICAgICAgIChvcGVuQ29ubmVjdGlvbi5yZXF1ZXN0Lm9uc3VjY2Vzcyk6Cisg ICAgICAgIChvcGVuQ29ubmVjdGlvbik6CisgICAgICAgICh0ZXN0RGF0YWJhc2VEZWxldGUuY29u bmVjdGlvbi5vbnZlcnNpb25jaGFuZ2UpOgorICAgICAgICAodGVzdERhdGFiYXNlRGVsZXRlLmRl bGV0ZVJlcXVlc3Qub25ibG9ja2VkKToKKyAgICAgICAgKHRlc3REYXRhYmFzZURlbGV0ZS5kZWxl dGVSZXF1ZXN0Lm9uc3VjY2Vzcyk6CisgICAgICAgICh0ZXN0RGF0YWJhc2VEZWxldGUub3BlblJl cXVlc3Qub25zdWNjZXNzKToKKyAgICAgICAgKHRlc3REYXRhYmFzZURlbGV0ZSk6CisKIDIwMTIt MDctMTEgIFphbiBEb2JlcnNlayAgPHphbmRvYmVyc2VrQGdtYWlsLmNvbT4KIAogICAgICAgICBV bnJldmlld2VkIEdUSyBnYXJkZW5pbmcsIGFkZGluZyBhbiBpbWFnZSBleHBlY3RhdGlvbiBmb3Ig dGhlCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9zdG9yYWdlL2luZGV4ZWRkYi9kYXRhYmFzZS1k ZWxldGVwZW5kaW5nLWZsYWctZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvc3RvcmFnZS9pbmRl eGVkZGIvZGF0YWJhc2UtZGVsZXRlcGVuZGluZy1mbGFnLWV4cGVjdGVkLnR4dApuZXcgZmlsZSBt b2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw Li44MmUyMDUwM2VhZTAwN2EwMzE3NmNlMGE1YmU2YWNkMzc0NjEyNmM2Ci0tLSAvZGV2L251bGwK KysrIGIvTGF5b3V0VGVzdHMvc3RvcmFnZS9pbmRleGVkZGIvZGF0YWJhc2UtZGVsZXRlcGVuZGlu Zy1mbGFnLWV4cGVjdGVkLnR4dApAQCAtMCwwICsxLDQ5IEBACitUZXN0IEluZGV4ZWREQiBJREJE YXRhYmFzZSBpbnRlcm5hbCBkZWxldGUgcGVuZGluZyBmbGFnCisKK09uIHN1Y2Nlc3MsIHlvdSB3 aWxsIHNlZSBhIHNlcmllcyBvZiAiUEFTUyIgbWVzc2FnZXMsIGZvbGxvd2VkIGJ5ICJURVNUIENP TVBMRVRFIi4KKworCitpbmRleGVkREIgPSBzZWxmLmluZGV4ZWREQiB8fCBzZWxmLndlYmtpdElu ZGV4ZWREQiB8fCBzZWxmLm1vekluZGV4ZWREQiB8fCBzZWxmLm1zSW5kZXhlZERCIHx8IHNlbGYu T0luZGV4ZWREQjsKKworZGJuYW1lID0gc2VsZi5sb2NhdGlvbi5wYXRobmFtZQoraW5kZXhlZERC LmRlbGV0ZURhdGFiYXNlKGRibmFtZSkKKworT3BlbiBhIGNvbm5lY3Rpb24gYW5kIHNldCBhIHNl bnRpbmVsIHZlcnNpb246Cit2ZXJzaW9uID0gJzEwJworcmVxdWVzdCA9IGluZGV4ZWREQi5vcGVu KGRibmFtZSkKK2Nvbm5lY3Rpb24gPSByZXF1ZXN0LnJlc3VsdAorcmVxdWVzdCA9IGNvbm5lY3Rp b24uc2V0VmVyc2lvbih2ZXJzaW9uKQorUEFTUyBjb25uZWN0aW9uLnZlcnNpb24gaXMgdmVyc2lv bgorY29ubmVjdGlvbi5jcmVhdGVPYmplY3RTdG9yZSgnc3RvcmUnKQorUEFTUyBjb25uZWN0aW9u Lm9iamVjdFN0b3JlTmFtZXMubGVuZ3RoIGlzIDEKKworSXNzdWUgYSBkZWxldGUgcmVxdWVzdCBh Z2FpbnN0IHRoZSBkYXRhYmFzZSAtIHNob3VsZCBiZSBibG9ja2VkIGJ5IHRoZSBvcGVuIGNvbm5l Y3Rpb246CitkZWxldGVSZXF1ZXN0ID0gaW5kZXhlZERCLmRlbGV0ZURhdGFiYXNlKGRibmFtZSkK K3N0YXRlID0gMAorCitPcGVuIGEgc2Vjb25kIGNvbm5lY3Rpb24gLSBzaG91bGQgYmUgZGVsYXll ZDoKK29wZW5SZXF1ZXN0ID0gaW5kZXhlZERCLm9wZW4oZGJuYW1lKQorCitjb25uZWN0aW9uIHJl Y2VpdmVkIHZlcnNpb25jaGFuZ2UgZXZlbnQgLSBpZ25vcmluZy4KK1BBU1MgKytzdGF0ZSBpcyAx CisKK2RlbGV0ZVJlcXVlc3QgcmVjZWl2ZWQgYmxvY2tlZCBldmVudC4KK1BBU1MgKytzdGF0ZSBp cyAyCitjb25uZWN0aW9uLmNsb3NlKCkKK2RlbGV0ZVJlcXVlc3Qgc2hvdWxkIG5vdyBiZSB1bmJs b2NrZWQuCisKK2RlbGV0ZVJlcXVlc3QgcmVjZWl2ZWQgc3VjY2VzcyBldmVudC4KK1BBU1MgKytz dGF0ZSBpcyAzCitvcGVuUmVxdWVzdCBzaG91bGQgbm93IGJlIHVuYmxvY2tlZC4KKworUEFTUyBv cGVuUmVxdWVzdCByZWNlaXZlZCBzdWNjZXNzIGV2ZW50LgorUEFTUyArK3N0YXRlIGlzIDQKK2Nv bm5lY3Rpb24yID0gb3BlblJlcXVlc3QucmVzdWx0Citjb25uZWN0aW9uMiBzaG91bGQgcmVmZXJl bmNlIGEgZGlmZmVyZW50IGRhdGFiYXNlOgorUEFTUyBjb25uZWN0aW9uMi52ZXJzaW9uID09IGNv bm5lY3Rpb24udmVyc2lvbiBpcyBmYWxzZQorUEFTUyBjb25uZWN0aW9uMi5vYmplY3RTdG9yZU5h bWVzLmxlbmd0aCBpcyAwCisKK1BBU1Mgc3VjY2Vzc2Z1bGx5UGFyc2VkIGlzIHRydWUKKworVEVT VCBDT01QTEVURQorCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9zdG9yYWdlL2luZGV4ZWRkYi9k YXRhYmFzZS1kZWxldGVwZW5kaW5nLWZsYWcuaHRtbCBiL0xheW91dFRlc3RzL3N0b3JhZ2UvaW5k ZXhlZGRiL2RhdGFiYXNlLWRlbGV0ZXBlbmRpbmctZmxhZy5odG1sCm5ldyBmaWxlIG1vZGUgMTAw NjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjVlOTAw NGZkMDIwNDQ1NjNjNmM0NzNjODBhNDMyMmQxMTQ4YmExMDgKLS0tIC9kZXYvbnVsbAorKysgYi9M YXlvdXRUZXN0cy9zdG9yYWdlL2luZGV4ZWRkYi9kYXRhYmFzZS1kZWxldGVwZW5kaW5nLWZsYWcu aHRtbApAQCAtMCwwICsxLDEwIEBACis8aHRtbD4KKzxoZWFkPgorPHNjcmlwdCBzcmM9Ii4uLy4u L2Zhc3QvanMvcmVzb3VyY2VzL2pzLXRlc3QtcHJlLmpzIj48L3NjcmlwdD4KKzxzY3JpcHQgc3Jj PSJyZXNvdXJjZXMvc2hhcmVkLmpzIj48L3NjcmlwdD4KKzwvaGVhZD4KKzxib2R5PgorPHNjcmlw dCBzcmM9InJlc291cmNlcy9kYXRhYmFzZS1kZWxldGVwZW5kaW5nLWZsYWcuanMiPjwvc2NyaXB0 PgorPHNjcmlwdCBzcmM9Ii4uLy4uL2Zhc3QvanMvcmVzb3VyY2VzL2pzLXRlc3QtcG9zdC5qcyI+ PC9zY3JpcHQ+Cis8L2JvZHk+Cis8L2h0bWw+CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9zdG9y YWdlL2luZGV4ZWRkYi9yZXNvdXJjZXMvZGF0YWJhc2UtZGVsZXRlcGVuZGluZy1mbGFnLmpzIGIv TGF5b3V0VGVzdHMvc3RvcmFnZS9pbmRleGVkZGIvcmVzb3VyY2VzL2RhdGFiYXNlLWRlbGV0ZXBl bmRpbmctZmxhZy5qcwpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi5lMWFjMTA4NDU1YTg2M2MxNTNiNzlhMzMzZDA0ZmVj YzI2Mzg4N2U5Ci0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvc3RvcmFnZS9pbmRleGVk ZGIvcmVzb3VyY2VzL2RhdGFiYXNlLWRlbGV0ZXBlbmRpbmctZmxhZy5qcwpAQCAtMCwwICsxLDkw IEBACitpZiAodGhpcy5pbXBvcnRTY3JpcHRzKSB7CisgICAgaW1wb3J0U2NyaXB0cygnLi4vLi4v Li4vZmFzdC9qcy9yZXNvdXJjZXMvanMtdGVzdC1wcmUuanMnKTsKKyAgICBpbXBvcnRTY3JpcHRz KCdzaGFyZWQuanMnKTsKK30KKworZGVzY3JpcHRpb24oIlRlc3QgSW5kZXhlZERCIElEQkRhdGFi YXNlIGludGVybmFsIGRlbGV0ZSBwZW5kaW5nIGZsYWciKTsKKworZnVuY3Rpb24gdGVzdCgpCit7 CisgICAgcmVtb3ZlVmVuZG9yUHJlZml4ZXMoKTsKKworICAgIGV2YWxBbmRMb2coImRibmFtZSA9 IHNlbGYubG9jYXRpb24ucGF0aG5hbWUiKTsKKyAgICByZXF1ZXN0ID0gZXZhbEFuZExvZygiaW5k ZXhlZERCLmRlbGV0ZURhdGFiYXNlKGRibmFtZSkiKTsKKyAgICByZXF1ZXN0Lm9uZXJyb3IgPSB1 bmV4cGVjdGVkRXJyb3JDYWxsYmFjazsKKyAgICByZXF1ZXN0Lm9uc3VjY2VzcyA9IG9wZW5Db25u ZWN0aW9uOworfQorCitmdW5jdGlvbiBvcGVuQ29ubmVjdGlvbigpCit7CisgICAgZGVidWcoIiIp OworICAgIGRlYnVnKCJPcGVuIGEgY29ubmVjdGlvbiBhbmQgc2V0IGEgc2VudGluZWwgdmVyc2lv bjoiKTsKKyAgICBldmFsQW5kTG9nKCJ2ZXJzaW9uID0gJzEwJyIpOworICAgIGV2YWxBbmRMb2co InJlcXVlc3QgPSBpbmRleGVkREIub3BlbihkYm5hbWUpIik7CisgICAgcmVxdWVzdC5vbmVycm9y ID0gdW5leHBlY3RlZEVycm9yQ2FsbGJhY2s7CisgICAgcmVxdWVzdC5vbnN1Y2Nlc3MgPSBmdW5j dGlvbigpIHsKKyAgICAgICAgZXZhbEFuZExvZygiY29ubmVjdGlvbiA9IHJlcXVlc3QucmVzdWx0 Iik7CisgICAgICAgIGV2YWxBbmRMb2coInJlcXVlc3QgPSBjb25uZWN0aW9uLnNldFZlcnNpb24o dmVyc2lvbikiKTsKKyAgICAgICAgcmVxdWVzdC5vbmVycm9yID0gdW5leHBlY3RlZEVycm9yQ2Fs bGJhY2s7CisgICAgICAgIHJlcXVlc3Qub25ibG9ja2VkID0gdW5leHBlY3RlZEJsb2NrZWRDYWxs YmFjazsKKyAgICAgICAgcmVxdWVzdC5vbnN1Y2Nlc3MgPSBmdW5jdGlvbigpIHsKKyAgICAgICAg ICAgIHRyYW5zID0gcmVxdWVzdC5yZXN1bHQ7CisgICAgICAgICAgICB0cmFucy5vbmFib3J0ID0g dW5leHBlY3RlZEFib3J0Q2FsbGJhY2s7CisgICAgICAgICAgICBzaG91bGRCZSgiY29ubmVjdGlv bi52ZXJzaW9uIiwgInZlcnNpb24iKTsKKyAgICAgICAgICAgIGV2YWxBbmRMb2coImNvbm5lY3Rp b24uY3JlYXRlT2JqZWN0U3RvcmUoJ3N0b3JlJykiKTsKKyAgICAgICAgICAgIHNob3VsZEJlKCJj b25uZWN0aW9uLm9iamVjdFN0b3JlTmFtZXMubGVuZ3RoIiwgIjEiKTsKKyAgICAgICAgICAgIHRy YW5zLm9uY29tcGxldGUgPSB0ZXN0RGF0YWJhc2VEZWxldGU7CisgICAgICAgIH07CisgICAgfTsK K30KKworZnVuY3Rpb24gdGVzdERhdGFiYXNlRGVsZXRlKCkKK3sKKyAgICBkZWJ1ZygiIik7Cisg ICAgZGVidWcoIklzc3VlIGEgZGVsZXRlIHJlcXVlc3QgYWdhaW5zdCB0aGUgZGF0YWJhc2UgLSBz aG91bGQgYmUgYmxvY2tlZCBieSB0aGUgb3BlbiBjb25uZWN0aW9uOiIpOworICAgIGV2YWxBbmRM b2coImRlbGV0ZVJlcXVlc3QgPSBpbmRleGVkREIuZGVsZXRlRGF0YWJhc2UoZGJuYW1lKSIpOwor ICAgIGRlbGV0ZVJlcXVlc3Qub25lcnJvciA9IHVuZXhwZWN0ZWRFcnJvckNhbGxiYWNrOworICAg IGV2YWxBbmRMb2coInN0YXRlID0gMCIpOworCisgICAgZGVidWcoIiIpOworICAgIGRlYnVnKCJP cGVuIGEgc2Vjb25kIGNvbm5lY3Rpb24gLSBzaG91bGQgYmUgZGVsYXllZDoiKTsKKyAgICBldmFs QW5kTG9nKCJvcGVuUmVxdWVzdCA9IGluZGV4ZWREQi5vcGVuKGRibmFtZSkiKTsKKyAgICBvcGVu UmVxdWVzdC5vbmVycm9yID0gdW5leHBlY3RlZEVycm9yQ2FsbGJhY2s7CisKKyAgICBjb25uZWN0 aW9uLm9udmVyc2lvbmNoYW5nZSA9IGZ1bmN0aW9uKCkgeworICAgICAgICBkZWJ1ZygiIik7Cisg ICAgICAgIGRlYnVnKCJjb25uZWN0aW9uIHJlY2VpdmVkIHZlcnNpb25jaGFuZ2UgZXZlbnQgLSBp Z25vcmluZy4iKTsKKyAgICAgICAgc2hvdWxkQmUoIisrc3RhdGUiLCAiMSIpOworICAgIH07CisK KyAgICBkZWxldGVSZXF1ZXN0Lm9uYmxvY2tlZCA9IGZ1bmN0aW9uKCkgeworICAgICAgICBkZWJ1 ZygiIik7CisgICAgICAgIGRlYnVnKCJkZWxldGVSZXF1ZXN0IHJlY2VpdmVkIGJsb2NrZWQgZXZl bnQuIik7CisgICAgICAgIHNob3VsZEJlKCIrK3N0YXRlIiwgIjIiKTsKKyAgICAgICAgZXZhbEFu ZExvZygiY29ubmVjdGlvbi5jbG9zZSgpIik7CisgICAgICAgIGRlYnVnKCJkZWxldGVSZXF1ZXN0 IHNob3VsZCBub3cgYmUgdW5ibG9ja2VkLiIpOworICAgIH07CisKKyAgICBkZWxldGVSZXF1ZXN0 Lm9uc3VjY2VzcyA9IGZ1bmN0aW9uKCkgeworICAgICAgICBkZWJ1ZygiIik7CisgICAgICAgIGRl YnVnKCJkZWxldGVSZXF1ZXN0IHJlY2VpdmVkIHN1Y2Nlc3MgZXZlbnQuIik7CisgICAgICAgIHNo b3VsZEJlKCIrK3N0YXRlIiwgIjMiKTsKKyAgICAgICAgZGVidWcoIm9wZW5SZXF1ZXN0IHNob3Vs ZCBub3cgYmUgdW5ibG9ja2VkLiIpOworICAgIH07CisKKyAgICBvcGVuUmVxdWVzdC5vbnN1Y2Nl c3MgPSBmdW5jdGlvbigpIHsKKyAgICAgICAgZGVidWcoIiIpOworICAgICAgICB0ZXN0UGFzc2Vk KCJvcGVuUmVxdWVzdCByZWNlaXZlZCBzdWNjZXNzIGV2ZW50LiIpOworICAgICAgICBzaG91bGRC ZSgiKytzdGF0ZSIsICI0Iik7CisgICAgICAgIGV2YWxBbmRMb2coImNvbm5lY3Rpb24yID0gb3Bl blJlcXVlc3QucmVzdWx0Iik7CisKKyAgICAgICAgZGVidWcoImNvbm5lY3Rpb24yIHNob3VsZCBy ZWZlcmVuY2UgYSBkaWZmZXJlbnQgZGF0YWJhc2U6Iik7CisgICAgICAgIHNob3VsZEJlRmFsc2Uo ImNvbm5lY3Rpb24yLnZlcnNpb24gPT0gY29ubmVjdGlvbi52ZXJzaW9uIik7CisgICAgICAgIHNo b3VsZEJlKCJjb25uZWN0aW9uMi5vYmplY3RTdG9yZU5hbWVzLmxlbmd0aCIsICIwIik7CisKKyAg ICAgICAgZGVidWcoIiIpOworICAgICAgICBmaW5pc2hKU1Rlc3QoKTsKKyAgICB9OworfQorCit0 ZXN0KCk7Cg==