69111 2011-09-29 16:22:29 -0700 [Qt][WK2] Default directories and paths are missing for LocalStorage, Database and IconDatabase. 2011-10-05 07:19:38 -0700 1 1 1 Unclassified WebKit WebKit Qt 528+ (Nightly build) All All RESOLVED FIXED Qt, QtTriaged P2 Normal --- 1 menard menard hausmann kenneth kling laszlo.gombos vestbo webkit.review.bot oldest_to_newest 475742 0 menard 2011-09-29 16:22:29 -0700 [Qt][WK2] Default directories and paths are missing for LocalStorage, Database and IconDatabase. 475754 1 109220 menard 2011-09-29 16:44:59 -0700 Created attachment 109220 Patch 475785 2 109220 kenneth 2011-09-29 18:03:59 -0700 Comment on attachment 109220 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=109220&action=review > Source/WebKit2/UIProcess/qt/WebContextQt.cpp:41 > + QDir().mkpath(s_dataLocation); What if this fails? 476040 3 menard 2011-09-30 05:27:17 -0700 (In reply to comment #2) > (From update of attachment 109220 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=109220&action=review > > > Source/WebKit2/UIProcess/qt/WebContextQt.cpp:41 > > + QDir().mkpath(s_dataLocation); > > What if this fails? We could just return empty paths then. Will update the patch on monday. 477697 4 109641 menard 2011-10-04 10:34:07 -0700 Created attachment 109641 Patch 477709 5 menard 2011-10-04 10:38:30 -0700 (In reply to comment #4) > Created an attachment (id=109641) [details] > Patch The new patch as a fallback to a sensible path if there is no DataLocation from QDesktopServices (it writes into home so the mkdir should work). 478233 6 109641 hausmann 2011-10-05 02:00:13 -0700 Comment on attachment 109641 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=109641&action=review > Source/WebKit2/UIProcess/qt/WebContextQt.cpp:85 > + QDir().mkpath(defaultLocalStorageDirectory); Hm, this calls mkpath() every time, which for a given path /foo/bar/baz will stat() /foo, /foo/bar and /foo/bar/baz every time. Maybe that could be avoided :) 478281 7 109775 menard 2011-10-05 05:15:26 -0700 Created attachment 109775 Patch 478282 8 109775 kenneth 2011-10-05 05:18:49 -0700 Comment on attachment 109775 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=109775&action=review > Source/WebKit2/UIProcess/qt/WebContextQt.cpp:78 > + s_defaultDatabaseDirectory = defaultDataLocation() + QLatin1String("Databases"); Are you sure that defaultDataLocation always ends with a / ? It is user configurable right via QDesktopServies 478296 9 109779 menard 2011-10-05 05:59:11 -0700 Created attachment 109779 Patch 478330 10 109779 webkit.review.bot 2011-10-05 07:19:33 -0700 Comment on attachment 109779 Patch Clearing flags on attachment: 109779 Committed r96702: <http://trac.webkit.org/changeset/96702> 478331 11 webkit.review.bot 2011-10-05 07:19:38 -0700 All reviewed patches have been landed. Closing bug. 109220 2011-09-29 16:44:59 -0700 2011-10-04 10:34:00 -0700 Patch bug-69111-20110929204446.patch text/plain 5019 menard SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDk2Mzc3KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTEtMDktMjkgIEFsZXhpcyBN ZW5hcmQgIDxhbGV4aXMubWVuYXJkQG9wZW5ib3NzYS5vcmc+CisKKyAgICAgICAgW1F0XVtXSzJd IERlZmF1bHQgZGlyZWN0b3JpZXMgYW5kIHBhdGhzIGFyZSBtaXNzaW5nIGZvciBMb2NhbFN0b3Jh Z2UsIERhdGFiYXNlIGFuZCBJY29uRGF0YWJhc2UuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD02OTExMQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIE1ha2Ugc3VyZSB0aGF0IHRoZSBkZWZhdWx0IHBhdGggY29k ZSBmb3IgY29va2llcyBzdG9yYWdlIGlzIGF0IHRoZSBzYW1lIHBsYWNlIGFzIGZvciBMb2NhbFN0 b3JhZ2UsIERhdGFiYXNlIGFuZCBJY29uRGF0YWJhc2UuIAorCisgICAgICAgIE5vIG5ldyB0ZXN0 cyA6IGV4aXN0aW5nIG9uZXMgc2hvdWxkIGNvdmVyLgorCisgICAgICAgICogcGxhdGZvcm0vcXQv Q29va2llSmFyUXQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U2hhcmVkQ29va2llSmFyUXQ6OlNo YXJlZENvb2tpZUphclF0KToKKwogMjAxMS0wOS0yOSAgRGFuIEJlcm5zdGVpbiAgPG1pdHpAYXBw bGUuY29tPgogCiAgICAgICAgIEZvbGxvdy11cCBmaXggZm9yIDxyZGFyOi8vcHJvYmxlbS8xMDE5 MTI0Mz4gR2x5cGggdmFyaWFudHMgKGxpbmUgZmluYWwgc3dhc2hlcykgYXBwZWFyIHdoZXJlIHRo ZXkgc2hvdWxkIG5vdApJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vcXQvQ29va2llSmFy UXQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3F0L0Nvb2tpZUph clF0LmNwcAkocmV2aXNpb24gOTYzNzUpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9xdC9D b29raWVKYXJRdC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTQyLDcgKzQyLDYgQEAKICNpbmNsdWRl ICJxd2VicGFnZS5oIgogI2luY2x1ZGUgInF3ZWJzZXR0aW5ncy5oIgogI2luY2x1ZGUgPFFEYXRl VGltZT4KLSNpbmNsdWRlIDxRRGlyPgogI2luY2x1ZGUgPFFOZXR3b3JrQWNjZXNzTWFuYWdlcj4K ICNpbmNsdWRlIDxRTmV0d29ya0Nvb2tpZT4KICNpbmNsdWRlIDxRU3FsUXVlcnk+CkBAIC0yMjcs OCArMjI2LDcgQEAgU2hhcmVkQ29va2llSmFyUXQ6OlNoYXJlZENvb2tpZUphclF0KGNvbgogewog ICAgIG1fZGF0YWJhc2UgPSBRU3FsRGF0YWJhc2U6OmFkZERhdGFiYXNlKFFMYXRpbjFTdHJpbmco IlFTUUxJVEUiKSk7CiAgICAgY29uc3QgUVN0cmluZyBjb29raWVTdG9yYWdlUGF0aCA9IGNvb2tp ZVN0b3JhZ2VEaXJlY3Rvcnk7Ci0gICAgUURpcigpLm1rcGF0aChjb29raWVTdG9yYWdlUGF0aCAr IFFMYXRpbjFTdHJpbmcoIi5RdFdlYktpdC8iKSk7Ci0gICAgY29uc3QgUVN0cmluZyBkYXRhQmFz ZU5hbWUgPSBjb29raWVTdG9yYWdlUGF0aCArIFFMYXRpbjFTdHJpbmcoIi5RdFdlYktpdC9jb29r aWVzLmRiIik7CisgICAgY29uc3QgUVN0cmluZyBkYXRhQmFzZU5hbWUgPSBjb29raWVTdG9yYWdl UGF0aCArIFFMYXRpbjFTdHJpbmcoImNvb2tpZXMuZGIiKTsKICAgICBtX2RhdGFiYXNlLnNldERh dGFiYXNlTmFtZShkYXRhQmFzZU5hbWUpOwogICAgIGVuc3VyZURhdGFiYXNlVGFibGUoKTsKICAg ICBsb2FkQ29va2llcygpOwpJbmRleDogU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwkocmV2aXNpb24gOTYzNzcpCisrKyBTb3Vy Y2UvV2ViS2l0Mi9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxOSBAQAorMjAx MS0wOS0yOSAgQWxleGlzIE1lbmFyZCAgPGFsZXhpcy5tZW5hcmRAb3BlbmJvc3NhLm9yZz4KKwor ICAgICAgICBbUXRdW1dLMl0gRGVmYXVsdCBkaXJlY3RvcmllcyBhbmQgcGF0aHMgYXJlIG1pc3Np bmcgZm9yIExvY2FsU3RvcmFnZSwgRGF0YWJhc2UgYW5kIEljb25EYXRhYmFzZS4KKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTY5MTExCisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUHJvdmlkZSBkZWZhdWx0IHBh dGggZm9yIExvY2FsU3RvcmFnZSwgRGF0YWJhc2UgYW5kIEljb25EYXRhYmFzZSB1c2luZyBRRGVz a3RvcFNlcnZpY2VzLgorCisgICAgICAgICogVUlQcm9jZXNzL3F0L1dlYkNvbnRleHRRdC5jcHA6 CisgICAgICAgIChXZWJLaXQ6OmRlZmF1bHREYXRhTG9jYXRpb24pOgorICAgICAgICAoV2ViS2l0 OjpXZWJDb250ZXh0OjpwbGF0Zm9ybUluaXRpYWxpemVXZWJQcm9jZXNzKToKKyAgICAgICAgKFdl YktpdDo6V2ViQ29udGV4dDo6cGxhdGZvcm1EZWZhdWx0RGF0YWJhc2VEaXJlY3RvcnkpOgorICAg ICAgICAoV2ViS2l0OjpXZWJDb250ZXh0OjpwbGF0Zm9ybURlZmF1bHRJY29uRGF0YWJhc2VQYXRo KToKKyAgICAgICAgKFdlYktpdDo6V2ViQ29udGV4dDo6cGxhdGZvcm1EZWZhdWx0TG9jYWxTdG9y YWdlRGlyZWN0b3J5KToKKwogMjAxMS0wOS0yMyAgVG9yIEFybmUgVmVzdGLDuCAgPHRvci5hcm5l LnZlc3Rib0Bub2tpYS5jb20+CiAKICAgICAgICAgW1F0XSBGaXggYnVpbGQgYWdhaW5zdCBRdDUg YWZ0ZXIgcmVmYWN0b3Igb2Ygd2lkZ2V0cyBvdXQgb2YgUXRHVWkKSW5kZXg6IFNvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9xdC9XZWJDb250ZXh0UXQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9xdC9XZWJDb250ZXh0UXQuY3BwCShyZXZpc2lvbiA5NjM3NSkKKysr IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9XZWJDb250ZXh0UXQuY3BwCSh3b3JraW5nIGNv cHkpCkBAIC0zMCwxMCArMzAsMTggQEAKICNpbmNsdWRlICJBcHBsaWNhdGlvbkNhY2hlU3RvcmFn ZS5oIgogI2luY2x1ZGUgIldlYlByb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnMuaCIKICNpbmNsdWRl IDxRRGVza3RvcFNlcnZpY2VzPgorI2luY2x1ZGUgPFFEaXI+CiAjaW5jbHVkZSA8UVByb2Nlc3M+ CiAKIG5hbWVzcGFjZSBXZWJLaXQgewogCitzdGF0aWMgUVN0cmluZyBkZWZhdWx0RGF0YUxvY2F0 aW9uKCkKK3sKKyAgICBzdGF0aWMgUVN0cmluZyBzX2RhdGFMb2NhdGlvbiA9IFFEZXNrdG9wU2Vy dmljZXM6OnN0b3JhZ2VMb2NhdGlvbihRRGVza3RvcFNlcnZpY2VzOjpEYXRhTG9jYXRpb24pICsg UUxhdGluMVN0cmluZygiLlF0V2ViS2l0LyIpOworICAgIFFEaXIoKS5ta3BhdGgoc19kYXRhTG9j YXRpb24pOworICAgIHJldHVybiBzX2RhdGFMb2NhdGlvbjsKK30KKwogU3RyaW5nIFdlYkNvbnRl eHQ6OmFwcGxpY2F0aW9uQ2FjaGVEaXJlY3RvcnkoKQogewogICAgIHJldHVybiBXZWJDb3JlOjpj YWNoZVN0b3JhZ2UoKS5jYWNoZURpcmVjdG9yeSgpOwpAQCAtNDIsNyArNTAsNyBAQCBTdHJpbmcg V2ViQ29udGV4dDo6YXBwbGljYXRpb25DYWNoZURpcmVjCiB2b2lkIFdlYkNvbnRleHQ6OnBsYXRm b3JtSW5pdGlhbGl6ZVdlYlByb2Nlc3MoV2ViUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVycyYgcGFy YW1ldGVycykKIHsKICAgICBxUmVnaXN0ZXJNZXRhVHlwZTxRUHJvY2Vzczo6RXhpdFN0YXR1cz4o IlFQcm9jZXNzOjpFeGl0U3RhdHVzIik7Ci0gICAgcGFyYW1ldGVycy5jb29raWVTdG9yYWdlRGly ZWN0b3J5ID0gUURlc2t0b3BTZXJ2aWNlczo6c3RvcmFnZUxvY2F0aW9uKFFEZXNrdG9wU2Vydmlj ZXM6OkRhdGFMb2NhdGlvbik7CisgICAgcGFyYW1ldGVycy5jb29raWVTdG9yYWdlRGlyZWN0b3J5 ID0gZGVmYXVsdERhdGFMb2NhdGlvbigpOwogfQogCiB2b2lkIFdlYkNvbnRleHQ6OnBsYXRmb3Jt SW52YWxpZGF0ZUNvbnRleHQoKQpAQCAtNTEsMjAgKzU5LDIxIEBAIHZvaWQgV2ViQ29udGV4dDo6 cGxhdGZvcm1JbnZhbGlkYXRlQ29udGUKIAogU3RyaW5nIFdlYkNvbnRleHQ6OnBsYXRmb3JtRGVm YXVsdERhdGFiYXNlRGlyZWN0b3J5KCkgY29uc3QKIHsKLSAgICAvLyBGSVhNRTogSW1wbGVtZW50 LgotICAgIHJldHVybiAiIjsKKyAgICBjb25zdCBRU3RyaW5nJiBkZWZhdWx0RGF0YWJhc2VEaXJl Y3RvcnkgPSBkZWZhdWx0RGF0YUxvY2F0aW9uKCkgKyBRTGF0aW4xU3RyaW5nKCJEYXRhYmFzZXMi KTsKKyAgICBRRGlyKCkubWtwYXRoKGRlZmF1bHREYXRhYmFzZURpcmVjdG9yeSk7CisgICAgcmV0 dXJuIGRlZmF1bHREYXRhYmFzZURpcmVjdG9yeTsKIH0KIAogU3RyaW5nIFdlYkNvbnRleHQ6OnBs YXRmb3JtRGVmYXVsdEljb25EYXRhYmFzZVBhdGgoKSBjb25zdAogewotICAgIC8vIEZJWE1FOiBJ bXBsZW1lbnQuCi0gICAgcmV0dXJuICIiOworICAgIHJldHVybiBkZWZhdWx0RGF0YUxvY2F0aW9u KCk7CiB9CiAKIFN0cmluZyBXZWJDb250ZXh0OjpwbGF0Zm9ybURlZmF1bHRMb2NhbFN0b3JhZ2VE aXJlY3RvcnkoKSBjb25zdAogewotICAgIC8vIEZJWE1FOiBJbXBsZW1lbnQuCi0gICAgcmV0dXJu ICIiOworICAgIGNvbnN0IFFTdHJpbmcmIGRlZmF1bHRMb2NhbFN0b3JhZ2VEaXJlY3RvcnkgPSBk ZWZhdWx0RGF0YUxvY2F0aW9uKCkgKyBRTGF0aW4xU3RyaW5nKCJMb2NhbFN0b3JhZ2UiKTsKKyAg ICBRRGlyKCkubWtwYXRoKGRlZmF1bHRMb2NhbFN0b3JhZ2VEaXJlY3RvcnkpOworICAgIHJldHVy biBkZWZhdWx0TG9jYWxTdG9yYWdlRGlyZWN0b3J5OwogfQogCiB9IC8vIG5hbWVzcGFjZSBXZWJL aXQK 109641 2011-10-04 10:34:07 -0700 2011-10-05 05:15:18 -0700 Patch bug-69111-20111004143353.patch text/plain 5377 menard SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDk2NTkzKQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTEtMTAtMDQgIEFsZXhpcyBN ZW5hcmQgIDxhbGV4aXMubWVuYXJkQG9wZW5ib3NzYS5vcmc+CisKKyAgICAgICAgW1F0XVtXSzJd IERlZmF1bHQgZGlyZWN0b3JpZXMgYW5kIHBhdGhzIGFyZSBtaXNzaW5nIGZvciBMb2NhbFN0b3Jh Z2UsIERhdGFiYXNlIGFuZCBJY29uRGF0YWJhc2UuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD02OTExMQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIE1ha2Ugc3VyZSB0aGF0IHRoZSBkZWZhdWx0IHBhdGggY29k ZSBmb3IgY29va2llcyBzdG9yYWdlIGlzIGF0IHRoZSBzYW1lIHBsYWNlIGFzIGZvciBMb2NhbFN0 b3JhZ2UsIERhdGFiYXNlIGFuZCBJY29uRGF0YWJhc2UuIAorCisgICAgICAgIE5vIG5ldyB0ZXN0 cyA6IGV4aXN0aW5nIG9uZXMgc2hvdWxkIGNvdmVyLgorCisgICAgICAgICogcGxhdGZvcm0vcXQv Q29va2llSmFyUXQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U2hhcmVkQ29va2llSmFyUXQ6OlNo YXJlZENvb2tpZUphclF0KToKKwogMjAxMS0xMC0wNCAgVnNldm9sb2QgVmxhc292ICA8dnNldmlr QGNocm9taXVtLm9yZz4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBSZW1vdmUgaHR0cC90ZXN0 cy9pbnNwZWN0b3IvbmV0d29yay9kaXNhYmxlZC1jYWNoZS1jcmFzaC5odG1sLgpJbmRleDogU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vcXQvQ29va2llSmFyUXQuY3BwCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL3F0L0Nvb2tpZUphclF0LmNwcAkocmV2aXNpb24gOTY1OTMp CisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9xdC9Db29raWVKYXJRdC5jcHAJKHdvcmtpbmcg Y29weSkKQEAgLTQyLDcgKzQyLDYgQEAKICNpbmNsdWRlICJxd2VicGFnZS5oIgogI2luY2x1ZGUg InF3ZWJzZXR0aW5ncy5oIgogI2luY2x1ZGUgPFFEYXRlVGltZT4KLSNpbmNsdWRlIDxRRGlyPgog I2luY2x1ZGUgPFFOZXR3b3JrQWNjZXNzTWFuYWdlcj4KICNpbmNsdWRlIDxRTmV0d29ya0Nvb2tp ZT4KICNpbmNsdWRlIDxRU3FsUXVlcnk+CkBAIC0yMjcsOCArMjI2LDcgQEAgU2hhcmVkQ29va2ll SmFyUXQ6OlNoYXJlZENvb2tpZUphclF0KGNvbgogewogICAgIG1fZGF0YWJhc2UgPSBRU3FsRGF0 YWJhc2U6OmFkZERhdGFiYXNlKFFMYXRpbjFTdHJpbmcoIlFTUUxJVEUiKSk7CiAgICAgY29uc3Qg UVN0cmluZyBjb29raWVTdG9yYWdlUGF0aCA9IGNvb2tpZVN0b3JhZ2VEaXJlY3Rvcnk7Ci0gICAg UURpcigpLm1rcGF0aChjb29raWVTdG9yYWdlUGF0aCArIFFMYXRpbjFTdHJpbmcoIi5RdFdlYktp dC8iKSk7Ci0gICAgY29uc3QgUVN0cmluZyBkYXRhQmFzZU5hbWUgPSBjb29raWVTdG9yYWdlUGF0 aCArIFFMYXRpbjFTdHJpbmcoIi5RdFdlYktpdC9jb29raWVzLmRiIik7CisgICAgY29uc3QgUVN0 cmluZyBkYXRhQmFzZU5hbWUgPSBjb29raWVTdG9yYWdlUGF0aCArIFFMYXRpbjFTdHJpbmcoImNv b2tpZXMuZGIiKTsKICAgICBtX2RhdGFiYXNlLnNldERhdGFiYXNlTmFtZShkYXRhQmFzZU5hbWUp OwogICAgIGVuc3VyZURhdGFiYXNlVGFibGUoKTsKICAgICBsb2FkQ29va2llcygpOwpJbmRleDog U291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwkocmV2aXNpb24gOTY1OTMpCisrKyBTb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cJKHdv cmtpbmcgY29weSkKQEAgLTEsMyArMSwxOSBAQAorMjAxMS0xMC0wNCAgQWxleGlzIE1lbmFyZCAg PGFsZXhpcy5tZW5hcmRAb3BlbmJvc3NhLm9yZz4KKworICAgICAgICBbUXRdW1dLMl0gRGVmYXVs dCBkaXJlY3RvcmllcyBhbmQgcGF0aHMgYXJlIG1pc3NpbmcgZm9yIExvY2FsU3RvcmFnZSwgRGF0 YWJhc2UgYW5kIEljb25EYXRhYmFzZS4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTY5MTExCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgUHJvdmlkZSBkZWZhdWx0IHBhdGggZm9yIExvY2FsU3RvcmFnZSwgRGF0 YWJhc2UgYW5kIEljb25EYXRhYmFzZSB1c2luZyBRRGVza3RvcFNlcnZpY2VzLgorCisgICAgICAg ICogVUlQcm9jZXNzL3F0L1dlYkNvbnRleHRRdC5jcHA6CisgICAgICAgIChXZWJLaXQ6OmRlZmF1 bHREYXRhTG9jYXRpb24pOgorICAgICAgICAoV2ViS2l0OjpXZWJDb250ZXh0OjpwbGF0Zm9ybUlu aXRpYWxpemVXZWJQcm9jZXNzKToKKyAgICAgICAgKFdlYktpdDo6V2ViQ29udGV4dDo6cGxhdGZv cm1EZWZhdWx0RGF0YWJhc2VEaXJlY3RvcnkpOgorICAgICAgICAoV2ViS2l0OjpXZWJDb250ZXh0 OjpwbGF0Zm9ybURlZmF1bHRJY29uRGF0YWJhc2VQYXRoKToKKyAgICAgICAgKFdlYktpdDo6V2Vi Q29udGV4dDo6cGxhdGZvcm1EZWZhdWx0TG9jYWxTdG9yYWdlRGlyZWN0b3J5KToKKwogMjAxMS0x MC0wNCAgVnNldm9sb2QgVmxhc292ICA8dnNldmlrQGNocm9taXVtLm9yZz4KIAogICAgICAgICBX ZWIgSW5zcGVjdG9yOiBSZW1vdmUgaHR0cC90ZXN0cy9pbnNwZWN0b3IvbmV0d29yay9kaXNhYmxl ZC1jYWNoZS1jcmFzaC5odG1sLgpJbmRleDogU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L1dl YkNvbnRleHRRdC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0 L1dlYkNvbnRleHRRdC5jcHAJKHJldmlzaW9uIDk2NTkzKQorKysgU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL3F0L1dlYkNvbnRleHRRdC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTI4LDEyICsyOCwz MCBAQAogI2luY2x1ZGUgIldlYkNvbnRleHQuaCIKIAogI2luY2x1ZGUgIkFwcGxpY2F0aW9uQ2Fj aGVTdG9yYWdlLmgiCisjaW5jbHVkZSAiRmlsZVN5c3RlbS5oIgogI2luY2x1ZGUgIldlYlByb2Nl c3NDcmVhdGlvblBhcmFtZXRlcnMuaCIKKyNpbmNsdWRlIDxRQ29yZUFwcGxpY2F0aW9uPgogI2lu Y2x1ZGUgPFFEZXNrdG9wU2VydmljZXM+CisjaW5jbHVkZSA8UURpcj4KICNpbmNsdWRlIDxRUHJv Y2Vzcz4KIAogbmFtZXNwYWNlIFdlYktpdCB7CiAKK3N0YXRpYyBRU3RyaW5nIGRlZmF1bHREYXRh TG9jYXRpb24oKQoreworICAgIHN0YXRpYyBRU3RyaW5nIHNfZGF0YUxvY2F0aW9uOworCisgICAg aWYgKCFzX2RhdGFMb2NhdGlvbi5pc0VtcHR5KCkpCisgICAgICAgIHJldHVybiBzX2RhdGFMb2Nh dGlvbjsKKworICAgIFFTdHJpbmcgZGF0YUxvY2F0aW9uID0gUURlc2t0b3BTZXJ2aWNlczo6c3Rv cmFnZUxvY2F0aW9uKFFEZXNrdG9wU2VydmljZXM6OkRhdGFMb2NhdGlvbik7CisgICAgaWYgKGRh dGFMb2NhdGlvbi5pc0VtcHR5KCkpCisgICAgICAgIGRhdGFMb2NhdGlvbiA9IFdlYkNvcmU6OnBh dGhCeUFwcGVuZGluZ0NvbXBvbmVudChRRGlyOjpob21lUGF0aCgpLCBRQ29yZUFwcGxpY2F0aW9u OjphcHBsaWNhdGlvbk5hbWUoKSk7CisgICAgc19kYXRhTG9jYXRpb24gPSBkYXRhTG9jYXRpb24g KyBRTGF0aW4xU3RyaW5nKCIuUXRXZWJLaXQvIik7CisgICAgV2ViQ29yZTo6bWFrZUFsbERpcmVj dG9yaWVzKHNfZGF0YUxvY2F0aW9uKTsKKyAgICByZXR1cm4gc19kYXRhTG9jYXRpb247Cit9CisK IFN0cmluZyBXZWJDb250ZXh0OjphcHBsaWNhdGlvbkNhY2hlRGlyZWN0b3J5KCkKIHsKICAgICBy ZXR1cm4gV2ViQ29yZTo6Y2FjaGVTdG9yYWdlKCkuY2FjaGVEaXJlY3RvcnkoKTsKQEAgLTQyLDcg KzYwLDcgQEAgU3RyaW5nIFdlYkNvbnRleHQ6OmFwcGxpY2F0aW9uQ2FjaGVEaXJlYwogdm9pZCBX ZWJDb250ZXh0OjpwbGF0Zm9ybUluaXRpYWxpemVXZWJQcm9jZXNzKFdlYlByb2Nlc3NDcmVhdGlv blBhcmFtZXRlcnMmIHBhcmFtZXRlcnMpCiB7CiAgICAgcVJlZ2lzdGVyTWV0YVR5cGU8UVByb2Nl c3M6OkV4aXRTdGF0dXM+KCJRUHJvY2Vzczo6RXhpdFN0YXR1cyIpOwotICAgIHBhcmFtZXRlcnMu Y29va2llU3RvcmFnZURpcmVjdG9yeSA9IFFEZXNrdG9wU2VydmljZXM6OnN0b3JhZ2VMb2NhdGlv bihRRGVza3RvcFNlcnZpY2VzOjpEYXRhTG9jYXRpb24pOworICAgIHBhcmFtZXRlcnMuY29va2ll U3RvcmFnZURpcmVjdG9yeSA9IGRlZmF1bHREYXRhTG9jYXRpb24oKTsKIH0KIAogdm9pZCBXZWJD b250ZXh0OjpwbGF0Zm9ybUludmFsaWRhdGVDb250ZXh0KCkKQEAgLTUxLDIwICs2OSwyMSBAQCB2 b2lkIFdlYkNvbnRleHQ6OnBsYXRmb3JtSW52YWxpZGF0ZUNvbnRlCiAKIFN0cmluZyBXZWJDb250 ZXh0OjpwbGF0Zm9ybURlZmF1bHREYXRhYmFzZURpcmVjdG9yeSgpIGNvbnN0CiB7Ci0gICAgLy8g RklYTUU6IEltcGxlbWVudC4KLSAgICByZXR1cm4gIiI7CisgICAgY29uc3QgUVN0cmluZyYgZGVm YXVsdERhdGFiYXNlRGlyZWN0b3J5ID0gZGVmYXVsdERhdGFMb2NhdGlvbigpICsgUUxhdGluMVN0 cmluZygiRGF0YWJhc2VzIik7CisgICAgUURpcigpLm1rcGF0aChkZWZhdWx0RGF0YWJhc2VEaXJl Y3RvcnkpOworICAgIHJldHVybiBkZWZhdWx0RGF0YWJhc2VEaXJlY3Rvcnk7CiB9CiAKIFN0cmlu ZyBXZWJDb250ZXh0OjpwbGF0Zm9ybURlZmF1bHRJY29uRGF0YWJhc2VQYXRoKCkgY29uc3QKIHsK LSAgICAvLyBGSVhNRTogSW1wbGVtZW50LgotICAgIHJldHVybiAiIjsKKyAgICByZXR1cm4gZGVm YXVsdERhdGFMb2NhdGlvbigpOwogfQogCiBTdHJpbmcgV2ViQ29udGV4dDo6cGxhdGZvcm1EZWZh dWx0TG9jYWxTdG9yYWdlRGlyZWN0b3J5KCkgY29uc3QKIHsKLSAgICAvLyBGSVhNRTogSW1wbGVt ZW50LgotICAgIHJldHVybiAiIjsKKyAgICBjb25zdCBRU3RyaW5nJiBkZWZhdWx0TG9jYWxTdG9y YWdlRGlyZWN0b3J5ID0gZGVmYXVsdERhdGFMb2NhdGlvbigpICsgUUxhdGluMVN0cmluZygiTG9j YWxTdG9yYWdlIik7CisgICAgUURpcigpLm1rcGF0aChkZWZhdWx0TG9jYWxTdG9yYWdlRGlyZWN0 b3J5KTsKKyAgICByZXR1cm4gZGVmYXVsdExvY2FsU3RvcmFnZURpcmVjdG9yeTsKIH0KIAogfSAv LyBuYW1lc3BhY2UgV2ViS2l0Cg== 109775 2011-10-05 05:15:26 -0700 2011-10-05 05:59:02 -0700 Patch bug-69111-20111005091512.patch text/plain 5567 menard SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDk2NjkwKQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTEtMTAtMDUgIEFsZXhpcyBN ZW5hcmQgIDxhbGV4aXMubWVuYXJkQG9wZW5ib3NzYS5vcmc+CisKKyAgICAgICAgW1F0XVtXSzJd IERlZmF1bHQgZGlyZWN0b3JpZXMgYW5kIHBhdGhzIGFyZSBtaXNzaW5nIGZvciBMb2NhbFN0b3Jh Z2UsIERhdGFiYXNlIGFuZCBJY29uRGF0YWJhc2UuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD02OTExMQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFByb3ZpZGUgZGVmYXVsdCBwYXRoIGZvciBMb2NhbFN0b3Jh Z2UsIERhdGFiYXNlIGFuZCBJY29uRGF0YWJhc2UgdXNpbmcgUURlc2t0b3BTZXJ2aWNlcy4KKwor ICAgICAgICBObyBuZXcgdGVzdHMgOiBleGlzdGluZyBvbmVzIHNob3VsZCBjb3Zlci4KKworICAg ICAgICAqIHBsYXRmb3JtL3F0L0Nvb2tpZUphclF0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlNo YXJlZENvb2tpZUphclF0OjpTaGFyZWRDb29raWVKYXJRdCk6CisKIDIwMTEtMTAtMDUgIFBhdmVs IEZlbGRtYW4gIDxwZmVsZG1hbkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgV2ViIEluc3BlY3Rv cjogYWRkIENTUyBtb2RlbCBjbGFzc2VzIHRvIHRoZSBjb21waWxhdGlvbi4KSW5kZXg6IFNvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL3F0L0Nvb2tpZUphclF0LmNwcAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9xdC9Db29raWVKYXJRdC5jcHAJKHJldmlzaW9uIDk2NTkzKQor KysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vcXQvQ29va2llSmFyUXQuY3BwCSh3b3JraW5nIGNv cHkpCkBAIC00Miw3ICs0Miw2IEBACiAjaW5jbHVkZSAicXdlYnBhZ2UuaCIKICNpbmNsdWRlICJx d2Vic2V0dGluZ3MuaCIKICNpbmNsdWRlIDxRRGF0ZVRpbWU+Ci0jaW5jbHVkZSA8UURpcj4KICNp bmNsdWRlIDxRTmV0d29ya0FjY2Vzc01hbmFnZXI+CiAjaW5jbHVkZSA8UU5ldHdvcmtDb29raWU+ CiAjaW5jbHVkZSA8UVNxbFF1ZXJ5PgpAQCAtMjI3LDggKzIyNiw3IEBAIFNoYXJlZENvb2tpZUph clF0OjpTaGFyZWRDb29raWVKYXJRdChjb24KIHsKICAgICBtX2RhdGFiYXNlID0gUVNxbERhdGFi YXNlOjphZGREYXRhYmFzZShRTGF0aW4xU3RyaW5nKCJRU1FMSVRFIikpOwogICAgIGNvbnN0IFFT dHJpbmcgY29va2llU3RvcmFnZVBhdGggPSBjb29raWVTdG9yYWdlRGlyZWN0b3J5OwotICAgIFFE aXIoKS5ta3BhdGgoY29va2llU3RvcmFnZVBhdGggKyBRTGF0aW4xU3RyaW5nKCIuUXRXZWJLaXQv IikpOwotICAgIGNvbnN0IFFTdHJpbmcgZGF0YUJhc2VOYW1lID0gY29va2llU3RvcmFnZVBhdGgg KyBRTGF0aW4xU3RyaW5nKCIuUXRXZWJLaXQvY29va2llcy5kYiIpOworICAgIGNvbnN0IFFTdHJp bmcgZGF0YUJhc2VOYW1lID0gY29va2llU3RvcmFnZVBhdGggKyBRTGF0aW4xU3RyaW5nKCJjb29r aWVzLmRiIik7CiAgICAgbV9kYXRhYmFzZS5zZXREYXRhYmFzZU5hbWUoZGF0YUJhc2VOYW1lKTsK ICAgICBlbnN1cmVEYXRhYmFzZVRhYmxlKCk7CiAgICAgbG9hZENvb2tpZXMoKTsKSW5kZXg6IFNv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9DaGFu Z2VMb2cJKHJldmlzaW9uIDk2NjkwKQorKysgU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCSh3b3Jr aW5nIGNvcHkpCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTEtMTAtMDUgIEFsZXhpcyBNZW5hcmQgIDxh bGV4aXMubWVuYXJkQG9wZW5ib3NzYS5vcmc+CisKKyAgICAgICAgW1F0XVtXSzJdIERlZmF1bHQg ZGlyZWN0b3JpZXMgYW5kIHBhdGhzIGFyZSBtaXNzaW5nIGZvciBMb2NhbFN0b3JhZ2UsIERhdGFi YXNlIGFuZCBJY29uRGF0YWJhc2UuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD02OTExMQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIFByb3ZpZGUgZGVmYXVsdCBwYXRoIGZvciBMb2NhbFN0b3JhZ2UsIERhdGFi YXNlIGFuZCBJY29uRGF0YWJhc2UgdXNpbmcgUURlc2t0b3BTZXJ2aWNlcy4KKworICAgICAgICAq IFVJUHJvY2Vzcy9xdC9XZWJDb250ZXh0UXQuY3BwOgorICAgICAgICAoV2ViS2l0OjpkZWZhdWx0 RGF0YUxvY2F0aW9uKToKKyAgICAgICAgKFdlYktpdDo6V2ViQ29udGV4dDo6cGxhdGZvcm1Jbml0 aWFsaXplV2ViUHJvY2Vzcyk6CisgICAgICAgIChXZWJLaXQ6OldlYkNvbnRleHQ6OnBsYXRmb3Jt RGVmYXVsdERhdGFiYXNlRGlyZWN0b3J5KToKKyAgICAgICAgKFdlYktpdDo6V2ViQ29udGV4dDo6 cGxhdGZvcm1EZWZhdWx0SWNvbkRhdGFiYXNlUGF0aCk6CisgICAgICAgIChXZWJLaXQ6OldlYkNv bnRleHQ6OnBsYXRmb3JtRGVmYXVsdExvY2FsU3RvcmFnZURpcmVjdG9yeSk6CisKIDIwMTEtMTAt MDUgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgogCiAgICAgICAg IFtHVEtdIFVzZSBXS1JldGFpblB0ciBmb3IgV0sgdHlwZXMgaW4gV2ViS2l0MiBHVEsrCkluZGV4 OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvV2ViQ29udGV4dFF0LmNwcAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvV2ViQ29udGV4dFF0LmNwcAkocmV2aXNp b24gOTY1OTMpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvV2ViQ29udGV4dFF0LmNw cAkod29ya2luZyBjb3B5KQpAQCAtMjgsMTIgKzI4LDMzIEBACiAjaW5jbHVkZSAiV2ViQ29udGV4 dC5oIgogCiAjaW5jbHVkZSAiQXBwbGljYXRpb25DYWNoZVN0b3JhZ2UuaCIKKyNpbmNsdWRlICJG aWxlU3lzdGVtLmgiCiAjaW5jbHVkZSAiV2ViUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVycy5oIgor I2luY2x1ZGUgPFFDb3JlQXBwbGljYXRpb24+CiAjaW5jbHVkZSA8UURlc2t0b3BTZXJ2aWNlcz4K KyNpbmNsdWRlIDxRRGlyPgogI2luY2x1ZGUgPFFQcm9jZXNzPgogCiBuYW1lc3BhY2UgV2ViS2l0 IHsKIAorc3RhdGljIFFTdHJpbmcgZGVmYXVsdERhdGFMb2NhdGlvbigpCit7CisgICAgc3RhdGlj IFFTdHJpbmcgc19kYXRhTG9jYXRpb247CisKKyAgICBpZiAoIXNfZGF0YUxvY2F0aW9uLmlzRW1w dHkoKSkKKyAgICAgICAgcmV0dXJuIHNfZGF0YUxvY2F0aW9uOworCisgICAgUVN0cmluZyBkYXRh TG9jYXRpb24gPSBRRGVza3RvcFNlcnZpY2VzOjpzdG9yYWdlTG9jYXRpb24oUURlc2t0b3BTZXJ2 aWNlczo6RGF0YUxvY2F0aW9uKTsKKyAgICBpZiAoZGF0YUxvY2F0aW9uLmlzRW1wdHkoKSkKKyAg ICAgICAgZGF0YUxvY2F0aW9uID0gV2ViQ29yZTo6cGF0aEJ5QXBwZW5kaW5nQ29tcG9uZW50KFFE aXI6OmhvbWVQYXRoKCksIFFDb3JlQXBwbGljYXRpb246OmFwcGxpY2F0aW9uTmFtZSgpKTsKKyAg ICBzX2RhdGFMb2NhdGlvbiA9IGRhdGFMb2NhdGlvbiArIFFMYXRpbjFTdHJpbmcoIi5RdFdlYktp dC8iKTsKKyAgICBXZWJDb3JlOjptYWtlQWxsRGlyZWN0b3JpZXMoc19kYXRhTG9jYXRpb24pOwor ICAgIHJldHVybiBzX2RhdGFMb2NhdGlvbjsKK30KKworc3RhdGljIFFTdHJpbmcgc19kZWZhdWx0 RGF0YWJhc2VEaXJlY3Rvcnk7CitzdGF0aWMgUVN0cmluZyBzX2RlZmF1bHRMb2NhbFN0b3JhZ2VE aXJlY3Rvcnk7CisKIFN0cmluZyBXZWJDb250ZXh0OjphcHBsaWNhdGlvbkNhY2hlRGlyZWN0b3J5 KCkKIHsKICAgICByZXR1cm4gV2ViQ29yZTo6Y2FjaGVTdG9yYWdlKCkuY2FjaGVEaXJlY3Rvcnko KTsKQEAgLTQyLDcgKzYzLDcgQEAgU3RyaW5nIFdlYkNvbnRleHQ6OmFwcGxpY2F0aW9uQ2FjaGVE aXJlYwogdm9pZCBXZWJDb250ZXh0OjpwbGF0Zm9ybUluaXRpYWxpemVXZWJQcm9jZXNzKFdlYlBy b2Nlc3NDcmVhdGlvblBhcmFtZXRlcnMmIHBhcmFtZXRlcnMpCiB7CiAgICAgcVJlZ2lzdGVyTWV0 YVR5cGU8UVByb2Nlc3M6OkV4aXRTdGF0dXM+KCJRUHJvY2Vzczo6RXhpdFN0YXR1cyIpOwotICAg IHBhcmFtZXRlcnMuY29va2llU3RvcmFnZURpcmVjdG9yeSA9IFFEZXNrdG9wU2VydmljZXM6OnN0 b3JhZ2VMb2NhdGlvbihRRGVza3RvcFNlcnZpY2VzOjpEYXRhTG9jYXRpb24pOworICAgIHBhcmFt ZXRlcnMuY29va2llU3RvcmFnZURpcmVjdG9yeSA9IGRlZmF1bHREYXRhTG9jYXRpb24oKTsKIH0K IAogdm9pZCBXZWJDb250ZXh0OjpwbGF0Zm9ybUludmFsaWRhdGVDb250ZXh0KCkKQEAgLTUxLDIw ICs3MiwyNyBAQCB2b2lkIFdlYkNvbnRleHQ6OnBsYXRmb3JtSW52YWxpZGF0ZUNvbnRlCiAKIFN0 cmluZyBXZWJDb250ZXh0OjpwbGF0Zm9ybURlZmF1bHREYXRhYmFzZURpcmVjdG9yeSgpIGNvbnN0 CiB7Ci0gICAgLy8gRklYTUU6IEltcGxlbWVudC4KLSAgICByZXR1cm4gIiI7CisgICAgaWYgKCFz X2RlZmF1bHREYXRhYmFzZURpcmVjdG9yeS5pc0VtcHR5KCkpCisgICAgICAgIHJldHVybiBzX2Rl ZmF1bHREYXRhYmFzZURpcmVjdG9yeTsKKworICAgIHNfZGVmYXVsdERhdGFiYXNlRGlyZWN0b3J5 ID0gZGVmYXVsdERhdGFMb2NhdGlvbigpICsgUUxhdGluMVN0cmluZygiRGF0YWJhc2VzIik7Cisg ICAgUURpcigpLm1rcGF0aChzX2RlZmF1bHREYXRhYmFzZURpcmVjdG9yeSk7CisgICAgcmV0dXJu IHNfZGVmYXVsdERhdGFiYXNlRGlyZWN0b3J5OwogfQogCiBTdHJpbmcgV2ViQ29udGV4dDo6cGxh dGZvcm1EZWZhdWx0SWNvbkRhdGFiYXNlUGF0aCgpIGNvbnN0CiB7Ci0gICAgLy8gRklYTUU6IElt cGxlbWVudC4KLSAgICByZXR1cm4gIiI7CisgICAgcmV0dXJuIGRlZmF1bHREYXRhTG9jYXRpb24o KTsKIH0KIAogU3RyaW5nIFdlYkNvbnRleHQ6OnBsYXRmb3JtRGVmYXVsdExvY2FsU3RvcmFnZURp cmVjdG9yeSgpIGNvbnN0CiB7Ci0gICAgLy8gRklYTUU6IEltcGxlbWVudC4KLSAgICByZXR1cm4g IiI7CisgICAgaWYgKCFzX2RlZmF1bHRMb2NhbFN0b3JhZ2VEaXJlY3RvcnkuaXNFbXB0eSgpKQor ICAgICAgICByZXR1cm4gc19kZWZhdWx0TG9jYWxTdG9yYWdlRGlyZWN0b3J5OworCisgICAgc19k ZWZhdWx0TG9jYWxTdG9yYWdlRGlyZWN0b3J5ID0gZGVmYXVsdERhdGFMb2NhdGlvbigpICsgUUxh dGluMVN0cmluZygiTG9jYWxTdG9yYWdlIik7CisgICAgUURpcigpLm1rcGF0aChzX2RlZmF1bHRM b2NhbFN0b3JhZ2VEaXJlY3RvcnkpOworICAgIHJldHVybiBzX2RlZmF1bHRMb2NhbFN0b3JhZ2VE aXJlY3Rvcnk7CiB9CiAKIH0gLy8gbmFtZXNwYWNlIFdlYktpdAo= 109779 2011-10-05 05:59:11 -0700 2011-10-05 07:19:32 -0700 Patch bug-69111-20111005095857.patch text/plain 5586 menard SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDk2NjkwKQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTEtMTAtMDUgIEFsZXhpcyBN ZW5hcmQgIDxhbGV4aXMubWVuYXJkQG9wZW5ib3NzYS5vcmc+CisKKyAgICAgICAgW1F0XVtXSzJd IERlZmF1bHQgZGlyZWN0b3JpZXMgYW5kIHBhdGhzIGFyZSBtaXNzaW5nIGZvciBMb2NhbFN0b3Jh Z2UsIERhdGFiYXNlIGFuZCBJY29uRGF0YWJhc2UuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD02OTExMQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFByb3ZpZGUgZGVmYXVsdCBwYXRoIGZvciBMb2NhbFN0b3Jh Z2UsIERhdGFiYXNlIGFuZCBJY29uRGF0YWJhc2UgdXNpbmcgUURlc2t0b3BTZXJ2aWNlcy4KKwor ICAgICAgICBObyBuZXcgdGVzdHMgOiBleGlzdGluZyBvbmVzIHNob3VsZCBjb3Zlci4KKworICAg ICAgICAqIHBsYXRmb3JtL3F0L0Nvb2tpZUphclF0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlNo YXJlZENvb2tpZUphclF0OjpTaGFyZWRDb29raWVKYXJRdCk6CisKIDIwMTEtMTAtMDUgIFBhdmVs IEZlbGRtYW4gIDxwZmVsZG1hbkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgV2ViIEluc3BlY3Rv cjogYWRkIENTUyBtb2RlbCBjbGFzc2VzIHRvIHRoZSBjb21waWxhdGlvbi4KSW5kZXg6IFNvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL3F0L0Nvb2tpZUphclF0LmNwcAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9xdC9Db29raWVKYXJRdC5jcHAJKHJldmlzaW9uIDk2NTkzKQor KysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vcXQvQ29va2llSmFyUXQuY3BwCSh3b3JraW5nIGNv cHkpCkBAIC00Miw3ICs0Miw2IEBACiAjaW5jbHVkZSAicXdlYnBhZ2UuaCIKICNpbmNsdWRlICJx d2Vic2V0dGluZ3MuaCIKICNpbmNsdWRlIDxRRGF0ZVRpbWU+Ci0jaW5jbHVkZSA8UURpcj4KICNp bmNsdWRlIDxRTmV0d29ya0FjY2Vzc01hbmFnZXI+CiAjaW5jbHVkZSA8UU5ldHdvcmtDb29raWU+ CiAjaW5jbHVkZSA8UVNxbFF1ZXJ5PgpAQCAtMjI3LDggKzIyNiw3IEBAIFNoYXJlZENvb2tpZUph clF0OjpTaGFyZWRDb29raWVKYXJRdChjb24KIHsKICAgICBtX2RhdGFiYXNlID0gUVNxbERhdGFi YXNlOjphZGREYXRhYmFzZShRTGF0aW4xU3RyaW5nKCJRU1FMSVRFIikpOwogICAgIGNvbnN0IFFT dHJpbmcgY29va2llU3RvcmFnZVBhdGggPSBjb29raWVTdG9yYWdlRGlyZWN0b3J5OwotICAgIFFE aXIoKS5ta3BhdGgoY29va2llU3RvcmFnZVBhdGggKyBRTGF0aW4xU3RyaW5nKCIuUXRXZWJLaXQv IikpOwotICAgIGNvbnN0IFFTdHJpbmcgZGF0YUJhc2VOYW1lID0gY29va2llU3RvcmFnZVBhdGgg KyBRTGF0aW4xU3RyaW5nKCIuUXRXZWJLaXQvY29va2llcy5kYiIpOworICAgIGNvbnN0IFFTdHJp bmcgZGF0YUJhc2VOYW1lID0gY29va2llU3RvcmFnZVBhdGggKyBRTGF0aW4xU3RyaW5nKCJjb29r aWVzLmRiIik7CiAgICAgbV9kYXRhYmFzZS5zZXREYXRhYmFzZU5hbWUoZGF0YUJhc2VOYW1lKTsK ICAgICBlbnN1cmVEYXRhYmFzZVRhYmxlKCk7CiAgICAgbG9hZENvb2tpZXMoKTsKSW5kZXg6IFNv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9DaGFu Z2VMb2cJKHJldmlzaW9uIDk2NjkwKQorKysgU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCSh3b3Jr aW5nIGNvcHkpCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTEtMTAtMDUgIEFsZXhpcyBNZW5hcmQgIDxh bGV4aXMubWVuYXJkQG9wZW5ib3NzYS5vcmc+CisKKyAgICAgICAgW1F0XVtXSzJdIERlZmF1bHQg ZGlyZWN0b3JpZXMgYW5kIHBhdGhzIGFyZSBtaXNzaW5nIGZvciBMb2NhbFN0b3JhZ2UsIERhdGFi YXNlIGFuZCBJY29uRGF0YWJhc2UuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD02OTExMQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIFByb3ZpZGUgZGVmYXVsdCBwYXRoIGZvciBMb2NhbFN0b3JhZ2UsIERhdGFi YXNlIGFuZCBJY29uRGF0YWJhc2UgdXNpbmcgUURlc2t0b3BTZXJ2aWNlcy4KKworICAgICAgICAq IFVJUHJvY2Vzcy9xdC9XZWJDb250ZXh0UXQuY3BwOgorICAgICAgICAoV2ViS2l0OjpkZWZhdWx0 RGF0YUxvY2F0aW9uKToKKyAgICAgICAgKFdlYktpdDo6V2ViQ29udGV4dDo6cGxhdGZvcm1Jbml0 aWFsaXplV2ViUHJvY2Vzcyk6CisgICAgICAgIChXZWJLaXQ6OldlYkNvbnRleHQ6OnBsYXRmb3Jt RGVmYXVsdERhdGFiYXNlRGlyZWN0b3J5KToKKyAgICAgICAgKFdlYktpdDo6V2ViQ29udGV4dDo6 cGxhdGZvcm1EZWZhdWx0SWNvbkRhdGFiYXNlUGF0aCk6CisgICAgICAgIChXZWJLaXQ6OldlYkNv bnRleHQ6OnBsYXRmb3JtRGVmYXVsdExvY2FsU3RvcmFnZURpcmVjdG9yeSk6CisKIDIwMTEtMTAt MDUgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgogCiAgICAgICAg IFtHVEtdIFVzZSBXS1JldGFpblB0ciBmb3IgV0sgdHlwZXMgaW4gV2ViS2l0MiBHVEsrCkluZGV4 OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvV2ViQ29udGV4dFF0LmNwcAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvV2ViQ29udGV4dFF0LmNwcAkocmV2aXNp b24gOTY1OTMpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvV2ViQ29udGV4dFF0LmNw cAkod29ya2luZyBjb3B5KQpAQCAtMjgsMTIgKzI4LDMzIEBACiAjaW5jbHVkZSAiV2ViQ29udGV4 dC5oIgogCiAjaW5jbHVkZSAiQXBwbGljYXRpb25DYWNoZVN0b3JhZ2UuaCIKKyNpbmNsdWRlICJG aWxlU3lzdGVtLmgiCiAjaW5jbHVkZSAiV2ViUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVycy5oIgor I2luY2x1ZGUgPFFDb3JlQXBwbGljYXRpb24+CiAjaW5jbHVkZSA8UURlc2t0b3BTZXJ2aWNlcz4K KyNpbmNsdWRlIDxRRGlyPgogI2luY2x1ZGUgPFFQcm9jZXNzPgogCiBuYW1lc3BhY2UgV2ViS2l0 IHsKIAorc3RhdGljIFFTdHJpbmcgZGVmYXVsdERhdGFMb2NhdGlvbigpCit7CisgICAgc3RhdGlj IFFTdHJpbmcgc19kYXRhTG9jYXRpb247CisKKyAgICBpZiAoIXNfZGF0YUxvY2F0aW9uLmlzRW1w dHkoKSkKKyAgICAgICAgcmV0dXJuIHNfZGF0YUxvY2F0aW9uOworCisgICAgUVN0cmluZyBkYXRh TG9jYXRpb24gPSBRRGVza3RvcFNlcnZpY2VzOjpzdG9yYWdlTG9jYXRpb24oUURlc2t0b3BTZXJ2 aWNlczo6RGF0YUxvY2F0aW9uKTsKKyAgICBpZiAoZGF0YUxvY2F0aW9uLmlzRW1wdHkoKSkKKyAg ICAgICAgZGF0YUxvY2F0aW9uID0gV2ViQ29yZTo6cGF0aEJ5QXBwZW5kaW5nQ29tcG9uZW50KFFE aXI6OmhvbWVQYXRoKCksIFFDb3JlQXBwbGljYXRpb246OmFwcGxpY2F0aW9uTmFtZSgpKTsKKyAg ICBzX2RhdGFMb2NhdGlvbiA9IFdlYkNvcmU6OnBhdGhCeUFwcGVuZGluZ0NvbXBvbmVudChkYXRh TG9jYXRpb24sICIuUXRXZWJLaXQvIik7CisgICAgV2ViQ29yZTo6bWFrZUFsbERpcmVjdG9yaWVz KHNfZGF0YUxvY2F0aW9uKTsKKyAgICByZXR1cm4gc19kYXRhTG9jYXRpb247Cit9CisKK3N0YXRp YyBRU3RyaW5nIHNfZGVmYXVsdERhdGFiYXNlRGlyZWN0b3J5Oworc3RhdGljIFFTdHJpbmcgc19k ZWZhdWx0TG9jYWxTdG9yYWdlRGlyZWN0b3J5OworCiBTdHJpbmcgV2ViQ29udGV4dDo6YXBwbGlj YXRpb25DYWNoZURpcmVjdG9yeSgpCiB7CiAgICAgcmV0dXJuIFdlYkNvcmU6OmNhY2hlU3RvcmFn ZSgpLmNhY2hlRGlyZWN0b3J5KCk7CkBAIC00Miw3ICs2Myw3IEBAIFN0cmluZyBXZWJDb250ZXh0 OjphcHBsaWNhdGlvbkNhY2hlRGlyZWMKIHZvaWQgV2ViQ29udGV4dDo6cGxhdGZvcm1Jbml0aWFs aXplV2ViUHJvY2VzcyhXZWJQcm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJzJiBwYXJhbWV0ZXJzKQog ewogICAgIHFSZWdpc3Rlck1ldGFUeXBlPFFQcm9jZXNzOjpFeGl0U3RhdHVzPigiUVByb2Nlc3M6 OkV4aXRTdGF0dXMiKTsKLSAgICBwYXJhbWV0ZXJzLmNvb2tpZVN0b3JhZ2VEaXJlY3RvcnkgPSBR RGVza3RvcFNlcnZpY2VzOjpzdG9yYWdlTG9jYXRpb24oUURlc2t0b3BTZXJ2aWNlczo6RGF0YUxv Y2F0aW9uKTsKKyAgICBwYXJhbWV0ZXJzLmNvb2tpZVN0b3JhZ2VEaXJlY3RvcnkgPSBkZWZhdWx0 RGF0YUxvY2F0aW9uKCk7CiB9CiAKIHZvaWQgV2ViQ29udGV4dDo6cGxhdGZvcm1JbnZhbGlkYXRl Q29udGV4dCgpCkBAIC01MSwyMCArNzIsMjcgQEAgdm9pZCBXZWJDb250ZXh0OjpwbGF0Zm9ybUlu dmFsaWRhdGVDb250ZQogCiBTdHJpbmcgV2ViQ29udGV4dDo6cGxhdGZvcm1EZWZhdWx0RGF0YWJh c2VEaXJlY3RvcnkoKSBjb25zdAogewotICAgIC8vIEZJWE1FOiBJbXBsZW1lbnQuCi0gICAgcmV0 dXJuICIiOworICAgIGlmICghc19kZWZhdWx0RGF0YWJhc2VEaXJlY3RvcnkuaXNFbXB0eSgpKQor ICAgICAgICByZXR1cm4gc19kZWZhdWx0RGF0YWJhc2VEaXJlY3Rvcnk7CisKKyAgICBzX2RlZmF1 bHREYXRhYmFzZURpcmVjdG9yeSA9IGRlZmF1bHREYXRhTG9jYXRpb24oKSArIFFMYXRpbjFTdHJp bmcoIkRhdGFiYXNlcyIpOworICAgIFFEaXIoKS5ta3BhdGgoc19kZWZhdWx0RGF0YWJhc2VEaXJl Y3RvcnkpOworICAgIHJldHVybiBzX2RlZmF1bHREYXRhYmFzZURpcmVjdG9yeTsKIH0KIAogU3Ry aW5nIFdlYkNvbnRleHQ6OnBsYXRmb3JtRGVmYXVsdEljb25EYXRhYmFzZVBhdGgoKSBjb25zdAog ewotICAgIC8vIEZJWE1FOiBJbXBsZW1lbnQuCi0gICAgcmV0dXJuICIiOworICAgIHJldHVybiBk ZWZhdWx0RGF0YUxvY2F0aW9uKCk7CiB9CiAKIFN0cmluZyBXZWJDb250ZXh0OjpwbGF0Zm9ybURl ZmF1bHRMb2NhbFN0b3JhZ2VEaXJlY3RvcnkoKSBjb25zdAogewotICAgIC8vIEZJWE1FOiBJbXBs ZW1lbnQuCi0gICAgcmV0dXJuICIiOworICAgIGlmICghc19kZWZhdWx0TG9jYWxTdG9yYWdlRGly ZWN0b3J5LmlzRW1wdHkoKSkKKyAgICAgICAgcmV0dXJuIHNfZGVmYXVsdExvY2FsU3RvcmFnZURp cmVjdG9yeTsKKworICAgIHNfZGVmYXVsdExvY2FsU3RvcmFnZURpcmVjdG9yeSA9IGRlZmF1bHRE YXRhTG9jYXRpb24oKSArIFFMYXRpbjFTdHJpbmcoIkxvY2FsU3RvcmFnZSIpOworICAgIFFEaXIo KS5ta3BhdGgoc19kZWZhdWx0TG9jYWxTdG9yYWdlRGlyZWN0b3J5KTsKKyAgICByZXR1cm4gc19k ZWZhdWx0TG9jYWxTdG9yYWdlRGlyZWN0b3J5OwogfQogCiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQK