60326 2011-05-05 17:41:51 -0700 NRWT: clean up metered_stream code in preparation for 'nooverwriting' patch 2011-05-27 19:28:11 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 dpranke dpranke abarth eric ojan tony oldest_to_newest 399239 0 dpranke 2011-05-05 17:41:51 -0700 NRWT: clean up metered_stream code in preparation for 'nooverwriting' patch 399241 1 92513 dpranke 2011-05-05 17:43:36 -0700 Created attachment 92513 Patch 399762 2 92513 eric 2011-05-06 13:15:33 -0700 Comment on attachment 92513 Patch Yay deleting code! 411778 3 dpranke 2011-05-27 19:28:11 -0700 Committed r87596: <http://trac.webkit.org/changeset/87596> 92513 2011-05-05 17:43:36 -0700 2011-05-06 13:15:32 -0700 Patch bug-60326-20110505174335.patch text/plain 13149 dpranke U3VidmVyc2lvbiBSZXZpc2lvbjogODU2NjUKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBi L1Rvb2xzL0NoYW5nZUxvZwppbmRleCAwODNhNTRiOTg2NTg2YmMyY2U2MmU3MTg4ZGI3ODBjNzU1 MWM2MTcxLi4wZTliOWEyYmIwNDc0NDk1OWQxOTJmZmEwZGJkMWQ3MjUwZDZkMGU2IDEwMDY0NAot LS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0yLDYgKzIsMjUg QEAKIAogICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KIAorICAgICAgICBOUldU OiBjbGVhbiB1cCBtZXRlcmVkX3N0cmVhbSBjb2RlIGluIHByZXBhcmF0aW9uIGZvciAnbm9vdmVy d3JpdGluZycgcGF0Y2gKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTYwMzI2CisKKyAgICAgICAgVGhpcyBwYXRjaCByZW1vdmVzIGEgbG90IG9mIHRoZSBj b21wbGV4aXR5IGZyb20gdGhlCisgICAgICAgIG1ldGVyZWRfc3RyZWFtIGltcGxlbWVudGF0aW9u IHRoYXQgd2FzIHVubmVjZXNzYXJ5IHNpbmNlIHRoZXJlCisgICAgICAgIHdhcyBvbmx5IG9uZSBj YWxsZXIgYW5kIHRoZSBsb2dpYyBjb3VsZCBiZSBjb29yZGluYXRlZCBiZXR0ZXIuCisKKyAgICAg ICAgVGhlcmUgc2hvdWxkIGJlIG5vIGZ1bmN0aW9uYWwgY2hhbmdlcyBpbiB0aGlzIHBhdGNoLCBq dXN0IGNvZGUKKyAgICAgICAgZ2V0dGluZyBkZWxldGVkIGFuZCBjbGVhbmVkIHVwLgorCisgICAg ICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvbGF5b3V0X3BhY2thZ2UvbWV0ZXJl ZF9zdHJlYW0ucHk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvbGF5 b3V0X3BhY2thZ2UvbWV0ZXJlZF9zdHJlYW1fdW5pdHRlc3QucHk6CisgICAgICAgICogU2NyaXB0 cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvbGF5b3V0X3BhY2thZ2UvcHJpbnRpbmcucHk6CisgICAg ICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvbGF5b3V0X3BhY2thZ2UvcHJpbnRp bmdfdW5pdHRlc3QucHk6CisKKzIwMTEtMDUtMDUgIERpcmsgUHJhbmtlICA8ZHByYW5rZUBjaHJv bWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKICAgICAg ICAgTlJXVDogcmVtb3ZlIC0tcHJpbnQgZGV0YWlsZWQtcHJvZ3Jlc3MKICAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTYwMzI0CiAKZGlmZiAtLWdpdCBhL1Rv b2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2xheW91dF9wYWNrYWdlL21ldGVyZWRf c3RyZWFtLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvbGF5b3V0X3Bh Y2thZ2UvbWV0ZXJlZF9zdHJlYW0ucHkKaW5kZXggMjA2NDZhMTljZGI5MzA2YWI5MWJlNzQyNmU5 NGRjNjk0YjdhYjBlNC4uZDQ1YWIwOTk3NjllYTYyZWY3NTZiMjllODhlZjEzMmE5ZjcxMWI5YyAx MDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvbGF5b3V0X3Bh Y2thZ2UvbWV0ZXJlZF9zdHJlYW0ucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlv dXRfdGVzdHMvbGF5b3V0X3BhY2thZ2UvbWV0ZXJlZF9zdHJlYW0ucHkKQEAgLTM3LDExMCArMzcs NDcgQEAgVGhpcyBwYWNrYWdlIHNob3VsZCBvbmx5IGJlIGNhbGxlZCBieSB0aGUgcHJpbnRpbmcg bW9kdWxlIGluIHRoZSBsYXlvdXRfdGVzdHMKIHBhY2thZ2UuCiAiIiIKIAotaW1wb3J0IGxvZ2dp bmcKLQotX2xvZyA9IGxvZ2dpbmcuZ2V0TG9nZ2VyKCJ3ZWJraXRweS5sYXlvdXRfdGVzdHMubWV0 ZXJlZF9zdHJlYW0iKQotCi0KIGNsYXNzIE1ldGVyZWRTdHJlYW06CiAgICAgIiIiVGhpcyBjbGFz cyBpcyBhIHdyYXBwZXIgYXJvdW5kIGEgc3RyZWFtIHRoYXQgYWxsb3dzIHlvdSB0byBpbXBsZW1l bnQKICAgICBtZXRlcnMgKHByb2dyZXNzIGJhcnMsIGV0Yy4pLgogCi0gICAgSXQgY2FuIGJlIHVz ZWQgZGlyZWN0bHkgYXMgYSBzdHJlYW0sIGJ5IGNhbGxpbmcgd3JpdGUoKSwgYnV0IHByb3ZpZGVz Ci0gICAgdHdvIG90aGVyIG1ldGhvZHMgZm9yIG91dHB1dCwgdXBkYXRlKCksIGFuZCBwcm9ncmVz cygpLgotCi0gICAgSW4gbm9ybWFsIHVzYWdlLCB1cGRhdGUoKSB3aWxsIG92ZXJ3cml0ZSB0aGUg b3V0cHV0IG9mIHRoZSBpbW1lZGlhdGVseQotICAgIHByZWNlZGluZyB1cGRhdGUoKSAod3JpdGUo KSBhbHNvIHdpbGwgb3ZlcndyaXRlIHVwZGF0ZSgpKS4gU28sIGNhbGxpbmcKLSAgICBtdWx0aXBs ZSB1cGRhdGUoKXMgaW4gYSByb3cgY2FuIHByb3ZpZGUgYW4gdXBkYXRpbmcgc3RhdHVzIGJhciAo bm90ZSB0aGF0Ci0gICAgaWYgYW4gdXBkYXRlIHN0cmluZyBjb250YWlucyBuZXdsaW5lcywgb25s eSB0aGUgdGV4dCBmb2xsb3dpbmcgdGhlIGxhc3QKLSAgICBuZXdsaW5lIHdpbGwgYmUgb3Zlcndy aXR0ZW4vZXJhc2VkKS4KLQotICAgIElmIHRoZSBNZXRlcmVkU3RyZWFtIGlzIGNvbnN0cnVjdGVk IGluICJ2ZXJib3NlIiBtb2RlIChpLmUuLCBieSBwYXNzaW5nCi0gICAgdmVyYm9zZT10cnVlKSwg dGhlbiB1cGRhdGUoKSBubyBsb25nZXIgb3ZlcndyaXRlIGEgcHJldmlvdXMgdXBkYXRlKCksIGFu ZAotICAgIGluc3RlYWQgdGhlIGNhbGwgaXMgZXF1aXZhbGVudCB0byB3cml0ZSgpLCBhbHRob3Vn aCB0aGUgdGV4dCBpcwotICAgIGFjdHVhbGx5IHNlbnQgdG8gdGhlIGxvZ2dlciByYXRoZXIgdGhh biB0byB0aGUgc3RyZWFtIHBhc3NlZAotICAgIHRvIHRoZSBjb25zdHJ1Y3Rvci4KLQotICAgIHBy b2dyZXNzKCkgaXMganVzdCBsaWtlIHVwZGF0ZSgpLCBleGNlcHQgdGhhdCBpZiB5b3UgYXJlIGlu IHZlcmJvc2UgbW9kZSwKLSAgICBwcm9ncmVzcyBtZXNzYWdlcyBhcmUgbm90IG91dHB1dCBhdCBh bGwgKHRoZXkgYXJlIGRyb3BwZWQpLiBUaGlzIGlzCi0gICAgdXNlZCBmb3IgdGhpbmdzIGxpa2Ug cHJvZ3Jlc3MgYmFycyB3aGljaCBhcmUgcHJlc3VtZWQgdG8gYmUgdW53YW50ZWQgaW4KLSAgICB2 ZXJib3NlIG1vZGUuCisgICAgSXQgY2FuIGJlIHVzZWQgZGlyZWN0bHkgYXMgYSBzdHJlYW0sIGJ5 IGNhbGxpbmcgd3JpdGUoKSwgYnV0IGFsc28gcHJvdmlkZXMKKyAgICBhIG1ldGhvZCBjYWxsZWQg dXBkYXRlKCkgdGhhdCB3aWxsIG92ZXJ3aXRlIHByaW9yIHVwZGF0ZXMoKS4KKyAgICIiIgogCi0g ICAgTm90ZSB0aGF0IHRoZSB1c3VhbCB1c2FnZSBmb3IgdGhpcyBjbGFzcyBpcyBhcyBhIGRlc3Rp bmF0aW9uIGZvcgotICAgIGEgbG9nZ2VyIHRoYXQgY2FuIGFsc28gYmUgd3JpdHRlbiB0byBkaXJl Y3RseSAoaS5lLiwgc29tZSBtZXNzYWdlcyBnbwotICAgIHRocm91Z2ggdGhlIGxvZ2dlciwgc29t ZSBkb24ndCkuIFdlIHRodXMgaGF2ZSB0byBkYW5jZSBhcm91bmQgYQotICAgIGxheWVyaW5nIGlu dmVyc2lvbiBpbiB1cGRhdGUoKSBmb3IgdGhpbmdzIHRvIHdvcmsgY29ycmVjdGx5LgotICAgICIi IgotCi0gICAgZGVmIF9faW5pdF9fKHNlbGYsIHZlcmJvc2UsIHN0cmVhbSk6CisgICAgZGVmIF9f aW5pdF9fKHNlbGYsIHN0cmVhbSk6CiAgICAgICAgICIiIgogICAgICAgICBBcmdzOgotICAgICAg ICAgIHZlcmJvc2U6IHdoZXRoZXIgcHJvZ3Jlc3MgaXMgYSBuby1vcCBhbmQgdXBkYXRlcygpIGFy ZW4ndCBvdmVyd3JpdHRlbgogICAgICAgICAgIHN0cmVhbTogb3V0cHV0IHN0cmVhbSB0byB3cml0 ZSB0bwogICAgICAgICAiIiIKLSAgICAgICAgc2VsZi5fZGlydHkgPSBGYWxzZQotICAgICAgICBz ZWxmLl92ZXJib3NlID0gdmVyYm9zZQogICAgICAgICBzZWxmLl9zdHJlYW0gPSBzdHJlYW0KKyAg ICAgICAgc2VsZi5fZGlydHkgPSBGYWxzZQogICAgICAgICBzZWxmLl9sYXN0X3VwZGF0ZSA9ICIi CiAKICAgICBkZWYgd3JpdGUoc2VsZiwgdHh0KToKICAgICAgICAgIiIiV3JpdGUgdG8gdGhlIHN0 cmVhbSwgb3ZlcndyaXRpbmcgYW5kIHJlc2V0dGluZyB0aGUgbWV0ZXIuIiIiCi0gICAgICAgIGlm IHNlbGYuX2RpcnR5OgotICAgICAgICAgICAgc2VsZi5fd3JpdGUodHh0KQotICAgICAgICAgICAg c2VsZi5fZGlydHkgPSBGYWxzZQotICAgICAgICAgICAgc2VsZi5fbGFzdF91cGRhdGUgPSAnJwot ICAgICAgICBlbHNlOgotICAgICAgICAgICAgc2VsZi5fc3RyZWFtLndyaXRlKHR4dCkKLQotICAg IGRlZiBmbHVzaChzZWxmKToKLSAgICAgICAgIiIiRmx1c2ggYW55IGJ1ZmZlcmVkIG91dHB1dC4i IiIKLSAgICAgICAgc2VsZi5fc3RyZWFtLmZsdXNoKCkKLQotICAgIGRlZiBwcm9ncmVzcyhzZWxm LCBzdHIpOgotICAgICAgICAiIiIKLSAgICAgICAgV3JpdGUgYSBtZXNzYWdlIHRvIHRoZSBzdHJl YW0gdGhhdCB3aWxsIGdldCBvdmVyd3JpdHRlbi4KLQotICAgICAgICBUaGlzIGlzIHVzZWQgZm9y IHByb2dyZXNzIHVwZGF0ZXMgdGhhdCBkb24ndCBuZWVkIHRvIGJlIHByZXNlcnZlZCBpbgotICAg ICAgICB0aGUgbG9nLiBJZiB0aGUgTWV0ZXJlZFN0cmVhbSB3YXMgaW5pdGlhbGl6ZWQgd2l0aCB2 ZXJib3NlPT1UcnVlLAotICAgICAgICB0aGVuIHRoaXMgb3V0cHV0IGlzIGRpc2NhcmRlZC4gV2Ug aGF2ZSB0aGlzIGluIGNhc2Ugd2UgYXJlIGxvZ2dpbmcKLSAgICAgICAgbG90cyBvZiBvdXRwdXQg YW5kIHRoZSB1cGRhdGUoKXMgd2lsbCBnZXQgbG9zdCBvciB3b24ndCB3b3JrCi0gICAgICAgIHBy b3Blcmx5ICh0eXBpY2FsbHkgYmVjYXVzZSB2ZXJib3NlIHN0cmVhbXMgYXJlIHJlZGlyZWN0ZWQg dG8gZmlsZXMpLgotCi0gICAgICAgICIiIgotICAgICAgICBpZiBzZWxmLl92ZXJib3NlOgotICAg ICAgICAgICAgcmV0dXJuCi0gICAgICAgIHNlbGYuX3dyaXRlKHN0cikKIAotICAgIGRlZiB1cGRh dGUoc2VsZiwgc3RyKToKLSAgICAgICAgIiIiCi0gICAgICAgIFdyaXRlIGEgbWVzc2FnZSB0aGF0 IGlzIGFsc28gaW5jbHVkZWQgd2hlbiBsb2dnaW5nIHZlcmJvc2VseS4KKyAgICAgICAgIyBUaGlz IHJvdXRpbmUgaXMgY2FsbGVkIGJ5IHRoZSBsb2dnaW5nIGluZnJhc3RydWN0dXJlLCBhbmQKKyAg ICAgICAgIyBtdXN0IG5vdCBjYWxsIGJhY2sgaW50byBsb2dnaW5nLiBJdCBpcyBub3QgYSBwdWJs aWMgZnVuY3Rpb24uCisgICAgICAgIHNlbGYuX292ZXJ3cml0ZSh0eHQpCisgICAgICAgIHNlbGYu X3Jlc2V0KCkKIAotICAgICAgICBUaGlzIHJvdXRpbmUgcHJlc2VydmVzIHRoZSBzYW1lIGNvbnNv bGUgbG9nZ2luZyBiZWhhdmlvciBhcyBwcm9ncmVzcygpLAotICAgICAgICBidXQgd2lsbCBhbHNv IGxvZyB0aGUgbWVzc2FnZSBpZiB2ZXJib3NlKCkgd2FzIHRydWUuCi0KLSAgICAgICAgIiIiCi0g ICAgICAgICMgTm90ZSB0aGlzIGlzIGEgc2VwYXJhdGUgcm91dGluZSB0aGF0IGNhbGxzIGVpdGhl ciBpbnRvIHRoZSBsb2dnZXIKLSAgICAgICAgIyBvciB0aGUgbWV0ZXJpbmcgc3RyZWFtLiBXZSBo YXZlIHRvIGJlIGNhcmVmdWwgdG8gYXZvaWQgYSBsYXllcmluZwotICAgICAgICAjIGludmVyc2lv biAoc3RyZWFtIGNhbGxpbmcgYmFjayBpbnRvIHRoZSBsb2dnZXIpLgotICAgICAgICBpZiBzZWxm Ll92ZXJib3NlOgotICAgICAgICAgICAgX2xvZy5pbmZvKHN0cikKLSAgICAgICAgZWxzZToKLSAg ICAgICAgICAgIHNlbGYuX3dyaXRlKHN0cikKLQotICAgIGRlZiBfd3JpdGUoc2VsZiwgc3RyKToK LSAgICAgICAgIiIiQWN0dWFsbHkgd3JpdGUgdGhlIG1lc3NhZ2UgdG8gdGhlIHN0cmVhbS4iIiIK LQotICAgICAgICAjIEZJWE1FOiBGaWd1cmUgb3V0IGlmIHRoZXJlIGlzIGEgd2F5IHRvIGRldGVj dCBpZiB3ZSdyZSB3cml0aW5nCi0gICAgICAgICMgdG8gYSBzdHJlYW0gdGhhdCBoYW5kbGVzIENS cyBjb3JyZWN0bHkgKGUuZy4sIHRlcm1pbmFscykuIFRoYXQgbWlnaHQKLSAgICAgICAgIyBiZSBh IGNsZWFuZXIgd2F5IG9mIGhhbmRsaW5nIHRoaXMuCisgICAgZGVmIHVwZGF0ZShzZWxmLCB0eHQp OgorICAgICAgICAiIiJXcml0ZSBhIG1lc3NhZ2UgdGhhdCB3aWxsIGJlIG92ZXJ3cml0dGVuIGJ5 IHN1YnNlcXVlbnQgdXBkYXRlKCkgb3Igd3JpdGUoKSBjYWxscy4iIiIKKyAgICAgICAgc2VsZi5f b3ZlcndyaXRlKHR4dCkKIAorICAgIGRlZiBfb3ZlcndyaXRlKHNlbGYsIHR4dCk6CiAgICAgICAg ICMgUHJpbnQgdGhlIG5lY2Vzc2FyeSBudW1iZXIgb2YgYmFja3NwYWNlcyB0byBlcmFzZSB0aGUg cHJldmlvdXMKICAgICAgICAgIyBtZXNzYWdlLgogICAgICAgICBpZiBsZW4oc2VsZi5fbGFzdF91 cGRhdGUpOgogICAgICAgICAgICAgc2VsZi5fc3RyZWFtLndyaXRlKCJcYiIgKiBsZW4oc2VsZi5f bGFzdF91cGRhdGUpICsKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAiICIgKiBsZW4o c2VsZi5fbGFzdF91cGRhdGUpICsKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAiXGIi ICogbGVuKHNlbGYuX2xhc3RfdXBkYXRlKSkKLSAgICAgICAgc2VsZi5fc3RyZWFtLndyaXRlKHN0 cikKLSAgICAgICAgbGFzdF9uZXdsaW5lID0gc3RyLnJmaW5kKCJcbiIpCi0gICAgICAgIHNlbGYu X2xhc3RfdXBkYXRlID0gc3RyWyhsYXN0X25ld2xpbmUgKyAxKTpdCisgICAgICAgIHNlbGYuX3N0 cmVhbS53cml0ZSh0eHQpCisgICAgICAgIGxhc3RfbmV3bGluZSA9IHR4dC5yZmluZCgiXG4iKQor ICAgICAgICBzZWxmLl9sYXN0X3VwZGF0ZSA9IHR4dFsobGFzdF9uZXdsaW5lICsgMSk6XQogICAg ICAgICBzZWxmLl9kaXJ0eSA9IFRydWUKKworICAgIGRlZiBfcmVzZXQoc2VsZik6CisgICAgICAg IHNlbGYuX2RpcnR5ID0gRmFsc2UKKyAgICAgICAgc2VsZi5fbGFzdF91cGRhdGUgPSAnJwpkaWZm IC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvbGF5b3V0X3BhY2th Z2UvbWV0ZXJlZF9zdHJlYW1fdW5pdHRlc3QucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xh eW91dF90ZXN0cy9sYXlvdXRfcGFja2FnZS9tZXRlcmVkX3N0cmVhbV91bml0dGVzdC5weQppbmRl eCA5NDIxZmY4ZmFhNmU2YmVmODM5YWZmZTc1NzU2NTFmMTMyMWUyZDUxLi5mZmI1YjBhODZlNDdj ZDkxZGEyNGQ3MjFhY2RjN2MxOTk3MjcyMTE1IDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dl YmtpdHB5L2xheW91dF90ZXN0cy9sYXlvdXRfcGFja2FnZS9tZXRlcmVkX3N0cmVhbV91bml0dGVz dC5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9sYXlvdXRfcGFj a2FnZS9tZXRlcmVkX3N0cmVhbV91bml0dGVzdC5weQpAQCAtMjksMTAgKzI5LDYgQEAKIAogIiIi VW5pdCB0ZXN0cyBmb3IgbWV0ZXJlZF9zdHJlYW0ucHkuIiIiCiAKLWltcG9ydCBvcwotaW1wb3J0 IG9wdHBhcnNlCi1pbXBvcnQgcGRiCi1pbXBvcnQgc3lzCiBpbXBvcnQgdW5pdHRlc3QKIAogZnJv bSB3ZWJraXRweS5jb21tb24uYXJyYXlfc3RyZWFtIGltcG9ydCBBcnJheVN0cmVhbQpAQCAtNDIs MTMgKzM4LDExIEBAIGZyb20gd2Via2l0cHkubGF5b3V0X3Rlc3RzLmxheW91dF9wYWNrYWdlIGlt cG9ydCBtZXRlcmVkX3N0cmVhbQogY2xhc3MgVGVzdE1ldGVyZWRTdHJlYW0odW5pdHRlc3QuVGVz dENhc2UpOgogICAgIGRlZiB0ZXN0X3JlZ3VsYXIoc2VsZik6CiAgICAgICAgIGEgPSBBcnJheVN0 cmVhbSgpCi0gICAgICAgIG0gPSBtZXRlcmVkX3N0cmVhbS5NZXRlcmVkU3RyZWFtKHZlcmJvc2U9 RmFsc2UsIHN0cmVhbT1hKQorICAgICAgICBtID0gbWV0ZXJlZF9zdHJlYW0uTWV0ZXJlZFN0cmVh bShzdHJlYW09YSkKICAgICAgICAgc2VsZi5hc3NlcnRUcnVlKGEuZW1wdHkoKSkKIAotICAgICAg ICAjIGJhc2ljIHRlc3QgLSBub3RlIHRoYXQgdGhlIGZsdXNoKCkgaXMgYSBuby1vcCwgYnV0IHdl IGluY2x1ZGUgaXQKLSAgICAgICAgIyBmb3IgY292ZXJhZ2UuCisgICAgICAgICMgYmFzaWMgdGVz dAogICAgICAgICBtLndyaXRlKCJmb28iKQotICAgICAgICBtLmZsdXNoKCkKICAgICAgICAgZXhw ID0gWydmb28nXQogICAgICAgICBzZWxmLmFzc2VydEVxdWFscyhhLmdldCgpLCBleHApCiAKQEAg LTY5LDE0ICs2Myw5IEBAIGNsYXNzIFRlc3RNZXRlcmVkU3RyZWFtKHVuaXR0ZXN0LlRlc3RDYXNl KToKICAgICAgICAgZXhwLmFwcGVuZCgnZm9vJykKICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbHMo YS5nZXQoKSwgZXhwKQogCi0gICAgICAgIG0ucHJvZ3Jlc3MoInByb2dyZXNzIikKLSAgICAgICAg ZXhwLmFwcGVuZCgnXGJcYlxiICAgXGJcYlxiJykKLSAgICAgICAgZXhwLmFwcGVuZCgncHJvZ3Jl c3MnKQotICAgICAgICBzZWxmLmFzc2VydEVxdWFscyhhLmdldCgpLCBleHApCi0KLSAgICAgICAg IyBub3cgY2hlY2sgdGhhdCBhIHdyaXRlKCkgZG9lcyBvdmVyd3JpdGUgdGhlIHByb2dyZXNzIGJh cgorICAgICAgICAjIG5vdyBjaGVjayB0aGF0IGEgd3JpdGUoKSBkb2VzIG92ZXJ3cml0ZSB0aGUg dXBkYXRlCiAgICAgICAgIG0ud3JpdGUoImZvbyIpCi0gICAgICAgIGV4cC5hcHBlbmQoJ1xiXGJc YlxiXGJcYlxiXGIgICAgICAgIFxiXGJcYlxiXGJcYlxiXGInKQorICAgICAgICBleHAuYXBwZW5k KCdcYlxiXGIgICBcYlxiXGInKQogICAgICAgICBleHAuYXBwZW5kKCdmb28nKQogICAgICAgICBz ZWxmLmFzc2VydEVxdWFscyhhLmdldCgpLCBleHApCiAKQEAgLTg5LDI3ICs3OCw2IEBAIGNsYXNz IFRlc3RNZXRlcmVkU3RyZWFtKHVuaXR0ZXN0LlRlc3RDYXNlKToKICAgICAgICAgbS51cGRhdGUo ImJheiIpCiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWxzKGEuZ2V0KCksIFsnZm9vXG5iYXInLCAn XGJcYlxiICAgXGJcYlxiJywgJ2JheiddKQogCi0gICAgZGVmIHRlc3RfdmVyYm9zZShzZWxmKToK LSAgICAgICAgYSA9IEFycmF5U3RyZWFtKCkKLSAgICAgICAgbSA9IG1ldGVyZWRfc3RyZWFtLk1l dGVyZWRTdHJlYW0odmVyYm9zZT1UcnVlLCBzdHJlYW09YSkKLSAgICAgICAgc2VsZi5hc3NlcnRU cnVlKGEuZW1wdHkoKSkKLSAgICAgICAgbS53cml0ZSgiZm9vIikKLSAgICAgICAgc2VsZi5hc3Nl cnRFcXVhbHMoYS5nZXQoKSwgWydmb28nXSkKLQotICAgICAgICBpbXBvcnQgbG9nZ2luZwotICAg ICAgICBiID0gQXJyYXlTdHJlYW0oKQotICAgICAgICBsb2dnZXIgPSBsb2dnaW5nLmdldExvZ2dl cigpCi0gICAgICAgIGhhbmRsZXIgPSBsb2dnaW5nLlN0cmVhbUhhbmRsZXIoYikKLSAgICAgICAg bG9nZ2VyLmFkZEhhbmRsZXIoaGFuZGxlcikKLSAgICAgICAgbS51cGRhdGUoImJhciIpCi0gICAg ICAgIGxvZ2dlci5oYW5kbGVycy5yZW1vdmUoaGFuZGxlcikKLSAgICAgICAgc2VsZi5hc3NlcnRF cXVhbHMoYS5nZXQoKSwgWydmb28nXSkKLSAgICAgICAgc2VsZi5hc3NlcnRFcXVhbHMoYi5nZXQo KSwgWydiYXJcbiddKQotCi0gICAgICAgIG0ucHJvZ3Jlc3MoImRyb3BwZWQiKQotICAgICAgICBz ZWxmLmFzc2VydEVxdWFscyhhLmdldCgpLCBbJ2ZvbyddKQotICAgICAgICBzZWxmLmFzc2VydEVx dWFscyhiLmdldCgpLCBbJ2JhclxuJ10pCi0KIAogaWYgX19uYW1lX18gPT0gJ19fbWFpbl9fJzoK ICAgICB1bml0dGVzdC5tYWluKCkKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkv bGF5b3V0X3Rlc3RzL2xheW91dF9wYWNrYWdlL3ByaW50aW5nLnB5IGIvVG9vbHMvU2NyaXB0cy93 ZWJraXRweS9sYXlvdXRfdGVzdHMvbGF5b3V0X3BhY2thZ2UvcHJpbnRpbmcucHkKaW5kZXggN2Y2 ZWI4YjA5ZjJiMjExYWZmMTBjYTg2ZWM3MTNlYjI5OWM3Y2QzZS4uYzNjYWMwZmIxYjE1NTIwYTI1 YzBjN2UzZmQ0OWQ5ODJlNWI2N2U1NSAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRw eS9sYXlvdXRfdGVzdHMvbGF5b3V0X3BhY2thZ2UvcHJpbnRpbmcucHkKKysrIGIvVG9vbHMvU2Ny aXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvbGF5b3V0X3BhY2thZ2UvcHJpbnRpbmcucHkKQEAg LTEyOSw2ICsxMjksNyBAQCBkZWYgcGFyc2VfcHJpbnRfb3B0aW9ucyhwcmludF9vcHRpb25zLCB2 ZXJib3NlKToKICAgICAgICAgc3dpdGNoZXMgPSBzZXQocHJpbnRfb3B0aW9ucy5zcGxpdCgnLCcp KQogICAgIGVsaWYgdmVyYm9zZToKICAgICAgICAgc3dpdGNoZXMgPSBzZXQoUFJJTlRfRVZFUllU SElORy5zcGxpdCgnLCcpKQorICAgICAgICBzd2l0Y2hlcy5kaXNjYXJkKCdvbmUtbGluZS1wcm9n cmVzcycpCiAgICAgZWxzZToKICAgICAgICAgc3dpdGNoZXMgPSBzZXQoUFJJTlRfREVGQVVMVC5z cGxpdCgnLCcpKQogCkBAIC0yMDMsMTAgKzIwNCwxMyBAQCBjbGFzcyBQcmludGVyKG9iamVjdCk6 CiAgICAgICAgIHNlbGYuX3BvcnQgPSBwb3J0CiAgICAgICAgIHNlbGYuX3N0cmVhbSA9IHJlZ3Vs YXJfb3V0cHV0CiAKLSAgICAgICAgc2VsZi5fbWV0ZXIgPSBtZXRlcmVkX3N0cmVhbS5NZXRlcmVk U3RyZWFtKG9wdGlvbnMudmVyYm9zZSwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIHJlZ3VsYXJfb3V0cHV0KQotICAgICAgICBzZWxmLl9sb2dnaW5n X2hhbmRsZXIgPSBfY29uZmlndXJlX2xvZ2dpbmcoc2VsZi5fbWV0ZXIsCi0gICAgICAgICAgICBv cHRpb25zLnZlcmJvc2UpCisgICAgICAgIHNlbGYuX21ldGVyID0gTm9uZQorICAgICAgICBpZiBv cHRpb25zLnZlcmJvc2U6CisgICAgICAgICAgICBzZWxmLl9sb2dnaW5nX2hhbmRsZXIgPSBfY29u ZmlndXJlX2xvZ2dpbmcocmVndWxhcl9vdXRwdXQsIG9wdGlvbnMudmVyYm9zZSkKKyAgICAgICAg ZWxzZToKKyAgICAgICAgICAgIHNlbGYuX21ldGVyID0gbWV0ZXJlZF9zdHJlYW0uTWV0ZXJlZFN0 cmVhbShyZWd1bGFyX291dHB1dCkKKyAgICAgICAgICAgIHNlbGYuX2xvZ2dpbmdfaGFuZGxlciA9 IF9jb25maWd1cmVfbG9nZ2luZyhzZWxmLl9tZXRlciwgb3B0aW9ucy52ZXJib3NlKQorCiAKICAg ICAgICAgc2VsZi5zd2l0Y2hlcyA9IHBhcnNlX3ByaW50X29wdGlvbnMob3B0aW9ucy5wcmludF9v cHRpb25zLAogICAgICAgICAgICAgb3B0aW9ucy52ZXJib3NlKQpAQCAtMzQ4LDcgKzM1Miw3IEBA IGNsYXNzIFByaW50ZXIob2JqZWN0KToKICAgICAgICAgYWN0aW9uID0gIlRlc3RpbmciCiAgICAg ICAgIGlmIHJldHJ5aW5nOgogICAgICAgICAgICAgYWN0aW9uID0gIlJldHJ5aW5nIgotICAgICAg ICBzZWxmLl9tZXRlci5wcm9ncmVzcygiJXMgKCVkJSUpOiAlZCByYW4gYXMgZXhwZWN0ZWQsICVk IGRpZG4ndCwiCisgICAgICAgIHNlbGYuX21ldGVyLnVwZGF0ZSgiJXMgKCVkJSUpOiAlZCByYW4g YXMgZXhwZWN0ZWQsICVkIGRpZG4ndCwiCiAgICAgICAgICAgICAiICVkIGxlZnQiICUgKGFjdGlv biwgcGVyY2VudF9jb21wbGV0ZSwgcmVzdWx0X3N1bW1hcnkuZXhwZWN0ZWQsCiAgICAgICAgICAg ICAgcmVzdWx0X3N1bW1hcnkudW5leHBlY3RlZCwgcmVzdWx0X3N1bW1hcnkucmVtYWluaW5nKSkK IApAQCAtNDM1LDcgKzQzOSw3IEBAIGNsYXNzIFByaW50ZXIob2JqZWN0KToKICAgICBkZWYgcHJp bnRfdXBkYXRlKHNlbGYsIG1zZyk6CiAgICAgICAgIGlmIHNlbGYuZGlzYWJsZWQoJ3VwZGF0ZXMn KToKICAgICAgICAgICAgIHJldHVybgotICAgICAgICBzZWxmLl9tZXRlci51cGRhdGUobXNnKQor ICAgICAgICBzZWxmLl91cGRhdGUobXNnKQogCiAgICAgZGVmIHdyaXRlKHNlbGYsIG1zZywgb3B0 aW9uPSJtaXNjIik6CiAgICAgICAgIGlmIHNlbGYuZGlzYWJsZWQob3B0aW9uKToKQEAgLTQ0Mywx MyArNDQ3LDEzIEBAIGNsYXNzIFByaW50ZXIob2JqZWN0KToKICAgICAgICAgc2VsZi5fd3JpdGUo bXNnKQogCiAgICAgZGVmIF93cml0ZShzZWxmLCBtc2cpOgotICAgICAgICAjIEZJWE1FOiB3ZSBj b3VsZCBwcm9iYWJseSBnZXQgYXdheSB3aXRoIGNhbGxpbmcgX2xvZy5pbmZvKCkgYWxsIG9mCi0g ICAgICAgICMgdGhlIHRpbWUsIGJ1dCB0aGVyZSBkb2Vzbid0IHNlZW0gdG8gYmUgYSBnb29kIHdh eSB0byB0ZXN0IHRoZSBvdXRwdXQKLSAgICAgICAgIyBmcm9tIHRoZSBsb2dnZXIgOiguCi0gICAg ICAgIGlmIHNlbGYuX29wdGlvbnMudmVyYm9zZToKLSAgICAgICAgICAgIF9sb2cuaW5mbyhtc2cp CisgICAgICAgIF9sb2cuaW5mbyhtc2cpCisKKyAgICBkZWYgX3VwZGF0ZShzZWxmLCBtc2cpOgor ICAgICAgICBpZiBzZWxmLl9tZXRlcjoKKyAgICAgICAgICAgIHNlbGYuX21ldGVyLnVwZGF0ZSht c2cpCiAgICAgICAgIGVsc2U6Ci0gICAgICAgICAgICBzZWxmLl9tZXRlci53cml0ZSgiJXNcbiIg JSBtc2cpCisgICAgICAgICAgICBzZWxmLl93cml0ZShtc2cpCiAKICMKICMgVXRpbGl0eSByb3V0 aW5lcyB1c2VkIGJ5IHRoZSBDb250cm9sbGVyIGNsYXNzCmRpZmYgLS1naXQgYS9Ub29scy9TY3Jp cHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9sYXlvdXRfcGFja2FnZS9wcmludGluZ191bml0dGVz dC5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2xheW91dF9wYWNrYWdl L3ByaW50aW5nX3VuaXR0ZXN0LnB5CmluZGV4IDk4ZjFjMjg3NjE3NjFjMDFiOTM1NTVlOWRiMmI5 YjA2NjEzYTNkMzQuLjAwMWM5ZGQ2YTRlOTg1MDUzNzA4NzQ3NzQ3NDkxMTEzODJjZTcxY2IgMTAw NjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2xheW91dF9wYWNr YWdlL3ByaW50aW5nX3VuaXR0ZXN0LnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5 b3V0X3Rlc3RzL2xheW91dF9wYWNrYWdlL3ByaW50aW5nX3VuaXR0ZXN0LnB5CkBAIC05MCw3ICs5 MCw4IEBAIGNsYXNzIFRlc3RVdGlsaXR5RnVuY3Rpb25zKHVuaXR0ZXN0LlRlc3RDYXNlKToKICAg ICAgICAgdGVzdF9zd2l0Y2hlcyhbXSwgcHJpbnRpbmcuUFJJTlRfREVGQVVMVCkKIAogICAgICAg ICAjIHRlc3QgdGhhdCB2ZXJib3NlIGRlZmF1bHRzIHRvIGV2ZXJ5dGhpbmcKLSAgICAgICAgdGVz dF9zd2l0Y2hlcyhbXSwgcHJpbnRpbmcuUFJJTlRfRVZFUllUSElORywgdmVyYm9zZT1UcnVlKQor ICAgICAgICBzd2l0Y2hlcyA9IHByaW50aW5nLlBSSU5UX0VWRVJZVEhJTkcucmVwbGFjZSgnLG9u ZS1saW5lLXByb2dyZXNzJywgJycpCisgICAgICAgIHRlc3Rfc3dpdGNoZXMoW10sIHN3aXRjaGVz LCB2ZXJib3NlPVRydWUpCiAKICAgICAgICAgIyB0ZXN0IHRoYXQgLS1wcmludCBkZWZhdWx0IGRv ZXMgd2hhdCBpdCdzIHN1cHBvc2VkIHRvCiAgICAgICAgIHRlc3Rfc3dpdGNoZXMoWyctLXByaW50 JywgJ2RlZmF1bHQnXSwgcHJpbnRpbmcuUFJJTlRfREVGQVVMVCkK