40133 2010-06-03 11:24:55 -0700 AX: need ListItemRole and PresentationalRole 2010-06-14 23:51:06 -0700 1 1 1 Unclassified WebKit Accessibility 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 40132 1 cfleizach cfleizach bdakin dglazkov eric mrobinson webkit.review.bot wsiegrist xan.lopez oldest_to_newest 233848 0 cfleizach 2010-06-03 11:24:55 -0700 We need both these roles to be exposed directly to help solve https://bugs.webkit.org/show_bug.cgi?id=40132 233850 1 cfleizach 2010-06-03 11:30:01 -0700 no functional changes. just prep work 233857 2 57796 cfleizach 2010-06-03 11:46:03 -0700 Created attachment 57796 Patch 234037 3 webkit.review.bot 2010-06-03 20:31:24 -0700 Attachment 57796 did not build on chromium: Build output: http://webkit-commit-queue.appspot.com/results/3102006 235035 4 58083 cfleizach 2010-06-07 14:22:57 -0700 Created attachment 58083 patch this should hopefully work for chomium too 235038 5 58084 cfleizach 2010-06-07 14:26:20 -0700 Created attachment 58084 patch now with correct changelogs 235041 6 58086 cfleizach 2010-06-07 14:30:17 -0700 Created attachment 58086 patch for some reason the last patch didn't take 235043 7 cfleizach 2010-06-07 14:38:09 -0700 weird only details is showing up 237429 8 58086 darin 2010-06-12 19:12:28 -0700 Comment on attachment 58086 patch > +Node* AccessibilityRenderObject::node() const > +{ > + if (!m_renderer) > + return 0; > + return m_renderer->node(); > +} What is this function for? It's added in the patch and not used. The patch otherwise seems great. review- because of the seemingly-unrelated change. 237857 9 cfleizach 2010-06-14 09:29:01 -0700 (In reply to comment #8) > (From update of attachment 58086 [details]) > > +Node* AccessibilityRenderObject::node() const > > +{ > > + if (!m_renderer) > > + return 0; > > + return m_renderer->node(); > > +} > > What is this function for? It's added in the patch and not used. > > The patch otherwise seems great. review- because of the seemingly-unrelated change. That was part of the follow up patch. Forgot to take it out of this one 237862 10 58664 cfleizach 2010-06-14 09:35:16 -0700 Created attachment 58664 patch Patch is same as before, but removes the not necessary node() function from this patch 238028 11 58664 darin 2010-06-14 13:54:11 -0700 Comment on attachment 58664 patch > + (WebCore::): Lines like this should be deleted from the ChangeLog. And we should fix prepare-ChangeLog to not generate them. > + (RoleEntry::): Ditto. 238058 12 cfleizach 2010-06-14 14:48:51 -0700 http://trac.webkit.org/changeset/61151 238216 13 eric 2010-06-14 20:15:41 -0700 Seems to have caused a Gtk API test regression: ERROR:../../WebKit/gtk/tests/testatkroles.c:98:get_child_and_test_role: assertion failed: (child_role == role) 238217 14 eric 2010-06-14 20:16:14 -0700 Sheriffbot didn't notice because the buildbot seems to have not been notified of this revision. Not sure why or how. 238246 15 cfleizach 2010-06-14 22:53:36 -0700 (In reply to comment #14) > Sheriffbot didn't notice because the buildbot seems to have not been notified of this revision. Not sure why or how. hopefully i can fix this tonite 238260 16 cfleizach 2010-06-14 23:51:06 -0700 looks like http://trac.webkit.org/changeset/61176 fixed it 57796 2010-06-03 11:46:03 -0700 2010-06-07 14:22:57 -0700 Patch bug-40133-20100603114601.patch text/plain 5963 cfleizach SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA2MDYzMCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjQgQEAKKzIwMTAtMDYtMDMgIENocmlzIEZsZWl6YWNoICA8Y2ZsZWl6YWNoQGFw cGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBBWDogbmVlZCBMaXN0SXRlbVJvbGUgYW5kIFByZXNlbnRhdGlvbmFsUm9sZQorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDAxMzMKKworICAgICAgICBB ZGRpbmcgc3BlY2lmaWMgcm9sZXMgZm9yIHRoZXNlIGtpbmRzIHRvIGZpeCBmdXR1cmUgYnVncy4g Tm8gZnVuY3Rpb25hbCBjaGFuZ2VzLgorCisgICAgICAgICogYWNjZXNzaWJpbGl0eS9BY2Nlc3Np YmlsaXR5T2JqZWN0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmNyZWF0ZUFSSUFSb2xlTWFwKToK KyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlPYmplY3QuaDoKKyAgICAgICAg KFdlYkNvcmU6OkFjY2Vzc2liaWxpdHlPYmplY3Q6OmlzTGlzdEl0ZW0pOgorICAgICAgICAqIGFj Y2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdC5jcHA6CisgICAgICAgIChXZWJD b3JlOjpBY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0Ojpub2RlKToKKyAgICAgICAgKFdlYkNvcmU6 OkFjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3Q6OmFjY2Vzc2liaWxpdHlJc0lnbm9yZWQpOgorICAg ICAgICAoV2ViQ29yZTo6QWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdDo6ZGV0ZXJtaW5lQWNjZXNz aWJpbGl0eVJvbGUpOgorICAgICAgICAqIGFjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eVJlbmRl ck9iamVjdC5oOgorICAgICAgICAqIGFjY2Vzc2liaWxpdHkvbWFjL0FjY2Vzc2liaWxpdHlPYmpl Y3RXcmFwcGVyLm1tOgorICAgICAgICAoLVtBY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBlciBhY2Nl c3NpYmlsaXR5QXR0cmlidXRlTmFtZXNdKToKKwogMjAxMC0wNi0wMyAgU2hlcmlmZiBCb3QgIDx3 ZWJraXQucmV2aWV3LmJvdEBnbWFpbC5jb20+CiAKICAgICAgICAgVW5yZXZpZXdlZCwgcm9sbGlu ZyBvdXQgcjYwNjE0LgpJbmRleDogV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlP YmplY3QuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmls aXR5T2JqZWN0LmNwcAkocmV2aXNpb24gNjA2MjEpCisrKyBXZWJDb3JlL2FjY2Vzc2liaWxpdHkv QWNjZXNzaWJpbGl0eU9iamVjdC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTkwMiw3ICs5MDIsNyBA QCBzdGF0aWMgQVJJQVJvbGVNYXAqIGNyZWF0ZUFSSUFSb2xlTWFwKCkKICAgICAgICAgeyAiaW1n IiwgSW1hZ2VSb2xlIH0sCiAgICAgICAgIHsgImxpbmsiLCBXZWJDb3JlTGlua1JvbGUgfSwKICAg ICAgICAgeyAibGlzdCIsIExpc3RSb2xlIH0sICAgICAgICAKLSAgICAgICAgeyAibGlzdGl0ZW0i LCBHcm91cFJvbGUgfSwgICAgICAgIAorICAgICAgICB7ICJsaXN0aXRlbSIsIExpc3RJdGVtUm9s ZSB9LCAgICAgICAgCiAgICAgICAgIHsgImxpc3Rib3giLCBMaXN0Qm94Um9sZSB9LAogICAgICAg ICB7ICJsb2ciLCBBcHBsaWNhdGlvbkxvZ1JvbGUgfSwKICAgICAgICAgLy8gIm9wdGlvbiIgaXNu J3QgaGVyZSBiZWNhdXNlIGl0IG1heSBtYXAgdG8gZGlmZmVyZW50IHJvbGVzIGRlcGVuZGluZyBv biB0aGUgcGFyZW50IGVsZW1lbnQncyByb2xlCkBAIC05MTcsNyArOTE3LDcgQEAgc3RhdGljIEFS SUFSb2xlTWFwKiBjcmVhdGVBUklBUm9sZU1hcCgpCiAgICAgICAgIHsgIm5vdGUiLCBEb2N1bWVu dE5vdGVSb2xlIH0sCiAgICAgICAgIHsgIm5hdmlnYXRpb24iLCBMYW5kbWFya05hdmlnYXRpb25S b2xlIH0sCiAgICAgICAgIHsgIm9wdGlvbiIsIExpc3RCb3hPcHRpb25Sb2xlIH0sCi0gICAgICAg IHsgInByZXNlbnRhdGlvbiIsIElnbm9yZWRSb2xlIH0sCisgICAgICAgIHsgInByZXNlbnRhdGlv biIsIFByZXNlbnRhdGlvbmFsUm9sZSB9LAogICAgICAgICB7ICJwcm9ncmVzc2JhciIsIFByb2dy ZXNzSW5kaWNhdG9yUm9sZSB9LAogICAgICAgICB7ICJyYWRpbyIsIFJhZGlvQnV0dG9uUm9sZSB9 LAogICAgICAgICB7ICJyYWRpb2dyb3VwIiwgUmFkaW9Hcm91cFJvbGUgfSwKSW5kZXg6IFdlYkNv cmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5T2JqZWN0LmgKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2Vi Q29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlPYmplY3QuaAkocmV2aXNpb24gNjA2MjEp CisrKyBXZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eU9iamVjdC5oCSh3b3JraW5n IGNvcHkpCkBAIC0xNjAsNiArMTYwLDcgQEAgZW51bSBBY2Nlc3NpYmlsaXR5Um9sZSB7CiAgICAg QW5ub3RhdGlvblJvbGUsCiAgICAgU2xpZGVyVGh1bWJSb2xlLAogICAgIElnbm9yZWRSb2xlLAor ICAgIFByZXNlbnRhdGlvbmFsUm9sZSwKICAgICBUYWJSb2xlLAogICAgIFRhYkxpc3RSb2xlLAog ICAgIFRhYlBhbmVsUm9sZSwKQEAgLTI5Niw2ICsyOTcsNyBAQCBwdWJsaWM6CiAgICAgYm9vbCBp c1RyZWVJdGVtKCkgY29uc3QgeyByZXR1cm4gcm9sZVZhbHVlKCkgPT0gVHJlZUl0ZW1Sb2xlOyB9 CiAgICAgYm9vbCBpc1Njcm9sbGJhcigpIGNvbnN0IHsgcmV0dXJuIHJvbGVWYWx1ZSgpID09IFNj cm9sbEJhclJvbGU7IH0KICAgICBib29sIGlzQnV0dG9uKCkgY29uc3QgeyByZXR1cm4gcm9sZVZh bHVlKCkgPT0gQnV0dG9uUm9sZTsgfQorICAgIGJvb2wgaXNMaXN0SXRlbSgpIGNvbnN0IHsgcmV0 dXJuIHJvbGVWYWx1ZSgpID09IExpc3RJdGVtUm9sZTsgfQogICAgIAogICAgIHZpcnR1YWwgYm9v bCBpc0NoZWNrZWQoKSBjb25zdCB7IHJldHVybiBmYWxzZTsgfQogICAgIHZpcnR1YWwgYm9vbCBp c0VuYWJsZWQoKSBjb25zdCB7IHJldHVybiBmYWxzZTsgfQpJbmRleDogV2ViQ29yZS9hY2Nlc3Np YmlsaXR5L0FjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3QuY3BwCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNv cmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0LmNwcAkocmV2aXNpb24g NjA2MjEpCisrKyBXZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eVJlbmRlck9iamVj dC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTExNyw2ICsxMTcsMTMgQEAgdm9pZCBBY2Nlc3NpYmls aXR5UmVuZGVyT2JqZWN0OjpkZXRhY2goKQogI2VuZGlmCiAgICAgbV9yZW5kZXJlciA9IDA7ICAg IAogfQorICAgIAorTm9kZSogQWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdDo6bm9kZSgpIGNvbnN0 Cit7CisgICAgaWYgKCFtX3JlbmRlcmVyKSAKKyAgICAgICAgcmV0dXJuIDA7CisgICAgcmV0dXJu IG1fcmVuZGVyZXItPm5vZGUoKTsKK30KIAogc3RhdGljIGlubGluZSBib29sIGlzSW5saW5lV2l0 aENvbnRpbnVhdGlvbihSZW5kZXJPYmplY3QqIHJlbmRlcmVyKQogewpAQCAtMTczMCw2ICsxNzM3 LDkgQEAgYm9vbCBBY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0OjphY2Nlc3NpYgogICAgIGlmIChy b2xlVmFsdWUoKSA9PSBJZ25vcmVkUm9sZSkKICAgICAgICAgcmV0dXJuIHRydWU7CiAgICAgCisg ICAgaWYgKHJvbGVWYWx1ZSgpID09IFByZXNlbnRhdGlvbmFsUm9sZSkKKyAgICAgICAgcmV0dXJu IHRydWU7CisgICAgCiAgICAgLy8gQW4gQVJJQSB0cmVlIGNhbiBvbmx5IGhhdmUgdHJlZSBpdGVt cyBhbmQgc3RhdGljIHRleHQgYXMgY2hpbGRyZW4uCiAgICAgaWYgKCFpc0FsbG93ZWRDaGlsZE9m VHJlZSgpKQogICAgICAgICByZXR1cm4gdHJ1ZTsKQEAgLTI5NDksNiArMjk1OSw4IEBAIEFjY2Vz c2liaWxpdHlSb2xlIEFjY2Vzc2liaWxpdHlSZW5kZXJPYmoKICAgICAgICAgICAgIHJldHVybiBJ bWFnZU1hcFJvbGU7CiAgICAgICAgIHJldHVybiBXZWJDb3JlTGlua1JvbGU7CiAgICAgfQorICAg IGlmIChtX3JlbmRlcmVyLT5pc0xpc3RJdGVtKCkpCisgICAgICAgIHJldHVybiBMaXN0SXRlbVJv bGU7CiAgICAgaWYgKG1fcmVuZGVyZXItPmlzTGlzdE1hcmtlcigpKQogICAgICAgICByZXR1cm4g TGlzdE1hcmtlclJvbGU7CiAgICAgaWYgKG5vZGUgJiYgbm9kZS0+aGFzVGFnTmFtZShidXR0b25U YWcpKQpJbmRleDogV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlSZW5kZXJPYmpl Y3QuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eVJl bmRlck9iamVjdC5oCShyZXZpc2lvbiA2MDYyMSkKKysrIFdlYkNvcmUvYWNjZXNzaWJpbGl0eS9B Y2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0LmgJKHdvcmtpbmcgY29weSkKQEAgLTE2OSw2ICsxNjks OCBAQCBwdWJsaWM6CiAgICAgCiAgICAgdm9pZCBzZXRSZW5kZXJlcihSZW5kZXJPYmplY3QqIHJl bmRlcmVyKSB7IG1fcmVuZGVyZXIgPSByZW5kZXJlcjsgfQogICAgIFJlbmRlck9iamVjdCogcmVu ZGVyZXIoKSBjb25zdCB7IHJldHVybiBtX3JlbmRlcmVyOyB9CisgICAgTm9kZSogbm9kZSgpIGNv bnN0OworICAgIAogICAgIFJlbmRlclZpZXcqIHRvcFJlbmRlcmVyKCkgY29uc3Q7CiAgICAgUmVu ZGVyVGV4dENvbnRyb2wqIHRleHRDb250cm9sKCkgY29uc3Q7CiAgICAgRG9jdW1lbnQqIGRvY3Vt ZW50KCkgY29uc3Q7CkluZGV4OiBXZWJDb3JlL2FjY2Vzc2liaWxpdHkvbWFjL0FjY2Vzc2liaWxp dHlPYmplY3RXcmFwcGVyLm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvYWNjZXNzaWJpbGl0eS9t YWMvQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBwZXIubW0JKHJldmlzaW9uIDYwNjIxKQorKysgV2Vi Q29yZS9hY2Nlc3NpYmlsaXR5L21hYy9BY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBlci5tbQkod29y a2luZyBjb3B5KQpAQCAtOTU3LDcgKzk1Nyw3IEBAIC0gKE5TQXJyYXkqKWFjY2Vzc2liaWxpdHlB dHRyaWJ1dGVOYW1lcwogICAgIGVsc2UgaWYgKG1fb2JqZWN0LT5pc0NvbnRyb2woKSkKICAgICAg ICAgb2JqZWN0QXR0cmlidXRlcyA9IGNvbnRyb2xBdHRyczsKICAgICAKLSAgICBlbHNlIGlmICht X29iamVjdC0+aXNHcm91cCgpKQorICAgIGVsc2UgaWYgKG1fb2JqZWN0LT5pc0dyb3VwKCkgfHwg bV9vYmplY3QtPmlzTGlzdEl0ZW0oKSkKICAgICAgICAgb2JqZWN0QXR0cmlidXRlcyA9IGdyb3Vw QXR0cnM7CiAgICAgZWxzZSBpZiAobV9vYmplY3QtPmlzVGFiTGlzdCgpKQogICAgICAgICBvYmpl Y3RBdHRyaWJ1dGVzID0gdGFiTGlzdEF0dHJzOwpAQCAtMTE0OCw2ICsxMTQ4LDcgQEAgc3RhdGlj IGNvbnN0IEFjY2Vzc2liaWxpdHlSb2xlTWFwJiBjcmVhdAogICAgICAgICB7IFRhYlBhbmVsUm9s ZSwgTlNBY2Nlc3NpYmlsaXR5R3JvdXBSb2xlIH0sCiAgICAgICAgIHsgVHJlZVJvbGUsIE5TQWNj ZXNzaWJpbGl0eU91dGxpbmVSb2xlIH0sCiAgICAgICAgIHsgVHJlZUl0ZW1Sb2xlLCBOU0FjY2Vz c2liaWxpdHlSb3dSb2xlIH0sCisgICAgICAgIHsgTGlzdEl0ZW1Sb2xlLCBOU0FjY2Vzc2liaWxp dHlHcm91cFJvbGUgfQogICAgIH07CiAgICAgQWNjZXNzaWJpbGl0eVJvbGVNYXAmIHJvbGVNYXAg PSAqbmV3IEFjY2Vzc2liaWxpdHlSb2xlTWFwOwogICAgIAo= 58083 2010-06-07 14:22:57 -0700 2010-06-07 14:26:20 -0700 patch patch.txt text/plain 7805 cfleizach SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA2MDgwMCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjUgQEAKKzIwMTAtMDYtMDcgIENocmlzIEZsZWl6YWNoICA8Y2ZsZWl6YWNoQGFw cGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBOZWVkIGEgc2hvcnQgZGVzY3JpcHRpb24gYW5kIGJ1ZyBVUkwgKE9PUFMhKQorCisgICAgICAg IE5vIG5ldyB0ZXN0cy4gKE9PUFMhKQorCisgICAgICAgICogYWNjZXNzaWJpbGl0eS9BY2Nlc3Np YmlsaXR5T2JqZWN0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmNyZWF0ZUFSSUFSb2xlTWFwKToK KyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlPYmplY3QuaDoKKyAgICAgICAg KFdlYkNvcmU6Oik6CisgICAgICAgIChXZWJDb3JlOjpBY2Nlc3NpYmlsaXR5T2JqZWN0Ojppc0xp c3RJdGVtKToKKyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlSZW5kZXJPYmpl Y3QuY3BwOgorICAgICAgICAoV2ViQ29yZTo6QWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdDo6bm9k ZSk6CisgICAgICAgIChXZWJDb3JlOjpBY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0OjphY2Nlc3Np YmlsaXR5SXNJZ25vcmVkKToKKyAgICAgICAgKFdlYkNvcmU6OkFjY2Vzc2liaWxpdHlSZW5kZXJP YmplY3Q6OmRldGVybWluZUFjY2Vzc2liaWxpdHlSb2xlKToKKyAgICAgICAgKiBhY2Nlc3NpYmls aXR5L0FjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3QuaDoKKyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5 L21hYy9BY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBlci5tbToKKyAgICAgICAgKC1bQWNjZXNzaWJp bGl0eU9iamVjdFdyYXBwZXIgYWNjZXNzaWJpbGl0eUF0dHJpYnV0ZU5hbWVzXSk6CisgICAgICAg IChSb2xlRW50cnk6Oik6CisKIDIwMTAtMDYtMDcgIEtpbnVrbyBZYXN1ZGEgIDxraW51a29AY2hy b21pdW0ub3JnPgogCiAgICAgICAgIFVucmV2aWV3ZWQuCkluZGV4OiBXZWJDb3JlL2FjY2Vzc2li aWxpdHkvQWNjZXNzaWJpbGl0eU9iamVjdC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9hY2Nl c3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlPYmplY3QuY3BwCShyZXZpc2lvbiA2MDcyNykKKysrIFdl YkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5T2JqZWN0LmNwcAkod29ya2luZyBjb3B5 KQpAQCAtOTAyLDcgKzkwMiw3IEBAIHN0YXRpYyBBUklBUm9sZU1hcCogY3JlYXRlQVJJQVJvbGVN YXAoKQogICAgICAgICB7ICJpbWciLCBJbWFnZVJvbGUgfSwKICAgICAgICAgeyAibGluayIsIFdl YkNvcmVMaW5rUm9sZSB9LAogICAgICAgICB7ICJsaXN0IiwgTGlzdFJvbGUgfSwgICAgICAgIAot ICAgICAgICB7ICJsaXN0aXRlbSIsIEdyb3VwUm9sZSB9LCAgICAgICAgCisgICAgICAgIHsgImxp c3RpdGVtIiwgTGlzdEl0ZW1Sb2xlIH0sICAgICAgICAKICAgICAgICAgeyAibGlzdGJveCIsIExp c3RCb3hSb2xlIH0sCiAgICAgICAgIHsgImxvZyIsIEFwcGxpY2F0aW9uTG9nUm9sZSB9LAogICAg ICAgICAvLyAib3B0aW9uIiBpc24ndCBoZXJlIGJlY2F1c2UgaXQgbWF5IG1hcCB0byBkaWZmZXJl bnQgcm9sZXMgZGVwZW5kaW5nIG9uIHRoZSBwYXJlbnQgZWxlbWVudCdzIHJvbGUKQEAgLTkxNyw3 ICs5MTcsNyBAQCBzdGF0aWMgQVJJQVJvbGVNYXAqIGNyZWF0ZUFSSUFSb2xlTWFwKCkKICAgICAg ICAgeyAibm90ZSIsIERvY3VtZW50Tm90ZVJvbGUgfSwKICAgICAgICAgeyAibmF2aWdhdGlvbiIs IExhbmRtYXJrTmF2aWdhdGlvblJvbGUgfSwKICAgICAgICAgeyAib3B0aW9uIiwgTGlzdEJveE9w dGlvblJvbGUgfSwKLSAgICAgICAgeyAicHJlc2VudGF0aW9uIiwgSWdub3JlZFJvbGUgfSwKKyAg ICAgICAgeyAicHJlc2VudGF0aW9uIiwgUHJlc2VudGF0aW9uYWxSb2xlIH0sCiAgICAgICAgIHsg InByb2dyZXNzYmFyIiwgUHJvZ3Jlc3NJbmRpY2F0b3JSb2xlIH0sCiAgICAgICAgIHsgInJhZGlv IiwgUmFkaW9CdXR0b25Sb2xlIH0sCiAgICAgICAgIHsgInJhZGlvZ3JvdXAiLCBSYWRpb0dyb3Vw Um9sZSB9LApJbmRleDogV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlPYmplY3Qu aAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eU9iamVj dC5oCShyZXZpc2lvbiA2MDcyNykKKysrIFdlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmls aXR5T2JqZWN0LmgJKHdvcmtpbmcgY29weSkKQEAgLTE2MCw2ICsxNjAsNyBAQCBlbnVtIEFjY2Vz c2liaWxpdHlSb2xlIHsKICAgICBBbm5vdGF0aW9uUm9sZSwKICAgICBTbGlkZXJUaHVtYlJvbGUs CiAgICAgSWdub3JlZFJvbGUsCisgICAgUHJlc2VudGF0aW9uYWxSb2xlLAogICAgIFRhYlJvbGUs CiAgICAgVGFiTGlzdFJvbGUsCiAgICAgVGFiUGFuZWxSb2xlLApAQCAtMjk2LDYgKzI5Nyw3IEBA IHB1YmxpYzoKICAgICBib29sIGlzVHJlZUl0ZW0oKSBjb25zdCB7IHJldHVybiByb2xlVmFsdWUo KSA9PSBUcmVlSXRlbVJvbGU7IH0KICAgICBib29sIGlzU2Nyb2xsYmFyKCkgY29uc3QgeyByZXR1 cm4gcm9sZVZhbHVlKCkgPT0gU2Nyb2xsQmFyUm9sZTsgfQogICAgIGJvb2wgaXNCdXR0b24oKSBj b25zdCB7IHJldHVybiByb2xlVmFsdWUoKSA9PSBCdXR0b25Sb2xlOyB9CisgICAgYm9vbCBpc0xp c3RJdGVtKCkgY29uc3QgeyByZXR1cm4gcm9sZVZhbHVlKCkgPT0gTGlzdEl0ZW1Sb2xlOyB9CiAg ICAgCiAgICAgdmlydHVhbCBib29sIGlzQ2hlY2tlZCgpIGNvbnN0IHsgcmV0dXJuIGZhbHNlOyB9 CiAgICAgdmlydHVhbCBib29sIGlzRW5hYmxlZCgpIGNvbnN0IHsgcmV0dXJuIGZhbHNlOyB9Cklu ZGV4OiBXZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdC5jcHAK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlSZW5kZXJP YmplY3QuY3BwCShyZXZpc2lvbiA2MDcyNykKKysrIFdlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nl c3NpYmlsaXR5UmVuZGVyT2JqZWN0LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTE3LDYgKzExNywx MyBAQCB2b2lkIEFjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3Q6OmRldGFjaCgpCiAjZW5kaWYKICAg ICBtX3JlbmRlcmVyID0gMDsgICAgCiB9CisgICAgCitOb2RlKiBBY2Nlc3NpYmlsaXR5UmVuZGVy T2JqZWN0Ojpub2RlKCkgY29uc3QKK3sKKyAgICBpZiAoIW1fcmVuZGVyZXIpIAorICAgICAgICBy ZXR1cm4gMDsKKyAgICByZXR1cm4gbV9yZW5kZXJlci0+bm9kZSgpOworfQogCiBzdGF0aWMgaW5s aW5lIGJvb2wgaXNJbmxpbmVXaXRoQ29udGludWF0aW9uKFJlbmRlck9iamVjdCogcmVuZGVyZXIp CiB7CkBAIC0xNzM0LDYgKzE3NDEsOSBAQCBib29sIEFjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3Q6 OmFjY2Vzc2liCiAgICAgaWYgKHJvbGVWYWx1ZSgpID09IElnbm9yZWRSb2xlKQogICAgICAgICBy ZXR1cm4gdHJ1ZTsKICAgICAKKyAgICBpZiAocm9sZVZhbHVlKCkgPT0gUHJlc2VudGF0aW9uYWxS b2xlKQorICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICAKICAgICAvLyBBbiBBUklBIHRyZWUgY2Fu IG9ubHkgaGF2ZSB0cmVlIGl0ZW1zIGFuZCBzdGF0aWMgdGV4dCBhcyBjaGlsZHJlbi4KICAgICBp ZiAoIWlzQWxsb3dlZENoaWxkT2ZUcmVlKCkpCiAgICAgICAgIHJldHVybiB0cnVlOwpAQCAtMjk1 Myw2ICsyOTYzLDggQEAgQWNjZXNzaWJpbGl0eVJvbGUgQWNjZXNzaWJpbGl0eVJlbmRlck9iagog ICAgICAgICAgICAgcmV0dXJuIEltYWdlTWFwUm9sZTsKICAgICAgICAgcmV0dXJuIFdlYkNvcmVM aW5rUm9sZTsKICAgICB9CisgICAgaWYgKG1fcmVuZGVyZXItPmlzTGlzdEl0ZW0oKSkKKyAgICAg ICAgcmV0dXJuIExpc3RJdGVtUm9sZTsKICAgICBpZiAobV9yZW5kZXJlci0+aXNMaXN0TWFya2Vy KCkpCiAgICAgICAgIHJldHVybiBMaXN0TWFya2VyUm9sZTsKICAgICBpZiAobm9kZSAmJiBub2Rl LT5oYXNUYWdOYW1lKGJ1dHRvblRhZykpCkluZGV4OiBXZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNj ZXNzaWJpbGl0eVJlbmRlck9iamVjdC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvYWNjZXNzaWJp bGl0eS9BY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0LmgJKHJldmlzaW9uIDYwNzI3KQorKysgV2Vi Q29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3QuaAkod29ya2luZyBj b3B5KQpAQCAtMTY5LDYgKzE2OSw4IEBAIHB1YmxpYzoKICAgICAKICAgICB2b2lkIHNldFJlbmRl cmVyKFJlbmRlck9iamVjdCogcmVuZGVyZXIpIHsgbV9yZW5kZXJlciA9IHJlbmRlcmVyOyB9CiAg ICAgUmVuZGVyT2JqZWN0KiByZW5kZXJlcigpIGNvbnN0IHsgcmV0dXJuIG1fcmVuZGVyZXI7IH0K KyAgICBOb2RlKiBub2RlKCkgY29uc3Q7CisgICAgCiAgICAgUmVuZGVyVmlldyogdG9wUmVuZGVy ZXIoKSBjb25zdDsKICAgICBSZW5kZXJUZXh0Q29udHJvbCogdGV4dENvbnRyb2woKSBjb25zdDsK ICAgICBEb2N1bWVudCogZG9jdW1lbnQoKSBjb25zdDsKSW5kZXg6IFdlYkNvcmUvYWNjZXNzaWJp bGl0eS9tYWMvQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBwZXIubW0KPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2Vi Q29yZS9hY2Nlc3NpYmlsaXR5L21hYy9BY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBlci5tbQkocmV2 aXNpb24gNjA3MjcpCisrKyBXZWJDb3JlL2FjY2Vzc2liaWxpdHkvbWFjL0FjY2Vzc2liaWxpdHlP YmplY3RXcmFwcGVyLm1tCSh3b3JraW5nIGNvcHkpCkBAIC05NTcsNyArOTU3LDcgQEAgLSAoTlNB cnJheSopYWNjZXNzaWJpbGl0eUF0dHJpYnV0ZU5hbWVzCiAgICAgZWxzZSBpZiAobV9vYmplY3Qt PmlzQ29udHJvbCgpKQogICAgICAgICBvYmplY3RBdHRyaWJ1dGVzID0gY29udHJvbEF0dHJzOwog ICAgIAotICAgIGVsc2UgaWYgKG1fb2JqZWN0LT5pc0dyb3VwKCkpCisgICAgZWxzZSBpZiAobV9v YmplY3QtPmlzR3JvdXAoKSB8fCBtX29iamVjdC0+aXNMaXN0SXRlbSgpKQogICAgICAgICBvYmpl Y3RBdHRyaWJ1dGVzID0gZ3JvdXBBdHRyczsKICAgICBlbHNlIGlmIChtX29iamVjdC0+aXNUYWJM aXN0KCkpCiAgICAgICAgIG9iamVjdEF0dHJpYnV0ZXMgPSB0YWJMaXN0QXR0cnM7CkBAIC0xMTQ4 LDYgKzExNDgsNyBAQCBzdGF0aWMgY29uc3QgQWNjZXNzaWJpbGl0eVJvbGVNYXAmIGNyZWF0CiAg ICAgICAgIHsgVGFiUGFuZWxSb2xlLCBOU0FjY2Vzc2liaWxpdHlHcm91cFJvbGUgfSwKICAgICAg ICAgeyBUcmVlUm9sZSwgTlNBY2Nlc3NpYmlsaXR5T3V0bGluZVJvbGUgfSwKICAgICAgICAgeyBU cmVlSXRlbVJvbGUsIE5TQWNjZXNzaWJpbGl0eVJvd1JvbGUgfSwKKyAgICAgICAgeyBMaXN0SXRl bVJvbGUsIE5TQWNjZXNzaWJpbGl0eUdyb3VwUm9sZSB9CiAgICAgfTsKICAgICBBY2Nlc3NpYmls aXR5Um9sZU1hcCYgcm9sZU1hcCA9ICpuZXcgQWNjZXNzaWJpbGl0eVJvbGVNYXA7CiAgICAgCklu ZGV4OiBXZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9jaHJv bWl1bS9DaGFuZ2VMb2cJKHJldmlzaW9uIDYwODAwKQorKysgV2ViS2l0L2Nocm9taXVtL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDEzIEBACisyMDEwLTA2LTA3ICBDaHJpcyBG bGVpemFjaCAgPGNmbGVpemFjaEBhcHBsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgTmVlZCBhIHNob3J0IGRlc2NyaXB0aW9uIGFuZCBidWcg VVJMIChPT1BTISkKKworICAgICAgICAqIHB1YmxpYy9XZWJBY2Nlc3NpYmlsaXR5Um9sZS5oOgor ICAgICAgICAoV2ViS2l0OjopOgorICAgICAgICAqIHNyYy9Bc3NlcnRNYXRjaGluZ0VudW1zLmNw cDoKKwogMjAxMC0wNi0wNyAgS2ludWtvIFlhc3VkYSAgPGtpbnVrb0BjaHJvbWl1bS5vcmc+CiAK ICAgICAgICAgUmV2aWV3ZWQgYnkgSmlhbiBMaS4KSW5kZXg6IFdlYktpdC9jaHJvbWl1bS9wdWJs aWMvV2ViQWNjZXNzaWJpbGl0eVJvbGUuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQvY2hyb21pdW0v cHVibGljL1dlYkFjY2Vzc2liaWxpdHlSb2xlLmgJKHJldmlzaW9uIDYwNzI3KQorKysgV2ViS2l0 L2Nocm9taXVtL3B1YmxpYy9XZWJBY2Nlc3NpYmlsaXR5Um9sZS5oCSh3b3JraW5nIGNvcHkpCkBA IC0xMDIsNiArMTAyLDcgQEAgZW51bSBXZWJBY2Nlc3NpYmlsaXR5Um9sZSB7CiAgICAgV2ViQWNj ZXNzaWJpbGl0eVJvbGVBbm5vdGF0aW9uLAogICAgIFdlYkFjY2Vzc2liaWxpdHlSb2xlU2xpZGVy VGh1bWIsCiAgICAgV2ViQWNjZXNzaWJpbGl0eVJvbGVJZ25vcmVkLAorICAgIFdlYkFjY2Vzc2li aWxpdHlSb2xlUHJlc2VudGF0aW9uYWwsCiAgICAgV2ViQWNjZXNzaWJpbGl0eVJvbGVUYWIsCiAg ICAgV2ViQWNjZXNzaWJpbGl0eVJvbGVUYWJMaXN0LAogICAgIFdlYkFjY2Vzc2liaWxpdHlSb2xl VGFiUGFuZWwsCkluZGV4OiBXZWJLaXQvY2hyb21pdW0vc3JjL0Fzc2VydE1hdGNoaW5nRW51bXMu Y3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9jaHJvbWl1bS9zcmMvQXNzZXJ0TWF0Y2hpbmdFbnVt cy5jcHAJKHJldmlzaW9uIDYwNzI3KQorKysgV2ViS2l0L2Nocm9taXVtL3NyYy9Bc3NlcnRNYXRj aGluZ0VudW1zLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTI3LDYgKzEyNyw3IEBAIENPTVBJTEVf QVNTRVJUX01BVENISU5HX0VOVU0oV2ViQWNjZXNzaWIKIENPTVBJTEVfQVNTRVJUX01BVENISU5H X0VOVU0oV2ViQWNjZXNzaWJpbGl0eVJvbGVBbm5vdGF0aW9uLCBBbm5vdGF0aW9uUm9sZSk7CiBD T01QSUxFX0FTU0VSVF9NQVRDSElOR19FTlVNKFdlYkFjY2Vzc2liaWxpdHlSb2xlU2xpZGVyVGh1 bWIsIFNsaWRlclRodW1iUm9sZSk7CiBDT01QSUxFX0FTU0VSVF9NQVRDSElOR19FTlVNKFdlYkFj Y2Vzc2liaWxpdHlSb2xlSWdub3JlZCwgSWdub3JlZFJvbGUpOworQ09NUElMRV9BU1NFUlRfTUFU Q0hJTkdfRU5VTShXZWJBY2Nlc3NpYmlsaXR5Um9sZVByZXNlbnRhdGlvbmFsLCBQcmVzZW50YXRp b25hbFJvbGUpOwogQ09NUElMRV9BU1NFUlRfTUFUQ0hJTkdfRU5VTShXZWJBY2Nlc3NpYmlsaXR5 Um9sZVRhYiwgVGFiUm9sZSk7CiBDT01QSUxFX0FTU0VSVF9NQVRDSElOR19FTlVNKFdlYkFjY2Vz c2liaWxpdHlSb2xlVGFiTGlzdCwgVGFiTGlzdFJvbGUpOwogQ09NUElMRV9BU1NFUlRfTUFUQ0hJ TkdfRU5VTShXZWJBY2Nlc3NpYmlsaXR5Um9sZVRhYlBhbmVsLCBUYWJQYW5lbFJvbGUpOwo= 58084 2010-06-07 14:26:20 -0700 2010-06-07 14:30:17 -0700 patch patch.txt text/plain 7839 cfleizach SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA2MDgwMCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjYgQEAKKzIwMTAtMDYtMDcgIENocmlzIEZsZWl6YWNoICA8Y2ZsZWl6YWNoQGFw cGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBBWDogbmVlZCBMaXN0SXRlbVJvbGUgYW5kIFByZXNlbnRhdGlvbmFsUm9sZQorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDAxMzMKKworICAgICAgICAq IGFjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eU9iamVjdC5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpjcmVhdGVBUklBUm9sZU1hcCk6CisgICAgICAgICogYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmls aXR5T2JqZWN0Lmg6CisgICAgICAgIChXZWJDb3JlOjpBY2Nlc3NpYmlsaXR5T2JqZWN0Ojppc0xp c3RJdGVtKToKKyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlSZW5kZXJPYmpl Y3QuY3BwOgorICAgICAgICAoV2ViQ29yZTo6QWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdDo6bm9k ZSk6CisgICAgICAgIChXZWJDb3JlOjpBY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0OjphY2Nlc3Np YmlsaXR5SXNJZ25vcmVkKToKKyAgICAgICAgKFdlYkNvcmU6OkFjY2Vzc2liaWxpdHlSZW5kZXJP YmplY3Q6OmRldGVybWluZUFjY2Vzc2liaWxpdHlSb2xlKToKKyAgICAgICAgKiBhY2Nlc3NpYmls aXR5L0FjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3QuaDoKKyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5 L21hYy9BY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBlci5tbToKKyAgICAgICAgKC1bQWNjZXNzaWJp bGl0eU9iamVjdFdyYXBwZXIgYWNjZXNzaWJpbGl0eUF0dHJpYnV0ZU5hbWVzXSk6CisgICAgICAg IChSb2xlRW50cnk6Oik6CisKIDIwMTAtMDYtMDcgIEtpbnVrbyBZYXN1ZGEgIDxraW51a29AY2hy b21pdW0ub3JnPgogCiAgICAgICAgIFVucmV2aWV3ZWQuCkluZGV4OiBXZWJDb3JlL2FjY2Vzc2li aWxpdHkvQWNjZXNzaWJpbGl0eU9iamVjdC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9hY2Nl c3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlPYmplY3QuY3BwCShyZXZpc2lvbiA2MDgwMCkKKysrIFdl YkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5T2JqZWN0LmNwcAkod29ya2luZyBjb3B5 KQpAQCAtOTAyLDcgKzkwMiw3IEBAIHN0YXRpYyBBUklBUm9sZU1hcCogY3JlYXRlQVJJQVJvbGVN YXAoKQogICAgICAgICB7ICJpbWciLCBJbWFnZVJvbGUgfSwKICAgICAgICAgeyAibGluayIsIFdl YkNvcmVMaW5rUm9sZSB9LAogICAgICAgICB7ICJsaXN0IiwgTGlzdFJvbGUgfSwgICAgICAgIAot ICAgICAgICB7ICJsaXN0aXRlbSIsIEdyb3VwUm9sZSB9LCAgICAgICAgCisgICAgICAgIHsgImxp c3RpdGVtIiwgTGlzdEl0ZW1Sb2xlIH0sICAgICAgICAKICAgICAgICAgeyAibGlzdGJveCIsIExp c3RCb3hSb2xlIH0sCiAgICAgICAgIHsgImxvZyIsIEFwcGxpY2F0aW9uTG9nUm9sZSB9LAogICAg ICAgICAvLyAib3B0aW9uIiBpc24ndCBoZXJlIGJlY2F1c2UgaXQgbWF5IG1hcCB0byBkaWZmZXJl bnQgcm9sZXMgZGVwZW5kaW5nIG9uIHRoZSBwYXJlbnQgZWxlbWVudCdzIHJvbGUKQEAgLTkxNyw3 ICs5MTcsNyBAQCBzdGF0aWMgQVJJQVJvbGVNYXAqIGNyZWF0ZUFSSUFSb2xlTWFwKCkKICAgICAg ICAgeyAibm90ZSIsIERvY3VtZW50Tm90ZVJvbGUgfSwKICAgICAgICAgeyAibmF2aWdhdGlvbiIs IExhbmRtYXJrTmF2aWdhdGlvblJvbGUgfSwKICAgICAgICAgeyAib3B0aW9uIiwgTGlzdEJveE9w dGlvblJvbGUgfSwKLSAgICAgICAgeyAicHJlc2VudGF0aW9uIiwgSWdub3JlZFJvbGUgfSwKKyAg ICAgICAgeyAicHJlc2VudGF0aW9uIiwgUHJlc2VudGF0aW9uYWxSb2xlIH0sCiAgICAgICAgIHsg InByb2dyZXNzYmFyIiwgUHJvZ3Jlc3NJbmRpY2F0b3JSb2xlIH0sCiAgICAgICAgIHsgInJhZGlv IiwgUmFkaW9CdXR0b25Sb2xlIH0sCiAgICAgICAgIHsgInJhZGlvZ3JvdXAiLCBSYWRpb0dyb3Vw Um9sZSB9LApJbmRleDogV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlPYmplY3Qu aAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eU9iamVj dC5oCShyZXZpc2lvbiA2MDgwMCkKKysrIFdlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmls aXR5T2JqZWN0LmgJKHdvcmtpbmcgY29weSkKQEAgLTE2MCw2ICsxNjAsNyBAQCBlbnVtIEFjY2Vz c2liaWxpdHlSb2xlIHsKICAgICBBbm5vdGF0aW9uUm9sZSwKICAgICBTbGlkZXJUaHVtYlJvbGUs CiAgICAgSWdub3JlZFJvbGUsCisgICAgUHJlc2VudGF0aW9uYWxSb2xlLAogICAgIFRhYlJvbGUs CiAgICAgVGFiTGlzdFJvbGUsCiAgICAgVGFiUGFuZWxSb2xlLApAQCAtMjk2LDYgKzI5Nyw3IEBA IHB1YmxpYzoKICAgICBib29sIGlzVHJlZUl0ZW0oKSBjb25zdCB7IHJldHVybiByb2xlVmFsdWUo KSA9PSBUcmVlSXRlbVJvbGU7IH0KICAgICBib29sIGlzU2Nyb2xsYmFyKCkgY29uc3QgeyByZXR1 cm4gcm9sZVZhbHVlKCkgPT0gU2Nyb2xsQmFyUm9sZTsgfQogICAgIGJvb2wgaXNCdXR0b24oKSBj b25zdCB7IHJldHVybiByb2xlVmFsdWUoKSA9PSBCdXR0b25Sb2xlOyB9CisgICAgYm9vbCBpc0xp c3RJdGVtKCkgY29uc3QgeyByZXR1cm4gcm9sZVZhbHVlKCkgPT0gTGlzdEl0ZW1Sb2xlOyB9CiAg ICAgCiAgICAgdmlydHVhbCBib29sIGlzQ2hlY2tlZCgpIGNvbnN0IHsgcmV0dXJuIGZhbHNlOyB9 CiAgICAgdmlydHVhbCBib29sIGlzRW5hYmxlZCgpIGNvbnN0IHsgcmV0dXJuIGZhbHNlOyB9Cklu ZGV4OiBXZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdC5jcHAK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlSZW5kZXJP YmplY3QuY3BwCShyZXZpc2lvbiA2MDgwMCkKKysrIFdlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nl c3NpYmlsaXR5UmVuZGVyT2JqZWN0LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTE3LDYgKzExNywx MyBAQCB2b2lkIEFjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3Q6OmRldGFjaCgpCiAjZW5kaWYKICAg ICBtX3JlbmRlcmVyID0gMDsgICAgCiB9CisgICAgCitOb2RlKiBBY2Nlc3NpYmlsaXR5UmVuZGVy T2JqZWN0Ojpub2RlKCkgY29uc3QKK3sKKyAgICBpZiAoIW1fcmVuZGVyZXIpIAorICAgICAgICBy ZXR1cm4gMDsKKyAgICByZXR1cm4gbV9yZW5kZXJlci0+bm9kZSgpOworfQogCiBzdGF0aWMgaW5s aW5lIGJvb2wgaXNJbmxpbmVXaXRoQ29udGludWF0aW9uKFJlbmRlck9iamVjdCogcmVuZGVyZXIp CiB7CkBAIC0xNzM0LDYgKzE3NDEsOSBAQCBib29sIEFjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3Q6 OmFjY2Vzc2liCiAgICAgaWYgKHJvbGVWYWx1ZSgpID09IElnbm9yZWRSb2xlKQogICAgICAgICBy ZXR1cm4gdHJ1ZTsKICAgICAKKyAgICBpZiAocm9sZVZhbHVlKCkgPT0gUHJlc2VudGF0aW9uYWxS b2xlKQorICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICAKICAgICAvLyBBbiBBUklBIHRyZWUgY2Fu IG9ubHkgaGF2ZSB0cmVlIGl0ZW1zIGFuZCBzdGF0aWMgdGV4dCBhcyBjaGlsZHJlbi4KICAgICBp ZiAoIWlzQWxsb3dlZENoaWxkT2ZUcmVlKCkpCiAgICAgICAgIHJldHVybiB0cnVlOwpAQCAtMjk1 Myw2ICsyOTYzLDggQEAgQWNjZXNzaWJpbGl0eVJvbGUgQWNjZXNzaWJpbGl0eVJlbmRlck9iagog ICAgICAgICAgICAgcmV0dXJuIEltYWdlTWFwUm9sZTsKICAgICAgICAgcmV0dXJuIFdlYkNvcmVM aW5rUm9sZTsKICAgICB9CisgICAgaWYgKG1fcmVuZGVyZXItPmlzTGlzdEl0ZW0oKSkKKyAgICAg ICAgcmV0dXJuIExpc3RJdGVtUm9sZTsKICAgICBpZiAobV9yZW5kZXJlci0+aXNMaXN0TWFya2Vy KCkpCiAgICAgICAgIHJldHVybiBMaXN0TWFya2VyUm9sZTsKICAgICBpZiAobm9kZSAmJiBub2Rl LT5oYXNUYWdOYW1lKGJ1dHRvblRhZykpCkluZGV4OiBXZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNj ZXNzaWJpbGl0eVJlbmRlck9iamVjdC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvYWNjZXNzaWJp bGl0eS9BY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0LmgJKHJldmlzaW9uIDYwODAwKQorKysgV2Vi Q29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3QuaAkod29ya2luZyBj b3B5KQpAQCAtMTY5LDYgKzE2OSw4IEBAIHB1YmxpYzoKICAgICAKICAgICB2b2lkIHNldFJlbmRl cmVyKFJlbmRlck9iamVjdCogcmVuZGVyZXIpIHsgbV9yZW5kZXJlciA9IHJlbmRlcmVyOyB9CiAg ICAgUmVuZGVyT2JqZWN0KiByZW5kZXJlcigpIGNvbnN0IHsgcmV0dXJuIG1fcmVuZGVyZXI7IH0K KyAgICBOb2RlKiBub2RlKCkgY29uc3Q7CisgICAgCiAgICAgUmVuZGVyVmlldyogdG9wUmVuZGVy ZXIoKSBjb25zdDsKICAgICBSZW5kZXJUZXh0Q29udHJvbCogdGV4dENvbnRyb2woKSBjb25zdDsK ICAgICBEb2N1bWVudCogZG9jdW1lbnQoKSBjb25zdDsKSW5kZXg6IFdlYkNvcmUvYWNjZXNzaWJp bGl0eS9tYWMvQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBwZXIubW0KPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2Vi Q29yZS9hY2Nlc3NpYmlsaXR5L21hYy9BY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBlci5tbQkocmV2 aXNpb24gNjA4MDApCisrKyBXZWJDb3JlL2FjY2Vzc2liaWxpdHkvbWFjL0FjY2Vzc2liaWxpdHlP YmplY3RXcmFwcGVyLm1tCSh3b3JraW5nIGNvcHkpCkBAIC05NTcsNyArOTU3LDcgQEAgLSAoTlNB cnJheSopYWNjZXNzaWJpbGl0eUF0dHJpYnV0ZU5hbWVzCiAgICAgZWxzZSBpZiAobV9vYmplY3Qt PmlzQ29udHJvbCgpKQogICAgICAgICBvYmplY3RBdHRyaWJ1dGVzID0gY29udHJvbEF0dHJzOwog ICAgIAotICAgIGVsc2UgaWYgKG1fb2JqZWN0LT5pc0dyb3VwKCkpCisgICAgZWxzZSBpZiAobV9v YmplY3QtPmlzR3JvdXAoKSB8fCBtX29iamVjdC0+aXNMaXN0SXRlbSgpKQogICAgICAgICBvYmpl Y3RBdHRyaWJ1dGVzID0gZ3JvdXBBdHRyczsKICAgICBlbHNlIGlmIChtX29iamVjdC0+aXNUYWJM aXN0KCkpCiAgICAgICAgIG9iamVjdEF0dHJpYnV0ZXMgPSB0YWJMaXN0QXR0cnM7CkBAIC0xMTQ4 LDYgKzExNDgsNyBAQCBzdGF0aWMgY29uc3QgQWNjZXNzaWJpbGl0eVJvbGVNYXAmIGNyZWF0CiAg ICAgICAgIHsgVGFiUGFuZWxSb2xlLCBOU0FjY2Vzc2liaWxpdHlHcm91cFJvbGUgfSwKICAgICAg ICAgeyBUcmVlUm9sZSwgTlNBY2Nlc3NpYmlsaXR5T3V0bGluZVJvbGUgfSwKICAgICAgICAgeyBU cmVlSXRlbVJvbGUsIE5TQWNjZXNzaWJpbGl0eVJvd1JvbGUgfSwKKyAgICAgICAgeyBMaXN0SXRl bVJvbGUsIE5TQWNjZXNzaWJpbGl0eUdyb3VwUm9sZSB9CiAgICAgfTsKICAgICBBY2Nlc3NpYmls aXR5Um9sZU1hcCYgcm9sZU1hcCA9ICpuZXcgQWNjZXNzaWJpbGl0eVJvbGVNYXA7CiAgICAgCklu ZGV4OiBXZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9jaHJv bWl1bS9DaGFuZ2VMb2cJKHJldmlzaW9uIDYwODAwKQorKysgV2ViS2l0L2Nocm9taXVtL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI0IEBACisyMDEwLTA2LTA3ICBDaHJpcyBG bGVpemFjaCAgPGNmbGVpemFjaEBhcHBsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgQVg6IG5lZWQgTGlzdEl0ZW1Sb2xlIGFuZCBQcmVzZW50 YXRpb25hbFJvbGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTQwMTMzCisKKyAgICAgICAgKiBwdWJsaWMvV2ViQWNjZXNzaWJpbGl0eVJvbGUuaDoKKyAg ICAgICAgKiBzcmMvQXNzZXJ0TWF0Y2hpbmdFbnVtcy5jcHA6CisKIDIwMTAtMDYtMDcgIEtpbnVr byBZYXN1ZGEgIDxraW51a29AY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEpp YW4gTGkuCkluZGV4OiBXZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYkFjY2Vzc2liaWxpdHlSb2xl LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJBY2Nlc3NpYmlsaXR5 Um9sZS5oCShyZXZpc2lvbiA2MDgwMCkKKysrIFdlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViQWNj ZXNzaWJpbGl0eVJvbGUuaAkod29ya2luZyBjb3B5KQpAQCAtMTAyLDYgKzEwMiw3IEBAIGVudW0g V2ViQWNjZXNzaWJpbGl0eVJvbGUgewogICAgIFdlYkFjY2Vzc2liaWxpdHlSb2xlQW5ub3RhdGlv biwKICAgICBXZWJBY2Nlc3NpYmlsaXR5Um9sZVNsaWRlclRodW1iLAogICAgIFdlYkFjY2Vzc2li aWxpdHlSb2xlSWdub3JlZCwKKyAgICBXZWJBY2Nlc3NpYmlsaXR5Um9sZVByZXNlbnRhdGlvbmFs LAogICAgIFdlYkFjY2Vzc2liaWxpdHlSb2xlVGFiLAogICAgIFdlYkFjY2Vzc2liaWxpdHlSb2xl VGFiTGlzdCwKICAgICBXZWJBY2Nlc3NpYmlsaXR5Um9sZVRhYlBhbmVsLApJbmRleDogV2ViS2l0 L2Nocm9taXVtL3NyYy9Bc3NlcnRNYXRjaGluZ0VudW1zLmNwcAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJL aXQvY2hyb21pdW0vc3JjL0Fzc2VydE1hdGNoaW5nRW51bXMuY3BwCShyZXZpc2lvbiA2MDgwMCkK KysrIFdlYktpdC9jaHJvbWl1bS9zcmMvQXNzZXJ0TWF0Y2hpbmdFbnVtcy5jcHAJKHdvcmtpbmcg Y29weSkKQEAgLTEyNyw2ICsxMjcsNyBAQCBDT01QSUxFX0FTU0VSVF9NQVRDSElOR19FTlVNKFdl YkFjY2Vzc2liCiBDT01QSUxFX0FTU0VSVF9NQVRDSElOR19FTlVNKFdlYkFjY2Vzc2liaWxpdHlS b2xlQW5ub3RhdGlvbiwgQW5ub3RhdGlvblJvbGUpOwogQ09NUElMRV9BU1NFUlRfTUFUQ0hJTkdf RU5VTShXZWJBY2Nlc3NpYmlsaXR5Um9sZVNsaWRlclRodW1iLCBTbGlkZXJUaHVtYlJvbGUpOwog Q09NUElMRV9BU1NFUlRfTUFUQ0hJTkdfRU5VTShXZWJBY2Nlc3NpYmlsaXR5Um9sZUlnbm9yZWQs IElnbm9yZWRSb2xlKTsKK0NPTVBJTEVfQVNTRVJUX01BVENISU5HX0VOVU0oV2ViQWNjZXNzaWJp bGl0eVJvbGVQcmVzZW50YXRpb25hbCwgUHJlc2VudGF0aW9uYWxSb2xlKTsKIENPTVBJTEVfQVNT RVJUX01BVENISU5HX0VOVU0oV2ViQWNjZXNzaWJpbGl0eVJvbGVUYWIsIFRhYlJvbGUpOwogQ09N UElMRV9BU1NFUlRfTUFUQ0hJTkdfRU5VTShXZWJBY2Nlc3NpYmlsaXR5Um9sZVRhYkxpc3QsIFRh Ykxpc3RSb2xlKTsKIENPTVBJTEVfQVNTRVJUX01BVENISU5HX0VOVU0oV2ViQWNjZXNzaWJpbGl0 eVJvbGVUYWJQYW5lbCwgVGFiUGFuZWxSb2xlKTsK 58086 2010-06-07 14:30:17 -0700 2010-06-14 09:35:16 -0700 patch patch.txt text/plain 7860 cfleizach SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA2MDgwMCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjMgQEAKKzIwMTAtMDYtMDcgIENocmlzIEZsZWl6YWNoICA8Y2ZsZWl6YWNoQGFw cGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBBWDogbmVlZCBMaXN0SXRlbVJvbGUgYW5kIFByZXNlbnRhdGlvbmFsUm9sZQorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDAxMzMKKworICAgICAgICAq IGFjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eU9iamVjdC5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpjcmVhdGVBUklBUm9sZU1hcCk6CisgICAgICAgICogYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmls aXR5T2JqZWN0Lmg6CisgICAgICAgIChXZWJDb3JlOjpBY2Nlc3NpYmlsaXR5T2JqZWN0Ojppc0xp c3RJdGVtKToKKyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlSZW5kZXJPYmpl Y3QuY3BwOgorICAgICAgICAoV2ViQ29yZTo6QWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdDo6bm9k ZSk6CisgICAgICAgIChXZWJDb3JlOjpBY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0OjphY2Nlc3Np YmlsaXR5SXNJZ25vcmVkKToKKyAgICAgICAgKFdlYkNvcmU6OkFjY2Vzc2liaWxpdHlSZW5kZXJP YmplY3Q6OmRldGVybWluZUFjY2Vzc2liaWxpdHlSb2xlKToKKyAgICAgICAgKiBhY2Nlc3NpYmls aXR5L0FjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3QuaDoKKyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5 L21hYy9BY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBlci5tbToKKyAgICAgICAgKC1bQWNjZXNzaWJp bGl0eU9iamVjdFdyYXBwZXIgYWNjZXNzaWJpbGl0eUF0dHJpYnV0ZU5hbWVzXSk6CisgICAgICAg IChSb2xlRW50cnk6Oik6CisKIDIwMTAtMDYtMDcgIEtpbnVrbyBZYXN1ZGEgIDxraW51a29AY2hy b21pdW0ub3JnPgogCiAgICAgICAgIFVucmV2aWV3ZWQuCkluZGV4OiBXZWJDb3JlL2FjY2Vzc2li aWxpdHkvQWNjZXNzaWJpbGl0eU9iamVjdC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9hY2Nl c3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlPYmplY3QuY3BwCShyZXZpc2lvbiA2MDgwMCkKKysrIFdl YkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5T2JqZWN0LmNwcAkod29ya2luZyBjb3B5 KQpAQCAtOTAyLDcgKzkwMiw3IEBAIHN0YXRpYyBBUklBUm9sZU1hcCogY3JlYXRlQVJJQVJvbGVN YXAoKQogICAgICAgICB7ICJpbWciLCBJbWFnZVJvbGUgfSwKICAgICAgICAgeyAibGluayIsIFdl YkNvcmVMaW5rUm9sZSB9LAogICAgICAgICB7ICJsaXN0IiwgTGlzdFJvbGUgfSwgICAgICAgIAot ICAgICAgICB7ICJsaXN0aXRlbSIsIEdyb3VwUm9sZSB9LCAgICAgICAgCisgICAgICAgIHsgImxp c3RpdGVtIiwgTGlzdEl0ZW1Sb2xlIH0sICAgICAgICAKICAgICAgICAgeyAibGlzdGJveCIsIExp c3RCb3hSb2xlIH0sCiAgICAgICAgIHsgImxvZyIsIEFwcGxpY2F0aW9uTG9nUm9sZSB9LAogICAg ICAgICAvLyAib3B0aW9uIiBpc24ndCBoZXJlIGJlY2F1c2UgaXQgbWF5IG1hcCB0byBkaWZmZXJl bnQgcm9sZXMgZGVwZW5kaW5nIG9uIHRoZSBwYXJlbnQgZWxlbWVudCdzIHJvbGUKQEAgLTkxNyw3 ICs5MTcsNyBAQCBzdGF0aWMgQVJJQVJvbGVNYXAqIGNyZWF0ZUFSSUFSb2xlTWFwKCkKICAgICAg ICAgeyAibm90ZSIsIERvY3VtZW50Tm90ZVJvbGUgfSwKICAgICAgICAgeyAibmF2aWdhdGlvbiIs IExhbmRtYXJrTmF2aWdhdGlvblJvbGUgfSwKICAgICAgICAgeyAib3B0aW9uIiwgTGlzdEJveE9w dGlvblJvbGUgfSwKLSAgICAgICAgeyAicHJlc2VudGF0aW9uIiwgSWdub3JlZFJvbGUgfSwKKyAg ICAgICAgeyAicHJlc2VudGF0aW9uIiwgUHJlc2VudGF0aW9uYWxSb2xlIH0sCiAgICAgICAgIHsg InByb2dyZXNzYmFyIiwgUHJvZ3Jlc3NJbmRpY2F0b3JSb2xlIH0sCiAgICAgICAgIHsgInJhZGlv IiwgUmFkaW9CdXR0b25Sb2xlIH0sCiAgICAgICAgIHsgInJhZGlvZ3JvdXAiLCBSYWRpb0dyb3Vw Um9sZSB9LApJbmRleDogV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlPYmplY3Qu aAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eU9iamVj dC5oCShyZXZpc2lvbiA2MDgwMCkKKysrIFdlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmls aXR5T2JqZWN0LmgJKHdvcmtpbmcgY29weSkKQEAgLTE2MCw2ICsxNjAsNyBAQCBlbnVtIEFjY2Vz c2liaWxpdHlSb2xlIHsKICAgICBBbm5vdGF0aW9uUm9sZSwKICAgICBTbGlkZXJUaHVtYlJvbGUs CiAgICAgSWdub3JlZFJvbGUsCisgICAgUHJlc2VudGF0aW9uYWxSb2xlLAogICAgIFRhYlJvbGUs CiAgICAgVGFiTGlzdFJvbGUsCiAgICAgVGFiUGFuZWxSb2xlLApAQCAtMjk2LDYgKzI5Nyw3IEBA IHB1YmxpYzoKICAgICBib29sIGlzVHJlZUl0ZW0oKSBjb25zdCB7IHJldHVybiByb2xlVmFsdWUo KSA9PSBUcmVlSXRlbVJvbGU7IH0KICAgICBib29sIGlzU2Nyb2xsYmFyKCkgY29uc3QgeyByZXR1 cm4gcm9sZVZhbHVlKCkgPT0gU2Nyb2xsQmFyUm9sZTsgfQogICAgIGJvb2wgaXNCdXR0b24oKSBj b25zdCB7IHJldHVybiByb2xlVmFsdWUoKSA9PSBCdXR0b25Sb2xlOyB9CisgICAgYm9vbCBpc0xp c3RJdGVtKCkgY29uc3QgeyByZXR1cm4gcm9sZVZhbHVlKCkgPT0gTGlzdEl0ZW1Sb2xlOyB9CiAg ICAgCiAgICAgdmlydHVhbCBib29sIGlzQ2hlY2tlZCgpIGNvbnN0IHsgcmV0dXJuIGZhbHNlOyB9 CiAgICAgdmlydHVhbCBib29sIGlzRW5hYmxlZCgpIGNvbnN0IHsgcmV0dXJuIGZhbHNlOyB9Cklu ZGV4OiBXZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdC5jcHAK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlSZW5kZXJP YmplY3QuY3BwCShyZXZpc2lvbiA2MDgwMCkKKysrIFdlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nl c3NpYmlsaXR5UmVuZGVyT2JqZWN0LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTE3LDYgKzExNywx MyBAQCB2b2lkIEFjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3Q6OmRldGFjaCgpCiAjZW5kaWYKICAg ICBtX3JlbmRlcmVyID0gMDsgICAgCiB9CisgICAgCitOb2RlKiBBY2Nlc3NpYmlsaXR5UmVuZGVy T2JqZWN0Ojpub2RlKCkgY29uc3QKK3sKKyAgICBpZiAoIW1fcmVuZGVyZXIpIAorICAgICAgICBy ZXR1cm4gMDsKKyAgICByZXR1cm4gbV9yZW5kZXJlci0+bm9kZSgpOworfQogCiBzdGF0aWMgaW5s aW5lIGJvb2wgaXNJbmxpbmVXaXRoQ29udGludWF0aW9uKFJlbmRlck9iamVjdCogcmVuZGVyZXIp CiB7CkBAIC0xNzM0LDYgKzE3NDEsOSBAQCBib29sIEFjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3Q6 OmFjY2Vzc2liCiAgICAgaWYgKHJvbGVWYWx1ZSgpID09IElnbm9yZWRSb2xlKQogICAgICAgICBy ZXR1cm4gdHJ1ZTsKICAgICAKKyAgICBpZiAocm9sZVZhbHVlKCkgPT0gUHJlc2VudGF0aW9uYWxS b2xlKQorICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICAKICAgICAvLyBBbiBBUklBIHRyZWUgY2Fu IG9ubHkgaGF2ZSB0cmVlIGl0ZW1zIGFuZCBzdGF0aWMgdGV4dCBhcyBjaGlsZHJlbi4KICAgICBp ZiAoIWlzQWxsb3dlZENoaWxkT2ZUcmVlKCkpCiAgICAgICAgIHJldHVybiB0cnVlOwpAQCAtMjk1 Myw2ICsyOTYzLDggQEAgQWNjZXNzaWJpbGl0eVJvbGUgQWNjZXNzaWJpbGl0eVJlbmRlck9iagog ICAgICAgICAgICAgcmV0dXJuIEltYWdlTWFwUm9sZTsKICAgICAgICAgcmV0dXJuIFdlYkNvcmVM aW5rUm9sZTsKICAgICB9CisgICAgaWYgKG1fcmVuZGVyZXItPmlzTGlzdEl0ZW0oKSkKKyAgICAg ICAgcmV0dXJuIExpc3RJdGVtUm9sZTsKICAgICBpZiAobV9yZW5kZXJlci0+aXNMaXN0TWFya2Vy KCkpCiAgICAgICAgIHJldHVybiBMaXN0TWFya2VyUm9sZTsKICAgICBpZiAobm9kZSAmJiBub2Rl LT5oYXNUYWdOYW1lKGJ1dHRvblRhZykpCkluZGV4OiBXZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNj ZXNzaWJpbGl0eVJlbmRlck9iamVjdC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvYWNjZXNzaWJp bGl0eS9BY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0LmgJKHJldmlzaW9uIDYwODAwKQorKysgV2Vi Q29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3QuaAkod29ya2luZyBj b3B5KQpAQCAtMTY5LDYgKzE2OSw4IEBAIHB1YmxpYzoKICAgICAKICAgICB2b2lkIHNldFJlbmRl cmVyKFJlbmRlck9iamVjdCogcmVuZGVyZXIpIHsgbV9yZW5kZXJlciA9IHJlbmRlcmVyOyB9CiAg ICAgUmVuZGVyT2JqZWN0KiByZW5kZXJlcigpIGNvbnN0IHsgcmV0dXJuIG1fcmVuZGVyZXI7IH0K KyAgICBOb2RlKiBub2RlKCkgY29uc3Q7CisgICAgCiAgICAgUmVuZGVyVmlldyogdG9wUmVuZGVy ZXIoKSBjb25zdDsKICAgICBSZW5kZXJUZXh0Q29udHJvbCogdGV4dENvbnRyb2woKSBjb25zdDsK ICAgICBEb2N1bWVudCogZG9jdW1lbnQoKSBjb25zdDsKSW5kZXg6IFdlYkNvcmUvYWNjZXNzaWJp bGl0eS9tYWMvQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBwZXIubW0KPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2Vi Q29yZS9hY2Nlc3NpYmlsaXR5L21hYy9BY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBlci5tbQkocmV2 aXNpb24gNjA4MDApCisrKyBXZWJDb3JlL2FjY2Vzc2liaWxpdHkvbWFjL0FjY2Vzc2liaWxpdHlP YmplY3RXcmFwcGVyLm1tCSh3b3JraW5nIGNvcHkpCkBAIC05NTcsNyArOTU3LDcgQEAgLSAoTlNB cnJheSopYWNjZXNzaWJpbGl0eUF0dHJpYnV0ZU5hbWVzCiAgICAgZWxzZSBpZiAobV9vYmplY3Qt PmlzQ29udHJvbCgpKQogICAgICAgICBvYmplY3RBdHRyaWJ1dGVzID0gY29udHJvbEF0dHJzOwog ICAgIAotICAgIGVsc2UgaWYgKG1fb2JqZWN0LT5pc0dyb3VwKCkpCisgICAgZWxzZSBpZiAobV9v YmplY3QtPmlzR3JvdXAoKSB8fCBtX29iamVjdC0+aXNMaXN0SXRlbSgpKQogICAgICAgICBvYmpl Y3RBdHRyaWJ1dGVzID0gZ3JvdXBBdHRyczsKICAgICBlbHNlIGlmIChtX29iamVjdC0+aXNUYWJM aXN0KCkpCiAgICAgICAgIG9iamVjdEF0dHJpYnV0ZXMgPSB0YWJMaXN0QXR0cnM7CkBAIC0xMTQ4 LDYgKzExNDgsNyBAQCBzdGF0aWMgY29uc3QgQWNjZXNzaWJpbGl0eVJvbGVNYXAmIGNyZWF0CiAg ICAgICAgIHsgVGFiUGFuZWxSb2xlLCBOU0FjY2Vzc2liaWxpdHlHcm91cFJvbGUgfSwKICAgICAg ICAgeyBUcmVlUm9sZSwgTlNBY2Nlc3NpYmlsaXR5T3V0bGluZVJvbGUgfSwKICAgICAgICAgeyBU cmVlSXRlbVJvbGUsIE5TQWNjZXNzaWJpbGl0eVJvd1JvbGUgfSwKKyAgICAgICAgeyBMaXN0SXRl bVJvbGUsIE5TQWNjZXNzaWJpbGl0eUdyb3VwUm9sZSB9CiAgICAgfTsKICAgICBBY2Nlc3NpYmls aXR5Um9sZU1hcCYgcm9sZU1hcCA9ICpuZXcgQWNjZXNzaWJpbGl0eVJvbGVNYXA7CiAgICAgCklu ZGV4OiBXZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9jaHJv bWl1bS9DaGFuZ2VMb2cJKHJldmlzaW9uIDYwODAwKQorKysgV2ViS2l0L2Nocm9taXVtL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE0IEBACisyMDEwLTA2LTA3ICBDaHJpcyBG bGVpemFjaCAgPGNmbGVpemFjaEBhcHBsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgQVg6IG5lZWQgTGlzdEl0ZW1Sb2xlIGFuZCBQcmVzZW50 YXRpb25hbFJvbGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTQwMTMzCisKKyAgICAgICAgKiBwdWJsaWMvV2ViQWNjZXNzaWJpbGl0eVJvbGUuaDoKKyAg ICAgICAgKFdlYktpdDo6KToKKyAgICAgICAgKiBzcmMvQXNzZXJ0TWF0Y2hpbmdFbnVtcy5jcHA6 CisKIDIwMTAtMDYtMDcgIEtpbnVrbyBZYXN1ZGEgIDxraW51a29AY2hyb21pdW0ub3JnPgogCiAg ICAgICAgIFJldmlld2VkIGJ5IEppYW4gTGkuCkluZGV4OiBXZWJLaXQvY2hyb21pdW0vcHVibGlj L1dlYkFjY2Vzc2liaWxpdHlSb2xlLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L2Nocm9taXVtL3B1 YmxpYy9XZWJBY2Nlc3NpYmlsaXR5Um9sZS5oCShyZXZpc2lvbiA2MDgwMCkKKysrIFdlYktpdC9j aHJvbWl1bS9wdWJsaWMvV2ViQWNjZXNzaWJpbGl0eVJvbGUuaAkod29ya2luZyBjb3B5KQpAQCAt MTAyLDYgKzEwMiw3IEBAIGVudW0gV2ViQWNjZXNzaWJpbGl0eVJvbGUgewogICAgIFdlYkFjY2Vz c2liaWxpdHlSb2xlQW5ub3RhdGlvbiwKICAgICBXZWJBY2Nlc3NpYmlsaXR5Um9sZVNsaWRlclRo dW1iLAogICAgIFdlYkFjY2Vzc2liaWxpdHlSb2xlSWdub3JlZCwKKyAgICBXZWJBY2Nlc3NpYmls aXR5Um9sZVByZXNlbnRhdGlvbmFsLAogICAgIFdlYkFjY2Vzc2liaWxpdHlSb2xlVGFiLAogICAg IFdlYkFjY2Vzc2liaWxpdHlSb2xlVGFiTGlzdCwKICAgICBXZWJBY2Nlc3NpYmlsaXR5Um9sZVRh YlBhbmVsLApJbmRleDogV2ViS2l0L2Nocm9taXVtL3NyYy9Bc3NlcnRNYXRjaGluZ0VudW1zLmNw cAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBXZWJLaXQvY2hyb21pdW0vc3JjL0Fzc2VydE1hdGNoaW5nRW51bXMu Y3BwCShyZXZpc2lvbiA2MDgwMCkKKysrIFdlYktpdC9jaHJvbWl1bS9zcmMvQXNzZXJ0TWF0Y2hp bmdFbnVtcy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTEyNyw2ICsxMjcsNyBAQCBDT01QSUxFX0FT U0VSVF9NQVRDSElOR19FTlVNKFdlYkFjY2Vzc2liCiBDT01QSUxFX0FTU0VSVF9NQVRDSElOR19F TlVNKFdlYkFjY2Vzc2liaWxpdHlSb2xlQW5ub3RhdGlvbiwgQW5ub3RhdGlvblJvbGUpOwogQ09N UElMRV9BU1NFUlRfTUFUQ0hJTkdfRU5VTShXZWJBY2Nlc3NpYmlsaXR5Um9sZVNsaWRlclRodW1i LCBTbGlkZXJUaHVtYlJvbGUpOwogQ09NUElMRV9BU1NFUlRfTUFUQ0hJTkdfRU5VTShXZWJBY2Nl c3NpYmlsaXR5Um9sZUlnbm9yZWQsIElnbm9yZWRSb2xlKTsKK0NPTVBJTEVfQVNTRVJUX01BVENI SU5HX0VOVU0oV2ViQWNjZXNzaWJpbGl0eVJvbGVQcmVzZW50YXRpb25hbCwgUHJlc2VudGF0aW9u YWxSb2xlKTsKIENPTVBJTEVfQVNTRVJUX01BVENISU5HX0VOVU0oV2ViQWNjZXNzaWJpbGl0eVJv bGVUYWIsIFRhYlJvbGUpOwogQ09NUElMRV9BU1NFUlRfTUFUQ0hJTkdfRU5VTShXZWJBY2Nlc3Np YmlsaXR5Um9sZVRhYkxpc3QsIFRhYkxpc3RSb2xlKTsKIENPTVBJTEVfQVNTRVJUX01BVENISU5H X0VOVU0oV2ViQWNjZXNzaWJpbGl0eVJvbGVUYWJQYW5lbCwgVGFiUGFuZWxSb2xlKTsK 58664 2010-06-14 09:35:16 -0700 2010-06-14 13:54:11 -0700 patch patch.txt text/plain 6899 cfleizach SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA2MTEyNikKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjIgQEAKKzIwMTAtMDYtMTQgIENocmlzIEZsZWl6YWNoICA8Y2ZsZWl6YWNoQGFw cGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBBWDogbmVlZCBMaXN0SXRlbVJvbGUgYW5kIFByZXNlbnRhdGlvbmFsUm9sZQorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDAxMzMKKworICAgICAgICAq IGFjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eU9iamVjdC5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpjcmVhdGVBUklBUm9sZU1hcCk6CisgICAgICAgICogYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmls aXR5T2JqZWN0Lmg6CisgICAgICAgIChXZWJDb3JlOjopOgorICAgICAgICAoV2ViQ29yZTo6QWNj ZXNzaWJpbGl0eU9iamVjdDo6aXNMaXN0SXRlbSk6CisgICAgICAgICogYWNjZXNzaWJpbGl0eS9B Y2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkFjY2Vzc2li aWxpdHlSZW5kZXJPYmplY3Q6OmFjY2Vzc2liaWxpdHlJc0lnbm9yZWQpOgorICAgICAgICAoV2Vi Q29yZTo6QWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdDo6ZGV0ZXJtaW5lQWNjZXNzaWJpbGl0eVJv bGUpOgorICAgICAgICAqIGFjY2Vzc2liaWxpdHkvbWFjL0FjY2Vzc2liaWxpdHlPYmplY3RXcmFw cGVyLm1tOgorICAgICAgICAoLVtBY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBlciBhY2Nlc3NpYmls aXR5QXR0cmlidXRlTmFtZXNdKToKKyAgICAgICAgKFJvbGVFbnRyeTo6KToKKwogMjAxMC0wNi0x NCAgWW9uZyBMaSAgPHlvbGlAcmltLmNvbT4KIAogICAgICAgICBUZXN0IGNhc2VzIGNyZWF0ZWQg Ynk6IFJvYmluIENhbyA8cm9iaW4uY2FvQHRvcmNobW9iaWxlLmNvbS5jbj4KSW5kZXg6IFdlYkNv cmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5T2JqZWN0LmNwcAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBX ZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eU9iamVjdC5jcHAJKHJldmlzaW9uIDYx MTI2KQorKysgV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlPYmplY3QuY3BwCSh3 b3JraW5nIGNvcHkpCkBAIC05MDIsNyArOTAyLDcgQEAgc3RhdGljIEFSSUFSb2xlTWFwKiBjcmVh dGVBUklBUm9sZU1hcCgpCiAgICAgICAgIHsgImltZyIsIEltYWdlUm9sZSB9LAogICAgICAgICB7 ICJsaW5rIiwgV2ViQ29yZUxpbmtSb2xlIH0sCiAgICAgICAgIHsgImxpc3QiLCBMaXN0Um9sZSB9 LCAgICAgICAgCi0gICAgICAgIHsgImxpc3RpdGVtIiwgR3JvdXBSb2xlIH0sICAgICAgICAKKyAg ICAgICAgeyAibGlzdGl0ZW0iLCBMaXN0SXRlbVJvbGUgfSwgICAgICAgIAogICAgICAgICB7ICJs aXN0Ym94IiwgTGlzdEJveFJvbGUgfSwKICAgICAgICAgeyAibG9nIiwgQXBwbGljYXRpb25Mb2dS b2xlIH0sCiAgICAgICAgIC8vICJvcHRpb24iIGlzbid0IGhlcmUgYmVjYXVzZSBpdCBtYXkgbWFw IHRvIGRpZmZlcmVudCByb2xlcyBkZXBlbmRpbmcgb24gdGhlIHBhcmVudCBlbGVtZW50J3Mgcm9s ZQpAQCAtOTE3LDcgKzkxNyw3IEBAIHN0YXRpYyBBUklBUm9sZU1hcCogY3JlYXRlQVJJQVJvbGVN YXAoKQogICAgICAgICB7ICJub3RlIiwgRG9jdW1lbnROb3RlUm9sZSB9LAogICAgICAgICB7ICJu YXZpZ2F0aW9uIiwgTGFuZG1hcmtOYXZpZ2F0aW9uUm9sZSB9LAogICAgICAgICB7ICJvcHRpb24i LCBMaXN0Qm94T3B0aW9uUm9sZSB9LAotICAgICAgICB7ICJwcmVzZW50YXRpb24iLCBJZ25vcmVk Um9sZSB9LAorICAgICAgICB7ICJwcmVzZW50YXRpb24iLCBQcmVzZW50YXRpb25hbFJvbGUgfSwK ICAgICAgICAgeyAicHJvZ3Jlc3NiYXIiLCBQcm9ncmVzc0luZGljYXRvclJvbGUgfSwKICAgICAg ICAgeyAicmFkaW8iLCBSYWRpb0J1dHRvblJvbGUgfSwKICAgICAgICAgeyAicmFkaW9ncm91cCIs IFJhZGlvR3JvdXBSb2xlIH0sCkluZGV4OiBXZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJp bGl0eU9iamVjdC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3Np YmlsaXR5T2JqZWN0LmgJKHJldmlzaW9uIDYxMTI2KQorKysgV2ViQ29yZS9hY2Nlc3NpYmlsaXR5 L0FjY2Vzc2liaWxpdHlPYmplY3QuaAkod29ya2luZyBjb3B5KQpAQCAtMTYwLDYgKzE2MCw3IEBA IGVudW0gQWNjZXNzaWJpbGl0eVJvbGUgewogICAgIEFubm90YXRpb25Sb2xlLAogICAgIFNsaWRl clRodW1iUm9sZSwKICAgICBJZ25vcmVkUm9sZSwKKyAgICBQcmVzZW50YXRpb25hbFJvbGUsCiAg ICAgVGFiUm9sZSwKICAgICBUYWJMaXN0Um9sZSwKICAgICBUYWJQYW5lbFJvbGUsCkBAIC0yOTYs NiArMjk3LDcgQEAgcHVibGljOgogICAgIGJvb2wgaXNUcmVlSXRlbSgpIGNvbnN0IHsgcmV0dXJu IHJvbGVWYWx1ZSgpID09IFRyZWVJdGVtUm9sZTsgfQogICAgIGJvb2wgaXNTY3JvbGxiYXIoKSBj b25zdCB7IHJldHVybiByb2xlVmFsdWUoKSA9PSBTY3JvbGxCYXJSb2xlOyB9CiAgICAgYm9vbCBp c0J1dHRvbigpIGNvbnN0IHsgcmV0dXJuIHJvbGVWYWx1ZSgpID09IEJ1dHRvblJvbGU7IH0KKyAg ICBib29sIGlzTGlzdEl0ZW0oKSBjb25zdCB7IHJldHVybiByb2xlVmFsdWUoKSA9PSBMaXN0SXRl bVJvbGU7IH0KICAgICAKICAgICB2aXJ0dWFsIGJvb2wgaXNDaGVja2VkKCkgY29uc3QgeyByZXR1 cm4gZmFsc2U7IH0KICAgICB2aXJ0dWFsIGJvb2wgaXNFbmFibGVkKCkgY29uc3QgeyByZXR1cm4g ZmFsc2U7IH0KSW5kZXg6IFdlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5UmVuZGVy T2JqZWN0LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJp bGl0eVJlbmRlck9iamVjdC5jcHAJKHJldmlzaW9uIDYxMTI2KQorKysgV2ViQ29yZS9hY2Nlc3Np YmlsaXR5L0FjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3QuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0x NzM1LDYgKzE3MzUsOSBAQCBib29sIEFjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3Q6OmFjY2Vzc2li CiAgICAgaWYgKHJvbGVWYWx1ZSgpID09IElnbm9yZWRSb2xlKQogICAgICAgICByZXR1cm4gdHJ1 ZTsKICAgICAKKyAgICBpZiAocm9sZVZhbHVlKCkgPT0gUHJlc2VudGF0aW9uYWxSb2xlKQorICAg ICAgICByZXR1cm4gdHJ1ZTsKKyAgICAKICAgICAvLyBBbiBBUklBIHRyZWUgY2FuIG9ubHkgaGF2 ZSB0cmVlIGl0ZW1zIGFuZCBzdGF0aWMgdGV4dCBhcyBjaGlsZHJlbi4KICAgICBpZiAoIWlzQWxs b3dlZENoaWxkT2ZUcmVlKCkpCiAgICAgICAgIHJldHVybiB0cnVlOwpAQCAtMjk1NCw2ICsyOTU3 LDggQEAgQWNjZXNzaWJpbGl0eVJvbGUgQWNjZXNzaWJpbGl0eVJlbmRlck9iagogICAgICAgICAg ICAgcmV0dXJuIEltYWdlTWFwUm9sZTsKICAgICAgICAgcmV0dXJuIFdlYkNvcmVMaW5rUm9sZTsK ICAgICB9CisgICAgaWYgKG1fcmVuZGVyZXItPmlzTGlzdEl0ZW0oKSkKKyAgICAgICAgcmV0dXJu IExpc3RJdGVtUm9sZTsKICAgICBpZiAobV9yZW5kZXJlci0+aXNMaXN0TWFya2VyKCkpCiAgICAg ICAgIHJldHVybiBMaXN0TWFya2VyUm9sZTsKICAgICBpZiAobm9kZSAmJiBub2RlLT5oYXNUYWdO YW1lKGJ1dHRvblRhZykpCkluZGV4OiBXZWJDb3JlL2FjY2Vzc2liaWxpdHkvbWFjL0FjY2Vzc2li aWxpdHlPYmplY3RXcmFwcGVyLm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvYWNjZXNzaWJpbGl0 eS9tYWMvQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBwZXIubW0JKHJldmlzaW9uIDYxMTI2KQorKysg V2ViQ29yZS9hY2Nlc3NpYmlsaXR5L21hYy9BY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBlci5tbQko d29ya2luZyBjb3B5KQpAQCAtOTU3LDcgKzk1Nyw3IEBAIC0gKE5TQXJyYXkqKWFjY2Vzc2liaWxp dHlBdHRyaWJ1dGVOYW1lcwogICAgIGVsc2UgaWYgKG1fb2JqZWN0LT5pc0NvbnRyb2woKSkKICAg ICAgICAgb2JqZWN0QXR0cmlidXRlcyA9IGNvbnRyb2xBdHRyczsKICAgICAKLSAgICBlbHNlIGlm IChtX29iamVjdC0+aXNHcm91cCgpKQorICAgIGVsc2UgaWYgKG1fb2JqZWN0LT5pc0dyb3VwKCkg fHwgbV9vYmplY3QtPmlzTGlzdEl0ZW0oKSkKICAgICAgICAgb2JqZWN0QXR0cmlidXRlcyA9IGdy b3VwQXR0cnM7CiAgICAgZWxzZSBpZiAobV9vYmplY3QtPmlzVGFiTGlzdCgpKQogICAgICAgICBv YmplY3RBdHRyaWJ1dGVzID0gdGFiTGlzdEF0dHJzOwpAQCAtMTE0OCw2ICsxMTQ4LDcgQEAgc3Rh dGljIGNvbnN0IEFjY2Vzc2liaWxpdHlSb2xlTWFwJiBjcmVhdAogICAgICAgICB7IFRhYlBhbmVs Um9sZSwgTlNBY2Nlc3NpYmlsaXR5R3JvdXBSb2xlIH0sCiAgICAgICAgIHsgVHJlZVJvbGUsIE5T QWNjZXNzaWJpbGl0eU91dGxpbmVSb2xlIH0sCiAgICAgICAgIHsgVHJlZUl0ZW1Sb2xlLCBOU0Fj Y2Vzc2liaWxpdHlSb3dSb2xlIH0sCisgICAgICAgIHsgTGlzdEl0ZW1Sb2xlLCBOU0FjY2Vzc2li aWxpdHlHcm91cFJvbGUgfQogICAgIH07CiAgICAgQWNjZXNzaWJpbGl0eVJvbGVNYXAmIHJvbGVN YXAgPSAqbmV3IEFjY2Vzc2liaWxpdHlSb2xlTWFwOwogICAgIApJbmRleDogV2ViS2l0L2Nocm9t aXVtL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCShy ZXZpc2lvbiA2MTEyNikKKysrIFdlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cJKHdvcmtpbmcgY29w eSkKQEAgLTEsMyArMSwxMyBAQAorMjAxMC0wNi0xNCAgQ2hyaXMgRmxlaXphY2ggIDxjZmxlaXph Y2hAYXBwbGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIEFYOiBuZWVkIExpc3RJdGVtUm9sZSBhbmQgUHJlc2VudGF0aW9uYWxSb2xlCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00MDEzMworCisgICAg ICAgICogcHVibGljL1dlYkFjY2Vzc2liaWxpdHlSb2xlLmg6CisgICAgICAgICogc3JjL0Fzc2Vy dE1hdGNoaW5nRW51bXMuY3BwOgorCiAyMDEwLTA2LTE0ICBKZXJlbXkgT3Jsb3cgIDxqb3Jsb3dA Y2hyb21pdW0ub3JnPgogCiAgICAgICAgIEJ1aWxkIGZpeC4KSW5kZXg6IFdlYktpdC9jaHJvbWl1 bS9wdWJsaWMvV2ViQWNjZXNzaWJpbGl0eVJvbGUuaAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQvY2hy b21pdW0vcHVibGljL1dlYkFjY2Vzc2liaWxpdHlSb2xlLmgJKHJldmlzaW9uIDYxMTI2KQorKysg V2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJBY2Nlc3NpYmlsaXR5Um9sZS5oCSh3b3JraW5nIGNv cHkpCkBAIC0xMDIsNiArMTAyLDcgQEAgZW51bSBXZWJBY2Nlc3NpYmlsaXR5Um9sZSB7CiAgICAg V2ViQWNjZXNzaWJpbGl0eVJvbGVBbm5vdGF0aW9uLAogICAgIFdlYkFjY2Vzc2liaWxpdHlSb2xl U2xpZGVyVGh1bWIsCiAgICAgV2ViQWNjZXNzaWJpbGl0eVJvbGVJZ25vcmVkLAorICAgIFdlYkFj Y2Vzc2liaWxpdHlSb2xlUHJlc2VudGF0aW9uYWwsCiAgICAgV2ViQWNjZXNzaWJpbGl0eVJvbGVU YWIsCiAgICAgV2ViQWNjZXNzaWJpbGl0eVJvbGVUYWJMaXN0LAogICAgIFdlYkFjY2Vzc2liaWxp dHlSb2xlVGFiUGFuZWwsCkluZGV4OiBXZWJLaXQvY2hyb21pdW0vc3JjL0Fzc2VydE1hdGNoaW5n RW51bXMuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9jaHJvbWl1bS9zcmMvQXNzZXJ0TWF0Y2hp bmdFbnVtcy5jcHAJKHJldmlzaW9uIDYxMTI2KQorKysgV2ViS2l0L2Nocm9taXVtL3NyYy9Bc3Nl cnRNYXRjaGluZ0VudW1zLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTI3LDYgKzEyNyw3IEBAIENP TVBJTEVfQVNTRVJUX01BVENISU5HX0VOVU0oV2ViQWNjZXNzaWIKIENPTVBJTEVfQVNTRVJUX01B VENISU5HX0VOVU0oV2ViQWNjZXNzaWJpbGl0eVJvbGVBbm5vdGF0aW9uLCBBbm5vdGF0aW9uUm9s ZSk7CiBDT01QSUxFX0FTU0VSVF9NQVRDSElOR19FTlVNKFdlYkFjY2Vzc2liaWxpdHlSb2xlU2xp ZGVyVGh1bWIsIFNsaWRlclRodW1iUm9sZSk7CiBDT01QSUxFX0FTU0VSVF9NQVRDSElOR19FTlVN KFdlYkFjY2Vzc2liaWxpdHlSb2xlSWdub3JlZCwgSWdub3JlZFJvbGUpOworQ09NUElMRV9BU1NF UlRfTUFUQ0hJTkdfRU5VTShXZWJBY2Nlc3NpYmlsaXR5Um9sZVByZXNlbnRhdGlvbmFsLCBQcmVz ZW50YXRpb25hbFJvbGUpOwogQ09NUElMRV9BU1NFUlRfTUFUQ0hJTkdfRU5VTShXZWJBY2Nlc3Np YmlsaXR5Um9sZVRhYiwgVGFiUm9sZSk7CiBDT01QSUxFX0FTU0VSVF9NQVRDSElOR19FTlVNKFdl YkFjY2Vzc2liaWxpdHlSb2xlVGFiTGlzdCwgVGFiTGlzdFJvbGUpOwogQ09NUElMRV9BU1NFUlRf TUFUQ0hJTkdfRU5VTShXZWJBY2Nlc3NpYmlsaXR5Um9sZVRhYlBhbmVsLCBUYWJQYW5lbFJvbGUp Owo=