55699 2011-03-03 12:46:36 -0800 Give the Bundle's policy client the option of deciding the policy 2011-03-03 13:06:11 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 sam sam oldest_to_newest 361850 0 sam 2011-03-03 12:46:36 -0800 Give the Bundle's policy client the option of deciding the policy 361852 1 84610 sam 2011-03-03 12:49:29 -0800 Created attachment 84610 Patch 361862 2 84613 sam 2011-03-03 13:00:35 -0800 Created attachment 84613 Patch 361870 3 sam 2011-03-03 13:06:11 -0800 Committed r80275: <http://trac.webkit.org/changeset/80275> 84610 2011-03-03 12:49:29 -0800 2011-03-03 13:00:33 -0800 Patch bug-55699-20110303124928.patch text/plain 11714 sam SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDgwMjcyKQorKysgU291cmNlL1dlYktpdDIvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjcgQEAKKzIwMTEtMDMtMDMgIFNhbSBXZWlu aWcgIDxzYW1Ad2Via2l0Lm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBHaXZlIHRoZSBCdW5kbGUncyBwb2xpY3kgY2xpZW50IHRoZSBvcHRpb24g b2YgZGVjaWRpbmcgdGhlIHBvbGljeQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9NTU2OTkKKworICAgICAgICAqIFdlYlByb2Nlc3MvSW5qZWN0ZWRCdW5k bGUvQVBJL2MvV0tCdW5kbGVQYWdlLmg6CisgICAgICAgIEFkZCBXS0J1bmRsZVBhZ2VQb2xpY3lB Y3Rpb24gZW51bSBhbmQgbWFrZSBpdCB0aGUgcmV0dXJuIHZhbHVlIG9mCisgICAgICAgIHRoZSBX S0J1bmRsZVBhZ2VQb2xpY3lDbGllbnQgZnVuY3Rpb25zLgorCisgICAgICAgICogV2ViUHJvY2Vz cy9JbmplY3RlZEJ1bmRsZS9JbmplY3RlZEJ1bmRsZVBhZ2VQb2xpY3lDbGllbnQuY3BwOgorICAg ICAgICAoV2ViS2l0OjpJbmplY3RlZEJ1bmRsZVBhZ2VQb2xpY3lDbGllbnQ6OmRlY2lkZVBvbGlj eUZvck5hdmlnYXRpb25BY3Rpb24pOgorICAgICAgICAoV2ViS2l0OjpJbmplY3RlZEJ1bmRsZVBh Z2VQb2xpY3lDbGllbnQ6OmRlY2lkZVBvbGljeUZvck5ld1dpbmRvd0FjdGlvbik6CisgICAgICAg IChXZWJLaXQ6OkluamVjdGVkQnVuZGxlUGFnZVBvbGljeUNsaWVudDo6ZGVjaWRlUG9saWN5Rm9y TUlNRVR5cGUpOgorICAgICAgICAqIFdlYlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUvSW5qZWN0ZWRC dW5kbGVQYWdlUG9saWN5Q2xpZW50Lmg6CisgICAgICAgIFBhc3MgdGhlIHJldHVybiB2YWx1ZSBi YWNrIHRvIHRoZSBjYWxsZXIuIEZvciB1bmltcGxlbWVudGVkIGZ1bmN0aW9ucywgcmV0dXJuIFdL QnVuZGxlUGFnZVBvbGljeUFjdGlvblBhc3NUaHJvdWdoLgorCisgICAgICAgICogV2ViUHJvY2Vz cy9XZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5jcHA6CisgICAgICAgIChXZWJL aXQ6OldlYkZyYW1lTG9hZGVyQ2xpZW50OjpkaXNwYXRjaERlY2lkZVBvbGljeUZvck1JTUVUeXBl KToKKyAgICAgICAgKFdlYktpdDo6V2ViRnJhbWVMb2FkZXJDbGllbnQ6OmRpc3BhdGNoRGVjaWRl UG9saWN5Rm9yTmV3V2luZG93QWN0aW9uKToKKyAgICAgICAgKFdlYktpdDo6V2ViRnJhbWVMb2Fk ZXJDbGllbnQ6OmRpc3BhdGNoRGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlvbkFjdGlvbik6CisgICAg ICAgIENhbGwgdGhlIHBvbGljeSBmdW5jdGlvbiBlYXJseSBpZiB0aGUgYnVuZGxlIGhhbmRsZXMg aXQuCisKIDIwMTEtMDMtMDIgIEJyaWFuIFdlaW5zdGVpbiAgPGJ3ZWluc3RlaW5AYXBwbGUuY29t PgogCiAgICAgICAgIFJldmlld2VkIGJ5IEFkYW0gUm9iZW4uCkluZGV4OiBTb3VyY2UvV2ViS2l0 Mi9XZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL0luamVjdGVkQnVuZGxlUGFnZVBvbGljeUNsaWVu dC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9JbmplY3RlZEJ1 bmRsZS9JbmplY3RlZEJ1bmRsZVBhZ2VQb2xpY3lDbGllbnQuY3BwCShyZXZpc2lvbiA4MDI2MSkK KysrIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUvSW5qZWN0ZWRCdW5k bGVQYWdlUG9saWN5Q2xpZW50LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzMsNDAgKzMzLDQzIEBA IHVzaW5nIG5hbWVzcGFjZSBXZWJDb3JlOwogCiBuYW1lc3BhY2UgV2ViS2l0IHsKIAotdm9pZCBJ bmplY3RlZEJ1bmRsZVBhZ2VQb2xpY3lDbGllbnQ6OmRlY2lkZVBvbGljeUZvck5hdmlnYXRpb25B Y3Rpb24oV2ViUGFnZSogcGFnZSwgV2ViRnJhbWUqIGZyYW1lLCBJbmplY3RlZEJ1bmRsZU5hdmln YXRpb25BY3Rpb24qIGFjdGlvbiwgY29uc3QgUmVzb3VyY2VSZXF1ZXN0JiByZXNvdXJjZVJlcXVl c3QsIFJlZlB0cjxBUElPYmplY3Q+JiB1c2VyRGF0YSkKK1dLQnVuZGxlUGFnZVBvbGljeUFjdGlv biBJbmplY3RlZEJ1bmRsZVBhZ2VQb2xpY3lDbGllbnQ6OmRlY2lkZVBvbGljeUZvck5hdmlnYXRp b25BY3Rpb24oV2ViUGFnZSogcGFnZSwgV2ViRnJhbWUqIGZyYW1lLCBJbmplY3RlZEJ1bmRsZU5h dmlnYXRpb25BY3Rpb24qIGFjdGlvbiwgY29uc3QgUmVzb3VyY2VSZXF1ZXN0JiByZXNvdXJjZVJl cXVlc3QsIFJlZlB0cjxBUElPYmplY3Q+JiB1c2VyRGF0YSkKIHsKICAgICBpZiAoIW1fY2xpZW50 LmRlY2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rpb24pCi0gICAgICAgIHJldHVybjsKKyAgICAg ICAgcmV0dXJuIFdLQnVuZGxlUGFnZVBvbGljeUFjdGlvblBhc3NUaHJvdWdoOwogCiAgICAgUmVm UHRyPFdlYlVSTFJlcXVlc3Q+IHJlcXVlc3QgPSBXZWJVUkxSZXF1ZXN0OjpjcmVhdGUocmVzb3Vy Y2VSZXF1ZXN0KTsKIAogICAgIFdLVHlwZVJlZiB1c2VyRGF0YVRvUGFzcyA9IDA7Ci0gICAgbV9j bGllbnQuZGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlvbkFjdGlvbih0b0FQSShwYWdlKSwgdG9BUEko ZnJhbWUpLCB0b0FQSShhY3Rpb24pLCB0b0FQSShyZXF1ZXN0LmdldCgpKSwgJnVzZXJEYXRhVG9Q YXNzLCBtX2NsaWVudC5jbGllbnRJbmZvKTsKKyAgICBXS0J1bmRsZVBhZ2VQb2xpY3lBY3Rpb24g cG9saWN5ID0gbV9jbGllbnQuZGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlvbkFjdGlvbih0b0FQSShw YWdlKSwgdG9BUEkoZnJhbWUpLCB0b0FQSShhY3Rpb24pLCB0b0FQSShyZXF1ZXN0LmdldCgpKSwg JnVzZXJEYXRhVG9QYXNzLCBtX2NsaWVudC5jbGllbnRJbmZvKTsKICAgICB1c2VyRGF0YSA9IGFk b3B0UmVmKHRvSW1wbCh1c2VyRGF0YVRvUGFzcykpOworICAgIHJldHVybiBwb2xpY3k7CiB9CiAK LXZvaWQgSW5qZWN0ZWRCdW5kbGVQYWdlUG9saWN5Q2xpZW50OjpkZWNpZGVQb2xpY3lGb3JOZXdX aW5kb3dBY3Rpb24oV2ViUGFnZSogcGFnZSwgV2ViRnJhbWUqIGZyYW1lLCBJbmplY3RlZEJ1bmRs ZU5hdmlnYXRpb25BY3Rpb24qIGFjdGlvbiwgY29uc3QgUmVzb3VyY2VSZXF1ZXN0JiByZXNvdXJj ZVJlcXVlc3QsIGNvbnN0IFN0cmluZyYgZnJhbWVOYW1lLCBSZWZQdHI8QVBJT2JqZWN0PiYgdXNl ckRhdGEpCitXS0J1bmRsZVBhZ2VQb2xpY3lBY3Rpb24gSW5qZWN0ZWRCdW5kbGVQYWdlUG9saWN5 Q2xpZW50OjpkZWNpZGVQb2xpY3lGb3JOZXdXaW5kb3dBY3Rpb24oV2ViUGFnZSogcGFnZSwgV2Vi RnJhbWUqIGZyYW1lLCBJbmplY3RlZEJ1bmRsZU5hdmlnYXRpb25BY3Rpb24qIGFjdGlvbiwgY29u c3QgUmVzb3VyY2VSZXF1ZXN0JiByZXNvdXJjZVJlcXVlc3QsIGNvbnN0IFN0cmluZyYgZnJhbWVO YW1lLCBSZWZQdHI8QVBJT2JqZWN0PiYgdXNlckRhdGEpCiB7CiAgICAgaWYgKCFtX2NsaWVudC5k ZWNpZGVQb2xpY3lGb3JOZXdXaW5kb3dBY3Rpb24pCi0gICAgICAgIHJldHVybjsKKyAgICAgICAg cmV0dXJuIFdLQnVuZGxlUGFnZVBvbGljeUFjdGlvblBhc3NUaHJvdWdoOwogCiAgICAgUmVmUHRy PFdlYlVSTFJlcXVlc3Q+IHJlcXVlc3QgPSBXZWJVUkxSZXF1ZXN0OjpjcmVhdGUocmVzb3VyY2VS ZXF1ZXN0KTsKIAogICAgIFdLVHlwZVJlZiB1c2VyRGF0YVRvUGFzcyA9IDA7Ci0gICAgbV9jbGll bnQuZGVjaWRlUG9saWN5Rm9yTmV3V2luZG93QWN0aW9uKHRvQVBJKHBhZ2UpLCB0b0FQSShmcmFt ZSksIHRvQVBJKGFjdGlvbiksIHRvQVBJKHJlcXVlc3QuZ2V0KCkpLCB0b0FQSShmcmFtZU5hbWUu aW1wbCgpKSwgJnVzZXJEYXRhVG9QYXNzLCBtX2NsaWVudC5jbGllbnRJbmZvKTsKKyAgICBXS0J1 bmRsZVBhZ2VQb2xpY3lBY3Rpb24gcG9saWN5ID0gbV9jbGllbnQuZGVjaWRlUG9saWN5Rm9yTmV3 V2luZG93QWN0aW9uKHRvQVBJKHBhZ2UpLCB0b0FQSShmcmFtZSksIHRvQVBJKGFjdGlvbiksIHRv QVBJKHJlcXVlc3QuZ2V0KCkpLCB0b0FQSShmcmFtZU5hbWUuaW1wbCgpKSwgJnVzZXJEYXRhVG9Q YXNzLCBtX2NsaWVudC5jbGllbnRJbmZvKTsKICAgICB1c2VyRGF0YSA9IGFkb3B0UmVmKHRvSW1w bCh1c2VyRGF0YVRvUGFzcykpOworICAgIHJldHVybiBwb2xpY3k7CiB9CiAKLXZvaWQgSW5qZWN0 ZWRCdW5kbGVQYWdlUG9saWN5Q2xpZW50OjpkZWNpZGVQb2xpY3lGb3JNSU1FVHlwZShXZWJQYWdl KiBwYWdlLCBXZWJGcmFtZSogZnJhbWUsIGNvbnN0IFN0cmluZyYgTUlNRVR5cGUsIGNvbnN0IFJl c291cmNlUmVxdWVzdCYgcmVzb3VyY2VSZXF1ZXN0LCBSZWZQdHI8QVBJT2JqZWN0PiYgdXNlckRh dGEpCitXS0J1bmRsZVBhZ2VQb2xpY3lBY3Rpb24gSW5qZWN0ZWRCdW5kbGVQYWdlUG9saWN5Q2xp ZW50OjpkZWNpZGVQb2xpY3lGb3JNSU1FVHlwZShXZWJQYWdlKiBwYWdlLCBXZWJGcmFtZSogZnJh bWUsIGNvbnN0IFN0cmluZyYgTUlNRVR5cGUsIGNvbnN0IFJlc291cmNlUmVxdWVzdCYgcmVzb3Vy Y2VSZXF1ZXN0LCBSZWZQdHI8QVBJT2JqZWN0PiYgdXNlckRhdGEpCiB7CiAgICAgaWYgKCFtX2Ns aWVudC5kZWNpZGVQb2xpY3lGb3JNSU1FVHlwZSkKLSAgICAgICAgcmV0dXJuOworICAgICAgICBy ZXR1cm4gV0tCdW5kbGVQYWdlUG9saWN5QWN0aW9uUGFzc1Rocm91Z2g7CiAKICAgICBSZWZQdHI8 V2ViVVJMUmVxdWVzdD4gcmVxdWVzdCA9IFdlYlVSTFJlcXVlc3Q6OmNyZWF0ZShyZXNvdXJjZVJl cXVlc3QpOwogCiAgICAgV0tUeXBlUmVmIHVzZXJEYXRhVG9QYXNzID0gMDsKLSAgICBtX2NsaWVu dC5kZWNpZGVQb2xpY3lGb3JNSU1FVHlwZSh0b0FQSShwYWdlKSwgdG9BUEkoZnJhbWUpLCB0b0FQ SShNSU1FVHlwZS5pbXBsKCkpLCB0b0FQSShyZXF1ZXN0LmdldCgpKSwgJnVzZXJEYXRhVG9QYXNz LCBtX2NsaWVudC5jbGllbnRJbmZvKTsKKyAgICBXS0J1bmRsZVBhZ2VQb2xpY3lBY3Rpb24gcG9s aWN5ID0gbV9jbGllbnQuZGVjaWRlUG9saWN5Rm9yTUlNRVR5cGUodG9BUEkocGFnZSksIHRvQVBJ KGZyYW1lKSwgdG9BUEkoTUlNRVR5cGUuaW1wbCgpKSwgdG9BUEkocmVxdWVzdC5nZXQoKSksICZ1 c2VyRGF0YVRvUGFzcywgbV9jbGllbnQuY2xpZW50SW5mbyk7CiAgICAgdXNlckRhdGEgPSBhZG9w dFJlZih0b0ltcGwodXNlckRhdGFUb1Bhc3MpKTsKKyAgICByZXR1cm4gcG9saWN5OwogfQogCiB9 IC8vIG5hbWVzcGFjZSBXZWJLaXQKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvSW5q ZWN0ZWRCdW5kbGUvSW5qZWN0ZWRCdW5kbGVQYWdlUG9saWN5Q2xpZW50LmgKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9JbmplY3RlZEJ1bmRsZS9JbmplY3RlZEJ1bmRs ZVBhZ2VQb2xpY3lDbGllbnQuaAkocmV2aXNpb24gODAyNjEpCisrKyBTb3VyY2UvV2ViS2l0Mi9X ZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL0luamVjdGVkQnVuZGxlUGFnZVBvbGljeUNsaWVudC5o CSh3b3JraW5nIGNvcHkpCkBAIC00Myw5ICs0Myw5IEBAIGNsYXNzIFdlYlBhZ2U7CiAKIGNsYXNz IEluamVjdGVkQnVuZGxlUGFnZVBvbGljeUNsaWVudCA6IHB1YmxpYyBBUElDbGllbnQ8V0tCdW5k bGVQYWdlUG9saWN5Q2xpZW50PiB7CiBwdWJsaWM6Ci0gICAgdm9pZCBkZWNpZGVQb2xpY3lGb3JO YXZpZ2F0aW9uQWN0aW9uKFdlYlBhZ2UqLCBXZWJGcmFtZSosIEluamVjdGVkQnVuZGxlTmF2aWdh dGlvbkFjdGlvbiosIGNvbnN0IFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdCYsIFJlZlB0cjxBUElP YmplY3Q+JiB1c2VyRGF0YSk7Ci0gICAgdm9pZCBkZWNpZGVQb2xpY3lGb3JOZXdXaW5kb3dBY3Rp b24oV2ViUGFnZSosIFdlYkZyYW1lKiwgSW5qZWN0ZWRCdW5kbGVOYXZpZ2F0aW9uQWN0aW9uKiwg Y29uc3QgV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0JiwgY29uc3QgU3RyaW5nJiBmcmFtZU5hbWUs IFJlZlB0cjxBUElPYmplY3Q+JiB1c2VyRGF0YSk7Ci0gICAgdm9pZCBkZWNpZGVQb2xpY3lGb3JN SU1FVHlwZShXZWJQYWdlKiwgV2ViRnJhbWUqLCBjb25zdCBTdHJpbmcmIE1JTUVUeXBlLCBjb25z dCBXZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3QmLCBSZWZQdHI8QVBJT2JqZWN0PiYgdXNlckRhdGEp OworICAgIFdLQnVuZGxlUGFnZVBvbGljeUFjdGlvbiBkZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9u QWN0aW9uKFdlYlBhZ2UqLCBXZWJGcmFtZSosIEluamVjdGVkQnVuZGxlTmF2aWdhdGlvbkFjdGlv biosIGNvbnN0IFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdCYsIFJlZlB0cjxBUElPYmplY3Q+JiB1 c2VyRGF0YSk7CisgICAgV0tCdW5kbGVQYWdlUG9saWN5QWN0aW9uIGRlY2lkZVBvbGljeUZvck5l d1dpbmRvd0FjdGlvbihXZWJQYWdlKiwgV2ViRnJhbWUqLCBJbmplY3RlZEJ1bmRsZU5hdmlnYXRp b25BY3Rpb24qLCBjb25zdCBXZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3QmLCBjb25zdCBTdHJpbmcm IGZyYW1lTmFtZSwgUmVmUHRyPEFQSU9iamVjdD4mIHVzZXJEYXRhKTsKKyAgICBXS0J1bmRsZVBh Z2VQb2xpY3lBY3Rpb24gZGVjaWRlUG9saWN5Rm9yTUlNRVR5cGUoV2ViUGFnZSosIFdlYkZyYW1l KiwgY29uc3QgU3RyaW5nJiBNSU1FVHlwZSwgY29uc3QgV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0 JiwgUmVmUHRyPEFQSU9iamVjdD4mIHVzZXJEYXRhKTsKIH07CiAKIH0gLy8gbmFtZXNwYWNlIFdl YktpdApJbmRleDogU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9JbmplY3RlZEJ1bmRsZS9BUEkv Yy9XS0J1bmRsZVBhZ2UuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNz L0luamVjdGVkQnVuZGxlL0FQSS9jL1dLQnVuZGxlUGFnZS5oCShyZXZpc2lvbiA4MDI2MSkKKysr IFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUvQVBJL2MvV0tCdW5kbGVQ YWdlLmgJKHdvcmtpbmcgY29weSkKQEAgLTExNCwxMCArMTE0LDE4IEBAIHN0cnVjdCBXS0J1bmRs ZVBhZ2VMb2FkZXJDbGllbnQgewogfTsKIHR5cGVkZWYgc3RydWN0IFdLQnVuZGxlUGFnZUxvYWRl ckNsaWVudCBXS0J1bmRsZVBhZ2VMb2FkZXJDbGllbnQ7CiAKK2VudW0geworICAgIFdLQnVuZGxl UGFnZVBvbGljeUFjdGlvblBhc3NUaHJvdWdoLAorICAgIFdLQnVuZGxlUGFnZVBvbGljeUFjdGlv blVzZSwKKyAgICBXS0J1bmRsZVBhZ2VQb2xpY3lBY3Rpb25JZ25vcmUKK307Cit0eXBlZGVmIHVp bnQzMl90IFdLQnVuZGxlUGFnZVBvbGljeUFjdGlvbjsKKworICAgIAogLy8gUG9saWN5IENsaWVu dAotdHlwZWRlZiB2b2lkICgqV0tCdW5kbGVQYWdlRGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlvbkFj dGlvbkNhbGxiYWNrKShXS0J1bmRsZVBhZ2VSZWYgcGFnZSwgV0tCdW5kbGVGcmFtZVJlZiBmcmFt ZSwgV0tCdW5kbGVOYXZpZ2F0aW9uQWN0aW9uUmVmIG5hdmlnYXRpb25BY3Rpb24sIFdLVVJMUmVx dWVzdFJlZiByZXF1ZXN0LCBXS1R5cGVSZWYqIHVzZXJEYXRhLCBjb25zdCB2b2lkKiBjbGllbnRJ bmZvKTsKLXR5cGVkZWYgdm9pZCAoKldLQnVuZGxlUGFnZURlY2lkZVBvbGljeUZvck5ld1dpbmRv d0FjdGlvbkNhbGxiYWNrKShXS0J1bmRsZVBhZ2VSZWYgcGFnZSwgV0tCdW5kbGVGcmFtZVJlZiBm cmFtZSwgV0tCdW5kbGVOYXZpZ2F0aW9uQWN0aW9uUmVmIG5hdmlnYXRpb25BY3Rpb24sIFdLVVJM UmVxdWVzdFJlZiByZXF1ZXN0LCBXS1N0cmluZ1JlZiBmcmFtZU5hbWUsIFdLVHlwZVJlZiogdXNl ckRhdGEsIGNvbnN0IHZvaWQqIGNsaWVudEluZm8pOwotdHlwZWRlZiB2b2lkICgqV0tCdW5kbGVQ YWdlRGVjaWRlUG9saWN5Rm9yTUlNRVR5cGVDYWxsYmFjaykoV0tCdW5kbGVQYWdlUmVmIHBhZ2Us IFdLQnVuZGxlRnJhbWVSZWYgZnJhbWUsICBXS1N0cmluZ1JlZiBNSU1FVHlwZSwgV0tVUkxSZXF1 ZXN0UmVmIHJlcXVlc3QsIFdLVHlwZVJlZiogdXNlckRhdGEsIGNvbnN0IHZvaWQqIGNsaWVudElu Zm8pOwordHlwZWRlZiBXS0J1bmRsZVBhZ2VQb2xpY3lBY3Rpb24gKCpXS0J1bmRsZVBhZ2VEZWNp ZGVQb2xpY3lGb3JOYXZpZ2F0aW9uQWN0aW9uQ2FsbGJhY2spKFdLQnVuZGxlUGFnZVJlZiBwYWdl LCBXS0J1bmRsZUZyYW1lUmVmIGZyYW1lLCBXS0J1bmRsZU5hdmlnYXRpb25BY3Rpb25SZWYgbmF2 aWdhdGlvbkFjdGlvbiwgV0tVUkxSZXF1ZXN0UmVmIHJlcXVlc3QsIFdLVHlwZVJlZiogdXNlckRh dGEsIGNvbnN0IHZvaWQqIGNsaWVudEluZm8pOwordHlwZWRlZiBXS0J1bmRsZVBhZ2VQb2xpY3lB Y3Rpb24gKCpXS0J1bmRsZVBhZ2VEZWNpZGVQb2xpY3lGb3JOZXdXaW5kb3dBY3Rpb25DYWxsYmFj aykoV0tCdW5kbGVQYWdlUmVmIHBhZ2UsIFdLQnVuZGxlRnJhbWVSZWYgZnJhbWUsIFdLQnVuZGxl TmF2aWdhdGlvbkFjdGlvblJlZiBuYXZpZ2F0aW9uQWN0aW9uLCBXS1VSTFJlcXVlc3RSZWYgcmVx dWVzdCwgV0tTdHJpbmdSZWYgZnJhbWVOYW1lLCBXS1R5cGVSZWYqIHVzZXJEYXRhLCBjb25zdCB2 b2lkKiBjbGllbnRJbmZvKTsKK3R5cGVkZWYgV0tCdW5kbGVQYWdlUG9saWN5QWN0aW9uICgqV0tC dW5kbGVQYWdlRGVjaWRlUG9saWN5Rm9yTUlNRVR5cGVDYWxsYmFjaykoV0tCdW5kbGVQYWdlUmVm IHBhZ2UsIFdLQnVuZGxlRnJhbWVSZWYgZnJhbWUsICBXS1N0cmluZ1JlZiBNSU1FVHlwZSwgV0tV UkxSZXF1ZXN0UmVmIHJlcXVlc3QsIFdLVHlwZVJlZiogdXNlckRhdGEsIGNvbnN0IHZvaWQqIGNs aWVudEluZm8pOwogCiBzdHJ1Y3QgV0tCdW5kbGVQYWdlUG9saWN5Q2xpZW50IHsKICAgICBpbnQg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIHZlcnNpb247CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYkNvcmVT dXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmNwcAko cmV2aXNpb24gODAyNjEpCisrKyBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBw b3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmNwcAkod29ya2luZyBjb3B5KQpAQCAtNTg3LDcgKzU4 NywxMSBAQCB2b2lkIFdlYkZyYW1lTG9hZGVyQ2xpZW50OjpkaXNwYXRjaERlY2lkCiAgICAgUmVm UHRyPEFQSU9iamVjdD4gdXNlckRhdGE7CiAKICAgICAvLyBOb3RpZnkgdGhlIGJ1bmRsZSBjbGll bnQuCi0gICAgd2ViUGFnZS0+aW5qZWN0ZWRCdW5kbGVQb2xpY3lDbGllbnQoKS5kZWNpZGVQb2xp Y3lGb3JNSU1FVHlwZSh3ZWJQYWdlLCBtX2ZyYW1lLCBNSU1FVHlwZSwgcmVxdWVzdCwgdXNlckRh dGEpOworICAgIFdLQnVuZGxlUGFnZVBvbGljeUFjdGlvbiBwb2xpY3kgPSB3ZWJQYWdlLT5pbmpl Y3RlZEJ1bmRsZVBvbGljeUNsaWVudCgpLmRlY2lkZVBvbGljeUZvck1JTUVUeXBlKHdlYlBhZ2Us IG1fZnJhbWUsIE1JTUVUeXBlLCByZXF1ZXN0LCB1c2VyRGF0YSk7CisgICAgaWYgKHBvbGljeSAh PSBXS0J1bmRsZVBhZ2VQb2xpY3lBY3Rpb25QYXNzVGhyb3VnaCkgeworICAgICAgICAobV9mcmFt ZS0+Y29yZUZyYW1lKCktPmxvYWRlcigpLT5wb2xpY3lDaGVja2VyKCktPipmdW5jdGlvbikocG9s aWN5ID09IFdLQnVuZGxlUGFnZVBvbGljeUFjdGlvblVzZSA/IFBvbGljeVVzZSA6IFBvbGljeUln bm9yZSk7CisgICAgICAgIHJldHVybjsKKyAgICB9CiAKICAgICB1aW50NjRfdCBsaXN0ZW5lcklE ID0gbV9mcmFtZS0+c2V0VXBQb2xpY3lMaXN0ZW5lcihmdW5jdGlvbik7CiAgICAgYm9vbCByZWNl aXZlZFBvbGljeUFjdGlvbjsKQEAgLTYxNCw3ICs2MTgsMTEgQEAgdm9pZCBXZWJGcmFtZUxvYWRl ckNsaWVudDo6ZGlzcGF0Y2hEZWNpZAogICAgIFJlZlB0cjxJbmplY3RlZEJ1bmRsZU5hdmlnYXRp b25BY3Rpb24+IGFjdGlvbiA9IEluamVjdGVkQnVuZGxlTmF2aWdhdGlvbkFjdGlvbjo6Y3JlYXRl KG1fZnJhbWUsIG5hdmlnYXRpb25BY3Rpb24sIGZvcm1TdGF0ZSk7CiAKICAgICAvLyBOb3RpZnkg dGhlIGJ1bmRsZSBjbGllbnQuCi0gICAgd2ViUGFnZS0+aW5qZWN0ZWRCdW5kbGVQb2xpY3lDbGll bnQoKS5kZWNpZGVQb2xpY3lGb3JOZXdXaW5kb3dBY3Rpb24od2ViUGFnZSwgbV9mcmFtZSwgYWN0 aW9uLmdldCgpLCByZXF1ZXN0LCBmcmFtZU5hbWUsIHVzZXJEYXRhKTsKKyAgICBXS0J1bmRsZVBh Z2VQb2xpY3lBY3Rpb24gcG9saWN5ID0gd2ViUGFnZS0+aW5qZWN0ZWRCdW5kbGVQb2xpY3lDbGll bnQoKS5kZWNpZGVQb2xpY3lGb3JOZXdXaW5kb3dBY3Rpb24od2ViUGFnZSwgbV9mcmFtZSwgYWN0 aW9uLmdldCgpLCByZXF1ZXN0LCBmcmFtZU5hbWUsIHVzZXJEYXRhKTsKKyAgICBpZiAocG9saWN5 ICE9IFdLQnVuZGxlUGFnZVBvbGljeUFjdGlvblBhc3NUaHJvdWdoKSB7CisgICAgICAgIChtX2Zy YW1lLT5jb3JlRnJhbWUoKS0+bG9hZGVyKCktPnBvbGljeUNoZWNrZXIoKS0+KmZ1bmN0aW9uKShw b2xpY3kgPT0gV0tCdW5kbGVQYWdlUG9saWN5QWN0aW9uVXNlID8gUG9saWN5VXNlIDogUG9saWN5 SWdub3JlKTsKKyAgICAgICAgcmV0dXJuOworICAgIH0KIAogCiAgICAgdWludDY0X3QgbGlzdGVu ZXJJRCA9IG1fZnJhbWUtPnNldFVwUG9saWN5TGlzdGVuZXIoZnVuY3Rpb24pOwpAQCAtNjQwLDcg KzY0OCwxMSBAQCB2b2lkIFdlYkZyYW1lTG9hZGVyQ2xpZW50OjpkaXNwYXRjaERlY2lkCiAgICAg UmVmUHRyPEluamVjdGVkQnVuZGxlTmF2aWdhdGlvbkFjdGlvbj4gYWN0aW9uID0gSW5qZWN0ZWRC dW5kbGVOYXZpZ2F0aW9uQWN0aW9uOjpjcmVhdGUobV9mcmFtZSwgbmF2aWdhdGlvbkFjdGlvbiwg Zm9ybVN0YXRlKTsKIAogICAgIC8vIE5vdGlmeSB0aGUgYnVuZGxlIGNsaWVudC4KLSAgICB3ZWJQ YWdlLT5pbmplY3RlZEJ1bmRsZVBvbGljeUNsaWVudCgpLmRlY2lkZVBvbGljeUZvck5hdmlnYXRp b25BY3Rpb24od2ViUGFnZSwgbV9mcmFtZSwgYWN0aW9uLmdldCgpLCByZXF1ZXN0LCB1c2VyRGF0 YSk7CisgICAgV0tCdW5kbGVQYWdlUG9saWN5QWN0aW9uIHBvbGljeSA9IHdlYlBhZ2UtPmluamVj dGVkQnVuZGxlUG9saWN5Q2xpZW50KCkuZGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlvbkFjdGlvbih3 ZWJQYWdlLCBtX2ZyYW1lLCBhY3Rpb24uZ2V0KCksIHJlcXVlc3QsIHVzZXJEYXRhKTsKKyAgICBp ZiAocG9saWN5ICE9IFdLQnVuZGxlUGFnZVBvbGljeUFjdGlvblBhc3NUaHJvdWdoKSB7CisgICAg ICAgIChtX2ZyYW1lLT5jb3JlRnJhbWUoKS0+bG9hZGVyKCktPnBvbGljeUNoZWNrZXIoKS0+KmZ1 bmN0aW9uKShwb2xpY3kgPT0gV0tCdW5kbGVQYWdlUG9saWN5QWN0aW9uVXNlID8gUG9saWN5VXNl IDogUG9saWN5SWdub3JlKTsKKyAgICAgICAgcmV0dXJuOworICAgIH0KIAogICAgIHVpbnQ2NF90 IGxpc3RlbmVySUQgPSBtX2ZyYW1lLT5zZXRVcFBvbGljeUxpc3RlbmVyKGZ1bmN0aW9uKTsKICAg ICBib29sIHJlY2VpdmVkUG9saWN5QWN0aW9uOwo= 84613 2011-03-03 13:00:35 -0800 2011-03-03 13:01:40 -0800 Patch bug-55699-20110303130034.patch text/plain 11488 sam SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDgwMjcyKQorKysgU291cmNlL1dlYktpdDIvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjcgQEAKKzIwMTEtMDMtMDMgIFNhbSBXZWlu aWcgIDxzYW1Ad2Via2l0Lm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBHaXZlIHRoZSBCdW5kbGUncyBwb2xpY3kgY2xpZW50IHRoZSBvcHRpb24g b2YgZGVjaWRpbmcgdGhlIHBvbGljeQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9NTU2OTkKKworICAgICAgICAqIFdlYlByb2Nlc3MvSW5qZWN0ZWRCdW5k bGUvQVBJL2MvV0tCdW5kbGVQYWdlLmg6CisgICAgICAgIEFkZCBXS0J1bmRsZVBhZ2VQb2xpY3lB Y3Rpb24gZW51bSBhbmQgbWFrZSBpdCB0aGUgcmV0dXJuIHZhbHVlIG9mCisgICAgICAgIHRoZSBX S0J1bmRsZVBhZ2VQb2xpY3lDbGllbnQgZnVuY3Rpb25zLgorCisgICAgICAgICogV2ViUHJvY2Vz cy9JbmplY3RlZEJ1bmRsZS9JbmplY3RlZEJ1bmRsZVBhZ2VQb2xpY3lDbGllbnQuY3BwOgorICAg ICAgICAoV2ViS2l0OjpJbmplY3RlZEJ1bmRsZVBhZ2VQb2xpY3lDbGllbnQ6OmRlY2lkZVBvbGlj eUZvck5hdmlnYXRpb25BY3Rpb24pOgorICAgICAgICAoV2ViS2l0OjpJbmplY3RlZEJ1bmRsZVBh Z2VQb2xpY3lDbGllbnQ6OmRlY2lkZVBvbGljeUZvck5ld1dpbmRvd0FjdGlvbik6CisgICAgICAg IChXZWJLaXQ6OkluamVjdGVkQnVuZGxlUGFnZVBvbGljeUNsaWVudDo6ZGVjaWRlUG9saWN5Rm9y TUlNRVR5cGUpOgorICAgICAgICAqIFdlYlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUvSW5qZWN0ZWRC dW5kbGVQYWdlUG9saWN5Q2xpZW50Lmg6CisgICAgICAgIFBhc3MgdGhlIHJldHVybiB2YWx1ZSBi YWNrIHRvIHRoZSBjYWxsZXIuIEZvciB1bmltcGxlbWVudGVkIGZ1bmN0aW9ucywgcmV0dXJuIFdL QnVuZGxlUGFnZVBvbGljeUFjdGlvblBhc3NUaHJvdWdoLgorCisgICAgICAgICogV2ViUHJvY2Vz cy9XZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5jcHA6CisgICAgICAgIChXZWJL aXQ6OldlYkZyYW1lTG9hZGVyQ2xpZW50OjpkaXNwYXRjaERlY2lkZVBvbGljeUZvck1JTUVUeXBl KToKKyAgICAgICAgKFdlYktpdDo6V2ViRnJhbWVMb2FkZXJDbGllbnQ6OmRpc3BhdGNoRGVjaWRl UG9saWN5Rm9yTmV3V2luZG93QWN0aW9uKToKKyAgICAgICAgKFdlYktpdDo6V2ViRnJhbWVMb2Fk ZXJDbGllbnQ6OmRpc3BhdGNoRGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlvbkFjdGlvbik6CisgICAg ICAgIENhbGwgdGhlIHBvbGljeSBmdW5jdGlvbiBlYXJseSBpZiB0aGUgYnVuZGxlIGhhbmRsZXMg aXQuCisKIDIwMTEtMDMtMDIgIEJyaWFuIFdlaW5zdGVpbiAgPGJ3ZWluc3RlaW5AYXBwbGUuY29t PgogCiAgICAgICAgIFJldmlld2VkIGJ5IEFkYW0gUm9iZW4uCkluZGV4OiBTb3VyY2UvV2ViS2l0 Mi9XZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL0luamVjdGVkQnVuZGxlUGFnZVBvbGljeUNsaWVu dC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9JbmplY3RlZEJ1 bmRsZS9JbmplY3RlZEJ1bmRsZVBhZ2VQb2xpY3lDbGllbnQuY3BwCShyZXZpc2lvbiA4MDI2MSkK KysrIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUvSW5qZWN0ZWRCdW5k bGVQYWdlUG9saWN5Q2xpZW50LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzMsNDAgKzMzLDQzIEBA IHVzaW5nIG5hbWVzcGFjZSBXZWJDb3JlOwogCiBuYW1lc3BhY2UgV2ViS2l0IHsKIAotdm9pZCBJ bmplY3RlZEJ1bmRsZVBhZ2VQb2xpY3lDbGllbnQ6OmRlY2lkZVBvbGljeUZvck5hdmlnYXRpb25B Y3Rpb24oV2ViUGFnZSogcGFnZSwgV2ViRnJhbWUqIGZyYW1lLCBJbmplY3RlZEJ1bmRsZU5hdmln YXRpb25BY3Rpb24qIGFjdGlvbiwgY29uc3QgUmVzb3VyY2VSZXF1ZXN0JiByZXNvdXJjZVJlcXVl c3QsIFJlZlB0cjxBUElPYmplY3Q+JiB1c2VyRGF0YSkKK1dLQnVuZGxlUGFnZVBvbGljeUFjdGlv biBJbmplY3RlZEJ1bmRsZVBhZ2VQb2xpY3lDbGllbnQ6OmRlY2lkZVBvbGljeUZvck5hdmlnYXRp b25BY3Rpb24oV2ViUGFnZSogcGFnZSwgV2ViRnJhbWUqIGZyYW1lLCBJbmplY3RlZEJ1bmRsZU5h dmlnYXRpb25BY3Rpb24qIGFjdGlvbiwgY29uc3QgUmVzb3VyY2VSZXF1ZXN0JiByZXNvdXJjZVJl cXVlc3QsIFJlZlB0cjxBUElPYmplY3Q+JiB1c2VyRGF0YSkKIHsKICAgICBpZiAoIW1fY2xpZW50 LmRlY2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rpb24pCi0gICAgICAgIHJldHVybjsKKyAgICAg ICAgcmV0dXJuIFdLQnVuZGxlUGFnZVBvbGljeUFjdGlvblBhc3NUaHJvdWdoOwogCiAgICAgUmVm UHRyPFdlYlVSTFJlcXVlc3Q+IHJlcXVlc3QgPSBXZWJVUkxSZXF1ZXN0OjpjcmVhdGUocmVzb3Vy Y2VSZXF1ZXN0KTsKIAogICAgIFdLVHlwZVJlZiB1c2VyRGF0YVRvUGFzcyA9IDA7Ci0gICAgbV9j bGllbnQuZGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlvbkFjdGlvbih0b0FQSShwYWdlKSwgdG9BUEko ZnJhbWUpLCB0b0FQSShhY3Rpb24pLCB0b0FQSShyZXF1ZXN0LmdldCgpKSwgJnVzZXJEYXRhVG9Q YXNzLCBtX2NsaWVudC5jbGllbnRJbmZvKTsKKyAgICBXS0J1bmRsZVBhZ2VQb2xpY3lBY3Rpb24g cG9saWN5ID0gbV9jbGllbnQuZGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlvbkFjdGlvbih0b0FQSShw YWdlKSwgdG9BUEkoZnJhbWUpLCB0b0FQSShhY3Rpb24pLCB0b0FQSShyZXF1ZXN0LmdldCgpKSwg JnVzZXJEYXRhVG9QYXNzLCBtX2NsaWVudC5jbGllbnRJbmZvKTsKICAgICB1c2VyRGF0YSA9IGFk b3B0UmVmKHRvSW1wbCh1c2VyRGF0YVRvUGFzcykpOworICAgIHJldHVybiBwb2xpY3k7CiB9CiAK LXZvaWQgSW5qZWN0ZWRCdW5kbGVQYWdlUG9saWN5Q2xpZW50OjpkZWNpZGVQb2xpY3lGb3JOZXdX aW5kb3dBY3Rpb24oV2ViUGFnZSogcGFnZSwgV2ViRnJhbWUqIGZyYW1lLCBJbmplY3RlZEJ1bmRs ZU5hdmlnYXRpb25BY3Rpb24qIGFjdGlvbiwgY29uc3QgUmVzb3VyY2VSZXF1ZXN0JiByZXNvdXJj ZVJlcXVlc3QsIGNvbnN0IFN0cmluZyYgZnJhbWVOYW1lLCBSZWZQdHI8QVBJT2JqZWN0PiYgdXNl ckRhdGEpCitXS0J1bmRsZVBhZ2VQb2xpY3lBY3Rpb24gSW5qZWN0ZWRCdW5kbGVQYWdlUG9saWN5 Q2xpZW50OjpkZWNpZGVQb2xpY3lGb3JOZXdXaW5kb3dBY3Rpb24oV2ViUGFnZSogcGFnZSwgV2Vi RnJhbWUqIGZyYW1lLCBJbmplY3RlZEJ1bmRsZU5hdmlnYXRpb25BY3Rpb24qIGFjdGlvbiwgY29u c3QgUmVzb3VyY2VSZXF1ZXN0JiByZXNvdXJjZVJlcXVlc3QsIGNvbnN0IFN0cmluZyYgZnJhbWVO YW1lLCBSZWZQdHI8QVBJT2JqZWN0PiYgdXNlckRhdGEpCiB7CiAgICAgaWYgKCFtX2NsaWVudC5k ZWNpZGVQb2xpY3lGb3JOZXdXaW5kb3dBY3Rpb24pCi0gICAgICAgIHJldHVybjsKKyAgICAgICAg cmV0dXJuIFdLQnVuZGxlUGFnZVBvbGljeUFjdGlvblBhc3NUaHJvdWdoOwogCiAgICAgUmVmUHRy PFdlYlVSTFJlcXVlc3Q+IHJlcXVlc3QgPSBXZWJVUkxSZXF1ZXN0OjpjcmVhdGUocmVzb3VyY2VS ZXF1ZXN0KTsKIAogICAgIFdLVHlwZVJlZiB1c2VyRGF0YVRvUGFzcyA9IDA7Ci0gICAgbV9jbGll bnQuZGVjaWRlUG9saWN5Rm9yTmV3V2luZG93QWN0aW9uKHRvQVBJKHBhZ2UpLCB0b0FQSShmcmFt ZSksIHRvQVBJKGFjdGlvbiksIHRvQVBJKHJlcXVlc3QuZ2V0KCkpLCB0b0FQSShmcmFtZU5hbWUu aW1wbCgpKSwgJnVzZXJEYXRhVG9QYXNzLCBtX2NsaWVudC5jbGllbnRJbmZvKTsKKyAgICBXS0J1 bmRsZVBhZ2VQb2xpY3lBY3Rpb24gcG9saWN5ID0gbV9jbGllbnQuZGVjaWRlUG9saWN5Rm9yTmV3 V2luZG93QWN0aW9uKHRvQVBJKHBhZ2UpLCB0b0FQSShmcmFtZSksIHRvQVBJKGFjdGlvbiksIHRv QVBJKHJlcXVlc3QuZ2V0KCkpLCB0b0FQSShmcmFtZU5hbWUuaW1wbCgpKSwgJnVzZXJEYXRhVG9Q YXNzLCBtX2NsaWVudC5jbGllbnRJbmZvKTsKICAgICB1c2VyRGF0YSA9IGFkb3B0UmVmKHRvSW1w bCh1c2VyRGF0YVRvUGFzcykpOworICAgIHJldHVybiBwb2xpY3k7CiB9CiAKLXZvaWQgSW5qZWN0 ZWRCdW5kbGVQYWdlUG9saWN5Q2xpZW50OjpkZWNpZGVQb2xpY3lGb3JNSU1FVHlwZShXZWJQYWdl KiBwYWdlLCBXZWJGcmFtZSogZnJhbWUsIGNvbnN0IFN0cmluZyYgTUlNRVR5cGUsIGNvbnN0IFJl c291cmNlUmVxdWVzdCYgcmVzb3VyY2VSZXF1ZXN0LCBSZWZQdHI8QVBJT2JqZWN0PiYgdXNlckRh dGEpCitXS0J1bmRsZVBhZ2VQb2xpY3lBY3Rpb24gSW5qZWN0ZWRCdW5kbGVQYWdlUG9saWN5Q2xp ZW50OjpkZWNpZGVQb2xpY3lGb3JNSU1FVHlwZShXZWJQYWdlKiBwYWdlLCBXZWJGcmFtZSogZnJh bWUsIGNvbnN0IFN0cmluZyYgTUlNRVR5cGUsIGNvbnN0IFJlc291cmNlUmVxdWVzdCYgcmVzb3Vy Y2VSZXF1ZXN0LCBSZWZQdHI8QVBJT2JqZWN0PiYgdXNlckRhdGEpCiB7CiAgICAgaWYgKCFtX2Ns aWVudC5kZWNpZGVQb2xpY3lGb3JNSU1FVHlwZSkKLSAgICAgICAgcmV0dXJuOworICAgICAgICBy ZXR1cm4gV0tCdW5kbGVQYWdlUG9saWN5QWN0aW9uUGFzc1Rocm91Z2g7CiAKICAgICBSZWZQdHI8 V2ViVVJMUmVxdWVzdD4gcmVxdWVzdCA9IFdlYlVSTFJlcXVlc3Q6OmNyZWF0ZShyZXNvdXJjZVJl cXVlc3QpOwogCiAgICAgV0tUeXBlUmVmIHVzZXJEYXRhVG9QYXNzID0gMDsKLSAgICBtX2NsaWVu dC5kZWNpZGVQb2xpY3lGb3JNSU1FVHlwZSh0b0FQSShwYWdlKSwgdG9BUEkoZnJhbWUpLCB0b0FQ SShNSU1FVHlwZS5pbXBsKCkpLCB0b0FQSShyZXF1ZXN0LmdldCgpKSwgJnVzZXJEYXRhVG9QYXNz LCBtX2NsaWVudC5jbGllbnRJbmZvKTsKKyAgICBXS0J1bmRsZVBhZ2VQb2xpY3lBY3Rpb24gcG9s aWN5ID0gbV9jbGllbnQuZGVjaWRlUG9saWN5Rm9yTUlNRVR5cGUodG9BUEkocGFnZSksIHRvQVBJ KGZyYW1lKSwgdG9BUEkoTUlNRVR5cGUuaW1wbCgpKSwgdG9BUEkocmVxdWVzdC5nZXQoKSksICZ1 c2VyRGF0YVRvUGFzcywgbV9jbGllbnQuY2xpZW50SW5mbyk7CiAgICAgdXNlckRhdGEgPSBhZG9w dFJlZih0b0ltcGwodXNlckRhdGFUb1Bhc3MpKTsKKyAgICByZXR1cm4gcG9saWN5OwogfQogCiB9 IC8vIG5hbWVzcGFjZSBXZWJLaXQKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvSW5q ZWN0ZWRCdW5kbGUvSW5qZWN0ZWRCdW5kbGVQYWdlUG9saWN5Q2xpZW50LmgKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9JbmplY3RlZEJ1bmRsZS9JbmplY3RlZEJ1bmRs ZVBhZ2VQb2xpY3lDbGllbnQuaAkocmV2aXNpb24gODAyNjEpCisrKyBTb3VyY2UvV2ViS2l0Mi9X ZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL0luamVjdGVkQnVuZGxlUGFnZVBvbGljeUNsaWVudC5o CSh3b3JraW5nIGNvcHkpCkBAIC00Myw5ICs0Myw5IEBAIGNsYXNzIFdlYlBhZ2U7CiAKIGNsYXNz IEluamVjdGVkQnVuZGxlUGFnZVBvbGljeUNsaWVudCA6IHB1YmxpYyBBUElDbGllbnQ8V0tCdW5k bGVQYWdlUG9saWN5Q2xpZW50PiB7CiBwdWJsaWM6Ci0gICAgdm9pZCBkZWNpZGVQb2xpY3lGb3JO YXZpZ2F0aW9uQWN0aW9uKFdlYlBhZ2UqLCBXZWJGcmFtZSosIEluamVjdGVkQnVuZGxlTmF2aWdh dGlvbkFjdGlvbiosIGNvbnN0IFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdCYsIFJlZlB0cjxBUElP YmplY3Q+JiB1c2VyRGF0YSk7Ci0gICAgdm9pZCBkZWNpZGVQb2xpY3lGb3JOZXdXaW5kb3dBY3Rp b24oV2ViUGFnZSosIFdlYkZyYW1lKiwgSW5qZWN0ZWRCdW5kbGVOYXZpZ2F0aW9uQWN0aW9uKiwg Y29uc3QgV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0JiwgY29uc3QgU3RyaW5nJiBmcmFtZU5hbWUs IFJlZlB0cjxBUElPYmplY3Q+JiB1c2VyRGF0YSk7Ci0gICAgdm9pZCBkZWNpZGVQb2xpY3lGb3JN SU1FVHlwZShXZWJQYWdlKiwgV2ViRnJhbWUqLCBjb25zdCBTdHJpbmcmIE1JTUVUeXBlLCBjb25z dCBXZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3QmLCBSZWZQdHI8QVBJT2JqZWN0PiYgdXNlckRhdGEp OworICAgIFdLQnVuZGxlUGFnZVBvbGljeUFjdGlvbiBkZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9u QWN0aW9uKFdlYlBhZ2UqLCBXZWJGcmFtZSosIEluamVjdGVkQnVuZGxlTmF2aWdhdGlvbkFjdGlv biosIGNvbnN0IFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdCYsIFJlZlB0cjxBUElPYmplY3Q+JiB1 c2VyRGF0YSk7CisgICAgV0tCdW5kbGVQYWdlUG9saWN5QWN0aW9uIGRlY2lkZVBvbGljeUZvck5l d1dpbmRvd0FjdGlvbihXZWJQYWdlKiwgV2ViRnJhbWUqLCBJbmplY3RlZEJ1bmRsZU5hdmlnYXRp b25BY3Rpb24qLCBjb25zdCBXZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3QmLCBjb25zdCBTdHJpbmcm IGZyYW1lTmFtZSwgUmVmUHRyPEFQSU9iamVjdD4mIHVzZXJEYXRhKTsKKyAgICBXS0J1bmRsZVBh Z2VQb2xpY3lBY3Rpb24gZGVjaWRlUG9saWN5Rm9yTUlNRVR5cGUoV2ViUGFnZSosIFdlYkZyYW1l KiwgY29uc3QgU3RyaW5nJiBNSU1FVHlwZSwgY29uc3QgV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0 JiwgUmVmUHRyPEFQSU9iamVjdD4mIHVzZXJEYXRhKTsKIH07CiAKIH0gLy8gbmFtZXNwYWNlIFdl YktpdApJbmRleDogU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9JbmplY3RlZEJ1bmRsZS9BUEkv Yy9XS0J1bmRsZVBhZ2UuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNz L0luamVjdGVkQnVuZGxlL0FQSS9jL1dLQnVuZGxlUGFnZS5oCShyZXZpc2lvbiA4MDI2MSkKKysr IFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUvQVBJL2MvV0tCdW5kbGVQ YWdlLmgJKHdvcmtpbmcgY29weSkKQEAgLTExNCwxMCArMTE0LDE3IEBAIHN0cnVjdCBXS0J1bmRs ZVBhZ2VMb2FkZXJDbGllbnQgewogfTsKIHR5cGVkZWYgc3RydWN0IFdLQnVuZGxlUGFnZUxvYWRl ckNsaWVudCBXS0J1bmRsZVBhZ2VMb2FkZXJDbGllbnQ7CiAKK2VudW0geworICAgIFdLQnVuZGxl UGFnZVBvbGljeUFjdGlvblBhc3NUaHJvdWdoLAorICAgIFdLQnVuZGxlUGFnZVBvbGljeUFjdGlv blVzZQorfTsKK3R5cGVkZWYgdWludDMyX3QgV0tCdW5kbGVQYWdlUG9saWN5QWN0aW9uOworCisg ICAgCiAvLyBQb2xpY3kgQ2xpZW50Ci10eXBlZGVmIHZvaWQgKCpXS0J1bmRsZVBhZ2VEZWNpZGVQ b2xpY3lGb3JOYXZpZ2F0aW9uQWN0aW9uQ2FsbGJhY2spKFdLQnVuZGxlUGFnZVJlZiBwYWdlLCBX S0J1bmRsZUZyYW1lUmVmIGZyYW1lLCBXS0J1bmRsZU5hdmlnYXRpb25BY3Rpb25SZWYgbmF2aWdh dGlvbkFjdGlvbiwgV0tVUkxSZXF1ZXN0UmVmIHJlcXVlc3QsIFdLVHlwZVJlZiogdXNlckRhdGEs IGNvbnN0IHZvaWQqIGNsaWVudEluZm8pOwotdHlwZWRlZiB2b2lkICgqV0tCdW5kbGVQYWdlRGVj aWRlUG9saWN5Rm9yTmV3V2luZG93QWN0aW9uQ2FsbGJhY2spKFdLQnVuZGxlUGFnZVJlZiBwYWdl LCBXS0J1bmRsZUZyYW1lUmVmIGZyYW1lLCBXS0J1bmRsZU5hdmlnYXRpb25BY3Rpb25SZWYgbmF2 aWdhdGlvbkFjdGlvbiwgV0tVUkxSZXF1ZXN0UmVmIHJlcXVlc3QsIFdLU3RyaW5nUmVmIGZyYW1l TmFtZSwgV0tUeXBlUmVmKiB1c2VyRGF0YSwgY29uc3Qgdm9pZCogY2xpZW50SW5mbyk7Ci10eXBl ZGVmIHZvaWQgKCpXS0J1bmRsZVBhZ2VEZWNpZGVQb2xpY3lGb3JNSU1FVHlwZUNhbGxiYWNrKShX S0J1bmRsZVBhZ2VSZWYgcGFnZSwgV0tCdW5kbGVGcmFtZVJlZiBmcmFtZSwgIFdLU3RyaW5nUmVm IE1JTUVUeXBlLCBXS1VSTFJlcXVlc3RSZWYgcmVxdWVzdCwgV0tUeXBlUmVmKiB1c2VyRGF0YSwg Y29uc3Qgdm9pZCogY2xpZW50SW5mbyk7Cit0eXBlZGVmIFdLQnVuZGxlUGFnZVBvbGljeUFjdGlv biAoKldLQnVuZGxlUGFnZURlY2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rpb25DYWxsYmFjayko V0tCdW5kbGVQYWdlUmVmIHBhZ2UsIFdLQnVuZGxlRnJhbWVSZWYgZnJhbWUsIFdLQnVuZGxlTmF2 aWdhdGlvbkFjdGlvblJlZiBuYXZpZ2F0aW9uQWN0aW9uLCBXS1VSTFJlcXVlc3RSZWYgcmVxdWVz dCwgV0tUeXBlUmVmKiB1c2VyRGF0YSwgY29uc3Qgdm9pZCogY2xpZW50SW5mbyk7Cit0eXBlZGVm IFdLQnVuZGxlUGFnZVBvbGljeUFjdGlvbiAoKldLQnVuZGxlUGFnZURlY2lkZVBvbGljeUZvck5l d1dpbmRvd0FjdGlvbkNhbGxiYWNrKShXS0J1bmRsZVBhZ2VSZWYgcGFnZSwgV0tCdW5kbGVGcmFt ZVJlZiBmcmFtZSwgV0tCdW5kbGVOYXZpZ2F0aW9uQWN0aW9uUmVmIG5hdmlnYXRpb25BY3Rpb24s IFdLVVJMUmVxdWVzdFJlZiByZXF1ZXN0LCBXS1N0cmluZ1JlZiBmcmFtZU5hbWUsIFdLVHlwZVJl ZiogdXNlckRhdGEsIGNvbnN0IHZvaWQqIGNsaWVudEluZm8pOwordHlwZWRlZiBXS0J1bmRsZVBh Z2VQb2xpY3lBY3Rpb24gKCpXS0J1bmRsZVBhZ2VEZWNpZGVQb2xpY3lGb3JNSU1FVHlwZUNhbGxi YWNrKShXS0J1bmRsZVBhZ2VSZWYgcGFnZSwgV0tCdW5kbGVGcmFtZVJlZiBmcmFtZSwgIFdLU3Ry aW5nUmVmIE1JTUVUeXBlLCBXS1VSTFJlcXVlc3RSZWYgcmVxdWVzdCwgV0tUeXBlUmVmKiB1c2Vy RGF0YSwgY29uc3Qgdm9pZCogY2xpZW50SW5mbyk7CiAKIHN0cnVjdCBXS0J1bmRsZVBhZ2VQb2xp Y3lDbGllbnQgewogICAgIGludCAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgdmVyc2lvbjsKSW5kZXg6IFNvdXJjZS9XZWJLaXQy L1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQuY3BwCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViRnJh bWVMb2FkZXJDbGllbnQuY3BwCShyZXZpc2lvbiA4MDI2MSkKKysrIFNvdXJjZS9XZWJLaXQyL1dl YlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQuY3BwCSh3b3JraW5n IGNvcHkpCkBAIC01ODcsNyArNTg3LDExIEBAIHZvaWQgV2ViRnJhbWVMb2FkZXJDbGllbnQ6OmRp c3BhdGNoRGVjaWQKICAgICBSZWZQdHI8QVBJT2JqZWN0PiB1c2VyRGF0YTsKIAogICAgIC8vIE5v dGlmeSB0aGUgYnVuZGxlIGNsaWVudC4KLSAgICB3ZWJQYWdlLT5pbmplY3RlZEJ1bmRsZVBvbGlj eUNsaWVudCgpLmRlY2lkZVBvbGljeUZvck1JTUVUeXBlKHdlYlBhZ2UsIG1fZnJhbWUsIE1JTUVU eXBlLCByZXF1ZXN0LCB1c2VyRGF0YSk7CisgICAgV0tCdW5kbGVQYWdlUG9saWN5QWN0aW9uIHBv bGljeSA9IHdlYlBhZ2UtPmluamVjdGVkQnVuZGxlUG9saWN5Q2xpZW50KCkuZGVjaWRlUG9saWN5 Rm9yTUlNRVR5cGUod2ViUGFnZSwgbV9mcmFtZSwgTUlNRVR5cGUsIHJlcXVlc3QsIHVzZXJEYXRh KTsKKyAgICBpZiAocG9saWN5ID09IFdLQnVuZGxlUGFnZVBvbGljeUFjdGlvblVzZSkgeworICAg ICAgICAobV9mcmFtZS0+Y29yZUZyYW1lKCktPmxvYWRlcigpLT5wb2xpY3lDaGVja2VyKCktPipm dW5jdGlvbikoUG9saWN5VXNlKTsKKyAgICAgICAgcmV0dXJuOworICAgIH0KIAogICAgIHVpbnQ2 NF90IGxpc3RlbmVySUQgPSBtX2ZyYW1lLT5zZXRVcFBvbGljeUxpc3RlbmVyKGZ1bmN0aW9uKTsK ICAgICBib29sIHJlY2VpdmVkUG9saWN5QWN0aW9uOwpAQCAtNjE0LDcgKzYxOCwxMSBAQCB2b2lk IFdlYkZyYW1lTG9hZGVyQ2xpZW50OjpkaXNwYXRjaERlY2lkCiAgICAgUmVmUHRyPEluamVjdGVk QnVuZGxlTmF2aWdhdGlvbkFjdGlvbj4gYWN0aW9uID0gSW5qZWN0ZWRCdW5kbGVOYXZpZ2F0aW9u QWN0aW9uOjpjcmVhdGUobV9mcmFtZSwgbmF2aWdhdGlvbkFjdGlvbiwgZm9ybVN0YXRlKTsKIAog ICAgIC8vIE5vdGlmeSB0aGUgYnVuZGxlIGNsaWVudC4KLSAgICB3ZWJQYWdlLT5pbmplY3RlZEJ1 bmRsZVBvbGljeUNsaWVudCgpLmRlY2lkZVBvbGljeUZvck5ld1dpbmRvd0FjdGlvbih3ZWJQYWdl LCBtX2ZyYW1lLCBhY3Rpb24uZ2V0KCksIHJlcXVlc3QsIGZyYW1lTmFtZSwgdXNlckRhdGEpOwor ICAgIFdLQnVuZGxlUGFnZVBvbGljeUFjdGlvbiBwb2xpY3kgPSB3ZWJQYWdlLT5pbmplY3RlZEJ1 bmRsZVBvbGljeUNsaWVudCgpLmRlY2lkZVBvbGljeUZvck5ld1dpbmRvd0FjdGlvbih3ZWJQYWdl LCBtX2ZyYW1lLCBhY3Rpb24uZ2V0KCksIHJlcXVlc3QsIGZyYW1lTmFtZSwgdXNlckRhdGEpOwor ICAgIGlmIChwb2xpY3kgPT0gV0tCdW5kbGVQYWdlUG9saWN5QWN0aW9uVXNlKSB7CisgICAgICAg IChtX2ZyYW1lLT5jb3JlRnJhbWUoKS0+bG9hZGVyKCktPnBvbGljeUNoZWNrZXIoKS0+KmZ1bmN0 aW9uKShQb2xpY3lVc2UpOworICAgICAgICByZXR1cm47CisgICAgfQogCiAKICAgICB1aW50NjRf dCBsaXN0ZW5lcklEID0gbV9mcmFtZS0+c2V0VXBQb2xpY3lMaXN0ZW5lcihmdW5jdGlvbik7CkBA IC02NDAsNyArNjQ4LDExIEBAIHZvaWQgV2ViRnJhbWVMb2FkZXJDbGllbnQ6OmRpc3BhdGNoRGVj aWQKICAgICBSZWZQdHI8SW5qZWN0ZWRCdW5kbGVOYXZpZ2F0aW9uQWN0aW9uPiBhY3Rpb24gPSBJ bmplY3RlZEJ1bmRsZU5hdmlnYXRpb25BY3Rpb246OmNyZWF0ZShtX2ZyYW1lLCBuYXZpZ2F0aW9u QWN0aW9uLCBmb3JtU3RhdGUpOwogCiAgICAgLy8gTm90aWZ5IHRoZSBidW5kbGUgY2xpZW50Lgot ICAgIHdlYlBhZ2UtPmluamVjdGVkQnVuZGxlUG9saWN5Q2xpZW50KCkuZGVjaWRlUG9saWN5Rm9y TmF2aWdhdGlvbkFjdGlvbih3ZWJQYWdlLCBtX2ZyYW1lLCBhY3Rpb24uZ2V0KCksIHJlcXVlc3Qs IHVzZXJEYXRhKTsKKyAgICBXS0J1bmRsZVBhZ2VQb2xpY3lBY3Rpb24gcG9saWN5ID0gd2ViUGFn ZS0+aW5qZWN0ZWRCdW5kbGVQb2xpY3lDbGllbnQoKS5kZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9u QWN0aW9uKHdlYlBhZ2UsIG1fZnJhbWUsIGFjdGlvbi5nZXQoKSwgcmVxdWVzdCwgdXNlckRhdGEp OworICAgIGlmIChwb2xpY3kgPT0gV0tCdW5kbGVQYWdlUG9saWN5QWN0aW9uVXNlKSB7CisgICAg ICAgIChtX2ZyYW1lLT5jb3JlRnJhbWUoKS0+bG9hZGVyKCktPnBvbGljeUNoZWNrZXIoKS0+KmZ1 bmN0aW9uKShQb2xpY3lVc2UpOworICAgICAgICByZXR1cm47CisgICAgfQogCiAgICAgdWludDY0 X3QgbGlzdGVuZXJJRCA9IG1fZnJhbWUtPnNldFVwUG9saWN5TGlzdGVuZXIoZnVuY3Rpb24pOwog ICAgIGJvb2wgcmVjZWl2ZWRQb2xpY3lBY3Rpb247Cg==