36635 2010-03-25 17:55:11 -0700 Move apply_patch from scm to checkout 2010-03-25 22:32:22 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 abarth webkit-unassigned commit-queue eric oldest_to_newest 204350 0 abarth 2010-03-25 17:55:11 -0700 Move apply_patch from scm to checkout 204351 1 51703 abarth 2010-03-25 17:56:01 -0700 Created attachment 51703 Patch 204353 2 51703 eric 2010-03-25 17:57:32 -0700 Comment on attachment 51703 Patch Eeek. That's ugly. I guess that's better though. 204412 3 abarth 2010-03-25 22:32:22 -0700 Committed r56600: <http://trac.webkit.org/changeset/56600> 51703 2010-03-25 17:56:01 -0700 2010-03-25 22:26:38 -0700 Patch bug-36635-20100325175600.patch text/plain 12497 abarth ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCA5NmNhMGU0Li42ZWQ3OWJhIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0yLDYgKzIsMjEgQEAKIAogICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KIAorICAgICAgICBNb3ZlIGFwcGx5X3BhdGNo IGZyb20gc2NtIHRvIGNoZWNrb3V0CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0zNjYzNQorCisgICAgICAgIFNDTSBzaG91bGRuJ3QgaGF2ZSBhbnkga25v d2xlZGdlIG9mIFdlYktpdCBzY3JpcHRzLgorCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9j b21tb24vY2hlY2tvdXQvYXBpLnB5OgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvY29tbW9u L2NoZWNrb3V0L3NjbS5weToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVj a291dC9zY21fdW5pdHRlc3QucHk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS90b29sL21v Y2t0b29sLnB5OgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvdG9vbC9zdGVwcy9hcHBseXBh dGNoLnB5OgorCisyMDEwLTAzLTI1ICBBZGFtIEJhcnRoICA8YWJhcnRoQHdlYmtpdC5vcmc+CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKICAgICAgICAgTW92ZSBjb21t aXRfbWVzc2FnZV9mb3JfdGhpc19jb21taXQgZnJvbSBzY20gdG8gY2hlY2tvdXQKICAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM2NjI5CiAKZGlmZiAtLWdp dCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L2FwaS5weSBi L1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L2FwaS5weQppbmRl eCBmMzlhMTIyLi4wNGIyZjk3IDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtp dHB5L2NvbW1vbi9jaGVja291dC9hcGkucHkKKysrIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJr aXRweS9jb21tb24vY2hlY2tvdXQvYXBpLnB5CkBAIC0yNiw5ICsyNiwxMSBAQAogIyAoSU5DTFVE SU5HIE5FR0xJR0VOQ0UgT1IgT1RIRVJXSVNFKSBBUklTSU5HIElOIEFOWSBXQVkgT1VUIE9GIFRI RSBVU0UKICMgT0YgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GIFRIRSBQT1NTSUJJ TElUWSBPRiBTVUNIIERBTUFHRS4KIAoraW1wb3J0IHN1YnByb2Nlc3MKKwogZnJvbSB3ZWJraXRw eS5jb21tb24uY2hlY2tvdXQuY29tbWl0aW5mbyBpbXBvcnQgQ29tbWl0SW5mbwogZnJvbSB3ZWJr aXRweS5jb21tb24uY2hlY2tvdXQuY2hhbmdlbG9nIGltcG9ydCBDaGFuZ2VMb2cKLWZyb20gd2Vi a2l0cHkuY29tbW9uLnN5c3RlbS5leGVjdXRpdmUgaW1wb3J0IFNjcmlwdEVycm9yCitmcm9tIHdl YmtpdHB5LmNvbW1vbi5zeXN0ZW0uZXhlY3V0aXZlIGltcG9ydCBFeGVjdXRpdmUsIHJ1bl9jb21t YW5kLCBTY3JpcHRFcnJvcgogZnJvbSB3ZWJraXRweS5jb21tb24uc3lzdGVtLmRlcHJlY2F0ZWRf bG9nZ2luZyBpbXBvcnQgbG9nCiAKIApAQCAtNjMsMyArNjUsMTcgQEAgY2xhc3MgQ2hlY2tvdXQo b2JqZWN0KToKIAogICAgICAgICAjIEZJWE1FOiBXZSBzaG91bGQgc29ydCBhbmQgbGFiZWwgdGhl IENoYW5nZUxvZyBtZXNzYWdlcyBsaWtlIGNvbW1pdC1sb2ctZWRpdG9yIGRvZXMuCiAgICAgICAg IHJldHVybiBDb21taXRNZXNzYWdlKCIiLmpvaW4oY2hhbmdlbG9nX21lc3NhZ2VzKS5zcGxpdGxp bmVzKCkpCisKKyAgICBkZWYgYXBwbHlfcGF0Y2goc2VsZiwgcGF0Y2gsIGZvcmNlPUZhbHNlKToK KyAgICAgICAgIyBJdCdzIHBvc3NpYmxlIHRoYXQgdGhlIHBhdGNoIHdhcyBub3QgbWFkZSBmcm9t IHRoZSByb290IGRpcmVjdG9yeS4KKyAgICAgICAgIyBXZSBzaG91bGQgZGV0ZWN0IGFuZCBoYW5k bGUgdGhhdCBjYXNlLgorICAgICAgICAjIEZJWE1FOiBVc2UgRXhlY3V0aXZlIGluc3RlYWQgb2Yg c3VicHJvY2VzcyBoZXJlLgorICAgICAgICBjdXJsX3Byb2Nlc3MgPSBzdWJwcm9jZXNzLlBvcGVu KFsnY3VybCcsICctLWxvY2F0aW9uJywgJy0tc2lsZW50JywgJy0tc2hvdy1lcnJvcicsIHBhdGNo LnVybCgpXSwgc3Rkb3V0PXN1YnByb2Nlc3MuUElQRSkKKyAgICAgICAgIyBGSVhNRTogTW92ZSBf c2NtLnNjcmlwdF9wYXRoIGhlcmUgb25jZSB3ZSBnZXQgcmlkIG9mIGFsbCB0aGUgZGVwZW5kZW5j aWVzLgorICAgICAgICBhcmdzID0gW3NlbGYuX3NjbS5zY3JpcHRfcGF0aCgnc3ZuLWFwcGx5Jyld CisgICAgICAgIGlmIHBhdGNoLnJldmlld2VyKCk6CisgICAgICAgICAgICBhcmdzICs9IFsnLS1y ZXZpZXdlcicsIHBhdGNoLnJldmlld2VyKCkuZnVsbF9uYW1lXQorICAgICAgICBpZiBmb3JjZToK KyAgICAgICAgICAgIGFyZ3MuYXBwZW5kKCctLWZvcmNlJykKKworICAgICAgICBydW5fY29tbWFu ZChhcmdzLCBpbnB1dD1jdXJsX3Byb2Nlc3Muc3Rkb3V0KQpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9v bHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvc2NtLnB5IGIvV2ViS2l0VG9vbHMv U2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvc2NtLnB5CmluZGV4IDc0ZDI3ZWIuLjE0 MmIxY2YgMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2No ZWNrb3V0L3NjbS5weQorKysgYi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9j aGVja291dC9zY20ucHkKQEAgLTMxLDcgKzMxLDYgQEAKIAogaW1wb3J0IG9zCiBpbXBvcnQgcmUK LWltcG9ydCBzdWJwcm9jZXNzCiAKIGZyb20gd2Via2l0cHkuY29tbW9uLmNoZWNrb3V0LmNoYW5n ZWxvZyBpbXBvcnQgQ2hhbmdlTG9nLCBpc19wYXRoX3RvX2NoYW5nZWxvZwogZnJvbSB3ZWJraXRw eS5jb21tb24uc3lzdGVtLmV4ZWN1dGl2ZSBpbXBvcnQgRXhlY3V0aXZlLCBydW5fY29tbWFuZCwg U2NyaXB0RXJyb3IKQEAgLTEyMCwxOSArMTE5LDYgQEAgY2xhc3MgU0NNOgogICAgICAgICAgICAg ZXJyb3IoIldvcmtpbmcgZGlyZWN0b3J5IGhhcyBsb2NhbCBjb21taXRzLCBwYXNzIC0tZm9yY2Ut Y2xlYW4gdG8gY29udGludWUuIikKICAgICAgICAgc2VsZi5kaXNjYXJkX2xvY2FsX2NvbW1pdHMo KQogCi0gICAgZGVmIGFwcGx5X3BhdGNoKHNlbGYsIHBhdGNoLCBmb3JjZT1GYWxzZSk6Ci0gICAg ICAgICMgSXQncyBwb3NzaWJsZSB0aGF0IHRoZSBwYXRjaCB3YXMgbm90IG1hZGUgZnJvbSB0aGUg cm9vdCBkaXJlY3RvcnkuCi0gICAgICAgICMgV2Ugc2hvdWxkIGRldGVjdCBhbmQgaGFuZGxlIHRo YXQgY2FzZS4KLSAgICAgICAgIyBGSVhNRTogc2NtLnB5IHNob3VsZCBub3QgZGVhbCB3aXRoIGZl dGNoaW5nIEF0dGFjaG1lbnQgZGF0YS4gIEF0dGFjaG1lbnQgc2hvdWxkIGp1c3QgaGF2ZSBhIC5k YXRhKCkgYWNjZXNzb3IuCi0gICAgICAgIGN1cmxfcHJvY2VzcyA9IHN1YnByb2Nlc3MuUG9wZW4o WydjdXJsJywgJy0tbG9jYXRpb24nLCAnLS1zaWxlbnQnLCAnLS1zaG93LWVycm9yJywgcGF0Y2gu dXJsKCldLCBzdGRvdXQ9c3VicHJvY2Vzcy5QSVBFKQotICAgICAgICBhcmdzID0gW3NlbGYuc2Ny aXB0X3BhdGgoJ3N2bi1hcHBseScpXQotICAgICAgICBpZiBwYXRjaC5yZXZpZXdlcigpOgotICAg ICAgICAgICAgYXJncyArPSBbJy0tcmV2aWV3ZXInLCBwYXRjaC5yZXZpZXdlcigpLmZ1bGxfbmFt ZV0KLSAgICAgICAgaWYgZm9yY2U6Ci0gICAgICAgICAgICBhcmdzLmFwcGVuZCgnLS1mb3JjZScp Ci0KLSAgICAgICAgcnVuX2NvbW1hbmQoYXJncywgaW5wdXQ9Y3VybF9wcm9jZXNzLnN0ZG91dCkK LQogICAgIGRlZiBydW5fc3RhdHVzX2FuZF9leHRyYWN0X2ZpbGVuYW1lcyhzZWxmLCBzdGF0dXNf Y29tbWFuZCwgc3RhdHVzX3JlZ2V4cCk6CiAgICAgICAgIGZpbGVuYW1lcyA9IFtdCiAgICAgICAg IGZvciBsaW5lIGluIHJ1bl9jb21tYW5kKHN0YXR1c19jb21tYW5kKS5zcGxpdGxpbmVzKCk6CmRp ZmYgLS1naXQgYS9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9z Y21fdW5pdHRlc3QucHkgYi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVj a291dC9zY21fdW5pdHRlc3QucHkKaW5kZXggNWJkZjM0MS4uOWI1ZDgxMiAxMDA2NDQKLS0tIGEv V2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvc2NtX3VuaXR0ZXN0 LnB5CisrKyBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L3Nj bV91bml0dGVzdC5weQpAQCAtMzksNiArMzksNyBAQCBpbXBvcnQgdW5pdHRlc3QKIGltcG9ydCB1 cmxsaWIKIAogZnJvbSBkYXRldGltZSBpbXBvcnQgZGF0ZQorZnJvbSB3ZWJraXRweS5jb21tb24u Y2hlY2tvdXQuYXBpIGltcG9ydCBDaGVja291dAogZnJvbSB3ZWJraXRweS5jb21tb24uY2hlY2tv dXQuc2NtIGltcG9ydCBkZXRlY3Rfc2NtX3N5c3RlbSwgU0NNLCBTVk4sIENoZWNrb3V0TmVlZHNV cGRhdGUsIGNvbW1pdF9lcnJvcl9oYW5kbGVyCiBmcm9tIHdlYmtpdHB5LmNvbW1vbi5uZXQuYnVn emlsbGEgaW1wb3J0IEF0dGFjaG1lbnQgIyBGSVhNRTogVGhpcyBzaG91bGQgbm90IGJlIG5lZWRl ZAogZnJvbSB3ZWJraXRweS5jb21tb24uc3lzdGVtLmV4ZWN1dGl2ZSBpbXBvcnQgRXhlY3V0aXZl LCBydW5fY29tbWFuZCwgU2NyaXB0RXJyb3IKQEAgLTI1NCwxNCArMjU1LDE0IEBAIGxpdGVyYWwg MAogSGNtVj9kMDAwMDEKIAogIiIiCi0gICAgICAgIHNlbGYuc2NtLmFwcGx5X3BhdGNoKHNlbGYu X2NyZWF0ZV9wYXRjaChnaXRfYmluYXJ5X2FkZGl0aW9uKSkKKyAgICAgICAgc2VsZi5jaGVja291 dC5hcHBseV9wYXRjaChzZWxmLl9jcmVhdGVfcGF0Y2goZ2l0X2JpbmFyeV9hZGRpdGlvbikpCiAg ICAgICAgIGFkZGVkID0gcmVhZF9mcm9tX3BhdGgoJ2ZpenpidXp6Ny5naWYnKQogICAgICAgICBz ZWxmLmFzc2VydEVxdWFsKDUxMiwgbGVuKGFkZGVkKSkKICAgICAgICAgc2VsZi5hc3NlcnRUcnVl KGFkZGVkLnN0YXJ0c3dpdGgoJ0dJRjg5YScpKQogICAgICAgICBzZWxmLmFzc2VydFRydWUoJ2Zp enpidXp6Ny5naWYnIGluIHNlbGYuc2NtLmNoYW5nZWRfZmlsZXMoKSkKIAogICAgICAgICAjIFRo ZSBmaWxlIGFscmVhZHkgZXhpc3RzLgotICAgICAgICBzZWxmLmFzc2VydFJhaXNlcyhTY3JpcHRF cnJvciwgc2VsZi5zY20uYXBwbHlfcGF0Y2gsIHNlbGYuX2NyZWF0ZV9wYXRjaChnaXRfYmluYXJ5 X2FkZGl0aW9uKSkKKyAgICAgICAgc2VsZi5hc3NlcnRSYWlzZXMoU2NyaXB0RXJyb3IsIHNlbGYu Y2hlY2tvdXQuYXBwbHlfcGF0Y2gsIHNlbGYuX2NyZWF0ZV9wYXRjaChnaXRfYmluYXJ5X2FkZGl0 aW9uKSkKIAogICAgICAgICBnaXRfYmluYXJ5X21vZGlmaWNhdGlvbiA9ICIiImRpZmYgLS1naXQg YS9maXp6YnV6ejcuZ2lmIGIvZml6emJ1eno3LmdpZgogaW5kZXggNjRhOTUzMmU3Nzk0ZmNkNzkx ZjZmMTIxNTc0MDZkOTA2MDE1MTY5MC4uMzIzZmFlMDNmNDYwNmVhOTk5MWRmOGJlZmJiMmZjYTcK QEAgLTI4MiwxMyArMjgzLDEzIEBAIHp7ODlJfFdQeUQhKk0/Z3Y/cWA7TD0yWUZlWHJKUU50aTQ/ fXMhekZvPTVDemVCeEM2OXhBPHpyalA8d1VjQ1JoNAogcHRVbC1aRzwlYX4jTHdrSVd2JnEhS1ND SDd0UThjSkRpdyt8R1Y/TU4pUmpZNTBSVGIteHZUJkgKIAogIiIiCi0gICAgICAgIHNlbGYuc2Nt LmFwcGx5X3BhdGNoKHNlbGYuX2NyZWF0ZV9wYXRjaChnaXRfYmluYXJ5X21vZGlmaWNhdGlvbikp CisgICAgICAgIHNlbGYuY2hlY2tvdXQuYXBwbHlfcGF0Y2goc2VsZi5fY3JlYXRlX3BhdGNoKGdp dF9iaW5hcnlfbW9kaWZpY2F0aW9uKSkKICAgICAgICAgbW9kaWZpZWQgPSByZWFkX2Zyb21fcGF0 aCgnZml6emJ1eno3LmdpZicpCiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoJ2Zvb2JhclxuJywg bW9kaWZpZWQpCiAgICAgICAgIHNlbGYuYXNzZXJ0VHJ1ZSgnZml6emJ1eno3LmdpZicgaW4gc2Vs Zi5zY20uY2hhbmdlZF9maWxlcygpKQogCiAgICAgICAgICMgQXBwbHlpbmcgdGhlIHNhbWUgbW9k aWZpY2F0aW9uIHNob3VsZCBmYWlsLgotICAgICAgICBzZWxmLmFzc2VydFJhaXNlcyhTY3JpcHRF cnJvciwgc2VsZi5zY20uYXBwbHlfcGF0Y2gsIHNlbGYuX2NyZWF0ZV9wYXRjaChnaXRfYmluYXJ5 X21vZGlmaWNhdGlvbikpCisgICAgICAgIHNlbGYuYXNzZXJ0UmFpc2VzKFNjcmlwdEVycm9yLCBz ZWxmLmNoZWNrb3V0LmFwcGx5X3BhdGNoLCBzZWxmLl9jcmVhdGVfcGF0Y2goZ2l0X2JpbmFyeV9t b2RpZmljYXRpb24pKQogCiAgICAgICAgIGdpdF9iaW5hcnlfZGVsZXRpb24gPSAiIiJkaWZmIC0t Z2l0IGEvZml6emJ1eno3LmdpZiBiL2ZpenpidXp6Ny5naWYKIGRlbGV0ZWQgZmlsZSBtb2RlIDEw MDY0NApAQCAtMzAxLDEyICszMDIsMTIgQEAgbGl0ZXJhbCA3CiBPY21ZZXgmcmVEJDtzTzgqRjlM KUIKIAogIiIiCi0gICAgICAgIHNlbGYuc2NtLmFwcGx5X3BhdGNoKHNlbGYuX2NyZWF0ZV9wYXRj aChnaXRfYmluYXJ5X2RlbGV0aW9uKSkKKyAgICAgICAgc2VsZi5jaGVja291dC5hcHBseV9wYXRj aChzZWxmLl9jcmVhdGVfcGF0Y2goZ2l0X2JpbmFyeV9kZWxldGlvbikpCiAgICAgICAgIHNlbGYu YXNzZXJ0RmFsc2Uob3MucGF0aC5leGlzdHMoJ2ZpenpidXp6Ny5naWYnKSkKICAgICAgICAgc2Vs Zi5hc3NlcnRGYWxzZSgnZml6emJ1eno3LmdpZicgaW4gc2VsZi5zY20uY2hhbmdlZF9maWxlcygp KQogCiAgICAgICAgICMgQ2Fubm90IGRlbGV0ZSBhZ2Fpbi4KLSAgICAgICAgc2VsZi5hc3NlcnRS YWlzZXMoU2NyaXB0RXJyb3IsIHNlbGYuc2NtLmFwcGx5X3BhdGNoLCBzZWxmLl9jcmVhdGVfcGF0 Y2goZ2l0X2JpbmFyeV9kZWxldGlvbikpCisgICAgICAgIHNlbGYuYXNzZXJ0UmFpc2VzKFNjcmlw dEVycm9yLCBzZWxmLmNoZWNrb3V0LmFwcGx5X3BhdGNoLCBzZWxmLl9jcmVhdGVfcGF0Y2goZ2l0 X2JpbmFyeV9kZWxldGlvbikpCiAKIAogY2xhc3MgU1ZOVGVzdChTQ01UZXN0KToKQEAgLTQwMSwx MiArNDAyLDEyIEBAIGNsYXNzIFNWTlRlc3QoU0NNVGVzdCk6CiAgICAgICAgIHJ1bl9jb21tYW5k KFsnc3ZuJywgJ2NvbW1pdCcsICctLXF1aWV0JywgJy0tbWVzc2FnZScsICdJbnRlcm1lZGlhdGUg Y29tbWl0J10pCiAKICAgICAgICAgc2VsZi5fc2V0dXBfd2Via2l0dG9vbHNfc2NyaXB0c19zeW1s aW5rKHNlbGYuc2NtKQotICAgICAgICBzZWxmLnNjbS5hcHBseV9wYXRjaChzZWxmLl9jcmVhdGVf cGF0Y2gob25lX2xpbmVfb3ZlcmxhcF9wYXRjaCkpCisgICAgICAgIHNlbGYuY2hlY2tvdXQuYXBw bHlfcGF0Y2goc2VsZi5fY3JlYXRlX3BhdGNoKG9uZV9saW5lX292ZXJsYXBfcGF0Y2gpKQogICAg ICAgICBleHBlY3RlZF9jaGFuZ2Vsb2dfY29udGVudHMgPSAiJXNcbiVzIiAlIChzZWxmLl9zZXRf ZGF0ZV9hbmRfcmV2aWV3ZXIob25lX2xpbmVfb3ZlcmxhcF9lbnRyeSksIGNoYW5nZWxvZ19jb250 ZW50cykKICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbHMocmVhZF9mcm9tX3BhdGgoJ0NoYW5nZUxv ZycpLCBleHBlY3RlZF9jaGFuZ2Vsb2dfY29udGVudHMpCiAKICAgICAgICAgc2VsZi5zY20ucmV2 ZXJ0X2ZpbGVzKFsnQ2hhbmdlTG9nJ10pCi0gICAgICAgIHNlbGYuc2NtLmFwcGx5X3BhdGNoKHNl bGYuX2NyZWF0ZV9wYXRjaCh0d29fbGluZV9vdmVybGFwX3BhdGNoKSkKKyAgICAgICAgc2VsZi5j aGVja291dC5hcHBseV9wYXRjaChzZWxmLl9jcmVhdGVfcGF0Y2godHdvX2xpbmVfb3ZlcmxhcF9w YXRjaCkpCiAgICAgICAgIGV4cGVjdGVkX2NoYW5nZWxvZ19jb250ZW50cyA9ICIlc1xuJXMiICUg KHNlbGYuX3NldF9kYXRlX2FuZF9yZXZpZXdlcih0d29fbGluZV9vdmVybGFwX2VudHJ5KSwgY2hh bmdlbG9nX2NvbnRlbnRzKQogICAgICAgICBzZWxmLmFzc2VydEVxdWFscyhyZWFkX2Zyb21fcGF0 aCgnQ2hhbmdlTG9nJyksIGV4cGVjdGVkX2NoYW5nZWxvZ19jb250ZW50cykKIApAQCAtNDE0LDYg KzQxNSw4IEBAIGNsYXNzIFNWTlRlc3QoU0NNVGVzdCk6CiAgICAgICAgIFNWTlRlc3RSZXBvc2l0 b3J5LnNldHVwKHNlbGYpCiAgICAgICAgIG9zLmNoZGlyKHNlbGYuc3ZuX2NoZWNrb3V0X3BhdGgp CiAgICAgICAgIHNlbGYuc2NtID0gZGV0ZWN0X3NjbV9zeXN0ZW0oc2VsZi5zdm5fY2hlY2tvdXRf cGF0aCkKKyAgICAgICAgIyBGb3IgaGlzdG9yaWNhbCByZWFzb25zLCB3ZSB0ZXN0IHNvbWUgY2hl Y2tvdXQgY29kZSBoZXJlIHRvby4KKyAgICAgICAgc2VsZi5jaGVja291dCA9IENoZWNrb3V0KHNl bGYuc2NtKQogCiAgICAgZGVmIHRlYXJEb3duKHNlbGYpOgogICAgICAgICBTVk5UZXN0UmVwb3Np dG9yeS50ZWFyX2Rvd24oc2VsZikKQEAgLTQ2Miw3ICs0NjUsNyBAQCBRMWRUQngwQUFBQjQyaXRn NEdsZ1lKakd3TUREeU9ETXhNRHczNEdCZ1FFQUpQUURKQT09CiAgICAgICAgIGV4cGVjdGVkX2Nv bnRlbnRzID0gYmFzZTY0LmI2NGRlY29kZSgiUTFkVEJ4MEFBQUI0Mml0ZzRHbGdZSmpHd01ERHlP RE14TUR3MzRHQmdRRUFKUFFESkE9PSIpCiAgICAgICAgIHNlbGYuX3NldHVwX3dlYmtpdHRvb2xz X3NjcmlwdHNfc3ltbGluayhzZWxmLnNjbSkKICAgICAgICAgcGF0Y2hfZmlsZSA9IHNlbGYuX2Ny ZWF0ZV9wYXRjaChwYXRjaF9jb250ZW50cykKLSAgICAgICAgc2VsZi5zY20uYXBwbHlfcGF0Y2go cGF0Y2hfZmlsZSkKKyAgICAgICAgc2VsZi5jaGVja291dC5hcHBseV9wYXRjaChwYXRjaF9maWxl KQogICAgICAgICBhY3R1YWxfY29udGVudHMgPSByZWFkX2Zyb21fcGF0aCgidGVzdF9maWxlLnN3 ZiIpCiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoYWN0dWFsX2NvbnRlbnRzLCBleHBlY3RlZF9j b250ZW50cykKIApAQCAtNDcwLDEzICs0NzMsMTMgQEAgUTFkVEJ4MEFBQUI0Mml0ZzRHbGdZSmpH d01ERHlPRE14TUR3MzRHQmdRRUFKUFFESkE9PQogICAgICAgICBzY20gPSBkZXRlY3Rfc2NtX3N5 c3RlbShzZWxmLnN2bl9jaGVja291dF9wYXRoKQogICAgICAgICBwYXRjaCA9IHNlbGYuX2NyZWF0 ZV9wYXRjaChydW5fY29tbWFuZChbJ3N2bicsICdkaWZmJywgJy1yNDozJ10pKQogICAgICAgICBz ZWxmLl9zZXR1cF93ZWJraXR0b29sc19zY3JpcHRzX3N5bWxpbmsoc2NtKQotICAgICAgICBzY20u YXBwbHlfcGF0Y2gocGF0Y2gpCisgICAgICAgIENoZWNrb3V0KHNjbSkuYXBwbHlfcGF0Y2gocGF0 Y2gpCiAKICAgICBkZWYgdGVzdF9hcHBseV9zdm5fcGF0Y2hfZm9yY2Uoc2VsZik6CiAgICAgICAg IHNjbSA9IGRldGVjdF9zY21fc3lzdGVtKHNlbGYuc3ZuX2NoZWNrb3V0X3BhdGgpCiAgICAgICAg IHBhdGNoID0gc2VsZi5fY3JlYXRlX3BhdGNoKHJ1bl9jb21tYW5kKFsnc3ZuJywgJ2RpZmYnLCAn LXIyOjQnXSkpCiAgICAgICAgIHNlbGYuX3NldHVwX3dlYmtpdHRvb2xzX3NjcmlwdHNfc3ltbGlu ayhzY20pCi0gICAgICAgIHNlbGYuYXNzZXJ0UmFpc2VzKFNjcmlwdEVycm9yLCBzY20uYXBwbHlf cGF0Y2gsIHBhdGNoLCBmb3JjZT1UcnVlKQorICAgICAgICBzZWxmLmFzc2VydFJhaXNlcyhTY3Jp cHRFcnJvciwgQ2hlY2tvdXQoc2NtKS5hcHBseV9wYXRjaCwgcGF0Y2gsIGZvcmNlPVRydWUpCiAK ICAgICBkZWYgdGVzdF9jb21taXRfbG9ncyhzZWxmKToKICAgICAgICAgIyBDb21taXRzIGhhdmUg ZGF0ZXMgYW5kIHVzZXJuYW1lcyBpbiB0aGVtLCBzbyB3ZSBjYW4ndCBqdXN0IGRpcmVjdCBjb21w YXJlLgpAQCAtNTQ0LDYgKzU0Nyw4IEBAIGNsYXNzIEdpdFRlc3QoU0NNVGVzdCk6CiAgICAgICAg IHNlbGYuX3NldHVwX2dpdF9jbG9uZV9vZl9zdm5fcmVwb3NpdG9yeSgpCiAgICAgICAgIG9zLmNo ZGlyKHNlbGYuZ2l0X2NoZWNrb3V0X3BhdGgpCiAgICAgICAgIHNlbGYuc2NtID0gZGV0ZWN0X3Nj bV9zeXN0ZW0oc2VsZi5naXRfY2hlY2tvdXRfcGF0aCkKKyAgICAgICAgIyBGb3IgaGlzdG9yaWNh bCByZWFzb25zLCB3ZSB0ZXN0IHNvbWUgY2hlY2tvdXQgY29kZSBoZXJlIHRvby4KKyAgICAgICAg c2VsZi5jaGVja291dCA9IENoZWNrb3V0KHNlbGYuc2NtKQogCiAgICAgZGVmIHRlYXJEb3duKHNl bGYpOgogICAgICAgICBTVk5UZXN0UmVwb3NpdG9yeS50ZWFyX2Rvd24oc2VsZikKQEAgLTYwMSwx MyArNjA2LDEzIEBAIGNsYXNzIEdpdFRlc3QoU0NNVGVzdCk6CiAgICAgICAgIHNjbSA9IGRldGVj dF9zY21fc3lzdGVtKHNlbGYuZ2l0X2NoZWNrb3V0X3BhdGgpCiAgICAgICAgIHBhdGNoID0gc2Vs Zi5fY3JlYXRlX3BhdGNoKHJ1bl9jb21tYW5kKFsnZ2l0JywgJ2RpZmYnLCAnSEVBRC4uSEVBRF4n XSkpCiAgICAgICAgIHNlbGYuX3NldHVwX3dlYmtpdHRvb2xzX3NjcmlwdHNfc3ltbGluayhzY20p Ci0gICAgICAgIHNjbS5hcHBseV9wYXRjaChwYXRjaCkKKyAgICAgICAgQ2hlY2tvdXQoc2NtKS5h cHBseV9wYXRjaChwYXRjaCkKIAogICAgIGRlZiB0ZXN0X2FwcGx5X2dpdF9wYXRjaF9mb3JjZShz ZWxmKToKICAgICAgICAgc2NtID0gZGV0ZWN0X3NjbV9zeXN0ZW0oc2VsZi5naXRfY2hlY2tvdXRf cGF0aCkKICAgICAgICAgcGF0Y2ggPSBzZWxmLl9jcmVhdGVfcGF0Y2gocnVuX2NvbW1hbmQoWydn aXQnLCAnZGlmZicsICdIRUFEfjIuLkhFQUQnXSkpCiAgICAgICAgIHNlbGYuX3NldHVwX3dlYmtp dHRvb2xzX3NjcmlwdHNfc3ltbGluayhzY20pCi0gICAgICAgIHNlbGYuYXNzZXJ0UmFpc2VzKFNj cmlwdEVycm9yLCBzY20uYXBwbHlfcGF0Y2gsIHBhdGNoLCBmb3JjZT1UcnVlKQorICAgICAgICBz ZWxmLmFzc2VydFJhaXNlcyhTY3JpcHRFcnJvciwgQ2hlY2tvdXQoc2NtKS5hcHBseV9wYXRjaCwg cGF0Y2gsIGZvcmNlPVRydWUpCiAKICAgICBkZWYgdGVzdF9jb21taXRfdGV4dF9wYXJzaW5nKHNl bGYpOgogICAgICAgICBzZWxmLl9zaGFyZWRfdGVzdF9jb21taXRfd2l0aF9tZXNzYWdlKCkKQEAg LTYzNiw3ICs2NDEsNyBAQCBjbGFzcyBHaXRUZXN0KFNDTVRlc3QpOgogICAgICAgICAjIENoZWNr IGlmIHdlIGNhbiBhcHBseSB0aGUgY3JlYXRlZCBwYXRjaC4KICAgICAgICAgcnVuX2NvbW1hbmQo WydnaXQnLCAncm0nLCAnLWYnLCB0ZXN0X2ZpbGVfbmFtZV0pCiAgICAgICAgIHNlbGYuX3NldHVw X3dlYmtpdHRvb2xzX3NjcmlwdHNfc3ltbGluayhzY20pCi0gICAgICAgIHNlbGYuc2NtLmFwcGx5 X3BhdGNoKHNlbGYuX2NyZWF0ZV9wYXRjaChwYXRjaCkpCisgICAgICAgIHNlbGYuY2hlY2tvdXQu YXBwbHlfcGF0Y2goc2VsZi5fY3JlYXRlX3BhdGNoKHBhdGNoKSkKICAgICAgICAgc2VsZi5hc3Nl cnRFcXVhbChmaWxlX2NvbnRlbnRzLCByZWFkX2Zyb21fcGF0aCh0ZXN0X2ZpbGVfcGF0aCkpCiAK ICAgICAgICAgIyBDaGVjayBpZiB3ZSBjYW4gY3JlYXRlIGEgcGF0Y2ggZnJvbSBhIGxvY2FsIGNv bW1pdC4KZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9tb2Nr dG9vbC5weSBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9tb2NrdG9vbC5weQpp bmRleCA1ZDExNGJjLi42OTQ3N2I2IDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9TY3JpcHRzL3dl YmtpdHB5L3Rvb2wvbW9ja3Rvb2wucHkKKysrIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRw eS90b29sL21vY2t0b29sLnB5CkBAIC0zODEsNiArMzgxLDkgQEAgY2xhc3MgTW9ja0NoZWNrb3V0 KG9iamVjdCk6CiAgICAgZGVmIGNvbW1pdF9tZXNzYWdlX2Zvcl90aGlzX2NvbW1pdChzZWxmKToK ICAgICAgICAgcmV0dXJuIE1vY2soKQogCisgICAgZGVmIGFwcGx5X3BhdGNoKHNlbGYsIHBhdGNo LCBmb3JjZT1GYWxzZSk6CisgICAgICAgIHBhc3MKKwogCiBjbGFzcyBNb2NrVXNlcihvYmplY3Qp OgogCmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvc3RlcHMv YXBwbHlwYXRjaC5weSBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9zdGVwcy9h cHBseXBhdGNoLnB5CmluZGV4IDY2YTdmODUuLjY2ZDBhMDMgMTAwNjQ0Ci0tLSBhL1dlYktpdFRv b2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9zdGVwcy9hcHBseXBhdGNoLnB5CisrKyBiL1dlYktp dFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9zdGVwcy9hcHBseXBhdGNoLnB5CkBAIC0zOSw0 ICszOSw0IEBAIGNsYXNzIEFwcGx5UGF0Y2goQWJzdHJhY3RTdGVwKToKIAogICAgIGRlZiBydW4o c2VsZiwgc3RhdGUpOgogICAgICAgICBsb2coIlByb2Nlc3NpbmcgcGF0Y2ggJXMgZnJvbSBidWcg JXMuIiAlIChzdGF0ZVsicGF0Y2giXS5pZCgpLCBzdGF0ZVsicGF0Y2giXS5idWdfaWQoKSkpCi0g ICAgICAgIHNlbGYuX3Rvb2wuc2NtKCkuYXBwbHlfcGF0Y2goc3RhdGVbInBhdGNoIl0sIGZvcmNl PXNlbGYuX29wdGlvbnMubm9uX2ludGVyYWN0aXZlKQorICAgICAgICBzZWxmLl90b29sLmNoZWNr b3V0KCkuYXBwbHlfcGF0Y2goc3RhdGVbInBhdGNoIl0sIGZvcmNlPXNlbGYuX29wdGlvbnMubm9u X2ludGVyYWN0aXZlKQo=