64917 2011-07-20 19:24:40 -0700 load() does not reset the resource selection algorithm 2011-09-06 11:49:26 -0700 1 1 1 Unclassified WebKit Media 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 eric.carlson eric.carlson webkit-bug-importer webkit.review.bot oldest_to_newest 440198 0 eric.carlson 2011-07-20 19:24:40 -0700 Calling the load() method on a media element should reset state so the resource selection algorithm starts over, but <source> element selection is not reset. 440199 1 eric.carlson 2011-07-20 19:25:01 -0700 <rdar://9712909> 440217 2 101549 eric.carlson 2011-07-20 20:06:33 -0700 Created attachment 101549 Proposed patch. 440218 3 webkit.review.bot 2011-07-20 20:08:43 -0700 Attachment 101549 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'LayoutTests/ChangeLog', u'LayoutTests/medi..." exit_code: 1 Source/WebCore/platform/graphics/MediaPlayer.cpp:197: Should have a space between // and comment [whitespace/comments] [4] Total errors found: 1 in 6 files If any of these errors are false positives, please file a bug against check-webkit-style. 440220 4 101550 eric.carlson 2011-07-20 20:09:50 -0700 Created attachment 101550 Proposed patch. 460773 5 106027 eric.carlson 2011-09-01 14:11:37 -0700 Created attachment 106027 Updated patch Update results slightly 462706 6 eric.carlson 2011-09-06 11:49:26 -0700 http://trac.webkit.org/changeset/94584 101549 2011-07-20 20:06:33 -0700 2011-07-20 20:09:50 -0700 Proposed patch. patch_2.txt text/plain 9967 eric.carlson SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDkxNDQxKQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTEtMDctMjAgIEVyaWMgQ2Fy bHNvbiAgPGVyaWMuY2FybHNvbkBhcHBsZS5jb20+CisKKyAgICAgICAgbG9hZCgpIGRvZXMgbm90 IHJlc2V0IHRoZSByZXNvdXJjZSBzZWxlY3Rpb24gYWxnb3JpdGhtCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02NDkxNworCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRlc3Q6IG1lZGlhL3ZpZGVvLXNvdXJjZS1s b2FkLmh0bWwKKworICAgICAgICAqIGh0bWwvSFRNTE1lZGlhRWxlbWVudC5jcHA6CisgICAgICAg IChXZWJDb3JlOjpIVE1MTWVkaWFFbGVtZW50OjpzZWxlY3RNZWRpYVJlc291cmNlKTogUmVzZXQg bV9uZXh0Q2hpbGROb2RlVG9Db25zaWRlciwgdXBkYXRlCisgICAgICAgICAgICBjb21tZW50cyBh bmQgcmVhcnJhbmdlIGxvZ2ljIHRvIG1vcmUgY2xvc2VseSBtYXRjaCBsb2dpYyBpbiBzcGVjLgor ICAgICAgICAoV2ViQ29yZTo6SFRNTE1lZGlhRWxlbWVudDo6bm9uZVN1cHBvcnRlZCk6IFVwZGF0 ZSBjb21tZW50cy4KKwogMjAxMS0wNy0yMCAgUnlvc3VrZSBOaXdhICA8cm5pd2FAd2Via2l0Lm9y Zz4KIAogICAgICAgICBCdWlsZCBmaXggYWZ0ZXIgcjkxNDM1LgpJbmRleDogU291cmNlL1dlYkNv cmUvaHRtbC9IVE1MTWVkaWFFbGVtZW50LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29y ZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQuY3BwCShyZXZpc2lvbiA5MTQ0MSkKKysrIFNvdXJjZS9X ZWJDb3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVudC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTYwOSwy OSArNjA5LDM1IEBAIHZvaWQgSFRNTE1lZGlhRWxlbWVudDo6c2VsZWN0TWVkaWFSZXNvdXIKICAg ICBMT0coTWVkaWEsICJIVE1MTWVkaWFFbGVtZW50OjpzZWxlY3RNZWRpYVJlc291cmNlIik7CiAK ICAgICBlbnVtIE1vZGUgeyBhdHRyaWJ1dGUsIGNoaWxkcmVuIH07Ci0gICAgTW9kZSBtb2RlID0g YXR0cmlidXRlOwogCi0gICAgLy8gMyAtIC4uLiB0aGUgbWVkaWEgZWxlbWVudCBoYXMgbmVpdGhl ciBhIHNyYyBhdHRyaWJ1dGUgLi4uCisgICAgCisgICAgLy8gMyAtIElmIHRoZSBtZWRpYSBlbGVt ZW50IGhhcyBhIHNyYyBhdHRyaWJ1dGUsIHRoZW4gbGV0IG1vZGUgYmUgYXR0cmlidXRlLgorICAg IE1vZGUgbW9kZSA9IGF0dHJpYnV0ZTsKICAgICBpZiAoIWhhc0F0dHJpYnV0ZShzcmNBdHRyKSkg ewotICAgICAgICAvLyAuLi4gbm9yIGEgc291cmNlIGVsZW1lbnQgY2hpbGQ6IC4uLgogICAgICAg ICBOb2RlKiBub2RlOwogICAgICAgICBmb3IgKG5vZGUgPSBmaXJzdENoaWxkKCk7IG5vZGU7IG5v ZGUgPSBub2RlLT5uZXh0U2libGluZygpKSB7CiAgICAgICAgICAgICBpZiAobm9kZS0+aGFzVGFn TmFtZShzb3VyY2VUYWcpKQogICAgICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICB9CiAKLSAg ICAgICAgaWYgKCFub2RlKSB7CisgICAgICAgIC8vIE90aGVyd2lzZSwgaWYgdGhlIG1lZGlhIGVs ZW1lbnQgZG9lcyBub3QgaGF2ZSBhIHNyYyBhdHRyaWJ1dGUgYnV0IGhhcyBhIHNvdXJjZSAKKyAg ICAgICAgLy8gZWxlbWVudCBjaGlsZCwgdGhlbiBsZXQgbW9kZSBiZSBjaGlsZHJlbiBhbmQgbGV0 IGNhbmRpZGF0ZSBiZSB0aGUgZmlyc3Qgc3VjaCAKKyAgICAgICAgLy8gc291cmNlIGVsZW1lbnQg Y2hpbGQgaW4gdHJlZSBvcmRlci4KKyAgICAgICAgaWYgKG5vZGUpIHsKKyAgICAgICAgICAgIG1v ZGUgPSBjaGlsZHJlbjsKKyAgICAgICAgICAgIG1fbmV4dENoaWxkTm9kZVRvQ29uc2lkZXIgPSAw OworICAgICAgICAgICAgbV9jdXJyZW50U291cmNlTm9kZSA9IDA7CisgICAgICAgIH0gZWxzZSB7 CisgICAgICAgICAgICAvLyBPdGhlcndpc2UgdGhlIG1lZGlhIGVsZW1lbnQgaGFzIG5laXRoZXIg YSBzcmMgYXR0cmlidXRlIG5vciBhIHNvdXJjZSBlbGVtZW50IAorICAgICAgICAgICAgLy8gY2hp bGQ6IHNldCB0aGUgbmV0d29ya1N0YXRlIHRvIE5FVFdPUktfRU1QVFksIGFuZCBhYm9ydCB0aGVz ZSBzdGVwczsgdGhlIAorICAgICAgICAgICAgLy8gc3luY2hyb25vdXMgc2VjdGlvbiBlbmRzLgog ICAgICAgICAgICAgbV9sb2FkU3RhdGUgPSBXYWl0aW5nRm9yU291cmNlOwogICAgICAgICAgICAg c2V0U2hvdWxkRGVsYXlMb2FkRXZlbnQoZmFsc2UpOwotCi0gICAgICAgICAgICAvLyAuLi4gc2V0 IHRoZSBuZXR3b3JrU3RhdGUgdG8gTkVUV09SS19FTVBUWSwgYW5kIGFib3J0IHRoZXNlIHN0ZXBz CiAgICAgICAgICAgICBtX25ldHdvcmtTdGF0ZSA9IE5FVFdPUktfRU1QVFk7CiAKICAgICAgICAg ICAgIExPRyhNZWRpYSwgIkhUTUxNZWRpYUVsZW1lbnQ6OnNlbGVjdE1lZGlhUmVzb3VyY2UsIG5v dGhpbmcgdG8gbG9hZCIpOwogICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB9Ci0KLSAgICAg ICAgbW9kZSA9IGNoaWxkcmVuOwogICAgIH0KIAogICAgIC8vIDQgLSBTZXQgdGhlIG1lZGlhIGVs ZW1lbnQncyBkZWxheWluZy10aGUtbG9hZC1ldmVudCBmbGFnIHRvIHRydWUgKHRoaXMgZGVsYXlz IHRoZSBsb2FkIGV2ZW50KSwgCkBAIC02MzksNyArNjQ1LDcgQEAgdm9pZCBIVE1MTWVkaWFFbGVt ZW50OjpzZWxlY3RNZWRpYVJlc291cgogICAgIHNldFNob3VsZERlbGF5TG9hZEV2ZW50KHRydWUp OwogICAgIG1fbmV0d29ya1N0YXRlID0gTkVUV09SS19MT0FESU5HOwogCi0gICAgLy8gNQorICAg IC8vIDUgLSBRdWV1ZSBhIHRhc2sgdG8gZmlyZSBhIHNpbXBsZSBldmVudCBuYW1lZCBsb2Fkc3Rh cnQgYXQgdGhlIG1lZGlhIGVsZW1lbnQuCiAgICAgc2NoZWR1bGVFdmVudChldmVudE5hbWVzKCku bG9hZHN0YXJ0RXZlbnQpOwogCiAgICAgLy8gNiAtIElmIG1vZGUgaXMgYXR0cmlidXRlLCB0aGVu IHJ1biB0aGVzZSBzdWJzdGVwcwpAQCAtNjY4LDcgKzY3NCw2IEBAIHZvaWQgSFRNTE1lZGlhRWxl bWVudDo6c2VsZWN0TWVkaWFSZXNvdXIKICAgICB9CiAKICAgICAvLyBPdGhlcndpc2UsIHRoZSBz b3VyY2UgZWxlbWVudHMgd2lsbCBiZSB1c2VkCi0gICAgbV9jdXJyZW50U291cmNlTm9kZSA9IDA7 CiAgICAgbG9hZE5leHRTb3VyY2VDaGlsZCgpOwogfQogCkBAIC04NTgsMjMgKzg2MywyNyBAQCB2 b2lkIEhUTUxNZWRpYUVsZW1lbnQ6Om5vbmVTdXBwb3J0ZWQoKQogICAgIG1fbG9hZFN0YXRlID0g V2FpdGluZ0ZvclNvdXJjZTsKICAgICBtX2N1cnJlbnRTb3VyY2VOb2RlID0gMDsKIAotICAgIC8v IDUgLSBSZWFjaGluZyB0aGlzIHN0ZXAgaW5kaWNhdGVzIHRoYXQgZWl0aGVyIHRoZSBVUkwgZmFp bGVkIHRvIHJlc29sdmUsIG9yIHRoZSBtZWRpYQotICAgIC8vIHJlc291cmNlIGZhaWxlZCB0byBs b2FkLiBTZXQgdGhlIGVycm9yIGF0dHJpYnV0ZSB0byBhIG5ldyBNZWRpYUVycm9yIG9iamVjdCB3 aG9zZQotICAgIC8vIGNvZGUgYXR0cmlidXRlIGlzIHNldCB0byBNRURJQV9FUlJfU1JDX05PVF9T VVBQT1JURUQuCisgICAgLy8gNC44LjEwLjUgCisgICAgLy8gNiAtIFJlYWNoaW5nIHRoaXMgc3Rl cCBpbmRpY2F0ZXMgdGhhdCB0aGUgbWVkaWEgcmVzb3VyY2UgZmFpbGVkIHRvIGxvYWQgb3IgdGhh dCB0aGUgZ2l2ZW4gCisgICAgLy8gVVJMIGNvdWxkIG5vdCBiZSByZXNvbHZlZC4gSW4gb25lIGF0 b21pYyBvcGVyYXRpb24sIHJ1biB0aGUgZm9sbG93aW5nIHN0ZXBzOgorCisgICAgLy8gNi4xIC0g U2V0IHRoZSBlcnJvciBhdHRyaWJ1dGUgdG8gYSBuZXcgTWVkaWFFcnJvciBvYmplY3Qgd2hvc2Ug Y29kZSBhdHRyaWJ1dGUgaXMgc2V0IHRvCisgICAgLy8gTUVESUFfRVJSX1NSQ19OT1RfU1VQUE9S VEVELgogICAgIG1fZXJyb3IgPSBNZWRpYUVycm9yOjpjcmVhdGUoTWVkaWFFcnJvcjo6TUVESUFf RVJSX1NSQ19OT1RfU1VQUE9SVEVEKTsKIAotICAgIC8vIDYgLSBTZXQgdGhlIGVsZW1lbnQncyBu ZXR3b3JrU3RhdGUgYXR0cmlidXRlIHRvIHRoZSBORVRXT1JLX05PX1NPVVJDRSB2YWx1ZS4KKyAg ICAvLyA2LjIgLSBGb3JnZXQgdGhlIG1lZGlhIGVsZW1lbnQncyBtZWRpYS1yZXNvdXJjZS1zcGVj aWZpYyB0ZXh0IHRyYWNrcy4KKworICAgIC8vIDYuMyAtIFNldCB0aGUgZWxlbWVudCdzIG5ldHdv cmtTdGF0ZSBhdHRyaWJ1dGUgdG8gdGhlIE5FVFdPUktfTk9fU09VUkNFIHZhbHVlLgogICAgIG1f bmV0d29ya1N0YXRlID0gTkVUV09SS19OT19TT1VSQ0U7CiAKLSAgICAvLyA3IC0gUXVldWUgYSB0 YXNrIHRvIGZpcmUgYSBwcm9ncmVzcyBldmVudCBjYWxsZWQgZXJyb3IgYXQgdGhlIG1lZGlhIGVs ZW1lbnQsIGluCi0gICAgLy8gdGhlIGNvbnRleHQgb2YgdGhlIGZldGNoaW5nIHByb2Nlc3MgdGhh dCB3YXMgdXNlZCB0byB0cnkgdG8gb2J0YWluIHRoZSBtZWRpYQotICAgIC8vIHJlc291cmNlIGlu IHRoZSByZXNvdXJjZSBmZXRjaCBhbGdvcml0aG0uCisgICAgLy8gNyAtIFF1ZXVlIGEgdGFzayB0 byBmaXJlIGEgc2ltcGxlIGV2ZW50IG5hbWVkIGVycm9yIGF0IHRoZSBtZWRpYSBlbGVtZW50Lgog ICAgIHNjaGVkdWxlRXZlbnQoZXZlbnROYW1lcygpLmVycm9yRXZlbnQpOwogCiAgICAgLy8gOCAt IFNldCB0aGUgZWxlbWVudCdzIGRlbGF5aW5nLXRoZS1sb2FkLWV2ZW50IGZsYWcgdG8gZmFsc2Uu IFRoaXMgc3RvcHMgZGVsYXlpbmcgdGhlIGxvYWQgZXZlbnQuCiAgICAgc2V0U2hvdWxkRGVsYXlM b2FkRXZlbnQoZmFsc2UpOwogCi0gICAgLy8gOSAtQWJvcnQgdGhlc2Ugc3RlcHMuIFVudGlsIHRo ZSBsb2FkKCkgbWV0aG9kIGlzIGludm9rZWQsIHRoZSBlbGVtZW50IHdvbid0IGF0dGVtcHQgdG8g bG9hZCBhbm90aGVyIHJlc291cmNlLgorICAgIC8vIDkgLSBBYm9ydCB0aGVzZSBzdGVwcy4gVW50 aWwgdGhlIGxvYWQoKSBtZXRob2QgaXMgaW52b2tlZCBvciB0aGUgc3JjIGF0dHJpYnV0ZSBpcyBj aGFuZ2VkLCAKKyAgICAvLyB0aGUgZWxlbWVudCB3b24ndCBhdHRlbXB0IHRvIGxvYWQgYW5vdGhl ciByZXNvdXJjZS4KIAogICAgIHVwZGF0ZURpc3BsYXlTdGF0ZSgpOwogCkluZGV4OiBTb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9NZWRpYVBsYXllci5jcHAKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvTWVkaWFQbGF5ZXIuY3BwCShyZXZpc2lv biA5MDgxNSkKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL01lZGlhUGxheWVy LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTk0LDcgKzE5NCw3IEBAIHN0YXRpYyBWZWN0b3I8TWVk aWFQbGF5ZXJGYWN0b3J5Kj4mIGluc3QKICNlbmRpZgogCiAjaWYgIVBMQVRGT1JNKEdUSykgJiYg IVBMQVRGT1JNKEVGTCkgJiYgIShQTEFURk9STShRVCkgJiYgVVNFKEdTVFJFQU1FUikpCi0gICAg ICAgIFBsYXRmb3JtTWVkaWFFbmdpbmVDbGFzc05hbWU6OnJlZ2lzdGVyTWVkaWFFbmdpbmUoYWRk TWVkaWFFbmdpbmUpOworLy9AQEBAQCAgICAgICAgUGxhdGZvcm1NZWRpYUVuZ2luZUNsYXNzTmFt ZTo6cmVnaXN0ZXJNZWRpYUVuZ2luZShhZGRNZWRpYUVuZ2luZSk7CiAjZW5kaWYKICAgICB9CiAK SW5kZXg6IExheW91dFRlc3RzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9D aGFuZ2VMb2cJKHJldmlzaW9uIDkxNDQxKQorKysgTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCSh3b3Jr aW5nIGNvcHkpCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTEtMDctMjAgIEVyaWMgQ2FybHNvbiAgPGVy aWMuY2FybHNvbkBhcHBsZS5jb20+CisKKyAgICAgICAgbG9hZCgpIGRvZXMgbm90IHJlc2V0IHRo ZSByZXNvdXJjZSBzZWxlY3Rpb24gYWxnb3JpdGhtCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD02NDkxNworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgICogbWVkaWEvdmlkZW8tc291cmNlLWxvYWQtZXhwZWN0ZWQu dHh0OiBBZGRlZC4KKyAgICAgICAgKiBtZWRpYS92aWRlby1zb3VyY2UtbG9hZC5odG1sOiBBZGRl ZC4KKwogMjAxMS0wNy0yMCAgUnlvc3VrZSBOaXdhICA8cm5pd2FAd2Via2l0Lm9yZz4KIAogICAg ICAgICBbY2hyb21pdW1dIFNoYWRvdy1yZWxhdGVkIHRlc3RzIG5lZWQgcmViYXNlbGluaW5nIGFm dGVyIHI4NTI5OQpJbmRleDogTGF5b3V0VGVzdHMvbWVkaWEvdmlkZW8tc291cmNlLWxvYWQtZXhw ZWN0ZWQudHh0Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL21lZGlhL3ZpZGVvLXNvdXJjZS1s b2FkLWV4cGVjdGVkLnR4dAkocmV2aXNpb24gMCkKKysrIExheW91dFRlc3RzL21lZGlhL3ZpZGVv LXNvdXJjZS1sb2FkLWV4cGVjdGVkLnR4dAkocmV2aXNpb24gMCkKQEAgLTAsMCArMSwxOCBAQAor VGVzdCB0aGF0IHRoZSByZXNvdXJjZSBzZWxlY3Rpb24gYWxnb3JpdGhtIGlzIHJlc3RhcnRlZCB3 aGVuIGxvYWQoKSBpcyBjYWxsZWQsIGFuZCB0aGF0IGFsbCA8c291cmNlPiBlbGVtZW50cyBhcmUg cmVjb25zaWRlcmVkLgorCisrKysgVGVzdCBpbml0aWFsIG5ldHdvcmtTdGF0ZS4KK0VYUEVDVEVE ICh2aWRlby5uZXR3b3JrU3RhdGUgPT0gJzAnKSBPSworCisrKysgVGVzdCBuZXR3b3JrU3RhdGUg YWZ0ZXIgYWRkaW5nIDxzb3VyY2U+LgorRVhQRUNURUQgKHZpZGVvLm5ldHdvcmtTdGF0ZSA9PSAn MycpIE9LCisKK0VWRU5UKGVycm9yKQorRVZFTlQoY2FucGxheXRocm91Z2gpCitFWFBFQ1RFRCAo c3RyaXBFeHRlbnNpb24ocmVsYXRpdmVVUkwodmlkZW8uY3VycmVudFNyYykpID09ICdjb250ZW50 L3Rlc3QnKSBPSworCisrKysgQ2FsbGluZyBsb2FkKCkuCitFVkVOVChlcnJvcikKK0VWRU5UKGNh bnBsYXl0aHJvdWdoKQorRVhQRUNURUQgKHN0cmlwRXh0ZW5zaW9uKHJlbGF0aXZlVVJMKHZpZGVv LmN1cnJlbnRTcmMpKSA9PSAnY29udGVudC90ZXN0JykgT0sKK0VORCBPRiBURVNUCisKSW5kZXg6 IExheW91dFRlc3RzL21lZGlhL3ZpZGVvLXNvdXJjZS1sb2FkLmh0bWwKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g TGF5b3V0VGVzdHMvbWVkaWEvdmlkZW8tc291cmNlLWxvYWQuaHRtbAkocmV2aXNpb24gMCkKKysr IExheW91dFRlc3RzL21lZGlhL3ZpZGVvLXNvdXJjZS1sb2FkLmh0bWwJKHJldmlzaW9uIDApCkBA IC0wLDAgKzEsNjIgQEAKKzwhZG9jdHlwZSBodG1sPgorPGh0bWw+CisgICAgPGhlYWQ+CisgICAg ICAgIDx0aXRsZT5sb2FkKCkgYW5kIHRoZSAmbHQ7c291cmNlJmd0OyBlbGVtZW50PC90aXRsZT4K KyAgICAgICAgPHNjcmlwdCBzcmM9dmlkZW8tdGVzdC5qcz48L3NjcmlwdD4KKyAgICAgICAgPHNj cmlwdCBzcmM9bWVkaWEtZmlsZS5qcz48L3NjcmlwdD4KKyAgICAgICAgPHNjcmlwdD4KKyAgICAg ICAgICAgIHZhciBzb3VyY2VzID0gW107CisgICAgICAgICAgICB2YXIgY291bnQgPSAwOworCisg ICAgICAgICAgICBmdW5jdGlvbiBjYW5wbGF5dGhyb3VnaCgpIAorICAgICAgICAgICAgeworICAg ICAgICAgICAgICAgIHRlc3RFeHBlY3RlZCgic3RyaXBFeHRlbnNpb24ocmVsYXRpdmVVUkwodmlk ZW8uY3VycmVudFNyYykpIiwgcmVsYXRpdmVVUkwoc3RyaXBFeHRlbnNpb24oc291cmNlc1sxXSkp KTsKKyAgICAgICAgICAgICAgICArK2NvdW50OworICAgICAgICAgICAgICAgIHN3aXRjaCAoY291 bnQpIAorICAgICAgICAgICAgICAgIHsKKyAgICAgICAgICAgICAgICAgICAgY2FzZSAxOgorICAg ICAgICAgICAgICAgICAgICAgICAgY29uc29sZVdyaXRlKCI8YnI+KysrIENhbGxpbmcgbG9hZCgp LiIpOworICAgICAgICAgICAgICAgICAgICAgICAgdmlkZW8ubG9hZCgpOworICAgICAgICAgICAg ICAgICAgICAgICAgYnJlYWs7CisgICAgICAgICAgICAgICAgICAgIGNhc2UgMjoKKyAgICAgICAg ICAgICAgICAgICAgICAgIGVuZFRlc3QoKTsKKyAgICAgICAgICAgICAgICAgICAgcmV0dXJuOwor ICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAgIH0KKworICAgICAgICAgICAgZnVuY3Rpb24g YWRkU291cmNlKHR5cGUsIG5hbWUpCisgICAgICAgICAgICB7CisgICAgICAgICAgICAgICAgdmFy IHNvdXJjZSA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoJ3NvdXJjZScpOworICAgICAgICAgICAg ICAgIHNvdXJjZS5zcmMgPSBmaW5kTWVkaWFGaWxlKHR5cGUsIG5hbWUpOworICAgICAgICAgICAg ICAgIHNvdXJjZXMucHVzaChzb3VyY2Uuc3JjKTsKKyAgICAgICAgICAgICAgICBzb3VyY2UudHlw ZSA9IG1pbWVUeXBlRm9yRXh0ZW5zaW9uKHNvdXJjZS5zcmMuc3BsaXQoJy4nKVsxXSk7CisgICAg ICAgICAgICAgICAgdmlkZW8uYXBwZW5kQ2hpbGQoc291cmNlKTsKKyAgICAgICAgICAgIH0KKwor ICAgICAgICAgICAgZnVuY3Rpb24gc2V0dXAoKQorICAgICAgICAgICAgeworICAgICAgICAgICAg ICAgIHZpZGVvID0gbWVkaWFFbGVtZW50ID0gZG9jdW1lbnQuZ2V0RWxlbWVudHNCeVRhZ05hbWUo J3ZpZGVvJylbMF07CisKKyAgICAgICAgICAgICAgICBjb25zb2xlV3JpdGUoIisrKyBUZXN0IGlu aXRpYWwgbmV0d29ya1N0YXRlLiIpOworICAgICAgICAgICAgICAgIHRlc3RFeHBlY3RlZCgidmlk ZW8ubmV0d29ya1N0YXRlIiwgSFRNTE1lZGlhRWxlbWVudC5wcm90b3R5cGUuTkVUV09SS19FTVBU WSwgIj09Iik7CisKKyAgICAgICAgICAgICAgICAvLyBBZGQgYW4gaW52YWxpZCB1cmwgdG8gdGhl IGZpcnN0IHNvdXJjZSBzbyB3ZSB0ZXN0IGdldHRpbmcgYW4gZXJyb3IgZXZlbnQKKyAgICAgICAg ICAgICAgICAvLyBlYWNoIHRpbWUgcmVzb3VyY2Ugc2VsZWN0aW9uIHJ1bnMuCisgICAgICAgICAg ICAgICAgYWRkU291cmNlKCJ2aWRlbyIsICJjb250ZW50L2JvZ3VzIik7CisgICAgICAgICAgICAg ICAgYWRkU291cmNlKCJ2aWRlbyIsICJjb250ZW50L3Rlc3QiKTsKKyAgICAgICAgICAgICAgICBh ZGRTb3VyY2UoImF1ZGlvIiwgImNvbnRlbnQvdGVzdCIpOworCisgICAgICAgICAgICAgICAgY29u c29sZVdyaXRlKCI8YnI+KysrIFRlc3QgbmV0d29ya1N0YXRlIGFmdGVyIGFkZGluZyAmbHQ7c291 cmNlJmd0Oy4iKTsKKyAgICAgICAgICAgICAgICB0ZXN0RXhwZWN0ZWQoInZpZGVvLm5ldHdvcmtT dGF0ZSIsIEhUTUxNZWRpYUVsZW1lbnQucHJvdG90eXBlLk5FVFdPUktfTk9fU09VUkNFLCAiPT0i KTsKKworICAgICAgICAgICAgICAgIHdhaXRGb3JFdmVudCgiY2FucGxheXRocm91Z2giLCBjYW5w bGF5dGhyb3VnaCk7CisgICAgICAgICAgICAgICAgd2FpdEZvckV2ZW50KCJlcnJvciIpOworICAg ICAgICAgICAgICAgIGNvbnNvbGVXcml0ZSgiIik7CisgICAgICAgICAgICB9CisgICAgICAgIDwv c2NyaXB0PgorICAgIDwvaGVhZD4KKyAgICA8Ym9keSBvbmxvYWQ9InNldHVwKCkiPgorICAgICAg ICA8dmlkZW8gY29udHJvbHMgd2lkdGg9MzAwIGhlaWdodD0xNTA+PC92aWRlbz4KKyAgICAgICAg PHA+VGVzdCB0aGF0IHRoZSByZXNvdXJjZSBzZWxlY3Rpb24gYWxnb3JpdGhtIGlzIHJlc3RhcnRl ZCB3aGVuIGxvYWQoKSBpcyBjYWxsZWQsIGFuZCB0aGF0IGFsbCAmbHQ7c291cmNlJmd0OyBlbGVt ZW50cyBhcmUgcmVjb25zaWRlcmVkLjwvcD4KKyAgICA8L2JvZHk+Cis8L2h0bWw+Cg== 101550 2011-07-20 20:09:50 -0700 2011-09-01 14:11:37 -0700 Proposed patch. patch_2.txt text/plain 9383 eric.carlson SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDkxNDQxKQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTEtMDctMjAgIEVyaWMgQ2Fy bHNvbiAgPGVyaWMuY2FybHNvbkBhcHBsZS5jb20+CisKKyAgICAgICAgbG9hZCgpIGRvZXMgbm90 IHJlc2V0IHRoZSByZXNvdXJjZSBzZWxlY3Rpb24gYWxnb3JpdGhtCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02NDkxNworCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRlc3Q6IG1lZGlhL3ZpZGVvLXNvdXJjZS1s b2FkLmh0bWwKKworICAgICAgICAqIGh0bWwvSFRNTE1lZGlhRWxlbWVudC5jcHA6CisgICAgICAg IChXZWJDb3JlOjpIVE1MTWVkaWFFbGVtZW50OjpzZWxlY3RNZWRpYVJlc291cmNlKTogUmVzZXQg bV9uZXh0Q2hpbGROb2RlVG9Db25zaWRlciwgdXBkYXRlCisgICAgICAgICAgICBjb21tZW50cyBh bmQgcmVhcnJhbmdlIGxvZ2ljIHRvIG1vcmUgY2xvc2VseSBtYXRjaCBsb2dpYyBpbiBzcGVjLgor ICAgICAgICAoV2ViQ29yZTo6SFRNTE1lZGlhRWxlbWVudDo6bm9uZVN1cHBvcnRlZCk6IFVwZGF0 ZSBjb21tZW50cy4KKwogMjAxMS0wNy0yMCAgUnlvc3VrZSBOaXdhICA8cm5pd2FAd2Via2l0Lm9y Zz4KIAogICAgICAgICBCdWlsZCBmaXggYWZ0ZXIgcjkxNDM1LgpJbmRleDogU291cmNlL1dlYkNv cmUvaHRtbC9IVE1MTWVkaWFFbGVtZW50LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29y ZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQuY3BwCShyZXZpc2lvbiA5MTQ0MSkKKysrIFNvdXJjZS9X ZWJDb3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVudC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTYwOSwy OSArNjA5LDM1IEBAIHZvaWQgSFRNTE1lZGlhRWxlbWVudDo6c2VsZWN0TWVkaWFSZXNvdXIKICAg ICBMT0coTWVkaWEsICJIVE1MTWVkaWFFbGVtZW50OjpzZWxlY3RNZWRpYVJlc291cmNlIik7CiAK ICAgICBlbnVtIE1vZGUgeyBhdHRyaWJ1dGUsIGNoaWxkcmVuIH07Ci0gICAgTW9kZSBtb2RlID0g YXR0cmlidXRlOwogCi0gICAgLy8gMyAtIC4uLiB0aGUgbWVkaWEgZWxlbWVudCBoYXMgbmVpdGhl ciBhIHNyYyBhdHRyaWJ1dGUgLi4uCisgICAgCisgICAgLy8gMyAtIElmIHRoZSBtZWRpYSBlbGVt ZW50IGhhcyBhIHNyYyBhdHRyaWJ1dGUsIHRoZW4gbGV0IG1vZGUgYmUgYXR0cmlidXRlLgorICAg IE1vZGUgbW9kZSA9IGF0dHJpYnV0ZTsKICAgICBpZiAoIWhhc0F0dHJpYnV0ZShzcmNBdHRyKSkg ewotICAgICAgICAvLyAuLi4gbm9yIGEgc291cmNlIGVsZW1lbnQgY2hpbGQ6IC4uLgogICAgICAg ICBOb2RlKiBub2RlOwogICAgICAgICBmb3IgKG5vZGUgPSBmaXJzdENoaWxkKCk7IG5vZGU7IG5v ZGUgPSBub2RlLT5uZXh0U2libGluZygpKSB7CiAgICAgICAgICAgICBpZiAobm9kZS0+aGFzVGFn TmFtZShzb3VyY2VUYWcpKQogICAgICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICB9CiAKLSAg ICAgICAgaWYgKCFub2RlKSB7CisgICAgICAgIC8vIE90aGVyd2lzZSwgaWYgdGhlIG1lZGlhIGVs ZW1lbnQgZG9lcyBub3QgaGF2ZSBhIHNyYyBhdHRyaWJ1dGUgYnV0IGhhcyBhIHNvdXJjZSAKKyAg ICAgICAgLy8gZWxlbWVudCBjaGlsZCwgdGhlbiBsZXQgbW9kZSBiZSBjaGlsZHJlbiBhbmQgbGV0 IGNhbmRpZGF0ZSBiZSB0aGUgZmlyc3Qgc3VjaCAKKyAgICAgICAgLy8gc291cmNlIGVsZW1lbnQg Y2hpbGQgaW4gdHJlZSBvcmRlci4KKyAgICAgICAgaWYgKG5vZGUpIHsKKyAgICAgICAgICAgIG1v ZGUgPSBjaGlsZHJlbjsKKyAgICAgICAgICAgIG1fbmV4dENoaWxkTm9kZVRvQ29uc2lkZXIgPSAw OworICAgICAgICAgICAgbV9jdXJyZW50U291cmNlTm9kZSA9IDA7CisgICAgICAgIH0gZWxzZSB7 CisgICAgICAgICAgICAvLyBPdGhlcndpc2UgdGhlIG1lZGlhIGVsZW1lbnQgaGFzIG5laXRoZXIg YSBzcmMgYXR0cmlidXRlIG5vciBhIHNvdXJjZSBlbGVtZW50IAorICAgICAgICAgICAgLy8gY2hp bGQ6IHNldCB0aGUgbmV0d29ya1N0YXRlIHRvIE5FVFdPUktfRU1QVFksIGFuZCBhYm9ydCB0aGVz ZSBzdGVwczsgdGhlIAorICAgICAgICAgICAgLy8gc3luY2hyb25vdXMgc2VjdGlvbiBlbmRzLgog ICAgICAgICAgICAgbV9sb2FkU3RhdGUgPSBXYWl0aW5nRm9yU291cmNlOwogICAgICAgICAgICAg c2V0U2hvdWxkRGVsYXlMb2FkRXZlbnQoZmFsc2UpOwotCi0gICAgICAgICAgICAvLyAuLi4gc2V0 IHRoZSBuZXR3b3JrU3RhdGUgdG8gTkVUV09SS19FTVBUWSwgYW5kIGFib3J0IHRoZXNlIHN0ZXBz CiAgICAgICAgICAgICBtX25ldHdvcmtTdGF0ZSA9IE5FVFdPUktfRU1QVFk7CiAKICAgICAgICAg ICAgIExPRyhNZWRpYSwgIkhUTUxNZWRpYUVsZW1lbnQ6OnNlbGVjdE1lZGlhUmVzb3VyY2UsIG5v dGhpbmcgdG8gbG9hZCIpOwogICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB9Ci0KLSAgICAg ICAgbW9kZSA9IGNoaWxkcmVuOwogICAgIH0KIAogICAgIC8vIDQgLSBTZXQgdGhlIG1lZGlhIGVs ZW1lbnQncyBkZWxheWluZy10aGUtbG9hZC1ldmVudCBmbGFnIHRvIHRydWUgKHRoaXMgZGVsYXlz IHRoZSBsb2FkIGV2ZW50KSwgCkBAIC02MzksNyArNjQ1LDcgQEAgdm9pZCBIVE1MTWVkaWFFbGVt ZW50OjpzZWxlY3RNZWRpYVJlc291cgogICAgIHNldFNob3VsZERlbGF5TG9hZEV2ZW50KHRydWUp OwogICAgIG1fbmV0d29ya1N0YXRlID0gTkVUV09SS19MT0FESU5HOwogCi0gICAgLy8gNQorICAg IC8vIDUgLSBRdWV1ZSBhIHRhc2sgdG8gZmlyZSBhIHNpbXBsZSBldmVudCBuYW1lZCBsb2Fkc3Rh cnQgYXQgdGhlIG1lZGlhIGVsZW1lbnQuCiAgICAgc2NoZWR1bGVFdmVudChldmVudE5hbWVzKCku bG9hZHN0YXJ0RXZlbnQpOwogCiAgICAgLy8gNiAtIElmIG1vZGUgaXMgYXR0cmlidXRlLCB0aGVu IHJ1biB0aGVzZSBzdWJzdGVwcwpAQCAtNjY4LDcgKzY3NCw2IEBAIHZvaWQgSFRNTE1lZGlhRWxl bWVudDo6c2VsZWN0TWVkaWFSZXNvdXIKICAgICB9CiAKICAgICAvLyBPdGhlcndpc2UsIHRoZSBz b3VyY2UgZWxlbWVudHMgd2lsbCBiZSB1c2VkCi0gICAgbV9jdXJyZW50U291cmNlTm9kZSA9IDA7 CiAgICAgbG9hZE5leHRTb3VyY2VDaGlsZCgpOwogfQogCkBAIC04NTgsMjMgKzg2MywyNyBAQCB2 b2lkIEhUTUxNZWRpYUVsZW1lbnQ6Om5vbmVTdXBwb3J0ZWQoKQogICAgIG1fbG9hZFN0YXRlID0g V2FpdGluZ0ZvclNvdXJjZTsKICAgICBtX2N1cnJlbnRTb3VyY2VOb2RlID0gMDsKIAotICAgIC8v IDUgLSBSZWFjaGluZyB0aGlzIHN0ZXAgaW5kaWNhdGVzIHRoYXQgZWl0aGVyIHRoZSBVUkwgZmFp bGVkIHRvIHJlc29sdmUsIG9yIHRoZSBtZWRpYQotICAgIC8vIHJlc291cmNlIGZhaWxlZCB0byBs b2FkLiBTZXQgdGhlIGVycm9yIGF0dHJpYnV0ZSB0byBhIG5ldyBNZWRpYUVycm9yIG9iamVjdCB3 aG9zZQotICAgIC8vIGNvZGUgYXR0cmlidXRlIGlzIHNldCB0byBNRURJQV9FUlJfU1JDX05PVF9T VVBQT1JURUQuCisgICAgLy8gNC44LjEwLjUgCisgICAgLy8gNiAtIFJlYWNoaW5nIHRoaXMgc3Rl cCBpbmRpY2F0ZXMgdGhhdCB0aGUgbWVkaWEgcmVzb3VyY2UgZmFpbGVkIHRvIGxvYWQgb3IgdGhh dCB0aGUgZ2l2ZW4gCisgICAgLy8gVVJMIGNvdWxkIG5vdCBiZSByZXNvbHZlZC4gSW4gb25lIGF0 b21pYyBvcGVyYXRpb24sIHJ1biB0aGUgZm9sbG93aW5nIHN0ZXBzOgorCisgICAgLy8gNi4xIC0g U2V0IHRoZSBlcnJvciBhdHRyaWJ1dGUgdG8gYSBuZXcgTWVkaWFFcnJvciBvYmplY3Qgd2hvc2Ug Y29kZSBhdHRyaWJ1dGUgaXMgc2V0IHRvCisgICAgLy8gTUVESUFfRVJSX1NSQ19OT1RfU1VQUE9S VEVELgogICAgIG1fZXJyb3IgPSBNZWRpYUVycm9yOjpjcmVhdGUoTWVkaWFFcnJvcjo6TUVESUFf RVJSX1NSQ19OT1RfU1VQUE9SVEVEKTsKIAotICAgIC8vIDYgLSBTZXQgdGhlIGVsZW1lbnQncyBu ZXR3b3JrU3RhdGUgYXR0cmlidXRlIHRvIHRoZSBORVRXT1JLX05PX1NPVVJDRSB2YWx1ZS4KKyAg ICAvLyA2LjIgLSBGb3JnZXQgdGhlIG1lZGlhIGVsZW1lbnQncyBtZWRpYS1yZXNvdXJjZS1zcGVj aWZpYyB0ZXh0IHRyYWNrcy4KKworICAgIC8vIDYuMyAtIFNldCB0aGUgZWxlbWVudCdzIG5ldHdv cmtTdGF0ZSBhdHRyaWJ1dGUgdG8gdGhlIE5FVFdPUktfTk9fU09VUkNFIHZhbHVlLgogICAgIG1f bmV0d29ya1N0YXRlID0gTkVUV09SS19OT19TT1VSQ0U7CiAKLSAgICAvLyA3IC0gUXVldWUgYSB0 YXNrIHRvIGZpcmUgYSBwcm9ncmVzcyBldmVudCBjYWxsZWQgZXJyb3IgYXQgdGhlIG1lZGlhIGVs ZW1lbnQsIGluCi0gICAgLy8gdGhlIGNvbnRleHQgb2YgdGhlIGZldGNoaW5nIHByb2Nlc3MgdGhh dCB3YXMgdXNlZCB0byB0cnkgdG8gb2J0YWluIHRoZSBtZWRpYQotICAgIC8vIHJlc291cmNlIGlu IHRoZSByZXNvdXJjZSBmZXRjaCBhbGdvcml0aG0uCisgICAgLy8gNyAtIFF1ZXVlIGEgdGFzayB0 byBmaXJlIGEgc2ltcGxlIGV2ZW50IG5hbWVkIGVycm9yIGF0IHRoZSBtZWRpYSBlbGVtZW50Lgog ICAgIHNjaGVkdWxlRXZlbnQoZXZlbnROYW1lcygpLmVycm9yRXZlbnQpOwogCiAgICAgLy8gOCAt IFNldCB0aGUgZWxlbWVudCdzIGRlbGF5aW5nLXRoZS1sb2FkLWV2ZW50IGZsYWcgdG8gZmFsc2Uu IFRoaXMgc3RvcHMgZGVsYXlpbmcgdGhlIGxvYWQgZXZlbnQuCiAgICAgc2V0U2hvdWxkRGVsYXlM b2FkRXZlbnQoZmFsc2UpOwogCi0gICAgLy8gOSAtQWJvcnQgdGhlc2Ugc3RlcHMuIFVudGlsIHRo ZSBsb2FkKCkgbWV0aG9kIGlzIGludm9rZWQsIHRoZSBlbGVtZW50IHdvbid0IGF0dGVtcHQgdG8g bG9hZCBhbm90aGVyIHJlc291cmNlLgorICAgIC8vIDkgLSBBYm9ydCB0aGVzZSBzdGVwcy4gVW50 aWwgdGhlIGxvYWQoKSBtZXRob2QgaXMgaW52b2tlZCBvciB0aGUgc3JjIGF0dHJpYnV0ZSBpcyBj aGFuZ2VkLCAKKyAgICAvLyB0aGUgZWxlbWVudCB3b24ndCBhdHRlbXB0IHRvIGxvYWQgYW5vdGhl ciByZXNvdXJjZS4KIAogICAgIHVwZGF0ZURpc3BsYXlTdGF0ZSgpOwogCkluZGV4OiBMYXlvdXRU ZXN0cy9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCShyZXZp c2lvbiA5MTQ0MSkKKysrIExheW91dFRlc3RzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAt MSwzICsxLDEzIEBACisyMDExLTA3LTIwICBFcmljIENhcmxzb24gIDxlcmljLmNhcmxzb25AYXBw bGUuY29tPgorCisgICAgICAgIGxvYWQoKSBkb2VzIG5vdCByZXNldCB0aGUgcmVzb3VyY2Ugc2Vs ZWN0aW9uIGFsZ29yaXRobQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9NjQ5MTcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICAqIG1lZGlhL3ZpZGVvLXNvdXJjZS1sb2FkLWV4cGVjdGVkLnR4dDogQWRkZWQuCisg ICAgICAgICogbWVkaWEvdmlkZW8tc291cmNlLWxvYWQuaHRtbDogQWRkZWQuCisKIDIwMTEtMDct MjAgIFJ5b3N1a2UgTml3YSAgPHJuaXdhQHdlYmtpdC5vcmc+CiAKICAgICAgICAgW2Nocm9taXVt XSBTaGFkb3ctcmVsYXRlZCB0ZXN0cyBuZWVkIHJlYmFzZWxpbmluZyBhZnRlciByODUyOTkKSW5k ZXg6IExheW91dFRlc3RzL21lZGlhL3ZpZGVvLXNvdXJjZS1sb2FkLWV4cGVjdGVkLnR4dAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9tZWRpYS92aWRlby1zb3VyY2UtbG9hZC1leHBlY3RlZC50 eHQJKHJldmlzaW9uIDApCisrKyBMYXlvdXRUZXN0cy9tZWRpYS92aWRlby1zb3VyY2UtbG9hZC1l eHBlY3RlZC50eHQJKHJldmlzaW9uIDApCkBAIC0wLDAgKzEsMTggQEAKK1Rlc3QgdGhhdCB0aGUg cmVzb3VyY2Ugc2VsZWN0aW9uIGFsZ29yaXRobSBpcyByZXN0YXJ0ZWQgd2hlbiBsb2FkKCkgaXMg Y2FsbGVkLCBhbmQgdGhhdCBhbGwgPHNvdXJjZT4gZWxlbWVudHMgYXJlIHJlY29uc2lkZXJlZC4K KworKysrIFRlc3QgaW5pdGlhbCBuZXR3b3JrU3RhdGUuCitFWFBFQ1RFRCAodmlkZW8ubmV0d29y a1N0YXRlID09ICcwJykgT0sKKworKysrIFRlc3QgbmV0d29ya1N0YXRlIGFmdGVyIGFkZGluZyA8 c291cmNlPi4KK0VYUEVDVEVEICh2aWRlby5uZXR3b3JrU3RhdGUgPT0gJzMnKSBPSworCitFVkVO VChlcnJvcikKK0VWRU5UKGNhbnBsYXl0aHJvdWdoKQorRVhQRUNURUQgKHN0cmlwRXh0ZW5zaW9u KHJlbGF0aXZlVVJMKHZpZGVvLmN1cnJlbnRTcmMpKSA9PSAnY29udGVudC90ZXN0JykgT0sKKwor KysrIENhbGxpbmcgbG9hZCgpLgorRVZFTlQoZXJyb3IpCitFVkVOVChjYW5wbGF5dGhyb3VnaCkK K0VYUEVDVEVEIChzdHJpcEV4dGVuc2lvbihyZWxhdGl2ZVVSTCh2aWRlby5jdXJyZW50U3JjKSkg PT0gJ2NvbnRlbnQvdGVzdCcpIE9LCitFTkQgT0YgVEVTVAorCkluZGV4OiBMYXlvdXRUZXN0cy9t ZWRpYS92aWRlby1zb3VyY2UtbG9hZC5odG1sCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL21l ZGlhL3ZpZGVvLXNvdXJjZS1sb2FkLmh0bWwJKHJldmlzaW9uIDApCisrKyBMYXlvdXRUZXN0cy9t ZWRpYS92aWRlby1zb3VyY2UtbG9hZC5odG1sCShyZXZpc2lvbiAwKQpAQCAtMCwwICsxLDYyIEBA Cis8IWRvY3R5cGUgaHRtbD4KKzxodG1sPgorICAgIDxoZWFkPgorICAgICAgICA8dGl0bGU+bG9h ZCgpIGFuZCB0aGUgJmx0O3NvdXJjZSZndDsgZWxlbWVudDwvdGl0bGU+CisgICAgICAgIDxzY3Jp cHQgc3JjPXZpZGVvLXRlc3QuanM+PC9zY3JpcHQ+CisgICAgICAgIDxzY3JpcHQgc3JjPW1lZGlh LWZpbGUuanM+PC9zY3JpcHQ+CisgICAgICAgIDxzY3JpcHQ+CisgICAgICAgICAgICB2YXIgc291 cmNlcyA9IFtdOworICAgICAgICAgICAgdmFyIGNvdW50ID0gMDsKKworICAgICAgICAgICAgZnVu Y3Rpb24gY2FucGxheXRocm91Z2goKSAKKyAgICAgICAgICAgIHsKKyAgICAgICAgICAgICAgICB0 ZXN0RXhwZWN0ZWQoInN0cmlwRXh0ZW5zaW9uKHJlbGF0aXZlVVJMKHZpZGVvLmN1cnJlbnRTcmMp KSIsIHJlbGF0aXZlVVJMKHN0cmlwRXh0ZW5zaW9uKHNvdXJjZXNbMV0pKSk7CisgICAgICAgICAg ICAgICAgKytjb3VudDsKKyAgICAgICAgICAgICAgICBzd2l0Y2ggKGNvdW50KSAKKyAgICAgICAg ICAgICAgICB7CisgICAgICAgICAgICAgICAgICAgIGNhc2UgMToKKyAgICAgICAgICAgICAgICAg ICAgICAgIGNvbnNvbGVXcml0ZSgiPGJyPisrKyBDYWxsaW5nIGxvYWQoKS4iKTsKKyAgICAgICAg ICAgICAgICAgICAgICAgIHZpZGVvLmxvYWQoKTsKKyAgICAgICAgICAgICAgICAgICAgICAgIGJy ZWFrOworICAgICAgICAgICAgICAgICAgICBjYXNlIDI6CisgICAgICAgICAgICAgICAgICAgICAg ICBlbmRUZXN0KCk7CisgICAgICAgICAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgICAgICAg ICB9CisgICAgICAgICAgICB9CisKKyAgICAgICAgICAgIGZ1bmN0aW9uIGFkZFNvdXJjZSh0eXBl LCBuYW1lKQorICAgICAgICAgICAgeworICAgICAgICAgICAgICAgIHZhciBzb3VyY2UgPSBkb2N1 bWVudC5jcmVhdGVFbGVtZW50KCdzb3VyY2UnKTsKKyAgICAgICAgICAgICAgICBzb3VyY2Uuc3Jj ID0gZmluZE1lZGlhRmlsZSh0eXBlLCBuYW1lKTsKKyAgICAgICAgICAgICAgICBzb3VyY2VzLnB1 c2goc291cmNlLnNyYyk7CisgICAgICAgICAgICAgICAgc291cmNlLnR5cGUgPSBtaW1lVHlwZUZv ckV4dGVuc2lvbihzb3VyY2Uuc3JjLnNwbGl0KCcuJylbMV0pOworICAgICAgICAgICAgICAgIHZp ZGVvLmFwcGVuZENoaWxkKHNvdXJjZSk7CisgICAgICAgICAgICB9CisKKyAgICAgICAgICAgIGZ1 bmN0aW9uIHNldHVwKCkKKyAgICAgICAgICAgIHsKKyAgICAgICAgICAgICAgICB2aWRlbyA9IG1l ZGlhRWxlbWVudCA9IGRvY3VtZW50LmdldEVsZW1lbnRzQnlUYWdOYW1lKCd2aWRlbycpWzBdOwor CisgICAgICAgICAgICAgICAgY29uc29sZVdyaXRlKCIrKysgVGVzdCBpbml0aWFsIG5ldHdvcmtT dGF0ZS4iKTsKKyAgICAgICAgICAgICAgICB0ZXN0RXhwZWN0ZWQoInZpZGVvLm5ldHdvcmtTdGF0 ZSIsIEhUTUxNZWRpYUVsZW1lbnQucHJvdG90eXBlLk5FVFdPUktfRU1QVFksICI9PSIpOworCisg ICAgICAgICAgICAgICAgLy8gQWRkIGFuIGludmFsaWQgdXJsIHRvIHRoZSBmaXJzdCBzb3VyY2Ug c28gd2UgdGVzdCBnZXR0aW5nIGFuIGVycm9yIGV2ZW50CisgICAgICAgICAgICAgICAgLy8gZWFj aCB0aW1lIHJlc291cmNlIHNlbGVjdGlvbiBydW5zLgorICAgICAgICAgICAgICAgIGFkZFNvdXJj ZSgidmlkZW8iLCAiY29udGVudC9ib2d1cyIpOworICAgICAgICAgICAgICAgIGFkZFNvdXJjZSgi dmlkZW8iLCAiY29udGVudC90ZXN0Iik7CisgICAgICAgICAgICAgICAgYWRkU291cmNlKCJhdWRp byIsICJjb250ZW50L3Rlc3QiKTsKKworICAgICAgICAgICAgICAgIGNvbnNvbGVXcml0ZSgiPGJy PisrKyBUZXN0IG5ldHdvcmtTdGF0ZSBhZnRlciBhZGRpbmcgJmx0O3NvdXJjZSZndDsuIik7Cisg ICAgICAgICAgICAgICAgdGVzdEV4cGVjdGVkKCJ2aWRlby5uZXR3b3JrU3RhdGUiLCBIVE1MTWVk aWFFbGVtZW50LnByb3RvdHlwZS5ORVRXT1JLX05PX1NPVVJDRSwgIj09Iik7CisKKyAgICAgICAg ICAgICAgICB3YWl0Rm9yRXZlbnQoImNhbnBsYXl0aHJvdWdoIiwgY2FucGxheXRocm91Z2gpOwor ICAgICAgICAgICAgICAgIHdhaXRGb3JFdmVudCgiZXJyb3IiKTsKKyAgICAgICAgICAgICAgICBj b25zb2xlV3JpdGUoIiIpOworICAgICAgICAgICAgfQorICAgICAgICA8L3NjcmlwdD4KKyAgICA8 L2hlYWQ+CisgICAgPGJvZHkgb25sb2FkPSJzZXR1cCgpIj4KKyAgICAgICAgPHZpZGVvIGNvbnRy b2xzIHdpZHRoPTMwMCBoZWlnaHQ9MTUwPjwvdmlkZW8+CisgICAgICAgIDxwPlRlc3QgdGhhdCB0 aGUgcmVzb3VyY2Ugc2VsZWN0aW9uIGFsZ29yaXRobSBpcyByZXN0YXJ0ZWQgd2hlbiBsb2FkKCkg aXMgY2FsbGVkLCBhbmQgdGhhdCBhbGwgJmx0O3NvdXJjZSZndDsgZWxlbWVudHMgYXJlIHJlY29u c2lkZXJlZC48L3A+CisgICAgPC9ib2R5PgorPC9odG1sPgo= 106027 2011-09-01 14:11:37 -0700 2011-09-01 14:59:33 -0700 Updated patch patch_2.txt text/plain 9428 eric.carlson SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDk0MzI0KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTEtMDktMDEgIEVyaWMgQ2Fy bHNvbiAgPGVyaWMuY2FybHNvbkBhcHBsZS5jb20+CisKKyAgICAgICAgbG9hZCgpIGRvZXMgbm90 IHJlc2V0IHRoZSByZXNvdXJjZSBzZWxlY3Rpb24gYWxnb3JpdGhtCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02NDkxNworCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRlc3Q6IG1lZGlhL3ZpZGVvLXNvdXJjZS1s b2FkLmh0bWwKKworICAgICAgICAqIGh0bWwvSFRNTE1lZGlhRWxlbWVudC5jcHA6CisgICAgICAg IChXZWJDb3JlOjpIVE1MTWVkaWFFbGVtZW50OjpzZWxlY3RNZWRpYVJlc291cmNlKTogUmVzZXQg bV9uZXh0Q2hpbGROb2RlVG9Db25zaWRlciwgdXBkYXRlCisgICAgICAgICAgICBjb21tZW50cyBh bmQgcmVhcnJhbmdlIGxvZ2ljIHRvIG1vcmUgY2xvc2VseSBtYXRjaCBsb2dpYyBpbiBzcGVjLgor ICAgICAgICAoV2ViQ29yZTo6SFRNTE1lZGlhRWxlbWVudDo6bm9uZVN1cHBvcnRlZCk6IFVwZGF0 ZSBjb21tZW50cy4KKwogMjAxMS0wOS0wMSAgU2ltb24gRnJhc2VyICA8c2ltb24uZnJhc2VyQGFw cGxlLmNvbT4KIAogICAgICAgICBSRUdSRVNTSU9OIChyOTQyNTkpOiBUd28gdGVzdHMgZG9pbmcg aGl0IHRlc3Rpbmcgd2VyZSBicm9rZW4gYnkgdGhpcyBjaGFuZ2UuCkluZGV4OiBTb3VyY2UvV2Vi Q29yZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJD b3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVudC5jcHAJKHJldmlzaW9uIDk0MzE4KQorKysgU291cmNl L1dlYkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVtZW50LmNwcAkod29ya2luZyBjb3B5KQpAQCAtNjM1 LDI5ICs2MzUsMzUgQEAgdm9pZCBIVE1MTWVkaWFFbGVtZW50OjpzZWxlY3RNZWRpYVJlc291cgog ICAgIExPRyhNZWRpYSwgIkhUTUxNZWRpYUVsZW1lbnQ6OnNlbGVjdE1lZGlhUmVzb3VyY2UiKTsK IAogICAgIGVudW0gTW9kZSB7IGF0dHJpYnV0ZSwgY2hpbGRyZW4gfTsKLSAgICBNb2RlIG1vZGUg PSBhdHRyaWJ1dGU7CiAKLSAgICAvLyAzIC0gLi4uIHRoZSBtZWRpYSBlbGVtZW50IGhhcyBuZWl0 aGVyIGEgc3JjIGF0dHJpYnV0ZSAuLi4KKyAgICAKKyAgICAvLyAzIC0gSWYgdGhlIG1lZGlhIGVs ZW1lbnQgaGFzIGEgc3JjIGF0dHJpYnV0ZSwgdGhlbiBsZXQgbW9kZSBiZSBhdHRyaWJ1dGUuCisg ICAgTW9kZSBtb2RlID0gYXR0cmlidXRlOwogICAgIGlmICghaGFzQXR0cmlidXRlKHNyY0F0dHIp KSB7Ci0gICAgICAgIC8vIC4uLiBub3IgYSBzb3VyY2UgZWxlbWVudCBjaGlsZDogLi4uCiAgICAg ICAgIE5vZGUqIG5vZGU7CiAgICAgICAgIGZvciAobm9kZSA9IGZpcnN0Q2hpbGQoKTsgbm9kZTsg bm9kZSA9IG5vZGUtPm5leHRTaWJsaW5nKCkpIHsKICAgICAgICAgICAgIGlmIChub2RlLT5oYXNU YWdOYW1lKHNvdXJjZVRhZykpCiAgICAgICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgIH0KIAot ICAgICAgICBpZiAoIW5vZGUpIHsKKyAgICAgICAgLy8gT3RoZXJ3aXNlLCBpZiB0aGUgbWVkaWEg ZWxlbWVudCBkb2VzIG5vdCBoYXZlIGEgc3JjIGF0dHJpYnV0ZSBidXQgaGFzIGEgc291cmNlIAor ICAgICAgICAvLyBlbGVtZW50IGNoaWxkLCB0aGVuIGxldCBtb2RlIGJlIGNoaWxkcmVuIGFuZCBs ZXQgY2FuZGlkYXRlIGJlIHRoZSBmaXJzdCBzdWNoIAorICAgICAgICAvLyBzb3VyY2UgZWxlbWVu dCBjaGlsZCBpbiB0cmVlIG9yZGVyLgorICAgICAgICBpZiAobm9kZSkgeworICAgICAgICAgICAg bW9kZSA9IGNoaWxkcmVuOworICAgICAgICAgICAgbV9uZXh0Q2hpbGROb2RlVG9Db25zaWRlciA9 IDA7CisgICAgICAgICAgICBtX2N1cnJlbnRTb3VyY2VOb2RlID0gMDsKKyAgICAgICAgfSBlbHNl IHsKKyAgICAgICAgICAgIC8vIE90aGVyd2lzZSB0aGUgbWVkaWEgZWxlbWVudCBoYXMgbmVpdGhl ciBhIHNyYyBhdHRyaWJ1dGUgbm9yIGEgc291cmNlIGVsZW1lbnQgCisgICAgICAgICAgICAvLyBj aGlsZDogc2V0IHRoZSBuZXR3b3JrU3RhdGUgdG8gTkVUV09SS19FTVBUWSwgYW5kIGFib3J0IHRo ZXNlIHN0ZXBzOyB0aGUgCisgICAgICAgICAgICAvLyBzeW5jaHJvbm91cyBzZWN0aW9uIGVuZHMu CiAgICAgICAgICAgICBtX2xvYWRTdGF0ZSA9IFdhaXRpbmdGb3JTb3VyY2U7CiAgICAgICAgICAg ICBzZXRTaG91bGREZWxheUxvYWRFdmVudChmYWxzZSk7Ci0KLSAgICAgICAgICAgIC8vIC4uLiBz ZXQgdGhlIG5ldHdvcmtTdGF0ZSB0byBORVRXT1JLX0VNUFRZLCBhbmQgYWJvcnQgdGhlc2Ugc3Rl cHMKICAgICAgICAgICAgIG1fbmV0d29ya1N0YXRlID0gTkVUV09SS19FTVBUWTsKIAogICAgICAg ICAgICAgTE9HKE1lZGlhLCAiSFRNTE1lZGlhRWxlbWVudDo6c2VsZWN0TWVkaWFSZXNvdXJjZSwg bm90aGluZyB0byBsb2FkIik7CiAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgIH0KLQotICAg ICAgICBtb2RlID0gY2hpbGRyZW47CiAgICAgfQogCiAgICAgLy8gNCAtIFNldCB0aGUgbWVkaWEg ZWxlbWVudCdzIGRlbGF5aW5nLXRoZS1sb2FkLWV2ZW50IGZsYWcgdG8gdHJ1ZSAodGhpcyBkZWxh eXMgdGhlIGxvYWQgZXZlbnQpLCAKQEAgLTY2NSw3ICs2NzEsNyBAQCB2b2lkIEhUTUxNZWRpYUVs ZW1lbnQ6OnNlbGVjdE1lZGlhUmVzb3VyCiAgICAgc2V0U2hvdWxkRGVsYXlMb2FkRXZlbnQodHJ1 ZSk7CiAgICAgbV9uZXR3b3JrU3RhdGUgPSBORVRXT1JLX0xPQURJTkc7CiAKLSAgICAvLyA1Cisg ICAgLy8gNSAtIFF1ZXVlIGEgdGFzayB0byBmaXJlIGEgc2ltcGxlIGV2ZW50IG5hbWVkIGxvYWRz dGFydCBhdCB0aGUgbWVkaWEgZWxlbWVudC4KICAgICBzY2hlZHVsZUV2ZW50KGV2ZW50TmFtZXMo KS5sb2Fkc3RhcnRFdmVudCk7CiAKICAgICAvLyA2IC0gSWYgbW9kZSBpcyBhdHRyaWJ1dGUsIHRo ZW4gcnVuIHRoZXNlIHN1YnN0ZXBzCkBAIC02OTQsNyArNzAwLDYgQEAgdm9pZCBIVE1MTWVkaWFF bGVtZW50OjpzZWxlY3RNZWRpYVJlc291cgogICAgIH0KIAogICAgIC8vIE90aGVyd2lzZSwgdGhl IHNvdXJjZSBlbGVtZW50cyB3aWxsIGJlIHVzZWQKLSAgICBtX2N1cnJlbnRTb3VyY2VOb2RlID0g MDsKICAgICBsb2FkTmV4dFNvdXJjZUNoaWxkKCk7CiB9CiAKQEAgLTg5NSwyMyArOTAwLDI3IEBA IHZvaWQgSFRNTE1lZGlhRWxlbWVudDo6bm9uZVN1cHBvcnRlZCgpCiAgICAgbV9sb2FkU3RhdGUg PSBXYWl0aW5nRm9yU291cmNlOwogICAgIG1fY3VycmVudFNvdXJjZU5vZGUgPSAwOwogCi0gICAg Ly8gNSAtIFJlYWNoaW5nIHRoaXMgc3RlcCBpbmRpY2F0ZXMgdGhhdCBlaXRoZXIgdGhlIFVSTCBm YWlsZWQgdG8gcmVzb2x2ZSwgb3IgdGhlIG1lZGlhCi0gICAgLy8gcmVzb3VyY2UgZmFpbGVkIHRv IGxvYWQuIFNldCB0aGUgZXJyb3IgYXR0cmlidXRlIHRvIGEgbmV3IE1lZGlhRXJyb3Igb2JqZWN0 IHdob3NlCi0gICAgLy8gY29kZSBhdHRyaWJ1dGUgaXMgc2V0IHRvIE1FRElBX0VSUl9TUkNfTk9U X1NVUFBPUlRFRC4KKyAgICAvLyA0LjguMTAuNSAKKyAgICAvLyA2IC0gUmVhY2hpbmcgdGhpcyBz dGVwIGluZGljYXRlcyB0aGF0IHRoZSBtZWRpYSByZXNvdXJjZSBmYWlsZWQgdG8gbG9hZCBvciB0 aGF0IHRoZSBnaXZlbiAKKyAgICAvLyBVUkwgY291bGQgbm90IGJlIHJlc29sdmVkLiBJbiBvbmUg YXRvbWljIG9wZXJhdGlvbiwgcnVuIHRoZSBmb2xsb3dpbmcgc3RlcHM6CisKKyAgICAvLyA2LjEg LSBTZXQgdGhlIGVycm9yIGF0dHJpYnV0ZSB0byBhIG5ldyBNZWRpYUVycm9yIG9iamVjdCB3aG9z ZSBjb2RlIGF0dHJpYnV0ZSBpcyBzZXQgdG8KKyAgICAvLyBNRURJQV9FUlJfU1JDX05PVF9TVVBQ T1JURUQuCiAgICAgbV9lcnJvciA9IE1lZGlhRXJyb3I6OmNyZWF0ZShNZWRpYUVycm9yOjpNRURJ QV9FUlJfU1JDX05PVF9TVVBQT1JURUQpOwogCi0gICAgLy8gNiAtIFNldCB0aGUgZWxlbWVudCdz IG5ldHdvcmtTdGF0ZSBhdHRyaWJ1dGUgdG8gdGhlIE5FVFdPUktfTk9fU09VUkNFIHZhbHVlLgor ICAgIC8vIDYuMiAtIEZvcmdldCB0aGUgbWVkaWEgZWxlbWVudCdzIG1lZGlhLXJlc291cmNlLXNw ZWNpZmljIHRleHQgdHJhY2tzLgorCisgICAgLy8gNi4zIC0gU2V0IHRoZSBlbGVtZW50J3MgbmV0 d29ya1N0YXRlIGF0dHJpYnV0ZSB0byB0aGUgTkVUV09SS19OT19TT1VSQ0UgdmFsdWUuCiAgICAg bV9uZXR3b3JrU3RhdGUgPSBORVRXT1JLX05PX1NPVVJDRTsKIAotICAgIC8vIDcgLSBRdWV1ZSBh IHRhc2sgdG8gZmlyZSBhIHByb2dyZXNzIGV2ZW50IGNhbGxlZCBlcnJvciBhdCB0aGUgbWVkaWEg ZWxlbWVudCwgaW4KLSAgICAvLyB0aGUgY29udGV4dCBvZiB0aGUgZmV0Y2hpbmcgcHJvY2VzcyB0 aGF0IHdhcyB1c2VkIHRvIHRyeSB0byBvYnRhaW4gdGhlIG1lZGlhCi0gICAgLy8gcmVzb3VyY2Ug aW4gdGhlIHJlc291cmNlIGZldGNoIGFsZ29yaXRobS4KKyAgICAvLyA3IC0gUXVldWUgYSB0YXNr IHRvIGZpcmUgYSBzaW1wbGUgZXZlbnQgbmFtZWQgZXJyb3IgYXQgdGhlIG1lZGlhIGVsZW1lbnQu CiAgICAgc2NoZWR1bGVFdmVudChldmVudE5hbWVzKCkuZXJyb3JFdmVudCk7CiAKICAgICAvLyA4 IC0gU2V0IHRoZSBlbGVtZW50J3MgZGVsYXlpbmctdGhlLWxvYWQtZXZlbnQgZmxhZyB0byBmYWxz ZS4gVGhpcyBzdG9wcyBkZWxheWluZyB0aGUgbG9hZCBldmVudC4KICAgICBzZXRTaG91bGREZWxh eUxvYWRFdmVudChmYWxzZSk7CiAKLSAgICAvLyA5IC1BYm9ydCB0aGVzZSBzdGVwcy4gVW50aWwg dGhlIGxvYWQoKSBtZXRob2QgaXMgaW52b2tlZCwgdGhlIGVsZW1lbnQgd29uJ3QgYXR0ZW1wdCB0 byBsb2FkIGFub3RoZXIgcmVzb3VyY2UuCisgICAgLy8gOSAtIEFib3J0IHRoZXNlIHN0ZXBzLiBV bnRpbCB0aGUgbG9hZCgpIG1ldGhvZCBpcyBpbnZva2VkIG9yIHRoZSBzcmMgYXR0cmlidXRlIGlz IGNoYW5nZWQsIAorICAgIC8vIHRoZSBlbGVtZW50IHdvbid0IGF0dGVtcHQgdG8gbG9hZCBhbm90 aGVyIHJlc291cmNlLgogCiAgICAgdXBkYXRlRGlzcGxheVN0YXRlKCk7CiAKSW5kZXg6IExheW91 dFRlc3RzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDk0MzE4KQorKysgTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTMgQEAKKzIwMTEtMDktMDEgIEVyaWMgQ2FybHNvbiAgPGVyaWMuY2FybHNvbkBh cHBsZS5jb20+CisKKyAgICAgICAgbG9hZCgpIGRvZXMgbm90IHJlc2V0IHRoZSByZXNvdXJjZSBz ZWxlY3Rpb24gYWxnb3JpdGhtCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD02NDkxNworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgICogbWVkaWEvdmlkZW8tc291cmNlLWxvYWQtZXhwZWN0ZWQudHh0OiBBZGRlZC4K KyAgICAgICAgKiBtZWRpYS92aWRlby1zb3VyY2UtbG9hZC5odG1sOiBBZGRlZC4KKwogMjAxMS0w OS0wMSAgRXJpYyBDYXJsc29uICA8ZXJpYy5jYXJsc29uQGFwcGxlLmNvbT4KIAogICAgICAgICBB ZGQgJ211dGVkJyBjb250ZW50IGF0dHJpYnV0ZSB0byBIVE1MTWVkaWFFbGVtZW50CkluZGV4OiBM YXlvdXRUZXN0cy9tZWRpYS92aWRlby1zb3VyY2UtbG9hZC1leHBlY3RlZC50eHQKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gTGF5b3V0VGVzdHMvbWVkaWEvdmlkZW8tc291cmNlLWxvYWQtZXhwZWN0ZWQudHh0CShy ZXZpc2lvbiAwKQorKysgTGF5b3V0VGVzdHMvbWVkaWEvdmlkZW8tc291cmNlLWxvYWQtZXhwZWN0 ZWQudHh0CShyZXZpc2lvbiAwKQpAQCAtMCwwICsxLDE3IEBACitUZXN0IHRoYXQgdGhlIHJlc291 cmNlIHNlbGVjdGlvbiBhbGdvcml0aG0gaXMgcmVzdGFydGVkIHdoZW4gbG9hZCgpIGlzIGNhbGxl ZCwgYW5kIHRoYXQgYWxsIDxzb3VyY2U+IGVsZW1lbnRzIGFyZSByZWNvbnNpZGVyZWQuCisKKysr KyBUZXN0IGluaXRpYWwgbmV0d29ya1N0YXRlLgorRVhQRUNURUQgKHZpZGVvLm5ldHdvcmtTdGF0 ZSA9PSAnMCcpIE9LCisKKysrKyBBZGQgPHNvdXJjZT4gZWxlbWVudHMgdG8gdHJpZ2dlciBsb2Fk aW5nLCB0ZXN0IG5ldHdvcmtTdGF0ZS4KK0VYUEVDVEVEICh2aWRlby5uZXR3b3JrU3RhdGUgPT0g JzMnKSBPSworRVZFTlQoZXJyb3IpCitFVkVOVChjYW5wbGF5dGhyb3VnaCkKK0VYUEVDVEVEIChz dHJpcEV4dGVuc2lvbihyZWxhdGl2ZVVSTCh2aWRlby5jdXJyZW50U3JjKSkgPT0gJ2NvbnRlbnQv dGVzdCcpIE9LCisKKysrKyBDYWxsaW5nIGxvYWQoKS4KK0VWRU5UKGVycm9yKQorRVZFTlQoY2Fu cGxheXRocm91Z2gpCitFWFBFQ1RFRCAoc3RyaXBFeHRlbnNpb24ocmVsYXRpdmVVUkwodmlkZW8u Y3VycmVudFNyYykpID09ICdjb250ZW50L3Rlc3QnKSBPSworRU5EIE9GIFRFU1QKKwpJbmRleDog TGF5b3V0VGVzdHMvbWVkaWEvdmlkZW8tc291cmNlLWxvYWQuaHRtbAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBM YXlvdXRUZXN0cy9tZWRpYS92aWRlby1zb3VyY2UtbG9hZC5odG1sCShyZXZpc2lvbiAwKQorKysg TGF5b3V0VGVzdHMvbWVkaWEvdmlkZW8tc291cmNlLWxvYWQuaHRtbAkocmV2aXNpb24gMCkKQEAg LTAsMCArMSw2MSBAQAorPCFkb2N0eXBlIGh0bWw+Cis8aHRtbD4KKyAgICA8aGVhZD4KKyAgICAg ICAgPHRpdGxlPmxvYWQoKSBhbmQgdGhlICZsdDtzb3VyY2UmZ3Q7IGVsZW1lbnQ8L3RpdGxlPgor ICAgICAgICA8c2NyaXB0IHNyYz12aWRlby10ZXN0LmpzPjwvc2NyaXB0PgorICAgICAgICA8c2Ny aXB0IHNyYz1tZWRpYS1maWxlLmpzPjwvc2NyaXB0PgorICAgICAgICA8c2NyaXB0PgorICAgICAg ICAgICAgdmFyIHNvdXJjZXMgPSBbXTsKKyAgICAgICAgICAgIHZhciBjb3VudCA9IDA7CisKKyAg ICAgICAgICAgIGZ1bmN0aW9uIGNhbnBsYXl0aHJvdWdoKCkgCisgICAgICAgICAgICB7CisgICAg ICAgICAgICAgICAgdGVzdEV4cGVjdGVkKCJzdHJpcEV4dGVuc2lvbihyZWxhdGl2ZVVSTCh2aWRl by5jdXJyZW50U3JjKSkiLCByZWxhdGl2ZVVSTChzdHJpcEV4dGVuc2lvbihzb3VyY2VzWzFdKSkp OworICAgICAgICAgICAgICAgICsrY291bnQ7CisgICAgICAgICAgICAgICAgc3dpdGNoIChjb3Vu dCkgCisgICAgICAgICAgICAgICAgeworICAgICAgICAgICAgICAgICAgICBjYXNlIDE6CisgICAg ICAgICAgICAgICAgICAgICAgICBjb25zb2xlV3JpdGUoIjxicj4rKysgQ2FsbGluZyBsb2FkKCku Iik7CisgICAgICAgICAgICAgICAgICAgICAgICB2aWRlby5sb2FkKCk7CisgICAgICAgICAgICAg ICAgICAgICAgICBicmVhazsKKyAgICAgICAgICAgICAgICAgICAgY2FzZSAyOgorICAgICAgICAg ICAgICAgICAgICAgICAgZW5kVGVzdCgpOworICAgICAgICAgICAgICAgICAgICByZXR1cm47Cisg ICAgICAgICAgICAgICAgfQorICAgICAgICAgICAgfQorCisgICAgICAgICAgICBmdW5jdGlvbiBh ZGRTb3VyY2UodHlwZSwgbmFtZSkKKyAgICAgICAgICAgIHsKKyAgICAgICAgICAgICAgICB2YXIg c291cmNlID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgnc291cmNlJyk7CisgICAgICAgICAgICAg ICAgc291cmNlLnNyYyA9IGZpbmRNZWRpYUZpbGUodHlwZSwgbmFtZSk7CisgICAgICAgICAgICAg ICAgc291cmNlcy5wdXNoKHNvdXJjZS5zcmMpOworICAgICAgICAgICAgICAgIHNvdXJjZS50eXBl ID0gbWltZVR5cGVGb3JFeHRlbnNpb24oc291cmNlLnNyYy5zcGxpdCgnLicpWzFdKTsKKyAgICAg ICAgICAgICAgICB2aWRlby5hcHBlbmRDaGlsZChzb3VyY2UpOworICAgICAgICAgICAgfQorCisg ICAgICAgICAgICBmdW5jdGlvbiBzZXR1cCgpCisgICAgICAgICAgICB7CisgICAgICAgICAgICAg ICAgdmlkZW8gPSBtZWRpYUVsZW1lbnQgPSBkb2N1bWVudC5nZXRFbGVtZW50c0J5VGFnTmFtZSgn dmlkZW8nKVswXTsKKworICAgICAgICAgICAgICAgIGNvbnNvbGVXcml0ZSgiKysrIFRlc3QgaW5p dGlhbCBuZXR3b3JrU3RhdGUuIik7CisgICAgICAgICAgICAgICAgdGVzdEV4cGVjdGVkKCJ2aWRl by5uZXR3b3JrU3RhdGUiLCBIVE1MTWVkaWFFbGVtZW50LnByb3RvdHlwZS5ORVRXT1JLX0VNUFRZ LCAiPT0iKTsKKworICAgICAgICAgICAgICAgIC8vIEFkZCBhbiBpbnZhbGlkIHVybCB0byB0aGUg Zmlyc3Qgc291cmNlIHNvIHdlIHRlc3QgZ2V0dGluZyBhbiBlcnJvciBldmVudAorICAgICAgICAg ICAgICAgIC8vIGVhY2ggdGltZSByZXNvdXJjZSBzZWxlY3Rpb24gcnVucy4KKyAgICAgICAgICAg ICAgICBhZGRTb3VyY2UoInZpZGVvIiwgImNvbnRlbnQvYm9ndXMiKTsKKyAgICAgICAgICAgICAg ICBhZGRTb3VyY2UoInZpZGVvIiwgImNvbnRlbnQvdGVzdCIpOworICAgICAgICAgICAgICAgIGFk ZFNvdXJjZSgiYXVkaW8iLCAiY29udGVudC90ZXN0Iik7CisKKyAgICAgICAgICAgICAgICBjb25z b2xlV3JpdGUoIjxicj4rKysgQWRkICZsdDtzb3VyY2UmZ3Q7IGVsZW1lbnRzIHRvIHRyaWdnZXIg bG9hZGluZywgdGVzdCBuZXR3b3JrU3RhdGUuIik7CisgICAgICAgICAgICAgICAgdGVzdEV4cGVj dGVkKCJ2aWRlby5uZXR3b3JrU3RhdGUiLCBIVE1MTWVkaWFFbGVtZW50LnByb3RvdHlwZS5ORVRX T1JLX05PX1NPVVJDRSwgIj09Iik7CisKKyAgICAgICAgICAgICAgICB3YWl0Rm9yRXZlbnQoImNh bnBsYXl0aHJvdWdoIiwgY2FucGxheXRocm91Z2gpOworICAgICAgICAgICAgICAgIHdhaXRGb3JF dmVudCgiZXJyb3IiKTsKKyAgICAgICAgICAgIH0KKyAgICAgICAgPC9zY3JpcHQ+CisgICAgPC9o ZWFkPgorICAgIDxib2R5IG9ubG9hZD0ic2V0dXAoKSI+CisgICAgICAgIDx2aWRlbyBjb250cm9s cyB3aWR0aD0zMDAgPjwvdmlkZW8+CisgICAgICAgIDxwPlRlc3QgdGhhdCB0aGUgcmVzb3VyY2Ug c2VsZWN0aW9uIGFsZ29yaXRobSBpcyByZXN0YXJ0ZWQgd2hlbiBsb2FkKCkgaXMgY2FsbGVkLCBh bmQgdGhhdCBhbGwgJmx0O3NvdXJjZSZndDsgZWxlbWVudHMgYXJlIHJlY29uc2lkZXJlZC48L3A+ CisgICAgPC9ib2R5PgorPC9odG1sPgo=