99486 2012-10-16 11:43:44 -0700 IndexedDB: Closing connection in upgradeneeded should result in error event 2012-10-17 16:51:12 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 jsbell jsbell alecflett dgrogan tony webkit.review.bot oldest_to_newest 743363 0 jsbell 2012-10-16 11:43:44 -0700 IndexedDB: Closing connection in upgradeneeded should result in error event 743374 1 168991 jsbell 2012-10-16 11:47:27 -0700 Created attachment 168991 Patch 743379 2 jsbell 2012-10-16 11:49:16 -0700 This is a weird one. I think the behavior is more correct with this patch (and the updated test looks more correct), but I'm still feeling iffy about whether logic like this should go in enqueue vs. dispatch. 743652 3 168991 dgrogan 2012-10-16 15:52:11 -0700 Comment on attachment 168991 Patch LGTM In the chromium bug you mentioned that this might just be postponing the flakiness but I can't see how failures would occur after this patch. 743678 4 jsbell 2012-10-16 16:26:26 -0700 (In reply to comment #3) > In the chromium bug you mentioned that this might just be postponing the flakiness but I can't see how failures would occur after this patch. Yeah, I agree - I don't recall what edge cases I might have been thinking of. As discussed offline, a more "elegant" approach than this patch would be to have the "complete" event dispatch send a message to the browser to unblock the success/error event, but this patch should have the equivalent from user script. 743723 5 168991 jsbell 2012-10-16 17:14:15 -0700 Comment on attachment 168991 Patch Actually, seeing some tests fail locally that may do an open and never see a success or an error. 744716 6 169279 jsbell 2012-10-17 15:43:22 -0700 Created attachment 169279 Patch 744719 7 jsbell 2012-10-17 15:44:55 -0700 (In reply to comment #5) > Actually, seeing some tests fail locally that may do an open and never see a success or an error. Whoops, that was a false alarm - I was running NRWT with a manually set and very low timeout. tony@ - r? 744790 8 169279 webkit.review.bot 2012-10-17 16:51:08 -0700 Comment on attachment 169279 Patch Clearing flags on attachment: 169279 Committed r131668: <http://trac.webkit.org/changeset/131668> 744791 9 webkit.review.bot 2012-10-17 16:51:12 -0700 All reviewed patches have been landed. Closing bug. 168991 2012-10-16 11:47:27 -0700 2012-10-17 15:43:21 -0700 Patch bug-99486-20121016114616.patch text/plain 7306 jsbell U3VidmVyc2lvbiBSZXZpc2lvbjogMTMxNDIxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjJjYzkxOWQ3M2M5ZDU3 YmExOGVkZmM2OWExNDMwYmQxZjJkYjgyYi4uZmVlZmRkMWE5ZjBlN2QxM2MzNGZjNzBjZTJjYTcy NTVhNjI3MDY5NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDEyLTEwLTE2ICBKb3No dWEgQmVsbCAgPGpzYmVsbEBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgSW5kZXhlZERCOiBDbG9z aW5nIGNvbm5lY3Rpb24gaW4gdXBncmFkZW5lZWRlZCBzaG91bGQgcmVzdWx0IGluIGVycm9yIGV2 ZW50CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05OTQ4 NgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoZSBJ REIgc3BlYyByZXF1aXJlcyB0aGF0ICIuLi5pZiBjb25uZWN0aW9uIGlzIGNsb3NlZCwgcmV0dXJu IGEgRE9NRXJyb3Igb2YgdHlwZSBBYm9ydEVycm9yIi4KKyAgICAgICAgVGhpcyB3YXMgYmVpbmcg aGFuZGxlZCBkdXJpbmcgdGhlICJlbnF1ZXVlIiBwaGFzZSwgd2hpY2ggd2FzIHRvbyBlYXJseSBl aXRoZXIgZm9yIHN5bmNocm9ub3VzbHkKKyAgICAgICAgZXhlY3V0aW5nIHNjcmlwdHMgb3IgYXN5 bmNocm9ub3VzIG1lc3NhZ2luZyBpbiBtdWx0aXByb2Nlc3MgcG9ydHMgKGNyYnVnLmNvbS8xNTA2 OTEpLiBNb3ZlIHRoZQorICAgICAgICBsb2dpYyB0byB0aGUgImRpc3BhdGNoIiBwaGFzZS4KKwor ICAgICAgICBUZXN0OiBzdG9yYWdlL2luZGV4ZWRkYi9pbnR2ZXJzaW9uLWNsb3NlLWluLW9uY29t cGxldGUuaHRtbAorCisgICAgICAgICogTW9kdWxlcy9pbmRleGVkZGIvSURCT3BlbkRCUmVxdWVz dC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJREJPcGVuREJSZXF1ZXN0OjpvblN1Y2Nlc3MpOiBN b3ZlIHN1Y2Nlc3MgdG8gZXJyb3IgbW9ycGhpbmcgZnJvbSBoZXJlLi4uCisgICAgICAgIChXZWJD b3JlOjpJREJPcGVuREJSZXF1ZXN0OjpkaXNwYXRjaEV2ZW50KTogVG8gaGVyZS4KKyAgICAgICAg KiBNb2R1bGVzL2luZGV4ZWRkYi9JREJPcGVuREJSZXF1ZXN0Lmg6CisgICAgICAgIChJREJPcGVu REJSZXF1ZXN0KToKKwogMjAxMi0xMC0xNSAgS2VudCBUYW11cmEgIDx0a2VudEBjaHJvbWl1bS5v cmc+CiAKICAgICAgICAgRml4IHNvbWUgYXBwZWFyYW5jZSBnbGl0Y2hlcyBvZiBtdWx0aXBsZSBm aWVsZHMgaW5wdXQgZWxlbWVudHMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMv aW5kZXhlZGRiL0lEQk9wZW5EQlJlcXVlc3QuY3BwIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9p bmRleGVkZGIvSURCT3BlbkRCUmVxdWVzdC5jcHAKaW5kZXggNzk5MTJkYmQxYjUwMTU2OThjZjU2 NWYxMGRhZGE0ZmUxYzA0ZTc4Ni4uZTA3MGI4YmQ3NmRiMDk2MjM4ZGNiMGIzNTg1ZjhhZWU0Nzc3 NDFjYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvSURCT3Bl bkRCUmVxdWVzdC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvSURC T3BlbkRCUmVxdWVzdC5jcHAKQEAgLTExNCwxNSArMTE0LDYgQEAgdm9pZCBJREJPcGVuREJSZXF1 ZXN0OjpvblN1Y2Nlc3MoUGFzc1JlZlB0cjxJREJEYXRhYmFzZUJhY2tlbmRJbnRlcmZhY2U+IGJh Y2tlbmQKICAgICAgICAgaWRiRGF0YWJhc2UgPSBtX3Jlc3VsdC0+aWRiRGF0YWJhc2UoKTsKICAg ICAgICAgQVNTRVJUKGlkYkRhdGFiYXNlKTsKICAgICAgICAgQVNTRVJUKCFtX2RhdGFiYXNlQ2Fs bGJhY2tzKTsKLQotICAgICAgICAvLyBJZiB0aGUgY29ubmVjdGlvbiBjbG9zZWQgYmV0d2VlbiBv blVwZ3JhZGVOZWVkZWQgYW5kIG9uU3VjY2VzcywgYW4gZXJyb3IKLSAgICAgICAgLy8gc2hvdWxk IGJlIGZpcmVkIGluc3RlYWQgb2Ygc3VjY2Vzcy4gVGhlIGJhY2stZW5kIG1heSBub3QgYmUgYXdh cmUgb2YKLSAgICAgICAgLy8gdGhlIGNsb3Npbmcgc3RhdGUgaWYgdGhlIGV2ZW50cyBhcmUgYXN5 bmNocm9ub3VzbHkgZGVsaXZlcmVkLgotICAgICAgICBpZiAoaWRiRGF0YWJhc2UtPmlzQ2xvc2VQ ZW5kaW5nKCkpIHsKLSAgICAgICAgICAgIG1fcmVzdWx0LmNsZWFyKCk7Ci0gICAgICAgICAgICBv bkVycm9yKElEQkRhdGFiYXNlRXJyb3I6OmNyZWF0ZShJREJEYXRhYmFzZUV4Y2VwdGlvbjo6SURC X0FCT1JUX0VSUiwgIlRoZSBjb25uZWN0aW9uIHdhcyBjbG9zZWQuIikpOwotICAgICAgICAgICAg cmV0dXJuOwotICAgICAgICB9CiAgICAgfSBlbHNlIHsKICAgICAgICAgQVNTRVJUKG1fZGF0YWJh c2VDYWxsYmFja3MpOwogICAgICAgICBpZGJEYXRhYmFzZSA9IElEQkRhdGFiYXNlOjpjcmVhdGUo c2NyaXB0RXhlY3V0aW9uQ29udGV4dCgpLCBiYWNrZW5kLCBtX2RhdGFiYXNlQ2FsbGJhY2tzKTsK QEAgLTE0Myw2ICsxMzQsMTggQEAgYm9vbCBJREJPcGVuREJSZXF1ZXN0OjpzaG91bGRFbnF1ZXVl RXZlbnQoKSBjb25zdAogICAgIHJldHVybiB0cnVlOwogfQogCitib29sIElEQk9wZW5EQlJlcXVl c3Q6OmRpc3BhdGNoRXZlbnQoUGFzc1JlZlB0cjxFdmVudD4gZXZlbnQpCit7CisgICAgLy8gSWYg dGhlIGNvbm5lY3Rpb24gY2xvc2VkIGJldHdlZW4gb25VcGdyYWRlTmVlZGVkIGFuZCB0aGUgZGVs aXZlcnkgb2YgdGhlICJzdWNjZXNzIiBldmVudCwKKyAgICAvLyBhbiAiZXJyb3IiIGV2ZW50IHNo b3VsZCBiZSBmaXJlZCBpbnN0ZWFkLgorICAgIGlmIChldmVudC0+dHlwZSgpID09IGV2ZW50TmFt ZXMoKS5zdWNjZXNzRXZlbnQgJiYgbV9yZXN1bHQtPmlkYkRhdGFiYXNlKCktPmlzQ2xvc2VQZW5k aW5nKCkpIHsKKyAgICAgICAgbV9yZXN1bHQuY2xlYXIoKTsKKyAgICAgICAgb25FcnJvcihJREJE YXRhYmFzZUVycm9yOjpjcmVhdGUoSURCRGF0YWJhc2VFeGNlcHRpb246OklEQl9BQk9SVF9FUlIs ICJUaGUgY29ubmVjdGlvbiB3YXMgY2xvc2VkLiIpKTsKKyAgICAgICAgcmV0dXJuIGZhbHNlOwor ICAgIH0KKworICAgIHJldHVybiBJREJSZXF1ZXN0OjpkaXNwYXRjaEV2ZW50KGV2ZW50KTsKK30K IAogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9N b2R1bGVzL2luZGV4ZWRkYi9JREJPcGVuREJSZXF1ZXN0LmggYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1 bGVzL2luZGV4ZWRkYi9JREJPcGVuREJSZXF1ZXN0LmgKaW5kZXggMWU4NGI1NGM5ZGE1MDdhZjU1 MTljODA4ODk4NDZkNDJlZmRlZDQ5Zi4uYTU1MTQyNjRlMzRiMjBlNjhkZjRiNzZiNjhlYWQxY2Q4 MGY4ZjA5MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvSURC T3BlbkRCUmVxdWVzdC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL0lE Qk9wZW5EQlJlcXVlc3QuaApAQCAtNDcsNiArNDcsNyBAQCBwdWJsaWM6CiAKICAgICAvLyBFdmVu dFRhcmdldAogICAgIHZpcnR1YWwgY29uc3QgQXRvbWljU3RyaW5nJiBpbnRlcmZhY2VOYW1lKCkg Y29uc3Q7CisgICAgdmlydHVhbCBib29sIGRpc3BhdGNoRXZlbnQoUGFzc1JlZlB0cjxFdmVudD4p OwogCiAgICAgREVGSU5FX0FUVFJJQlVURV9FVkVOVF9MSVNURU5FUihibG9ja2VkKTsKICAgICBE RUZJTkVfQVRUUklCVVRFX0VWRU5UX0xJU1RFTkVSKHVwZ3JhZGVuZWVkZWQpOwpkaWZmIC0tZ2l0 IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IDVj ODFhODdlODE3OWZlNTdhY2ExZDBmMGQ3NjM2NDM1OGM1ZWI1YWEuLjJkOGI0OTVhYzM3YzQyODI3 ZDllYzBhMDA3YmRlMGYxNWNkMWI3MDcgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxv ZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOSBAQAorMjAxMi0xMC0x NiAgSm9zaHVhIEJlbGwgIDxqc2JlbGxAY2hyb21pdW0ub3JnPgorCisgICAgICAgIEluZGV4ZWRE QjogQ2xvc2luZyBjb25uZWN0aW9uIGluIHVwZ3JhZGVuZWVkZWQgc2hvdWxkIHJlc3VsdCBpbiBl cnJvciBldmVudAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9OTk0ODYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBVcGRhdGVkIHRlc3QgZXhwZWN0YXRpb24gLSBlcnJvciwgbm90IHN1Y2Nlc3MuCisKKyAgICAg ICAgKiBzdG9yYWdlL2luZGV4ZWRkYi9pbnR2ZXJzaW9uLWNsb3NlLWluLW9uY29tcGxldGUtZXhw ZWN0ZWQudHh0OgorICAgICAgICAqIHN0b3JhZ2UvaW5kZXhlZGRiL3Jlc291cmNlcy9pbnR2ZXJz aW9uLWNsb3NlLWluLW9uY29tcGxldGUuanM6CisgICAgICAgIChkZWxldGVTdWNjZXNzKToKKyAg ICAgICAgKHVwZ3JhZGVOZWVkZWQudHJhbnNhY3Rpb24ub25jb21wbGV0ZSk6CisgICAgICAgICh1 cGdyYWRlTmVlZGVkKToKKyAgICAgICAgKG9wZW5FcnJvcik6CisKIDIwMTItMTAtMTUgIEtlbnQg VGFtdXJhICA8dGtlbnRAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIEZpeCBzb21lIGFwcGVhcmFu Y2UgZ2xpdGNoZXMgb2YgbXVsdGlwbGUgZmllbGRzIGlucHV0IGVsZW1lbnRzCmRpZmYgLS1naXQg YS9MYXlvdXRUZXN0cy9zdG9yYWdlL2luZGV4ZWRkYi9pbnR2ZXJzaW9uLWNsb3NlLWluLW9uY29t cGxldGUtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvc3RvcmFnZS9pbmRleGVkZGIvaW50dmVy c2lvbi1jbG9zZS1pbi1vbmNvbXBsZXRlLWV4cGVjdGVkLnR4dAppbmRleCBjM2Y4MDk2ZTlmNGRj YjM2ZTQ2NTEyM2U4Mzg0NWJmNDlmZTJhZDEwLi44MWI3YWQ5NDcxOGYzNTdkM2YyNzJjZjNkMzRl OTJiNTM0MzMzZTNmIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9zdG9yYWdlL2luZGV4ZWRkYi9p bnR2ZXJzaW9uLWNsb3NlLWluLW9uY29tcGxldGUtZXhwZWN0ZWQudHh0CisrKyBiL0xheW91dFRl c3RzL3N0b3JhZ2UvaW5kZXhlZGRiL2ludHZlcnNpb24tY2xvc2UtaW4tb25jb21wbGV0ZS1leHBl Y3RlZC50eHQKQEAgLTE5LDEwICsxOSwxMCBAQCB0cmFuc2FjdGlvbi5vbmNvbXBsZXRlOgogc2F3 VHJhbnNhY3Rpb25Db21wbGV0ZSA9IHRydWUKIGRiLmNsb3NlKCkKIAotb3BlblN1Y2Nlc3MoKToK K29wZW5FcnJvcigpOgogUEFTUyBzYXdUcmFuc2FjdGlvbkNvbXBsZXRlIGlzIHRydWUKLWRiID0g ZXZlbnQudGFyZ2V0LnJlc3VsdAotUEFTUyBkYi52ZXJzaW9uIGlzIDcKK1BBU1MgZXZlbnQudGFy Z2V0LnJlc3VsdCBpcyBudWxsCitQQVNTIGV2ZW50LnRhcmdldC5lcnJvci5uYW1lIGlzICJBYm9y dEVycm9yIgogRXhwZWN0aW5nIGV4Y2VwdGlvbiBmcm9tIHRyYW5zYWN0aW9uID0gZGIudHJhbnNh Y3Rpb24oJ29zJywgJ3JlYWR3cml0ZScpCiBQQVNTIEV4Y2VwdGlvbiB3YXMgdGhyb3duLgogUEFT UyBjb2RlIGlzIERPTUV4Y2VwdGlvbi5JTlZBTElEX1NUQVRFX0VSUgpkaWZmIC0tZ2l0IGEvTGF5 b3V0VGVzdHMvc3RvcmFnZS9pbmRleGVkZGIvcmVzb3VyY2VzL2ludHZlcnNpb24tY2xvc2UtaW4t b25jb21wbGV0ZS5qcyBiL0xheW91dFRlc3RzL3N0b3JhZ2UvaW5kZXhlZGRiL3Jlc291cmNlcy9p bnR2ZXJzaW9uLWNsb3NlLWluLW9uY29tcGxldGUuanMKaW5kZXggNzg0NGE1N2Q0YTNiOTE4YzEx OGMxYWM1YWNkMDA5NjgxYTFkY2Y5Ni4uYjk3ZDQ5YzQ4YzE5MjE4Y2I0ZjBmMTU0OTA4NGQwYzUz NTEwYTQ4YSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvc3RvcmFnZS9pbmRleGVkZGIvcmVzb3Vy Y2VzL2ludHZlcnNpb24tY2xvc2UtaW4tb25jb21wbGV0ZS5qcworKysgYi9MYXlvdXRUZXN0cy9z dG9yYWdlL2luZGV4ZWRkYi9yZXNvdXJjZXMvaW50dmVyc2lvbi1jbG9zZS1pbi1vbmNvbXBsZXRl LmpzCkBAIC0xNywxNyArMTcsMTYgQEAgZnVuY3Rpb24gdGVzdCgpCiAKIGZ1bmN0aW9uIGRlbGV0 ZVN1Y2Nlc3MoZXZ0KSB7CiAgICAgZXZhbEFuZExvZygicmVxdWVzdCA9IGluZGV4ZWREQi5vcGVu KGRibmFtZSwgNykiKTsKLSAgICByZXF1ZXN0Lm9uc3VjY2VzcyA9IG9wZW5TdWNjZXNzOwogICAg IHJlcXVlc3Qub251cGdyYWRlbmVlZGVkID0gdXBncmFkZU5lZWRlZDsKKyAgICByZXF1ZXN0Lm9u ZXJyb3IgPSBvcGVuRXJyb3I7CiAgICAgcmVxdWVzdC5vbmJsb2NrZWQgPSB1bmV4cGVjdGVkQmxv Y2tlZENhbGxiYWNrOworICAgIHJlcXVlc3Qub25zdWNjZXNzID0gdW5leHBlY3RlZFN1Y2Nlc3ND YWxsYmFjazsKIH0KIAogdmFyIHNhd1RyYW5zYWN0aW9uQ29tcGxldGUgPSBmYWxzZTsKIGZ1bmN0 aW9uIHVwZ3JhZGVOZWVkZWQoZXZ0KQogewotICAgIGV2ZW50ID0gZXZ0OwotICAgIGRlYnVnKCIi KTsKLSAgICBkZWJ1ZygidXBncmFkZU5lZWRlZCgpOiIpOworICAgIHByZWFtYmxlKGV2dCk7CiAg ICAgZXZhbEFuZExvZygiZGIgPSBldmVudC50YXJnZXQucmVzdWx0Iik7CiAgICAgc2hvdWxkQmUo ImV2ZW50Lm5ld1ZlcnNpb24iLCAiNyIpOwogICAgIGV2YWxBbmRMb2coImRiLmNyZWF0ZU9iamVj dFN0b3JlKCdvcycpIik7CkBAIC00MCwxNyArMzksMTUgQEAgZnVuY3Rpb24gdXBncmFkZU5lZWRl ZChldnQpCiAgICAgICAgIGRlYnVnKCJ0cmFuc2FjdGlvbi5vbmNvbXBsZXRlOiIpOwogICAgICAg ICBldmFsQW5kTG9nKCJzYXdUcmFuc2FjdGlvbkNvbXBsZXRlID0gdHJ1ZSIpOwogICAgICAgICBl dmFsQW5kTG9nKCJkYi5jbG9zZSgpIik7Ci0gICAgfQorICAgIH07CiB9CiAKLWZ1bmN0aW9uIG9w ZW5TdWNjZXNzKGV2dCkKK2Z1bmN0aW9uIG9wZW5FcnJvcihldnQpCiB7Ci0gICAgZXZlbnQgPSBl dnQ7Ci0gICAgZGVidWcoIiIpOwotICAgIGRlYnVnKCJvcGVuU3VjY2VzcygpOiIpOworICAgIHBy ZWFtYmxlKGV2dCk7CiAgICAgc2hvdWxkQmVUcnVlKCJzYXdUcmFuc2FjdGlvbkNvbXBsZXRlIik7 Ci0gICAgZXZhbEFuZExvZygiZGIgPSBldmVudC50YXJnZXQucmVzdWx0Iik7Ci0gICAgc2hvdWxk QmUoJ2RiLnZlcnNpb24nLCAiNyIpOworICAgIHNob3VsZEJlTnVsbCgiZXZlbnQudGFyZ2V0LnJl c3VsdCIpOworICAgIHNob3VsZEJlRXF1YWxUb1N0cmluZygiZXZlbnQudGFyZ2V0LmVycm9yLm5h bWUiLCAiQWJvcnRFcnJvciIpOwogICAgIGV2YWxBbmRFeHBlY3RFeGNlcHRpb24oInRyYW5zYWN0 aW9uID0gZGIudHJhbnNhY3Rpb24oJ29zJywgJ3JlYWR3cml0ZScpIiwgIkRPTUV4Y2VwdGlvbi5J TlZBTElEX1NUQVRFX0VSUiIsICInSW52YWxpZFN0YXRlRXJyb3InIik7CiAgICAgZmluaXNoSlNU ZXN0KCk7CiB9Cg== 169279 2012-10-17 15:43:22 -0700 2012-10-17 16:51:08 -0700 Patch bug-99486-20121017154209.patch text/plain 7312 jsbell U3VidmVyc2lvbiBSZXZpc2lvbjogMTMxNTc3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjhkNmY1MjFlZTgzODI3 MzdmZWRlYjk4YTRmNWYxZmRiZDhhYzBmOS4uZDcwNjFjNDQ0YTM5MWRjNjA4NmQzNmY0NDYzYWQ0 NDBmMzU4NjgyZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDEyLTEwLTE2ICBKb3No dWEgQmVsbCAgPGpzYmVsbEBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgSW5kZXhlZERCOiBDbG9z aW5nIGNvbm5lY3Rpb24gaW4gdXBncmFkZW5lZWRlZCBzaG91bGQgcmVzdWx0IGluIGVycm9yIGV2 ZW50CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05OTQ4 NgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoZSBJ REIgc3BlYyByZXF1aXJlcyB0aGF0ICIuLi5pZiBjb25uZWN0aW9uIGlzIGNsb3NlZCwgcmV0dXJu IGEgRE9NRXJyb3Igb2YgdHlwZSBBYm9ydEVycm9yIi4KKyAgICAgICAgVGhpcyB3YXMgYmVpbmcg aGFuZGxlZCBkdXJpbmcgdGhlICJlbnF1ZXVlIiBwaGFzZSwgd2hpY2ggd2FzIHRvbyBlYXJseSBl aXRoZXIgZm9yIHN5bmNocm9ub3VzbHkKKyAgICAgICAgZXhlY3V0aW5nIHNjcmlwdHMgb3IgYXN5 bmNocm9ub3VzIG1lc3NhZ2luZyBpbiBtdWx0aXByb2Nlc3MgcG9ydHMgKGNyYnVnLmNvbS8xNTA2 OTEpLiBNb3ZlIHRoZQorICAgICAgICBsb2dpYyB0byB0aGUgImRpc3BhdGNoIiBwaGFzZS4KKwor ICAgICAgICBUZXN0OiBzdG9yYWdlL2luZGV4ZWRkYi9pbnR2ZXJzaW9uLWNsb3NlLWluLW9uY29t cGxldGUuaHRtbAorCisgICAgICAgICogTW9kdWxlcy9pbmRleGVkZGIvSURCT3BlbkRCUmVxdWVz dC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJREJPcGVuREJSZXF1ZXN0OjpvblN1Y2Nlc3MpOiBN b3ZlIHN1Y2Nlc3MgdG8gZXJyb3IgbW9ycGhpbmcgZnJvbSBoZXJlLi4uCisgICAgICAgIChXZWJD b3JlOjpJREJPcGVuREJSZXF1ZXN0OjpkaXNwYXRjaEV2ZW50KTogVG8gaGVyZS4KKyAgICAgICAg KiBNb2R1bGVzL2luZGV4ZWRkYi9JREJPcGVuREJSZXF1ZXN0Lmg6CisgICAgICAgIChJREJPcGVu REJSZXF1ZXN0KToKKwogMjAxMi0xMC0xNyAgUGF0cmljayBHYW5zdGVyZXIgIDxwYXJvZ2FAd2Vi a2l0Lm9yZz4KIAogICAgICAgICBCdWlsZCBmaXggZm9yIFdpbkNFIGFmdGVyIHIxMzEzNjUuCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9JREJPcGVuREJSZXF1 ZXN0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL0lEQk9wZW5EQlJlcXVl c3QuY3BwCmluZGV4IDc5OTEyZGJkMWI1MDE1Njk4Y2Y1NjVmMTBkYWRhNGZlMWMwNGU3ODYuLmUw NzBiOGJkNzZkYjA5NjIzOGRjYjBiMzU4NWY4YWVlNDc3NzQxY2EgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL0lEQk9wZW5EQlJlcXVlc3QuY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL0lEQk9wZW5EQlJlcXVlc3QuY3BwCkBAIC0x MTQsMTUgKzExNCw2IEBAIHZvaWQgSURCT3BlbkRCUmVxdWVzdDo6b25TdWNjZXNzKFBhc3NSZWZQ dHI8SURCRGF0YWJhc2VCYWNrZW5kSW50ZXJmYWNlPiBiYWNrZW5kCiAgICAgICAgIGlkYkRhdGFi YXNlID0gbV9yZXN1bHQtPmlkYkRhdGFiYXNlKCk7CiAgICAgICAgIEFTU0VSVChpZGJEYXRhYmFz ZSk7CiAgICAgICAgIEFTU0VSVCghbV9kYXRhYmFzZUNhbGxiYWNrcyk7Ci0KLSAgICAgICAgLy8g SWYgdGhlIGNvbm5lY3Rpb24gY2xvc2VkIGJldHdlZW4gb25VcGdyYWRlTmVlZGVkIGFuZCBvblN1 Y2Nlc3MsIGFuIGVycm9yCi0gICAgICAgIC8vIHNob3VsZCBiZSBmaXJlZCBpbnN0ZWFkIG9mIHN1 Y2Nlc3MuIFRoZSBiYWNrLWVuZCBtYXkgbm90IGJlIGF3YXJlIG9mCi0gICAgICAgIC8vIHRoZSBj bG9zaW5nIHN0YXRlIGlmIHRoZSBldmVudHMgYXJlIGFzeW5jaHJvbm91c2x5IGRlbGl2ZXJlZC4K LSAgICAgICAgaWYgKGlkYkRhdGFiYXNlLT5pc0Nsb3NlUGVuZGluZygpKSB7Ci0gICAgICAgICAg ICBtX3Jlc3VsdC5jbGVhcigpOwotICAgICAgICAgICAgb25FcnJvcihJREJEYXRhYmFzZUVycm9y OjpjcmVhdGUoSURCRGF0YWJhc2VFeGNlcHRpb246OklEQl9BQk9SVF9FUlIsICJUaGUgY29ubmVj dGlvbiB3YXMgY2xvc2VkLiIpKTsKLSAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAgfQogICAg IH0gZWxzZSB7CiAgICAgICAgIEFTU0VSVChtX2RhdGFiYXNlQ2FsbGJhY2tzKTsKICAgICAgICAg aWRiRGF0YWJhc2UgPSBJREJEYXRhYmFzZTo6Y3JlYXRlKHNjcmlwdEV4ZWN1dGlvbkNvbnRleHQo KSwgYmFja2VuZCwgbV9kYXRhYmFzZUNhbGxiYWNrcyk7CkBAIC0xNDMsNiArMTM0LDE4IEBAIGJv b2wgSURCT3BlbkRCUmVxdWVzdDo6c2hvdWxkRW5xdWV1ZUV2ZW50KCkgY29uc3QKICAgICByZXR1 cm4gdHJ1ZTsKIH0KIAorYm9vbCBJREJPcGVuREJSZXF1ZXN0OjpkaXNwYXRjaEV2ZW50KFBhc3NS ZWZQdHI8RXZlbnQ+IGV2ZW50KQoreworICAgIC8vIElmIHRoZSBjb25uZWN0aW9uIGNsb3NlZCBi ZXR3ZWVuIG9uVXBncmFkZU5lZWRlZCBhbmQgdGhlIGRlbGl2ZXJ5IG9mIHRoZSAic3VjY2VzcyIg ZXZlbnQsCisgICAgLy8gYW4gImVycm9yIiBldmVudCBzaG91bGQgYmUgZmlyZWQgaW5zdGVhZC4K KyAgICBpZiAoZXZlbnQtPnR5cGUoKSA9PSBldmVudE5hbWVzKCkuc3VjY2Vzc0V2ZW50ICYmIG1f cmVzdWx0LT5pZGJEYXRhYmFzZSgpLT5pc0Nsb3NlUGVuZGluZygpKSB7CisgICAgICAgIG1fcmVz dWx0LmNsZWFyKCk7CisgICAgICAgIG9uRXJyb3IoSURCRGF0YWJhc2VFcnJvcjo6Y3JlYXRlKElE QkRhdGFiYXNlRXhjZXB0aW9uOjpJREJfQUJPUlRfRVJSLCAiVGhlIGNvbm5lY3Rpb24gd2FzIGNs b3NlZC4iKSk7CisgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICB9CisKKyAgICByZXR1cm4gSURC UmVxdWVzdDo6ZGlzcGF0Y2hFdmVudChldmVudCk7Cit9CiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNv cmUKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvSURCT3Bl bkRCUmVxdWVzdC5oIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvSURCT3BlbkRC UmVxdWVzdC5oCmluZGV4IDFlODRiNTRjOWRhNTA3YWY1NTE5YzgwODg5ODQ2ZDQyZWZkZWQ0OWYu LmE1NTE0MjY0ZTM0YjIwZTY4ZGY0Yjc2YjY4ZWFkMWNkODBmOGYwOTMgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL0lEQk9wZW5EQlJlcXVlc3QuaAorKysgYi9T b3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9JREJPcGVuREJSZXF1ZXN0LmgKQEAgLTQ3 LDYgKzQ3LDcgQEAgcHVibGljOgogCiAgICAgLy8gRXZlbnRUYXJnZXQKICAgICB2aXJ0dWFsIGNv bnN0IEF0b21pY1N0cmluZyYgaW50ZXJmYWNlTmFtZSgpIGNvbnN0OworICAgIHZpcnR1YWwgYm9v bCBkaXNwYXRjaEV2ZW50KFBhc3NSZWZQdHI8RXZlbnQ+KTsKIAogICAgIERFRklORV9BVFRSSUJV VEVfRVZFTlRfTElTVEVORVIoYmxvY2tlZCk7CiAgICAgREVGSU5FX0FUVFJJQlVURV9FVkVOVF9M SVNURU5FUih1cGdyYWRlbmVlZGVkKTsKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxv ZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCAxOGQ4NDY5ZjY5ZTVhNWQyNDZmYTkzNjkz OGUyNTFlMjhhYzNiYzE5Li42MTNiNmM3Y2ZjZjBjMDBhMmRlNWYyNTQ5MDU4YjRjM2EyY2NhNmQx IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTItMTAtMTYgIEpvc2h1YSBCZWxsICA8anNiZWxs QGNocm9taXVtLm9yZz4KKworICAgICAgICBJbmRleGVkREI6IENsb3NpbmcgY29ubmVjdGlvbiBp biB1cGdyYWRlbmVlZGVkIHNob3VsZCByZXN1bHQgaW4gZXJyb3IgZXZlbnQKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTk5NDg2CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVXBkYXRlZCB0ZXN0IGV4cGVjdGF0 aW9uIC0gZXJyb3IsIG5vdCBzdWNjZXNzLgorCisgICAgICAgICogc3RvcmFnZS9pbmRleGVkZGIv aW50dmVyc2lvbi1jbG9zZS1pbi1vbmNvbXBsZXRlLWV4cGVjdGVkLnR4dDoKKyAgICAgICAgKiBz dG9yYWdlL2luZGV4ZWRkYi9yZXNvdXJjZXMvaW50dmVyc2lvbi1jbG9zZS1pbi1vbmNvbXBsZXRl LmpzOgorICAgICAgICAoZGVsZXRlU3VjY2Vzcyk6CisgICAgICAgICh1cGdyYWRlTmVlZGVkLnRy YW5zYWN0aW9uLm9uY29tcGxldGUpOgorICAgICAgICAodXBncmFkZU5lZWRlZCk6CisgICAgICAg IChvcGVuRXJyb3IpOgorCiAyMDEyLTEwLTE3ICBEb21pbmlrIFLDtnR0c2NoZXMgIDxkb21pbmlr LnJvdHRzY2hlc0BpbnRlbC5jb20+CiAKICAgICAgICAgW0VGTF0gVW5yZXZpZXdlZCBnYXJkZW5p bmcuCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9zdG9yYWdlL2luZGV4ZWRkYi9pbnR2ZXJzaW9u LWNsb3NlLWluLW9uY29tcGxldGUtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvc3RvcmFnZS9p bmRleGVkZGIvaW50dmVyc2lvbi1jbG9zZS1pbi1vbmNvbXBsZXRlLWV4cGVjdGVkLnR4dAppbmRl eCBjM2Y4MDk2ZTlmNGRjYjM2ZTQ2NTEyM2U4Mzg0NWJmNDlmZTJhZDEwLi44MWI3YWQ5NDcxOGYz NTdkM2YyNzJjZjNkMzRlOTJiNTM0MzMzZTNmIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9zdG9y YWdlL2luZGV4ZWRkYi9pbnR2ZXJzaW9uLWNsb3NlLWluLW9uY29tcGxldGUtZXhwZWN0ZWQudHh0 CisrKyBiL0xheW91dFRlc3RzL3N0b3JhZ2UvaW5kZXhlZGRiL2ludHZlcnNpb24tY2xvc2UtaW4t b25jb21wbGV0ZS1leHBlY3RlZC50eHQKQEAgLTE5LDEwICsxOSwxMCBAQCB0cmFuc2FjdGlvbi5v bmNvbXBsZXRlOgogc2F3VHJhbnNhY3Rpb25Db21wbGV0ZSA9IHRydWUKIGRiLmNsb3NlKCkKIAot b3BlblN1Y2Nlc3MoKToKK29wZW5FcnJvcigpOgogUEFTUyBzYXdUcmFuc2FjdGlvbkNvbXBsZXRl IGlzIHRydWUKLWRiID0gZXZlbnQudGFyZ2V0LnJlc3VsdAotUEFTUyBkYi52ZXJzaW9uIGlzIDcK K1BBU1MgZXZlbnQudGFyZ2V0LnJlc3VsdCBpcyBudWxsCitQQVNTIGV2ZW50LnRhcmdldC5lcnJv ci5uYW1lIGlzICJBYm9ydEVycm9yIgogRXhwZWN0aW5nIGV4Y2VwdGlvbiBmcm9tIHRyYW5zYWN0 aW9uID0gZGIudHJhbnNhY3Rpb24oJ29zJywgJ3JlYWR3cml0ZScpCiBQQVNTIEV4Y2VwdGlvbiB3 YXMgdGhyb3duLgogUEFTUyBjb2RlIGlzIERPTUV4Y2VwdGlvbi5JTlZBTElEX1NUQVRFX0VSUgpk aWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvc3RvcmFnZS9pbmRleGVkZGIvcmVzb3VyY2VzL2ludHZl cnNpb24tY2xvc2UtaW4tb25jb21wbGV0ZS5qcyBiL0xheW91dFRlc3RzL3N0b3JhZ2UvaW5kZXhl ZGRiL3Jlc291cmNlcy9pbnR2ZXJzaW9uLWNsb3NlLWluLW9uY29tcGxldGUuanMKaW5kZXggNDVj MDBhMjM5YzYzNGVjZTdkMDAxNTU3MWI1YmVlNTY1MzhhY2ZiZC4uYjk3ZDQ5YzQ4YzE5MjE4Y2I0 ZjBmMTU0OTA4NGQwYzUzNTEwYTQ4YSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvc3RvcmFnZS9p bmRleGVkZGIvcmVzb3VyY2VzL2ludHZlcnNpb24tY2xvc2UtaW4tb25jb21wbGV0ZS5qcworKysg Yi9MYXlvdXRUZXN0cy9zdG9yYWdlL2luZGV4ZWRkYi9yZXNvdXJjZXMvaW50dmVyc2lvbi1jbG9z ZS1pbi1vbmNvbXBsZXRlLmpzCkBAIC0xNywxOCArMTcsMTYgQEAgZnVuY3Rpb24gdGVzdCgpCiAK IGZ1bmN0aW9uIGRlbGV0ZVN1Y2Nlc3MoZXZ0KSB7CiAgICAgZXZhbEFuZExvZygicmVxdWVzdCA9 IGluZGV4ZWREQi5vcGVuKGRibmFtZSwgNykiKTsKLSAgICByZXF1ZXN0Lm9uc3VjY2VzcyA9IG9w ZW5TdWNjZXNzOwogICAgIHJlcXVlc3Qub251cGdyYWRlbmVlZGVkID0gdXBncmFkZU5lZWRlZDsK KyAgICByZXF1ZXN0Lm9uZXJyb3IgPSBvcGVuRXJyb3I7CiAgICAgcmVxdWVzdC5vbmJsb2NrZWQg PSB1bmV4cGVjdGVkQmxvY2tlZENhbGxiYWNrOwotICAgIHJlcXVlc3Qub25lcnJvciA9IHVuZXhw ZWN0ZWRFcnJvckNhbGxiYWNrOworICAgIHJlcXVlc3Qub25zdWNjZXNzID0gdW5leHBlY3RlZFN1 Y2Nlc3NDYWxsYmFjazsKIH0KIAogdmFyIHNhd1RyYW5zYWN0aW9uQ29tcGxldGUgPSBmYWxzZTsK IGZ1bmN0aW9uIHVwZ3JhZGVOZWVkZWQoZXZ0KQogewotICAgIGV2ZW50ID0gZXZ0OwotICAgIGRl YnVnKCIiKTsKLSAgICBkZWJ1ZygidXBncmFkZU5lZWRlZCgpOiIpOworICAgIHByZWFtYmxlKGV2 dCk7CiAgICAgZXZhbEFuZExvZygiZGIgPSBldmVudC50YXJnZXQucmVzdWx0Iik7CiAgICAgc2hv dWxkQmUoImV2ZW50Lm5ld1ZlcnNpb24iLCAiNyIpOwogICAgIGV2YWxBbmRMb2coImRiLmNyZWF0 ZU9iamVjdFN0b3JlKCdvcycpIik7CkBAIC00MSwxNyArMzksMTUgQEAgZnVuY3Rpb24gdXBncmFk ZU5lZWRlZChldnQpCiAgICAgICAgIGRlYnVnKCJ0cmFuc2FjdGlvbi5vbmNvbXBsZXRlOiIpOwog ICAgICAgICBldmFsQW5kTG9nKCJzYXdUcmFuc2FjdGlvbkNvbXBsZXRlID0gdHJ1ZSIpOwogICAg ICAgICBldmFsQW5kTG9nKCJkYi5jbG9zZSgpIik7Ci0gICAgfQorICAgIH07CiB9CiAKLWZ1bmN0 aW9uIG9wZW5TdWNjZXNzKGV2dCkKK2Z1bmN0aW9uIG9wZW5FcnJvcihldnQpCiB7Ci0gICAgZXZl bnQgPSBldnQ7Ci0gICAgZGVidWcoIiIpOwotICAgIGRlYnVnKCJvcGVuU3VjY2VzcygpOiIpOwor ICAgIHByZWFtYmxlKGV2dCk7CiAgICAgc2hvdWxkQmVUcnVlKCJzYXdUcmFuc2FjdGlvbkNvbXBs ZXRlIik7Ci0gICAgZXZhbEFuZExvZygiZGIgPSBldmVudC50YXJnZXQucmVzdWx0Iik7Ci0gICAg c2hvdWxkQmUoJ2RiLnZlcnNpb24nLCAiNyIpOworICAgIHNob3VsZEJlTnVsbCgiZXZlbnQudGFy Z2V0LnJlc3VsdCIpOworICAgIHNob3VsZEJlRXF1YWxUb1N0cmluZygiZXZlbnQudGFyZ2V0LmVy cm9yLm5hbWUiLCAiQWJvcnRFcnJvciIpOwogICAgIGV2YWxBbmRFeHBlY3RFeGNlcHRpb24oInRy YW5zYWN0aW9uID0gZGIudHJhbnNhY3Rpb24oJ29zJywgJ3JlYWR3cml0ZScpIiwgIkRPTUV4Y2Vw dGlvbi5JTlZBTElEX1NUQVRFX0VSUiIsICInSW52YWxpZFN0YXRlRXJyb3InIik7CiAgICAgZmlu aXNoSlNUZXN0KCk7CiB9Cg==