69541 2011-10-06 10:43:01 -0700 [Qt][WK2] ApplicationCache LayoutTests failed 2012-08-30 05:52:34 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) PC Linux RESOLVED FIXED Qt P2 Normal --- 69653 95450 1 qi.2.zhang luciano.wolf abecsi andersca cmarcelo cshu laszlo.gombos luciano.wolf menard ossy webkit.review.bot zoltan oldest_to_newest 479272 0 qi.2.zhang 2011-10-06 10:43:01 -0700 Most of the ApplicationCache LayoutTests failed on Qt Webkit2, currently the whole directory is in the skip list. 479280 1 109978 qi.2.zhang 2011-10-06 10:52:26 -0700 Created attachment 109978 patch 479303 2 109978 cshu 2011-10-06 11:16:23 -0700 Comment on attachment 109978 patch View in context: https://bugs.webkit.org/attachment.cgi?id=109978&action=review > Source/WebKit2/ChangeLog:9 > + set and we didn't set yet. Shall we set the applicationCacheDirectory somewhere like WK1 does? What if the UI client indeed sets the cacheDirectory and this code change will break it. > Source/WebKit2/UIProcess/qt/WebContextQt.cpp:39 > + return QDesktopServices::storageLocation(QDesktopServices::DataLocation); Even if the approach is correct, I think we should call the existing function defaultDataLocation() in the same file instead. 479337 3 109978 menard 2011-10-06 11:42:59 -0700 Comment on attachment 109978 patch View in context: https://bugs.webkit.org/attachment.cgi?id=109978&action=review > Source/WebKit2/UIProcess/qt/WebContextQt.cpp:39 > + return QDesktopServices::storageLocation(QDesktopServices::DataLocation); I don't think this is the right fix because you don't want to call QDesktopServices every single time. Also this file changed have a look at http://trac.webkit.org/changeset/96702 to use the same pattern as the other. 479344 4 menard 2011-10-06 11:47:19 -0700 (In reply to comment #2) > (From update of attachment 109978 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=109978&action=review > > > Source/WebKit2/ChangeLog:9 > > + set and we didn't set yet. > > Shall we set the applicationCacheDirectory somewhere like WK1 does? What if the UI client indeed sets the cacheDirectory and this code change will break it. I think the problem is that unlike Database, DefaultIconDataBasePath, LocalStorageDirectory, there is no default (or fallback if a custom one is not set). I think we should do the same as the others : String WebContext::localStorageDirectory() const { if (!m_overrideLocalStorageDirectory.isEmpty()) return m_overrideLocalStorageDirectory; return platformDefaultLocalStorageDirectory(); } and add a platformDefaultApplicationCacheDirectory. > > > Source/WebKit2/UIProcess/qt/WebContextQt.cpp:39 > > + return QDesktopServices::storageLocation(QDesktopServices::DataLocation); > > Even if the approach is correct, I think we should call the existing function defaultDataLocation() in the same file instead. 479350 5 cshu 2011-10-06 11:52:40 -0700 Alexis, please update the flags with caution. 479380 6 menard 2011-10-06 12:20:49 -0700 (In reply to comment #5) > Alexis, please update the flags with caution. Yep sorry I messed up :( 479412 7 110002 qi.2.zhang 2011-10-06 13:14:48 -0700 Created attachment 110002 patch2 479413 8 110003 qi.2.zhang 2011-10-06 13:15:52 -0700 Created attachment 110003 patch2 Changed based on Chang and Alexis comments. 479721 9 menard 2011-10-06 19:04:59 -0700 Adding Anders as he is the dungeon keeper of WebProcess. 479961 10 110003 cshu 2011-10-07 06:14:38 -0700 Comment on attachment 110003 patch2 View in context: https://bugs.webkit.org/attachment.cgi?id=110003&action=review Please update ChangeLog descriptions before landing. > Source/WebKit2/ChangeLog:12 > + 3. Add interface setApplicationCacheDirectory. It seems we need a better wording here. :) How about this: 1. Moved applicationCacheDirectory to common code. 2. Added interface setApplicationCacheDirectory to allow UI client overriding. 3. Renamed all platform-dependent implementations of applicationCacheDirectory to platformDefaultApplicationCacheDirectory. 4. On Qt, set the platformDefaultApplicationCacheDirectory to the default data location. > LayoutTests/ChangeLog:7 > + Add "Unskip passed tests." here. 479976 11 110140 qi.2.zhang 2011-10-07 07:02:20 -0700 Created attachment 110140 patch3 480006 12 110140 webkit.review.bot 2011-10-07 08:08:22 -0700 Comment on attachment 110140 patch3 Clearing flags on attachment: 110140 Committed r96938: <http://trac.webkit.org/changeset/96938> 480007 13 webkit.review.bot 2011-10-07 08:08:27 -0700 All reviewed patches have been landed. Closing bug. 480207 14 ossy 2011-10-07 12:26:59 -0700 Reopen, because it was rolled out by http://trac.webkit.org/changeset/96969 Guys, you should have check buildbots after landing ... :-/ Check http://build.webkit.sed.hu/builders/x86-32%20Linux%20Qt%20Release%20WebKit2/builds/13015 It made many tests fail and made testing time 2,5 hours ... 480281 15 qi.2.zhang 2011-10-07 13:37:59 -0700 Not reproducible on my environment:( On buildbot, it has 12 crashs and some failed cases outside of the ApplicationCache. On my environment, if I used new-run-webkit-tests, no crash! but all the ApplicationCache test cases failed. If I used old-run-webkit-tests, all the ApplicationCache passed. But anyway, not able to reproduce the buildbot result. 484555 16 110003 abarth 2011-10-15 01:52:07 -0700 Comment on attachment 110003 patch2 Cleared Chang Shu's review+ from obsolete attachment 110003 so that this bug does not appear in http://webkit.org/pending-commit. 484770 17 cshu 2011-10-16 06:26:29 -0700 (In reply to comment #15) > Not reproducible on my environment:( > > On buildbot, it has 12 crashs and some failed cases outside of the ApplicationCache. > > On my environment, if I used new-run-webkit-tests, no crash! but all the ApplicationCache test cases failed. If I used old-run-webkit-tests, all the ApplicationCache passed. But anyway, not able to reproduce the buildbot result. The NRWT was failing for other reasons and it's fixed now. Please try again. 707844 18 161312 luciano.wolf 2012-08-29 14:09:27 -0700 Created attachment 161312 Patch that properly updates app cache dir Returns defaultDiskCacheDirectory when no cache directory was provided, this way setOfflineWebApplicationCacheEnabled works as expected. 708251 19 161312 webkit.review.bot 2012-08-29 20:30:29 -0700 Comment on attachment 161312 Patch that properly updates app cache dir Clearing flags on attachment: 161312 Committed r127091: <http://trac.webkit.org/changeset/127091> 708252 20 webkit.review.bot 2012-08-29 20:30:33 -0700 All reviewed patches have been landed. Closing bug. 708536 21 ossy 2012-08-30 05:52:34 -0700 (In reply to comment #19) > (From update of attachment 161312 [details]) > Clearing flags on attachment: 161312 > > Committed r127091: <http://trac.webkit.org/changeset/127091> It made layout testing extremely slow: https://bugs.webkit.org/show_bug.cgi?id=95450 Could you check it, please? 109978 2011-10-06 10:52:26 -0700 2011-10-06 13:15:52 -0700 patch bug69541.patch text/plain 2450 qi.2.zhang SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDk2ODI4KQorKysgU291cmNlL1dlYktpdDIvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTEtMTAtMDYgIFFpIFpoYW5n ICA8cWkuMi56aGFuZ0Bub2tpYS5jb20+CisKKyAgICAgICAgW1F0XVtXSzJdIEFwcGxpY2F0aW9u Q2FjaGUgTGF5b3V0VGVzdHMgZmFpbGVkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD02OTU0MQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIFNldCB0aGUgYXBwbGljYXRpb25DYWNoZURpcmVjdG9yeSB0byB0aGUg ZGVmYXVsdCBwbGFjZSBsaWtlIGNvb2tpZS4gVGhlIG9yaWdpbmFsIHZhbHVlIGlzIG51bGwgd2hp Y2ggZGVwZW5kIG9uIHVpIGNsaWVudCB0bworICAgICAgICBzZXQgYW5kIHdlIGRpZG4ndCBzZXQg eWV0LgorCisgICAgICAgICogVUlQcm9jZXNzL3F0L1dlYkNvbnRleHRRdC5jcHA6CisgICAgICAg IChXZWJLaXQ6OldlYkNvbnRleHQ6OmFwcGxpY2F0aW9uQ2FjaGVEaXJlY3RvcnkpOgorCiAyMDEx LTEwLTA1ICBBbGV4ZXkgUHJvc2t1cnlha292ICA8YXBAYXBwbGUuY29tPgogCiAgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02OTQ5MgpJbmRleDogU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL3F0L1dlYkNvbnRleHRRdC5jcHAKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L1dlYkNvbnRleHRRdC5jcHAJKHJldmlzaW9uIDk2NTIy KQorKysgU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L1dlYkNvbnRleHRRdC5jcHAJKHdvcmtp bmcgY29weSkKQEAgLTM2LDcgKzM2LDcgQEAgbmFtZXNwYWNlIFdlYktpdCB7CiAKIFN0cmluZyBX ZWJDb250ZXh0OjphcHBsaWNhdGlvbkNhY2hlRGlyZWN0b3J5KCkKIHsKLSAgICByZXR1cm4gV2Vi Q29yZTo6Y2FjaGVTdG9yYWdlKCkuY2FjaGVEaXJlY3RvcnkoKTsKKyAgICByZXR1cm4gUURlc2t0 b3BTZXJ2aWNlczo6c3RvcmFnZUxvY2F0aW9uKFFEZXNrdG9wU2VydmljZXM6OkRhdGFMb2NhdGlv bik7CiB9CiAKIHZvaWQgV2ViQ29udGV4dDo6cGxhdGZvcm1Jbml0aWFsaXplV2ViUHJvY2VzcyhX ZWJQcm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJzJiBwYXJhbWV0ZXJzKQpJbmRleDogTGF5b3V0VGVz dHMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL0NoYW5nZUxvZwkocmV2aXNp b24gOTY4MjgpCisrKyBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEs MyArMSwxMiBAQAorMjAxMS0xMC0wNiAgUWkgWmhhbmcgIDxxaS4yLnpoYW5nQG5va2lhLmNvbT4K KworICAgICAgICBbUXRdW1dLMl0gQXBwbGljYXRpb25DYWNoZSBMYXlvdXRUZXN0cyBmYWlsZWQK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTY5NTQxCisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBwbGF0Zm9y bS9xdC13azIvU2tpcHBlZDoKKwogMjAxMS0xMC0wNiAgTWFyayBQaWxncmltICA8cGlsZ3JpbUBj aHJvbWl1bS5vcmc+CiAKICAgICAgICAgVGVzdCBob3cgRE9NVG9rZW5MaXN0IG1ldGhvZHMgcmVh Y3QgdG8gdG9vIGZldyBhcmd1bWVudHMKSW5kZXg6IExheW91dFRlc3RzL3BsYXRmb3JtL3F0LXdr Mi9Ta2lwcGVkCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL3BsYXRmb3JtL3F0LXdrMi9Ta2lw cGVkCShyZXZpc2lvbiA5NjUyMikKKysrIExheW91dFRlc3RzL3BsYXRmb3JtL3F0LXdrMi9Ta2lw cGVkCSh3b3JraW5nIGNvcHkpCkBAIC0zMjUsNyArMzI1LDYgQEAgc3RvcmFnZS9vcGVuLWRhdGFi YXNlLWVtcHR5LXZlcnNpb24uaHRtbAogc3RvcmFnZS9yZWFkLXRyYW5zYWN0aW9ucy1ydW5uaW5n LWNvbmN1cnJlbnRseS5odG1sCiAKICMgRkFJTDogVGltZWQgb3V0IHdhaXRpbmcgZm9yIG5vdGlm eURvbmUgdG8gYmUgY2FsbGVkCi1odHRwL3Rlc3RzL2FwcGNhY2hlCiBmYXN0L2RvbS9iZWZvcmVs b2FkL3ZpZGVvLWJlZm9yZS1sb2FkLmh0bWwKIG1lZGlhL3ZpZGVvLXNvdXJjZS1tb3ZlZC5odG1s CiBodHRwL3Rlc3RzL3dlYnNvY2tldC90ZXN0cy9oaXhpZTc2L2ZyYW1lLWxlbmd0aHMuaHRtbAo= 110002 2011-10-06 13:14:48 -0700 2011-10-06 13:15:52 -0700 patch2 bug69541_2.patch text/plain 7170 qi.2.zhang SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDk2ODUyKQorKysgU291cmNlL1dlYktpdDIvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMzEgQEAKKzIwMTEtMTAtMDYgIFFpIFpoYW5n ICA8cWkuMi56aGFuZ0Bub2tpYS5jb20+CisKKyAgICAgICAgW1F0XVtXSzJdIEFwcGxpY2F0aW9u Q2FjaGUgTGF5b3V0VGVzdHMgZmFpbGVkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD02OTU0MQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIDEuIFNldCB0aGUgYXBwbGljYXRpb25DYWNoZURpcmVjdG9yeSB0byB0 aGUgZGVmYXVsdCBwbGFjZSBsaWtlIGNvb2tpZS4gVGhlIG9yaWdpbmFsIHZhbHVlIGlzIG51bGwg d2hpY2ggZGVwZW5kIG9uIHVpIGNsaWVudCB0bworICAgICAgICBzZXQgYW5kIHdlIGRpZG4ndCBz ZXQgeWV0LgorICAgICAgICAyLiBBZGQgaW50ZXJmYWNlIHBsYXRmb3JtRGVmYXVsdEFwcGxpY2F0 aW9uQ2FjaGVEaXJlY3RvcnkgbGlrZSBwbGF0Zm9ybURlZmF1bHREYXRhYmFzZURpcmVjdG9yeSwg cGxhdGZvcm1EZWZhdWx0SWNvbkRhdGFiYXNlUGF0aAorICAgICAgICBhbmQgcGxhdGZvcm1EZWZh dWx0TG9jYWxTdG9yYWdlRGlyZWN0b3J5IGRpZC4KKyAgICAgICAgMy4gQWRkIGludGVyZmFjZSBz ZXRBcHBsaWNhdGlvbkNhY2hlRGlyZWN0b3J5LgorCisgICAgICAgICogVUlQcm9jZXNzL1dlYkNv bnRleHQuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJDb250ZXh0OjphcHBsaWNhdGlvbkNhY2hl RGlyZWN0b3J5KToKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViQ29udGV4dC5oOgorICAgICAgICAo V2ViS2l0OjpXZWJDb250ZXh0OjpzZXRBcHBsaWNhdGlvbkNhY2hlRGlyZWN0b3J5KToKKyAgICAg ICAgKiBVSVByb2Nlc3MvZWZsL1dlYkNvbnRleHRFZmwuY3BwOgorICAgICAgICAoV2ViS2l0OjpX ZWJDb250ZXh0OjpwbGF0Zm9ybURlZmF1bHRBcHBsaWNhdGlvbkNhY2hlRGlyZWN0b3J5KToKKyAg ICAgICAgKiBVSVByb2Nlc3MvZ3RrL1dlYkNvbnRleHRHdGsuY3BwOgorICAgICAgICAoV2ViS2l0 OjpXZWJDb250ZXh0OjpwbGF0Zm9ybURlZmF1bHRBcHBsaWNhdGlvbkNhY2hlRGlyZWN0b3J5KToK KyAgICAgICAgKiBVSVByb2Nlc3MvbWFjL1dlYkNvbnRleHRNYWMubW06CisgICAgICAgIChXZWJL aXQ6OldlYkNvbnRleHQ6OnBsYXRmb3JtRGVmYXVsdEFwcGxpY2F0aW9uQ2FjaGVEaXJlY3Rvcnkp OgorICAgICAgICAqIFVJUHJvY2Vzcy9xdC9XZWJDb250ZXh0UXQuY3BwOgorICAgICAgICAoV2Vi S2l0OjpXZWJDb250ZXh0OjpwbGF0Zm9ybURlZmF1bHRBcHBsaWNhdGlvbkNhY2hlRGlyZWN0b3J5 KToKKyAgICAgICAgKiBVSVByb2Nlc3Mvd2luL1dlYkNvbnRleHRXaW4uY3BwOgorICAgICAgICAo V2ViS2l0OjpXZWJDb250ZXh0OjpwbGF0Zm9ybURlZmF1bHRBcHBsaWNhdGlvbkNhY2hlRGlyZWN0 b3J5KToKKwogMjAxMS0xMC0wNiAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxp YS5jb20+CiAKICAgICAgICAgW0dUS10gQWRkIGVzdGltYXRlZC1wcm9ncmVzcyBwcm9wZXJ0eSB0 byBXZWJLaXRXZWJMb2FkZXJDbGllbnQKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9X ZWJDb250ZXh0LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2Vi Q29udGV4dC5jcHAJKHJldmlzaW9uIDk2ODM2KQorKysgU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L1dlYkNvbnRleHQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC04MDQsNiArODA0LDE0IEBAIFN0cmlu ZyBXZWJDb250ZXh0Ojpsb2NhbFN0b3JhZ2VEaXJlY3RvcnkKICAgICByZXR1cm4gcGxhdGZvcm1E ZWZhdWx0TG9jYWxTdG9yYWdlRGlyZWN0b3J5KCk7CiB9CiAKK1N0cmluZyBXZWJDb250ZXh0Ojph cHBsaWNhdGlvbkNhY2hlRGlyZWN0b3J5KCkgY29uc3QKK3sKKyAgICBpZiAoIW1fb3ZlcnJpZGVB cHBsaWNhdGlvbkNhY2hlRGlyZWN0b3J5LmlzRW1wdHkoKSkKKyAgICAgICAgcmV0dXJuIG1fb3Zl cnJpZGVBcHBsaWNhdGlvbkNhY2hlRGlyZWN0b3J5OworCisgICAgcmV0dXJuIHBsYXRmb3JtRGVm YXVsdEFwcGxpY2F0aW9uQ2FjaGVEaXJlY3RvcnkoKTsKK30KKwogdm9pZCBXZWJDb250ZXh0Ojpz ZXRIVFRQUGlwZWxpbmluZ0VuYWJsZWQoYm9vbCBlbmFibGVkKQogewogI2lmIFBMQVRGT1JNKE1B QykKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJDb250ZXh0LmgKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYkNvbnRleHQuaAkocmV2aXNpb24gOTY4 MzYpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViQ29udGV4dC5oCSh3b3JraW5nIGNv cHkpCkBAIC0xMTAsNyArMTEwLDkgQEAgcHVibGljOgogICAgIHZvaWQgc2V0QWRkaXRpb25hbFBs dWdpbnNEaXJlY3RvcnkoY29uc3QgU3RyaW5nJik7CiAKICAgICBQbHVnaW5JbmZvU3RvcmUmIHBs dWdpbkluZm9TdG9yZSgpIHsgcmV0dXJuIG1fcGx1Z2luSW5mb1N0b3JlOyB9Ci0gICAgU3RyaW5n IGFwcGxpY2F0aW9uQ2FjaGVEaXJlY3RvcnkoKTsKKyAgICBTdHJpbmcgYXBwbGljYXRpb25DYWNo ZURpcmVjdG9yeSgpIGNvbnN0OworICAgIFN0cmluZyBwbGF0Zm9ybURlZmF1bHRBcHBsaWNhdGlv bkNhY2hlRGlyZWN0b3J5KCkgY29uc3Q7CisgICAgdm9pZCBzZXRBcHBsaWNhdGlvbkNhY2hlRGly ZWN0b3J5KGNvbnN0IFN0cmluZyYgZGlyKSB7IG1fb3ZlcnJpZGVBcHBsaWNhdGlvbkNhY2hlRGly ZWN0b3J5ID0gZGlyOyB9CiAKICAgICB2b2lkIHNldEFsd2F5c1VzZXNDb21wbGV4VGV4dENvZGVQ YXRoKGJvb2wpOwogICAgIHZvaWQgc2V0U2hvdWxkVXNlRm9udFNtb290aGluZyhib29sKTsKQEAg LTI3OSw2ICsyODEsNyBAQCBwcml2YXRlOgogICAgIFN0cmluZyBtX292ZXJyaWRlRGF0YWJhc2VE aXJlY3Rvcnk7CiAgICAgU3RyaW5nIG1fb3ZlcnJpZGVJY29uRGF0YWJhc2VQYXRoOwogICAgIFN0 cmluZyBtX292ZXJyaWRlTG9jYWxTdG9yYWdlRGlyZWN0b3J5OworICAgIFN0cmluZyBtX292ZXJy aWRlQXBwbGljYXRpb25DYWNoZURpcmVjdG9yeTsKIAogICAgIGJvb2wgbV9wcm9jZXNzVGVybWlu YXRpb25FbmFibGVkOwogICAgIApJbmRleDogU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2VmbC9X ZWJDb250ZXh0RWZsLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv ZWZsL1dlYkNvbnRleHRFZmwuY3BwCShyZXZpc2lvbiA5NjgzNikKKysrIFNvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9lZmwvV2ViQ29udGV4dEVmbC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTMxLDcg KzMxLDcgQEAKIAogbmFtZXNwYWNlIFdlYktpdCB7CiAKLVN0cmluZyBXZWJDb250ZXh0OjphcHBs aWNhdGlvbkNhY2hlRGlyZWN0b3J5KCkKK1N0cmluZyBXZWJDb250ZXh0OjpwbGF0Zm9ybURlZmF1 bHRBcHBsaWNhdGlvbkNhY2hlRGlyZWN0b3J5KCkgY29uc3QKIHsKICAgICByZXR1cm4gV2ViQ29y ZTo6Y2FjaGVTdG9yYWdlKCkuY2FjaGVEaXJlY3RvcnkoKTsKIH0KSW5kZXg6IFNvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9ndGsvV2ViQ29udGV4dEd0ay5jcHAKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL2d0ay9XZWJDb250ZXh0R3RrLmNwcAkocmV2aXNpb24gOTY4MzYp CisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvZ3RrL1dlYkNvbnRleHRHdGsuY3BwCSh3b3Jr aW5nIGNvcHkpCkBAIC0zMSw3ICszMSw3IEBACiAKIG5hbWVzcGFjZSBXZWJLaXQgewogCi1XVEY6 OlN0cmluZyBXZWJDb250ZXh0OjphcHBsaWNhdGlvbkNhY2hlRGlyZWN0b3J5KCkKK1dURjo6U3Ry aW5nIFdlYkNvbnRleHQ6OnBsYXRmb3JtRGVmYXVsdEFwcGxpY2F0aW9uQ2FjaGVEaXJlY3Rvcnko KSBjb25zdAogewogICAgIHJldHVybiBXZWJDb3JlOjpjYWNoZVN0b3JhZ2UoKS5jYWNoZURpcmVj dG9yeSgpOwogfQpJbmRleDogU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9XZWJDb250ZXh0 TWFjLm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvV2ViQ29u dGV4dE1hYy5tbQkocmV2aXNpb24gOTY4MzYpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv bWFjL1dlYkNvbnRleHRNYWMubW0JKHdvcmtpbmcgY29weSkKQEAgLTQ0LDcgKzQ0LDcgQEAgTlNT dHJpbmcgKldlYkljb25EYXRhYmFzZURpcmVjdG9yeURlZmF1bAogCiBuYW1lc3BhY2UgV2ViS2l0 IHsKIAotU3RyaW5nIFdlYkNvbnRleHQ6OmFwcGxpY2F0aW9uQ2FjaGVEaXJlY3RvcnkoKQorU3Ry aW5nIFdlYkNvbnRleHQ6OnBsYXRmb3JtRGVmYXVsdEFwcGxpY2F0aW9uQ2FjaGVEaXJlY3Rvcnko KSBjb25zdAogewogICAgIE5TU3RyaW5nICphcHBOYW1lID0gW1tOU0J1bmRsZSBtYWluQnVuZGxl XSBidW5kbGVJZGVudGlmaWVyXTsKICAgICBpZiAoIWFwcE5hbWUpCkluZGV4OiBTb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvcXQvV2ViQ29udGV4dFF0LmNwcAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvcXQvV2ViQ29udGV4dFF0LmNwcAkocmV2aXNpb24gOTY4MzYpCisr KyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvV2ViQ29udGV4dFF0LmNwcAkod29ya2luZyBj b3B5KQpAQCAtNTUsOSArNTUsOSBAQCBzdGF0aWMgUVN0cmluZyBkZWZhdWx0RGF0YUxvY2F0aW9u KCkKIHN0YXRpYyBRU3RyaW5nIHNfZGVmYXVsdERhdGFiYXNlRGlyZWN0b3J5Owogc3RhdGljIFFT dHJpbmcgc19kZWZhdWx0TG9jYWxTdG9yYWdlRGlyZWN0b3J5OwogCi1TdHJpbmcgV2ViQ29udGV4 dDo6YXBwbGljYXRpb25DYWNoZURpcmVjdG9yeSgpCitTdHJpbmcgV2ViQ29udGV4dDo6cGxhdGZv cm1EZWZhdWx0QXBwbGljYXRpb25DYWNoZURpcmVjdG9yeSgpIGNvbnN0CiB7Ci0gICAgcmV0dXJu IFdlYkNvcmU6OmNhY2hlU3RvcmFnZSgpLmNhY2hlRGlyZWN0b3J5KCk7CisgICAgcmV0dXJuIGRl ZmF1bHREYXRhTG9jYXRpb24oKTsKIH0KIAogdm9pZCBXZWJDb250ZXh0OjpwbGF0Zm9ybUluaXRp YWxpemVXZWJQcm9jZXNzKFdlYlByb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnMmIHBhcmFtZXRlcnMp CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mvd2luL1dlYkNvbnRleHRXaW4uY3BwCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy93aW4vV2ViQ29udGV4dFdpbi5j cHAJKHJldmlzaW9uIDk2ODM2KQorKysgU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3dpbi9XZWJD b250ZXh0V2luLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzksNyArMzksNyBAQCB1c2luZyBuYW1l c3BhY2UgV2ViQ29yZTsKIAogbmFtZXNwYWNlIFdlYktpdCB7CiAKLVN0cmluZyBXZWJDb250ZXh0 OjphcHBsaWNhdGlvbkNhY2hlRGlyZWN0b3J5KCkKK1N0cmluZyBXZWJDb250ZXh0OjpwbGF0Zm9y bURlZmF1bHRBcHBsaWNhdGlvbkNhY2hlRGlyZWN0b3J5KCkgY29uc3QKIHsKICAgICByZXR1cm4g bG9jYWxVc2VyU3BlY2lmaWNTdG9yYWdlRGlyZWN0b3J5KCk7CiB9CkluZGV4OiBMYXlvdXRUZXN0 cy9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCShyZXZpc2lv biA5Njg1MikKKysrIExheW91dFRlc3RzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDEyIEBACisyMDExLTEwLTA2ICBRaSBaaGFuZyAgPHFpLjIuemhhbmdAbm9raWEuY29tPgor CisgICAgICAgIFtRdF1bV0syXSBBcHBsaWNhdGlvbkNhY2hlIExheW91dFRlc3RzIGZhaWxlZAor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Njk1NDEKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHBsYXRmb3Jt L3F0LXdrMi9Ta2lwcGVkOgorCiAyMDExLTEwLTA2ICBEaXJrIFNjaHVsemUgIDxrcml0QHdlYmtp dC5vcmc+CiAKICAgICAgICAgVW5yZXZpZXdlZDogM3JkIGNodW5rIG9mIG5ldyBTVkcgYmFzZWxp bmUgZm9yIGxpb24uCkluZGV4OiBMYXlvdXRUZXN0cy9wbGF0Zm9ybS9xdC13azIvU2tpcHBlZAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9wbGF0Zm9ybS9xdC13azIvU2tpcHBlZAkocmV2aXNp b24gOTY4MzYpCisrKyBMYXlvdXRUZXN0cy9wbGF0Zm9ybS9xdC13azIvU2tpcHBlZAkod29ya2lu ZyBjb3B5KQpAQCAtMzMxLDcgKzMzMSw2IEBAIHN0b3JhZ2Uvb3Blbi1kYXRhYmFzZS1lbXB0eS12 ZXJzaW9uLmh0bWwKIHN0b3JhZ2UvcmVhZC10cmFuc2FjdGlvbnMtcnVubmluZy1jb25jdXJyZW50 bHkuaHRtbAogCiAjIEZBSUw6IFRpbWVkIG91dCB3YWl0aW5nIGZvciBub3RpZnlEb25lIHRvIGJl IGNhbGxlZAotaHR0cC90ZXN0cy9hcHBjYWNoZQogZmFzdC9kb20vYmVmb3JlbG9hZC92aWRlby1i ZWZvcmUtbG9hZC5odG1sCiBtZWRpYS92aWRlby1zb3VyY2UtbW92ZWQuaHRtbAogaHR0cC90ZXN0 cy93ZWJzb2NrZXQvdGVzdHMvaGl4aWU3Ni9mcmFtZS1sZW5ndGhzLmh0bWwK 110003 2011-10-06 13:15:52 -0700 2011-10-15 01:52:07 -0700 patch2 bug69541_2.patch text/plain 7170 qi.2.zhang SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDk2ODUyKQorKysgU291cmNlL1dlYktpdDIvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMzEgQEAKKzIwMTEtMTAtMDYgIFFpIFpoYW5n ICA8cWkuMi56aGFuZ0Bub2tpYS5jb20+CisKKyAgICAgICAgW1F0XVtXSzJdIEFwcGxpY2F0aW9u Q2FjaGUgTGF5b3V0VGVzdHMgZmFpbGVkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD02OTU0MQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIDEuIFNldCB0aGUgYXBwbGljYXRpb25DYWNoZURpcmVjdG9yeSB0byB0 aGUgZGVmYXVsdCBwbGFjZSBsaWtlIGNvb2tpZS4gVGhlIG9yaWdpbmFsIHZhbHVlIGlzIG51bGwg d2hpY2ggZGVwZW5kIG9uIHVpIGNsaWVudCB0bworICAgICAgICBzZXQgYW5kIHdlIGRpZG4ndCBz ZXQgeWV0LgorICAgICAgICAyLiBBZGQgaW50ZXJmYWNlIHBsYXRmb3JtRGVmYXVsdEFwcGxpY2F0 aW9uQ2FjaGVEaXJlY3RvcnkgbGlrZSBwbGF0Zm9ybURlZmF1bHREYXRhYmFzZURpcmVjdG9yeSwg cGxhdGZvcm1EZWZhdWx0SWNvbkRhdGFiYXNlUGF0aAorICAgICAgICBhbmQgcGxhdGZvcm1EZWZh dWx0TG9jYWxTdG9yYWdlRGlyZWN0b3J5IGRpZC4KKyAgICAgICAgMy4gQWRkIGludGVyZmFjZSBz ZXRBcHBsaWNhdGlvbkNhY2hlRGlyZWN0b3J5LgorCisgICAgICAgICogVUlQcm9jZXNzL1dlYkNv bnRleHQuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJDb250ZXh0OjphcHBsaWNhdGlvbkNhY2hl RGlyZWN0b3J5KToKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViQ29udGV4dC5oOgorICAgICAgICAo V2ViS2l0OjpXZWJDb250ZXh0OjpzZXRBcHBsaWNhdGlvbkNhY2hlRGlyZWN0b3J5KToKKyAgICAg ICAgKiBVSVByb2Nlc3MvZWZsL1dlYkNvbnRleHRFZmwuY3BwOgorICAgICAgICAoV2ViS2l0OjpX ZWJDb250ZXh0OjpwbGF0Zm9ybURlZmF1bHRBcHBsaWNhdGlvbkNhY2hlRGlyZWN0b3J5KToKKyAg ICAgICAgKiBVSVByb2Nlc3MvZ3RrL1dlYkNvbnRleHRHdGsuY3BwOgorICAgICAgICAoV2ViS2l0 OjpXZWJDb250ZXh0OjpwbGF0Zm9ybURlZmF1bHRBcHBsaWNhdGlvbkNhY2hlRGlyZWN0b3J5KToK KyAgICAgICAgKiBVSVByb2Nlc3MvbWFjL1dlYkNvbnRleHRNYWMubW06CisgICAgICAgIChXZWJL aXQ6OldlYkNvbnRleHQ6OnBsYXRmb3JtRGVmYXVsdEFwcGxpY2F0aW9uQ2FjaGVEaXJlY3Rvcnkp OgorICAgICAgICAqIFVJUHJvY2Vzcy9xdC9XZWJDb250ZXh0UXQuY3BwOgorICAgICAgICAoV2Vi S2l0OjpXZWJDb250ZXh0OjpwbGF0Zm9ybURlZmF1bHRBcHBsaWNhdGlvbkNhY2hlRGlyZWN0b3J5 KToKKyAgICAgICAgKiBVSVByb2Nlc3Mvd2luL1dlYkNvbnRleHRXaW4uY3BwOgorICAgICAgICAo V2ViS2l0OjpXZWJDb250ZXh0OjpwbGF0Zm9ybURlZmF1bHRBcHBsaWNhdGlvbkNhY2hlRGlyZWN0 b3J5KToKKwogMjAxMS0xMC0wNiAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxp YS5jb20+CiAKICAgICAgICAgW0dUS10gQWRkIGVzdGltYXRlZC1wcm9ncmVzcyBwcm9wZXJ0eSB0 byBXZWJLaXRXZWJMb2FkZXJDbGllbnQKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9X ZWJDb250ZXh0LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2Vi Q29udGV4dC5jcHAJKHJldmlzaW9uIDk2ODM2KQorKysgU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L1dlYkNvbnRleHQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC04MDQsNiArODA0LDE0IEBAIFN0cmlu ZyBXZWJDb250ZXh0Ojpsb2NhbFN0b3JhZ2VEaXJlY3RvcnkKICAgICByZXR1cm4gcGxhdGZvcm1E ZWZhdWx0TG9jYWxTdG9yYWdlRGlyZWN0b3J5KCk7CiB9CiAKK1N0cmluZyBXZWJDb250ZXh0Ojph cHBsaWNhdGlvbkNhY2hlRGlyZWN0b3J5KCkgY29uc3QKK3sKKyAgICBpZiAoIW1fb3ZlcnJpZGVB cHBsaWNhdGlvbkNhY2hlRGlyZWN0b3J5LmlzRW1wdHkoKSkKKyAgICAgICAgcmV0dXJuIG1fb3Zl cnJpZGVBcHBsaWNhdGlvbkNhY2hlRGlyZWN0b3J5OworCisgICAgcmV0dXJuIHBsYXRmb3JtRGVm YXVsdEFwcGxpY2F0aW9uQ2FjaGVEaXJlY3RvcnkoKTsKK30KKwogdm9pZCBXZWJDb250ZXh0Ojpz ZXRIVFRQUGlwZWxpbmluZ0VuYWJsZWQoYm9vbCBlbmFibGVkKQogewogI2lmIFBMQVRGT1JNKE1B QykKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJDb250ZXh0LmgKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYkNvbnRleHQuaAkocmV2aXNpb24gOTY4 MzYpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViQ29udGV4dC5oCSh3b3JraW5nIGNv cHkpCkBAIC0xMTAsNyArMTEwLDkgQEAgcHVibGljOgogICAgIHZvaWQgc2V0QWRkaXRpb25hbFBs dWdpbnNEaXJlY3RvcnkoY29uc3QgU3RyaW5nJik7CiAKICAgICBQbHVnaW5JbmZvU3RvcmUmIHBs dWdpbkluZm9TdG9yZSgpIHsgcmV0dXJuIG1fcGx1Z2luSW5mb1N0b3JlOyB9Ci0gICAgU3RyaW5n IGFwcGxpY2F0aW9uQ2FjaGVEaXJlY3RvcnkoKTsKKyAgICBTdHJpbmcgYXBwbGljYXRpb25DYWNo ZURpcmVjdG9yeSgpIGNvbnN0OworICAgIFN0cmluZyBwbGF0Zm9ybURlZmF1bHRBcHBsaWNhdGlv bkNhY2hlRGlyZWN0b3J5KCkgY29uc3Q7CisgICAgdm9pZCBzZXRBcHBsaWNhdGlvbkNhY2hlRGly ZWN0b3J5KGNvbnN0IFN0cmluZyYgZGlyKSB7IG1fb3ZlcnJpZGVBcHBsaWNhdGlvbkNhY2hlRGly ZWN0b3J5ID0gZGlyOyB9CiAKICAgICB2b2lkIHNldEFsd2F5c1VzZXNDb21wbGV4VGV4dENvZGVQ YXRoKGJvb2wpOwogICAgIHZvaWQgc2V0U2hvdWxkVXNlRm9udFNtb290aGluZyhib29sKTsKQEAg LTI3OSw2ICsyODEsNyBAQCBwcml2YXRlOgogICAgIFN0cmluZyBtX292ZXJyaWRlRGF0YWJhc2VE aXJlY3Rvcnk7CiAgICAgU3RyaW5nIG1fb3ZlcnJpZGVJY29uRGF0YWJhc2VQYXRoOwogICAgIFN0 cmluZyBtX292ZXJyaWRlTG9jYWxTdG9yYWdlRGlyZWN0b3J5OworICAgIFN0cmluZyBtX292ZXJy aWRlQXBwbGljYXRpb25DYWNoZURpcmVjdG9yeTsKIAogICAgIGJvb2wgbV9wcm9jZXNzVGVybWlu YXRpb25FbmFibGVkOwogICAgIApJbmRleDogU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2VmbC9X ZWJDb250ZXh0RWZsLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv ZWZsL1dlYkNvbnRleHRFZmwuY3BwCShyZXZpc2lvbiA5NjgzNikKKysrIFNvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9lZmwvV2ViQ29udGV4dEVmbC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTMxLDcg KzMxLDcgQEAKIAogbmFtZXNwYWNlIFdlYktpdCB7CiAKLVN0cmluZyBXZWJDb250ZXh0OjphcHBs aWNhdGlvbkNhY2hlRGlyZWN0b3J5KCkKK1N0cmluZyBXZWJDb250ZXh0OjpwbGF0Zm9ybURlZmF1 bHRBcHBsaWNhdGlvbkNhY2hlRGlyZWN0b3J5KCkgY29uc3QKIHsKICAgICByZXR1cm4gV2ViQ29y ZTo6Y2FjaGVTdG9yYWdlKCkuY2FjaGVEaXJlY3RvcnkoKTsKIH0KSW5kZXg6IFNvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9ndGsvV2ViQ29udGV4dEd0ay5jcHAKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL2d0ay9XZWJDb250ZXh0R3RrLmNwcAkocmV2aXNpb24gOTY4MzYp CisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvZ3RrL1dlYkNvbnRleHRHdGsuY3BwCSh3b3Jr aW5nIGNvcHkpCkBAIC0zMSw3ICszMSw3IEBACiAKIG5hbWVzcGFjZSBXZWJLaXQgewogCi1XVEY6 OlN0cmluZyBXZWJDb250ZXh0OjphcHBsaWNhdGlvbkNhY2hlRGlyZWN0b3J5KCkKK1dURjo6U3Ry aW5nIFdlYkNvbnRleHQ6OnBsYXRmb3JtRGVmYXVsdEFwcGxpY2F0aW9uQ2FjaGVEaXJlY3Rvcnko KSBjb25zdAogewogICAgIHJldHVybiBXZWJDb3JlOjpjYWNoZVN0b3JhZ2UoKS5jYWNoZURpcmVj dG9yeSgpOwogfQpJbmRleDogU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9XZWJDb250ZXh0 TWFjLm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvV2ViQ29u dGV4dE1hYy5tbQkocmV2aXNpb24gOTY4MzYpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv bWFjL1dlYkNvbnRleHRNYWMubW0JKHdvcmtpbmcgY29weSkKQEAgLTQ0LDcgKzQ0LDcgQEAgTlNT dHJpbmcgKldlYkljb25EYXRhYmFzZURpcmVjdG9yeURlZmF1bAogCiBuYW1lc3BhY2UgV2ViS2l0 IHsKIAotU3RyaW5nIFdlYkNvbnRleHQ6OmFwcGxpY2F0aW9uQ2FjaGVEaXJlY3RvcnkoKQorU3Ry aW5nIFdlYkNvbnRleHQ6OnBsYXRmb3JtRGVmYXVsdEFwcGxpY2F0aW9uQ2FjaGVEaXJlY3Rvcnko KSBjb25zdAogewogICAgIE5TU3RyaW5nICphcHBOYW1lID0gW1tOU0J1bmRsZSBtYWluQnVuZGxl XSBidW5kbGVJZGVudGlmaWVyXTsKICAgICBpZiAoIWFwcE5hbWUpCkluZGV4OiBTb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvcXQvV2ViQ29udGV4dFF0LmNwcAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvcXQvV2ViQ29udGV4dFF0LmNwcAkocmV2aXNpb24gOTY4MzYpCisr KyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvV2ViQ29udGV4dFF0LmNwcAkod29ya2luZyBj b3B5KQpAQCAtNTUsOSArNTUsOSBAQCBzdGF0aWMgUVN0cmluZyBkZWZhdWx0RGF0YUxvY2F0aW9u KCkKIHN0YXRpYyBRU3RyaW5nIHNfZGVmYXVsdERhdGFiYXNlRGlyZWN0b3J5Owogc3RhdGljIFFT dHJpbmcgc19kZWZhdWx0TG9jYWxTdG9yYWdlRGlyZWN0b3J5OwogCi1TdHJpbmcgV2ViQ29udGV4 dDo6YXBwbGljYXRpb25DYWNoZURpcmVjdG9yeSgpCitTdHJpbmcgV2ViQ29udGV4dDo6cGxhdGZv cm1EZWZhdWx0QXBwbGljYXRpb25DYWNoZURpcmVjdG9yeSgpIGNvbnN0CiB7Ci0gICAgcmV0dXJu IFdlYkNvcmU6OmNhY2hlU3RvcmFnZSgpLmNhY2hlRGlyZWN0b3J5KCk7CisgICAgcmV0dXJuIGRl ZmF1bHREYXRhTG9jYXRpb24oKTsKIH0KIAogdm9pZCBXZWJDb250ZXh0OjpwbGF0Zm9ybUluaXRp YWxpemVXZWJQcm9jZXNzKFdlYlByb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnMmIHBhcmFtZXRlcnMp CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mvd2luL1dlYkNvbnRleHRXaW4uY3BwCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy93aW4vV2ViQ29udGV4dFdpbi5j cHAJKHJldmlzaW9uIDk2ODM2KQorKysgU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3dpbi9XZWJD b250ZXh0V2luLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzksNyArMzksNyBAQCB1c2luZyBuYW1l c3BhY2UgV2ViQ29yZTsKIAogbmFtZXNwYWNlIFdlYktpdCB7CiAKLVN0cmluZyBXZWJDb250ZXh0 OjphcHBsaWNhdGlvbkNhY2hlRGlyZWN0b3J5KCkKK1N0cmluZyBXZWJDb250ZXh0OjpwbGF0Zm9y bURlZmF1bHRBcHBsaWNhdGlvbkNhY2hlRGlyZWN0b3J5KCkgY29uc3QKIHsKICAgICByZXR1cm4g bG9jYWxVc2VyU3BlY2lmaWNTdG9yYWdlRGlyZWN0b3J5KCk7CiB9CkluZGV4OiBMYXlvdXRUZXN0 cy9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCShyZXZpc2lv biA5Njg1MikKKysrIExheW91dFRlc3RzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDEyIEBACisyMDExLTEwLTA2ICBRaSBaaGFuZyAgPHFpLjIuemhhbmdAbm9raWEuY29tPgor CisgICAgICAgIFtRdF1bV0syXSBBcHBsaWNhdGlvbkNhY2hlIExheW91dFRlc3RzIGZhaWxlZAor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Njk1NDEKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHBsYXRmb3Jt L3F0LXdrMi9Ta2lwcGVkOgorCiAyMDExLTEwLTA2ICBEaXJrIFNjaHVsemUgIDxrcml0QHdlYmtp dC5vcmc+CiAKICAgICAgICAgVW5yZXZpZXdlZDogM3JkIGNodW5rIG9mIG5ldyBTVkcgYmFzZWxp bmUgZm9yIGxpb24uCkluZGV4OiBMYXlvdXRUZXN0cy9wbGF0Zm9ybS9xdC13azIvU2tpcHBlZAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9wbGF0Zm9ybS9xdC13azIvU2tpcHBlZAkocmV2aXNp b24gOTY4MzYpCisrKyBMYXlvdXRUZXN0cy9wbGF0Zm9ybS9xdC13azIvU2tpcHBlZAkod29ya2lu ZyBjb3B5KQpAQCAtMzMxLDcgKzMzMSw2IEBAIHN0b3JhZ2Uvb3Blbi1kYXRhYmFzZS1lbXB0eS12 ZXJzaW9uLmh0bWwKIHN0b3JhZ2UvcmVhZC10cmFuc2FjdGlvbnMtcnVubmluZy1jb25jdXJyZW50 bHkuaHRtbAogCiAjIEZBSUw6IFRpbWVkIG91dCB3YWl0aW5nIGZvciBub3RpZnlEb25lIHRvIGJl IGNhbGxlZAotaHR0cC90ZXN0cy9hcHBjYWNoZQogZmFzdC9kb20vYmVmb3JlbG9hZC92aWRlby1i ZWZvcmUtbG9hZC5odG1sCiBtZWRpYS92aWRlby1zb3VyY2UtbW92ZWQuaHRtbAogaHR0cC90ZXN0 cy93ZWJzb2NrZXQvdGVzdHMvaGl4aWU3Ni9mcmFtZS1sZW5ndGhzLmh0bWwK 110140 2011-10-07 07:02:20 -0700 2012-08-29 14:09:22 -0700 patch3 bug69541_3.patch text/plain 7152 qi.2.zhang SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDk2ODUyKQorKysgU291cmNlL1dlYktpdDIvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMzEgQEAKKzIwMTEtMTAtMDYgIFFpIFpoYW5n ICA8cWkuMi56aGFuZ0Bub2tpYS5jb20+CisKKyAgICAgICAgW1F0XVtXSzJdIEFwcGxpY2F0aW9u Q2FjaGUgTGF5b3V0VGVzdHMgZmFpbGVkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD02OTU0MQorCisgICAgICAgIFJldmlld2VkIGJ5IENoYW5nIFNodS4K KworICAgICAgICAxLiBNb3ZlZCBhcHBsaWNhdGlvbkNhY2hlRGlyZWN0b3J5IHRvIGNvbW1vbiBj b2RlLgorICAgICAgICAyLiBBZGRlZCBpbnRlcmZhY2Ugc2V0QXBwbGljYXRpb25DYWNoZURpcmVj dG9yeSB0byBhbGxvdyBVSSBjbGllbnQgb3ZlcnJpZGluZy4KKyAgICAgICAgMy4gUmVuYW1lZCBh bGwgcGxhdGZvcm0tZGVwZW5kZW50IGltcGxlbWVudGF0aW9ucyBvZiBhcHBsaWNhdGlvbkNhY2hl RGlyZWN0b3J5IHRvIHBsYXRmb3JtRGVmYXVsdEFwcGxpY2F0aW9uQ2FjaGVEaXJlY3RvcnkuCisg ICAgICAgIDQuIE9uIFF0LCBzZXQgdGhlIHBsYXRmb3JtRGVmYXVsdEFwcGxpY2F0aW9uQ2FjaGVE aXJlY3RvcnkgdG8gdGhlIGRlZmF1bHQgZGF0YSBsb2NhdGlvbi4KKworCisgICAgICAgICogVUlQ cm9jZXNzL1dlYkNvbnRleHQuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJDb250ZXh0OjphcHBs aWNhdGlvbkNhY2hlRGlyZWN0b3J5KToKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViQ29udGV4dC5o OgorICAgICAgICAoV2ViS2l0OjpXZWJDb250ZXh0OjpzZXRBcHBsaWNhdGlvbkNhY2hlRGlyZWN0 b3J5KToKKyAgICAgICAgKiBVSVByb2Nlc3MvZWZsL1dlYkNvbnRleHRFZmwuY3BwOgorICAgICAg ICAoV2ViS2l0OjpXZWJDb250ZXh0OjpwbGF0Zm9ybURlZmF1bHRBcHBsaWNhdGlvbkNhY2hlRGly ZWN0b3J5KToKKyAgICAgICAgKiBVSVByb2Nlc3MvZ3RrL1dlYkNvbnRleHRHdGsuY3BwOgorICAg ICAgICAoV2ViS2l0OjpXZWJDb250ZXh0OjpwbGF0Zm9ybURlZmF1bHRBcHBsaWNhdGlvbkNhY2hl RGlyZWN0b3J5KToKKyAgICAgICAgKiBVSVByb2Nlc3MvbWFjL1dlYkNvbnRleHRNYWMubW06Cisg ICAgICAgIChXZWJLaXQ6OldlYkNvbnRleHQ6OnBsYXRmb3JtRGVmYXVsdEFwcGxpY2F0aW9uQ2Fj aGVEaXJlY3RvcnkpOgorICAgICAgICAqIFVJUHJvY2Vzcy9xdC9XZWJDb250ZXh0UXQuY3BwOgor ICAgICAgICAoV2ViS2l0OjpXZWJDb250ZXh0OjpwbGF0Zm9ybURlZmF1bHRBcHBsaWNhdGlvbkNh Y2hlRGlyZWN0b3J5KToKKyAgICAgICAgKiBVSVByb2Nlc3Mvd2luL1dlYkNvbnRleHRXaW4uY3Bw OgorICAgICAgICAoV2ViS2l0OjpXZWJDb250ZXh0OjpwbGF0Zm9ybURlZmF1bHRBcHBsaWNhdGlv bkNhY2hlRGlyZWN0b3J5KToKKwogMjAxMS0xMC0wNiAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxj Z2FyY2lhQGlnYWxpYS5jb20+CiAKICAgICAgICAgW0dUS10gQWRkIGVzdGltYXRlZC1wcm9ncmVz cyBwcm9wZXJ0eSB0byBXZWJLaXRXZWJMb2FkZXJDbGllbnQKSW5kZXg6IFNvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9XZWJDb250ZXh0LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvV2ViQ29udGV4dC5jcHAJKHJldmlzaW9uIDk2ODM2KQorKysgU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL1dlYkNvbnRleHQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC04MDQsNiArODA0 LDE0IEBAIFN0cmluZyBXZWJDb250ZXh0Ojpsb2NhbFN0b3JhZ2VEaXJlY3RvcnkKICAgICByZXR1 cm4gcGxhdGZvcm1EZWZhdWx0TG9jYWxTdG9yYWdlRGlyZWN0b3J5KCk7CiB9CiAKK1N0cmluZyBX ZWJDb250ZXh0OjphcHBsaWNhdGlvbkNhY2hlRGlyZWN0b3J5KCkgY29uc3QKK3sKKyAgICBpZiAo IW1fb3ZlcnJpZGVBcHBsaWNhdGlvbkNhY2hlRGlyZWN0b3J5LmlzRW1wdHkoKSkKKyAgICAgICAg cmV0dXJuIG1fb3ZlcnJpZGVBcHBsaWNhdGlvbkNhY2hlRGlyZWN0b3J5OworCisgICAgcmV0dXJu IHBsYXRmb3JtRGVmYXVsdEFwcGxpY2F0aW9uQ2FjaGVEaXJlY3RvcnkoKTsKK30KKwogdm9pZCBX ZWJDb250ZXh0OjpzZXRIVFRQUGlwZWxpbmluZ0VuYWJsZWQoYm9vbCBlbmFibGVkKQogewogI2lm IFBMQVRGT1JNKE1BQykKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJDb250ZXh0 LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYkNvbnRleHQuaAko cmV2aXNpb24gOTY4MzYpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViQ29udGV4dC5o CSh3b3JraW5nIGNvcHkpCkBAIC0xMTAsNyArMTEwLDkgQEAgcHVibGljOgogICAgIHZvaWQgc2V0 QWRkaXRpb25hbFBsdWdpbnNEaXJlY3RvcnkoY29uc3QgU3RyaW5nJik7CiAKICAgICBQbHVnaW5J bmZvU3RvcmUmIHBsdWdpbkluZm9TdG9yZSgpIHsgcmV0dXJuIG1fcGx1Z2luSW5mb1N0b3JlOyB9 Ci0gICAgU3RyaW5nIGFwcGxpY2F0aW9uQ2FjaGVEaXJlY3RvcnkoKTsKKyAgICBTdHJpbmcgYXBw bGljYXRpb25DYWNoZURpcmVjdG9yeSgpIGNvbnN0OworICAgIFN0cmluZyBwbGF0Zm9ybURlZmF1 bHRBcHBsaWNhdGlvbkNhY2hlRGlyZWN0b3J5KCkgY29uc3Q7CisgICAgdm9pZCBzZXRBcHBsaWNh dGlvbkNhY2hlRGlyZWN0b3J5KGNvbnN0IFN0cmluZyYgZGlyKSB7IG1fb3ZlcnJpZGVBcHBsaWNh dGlvbkNhY2hlRGlyZWN0b3J5ID0gZGlyOyB9CiAKICAgICB2b2lkIHNldEFsd2F5c1VzZXNDb21w bGV4VGV4dENvZGVQYXRoKGJvb2wpOwogICAgIHZvaWQgc2V0U2hvdWxkVXNlRm9udFNtb290aGlu Zyhib29sKTsKQEAgLTI3OSw2ICsyODEsNyBAQCBwcml2YXRlOgogICAgIFN0cmluZyBtX292ZXJy aWRlRGF0YWJhc2VEaXJlY3Rvcnk7CiAgICAgU3RyaW5nIG1fb3ZlcnJpZGVJY29uRGF0YWJhc2VQ YXRoOwogICAgIFN0cmluZyBtX292ZXJyaWRlTG9jYWxTdG9yYWdlRGlyZWN0b3J5OworICAgIFN0 cmluZyBtX292ZXJyaWRlQXBwbGljYXRpb25DYWNoZURpcmVjdG9yeTsKIAogICAgIGJvb2wgbV9w cm9jZXNzVGVybWluYXRpb25FbmFibGVkOwogICAgIApJbmRleDogU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL2VmbC9XZWJDb250ZXh0RWZsLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvZWZsL1dlYkNvbnRleHRFZmwuY3BwCShyZXZpc2lvbiA5NjgzNikKKysrIFNv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9lZmwvV2ViQ29udGV4dEVmbC5jcHAJKHdvcmtpbmcgY29w eSkKQEAgLTMxLDcgKzMxLDcgQEAKIAogbmFtZXNwYWNlIFdlYktpdCB7CiAKLVN0cmluZyBXZWJD b250ZXh0OjphcHBsaWNhdGlvbkNhY2hlRGlyZWN0b3J5KCkKK1N0cmluZyBXZWJDb250ZXh0Ojpw bGF0Zm9ybURlZmF1bHRBcHBsaWNhdGlvbkNhY2hlRGlyZWN0b3J5KCkgY29uc3QKIHsKICAgICBy ZXR1cm4gV2ViQ29yZTo6Y2FjaGVTdG9yYWdlKCkuY2FjaGVEaXJlY3RvcnkoKTsKIH0KSW5kZXg6 IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9ndGsvV2ViQ29udGV4dEd0ay5jcHAKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2d0ay9XZWJDb250ZXh0R3RrLmNwcAkocmV2 aXNpb24gOTY4MzYpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvZ3RrL1dlYkNvbnRleHRH dGsuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zMSw3ICszMSw3IEBACiAKIG5hbWVzcGFjZSBXZWJL aXQgewogCi1XVEY6OlN0cmluZyBXZWJDb250ZXh0OjphcHBsaWNhdGlvbkNhY2hlRGlyZWN0b3J5 KCkKK1dURjo6U3RyaW5nIFdlYkNvbnRleHQ6OnBsYXRmb3JtRGVmYXVsdEFwcGxpY2F0aW9uQ2Fj aGVEaXJlY3RvcnkoKSBjb25zdAogewogICAgIHJldHVybiBXZWJDb3JlOjpjYWNoZVN0b3JhZ2Uo KS5jYWNoZURpcmVjdG9yeSgpOwogfQpJbmRleDogU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21h Yy9XZWJDb250ZXh0TWFjLm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9tYWMvV2ViQ29udGV4dE1hYy5tbQkocmV2aXNpb24gOTY4MzYpCisrKyBTb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvbWFjL1dlYkNvbnRleHRNYWMubW0JKHdvcmtpbmcgY29weSkKQEAgLTQ0LDcg KzQ0LDcgQEAgTlNTdHJpbmcgKldlYkljb25EYXRhYmFzZURpcmVjdG9yeURlZmF1bAogCiBuYW1l c3BhY2UgV2ViS2l0IHsKIAotU3RyaW5nIFdlYkNvbnRleHQ6OmFwcGxpY2F0aW9uQ2FjaGVEaXJl Y3RvcnkoKQorU3RyaW5nIFdlYkNvbnRleHQ6OnBsYXRmb3JtRGVmYXVsdEFwcGxpY2F0aW9uQ2Fj aGVEaXJlY3RvcnkoKSBjb25zdAogewogICAgIE5TU3RyaW5nICphcHBOYW1lID0gW1tOU0J1bmRs ZSBtYWluQnVuZGxlXSBidW5kbGVJZGVudGlmaWVyXTsKICAgICBpZiAoIWFwcE5hbWUpCkluZGV4 OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvV2ViQ29udGV4dFF0LmNwcAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvV2ViQ29udGV4dFF0LmNwcAkocmV2aXNp b24gOTY4MzYpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvV2ViQ29udGV4dFF0LmNw cAkod29ya2luZyBjb3B5KQpAQCAtNTUsOSArNTUsOSBAQCBzdGF0aWMgUVN0cmluZyBkZWZhdWx0 RGF0YUxvY2F0aW9uKCkKIHN0YXRpYyBRU3RyaW5nIHNfZGVmYXVsdERhdGFiYXNlRGlyZWN0b3J5 Owogc3RhdGljIFFTdHJpbmcgc19kZWZhdWx0TG9jYWxTdG9yYWdlRGlyZWN0b3J5OwogCi1TdHJp bmcgV2ViQ29udGV4dDo6YXBwbGljYXRpb25DYWNoZURpcmVjdG9yeSgpCitTdHJpbmcgV2ViQ29u dGV4dDo6cGxhdGZvcm1EZWZhdWx0QXBwbGljYXRpb25DYWNoZURpcmVjdG9yeSgpIGNvbnN0CiB7 Ci0gICAgcmV0dXJuIFdlYkNvcmU6OmNhY2hlU3RvcmFnZSgpLmNhY2hlRGlyZWN0b3J5KCk7Cisg ICAgcmV0dXJuIGRlZmF1bHREYXRhTG9jYXRpb24oKTsKIH0KIAogdm9pZCBXZWJDb250ZXh0Ojpw bGF0Zm9ybUluaXRpYWxpemVXZWJQcm9jZXNzKFdlYlByb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnMm IHBhcmFtZXRlcnMpCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mvd2luL1dlYkNvbnRl eHRXaW4uY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy93aW4vV2Vi Q29udGV4dFdpbi5jcHAJKHJldmlzaW9uIDk2ODM2KQorKysgU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL3dpbi9XZWJDb250ZXh0V2luLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzksNyArMzksNyBA QCB1c2luZyBuYW1lc3BhY2UgV2ViQ29yZTsKIAogbmFtZXNwYWNlIFdlYktpdCB7CiAKLVN0cmlu ZyBXZWJDb250ZXh0OjphcHBsaWNhdGlvbkNhY2hlRGlyZWN0b3J5KCkKK1N0cmluZyBXZWJDb250 ZXh0OjpwbGF0Zm9ybURlZmF1bHRBcHBsaWNhdGlvbkNhY2hlRGlyZWN0b3J5KCkgY29uc3QKIHsK ICAgICByZXR1cm4gbG9jYWxVc2VyU3BlY2lmaWNTdG9yYWdlRGlyZWN0b3J5KCk7CiB9CkluZGV4 OiBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvQ2hhbmdl TG9nCShyZXZpc2lvbiA5Njg1MikKKysrIExheW91dFRlc3RzL0NoYW5nZUxvZwkod29ya2luZyBj b3B5KQpAQCAtMSwzICsxLDE0IEBACisyMDExLTEwLTA2ICBRaSBaaGFuZyAgPHFpLjIuemhhbmdA bm9raWEuY29tPgorCisgICAgICAgIFtRdF1bV0syXSBBcHBsaWNhdGlvbkNhY2hlIExheW91dFRl c3RzIGZhaWxlZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9Njk1NDEKKworICAgICAgICBSZXZpZXdlZCBieSBDaGFuZyBTaHUuCisKKyAgICAgICAgVW5z a2lwIHBhc3NlZCB0ZXN0cy4KKworICAgICAgICAqIHBsYXRmb3JtL3F0LXdrMi9Ta2lwcGVkOgor CiAyMDExLTEwLTA2ICBEaXJrIFNjaHVsemUgIDxrcml0QHdlYmtpdC5vcmc+CiAKICAgICAgICAg VW5yZXZpZXdlZDogM3JkIGNodW5rIG9mIG5ldyBTVkcgYmFzZWxpbmUgZm9yIGxpb24uCkluZGV4 OiBMYXlvdXRUZXN0cy9wbGF0Zm9ybS9xdC13azIvU2tpcHBlZAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlv dXRUZXN0cy9wbGF0Zm9ybS9xdC13azIvU2tpcHBlZAkocmV2aXNpb24gOTY4MzYpCisrKyBMYXlv dXRUZXN0cy9wbGF0Zm9ybS9xdC13azIvU2tpcHBlZAkod29ya2luZyBjb3B5KQpAQCAtMzMxLDcg KzMzMSw2IEBAIHN0b3JhZ2Uvb3Blbi1kYXRhYmFzZS1lbXB0eS12ZXJzaW9uLmh0bWwKIHN0b3Jh Z2UvcmVhZC10cmFuc2FjdGlvbnMtcnVubmluZy1jb25jdXJyZW50bHkuaHRtbAogCiAjIEZBSUw6 IFRpbWVkIG91dCB3YWl0aW5nIGZvciBub3RpZnlEb25lIHRvIGJlIGNhbGxlZAotaHR0cC90ZXN0 cy9hcHBjYWNoZQogZmFzdC9kb20vYmVmb3JlbG9hZC92aWRlby1iZWZvcmUtbG9hZC5odG1sCiBt ZWRpYS92aWRlby1zb3VyY2UtbW92ZWQuaHRtbAogaHR0cC90ZXN0cy93ZWJzb2NrZXQvdGVzdHMv aGl4aWU3Ni9mcmFtZS1sZW5ndGhzLmh0bWwK 161312 2012-08-29 14:09:27 -0700 2012-08-29 20:30:29 -0700 Patch that properly updates app cache dir bug-69541-20120829180916.patch text/plain 2845 luciano.wolf U3VidmVyc2lvbiBSZXZpc2lvbjogMTI3MDQyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggMGYwNGIzMTY5NDk1N2Zm MjYzNmMxMWU0ZjNmMzI5ZDc5OGRhMzBmYS4uMWRiMWQzZWMyYjk0NGI4MzIzODhmNmExNDJiN2Zj NWJjZGVlM2RiNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDEyLTA4LTI5ICBMdWNp YW5vIFdvbGYgIDxsdWNpYW5vLndvbGZAb3BlbmJvc3NhLm9yZz4KKworICAgICAgICBbUXRdW1dL Ml0gQXBwbGljYXRpb25DYWNoZSBMYXlvdXRUZXN0cyBmYWlsZWQKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTY5NTQxCisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUmV0dXJucyBkZWZhdWx0RGlza0NhY2hlRGly ZWN0b3J5IHdoZW4gbm8gY2FjaGUgZGlyZWN0b3J5IHdhcyBwcm92aWRlZC4KKyAgICAgICAgSXQn cyB1c2VkIGJ5IHNldE9mZmxpbmVXZWJBcHBsaWNhdGlvbkNhY2hlRW5hYmxlZCBtZXRob2QgdGhh dCB3b24ndCB3b3JrCisgICAgICAgIHdpdGggYW4gaW52YWxpZCBjYWNoZSBkaXJlY3RvcnkuCisK KyAgICAgICAgKiBVSVByb2Nlc3MvcXQvV2ViQ29udGV4dFF0LmNwcDoKKyAgICAgICAgKFdlYktp dDo6V2ViQ29udGV4dDo6YXBwbGljYXRpb25DYWNoZURpcmVjdG9yeSk6CisKIDIwMTItMDgtMjkg IEpvbiBMZWUgIDxqb25sZWVAYXBwbGUuY29tPgogCiAgICAgICAgIEJ1aWxkIHBhdGNoIGZvciBR dApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L1dlYkNvbnRleHRRdC5j cHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvV2ViQ29udGV4dFF0LmNwcAppbmRleCAz ZjM4ZGQyODg5ZjA2ZWMzMDZjMTkwZGEyN2M2MDRhMGM4ZDczYzRmLi5mNmFmODlkNjJhYWUyZmQ1 MjI4OTNjM2E5NDkwZjQ0YmNkN2EzOGM1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvcXQvV2ViQ29udGV4dFF0LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv cXQvV2ViQ29udGV4dFF0LmNwcApAQCAtNTgsNyArNTgsMTIgQEAgc3RhdGljIFN0cmluZyBkZWZh dWx0RGlza0NhY2hlRGlyZWN0b3J5KCkKIAogU3RyaW5nIFdlYkNvbnRleHQ6OmFwcGxpY2F0aW9u Q2FjaGVEaXJlY3RvcnkoKQogewotICAgIHJldHVybiBXZWJDb3JlOjpjYWNoZVN0b3JhZ2UoKS5j YWNoZURpcmVjdG9yeSgpOworICAgIGNvbnN0IFN0cmluZyBjYWNoZURpcmVjdG9yeSA9IFdlYkNv cmU6OmNhY2hlU3RvcmFnZSgpLmNhY2hlRGlyZWN0b3J5KCk7CisKKyAgICBpZiAoY2FjaGVEaXJl Y3RvcnkuaXNFbXB0eSgpKQorICAgICAgICByZXR1cm4gZGVmYXVsdERpc2tDYWNoZURpcmVjdG9y eSgpOworCisgICAgcmV0dXJuIGNhY2hlRGlyZWN0b3J5OwogfQogCiB2b2lkIFdlYkNvbnRleHQ6 OnBsYXRmb3JtSW5pdGlhbGl6ZVdlYlByb2Nlc3MoV2ViUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVy cyYgcGFyYW1ldGVycykKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91 dFRlc3RzL0NoYW5nZUxvZwppbmRleCAwZWRjZGMwODgyMzkxMGM0YzA5YjExNTI4NzIyYWFkZjQ4 NWMwNzY2Li4xYTMyZGQ1MDhhMGQ3NGZkM2VkZGJkNGMzODQzZjg3MTRjZmE2NmM0IDEwMDY0NAot LS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMTQgQEAKKzIwMTItMDgtMjkgIEx1Y2lhbm8gV29sZiAgPGx1Y2lhbm8ud29sZkBv cGVuYm9zc2Eub3JnPgorCisgICAgICAgIFtRdF1bV0syXSBBcHBsaWNhdGlvbkNhY2hlIExheW91 dFRlc3RzIGZhaWxlZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9Njk1NDEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBVbnNraXAgaHR0cC9hcHBjYWNoZSB0ZXN0cyBmb3IgcXQtNS4wLXdrMi4KKworICAgICAg ICAqIHBsYXRmb3JtL3F0LTUuMC13azIvU2tpcHBlZDoKKwogMjAxMi0wOC0yOSAgRXVnZW5lIEts eXVjaG5pa292ICA8ZXVzdGFzLmJ1Z0BnbWFpbC5jb20+CiAKICAgICAgICAgV2ViIEluc3BlY3Rv cjogVGltZWxpbmU6IGF2b2lkICJJUEMgbWVzc2FnZSB0b28gYmlnIiBvbiBzYXZlL2xvYWQKZGlm ZiAtLWdpdCBhL0xheW91dFRlc3RzL3BsYXRmb3JtL3F0LTUuMC13azIvU2tpcHBlZCBiL0xheW91 dFRlc3RzL3BsYXRmb3JtL3F0LTUuMC13azIvU2tpcHBlZAppbmRleCBhNTY0YjViMmIzMDA5ODIz NmFmODdmOTIyYzE2ODQwNWUyNjBkNWQ3Li44OGIxNmQyODk5M2VhZWMyOWViODU3YWI1MWQxZDFj NTk0MzU4OWI0IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9xdC01LjAtd2syL1Nr aXBwZWQKKysrIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vcXQtNS4wLXdrMi9Ta2lwcGVkCkBAIC0x NDgsNyArMTQ4LDYgQEAgZmFzdC9ub3RpZmljYXRpb25zCiBmYXN0L292ZXJmbG93L3Njcm9sbGJh ci1yZXN0b3JlZC1hbmQtdGhlbi1sb2NrZWQuaHRtbAogCiAjIEZBSUw6IFRpbWVkIG91dCB3YWl0 aW5nIGZvciBub3RpZnlEb25lIHRvIGJlIGNhbGxlZAotaHR0cC90ZXN0cy9hcHBjYWNoZQogbWVk aWEvdmlkZW8tc291cmNlLW1vdmVkLmh0bWwKIAogIyBUaGVzZSB0ZXN0cyBhbHdheXMgZmFpbCAo d2l0aCBhbmQgd2l0aG91dCAtLXNpbmdseSkuIEl0IG5lZWRzIGludmVzdGlnYXRpb24uCg==