57544 2011-03-31 07:01:29 -0700 Web Inspector: remove dots at the end of error messages 2011-03-31 08:21:54 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 caseq caseq apavlov bweinstein commit-queue joepeck keishi loislo pfeldman pmuellr rik yurys oldest_to_newest 377123 0 caseq 2011-03-31 07:01:29 -0700 Error messages we return may be used as a part of a larger formatted message, e.g. in parenthesis, before a colon or comma, having a dot at the end of error messages does not fit this use well. 377143 1 87723 caseq 2011-03-31 07:25:25 -0700 Created attachment 87723 patch for i in *.cpp; do sed 's/\(errorString = ".*\)\.";/\1";/' $i >$i.tmp && mv $i.tmp $i; done 377165 2 87723 commit-queue 2011-03-31 08:21:49 -0700 Comment on attachment 87723 patch Clearing flags on attachment: 87723 Committed r82581: <http://trac.webkit.org/changeset/82581> 377166 3 commit-queue 2011-03-31 08:21:54 -0700 All reviewed patches have been landed. Closing bug. 87723 2011-03-31 07:25:25 -0700 2011-03-31 08:21:49 -0700 patch noperiods.diff text/plain 11429 caseq ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBmYzZkMWI1Li40YTNhNTBkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMzcg QEAKIDIwMTEtMDMtMzEgIEFuZHJleSBLb3N5YWtvdiAgPGNhc2VxQGNocm9taXVtLm9yZz4KIAor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXZWIgSW5zcGVj dG9yOiByZW1vdmUgcGVyaW9kcyBhdCB0aGUgZW5kIG9mIGVycm9yIG1lc3NhZ2VzCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01NzU0NAorCisgICAgICAg ICogaW5zcGVjdG9yL0luamVjdGVkU2NyaXB0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkluamVj dGVkU2NyaXB0OjpnZXRQcm9wZXJ0aWVzKToKKyAgICAgICAgKFdlYkNvcmU6OkluamVjdGVkU2Ny aXB0OjptYWtlT2JqZWN0Q2FsbCk6CisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3RvckNTU0Fn ZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvckNTU0FnZW50OjplbGVtZW50Rm9y SWQpOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yQ1NTQWdlbnQ6OnN0eWxlU2hlZXRGb3JJ ZCk6CisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3RvckRPTUFnZW50LmNwcDoKKyAgICAgICAg KFdlYkNvcmU6Okluc3BlY3RvckRPTUFnZW50Ojphc3NlcnROb2RlKToKKyAgICAgICAgKFdlYkNv cmU6Okluc3BlY3RvckRPTUFnZW50Ojphc3NlcnRFbGVtZW50KToKKyAgICAgICAgKFdlYkNvcmU6 Okluc3BlY3RvckRPTUFnZW50Ojphc3NlcnRIVE1MRWxlbWVudCk6CisgICAgICAgIChXZWJDb3Jl OjpJbnNwZWN0b3JET01BZ2VudDo6cXVlcnlTZWxlY3Rvcik6CisgICAgICAgIChXZWJDb3JlOjpJ bnNwZWN0b3JET01BZ2VudDo6cXVlcnlTZWxlY3RvckFsbCk6CisgICAgICAgIChXZWJDb3JlOjpJ bnNwZWN0b3JET01BZ2VudDo6c2V0QXR0cmlidXRlKToKKyAgICAgICAgKFdlYkNvcmU6Okluc3Bl Y3RvckRPTUFnZW50OjpyZW1vdmVBdHRyaWJ1dGUpOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVj dG9yRE9NQWdlbnQ6OnJlbW92ZU5vZGUpOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yRE9N QWdlbnQ6OnNldE5vZGVWYWx1ZSk6CisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3RvckRlYnVn Z2VyQWdlbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yRGVidWdnZXJBZ2VudDo6 c2V0UGF1c2VPbkV4Y2VwdGlvbnNTdGF0ZSk6CisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3Rv clJlc291cmNlQWdlbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yUmVzb3VyY2VB Z2VudDo6cmVzb3VyY2VDb250ZW50KToKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvclJlc291 cmNlQWdlbnQ6OnJlc291cmNlQ29udGVudEJhc2U2NCk6CisgICAgICAgIChXZWJDb3JlOjpJbnNw ZWN0b3JSZXNvdXJjZUFnZW50OjpnZXRSZXNvdXJjZUNvbnRlbnQpOgorICAgICAgICAqIGluc3Bl Y3Rvci9JbnNwZWN0b3JSdW50aW1lQWdlbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVj dG9yUnVudGltZUFnZW50OjpzZXRQcm9wZXJ0eVZhbHVlKToKKworMjAxMS0wMy0zMSAgQW5kcmV5 IEtvc3lha292ICA8Y2FzZXFAY2hyb21pdW0ub3JnPgorCiAgICAgICAgIFJldmlld2VkIGJ5IFBh dmVsIEZlbGRtYW4uCiAKICAgICAgICAgLSByZW1vdmVkIGRvY3VtZW50V2lkZSBwYXJhbWV0ZXIg dG8gcXVlcnlTZWxlY3RvcltBbGxdKCkgKHVzZXIgZG9jdW1lbnQgbm9kZSBpZCBpbnN0ZWFkKQpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luamVjdGVkU2NyaXB0LmNwcCBi L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbmplY3RlZFNjcmlwdC5jcHAKaW5kZXggZWUyZTM1 YS4uMmYyYTY4ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luamVjdGVk U2NyaXB0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5qZWN0ZWRTY3JpcHQu Y3BwCkBAIC04NSw3ICs4NSw3IEBAIHZvaWQgSW5qZWN0ZWRTY3JpcHQ6OmdldFByb3BlcnRpZXMo RXJyb3JTdHJpbmcqIGVycm9yU3RyaW5nLCBjb25zdCBTdHJpbmcmIG9iamVjCiAgICAgUmVmUHRy PEluc3BlY3RvclZhbHVlPiByZXN1bHQ7IAogICAgIG1ha2VDYWxsKGZ1bmN0aW9uLCAmcmVzdWx0 KTsKICAgICBpZiAoIXJlc3VsdCB8fCByZXN1bHQtPnR5cGUoKSAhPSBJbnNwZWN0b3JWYWx1ZTo6 VHlwZUFycmF5KSB7Ci0gICAgICAgICplcnJvclN0cmluZyA9ICJJbnRlcm5hbCBlcnJvci4iOwor ICAgICAgICAqZXJyb3JTdHJpbmcgPSAiSW50ZXJuYWwgZXJyb3IiOwogICAgICAgICByZXR1cm47 CiAgICAgfQogICAgICpwcm9wZXJ0aWVzID0gcmVzdWx0LT5hc0FycmF5KCk7CkBAIC0yMDksNyAr MjA5LDcgQEAgdm9pZCBJbmplY3RlZFNjcmlwdDo6bWFrZU9iamVjdENhbGwoRXJyb3JTdHJpbmcq IGVycm9yU3RyaW5nLCBTY3JpcHRGdW5jdGlvbkNhbGwKICAgICB9CiAKICAgICBpZiAoIXJlc3Vs dCB8fCByZXN1bHQtPnR5cGUoKSAhPSBJbnNwZWN0b3JWYWx1ZTo6VHlwZU9iamVjdCkgewotICAg ICAgICAqZXJyb3JTdHJpbmcgPSAiSW50ZXJuYWwgZXJyb3IuIjsKKyAgICAgICAgKmVycm9yU3Ry aW5nID0gIkludGVybmFsIGVycm9yIjsKICAgICAgICAgcmV0dXJuOwogICAgIH0KICAgICAqb2Jq ZWN0UmVzdWx0ID0gcmVzdWx0LT5hc09iamVjdCgpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL0luc3BlY3RvckNTU0FnZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9JbnNwZWN0b3JDU1NBZ2VudC5jcHAKaW5kZXggOTgwZmNmMi4uZDg2NGFjZiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckNTU0FnZW50LmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ1NTQWdlbnQuY3BwCkBAIC00MDIs MTEgKzQwMiwxMSBAQCBFbGVtZW50KiBJbnNwZWN0b3JDU1NBZ2VudDo6ZWxlbWVudEZvcklkKEVy cm9yU3RyaW5nKiBlcnJvclN0cmluZywgaW50IG5vZGVJZCkKIHsKICAgICBOb2RlKiBub2RlID0g bV9kb21BZ2VudC0+bm9kZUZvcklkKG5vZGVJZCk7CiAgICAgaWYgKCFub2RlKSB7Ci0gICAgICAg ICplcnJvclN0cmluZyA9ICJObyBub2RlIHdpdGggZ2l2ZW4gaWQgZm91bmQuIjsKKyAgICAgICAg KmVycm9yU3RyaW5nID0gIk5vIG5vZGUgd2l0aCBnaXZlbiBpZCBmb3VuZCI7CiAgICAgICAgIHJl dHVybiAwOwogICAgIH0KICAgICBpZiAobm9kZS0+bm9kZVR5cGUoKSAhPSBOb2RlOjpFTEVNRU5U X05PREUpIHsKLSAgICAgICAgKmVycm9yU3RyaW5nID0gIk5vdCBhbiBlbGVtZW50IG5vZGUuIjsK KyAgICAgICAgKmVycm9yU3RyaW5nID0gIk5vdCBhbiBlbGVtZW50IG5vZGUiOwogICAgICAgICBy ZXR1cm4gMDsKICAgICB9CiAgICAgcmV0dXJuIHN0YXRpY19jYXN0PEVsZW1lbnQqPihub2RlKTsK QEAgLTQ2OSw3ICs0NjksNyBAQCBJbnNwZWN0b3JTdHlsZVNoZWV0KiBJbnNwZWN0b3JDU1NBZ2Vu dDo6c3R5bGVTaGVldEZvcklkKEVycm9yU3RyaW5nKiBlcnJvclN0cmluZwogewogICAgIElkVG9J bnNwZWN0b3JTdHlsZVNoZWV0OjppdGVyYXRvciBpdCA9IG1faWRUb0luc3BlY3RvclN0eWxlU2hl ZXQuZmluZChzdHlsZVNoZWV0SWQpOwogICAgIGlmIChpdCA9PSBtX2lkVG9JbnNwZWN0b3JTdHls ZVNoZWV0LmVuZCgpKSB7Ci0gICAgICAgICplcnJvclN0cmluZyA9ICJObyBzdHlsZSBzaGVldCB3 aXRoIGdpdmVuIGlkIGZvdW5kLiI7CisgICAgICAgICplcnJvclN0cmluZyA9ICJObyBzdHlsZSBz aGVldCB3aXRoIGdpdmVuIGlkIGZvdW5kIjsKICAgICAgICAgcmV0dXJuIDA7CiAgICAgfQogICAg IHJldHVybiBpdC0+c2Vjb25kLmdldCgpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL0luc3BlY3RvckRPTUFnZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9J bnNwZWN0b3JET01BZ2VudC5jcHAKaW5kZXggNTA3NTc2Zi4uNTQ4M2NkOCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckRPTUFnZW50LmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRE9NQWdlbnQuY3BwCkBAIC0zOTcsNyArMzk3 LDcgQEAgTm9kZSogSW5zcGVjdG9yRE9NQWdlbnQ6OmFzc2VydE5vZGUoRXJyb3JTdHJpbmcqIGVy cm9yU3RyaW5nLCBpbnQgbm9kZUlkKQogewogICAgIE5vZGUqIG5vZGUgPSBub2RlRm9ySWQobm9k ZUlkKTsKICAgICBpZiAoIW5vZGUpIHsKLSAgICAgICAgKmVycm9yU3RyaW5nID0gIkNvdWxkIG5v dCBmaW5kIG5vZGUgd2l0aCBnaXZlbiBpZC4iOworICAgICAgICAqZXJyb3JTdHJpbmcgPSAiQ291 bGQgbm90IGZpbmQgbm9kZSB3aXRoIGdpdmVuIGlkIjsKICAgICAgICAgcmV0dXJuIDA7CiAgICAg fQogICAgIHJldHVybiBub2RlOwpAQCAtNDEwLDcgKzQxMCw3IEBAIEVsZW1lbnQqIEluc3BlY3Rv ckRPTUFnZW50Ojphc3NlcnRFbGVtZW50KEVycm9yU3RyaW5nKiBlcnJvclN0cmluZywgaW50IG5v ZGVJZCkKICAgICAgICAgcmV0dXJuIDA7CiAKICAgICBpZiAobm9kZS0+bm9kZVR5cGUoKSAhPSBO b2RlOjpFTEVNRU5UX05PREUpIHsKLSAgICAgICAgKmVycm9yU3RyaW5nID0gIk5vZGUgaXMgbm90 IGFuIEVsZW1lbnQuIjsKKyAgICAgICAgKmVycm9yU3RyaW5nID0gIk5vZGUgaXMgbm90IGFuIEVs ZW1lbnQiOwogICAgICAgICByZXR1cm4gMDsKICAgICB9CiAgICAgcmV0dXJuIHRvRWxlbWVudChu b2RlKTsKQEAgLTQyNCw3ICs0MjQsNyBAQCBIVE1MRWxlbWVudCogSW5zcGVjdG9yRE9NQWdlbnQ6 OmFzc2VydEhUTUxFbGVtZW50KEVycm9yU3RyaW5nKiBlcnJvclN0cmluZywgaW50CiAgICAgICAg IHJldHVybiAwOwogCiAgICAgaWYgKCFlbGVtZW50LT5pc0hUTUxFbGVtZW50KCkpIHsKLSAgICAg ICAgKmVycm9yU3RyaW5nID0gIk5vZGUgaXMgbm90IGFuIEhUTUwgRWxlbWVudC4iOworICAgICAg ICAqZXJyb3JTdHJpbmcgPSAiTm9kZSBpcyBub3QgYW4gSFRNTCBFbGVtZW50IjsKICAgICAgICAg cmV0dXJuIDA7CiAgICAgfQogICAgIHJldHVybiB0b0hUTUxFbGVtZW50KGVsZW1lbnQpOwpAQCAt NDk0LDcgKzQ5NCw3IEBAIHZvaWQgSW5zcGVjdG9yRE9NQWdlbnQ6OnF1ZXJ5U2VsZWN0b3IoRXJy b3JTdHJpbmcqIGVycm9yU3RyaW5nLCBpbnQgbm9kZUlkLCBjb25zCiAgICAgRXhjZXB0aW9uQ29k ZSBlYyA9IDA7CiAgICAgUmVmUHRyPEVsZW1lbnQ+IGVsZW1lbnQgPSBub2RlLT5xdWVyeVNlbGVj dG9yKHNlbGVjdG9ycywgZWMpOwogICAgIGlmIChlYykgewotICAgICAgICAqZXJyb3JTdHJpbmcg PSAiRE9NIEVycm9yIHdoaWxlIHF1ZXJ5aW5nLiI7CisgICAgICAgICplcnJvclN0cmluZyA9ICJE T00gRXJyb3Igd2hpbGUgcXVlcnlpbmciOwogICAgICAgICByZXR1cm47CiAgICAgfQogCkBAIC01 MTEsNyArNTExLDcgQEAgdm9pZCBJbnNwZWN0b3JET01BZ2VudDo6cXVlcnlTZWxlY3RvckFsbChF cnJvclN0cmluZyogZXJyb3JTdHJpbmcsIGludCBub2RlSWQsIGMKICAgICBFeGNlcHRpb25Db2Rl IGVjID0gMDsKICAgICBSZWZQdHI8Tm9kZUxpc3Q+IG5vZGVzID0gbm9kZS0+cXVlcnlTZWxlY3Rv ckFsbChzZWxlY3RvcnMsIGVjKTsKICAgICBpZiAoZWMpIHsKLSAgICAgICAgKmVycm9yU3RyaW5n ID0gIkRPTSBFcnJvciB3aGlsZSBxdWVyeWluZy4iOworICAgICAgICAqZXJyb3JTdHJpbmcgPSAi RE9NIEVycm9yIHdoaWxlIHF1ZXJ5aW5nIjsKICAgICAgICAgcmV0dXJuOwogICAgIH0KIApAQCAt NTc3LDcgKzU3Nyw3IEBAIHZvaWQgSW5zcGVjdG9yRE9NQWdlbnQ6OnNldEF0dHJpYnV0ZShFcnJv clN0cmluZyogZXJyb3JTdHJpbmcsIGludCBlbGVtZW50SWQsIGNvCiAgICAgICAgIEV4Y2VwdGlv bkNvZGUgZWMgPSAwOwogICAgICAgICBlbGVtZW50LT5zZXRBdHRyaWJ1dGUobmFtZSwgdmFsdWUs IGVjKTsKICAgICAgICAgaWYgKGVjKQotICAgICAgICAgICAgKmVycm9yU3RyaW5nID0gIkV4Y2Vw dGlvbiB3aGlsZSBzZXR0aW5nIGF0dHJpYnV0ZSB2YWx1ZS4iOworICAgICAgICAgICAgKmVycm9y U3RyaW5nID0gIkV4Y2VwdGlvbiB3aGlsZSBzZXR0aW5nIGF0dHJpYnV0ZSB2YWx1ZSI7CiAgICAg fQogfQogCkBAIC01ODgsNyArNTg4LDcgQEAgdm9pZCBJbnNwZWN0b3JET01BZ2VudDo6cmVtb3Zl QXR0cmlidXRlKEVycm9yU3RyaW5nKiBlcnJvclN0cmluZywgaW50IGVsZW1lbnRJZCwKICAgICAg ICAgRXhjZXB0aW9uQ29kZSBlYyA9IDA7CiAgICAgICAgIGVsZW1lbnQtPnJlbW92ZUF0dHJpYnV0 ZShuYW1lLCBlYyk7CiAgICAgICAgIGlmIChlYykKLSAgICAgICAgICAgICplcnJvclN0cmluZyA9 ICJFeGNlcHRpb24gd2hpbGUgcmVtb3ZpbmcgYXR0cmlidXRlLiI7CisgICAgICAgICAgICAqZXJy b3JTdHJpbmcgPSAiRXhjZXB0aW9uIHdoaWxlIHJlbW92aW5nIGF0dHJpYnV0ZSI7CiAgICAgfQog fQogCkBAIC02MDAsMTQgKzYwMCwxNCBAQCB2b2lkIEluc3BlY3RvckRPTUFnZW50OjpyZW1vdmVO b2RlKEVycm9yU3RyaW5nKiBlcnJvclN0cmluZywgaW50IG5vZGVJZCkKIAogICAgIENvbnRhaW5l ck5vZGUqIHBhcmVudE5vZGUgPSBub2RlLT5wYXJlbnROb2RlKCk7CiAgICAgaWYgKCFwYXJlbnRO b2RlKSB7Ci0gICAgICAgICplcnJvclN0cmluZyA9ICJDYW4gbm90IHJlbW92ZSBkZXRhY2hlZCBu b2RlLiI7CisgICAgICAgICplcnJvclN0cmluZyA9ICJDYW4gbm90IHJlbW92ZSBkZXRhY2hlZCBu b2RlIjsKICAgICAgICAgcmV0dXJuOwogICAgIH0KIAogICAgIEV4Y2VwdGlvbkNvZGUgZWMgPSAw OwogICAgIHBhcmVudE5vZGUtPnJlbW92ZUNoaWxkKG5vZGUsIGVjKTsKICAgICBpZiAoZWMpCi0g ICAgICAgICplcnJvclN0cmluZyA9ICJDb3VsZCBub3QgcmVtb3ZlIG5vZGUgZHVlIHRvIERPTSBl eGNlcHRpb24uIjsKKyAgICAgICAgKmVycm9yU3RyaW5nID0gIkNvdWxkIG5vdCByZW1vdmUgbm9k ZSBkdWUgdG8gRE9NIGV4Y2VwdGlvbiI7CiB9CiAKIHZvaWQgSW5zcGVjdG9yRE9NQWdlbnQ6OnNl dE5vZGVOYW1lKEVycm9yU3RyaW5nKiwgaW50IG5vZGVJZCwgY29uc3QgU3RyaW5nJiB0YWdOYW1l LCBpbnQqIG5ld0lkKQpAQCAtNjk4LDcgKzY5OCw3IEBAIHZvaWQgSW5zcGVjdG9yRE9NQWdlbnQ6 OnNldE5vZGVWYWx1ZShFcnJvclN0cmluZyogZXJyb3JTdHJpbmcsIGludCBub2RlSWQsIGNvbnN0 CiAgICAgICAgIHJldHVybjsKIAogICAgIGlmIChub2RlLT5ub2RlVHlwZSgpICE9IE5vZGU6OlRF WFRfTk9ERSkgewotICAgICAgICAqZXJyb3JTdHJpbmcgPSAiQ2FuIG9ubHkgc2V0IHZhbHVlIG9m IHRleHQgbm9kZXMuIjsKKyAgICAgICAgKmVycm9yU3RyaW5nID0gIkNhbiBvbmx5IHNldCB2YWx1 ZSBvZiB0ZXh0IG5vZGVzIjsKICAgICAgICAgcmV0dXJuOwogICAgIH0KIApAQCAtNzA2LDcgKzcw Niw3IEBAIHZvaWQgSW5zcGVjdG9yRE9NQWdlbnQ6OnNldE5vZGVWYWx1ZShFcnJvclN0cmluZyog ZXJyb3JTdHJpbmcsIGludCBub2RlSWQsIGNvbnN0CiAgICAgRXhjZXB0aW9uQ29kZSBlYyA9IDA7 CiAgICAgdGV4dE5vZGUtPnJlcGxhY2VXaG9sZVRleHQodmFsdWUsIGVjKTsKICAgICBpZiAoZWMp Ci0gICAgICAgICplcnJvclN0cmluZyA9ICJET00gRXJyb3Igd2hpbGUgc2V0dGluZyB0aGUgbm9k ZSB2YWx1ZS4iOworICAgICAgICAqZXJyb3JTdHJpbmcgPSAiRE9NIEVycm9yIHdoaWxlIHNldHRp bmcgdGhlIG5vZGUgdmFsdWUiOwogfQogCiB2b2lkIEluc3BlY3RvckRPTUFnZW50OjpnZXRFdmVu dExpc3RlbmVyc0Zvck5vZGUoRXJyb3JTdHJpbmcqLCBpbnQgbm9kZUlkLCBSZWZQdHI8SW5zcGVj dG9yQXJyYXk+KiBsaXN0ZW5lcnNBcnJheSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9JbnNwZWN0b3JEZWJ1Z2dlckFnZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9JbnNwZWN0b3JEZWJ1Z2dlckFnZW50LmNwcAppbmRleCA1NmJjN2I3Li4xNDE3ZGEzIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRGVidWdnZXJBZ2Vu dC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckRlYnVnZ2VyQWdl bnQuY3BwCkBAIC0zMDEsNyArMzAxLDcgQEAgdm9pZCBJbnNwZWN0b3JEZWJ1Z2dlckFnZW50Ojpz ZXRQYXVzZU9uRXhjZXB0aW9uc1N0YXRlKEVycm9yU3RyaW5nKiBlcnJvclN0cmluZywKIHsKICAg ICBzY3JpcHREZWJ1Z1NlcnZlcigpLnNldFBhdXNlT25FeGNlcHRpb25zU3RhdGUoc3RhdGljX2Nh c3Q8U2NyaXB0RGVidWdTZXJ2ZXI6OlBhdXNlT25FeGNlcHRpb25zU3RhdGU+KHBhdXNlU3RhdGUp KTsKICAgICBpZiAoc2NyaXB0RGVidWdTZXJ2ZXIoKS5wYXVzZU9uRXhjZXB0aW9uc1N0YXRlKCkg IT0gcGF1c2VTdGF0ZSkKLSAgICAgICAgKmVycm9yU3RyaW5nID0gIkludGVybmFsIGVycm9yLiBD b3VsZCBub3QgY2hhbmdlIHBhdXNlIG9uIGV4Y2VwdGlvbnMgc3RhdGUuIjsKKyAgICAgICAgKmVy cm9yU3RyaW5nID0gIkludGVybmFsIGVycm9yLiBDb3VsZCBub3QgY2hhbmdlIHBhdXNlIG9uIGV4 Y2VwdGlvbnMgc3RhdGUiOwogfQogCiB2b2lkIEluc3BlY3RvckRlYnVnZ2VyQWdlbnQ6OmV2YWx1 YXRlT25DYWxsRnJhbWUoRXJyb3JTdHJpbmcqIGVycm9yU3RyaW5nLCBjb25zdCBTdHJpbmcmIGNh bGxGcmFtZUlkLCBjb25zdCBTdHJpbmcmIGV4cHJlc3Npb24sIGNvbnN0IFN0cmluZyYgb2JqZWN0 R3JvdXAsIGJvb2wgaW5jbHVkZUNvbW1hbmRMaW5lQVBJLCBSZWZQdHI8SW5zcGVjdG9yT2JqZWN0 PiogcmVzdWx0KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rv clJlc291cmNlQWdlbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclJl c291cmNlQWdlbnQuY3BwCmluZGV4IDFlMmMxNmQuLjIwODM4ZGYgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JSZXNvdXJjZUFnZW50LmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yUmVzb3VyY2VBZ2VudC5jcHAKQEAgLTk0LDcg Kzk0LDcgQEAgdm9pZCBJbnNwZWN0b3JSZXNvdXJjZUFnZW50OjpyZXN0b3JlKCkKIHZvaWQgSW5z cGVjdG9yUmVzb3VyY2VBZ2VudDo6cmVzb3VyY2VDb250ZW50KEVycm9yU3RyaW5nKiBlcnJvclN0 cmluZywgRnJhbWUqIGZyYW1lLCBjb25zdCBLVVJMJiB1cmwsIFN0cmluZyogcmVzdWx0KQogewog ICAgIGlmICghZnJhbWUpIHsKLSAgICAgICAgKmVycm9yU3RyaW5nID0gIk5vIGZyYW1lIHRvIGdl dCByZXNvdXJjZSBjb250ZW50IGZvci4iOyAKKyAgICAgICAgKmVycm9yU3RyaW5nID0gIk5vIGZy YW1lIHRvIGdldCByZXNvdXJjZSBjb250ZW50IGZvciI7IAogICAgICAgICByZXR1cm47CiAgICAg fQogCkBAIC0xMDgsNyArMTA4LDcgQEAgdm9pZCBJbnNwZWN0b3JSZXNvdXJjZUFnZW50OjpyZXNv dXJjZUNvbnRlbnQoRXJyb3JTdHJpbmcqIGVycm9yU3RyaW5nLCBGcmFtZSogZnIKICAgICAgICAg KnJlc3VsdCA9IGVuY29kaW5nLmRlY29kZShidWZmZXItPmRhdGEoKSwgYnVmZmVyLT5zaXplKCkp OwogICAgICAgICByZXR1cm47CiAgICAgfQotICAgICplcnJvclN0cmluZyA9ICJObyByZXNvdXJj ZSB3aXRoIGdpdmVuIFVSTCBmb3VuZC4iOyAKKyAgICAqZXJyb3JTdHJpbmcgPSAiTm8gcmVzb3Vy Y2Ugd2l0aCBnaXZlbiBVUkwgZm91bmQiOyAKIH0KIAogdm9pZCBJbnNwZWN0b3JSZXNvdXJjZUFn ZW50OjpyZXNvdXJjZUNvbnRlbnRCYXNlNjQoRXJyb3JTdHJpbmcqIGVycm9yU3RyaW5nLCBGcmFt ZSogZnJhbWUsIGNvbnN0IEtVUkwmIHVybCwgU3RyaW5nKiByZXN1bHQpCkBAIC0xMTcsNyArMTE3 LDcgQEAgdm9pZCBJbnNwZWN0b3JSZXNvdXJjZUFnZW50OjpyZXNvdXJjZUNvbnRlbnRCYXNlNjQo RXJyb3JTdHJpbmcqIGVycm9yU3RyaW5nLCBGcmEKICAgICBSZWZQdHI8U2hhcmVkQnVmZmVyPiBk YXRhID0gSW5zcGVjdG9yUmVzb3VyY2VBZ2VudDo6cmVzb3VyY2VEYXRhKGZyYW1lLCB1cmwsICZ0 ZXh0RW5jb2RpbmdOYW1lKTsKICAgICBpZiAoIWRhdGEpIHsKICAgICAgICAgKnJlc3VsdCA9IFN0 cmluZygpOwotICAgICAgICAqZXJyb3JTdHJpbmcgPSAiTm8gcmVzb3VyY2Ugd2l0aCBnaXZlbiBV UkwgZm91bmQuIjsgCisgICAgICAgICplcnJvclN0cmluZyA9ICJObyByZXNvdXJjZSB3aXRoIGdp dmVuIFVSTCBmb3VuZCI7IAogICAgICAgICByZXR1cm47CiAgICAgfQogCkBAIC00OTMsNyArNDkz LDcgQEAgdm9pZCBJbnNwZWN0b3JSZXNvdXJjZUFnZW50OjpnZXRSZXNvdXJjZUNvbnRlbnQoRXJy b3JTdHJpbmcqIGVycm9yU3RyaW5nLCBjb25zdAogewogICAgIEZyYW1lKiBmcmFtZSA9IGZyYW1l Rm9ySWQoZnJhbWVJZCk7CiAgICAgaWYgKCFmcmFtZSkgewotICAgICAgICAqZXJyb3JTdHJpbmcg PSAiTm8gZnJhbWUgZm9yIGdpdmVuIGlkIGZvdW5kLiI7CisgICAgICAgICplcnJvclN0cmluZyA9 ICJObyBmcmFtZSBmb3IgZ2l2ZW4gaWQgZm91bmQiOwogICAgICAgICByZXR1cm47CiAgICAgfQog ICAgIGlmIChiYXNlNjRFbmNvZGUpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvSW5zcGVjdG9yUnVudGltZUFnZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9J bnNwZWN0b3JSdW50aW1lQWdlbnQuY3BwCmluZGV4IDA0ZmVkOWQuLjc1MmU3MzQgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JSdW50aW1lQWdlbnQuY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JSdW50aW1lQWdlbnQuY3BwCkBA IC04NSw3ICs4NSw3IEBAIHZvaWQgSW5zcGVjdG9yUnVudGltZUFnZW50OjpzZXRQcm9wZXJ0eVZh bHVlKEVycm9yU3RyaW5nKiBlcnJvclN0cmluZywgY29uc3QgU3RyCiAgICAgaWYgKCFpbmplY3Rl ZFNjcmlwdC5oYXNOb1ZhbHVlKCkpCiAgICAgICAgIGluamVjdGVkU2NyaXB0LnNldFByb3BlcnR5 VmFsdWUoZXJyb3JTdHJpbmcsIG9iamVjdElkLCBwcm9wZXJ0eU5hbWUsIGV4cHJlc3Npb24pOwog ICAgIGVsc2UKLSAgICAgICAgKmVycm9yU3RyaW5nID0gIk5vIGluamVjdGVkIHNjcmlwdCBmb3Vu ZC4iOworICAgICAgICAqZXJyb3JTdHJpbmcgPSAiTm8gaW5qZWN0ZWQgc2NyaXB0IGZvdW5kIjsK IH0KIAogdm9pZCBJbnNwZWN0b3JSdW50aW1lQWdlbnQ6OnJlbGVhc2VPYmplY3QoRXJyb3JTdHJp bmcqLCBjb25zdCBTdHJpbmcmIG9iamVjdElkKQo=