37186 2010-04-06 20:38:21 -0700 [Chromium] Register Chromium's SQLite VFS even when running in single-process mode 2010-04-07 18:19:08 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 dumi dumi dglazkov ericu fishd jorlow michaeln oldest_to_newest 209422 0 dumi 2010-04-06 20:38:21 -0700 Chromium's SQLite VFS has not been the default VFS for a while now. We should register it even when !ChromiumBridge::sandboxEnabled() (which is equivalent to running in single-process mode). This will make DBs work correctly with --single-process too. 209423 1 52698 dumi 2010-04-06 20:44:45 -0700 Created attachment 52698 patch 209425 2 52698 dglazkov 2010-04-06 20:51:31 -0700 Comment on attachment 52698 patch ok. 209764 3 michaeln 2010-04-07 11:58:55 -0700 like we talked about, this looks like it breaks DOMStorage in chrome? 209866 4 52788 dumi 2010-04-07 15:21:26 -0700 Created attachment 52788 patch Make WebSQLDatabases happy while not breaking other features. 209886 5 52795 dumi 2010-04-07 15:47:51 -0700 Created attachment 52795 patch Same patch, minus DatabaseTracker changes. 209909 6 jorlow 2010-04-07 16:40:58 -0700 I remember we considered this originally and decided against it, but I can't remember why. + darin in case he remembers. If not, I don't see any problem with this other than it seeming a bit ugly. 209913 7 dumi 2010-04-07 16:44:57 -0700 (In reply to comment #6) > I remember we considered this originally and decided against it, but I can't > remember why. + darin in case he remembers. If not, I don't see any problem > with this other than it seeming a bit ugly. I think when we previously talked about this, the Chromium VFS was registered as the default VFS. It _is_ a big ugly, but I don't see any other way of doing this. 209921 8 52795 jorlow 2010-04-07 16:50:05 -0700 Comment on attachment 52795 patch > Index: WebCore/ChangeLog > =================================================================== > --- WebCore/ChangeLog (revision 57235) > +++ WebCore/ChangeLog (working copy) > @@ -1,3 +1,29 @@ > +2010-04-07 Dumitru Daniliuc <dumi@chromium.org> > + > + Reviewed by NOBODY (OOPS!). > + > + Always register and use Chromium's SQLite VFS for > + WebSQLDatabases. Keep using the default VFS in all other > + cases. This change should allow Chromium to support > + WebSQLDatabases in --single-process mode. > + > + https://bugs.webkit.org/show_bug.cgi?id=37186. Please follow the standard format for change logs. Title url description Also, please describe the "full mutex" part of the change. > Index: WebCore/platform/sql/SQLiteFileSystem.h > =================================================================== > --- WebCore/platform/sql/SQLiteFileSystem.h (revision 57230) > +++ WebCore/platform/sql/SQLiteFileSystem.h (working copy) > @@ -52,7 +52,8 @@ public: > // fileName - The name of the database file. > // database - The SQLite structure that represents the database stored > // in the given file. > - static int openDatabase(const String& fileName, sqlite3** database); > + // forWebSQLDatabase - True, if and only if we're opening a Web SQL Database file. Probably you should explain why this is necessary. (Chromium needs this info.) 209927 9 52809 dumi 2010-04-07 17:14:56 -0700 Created attachment 52809 patch Done. Please take another look. 209945 10 52809 jorlow 2010-04-07 17:49:58 -0700 Comment on attachment 52809 patch > Index: WebCore/ChangeLog > =================================================================== > --- WebCore/ChangeLog (revision 57235) > +++ WebCore/ChangeLog (working copy) > @@ -1,3 +1,35 @@ > +2010-04-07 Dumitru Daniliuc <dumi@chromium.org> > + > + Reviewed by NOBODY (OOPS!). > + > + Fix Chromium's HTML5 DB support in --single-process mode. > + No newline here. > + https://bugs.webkit.org/show_bug.cgi?id=37186. > + > + Always register and use Chromium's SQLite VFS for > + WebSQLDatabases. Keep using the default VFS in all other > + cases. This change should allow Chromium to support > + WebSQLDatabases in --single-process mode. > + > + Also, cleaning up a big SQLiteFileSystemChromium and getting rid This sentence doesn't parse in my head.....a big what? r=me, provided Michael signs off on it as well and you double check that LocalStorage still works under --single-process. 209951 11 dumi 2010-04-07 17:58:58 -0700 (In reply to comment #10) > (From update of attachment 52809 [details]) > > Index: WebCore/ChangeLog > > =================================================================== > > --- WebCore/ChangeLog (revision 57235) > > +++ WebCore/ChangeLog (working copy) > > @@ -1,3 +1,35 @@ > > +2010-04-07 Dumitru Daniliuc <dumi@chromium.org> > > + > > + Reviewed by NOBODY (OOPS!). > > + > > + Fix Chromium's HTML5 DB support in --single-process mode. > > + > > No newline here. Removed. > > + https://bugs.webkit.org/show_bug.cgi?id=37186. > > + > > + Always register and use Chromium's SQLite VFS for > > + WebSQLDatabases. Keep using the default VFS in all other > > + cases. This change should allow Chromium to support > > + WebSQLDatabases in --single-process mode. > > + > > + Also, cleaning up a big SQLiteFileSystemChromium and getting rid > > This sentence doesn't parse in my head.....a big what? s/big/bit/. > r=me, provided Michael signs off on it as well and you double check that > LocalStorage still works under --single-process. Will do. 209953 12 michaeln 2010-04-07 18:03:13 -0700 LGTM 209961 13 dumi 2010-04-07 18:19:08 -0700 Landed as r57245. 52698 2010-04-06 20:44:45 -0700 2010-04-07 15:21:26 -0700 patch patch text/plain 3256 dumi SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1NzE5MCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTggQEAKKzIwMTAtMDQtMDYgIER1bWl0cnUgRGFuaWxpdWMgIDxkdW1pQGNocm9t aXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBSZWdpc3RlciBDaHJvbWl1bSdzIFZGUyBldmVuIHdoZW4gcnVubmluZyBpbiBzaW5nbGUtcHJv Y2VzcyBtb2RlLgorCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0zNzE4NgorCisgICAgICAgICogcGxhdGZvcm0vc3FsL2Nocm9taXVtL1NRTGl0ZUZpbGVT eXN0ZW1DaHJvbWl1bS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTUUxpdGVGaWxlU3lzdGVtOjpv cGVuRGF0YWJhc2UpOgorICAgICAgICAqIHBsYXRmb3JtL3NxbC9jaHJvbWl1bS9TUUxpdGVGaWxl U3lzdGVtQ2hyb21pdW1Qb3NpeC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTUUxpdGVGaWxlU3lz dGVtOjpyZWdpc3RlclNRTGl0ZVZGUyk6CisgICAgICAgICogcGxhdGZvcm0vc3FsL2Nocm9taXVt L1NRTGl0ZUZpbGVTeXN0ZW1DaHJvbWl1bVdpbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTUUxp dGVGaWxlU3lzdGVtOjpyZWdpc3RlclNRTGl0ZVZGUyk6CisKIDIwMTAtMDQtMDYgIEtpbnVrbyBZ YXN1ZGEgIDxraW51a29AY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEppYW4g TGkuCkluZGV4OiBXZWJDb3JlL3BsYXRmb3JtL3NxbC9jaHJvbWl1bS9TUUxpdGVGaWxlU3lzdGVt Q2hyb21pdW0uY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGxhdGZvcm0vc3FsL2Nocm9taXVt L1NRTGl0ZUZpbGVTeXN0ZW1DaHJvbWl1bS5jcHAJKHJldmlzaW9uIDU3MTkwKQorKysgV2ViQ29y ZS9wbGF0Zm9ybS9zcWwvY2hyb21pdW0vU1FMaXRlRmlsZVN5c3RlbUNocm9taXVtLmNwcAkod29y a2luZyBjb3B5KQpAQCAtNTAsMTMgKzUwLDYgQEAgU1FMaXRlRmlsZVN5c3RlbTo6U1FMaXRlRmls ZVN5c3RlbSgpCiAKIGludCBTUUxpdGVGaWxlU3lzdGVtOjpvcGVuRGF0YWJhc2UoY29uc3QgU3Ry aW5nJiBmaWxlTmFtZSwgc3FsaXRlMyoqIGRhdGFiYXNlKQogewotICAgIGlmICghQ2hyb21pdW1C cmlkZ2U6OnNhbmRib3hFbmFibGVkKCkpIHsKLSAgICAgICAgU3RyaW5nIHBhdGggPSBmaWxlTmFt ZTsKLSAgICAgICAgcmV0dXJuIHNxbGl0ZTNfb3BlbjE2KHBhdGguY2hhcmFjdGVyc1dpdGhOdWxs VGVybWluYXRpb24oKSwgZGF0YWJhc2UpOwotICAgIH0KLQotICAgIC8vIG9wZW4gZGF0YWJhc2Vz IHVzaW5nIHRoZSBkZWZhdWx0IFZGUwotICAgIC8vIGluIHJlbmRlcmVycywgaXQgc2hvdWxkIGJl IENocm9taXVtJ3MgVkZTOyBpbiB0aGUgYnJvd3NlciBwcm9jZXNzIGl0IHNob3VsZCBiZSBTUUxp dGUncyBkZWZhdWx0IFZGUwogICAgIHJldHVybiBzcWxpdGUzX29wZW5fdjIoZmlsZU5hbWUudXRm OCgpLmRhdGEoKSwgZGF0YWJhc2UsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICBTUUxJVEVf T1BFTl9SRUFEV1JJVEUgfCBTUUxJVEVfT1BFTl9DUkVBVEUgfCBTUUxJVEVfT1BFTl9GVUxMTVVU RVgsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAiY2hyb21pdW1fdmZzIik7CkluZGV4OiBX ZWJDb3JlL3BsYXRmb3JtL3NxbC9jaHJvbWl1bS9TUUxpdGVGaWxlU3lzdGVtQ2hyb21pdW1Qb3Np eC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9wbGF0Zm9ybS9zcWwvY2hyb21pdW0vU1FMaXRl RmlsZVN5c3RlbUNocm9taXVtUG9zaXguY3BwCShyZXZpc2lvbiA1NzE5MCkKKysrIFdlYkNvcmUv cGxhdGZvcm0vc3FsL2Nocm9taXVtL1NRTGl0ZUZpbGVTeXN0ZW1DaHJvbWl1bVBvc2l4LmNwcAko d29ya2luZyBjb3B5KQpAQCAtMTczLDEyICsxNzMsNiBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAK IHZvaWQgU1FMaXRlRmlsZVN5c3RlbTo6cmVnaXN0ZXJTUUxpdGVWRlMoKQogewotICAgIC8vIEZJ WE1FOiBNYWtlIHN1cmUgdGhlcmUgYXJlbid0IGFueSB1bmludGVuZGVkIGNvbnNlcXVlbmNlcyB3 aGVuIFZGUyBjb2RlIGlzIGNhbGxlZCBpbiB0aGUgYnJvd3NlciBwcm9jZXNzLgotICAgIGlmICgh Q2hyb21pdW1CcmlkZ2U6OnNhbmRib3hFbmFibGVkKCkpIHsKLSAgICAgICAgQVNTRVJUX05PVF9S RUFDSEVEKCk7Ci0gICAgICAgIHJldHVybjsKLSAgICB9Ci0KICAgICBzcWxpdGUzX3ZmcyogdW5p eF92ZnMgPSBzcWxpdGUzX3Zmc19maW5kKCJ1bml4Iik7CiAgICAgc3RhdGljIHNxbGl0ZTNfdmZz IGNocm9taXVtX3ZmcyA9IHsKICAgICAgICAgMSwKSW5kZXg6IFdlYkNvcmUvcGxhdGZvcm0vc3Fs L2Nocm9taXVtL1NRTGl0ZUZpbGVTeXN0ZW1DaHJvbWl1bVdpbi5jcHAKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g V2ViQ29yZS9wbGF0Zm9ybS9zcWwvY2hyb21pdW0vU1FMaXRlRmlsZVN5c3RlbUNocm9taXVtV2lu LmNwcAkocmV2aXNpb24gNTcxOTApCisrKyBXZWJDb3JlL3BsYXRmb3JtL3NxbC9jaHJvbWl1bS9T UUxpdGVGaWxlU3lzdGVtQ2hyb21pdW1XaW4uY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xNDIsMTIg KzE0Miw2IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogdm9pZCBTUUxpdGVGaWxlU3lzdGVtOjpy ZWdpc3RlclNRTGl0ZVZGUygpCiB7Ci0gICAgLy8gRklYTUU6IE1ha2Ugc3VyZSB0aGVyZSBhcmVu J3QgYW55IHVuaW50ZW5kZWQgY29uc2VxdWVuY2VzIHdoZW4gVkZTIGNvZGUgaXMgY2FsbGVkIGlu IHRoZSBicm93c2VyIHByb2Nlc3MuCi0gICAgaWYgKCFDaHJvbWl1bUJyaWRnZTo6c2FuZGJveEVu YWJsZWQoKSkgewotICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKLSAgICAgICAgcmV0dXJu OwotICAgIH0KLQogICAgIHNxbGl0ZTNfdmZzKiB3aW4zMl92ZnMgPSBzcWxpdGUzX3Zmc19maW5k KCJ3aW4zMiIpOwogICAgIHN0YXRpYyBzcWxpdGUzX3ZmcyBjaHJvbWl1bV92ZnMgPSB7CiAgICAg ICAgIDEsCg== 52788 2010-04-07 15:21:26 -0700 2010-04-07 15:47:51 -0700 patch patch text/plain 8597 dumi SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1NzIzNSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMzEgQEAKKzIwMTAtMDQtMDcgIER1bWl0cnUgRGFuaWxpdWMgIDxkdW1pQGNocm9t aXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBBbHdheXMgcmVnaXN0ZXIgYW5kIHVzZSBDaHJvbWl1bSdzIFNRTGl0ZSBWRlMgZm9yCisgICAg ICAgIFdlYlNRTERhdGFiYXNlcy4gS2VlcCB1c2luZyB0aGUgZGVmYXVsdCBWRlMgaW4gYWxsIG90 aGVyCisgICAgICAgIGNhc2VzLiBUaGlzIGNoYW5nZSBzaG91bGQgYWxsb3cgQ2hyb21pdW0gdG8g c3VwcG9ydAorICAgICAgICBXZWJTUUxEYXRhYmFzZXMgaW4gLS1zaW5nbGUtcHJvY2VzcyBtb2Rl LgorCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zNzE4 Ni4KKworICAgICAgICAqIHBsYXRmb3JtL3NxbC9TUUxpdGVEYXRhYmFzZS5jcHA6CisgICAgICAg IChXZWJDb3JlOjpTUUxpdGVEYXRhYmFzZTo6b3Blbik6CisgICAgICAgICogcGxhdGZvcm0vc3Fs L1NRTGl0ZURhdGFiYXNlLmg6CisgICAgICAgICogcGxhdGZvcm0vc3FsL1NRTGl0ZUZpbGVTeXN0 ZW0uY3BwOgorICAgICAgICAoV2ViQ29yZTo6U1FMaXRlRmlsZVN5c3RlbTo6b3BlbkRhdGFiYXNl KToKKyAgICAgICAgKiBwbGF0Zm9ybS9zcWwvU1FMaXRlRmlsZVN5c3RlbS5oOgorICAgICAgICAq IHBsYXRmb3JtL3NxbC9jaHJvbWl1bS9TUUxpdGVGaWxlU3lzdGVtQ2hyb21pdW0uY3BwOgorICAg ICAgICAoV2ViQ29yZTo6U1FMaXRlRmlsZVN5c3RlbTo6b3BlbkRhdGFiYXNlKToKKyAgICAgICAg KiBwbGF0Zm9ybS9zcWwvY2hyb21pdW0vU1FMaXRlRmlsZVN5c3RlbUNocm9taXVtUG9zaXguY3Bw OgorICAgICAgICAoV2ViQ29yZTo6U1FMaXRlRmlsZVN5c3RlbTo6cmVnaXN0ZXJTUUxpdGVWRlMp OgorICAgICAgICAqIHBsYXRmb3JtL3NxbC9jaHJvbWl1bS9TUUxpdGVGaWxlU3lzdGVtQ2hyb21p dW1XaW4uY3BwOgorICAgICAgICAoV2ViQ29yZTo6U1FMaXRlRmlsZVN5c3RlbTo6cmVnaXN0ZXJT UUxpdGVWRlMpOgorICAgICAgICAqIHN0b3JhZ2UvRGF0YWJhc2UuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6RGF0YWJhc2U6OnBlcmZvcm1PcGVuQW5kVmVyaWZ5KToKKyAgICAgICAgKiBzdG9yYWdl L0RhdGFiYXNlVHJhY2tlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpEYXRhYmFzZVRyYWNrZXI6 Om9wZW5UcmFja2VyRGF0YWJhc2UpOgorCiAyMDEwLTA0LTA3ICBBbGV4ZXkgUHJvc2t1cnlha292 ICA8YXBAYXBwbGUuY29tPgogCiAgICAgICAgICogcGxhdGZvcm0vbmV0d29yay9tYWMvQXV0aGVu dGljYXRpb25NYWMubW06IEZpeCBhIHR5cG8gaW4gY29tbWVudC4KSW5kZXg6IFdlYkNvcmUvcGxh dGZvcm0vc3FsL1NRTGl0ZURhdGFiYXNlLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3BsYXRm b3JtL3NxbC9TUUxpdGVEYXRhYmFzZS5jcHAJKHJldmlzaW9uIDU3MjMwKQorKysgV2ViQ29yZS9w bGF0Zm9ybS9zcWwvU1FMaXRlRGF0YWJhc2UuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC01OCwxMSAr NTgsMTEgQEAgU1FMaXRlRGF0YWJhc2U6On5TUUxpdGVEYXRhYmFzZSgpCiAgICAgY2xvc2UoKTsK IH0KIAotYm9vbCBTUUxpdGVEYXRhYmFzZTo6b3Blbihjb25zdCBTdHJpbmcmIGZpbGVuYW1lKQor Ym9vbCBTUUxpdGVEYXRhYmFzZTo6b3Blbihjb25zdCBTdHJpbmcmIGZpbGVuYW1lLCBib29sIGZv cldlYlNRTERhdGFiYXNlKQogewogICAgIGNsb3NlKCk7Ci0gICAgCi0gICAgbV9sYXN0RXJyb3Ig PSBTUUxpdGVGaWxlU3lzdGVtOjpvcGVuRGF0YWJhc2UoZmlsZW5hbWUsICZtX2RiKTsKKworICAg IG1fbGFzdEVycm9yID0gU1FMaXRlRmlsZVN5c3RlbTo6b3BlbkRhdGFiYXNlKGZpbGVuYW1lLCAm bV9kYiwgZm9yV2ViU1FMRGF0YWJhc2UpOwogICAgIGlmIChtX2xhc3RFcnJvciAhPSBTUUxJVEVf T0spIHsKICAgICAgICAgTE9HX0VSUk9SKCJTUUxpdGUgZGF0YWJhc2UgZmFpbGVkIHRvIGxvYWQg ZnJvbSAlc1xuQ2F1c2UgLSAlcyIsIGZpbGVuYW1lLmFzY2lpKCkuZGF0YSgpLAogICAgICAgICAg ICAgc3FsaXRlM19lcnJtc2cobV9kYikpOwpAQCAtNzMsNyArNzMsNyBAQCBib29sIFNRTGl0ZURh dGFiYXNlOjpvcGVuKGNvbnN0IFN0cmluZyYgCiAKICAgICBpZiAoaXNPcGVuKCkpCiAgICAgICAg IG1fb3BlbmluZ1RocmVhZCA9IGN1cnJlbnRUaHJlYWQoKTsKLSAgICAKKwogICAgIGlmICghU1FM aXRlU3RhdGVtZW50KCp0aGlzLCAiUFJBR01BIHRlbXBfc3RvcmUgPSBNRU1PUlk7IikuZXhlY3V0 ZUNvbW1hbmQoKSkKICAgICAgICAgTE9HX0VSUk9SKCJTUUxpdGUgZGF0YWJhc2UgY291bGQgbm90 IHNldCB0ZW1wX3N0b3JlIHRvIG1lbW9yeSIpOwogCkluZGV4OiBXZWJDb3JlL3BsYXRmb3JtL3Nx bC9TUUxpdGVEYXRhYmFzZS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGxhdGZvcm0vc3FsL1NR TGl0ZURhdGFiYXNlLmgJKHJldmlzaW9uIDU3MjMwKQorKysgV2ViQ29yZS9wbGF0Zm9ybS9zcWwv U1FMaXRlRGF0YWJhc2UuaAkod29ya2luZyBjb3B5KQpAQCAtNTUsNyArNTUsNyBAQCBwdWJsaWM6 CiAgICAgU1FMaXRlRGF0YWJhc2UoKTsKICAgICB+U1FMaXRlRGF0YWJhc2UoKTsKIAotICAgIGJv b2wgb3Blbihjb25zdCBTdHJpbmcmIGZpbGVuYW1lKTsKKyAgICBib29sIG9wZW4oY29uc3QgU3Ry aW5nJiBmaWxlbmFtZSwgYm9vbCBmb3JXZWJTUUxEYXRhYmFzZSA9IGZhbHNlKTsKICAgICBib29s IGlzT3BlbigpIGNvbnN0IHsgcmV0dXJuIG1fZGI7IH0KICAgICB2b2lkIGNsb3NlKCk7CiAKSW5k ZXg6IFdlYkNvcmUvcGxhdGZvcm0vc3FsL1NRTGl0ZUZpbGVTeXN0ZW0uY3BwCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFdlYkNvcmUvcGxhdGZvcm0vc3FsL1NRTGl0ZUZpbGVTeXN0ZW0uY3BwCShyZXZpc2lvbiA1 NzIzMCkKKysrIFdlYkNvcmUvcGxhdGZvcm0vc3FsL1NRTGl0ZUZpbGVTeXN0ZW0uY3BwCSh3b3Jr aW5nIGNvcHkpCkBAIC00Niw3ICs0Niw3IEBAIHZvaWQgU1FMaXRlRmlsZVN5c3RlbTo6cmVnaXN0 ZXJTUUxpdGVWRlMKIHsKIH0KIAotaW50IFNRTGl0ZUZpbGVTeXN0ZW06Om9wZW5EYXRhYmFzZShj b25zdCBTdHJpbmcmIGZpbGVOYW1lLCBzcWxpdGUzKiogZGF0YWJhc2UpCitpbnQgU1FMaXRlRmls ZVN5c3RlbTo6b3BlbkRhdGFiYXNlKGNvbnN0IFN0cmluZyYgZmlsZU5hbWUsIHNxbGl0ZTMqKiBk YXRhYmFzZSwgYm9vbCkKIHsKICAgICAvLyBTUUxpdGUgZXhwZWN0cyBhIG51bGwgdGVybWluYXRv ciBvbiBpdHMgVVRGLTE2IHN0cmluZ3MuCiAgICAgU3RyaW5nIHBhdGggPSBmaWxlTmFtZTsKSW5k ZXg6IFdlYkNvcmUvcGxhdGZvcm0vc3FsL1NRTGl0ZUZpbGVTeXN0ZW0uaAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBXZWJDb3JlL3BsYXRmb3JtL3NxbC9TUUxpdGVGaWxlU3lzdGVtLmgJKHJldmlzaW9uIDU3MjMw KQorKysgV2ViQ29yZS9wbGF0Zm9ybS9zcWwvU1FMaXRlRmlsZVN5c3RlbS5oCSh3b3JraW5nIGNv cHkpCkBAIC01Miw3ICs1Miw4IEBAIHB1YmxpYzoKICAgICAvLyBmaWxlTmFtZSAtIFRoZSBuYW1l IG9mIHRoZSBkYXRhYmFzZSBmaWxlLgogICAgIC8vIGRhdGFiYXNlIC0gVGhlIFNRTGl0ZSBzdHJ1 Y3R1cmUgdGhhdCByZXByZXNlbnRzIHRoZSBkYXRhYmFzZSBzdG9yZWQKICAgICAvLyAgICAgICAg ICAgIGluIHRoZSBnaXZlbiBmaWxlLgotICAgIHN0YXRpYyBpbnQgb3BlbkRhdGFiYXNlKGNvbnN0 IFN0cmluZyYgZmlsZU5hbWUsIHNxbGl0ZTMqKiBkYXRhYmFzZSk7CisgICAgLy8gZm9yV2ViU1FM RGF0YWJhc2UgLSBUcnVlLCBpZiBhbmQgb25seSBpZiB3ZSdyZSBvcGVuaW5nIGEgV2ViIFNRTCBE YXRhYmFzZSBmaWxlLgorICAgIHN0YXRpYyBpbnQgb3BlbkRhdGFiYXNlKGNvbnN0IFN0cmluZyYg ZmlsZU5hbWUsIHNxbGl0ZTMqKiBkYXRhYmFzZSwgYm9vbCBmb3JXZWJTUUxEYXRhYmFzZSk7CiAK ICAgICAvLyBSZXR1cm5zIHRoZSBmaWxlIG5hbWUgZm9yIGEgZGF0YWJhc2UuCiAgICAgLy8KSW5k ZXg6IFdlYkNvcmUvcGxhdGZvcm0vc3FsL2Nocm9taXVtL1NRTGl0ZUZpbGVTeXN0ZW1DaHJvbWl1 bS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9wbGF0Zm9ybS9zcWwvY2hyb21pdW0vU1FMaXRl RmlsZVN5c3RlbUNocm9taXVtLmNwcAkocmV2aXNpb24gNTcyMzApCisrKyBXZWJDb3JlL3BsYXRm b3JtL3NxbC9jaHJvbWl1bS9TUUxpdGVGaWxlU3lzdGVtQ2hyb21pdW0uY3BwCSh3b3JraW5nIGNv cHkpCkBAIC0zNiwxMCArMzYsNiBAQAogI2luY2x1ZGUgPHNxbGl0ZTMuaD4KICNpbmNsdWRlIDx3 dGYvdGV4dC9DU3RyaW5nLmg+CiAKLSNpZm5kZWYgU1FMSVRFX09QRU5fRlVMTE1VVEVYCi0jZGVm aW5lIFNRTElURV9PUEVOX0ZVTExNVVRFWCAweDAwMDEwMDAwCi0jZW5kaWYKLQogLy8gU1FMaXRl RmlsZVN5c3RlbTo6cmVnaXN0ZXJTUUxpdGVWRlMoKSBpcyBpbXBsZW1lbnRlZCBpbiB0aGUKIC8v IHBsYXRmb3JtLXNwZWNpZmljIGZpbGVzIFNRTGl0ZUZpbGVTeXN0ZW1DaHJvbWl1bXtXaW58UG9z aXh9LmNwcAogbmFtZXNwYWNlIFdlYkNvcmUgewpAQCAtNDgsMTggKzQ0LDE0IEBAIFNRTGl0ZUZp bGVTeXN0ZW06OlNRTGl0ZUZpbGVTeXN0ZW0oKQogewogfQogCi1pbnQgU1FMaXRlRmlsZVN5c3Rl bTo6b3BlbkRhdGFiYXNlKGNvbnN0IFN0cmluZyYgZmlsZU5hbWUsIHNxbGl0ZTMqKiBkYXRhYmFz ZSkKK2ludCBTUUxpdGVGaWxlU3lzdGVtOjpvcGVuRGF0YWJhc2UoY29uc3QgU3RyaW5nJiBmaWxl TmFtZSwgc3FsaXRlMyoqIGRhdGFiYXNlLCBib29sIGZvcldlYlNRTERhdGFiYXNlKQogewotICAg IGlmICghQ2hyb21pdW1CcmlkZ2U6OnNhbmRib3hFbmFibGVkKCkpIHsKKyAgICBpZiAoIWZvcldl YlNRTERhdGFiYXNlKSB7CiAgICAgICAgIFN0cmluZyBwYXRoID0gZmlsZU5hbWU7CiAgICAgICAg IHJldHVybiBzcWxpdGUzX29wZW4xNihwYXRoLmNoYXJhY3RlcnNXaXRoTnVsbFRlcm1pbmF0aW9u KCksIGRhdGFiYXNlKTsKICAgICB9CiAKLSAgICAvLyBvcGVuIGRhdGFiYXNlcyB1c2luZyB0aGUg ZGVmYXVsdCBWRlMKLSAgICAvLyBpbiByZW5kZXJlcnMsIGl0IHNob3VsZCBiZSBDaHJvbWl1bSdz IFZGUzsgaW4gdGhlIGJyb3dzZXIgcHJvY2VzcyBpdCBzaG91bGQgYmUgU1FMaXRlJ3MgZGVmYXVs dCBWRlMKLSAgICByZXR1cm4gc3FsaXRlM19vcGVuX3YyKGZpbGVOYW1lLnV0ZjgoKS5kYXRhKCks IGRhdGFiYXNlLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgU1FMSVRFX09QRU5fUkVBRFdS SVRFIHwgU1FMSVRFX09QRU5fQ1JFQVRFIHwgU1FMSVRFX09QRU5fRlVMTE1VVEVYLAotICAgICAg ICAgICAgICAgICAgICAgICAgICAgImNocm9taXVtX3ZmcyIpOworICAgIHJldHVybiBzcWxpdGUz X29wZW5fdjIoZmlsZU5hbWUudXRmOCgpLmRhdGEoKSwgZGF0YWJhc2UsIFNRTElURV9PUEVOX1JF QURXUklURSB8IFNRTElURV9PUEVOX0NSRUFURSwgImNocm9taXVtX3ZmcyIpOwogfQogCiBTdHJp bmcgU1FMaXRlRmlsZVN5c3RlbTo6Z2V0RmlsZU5hbWVGb3JOZXdEYXRhYmFzZSgKSW5kZXg6IFdl YkNvcmUvcGxhdGZvcm0vc3FsL2Nocm9taXVtL1NRTGl0ZUZpbGVTeXN0ZW1DaHJvbWl1bVBvc2l4 LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3BsYXRmb3JtL3NxbC9jaHJvbWl1bS9TUUxpdGVG aWxlU3lzdGVtQ2hyb21pdW1Qb3NpeC5jcHAJKHJldmlzaW9uIDU3MjMwKQorKysgV2ViQ29yZS9w bGF0Zm9ybS9zcWwvY2hyb21pdW0vU1FMaXRlRmlsZVN5c3RlbUNocm9taXVtUG9zaXguY3BwCSh3 b3JraW5nIGNvcHkpCkBAIC0xNzMsMTIgKzE3Myw2IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAog dm9pZCBTUUxpdGVGaWxlU3lzdGVtOjpyZWdpc3RlclNRTGl0ZVZGUygpCiB7Ci0gICAgLy8gRklY TUU6IE1ha2Ugc3VyZSB0aGVyZSBhcmVuJ3QgYW55IHVuaW50ZW5kZWQgY29uc2VxdWVuY2VzIHdo ZW4gVkZTIGNvZGUgaXMgY2FsbGVkIGluIHRoZSBicm93c2VyIHByb2Nlc3MuCi0gICAgaWYgKCFD aHJvbWl1bUJyaWRnZTo6c2FuZGJveEVuYWJsZWQoKSkgewotICAgICAgICBBU1NFUlRfTk9UX1JF QUNIRUQoKTsKLSAgICAgICAgcmV0dXJuOwotICAgIH0KLQogICAgIHNxbGl0ZTNfdmZzKiB1bml4 X3ZmcyA9IHNxbGl0ZTNfdmZzX2ZpbmQoInVuaXgiKTsKICAgICBzdGF0aWMgc3FsaXRlM192ZnMg Y2hyb21pdW1fdmZzID0gewogICAgICAgICAxLApJbmRleDogV2ViQ29yZS9wbGF0Zm9ybS9zcWwv Y2hyb21pdW0vU1FMaXRlRmlsZVN5c3RlbUNocm9taXVtV2luLmNwcAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBX ZWJDb3JlL3BsYXRmb3JtL3NxbC9jaHJvbWl1bS9TUUxpdGVGaWxlU3lzdGVtQ2hyb21pdW1XaW4u Y3BwCShyZXZpc2lvbiA1NzIzMCkKKysrIFdlYkNvcmUvcGxhdGZvcm0vc3FsL2Nocm9taXVtL1NR TGl0ZUZpbGVTeXN0ZW1DaHJvbWl1bVdpbi5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTE0MiwxMiAr MTQyLDYgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogCiB2b2lkIFNRTGl0ZUZpbGVTeXN0ZW06OnJl Z2lzdGVyU1FMaXRlVkZTKCkKIHsKLSAgICAvLyBGSVhNRTogTWFrZSBzdXJlIHRoZXJlIGFyZW4n dCBhbnkgdW5pbnRlbmRlZCBjb25zZXF1ZW5jZXMgd2hlbiBWRlMgY29kZSBpcyBjYWxsZWQgaW4g dGhlIGJyb3dzZXIgcHJvY2Vzcy4KLSAgICBpZiAoIUNocm9taXVtQnJpZGdlOjpzYW5kYm94RW5h YmxlZCgpKSB7Ci0gICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwotICAgICAgICByZXR1cm47 Ci0gICAgfQotCiAgICAgc3FsaXRlM192ZnMqIHdpbjMyX3ZmcyA9IHNxbGl0ZTNfdmZzX2ZpbmQo IndpbjMyIik7CiAgICAgc3RhdGljIHNxbGl0ZTNfdmZzIGNocm9taXVtX3ZmcyA9IHsKICAgICAg ICAgMSwKSW5kZXg6IFdlYkNvcmUvc3RvcmFnZS9EYXRhYmFzZS5jcHAKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g V2ViQ29yZS9zdG9yYWdlL0RhdGFiYXNlLmNwcAkocmV2aXNpb24gNTcyMzApCisrKyBXZWJDb3Jl L3N0b3JhZ2UvRGF0YWJhc2UuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC01MzgsNyArNTM4LDcgQEAg dm9pZCBEYXRhYmFzZTo6cGVyZm9ybVBvbGljeUNoZWNrcygpCiAKIGJvb2wgRGF0YWJhc2U6OnBl cmZvcm1PcGVuQW5kVmVyaWZ5KEV4Y2VwdGlvbkNvZGUmIGUpCiB7Ci0gICAgaWYgKCFtX3NxbGl0 ZURhdGFiYXNlLm9wZW4obV9maWxlbmFtZSkpIHsKKyAgICBpZiAoIW1fc3FsaXRlRGF0YWJhc2Uu b3BlbihtX2ZpbGVuYW1lLCB0cnVlKSkgewogICAgICAgICBMT0dfRVJST1IoIlVuYWJsZSB0byBv cGVuIGRhdGFiYXNlIGF0IHBhdGggJXMiLCBtX2ZpbGVuYW1lLmFzY2lpKCkuZGF0YSgpKTsKICAg ICAgICAgZSA9IElOVkFMSURfU1RBVEVfRVJSOwogICAgICAgICByZXR1cm4gZmFsc2U7CkluZGV4 OiBXZWJDb3JlL3N0b3JhZ2UvRGF0YWJhc2VUcmFja2VyLmNwcAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJD b3JlL3N0b3JhZ2UvRGF0YWJhc2VUcmFja2VyLmNwcAkocmV2aXNpb24gNTcyMzApCisrKyBXZWJD b3JlL3N0b3JhZ2UvRGF0YWJhc2VUcmFja2VyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTA0LDcg KzEwNCw3IEBAIHZvaWQgRGF0YWJhc2VUcmFja2VyOjpvcGVuVHJhY2tlckRhdGFiYXMKICAgICBp ZiAoIVNRTGl0ZUZpbGVTeXN0ZW06OmVuc3VyZURhdGFiYXNlRmlsZUV4aXN0cyhkYXRhYmFzZVBh dGgsIGNyZWF0ZUlmRG9lc05vdEV4aXN0KSkKICAgICAgICAgcmV0dXJuOwogCi0gICAgaWYgKCFt X2RhdGFiYXNlLm9wZW4oZGF0YWJhc2VQYXRoKSkgeworICAgIGlmICghbV9kYXRhYmFzZS5vcGVu KGRhdGFiYXNlUGF0aCwgdHJ1ZSkpIHsKICAgICAgICAgLy8gRklYTUU6IFdoYXQgZG8gZG8gaGVy ZT8KICAgICAgICAgTE9HX0VSUk9SKCJGYWlsZWQgdG8gb3BlbiBkYXRhYmFzZVBhdGggJXMuIiwg ZGF0YWJhc2VQYXRoLmFzY2lpKCkuZGF0YSgpKTsKICAgICAgICAgcmV0dXJuOwo= 52795 2010-04-07 15:47:51 -0700 2010-04-07 17:14:56 -0700 patch patch text/plain 7877 dumi SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1NzIzNSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjkgQEAKKzIwMTAtMDQtMDcgIER1bWl0cnUgRGFuaWxpdWMgIDxkdW1pQGNocm9t aXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBBbHdheXMgcmVnaXN0ZXIgYW5kIHVzZSBDaHJvbWl1bSdzIFNRTGl0ZSBWRlMgZm9yCisgICAg ICAgIFdlYlNRTERhdGFiYXNlcy4gS2VlcCB1c2luZyB0aGUgZGVmYXVsdCBWRlMgaW4gYWxsIG90 aGVyCisgICAgICAgIGNhc2VzLiBUaGlzIGNoYW5nZSBzaG91bGQgYWxsb3cgQ2hyb21pdW0gdG8g c3VwcG9ydAorICAgICAgICBXZWJTUUxEYXRhYmFzZXMgaW4gLS1zaW5nbGUtcHJvY2VzcyBtb2Rl LgorCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zNzE4 Ni4KKworICAgICAgICAqIHBsYXRmb3JtL3NxbC9TUUxpdGVEYXRhYmFzZS5jcHA6CisgICAgICAg IChXZWJDb3JlOjpTUUxpdGVEYXRhYmFzZTo6b3Blbik6CisgICAgICAgICogcGxhdGZvcm0vc3Fs L1NRTGl0ZURhdGFiYXNlLmg6CisgICAgICAgICogcGxhdGZvcm0vc3FsL1NRTGl0ZUZpbGVTeXN0 ZW0uY3BwOgorICAgICAgICAoV2ViQ29yZTo6U1FMaXRlRmlsZVN5c3RlbTo6b3BlbkRhdGFiYXNl KToKKyAgICAgICAgKiBwbGF0Zm9ybS9zcWwvU1FMaXRlRmlsZVN5c3RlbS5oOgorICAgICAgICAq IHBsYXRmb3JtL3NxbC9jaHJvbWl1bS9TUUxpdGVGaWxlU3lzdGVtQ2hyb21pdW0uY3BwOgorICAg ICAgICAoV2ViQ29yZTo6U1FMaXRlRmlsZVN5c3RlbTo6b3BlbkRhdGFiYXNlKToKKyAgICAgICAg KiBwbGF0Zm9ybS9zcWwvY2hyb21pdW0vU1FMaXRlRmlsZVN5c3RlbUNocm9taXVtUG9zaXguY3Bw OgorICAgICAgICAoV2ViQ29yZTo6U1FMaXRlRmlsZVN5c3RlbTo6cmVnaXN0ZXJTUUxpdGVWRlMp OgorICAgICAgICAqIHBsYXRmb3JtL3NxbC9jaHJvbWl1bS9TUUxpdGVGaWxlU3lzdGVtQ2hyb21p dW1XaW4uY3BwOgorICAgICAgICAoV2ViQ29yZTo6U1FMaXRlRmlsZVN5c3RlbTo6cmVnaXN0ZXJT UUxpdGVWRlMpOgorICAgICAgICAqIHN0b3JhZ2UvRGF0YWJhc2UuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6RGF0YWJhc2U6OnBlcmZvcm1PcGVuQW5kVmVyaWZ5KToKKwogMjAxMC0wNC0wNyAgQWxl eGV5IFByb3NrdXJ5YWtvdiAgPGFwQGFwcGxlLmNvbT4KIAogICAgICAgICAqIHBsYXRmb3JtL25l dHdvcmsvbWFjL0F1dGhlbnRpY2F0aW9uTWFjLm1tOiBGaXggYSB0eXBvIGluIGNvbW1lbnQuCklu ZGV4OiBXZWJDb3JlL3BsYXRmb3JtL3NxbC9TUUxpdGVEYXRhYmFzZS5jcHAKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gV2ViQ29yZS9wbGF0Zm9ybS9zcWwvU1FMaXRlRGF0YWJhc2UuY3BwCShyZXZpc2lvbiA1NzIz MCkKKysrIFdlYkNvcmUvcGxhdGZvcm0vc3FsL1NRTGl0ZURhdGFiYXNlLmNwcAkod29ya2luZyBj b3B5KQpAQCAtNTgsMTEgKzU4LDExIEBAIFNRTGl0ZURhdGFiYXNlOjp+U1FMaXRlRGF0YWJhc2Uo KQogICAgIGNsb3NlKCk7CiB9CiAKLWJvb2wgU1FMaXRlRGF0YWJhc2U6Om9wZW4oY29uc3QgU3Ry aW5nJiBmaWxlbmFtZSkKK2Jvb2wgU1FMaXRlRGF0YWJhc2U6Om9wZW4oY29uc3QgU3RyaW5nJiBm aWxlbmFtZSwgYm9vbCBmb3JXZWJTUUxEYXRhYmFzZSkKIHsKICAgICBjbG9zZSgpOwotICAgIAot ICAgIG1fbGFzdEVycm9yID0gU1FMaXRlRmlsZVN5c3RlbTo6b3BlbkRhdGFiYXNlKGZpbGVuYW1l LCAmbV9kYik7CisKKyAgICBtX2xhc3RFcnJvciA9IFNRTGl0ZUZpbGVTeXN0ZW06Om9wZW5EYXRh YmFzZShmaWxlbmFtZSwgJm1fZGIsIGZvcldlYlNRTERhdGFiYXNlKTsKICAgICBpZiAobV9sYXN0 RXJyb3IgIT0gU1FMSVRFX09LKSB7CiAgICAgICAgIExPR19FUlJPUigiU1FMaXRlIGRhdGFiYXNl IGZhaWxlZCB0byBsb2FkIGZyb20gJXNcbkNhdXNlIC0gJXMiLCBmaWxlbmFtZS5hc2NpaSgpLmRh dGEoKSwKICAgICAgICAgICAgIHNxbGl0ZTNfZXJybXNnKG1fZGIpKTsKQEAgLTczLDcgKzczLDcg QEAgYm9vbCBTUUxpdGVEYXRhYmFzZTo6b3Blbihjb25zdCBTdHJpbmcmIAogCiAgICAgaWYgKGlz T3BlbigpKQogICAgICAgICBtX29wZW5pbmdUaHJlYWQgPSBjdXJyZW50VGhyZWFkKCk7Ci0gICAg CisKICAgICBpZiAoIVNRTGl0ZVN0YXRlbWVudCgqdGhpcywgIlBSQUdNQSB0ZW1wX3N0b3JlID0g TUVNT1JZOyIpLmV4ZWN1dGVDb21tYW5kKCkpCiAgICAgICAgIExPR19FUlJPUigiU1FMaXRlIGRh dGFiYXNlIGNvdWxkIG5vdCBzZXQgdGVtcF9zdG9yZSB0byBtZW1vcnkiKTsKIApJbmRleDogV2Vi Q29yZS9wbGF0Zm9ybS9zcWwvU1FMaXRlRGF0YWJhc2UuaAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3Jl L3BsYXRmb3JtL3NxbC9TUUxpdGVEYXRhYmFzZS5oCShyZXZpc2lvbiA1NzIzMCkKKysrIFdlYkNv cmUvcGxhdGZvcm0vc3FsL1NRTGl0ZURhdGFiYXNlLmgJKHdvcmtpbmcgY29weSkKQEAgLTU1LDcg KzU1LDcgQEAgcHVibGljOgogICAgIFNRTGl0ZURhdGFiYXNlKCk7CiAgICAgflNRTGl0ZURhdGFi YXNlKCk7CiAKLSAgICBib29sIG9wZW4oY29uc3QgU3RyaW5nJiBmaWxlbmFtZSk7CisgICAgYm9v bCBvcGVuKGNvbnN0IFN0cmluZyYgZmlsZW5hbWUsIGJvb2wgZm9yV2ViU1FMRGF0YWJhc2UgPSBm YWxzZSk7CiAgICAgYm9vbCBpc09wZW4oKSBjb25zdCB7IHJldHVybiBtX2RiOyB9CiAgICAgdm9p ZCBjbG9zZSgpOwogCkluZGV4OiBXZWJDb3JlL3BsYXRmb3JtL3NxbC9TUUxpdGVGaWxlU3lzdGVt LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3BsYXRmb3JtL3NxbC9TUUxpdGVGaWxlU3lzdGVt LmNwcAkocmV2aXNpb24gNTcyMzApCisrKyBXZWJDb3JlL3BsYXRmb3JtL3NxbC9TUUxpdGVGaWxl U3lzdGVtLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNDYsNyArNDYsNyBAQCB2b2lkIFNRTGl0ZUZp bGVTeXN0ZW06OnJlZ2lzdGVyU1FMaXRlVkZTCiB7CiB9CiAKLWludCBTUUxpdGVGaWxlU3lzdGVt OjpvcGVuRGF0YWJhc2UoY29uc3QgU3RyaW5nJiBmaWxlTmFtZSwgc3FsaXRlMyoqIGRhdGFiYXNl KQoraW50IFNRTGl0ZUZpbGVTeXN0ZW06Om9wZW5EYXRhYmFzZShjb25zdCBTdHJpbmcmIGZpbGVO YW1lLCBzcWxpdGUzKiogZGF0YWJhc2UsIGJvb2wpCiB7CiAgICAgLy8gU1FMaXRlIGV4cGVjdHMg YSBudWxsIHRlcm1pbmF0b3Igb24gaXRzIFVURi0xNiBzdHJpbmdzLgogICAgIFN0cmluZyBwYXRo ID0gZmlsZU5hbWU7CkluZGV4OiBXZWJDb3JlL3BsYXRmb3JtL3NxbC9TUUxpdGVGaWxlU3lzdGVt LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9wbGF0Zm9ybS9zcWwvU1FMaXRlRmlsZVN5c3RlbS5o CShyZXZpc2lvbiA1NzIzMCkKKysrIFdlYkNvcmUvcGxhdGZvcm0vc3FsL1NRTGl0ZUZpbGVTeXN0 ZW0uaAkod29ya2luZyBjb3B5KQpAQCAtNTIsNyArNTIsOCBAQCBwdWJsaWM6CiAgICAgLy8gZmls ZU5hbWUgLSBUaGUgbmFtZSBvZiB0aGUgZGF0YWJhc2UgZmlsZS4KICAgICAvLyBkYXRhYmFzZSAt IFRoZSBTUUxpdGUgc3RydWN0dXJlIHRoYXQgcmVwcmVzZW50cyB0aGUgZGF0YWJhc2Ugc3RvcmVk CiAgICAgLy8gICAgICAgICAgICBpbiB0aGUgZ2l2ZW4gZmlsZS4KLSAgICBzdGF0aWMgaW50IG9w ZW5EYXRhYmFzZShjb25zdCBTdHJpbmcmIGZpbGVOYW1lLCBzcWxpdGUzKiogZGF0YWJhc2UpOwor ICAgIC8vIGZvcldlYlNRTERhdGFiYXNlIC0gVHJ1ZSwgaWYgYW5kIG9ubHkgaWYgd2UncmUgb3Bl bmluZyBhIFdlYiBTUUwgRGF0YWJhc2UgZmlsZS4KKyAgICBzdGF0aWMgaW50IG9wZW5EYXRhYmFz ZShjb25zdCBTdHJpbmcmIGZpbGVOYW1lLCBzcWxpdGUzKiogZGF0YWJhc2UsIGJvb2wgZm9yV2Vi U1FMRGF0YWJhc2UpOwogCiAgICAgLy8gUmV0dXJucyB0aGUgZmlsZSBuYW1lIGZvciBhIGRhdGFi YXNlLgogICAgIC8vCkluZGV4OiBXZWJDb3JlL3BsYXRmb3JtL3NxbC9jaHJvbWl1bS9TUUxpdGVG aWxlU3lzdGVtQ2hyb21pdW0uY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGxhdGZvcm0vc3Fs L2Nocm9taXVtL1NRTGl0ZUZpbGVTeXN0ZW1DaHJvbWl1bS5jcHAJKHJldmlzaW9uIDU3MjMwKQor KysgV2ViQ29yZS9wbGF0Zm9ybS9zcWwvY2hyb21pdW0vU1FMaXRlRmlsZVN5c3RlbUNocm9taXVt LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzYsMTAgKzM2LDYgQEAKICNpbmNsdWRlIDxzcWxpdGUz Lmg+CiAjaW5jbHVkZSA8d3RmL3RleHQvQ1N0cmluZy5oPgogCi0jaWZuZGVmIFNRTElURV9PUEVO X0ZVTExNVVRFWAotI2RlZmluZSBTUUxJVEVfT1BFTl9GVUxMTVVURVggMHgwMDAxMDAwMAotI2Vu ZGlmCi0KIC8vIFNRTGl0ZUZpbGVTeXN0ZW06OnJlZ2lzdGVyU1FMaXRlVkZTKCkgaXMgaW1wbGVt ZW50ZWQgaW4gdGhlCiAvLyBwbGF0Zm9ybS1zcGVjaWZpYyBmaWxlcyBTUUxpdGVGaWxlU3lzdGVt Q2hyb21pdW17V2lufFBvc2l4fS5jcHAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKQEAgLTQ4LDE4ICs0 NCwxNCBAQCBTUUxpdGVGaWxlU3lzdGVtOjpTUUxpdGVGaWxlU3lzdGVtKCkKIHsKIH0KIAotaW50 IFNRTGl0ZUZpbGVTeXN0ZW06Om9wZW5EYXRhYmFzZShjb25zdCBTdHJpbmcmIGZpbGVOYW1lLCBz cWxpdGUzKiogZGF0YWJhc2UpCitpbnQgU1FMaXRlRmlsZVN5c3RlbTo6b3BlbkRhdGFiYXNlKGNv bnN0IFN0cmluZyYgZmlsZU5hbWUsIHNxbGl0ZTMqKiBkYXRhYmFzZSwgYm9vbCBmb3JXZWJTUUxE YXRhYmFzZSkKIHsKLSAgICBpZiAoIUNocm9taXVtQnJpZGdlOjpzYW5kYm94RW5hYmxlZCgpKSB7 CisgICAgaWYgKCFmb3JXZWJTUUxEYXRhYmFzZSkgewogICAgICAgICBTdHJpbmcgcGF0aCA9IGZp bGVOYW1lOwogICAgICAgICByZXR1cm4gc3FsaXRlM19vcGVuMTYocGF0aC5jaGFyYWN0ZXJzV2l0 aE51bGxUZXJtaW5hdGlvbigpLCBkYXRhYmFzZSk7CiAgICAgfQogCi0gICAgLy8gb3BlbiBkYXRh YmFzZXMgdXNpbmcgdGhlIGRlZmF1bHQgVkZTCi0gICAgLy8gaW4gcmVuZGVyZXJzLCBpdCBzaG91 bGQgYmUgQ2hyb21pdW0ncyBWRlM7IGluIHRoZSBicm93c2VyIHByb2Nlc3MgaXQgc2hvdWxkIGJl IFNRTGl0ZSdzIGRlZmF1bHQgVkZTCi0gICAgcmV0dXJuIHNxbGl0ZTNfb3Blbl92MihmaWxlTmFt ZS51dGY4KCkuZGF0YSgpLCBkYXRhYmFzZSwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgIFNR TElURV9PUEVOX1JFQURXUklURSB8IFNRTElURV9PUEVOX0NSRUFURSB8IFNRTElURV9PUEVOX0ZV TExNVVRFWCwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICJjaHJvbWl1bV92ZnMiKTsKKyAg ICByZXR1cm4gc3FsaXRlM19vcGVuX3YyKGZpbGVOYW1lLnV0ZjgoKS5kYXRhKCksIGRhdGFiYXNl LCBTUUxJVEVfT1BFTl9SRUFEV1JJVEUgfCBTUUxJVEVfT1BFTl9DUkVBVEUsICJjaHJvbWl1bV92 ZnMiKTsKIH0KIAogU3RyaW5nIFNRTGl0ZUZpbGVTeXN0ZW06OmdldEZpbGVOYW1lRm9yTmV3RGF0 YWJhc2UoCkluZGV4OiBXZWJDb3JlL3BsYXRmb3JtL3NxbC9jaHJvbWl1bS9TUUxpdGVGaWxlU3lz dGVtQ2hyb21pdW1Qb3NpeC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9wbGF0Zm9ybS9zcWwv Y2hyb21pdW0vU1FMaXRlRmlsZVN5c3RlbUNocm9taXVtUG9zaXguY3BwCShyZXZpc2lvbiA1NzIz MCkKKysrIFdlYkNvcmUvcGxhdGZvcm0vc3FsL2Nocm9taXVtL1NRTGl0ZUZpbGVTeXN0ZW1DaHJv bWl1bVBvc2l4LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTczLDEyICsxNzMsNiBAQCBuYW1lc3Bh Y2UgV2ViQ29yZSB7CiAKIHZvaWQgU1FMaXRlRmlsZVN5c3RlbTo6cmVnaXN0ZXJTUUxpdGVWRlMo KQogewotICAgIC8vIEZJWE1FOiBNYWtlIHN1cmUgdGhlcmUgYXJlbid0IGFueSB1bmludGVuZGVk IGNvbnNlcXVlbmNlcyB3aGVuIFZGUyBjb2RlIGlzIGNhbGxlZCBpbiB0aGUgYnJvd3NlciBwcm9j ZXNzLgotICAgIGlmICghQ2hyb21pdW1CcmlkZ2U6OnNhbmRib3hFbmFibGVkKCkpIHsKLSAgICAg ICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7Ci0gICAgICAgIHJldHVybjsKLSAgICB9Ci0KICAgICBz cWxpdGUzX3ZmcyogdW5peF92ZnMgPSBzcWxpdGUzX3Zmc19maW5kKCJ1bml4Iik7CiAgICAgc3Rh dGljIHNxbGl0ZTNfdmZzIGNocm9taXVtX3ZmcyA9IHsKICAgICAgICAgMSwKSW5kZXg6IFdlYkNv cmUvcGxhdGZvcm0vc3FsL2Nocm9taXVtL1NRTGl0ZUZpbGVTeXN0ZW1DaHJvbWl1bVdpbi5jcHAK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gV2ViQ29yZS9wbGF0Zm9ybS9zcWwvY2hyb21pdW0vU1FMaXRlRmlsZVN5 c3RlbUNocm9taXVtV2luLmNwcAkocmV2aXNpb24gNTcyMzApCisrKyBXZWJDb3JlL3BsYXRmb3Jt L3NxbC9jaHJvbWl1bS9TUUxpdGVGaWxlU3lzdGVtQ2hyb21pdW1XaW4uY3BwCSh3b3JraW5nIGNv cHkpCkBAIC0xNDIsMTIgKzE0Miw2IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogdm9pZCBTUUxp dGVGaWxlU3lzdGVtOjpyZWdpc3RlclNRTGl0ZVZGUygpCiB7Ci0gICAgLy8gRklYTUU6IE1ha2Ug c3VyZSB0aGVyZSBhcmVuJ3QgYW55IHVuaW50ZW5kZWQgY29uc2VxdWVuY2VzIHdoZW4gVkZTIGNv ZGUgaXMgY2FsbGVkIGluIHRoZSBicm93c2VyIHByb2Nlc3MuCi0gICAgaWYgKCFDaHJvbWl1bUJy aWRnZTo6c2FuZGJveEVuYWJsZWQoKSkgewotICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsK LSAgICAgICAgcmV0dXJuOwotICAgIH0KLQogICAgIHNxbGl0ZTNfdmZzKiB3aW4zMl92ZnMgPSBz cWxpdGUzX3Zmc19maW5kKCJ3aW4zMiIpOwogICAgIHN0YXRpYyBzcWxpdGUzX3ZmcyBjaHJvbWl1 bV92ZnMgPSB7CiAgICAgICAgIDEsCkluZGV4OiBXZWJDb3JlL3N0b3JhZ2UvRGF0YWJhc2UuY3Bw Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFdlYkNvcmUvc3RvcmFnZS9EYXRhYmFzZS5jcHAJKHJldmlzaW9uIDU3 MjMwKQorKysgV2ViQ29yZS9zdG9yYWdlL0RhdGFiYXNlLmNwcAkod29ya2luZyBjb3B5KQpAQCAt NTM4LDcgKzUzOCw3IEBAIHZvaWQgRGF0YWJhc2U6OnBlcmZvcm1Qb2xpY3lDaGVja3MoKQogCiBi b29sIERhdGFiYXNlOjpwZXJmb3JtT3BlbkFuZFZlcmlmeShFeGNlcHRpb25Db2RlJiBlKQogewot ICAgIGlmICghbV9zcWxpdGVEYXRhYmFzZS5vcGVuKG1fZmlsZW5hbWUpKSB7CisgICAgaWYgKCFt X3NxbGl0ZURhdGFiYXNlLm9wZW4obV9maWxlbmFtZSwgdHJ1ZSkpIHsKICAgICAgICAgTE9HX0VS Uk9SKCJVbmFibGUgdG8gb3BlbiBkYXRhYmFzZSBhdCBwYXRoICVzIiwgbV9maWxlbmFtZS5hc2Np aSgpLmRhdGEoKSk7CiAgICAgICAgIGUgPSBJTlZBTElEX1NUQVRFX0VSUjsKICAgICAgICAgcmV0 dXJuIGZhbHNlOwo= 52809 2010-04-07 17:14:56 -0700 2010-04-07 17:49:58 -0700 patch patch text/plain 10163 dumi SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1NzIzNSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMzUgQEAKKzIwMTAtMDQtMDcgIER1bWl0cnUgRGFuaWxpdWMgIDxkdW1pQGNocm9t aXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBGaXggQ2hyb21pdW0ncyBIVE1MNSBEQiBzdXBwb3J0IGluIC0tc2luZ2xlLXByb2Nlc3MgbW9k ZS4KKworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Mzcx ODYuCisKKyAgICAgICAgQWx3YXlzIHJlZ2lzdGVyIGFuZCB1c2UgQ2hyb21pdW0ncyBTUUxpdGUg VkZTIGZvcgorICAgICAgICBXZWJTUUxEYXRhYmFzZXMuIEtlZXAgdXNpbmcgdGhlIGRlZmF1bHQg VkZTIGluIGFsbCBvdGhlcgorICAgICAgICBjYXNlcy4gVGhpcyBjaGFuZ2Ugc2hvdWxkIGFsbG93 IENocm9taXVtIHRvIHN1cHBvcnQKKyAgICAgICAgV2ViU1FMRGF0YWJhc2VzIGluIC0tc2luZ2xl LXByb2Nlc3MgbW9kZS4KKworICAgICAgICBBbHNvLCBjbGVhbmluZyB1cCBhIGJpZyBTUUxpdGVG aWxlU3lzdGVtQ2hyb21pdW0gYW5kIGdldHRpbmcgcmlkCisgICAgICAgIG9mIHRoZSBTUUxJVEVf T1BFTl9GVUxMTVVURVggZmxhZzogd2UgdXNlIHNxbGl0ZSBEQiBoYW5kbGVzIG9ubHkKKyAgICAg ICAgb24gdGhlIERCIHRocmVhZCwgc28gd2UgZG9uJ3QgbmVlZCBtdWx0aS10aHJlYWRlZCBzdXBw b3J0LgorCisgICAgICAgICogcGxhdGZvcm0vc3FsL1NRTGl0ZURhdGFiYXNlLmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OlNRTGl0ZURhdGFiYXNlOjpvcGVuKToKKyAgICAgICAgKiBwbGF0Zm9ybS9z cWwvU1FMaXRlRGF0YWJhc2UuaDoKKyAgICAgICAgKiBwbGF0Zm9ybS9zcWwvU1FMaXRlRmlsZVN5 c3RlbS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTUUxpdGVGaWxlU3lzdGVtOjpvcGVuRGF0YWJh c2UpOgorICAgICAgICAqIHBsYXRmb3JtL3NxbC9TUUxpdGVGaWxlU3lzdGVtLmg6CisgICAgICAg ICogcGxhdGZvcm0vc3FsL2Nocm9taXVtL1NRTGl0ZUZpbGVTeXN0ZW1DaHJvbWl1bS5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpTUUxpdGVGaWxlU3lzdGVtOjpvcGVuRGF0YWJhc2UpOgorICAgICAg ICAqIHBsYXRmb3JtL3NxbC9jaHJvbWl1bS9TUUxpdGVGaWxlU3lzdGVtQ2hyb21pdW1Qb3NpeC5j cHA6CisgICAgICAgIChXZWJDb3JlOjpTUUxpdGVGaWxlU3lzdGVtOjpyZWdpc3RlclNRTGl0ZVZG Uyk6CisgICAgICAgICogcGxhdGZvcm0vc3FsL2Nocm9taXVtL1NRTGl0ZUZpbGVTeXN0ZW1DaHJv bWl1bVdpbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTUUxpdGVGaWxlU3lzdGVtOjpyZWdpc3Rl clNRTGl0ZVZGUyk6CisgICAgICAgICogc3RvcmFnZS9EYXRhYmFzZS5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpEYXRhYmFzZTo6cGVyZm9ybU9wZW5BbmRWZXJpZnkpOgorCiAyMDEwLTA0LTA3ICBB bGV4ZXkgUHJvc2t1cnlha292ICA8YXBAYXBwbGUuY29tPgogCiAgICAgICAgICogcGxhdGZvcm0v bmV0d29yay9tYWMvQXV0aGVudGljYXRpb25NYWMubW06IEZpeCBhIHR5cG8gaW4gY29tbWVudC4K SW5kZXg6IFdlYkNvcmUvcGxhdGZvcm0vc3FsL1NRTGl0ZURhdGFiYXNlLmNwcAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBXZWJDb3JlL3BsYXRmb3JtL3NxbC9TUUxpdGVEYXRhYmFzZS5jcHAJKHJldmlzaW9uIDU3 MjMwKQorKysgV2ViQ29yZS9wbGF0Zm9ybS9zcWwvU1FMaXRlRGF0YWJhc2UuY3BwCSh3b3JraW5n IGNvcHkpCkBAIC01OCwxMSArNTgsMTEgQEAgU1FMaXRlRGF0YWJhc2U6On5TUUxpdGVEYXRhYmFz ZSgpCiAgICAgY2xvc2UoKTsKIH0KIAotYm9vbCBTUUxpdGVEYXRhYmFzZTo6b3Blbihjb25zdCBT dHJpbmcmIGZpbGVuYW1lKQorYm9vbCBTUUxpdGVEYXRhYmFzZTo6b3Blbihjb25zdCBTdHJpbmcm IGZpbGVuYW1lLCBib29sIGZvcldlYlNRTERhdGFiYXNlKQogewogICAgIGNsb3NlKCk7Ci0gICAg Ci0gICAgbV9sYXN0RXJyb3IgPSBTUUxpdGVGaWxlU3lzdGVtOjpvcGVuRGF0YWJhc2UoZmlsZW5h bWUsICZtX2RiKTsKKworICAgIG1fbGFzdEVycm9yID0gU1FMaXRlRmlsZVN5c3RlbTo6b3BlbkRh dGFiYXNlKGZpbGVuYW1lLCAmbV9kYiwgZm9yV2ViU1FMRGF0YWJhc2UpOwogICAgIGlmIChtX2xh c3RFcnJvciAhPSBTUUxJVEVfT0spIHsKICAgICAgICAgTE9HX0VSUk9SKCJTUUxpdGUgZGF0YWJh c2UgZmFpbGVkIHRvIGxvYWQgZnJvbSAlc1xuQ2F1c2UgLSAlcyIsIGZpbGVuYW1lLmFzY2lpKCku ZGF0YSgpLAogICAgICAgICAgICAgc3FsaXRlM19lcnJtc2cobV9kYikpOwpAQCAtNzMsNyArNzMs NyBAQCBib29sIFNRTGl0ZURhdGFiYXNlOjpvcGVuKGNvbnN0IFN0cmluZyYgCiAKICAgICBpZiAo aXNPcGVuKCkpCiAgICAgICAgIG1fb3BlbmluZ1RocmVhZCA9IGN1cnJlbnRUaHJlYWQoKTsKLSAg ICAKKwogICAgIGlmICghU1FMaXRlU3RhdGVtZW50KCp0aGlzLCAiUFJBR01BIHRlbXBfc3RvcmUg PSBNRU1PUlk7IikuZXhlY3V0ZUNvbW1hbmQoKSkKICAgICAgICAgTE9HX0VSUk9SKCJTUUxpdGUg ZGF0YWJhc2UgY291bGQgbm90IHNldCB0ZW1wX3N0b3JlIHRvIG1lbW9yeSIpOwogCkluZGV4OiBX ZWJDb3JlL3BsYXRmb3JtL3NxbC9TUUxpdGVEYXRhYmFzZS5oCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNv cmUvcGxhdGZvcm0vc3FsL1NRTGl0ZURhdGFiYXNlLmgJKHJldmlzaW9uIDU3MjMwKQorKysgV2Vi Q29yZS9wbGF0Zm9ybS9zcWwvU1FMaXRlRGF0YWJhc2UuaAkod29ya2luZyBjb3B5KQpAQCAtNTUs NyArNTUsNyBAQCBwdWJsaWM6CiAgICAgU1FMaXRlRGF0YWJhc2UoKTsKICAgICB+U1FMaXRlRGF0 YWJhc2UoKTsKIAotICAgIGJvb2wgb3Blbihjb25zdCBTdHJpbmcmIGZpbGVuYW1lKTsKKyAgICBi b29sIG9wZW4oY29uc3QgU3RyaW5nJiBmaWxlbmFtZSwgYm9vbCBmb3JXZWJTUUxEYXRhYmFzZSA9 IGZhbHNlKTsKICAgICBib29sIGlzT3BlbigpIGNvbnN0IHsgcmV0dXJuIG1fZGI7IH0KICAgICB2 b2lkIGNsb3NlKCk7CiAKSW5kZXg6IFdlYkNvcmUvcGxhdGZvcm0vc3FsL1NRTGl0ZUZpbGVTeXN0 ZW0uY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGxhdGZvcm0vc3FsL1NRTGl0ZUZpbGVTeXN0 ZW0uY3BwCShyZXZpc2lvbiA1NzIzMCkKKysrIFdlYkNvcmUvcGxhdGZvcm0vc3FsL1NRTGl0ZUZp bGVTeXN0ZW0uY3BwCSh3b3JraW5nIGNvcHkpCkBAIC00Niw3ICs0Niw3IEBAIHZvaWQgU1FMaXRl RmlsZVN5c3RlbTo6cmVnaXN0ZXJTUUxpdGVWRlMKIHsKIH0KIAotaW50IFNRTGl0ZUZpbGVTeXN0 ZW06Om9wZW5EYXRhYmFzZShjb25zdCBTdHJpbmcmIGZpbGVOYW1lLCBzcWxpdGUzKiogZGF0YWJh c2UpCitpbnQgU1FMaXRlRmlsZVN5c3RlbTo6b3BlbkRhdGFiYXNlKGNvbnN0IFN0cmluZyYgZmls ZU5hbWUsIHNxbGl0ZTMqKiBkYXRhYmFzZSwgYm9vbCkKIHsKICAgICAvLyBTUUxpdGUgZXhwZWN0 cyBhIG51bGwgdGVybWluYXRvciBvbiBpdHMgVVRGLTE2IHN0cmluZ3MuCiAgICAgU3RyaW5nIHBh dGggPSBmaWxlTmFtZTsKSW5kZXg6IFdlYkNvcmUvcGxhdGZvcm0vc3FsL1NRTGl0ZUZpbGVTeXN0 ZW0uaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3BsYXRmb3JtL3NxbC9TUUxpdGVGaWxlU3lzdGVt LmgJKHJldmlzaW9uIDU3MjMwKQorKysgV2ViQ29yZS9wbGF0Zm9ybS9zcWwvU1FMaXRlRmlsZVN5 c3RlbS5oCSh3b3JraW5nIGNvcHkpCkBAIC01Miw3ICs1MiwxMCBAQCBwdWJsaWM6CiAgICAgLy8g ZmlsZU5hbWUgLSBUaGUgbmFtZSBvZiB0aGUgZGF0YWJhc2UgZmlsZS4KICAgICAvLyBkYXRhYmFz ZSAtIFRoZSBTUUxpdGUgc3RydWN0dXJlIHRoYXQgcmVwcmVzZW50cyB0aGUgZGF0YWJhc2Ugc3Rv cmVkCiAgICAgLy8gICAgICAgICAgICBpbiB0aGUgZ2l2ZW4gZmlsZS4KLSAgICBzdGF0aWMgaW50 IG9wZW5EYXRhYmFzZShjb25zdCBTdHJpbmcmIGZpbGVOYW1lLCBzcWxpdGUzKiogZGF0YWJhc2Up OworICAgIC8vIGZvcldlYlNRTERhdGFiYXNlIC0gVHJ1ZSwgaWYgYW5kIG9ubHkgaWYgd2UncmUg b3BlbmluZyBhIFdlYiBTUUwgRGF0YWJhc2UgZmlsZS4KKyAgICAvLyAgICAgICAgICAgICAgICAg ICAgIFVzZWQgYnkgQ2hyb21pdW0gdG8gZGV0ZXJtaW5lIGlmIHRoZSBEQiBmaWxlIG5lZWRzIHRv IGJlIG9wZW5lZAorICAgIC8vICAgICAgICAgICAgICAgICAgICAgdXNpbmcgYSBjdXN0b20gVkZT LgorICAgIHN0YXRpYyBpbnQgb3BlbkRhdGFiYXNlKGNvbnN0IFN0cmluZyYgZmlsZU5hbWUsIHNx bGl0ZTMqKiBkYXRhYmFzZSwgYm9vbCBmb3JXZWJTUUxEYXRhYmFzZSk7CiAKICAgICAvLyBSZXR1 cm5zIHRoZSBmaWxlIG5hbWUgZm9yIGEgZGF0YWJhc2UuCiAgICAgLy8KSW5kZXg6IFdlYkNvcmUv cGxhdGZvcm0vc3FsL2Nocm9taXVtL1NRTGl0ZUZpbGVTeXN0ZW1DaHJvbWl1bS5jcHAKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gV2ViQ29yZS9wbGF0Zm9ybS9zcWwvY2hyb21pdW0vU1FMaXRlRmlsZVN5c3RlbUNo cm9taXVtLmNwcAkocmV2aXNpb24gNTcyMzApCisrKyBXZWJDb3JlL3BsYXRmb3JtL3NxbC9jaHJv bWl1bS9TUUxpdGVGaWxlU3lzdGVtQ2hyb21pdW0uY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zNiwx MCArMzYsNiBAQAogI2luY2x1ZGUgPHNxbGl0ZTMuaD4KICNpbmNsdWRlIDx3dGYvdGV4dC9DU3Ry aW5nLmg+CiAKLSNpZm5kZWYgU1FMSVRFX09QRU5fRlVMTE1VVEVYCi0jZGVmaW5lIFNRTElURV9P UEVOX0ZVTExNVVRFWCAweDAwMDEwMDAwCi0jZW5kaWYKLQogLy8gU1FMaXRlRmlsZVN5c3RlbTo6 cmVnaXN0ZXJTUUxpdGVWRlMoKSBpcyBpbXBsZW1lbnRlZCBpbiB0aGUKIC8vIHBsYXRmb3JtLXNw ZWNpZmljIGZpbGVzIFNRTGl0ZUZpbGVTeXN0ZW1DaHJvbWl1bXtXaW58UG9zaXh9LmNwcAogbmFt ZXNwYWNlIFdlYkNvcmUgewpAQCAtNDgsNTQgKzQ0LDUwIEBAIFNRTGl0ZUZpbGVTeXN0ZW06OlNR TGl0ZUZpbGVTeXN0ZW0oKQogewogfQogCi1pbnQgU1FMaXRlRmlsZVN5c3RlbTo6b3BlbkRhdGFi YXNlKGNvbnN0IFN0cmluZyYgZmlsZU5hbWUsIHNxbGl0ZTMqKiBkYXRhYmFzZSkKK2ludCBTUUxp dGVGaWxlU3lzdGVtOjpvcGVuRGF0YWJhc2UoY29uc3QgU3RyaW5nJiBmaWxlTmFtZSwgc3FsaXRl MyoqIGRhdGFiYXNlLCBib29sIGZvcldlYlNRTERhdGFiYXNlKQogewotICAgIGlmICghQ2hyb21p dW1CcmlkZ2U6OnNhbmRib3hFbmFibGVkKCkpIHsKKyAgICBpZiAoIWZvcldlYlNRTERhdGFiYXNl KSB7CiAgICAgICAgIFN0cmluZyBwYXRoID0gZmlsZU5hbWU7CiAgICAgICAgIHJldHVybiBzcWxp dGUzX29wZW4xNihwYXRoLmNoYXJhY3RlcnNXaXRoTnVsbFRlcm1pbmF0aW9uKCksIGRhdGFiYXNl KTsKICAgICB9CiAKLSAgICAvLyBvcGVuIGRhdGFiYXNlcyB1c2luZyB0aGUgZGVmYXVsdCBWRlMK LSAgICAvLyBpbiByZW5kZXJlcnMsIGl0IHNob3VsZCBiZSBDaHJvbWl1bSdzIFZGUzsgaW4gdGhl IGJyb3dzZXIgcHJvY2VzcyBpdCBzaG91bGQgYmUgU1FMaXRlJ3MgZGVmYXVsdCBWRlMKLSAgICBy ZXR1cm4gc3FsaXRlM19vcGVuX3YyKGZpbGVOYW1lLnV0ZjgoKS5kYXRhKCksIGRhdGFiYXNlLAot ICAgICAgICAgICAgICAgICAgICAgICAgICAgU1FMSVRFX09QRU5fUkVBRFdSSVRFIHwgU1FMSVRF X09QRU5fQ1JFQVRFIHwgU1FMSVRFX09QRU5fRlVMTE1VVEVYLAotICAgICAgICAgICAgICAgICAg ICAgICAgICAgImNocm9taXVtX3ZmcyIpOworICAgIHJldHVybiBzcWxpdGUzX29wZW5fdjIoZmls ZU5hbWUudXRmOCgpLmRhdGEoKSwgZGF0YWJhc2UsIFNRTElURV9PUEVOX1JFQURXUklURSB8IFNR TElURV9PUEVOX0NSRUFURSwgImNocm9taXVtX3ZmcyIpOwogfQogCiBTdHJpbmcgU1FMaXRlRmls ZVN5c3RlbTo6Z2V0RmlsZU5hbWVGb3JOZXdEYXRhYmFzZSgKICAgY29uc3QgU3RyaW5nJiwgY29u c3QgU3RyaW5nJiBkYk5hbWUsIGNvbnN0IFN0cmluZyAmb3JpZ2luSWRlbnRpZmllciwgU1FMaXRl RGF0YWJhc2UqKQogewotICAgIC8vIENocm9taXVtIG5hbWVzIERCIGZpbGVzIGJhc2VkIG9uIG9y aWdpbiBhbmQgREIgbmFtZSBvbmx5Ci0gICAgcmV0dXJuIG9yaWdpbklkZW50aWZpZXIgKyAiXyIg KyBkYk5hbWUgKyAiLmRiIjsKKyAgICAvLyBOb3QgdXNlZCBieSBDaHJvbWl1bSdzIERhdGFiYXNl VHJhY2tlciBpbXBsZW1lbnRhdGlvbgorICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOworICAgIHJl dHVybiBTdHJpbmcoKTsKIH0KIAogU3RyaW5nIFNRTGl0ZUZpbGVTeXN0ZW06OmFwcGVuZERhdGFi YXNlRmlsZU5hbWVUb1BhdGgoY29uc3QgU3RyaW5nJiwgY29uc3QgU3RyaW5nJiBmaWxlTmFtZSkK IHsKLSAgICAvLyBDaHJvbWl1bSBzYXZlcyBhbGwgREIgZmlsZXMgaW4gdGhlIHNhbWUgZGlyZWN0 b3J5IChrbm93biBieQotICAgIC8vIHRoZSBicm93c2VyIHByb2Nlc3Mgb25seSk7IGFzIGZhciBh cyB0aGUgcmVuZGVyZXIgcHJvY2Vzc2VzCi0gICAgLy8gYXJlIGNvbmNlcm5lZCwgYWxsIERCIGZp bGVzIGFyZSBzYXZlZCBpbiB0aGUgImN1cnJlbnQiIGRpcmVjdG9yeQotICAgIHJldHVybiBmaWxl TmFtZTsKKyAgICAvLyBOb3QgdXNlZCBieSBDaHJvbWl1bSdzIERhdGFiYXNlVHJhY2tlciBpbXBs ZW1lbnRhdGlvbgorICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOworICAgIHJldHVybiBTdHJpbmco KTsKIH0KIAogYm9vbCBTUUxpdGVGaWxlU3lzdGVtOjplbnN1cmVEYXRhYmFzZURpcmVjdG9yeUV4 aXN0cyhjb25zdCBTdHJpbmcmKQogewotICAgIC8vIGlmIHRoZSBkaXJlY3Rvcnkgd2hlcmUgQ2hy b21pdW0gc3RvcmVzIHRoZSBkYXRhYmFzZXMgZG9lcyBub3QgZXhpc3QsCi0gICAgLy8gaXQgd2ls bCBiZSBhdXRvbWF0aWNhbGx5IGNyZWF0ZWQgYnkgdGhlIGJyb3dzZXIgcHJvY2VzczsKLSAgICAv LyBzbyBhcyBmYXIgYXMgdGhlIFdlYktpdCBjb2RlIGlzIGNvbmNlcm5lZCwgdGhpcyBkaXJlY3Rv cnkgYWx3YXlzIGV4aXN0cwotICAgIHJldHVybiB0cnVlOworICAgIC8vIE5vdCB1c2VkIGJ5IENo cm9taXVtJ3MgRGF0YWJhc2VUcmFja2VyIGltcGxlbWVudGF0aW9uCisgICAgQVNTRVJUX05PVF9S RUFDSEVEKCk7CisgICAgcmV0dXJuIGZhbHNlOwogfQogCiBib29sIFNRTGl0ZUZpbGVTeXN0ZW06 OmVuc3VyZURhdGFiYXNlRmlsZUV4aXN0cyhjb25zdCBTdHJpbmcmLCBib29sKQogewotICAgIC8v IGFsbCBkYXRhYmFzZSBkaXJlY3RvcmllcyB3aWxsIGJlIGNyZWF0ZWQgYXMgbmVlZGVkIGJ5IHRo ZSBicm93c2VyIHByb2Nlc3MKLSAgICByZXR1cm4gdHJ1ZTsKKyAgICAvLyBOb3QgdXNlZCBieSBD aHJvbWl1bSdzIERhdGFiYXNlVHJhY2tlciBpbXBsZW1lbnRhdGlvbgorICAgIEFTU0VSVF9OT1Rf UkVBQ0hFRCgpOworICAgIHJldHVybiBmYWxzZTsKIH0KIAogYm9vbCBTUUxpdGVGaWxlU3lzdGVt OjpkZWxldGVFbXB0eURhdGFiYXNlRGlyZWN0b3J5KGNvbnN0IFN0cmluZyYpCiB7Ci0gICAgLy8g Q2hyb21pdW0gZG9lcyBub3QgdXNlIGEgc2VwYXJhdGUgZGlyZWN0b3J5IGZvciBlYWNoIGRhdGFi YXNlLAotICAgIC8vIHNvIHRoZXJlJ3Mgbm90aGluZyB0byBkbyBoZXJlCi0gICAgcmV0dXJuIHRy dWU7CisgICAgLy8gTm90IHVzZWQgYnkgQ2hyb21pdW0ncyBEYXRhYmFzZVRyYWNrZXIgaW1wbGVt ZW50YXRpb24KKyAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKKyAgICByZXR1cm4gZmFsc2U7CiB9 CiAKIGJvb2wgU1FMaXRlRmlsZVN5c3RlbTo6ZGVsZXRlRGF0YWJhc2VGaWxlKGNvbnN0IFN0cmlu ZyYgZmlsZU5hbWUpCkluZGV4OiBXZWJDb3JlL3BsYXRmb3JtL3NxbC9jaHJvbWl1bS9TUUxpdGVG aWxlU3lzdGVtQ2hyb21pdW1Qb3NpeC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9wbGF0Zm9y bS9zcWwvY2hyb21pdW0vU1FMaXRlRmlsZVN5c3RlbUNocm9taXVtUG9zaXguY3BwCShyZXZpc2lv biA1NzIzMCkKKysrIFdlYkNvcmUvcGxhdGZvcm0vc3FsL2Nocm9taXVtL1NRTGl0ZUZpbGVTeXN0 ZW1DaHJvbWl1bVBvc2l4LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTczLDEyICsxNzMsNiBAQCBu YW1lc3BhY2UgV2ViQ29yZSB7CiAKIHZvaWQgU1FMaXRlRmlsZVN5c3RlbTo6cmVnaXN0ZXJTUUxp dGVWRlMoKQogewotICAgIC8vIEZJWE1FOiBNYWtlIHN1cmUgdGhlcmUgYXJlbid0IGFueSB1bmlu dGVuZGVkIGNvbnNlcXVlbmNlcyB3aGVuIFZGUyBjb2RlIGlzIGNhbGxlZCBpbiB0aGUgYnJvd3Nl ciBwcm9jZXNzLgotICAgIGlmICghQ2hyb21pdW1CcmlkZ2U6OnNhbmRib3hFbmFibGVkKCkpIHsK LSAgICAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7Ci0gICAgICAgIHJldHVybjsKLSAgICB9Ci0K ICAgICBzcWxpdGUzX3ZmcyogdW5peF92ZnMgPSBzcWxpdGUzX3Zmc19maW5kKCJ1bml4Iik7CiAg ICAgc3RhdGljIHNxbGl0ZTNfdmZzIGNocm9taXVtX3ZmcyA9IHsKICAgICAgICAgMSwKSW5kZXg6 IFdlYkNvcmUvcGxhdGZvcm0vc3FsL2Nocm9taXVtL1NRTGl0ZUZpbGVTeXN0ZW1DaHJvbWl1bVdp bi5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9wbGF0Zm9ybS9zcWwvY2hyb21pdW0vU1FMaXRl RmlsZVN5c3RlbUNocm9taXVtV2luLmNwcAkocmV2aXNpb24gNTcyMzApCisrKyBXZWJDb3JlL3Bs YXRmb3JtL3NxbC9jaHJvbWl1bS9TUUxpdGVGaWxlU3lzdGVtQ2hyb21pdW1XaW4uY3BwCSh3b3Jr aW5nIGNvcHkpCkBAIC0xNDIsMTIgKzE0Miw2IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogdm9p ZCBTUUxpdGVGaWxlU3lzdGVtOjpyZWdpc3RlclNRTGl0ZVZGUygpCiB7Ci0gICAgLy8gRklYTUU6 IE1ha2Ugc3VyZSB0aGVyZSBhcmVuJ3QgYW55IHVuaW50ZW5kZWQgY29uc2VxdWVuY2VzIHdoZW4g VkZTIGNvZGUgaXMgY2FsbGVkIGluIHRoZSBicm93c2VyIHByb2Nlc3MuCi0gICAgaWYgKCFDaHJv bWl1bUJyaWRnZTo6c2FuZGJveEVuYWJsZWQoKSkgewotICAgICAgICBBU1NFUlRfTk9UX1JFQUNI RUQoKTsKLSAgICAgICAgcmV0dXJuOwotICAgIH0KLQogICAgIHNxbGl0ZTNfdmZzKiB3aW4zMl92 ZnMgPSBzcWxpdGUzX3Zmc19maW5kKCJ3aW4zMiIpOwogICAgIHN0YXRpYyBzcWxpdGUzX3ZmcyBj aHJvbWl1bV92ZnMgPSB7CiAgICAgICAgIDEsCkluZGV4OiBXZWJDb3JlL3N0b3JhZ2UvRGF0YWJh c2UuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvc3RvcmFnZS9EYXRhYmFzZS5jcHAJKHJldmlz aW9uIDU3MjMwKQorKysgV2ViQ29yZS9zdG9yYWdlL0RhdGFiYXNlLmNwcAkod29ya2luZyBjb3B5 KQpAQCAtNTM4LDcgKzUzOCw3IEBAIHZvaWQgRGF0YWJhc2U6OnBlcmZvcm1Qb2xpY3lDaGVja3Mo KQogCiBib29sIERhdGFiYXNlOjpwZXJmb3JtT3BlbkFuZFZlcmlmeShFeGNlcHRpb25Db2RlJiBl KQogewotICAgIGlmICghbV9zcWxpdGVEYXRhYmFzZS5vcGVuKG1fZmlsZW5hbWUpKSB7CisgICAg aWYgKCFtX3NxbGl0ZURhdGFiYXNlLm9wZW4obV9maWxlbmFtZSwgdHJ1ZSkpIHsKICAgICAgICAg TE9HX0VSUk9SKCJVbmFibGUgdG8gb3BlbiBkYXRhYmFzZSBhdCBwYXRoICVzIiwgbV9maWxlbmFt ZS5hc2NpaSgpLmRhdGEoKSk7CiAgICAgICAgIGUgPSBJTlZBTElEX1NUQVRFX0VSUjsKICAgICAg ICAgcmV0dXJuIGZhbHNlOwo=