135665 2014-08-06 12:25:56 -0700 Move Soup specific code out of WebCoreArgumentCoders.cpp 2014-08-07 05:39:27 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 koivisto webkit-unassigned cgarcia gyuyoung.kim mrobinson ossy oldest_to_newest 1027256 0 koivisto 2014-08-06 12:25:56 -0700 It should be in *Soup 1027257 1 236125 koivisto 2014-08-06 12:30:36 -0700 Created attachment 236125 patch 1027472 2 koivisto 2014-08-07 05:39:27 -0700 http://trac.webkit.org/changeset/172208 236125 2014-08-06 12:30:36 -0700 2014-08-06 12:41:09 -0700 patch soup-request.patch text/plain 11396 koivisto SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE3MjE2NSkKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI1IEBACisyMDE0LTA4LTA2ICBBbnR0aSBL b2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KKworICAgICAgICBNb3ZlIFNvdXAgc3BlY2lmaWMg Y29kZSBvdXQgb2YgV2ViQ29yZUFyZ3VtZW50Q29kZXJzLmNwcAorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTM1NjY1CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBTaGFyZWQvV2ViQ29yZUFyZ3VtZW50Q29k ZXJzLmNwcDoKKyAgICAgICAgKElQQzo6QXJndW1lbnRDb2RlcjxSZXNvdXJjZVJlcXVlc3Q+Ojpl bmNvZGUpOgorICAgICAgICAoSVBDOjpBcmd1bWVudENvZGVyPFJlc291cmNlUmVxdWVzdD46OmRl Y29kZSk6CisgICAgICAgIChJUEM6OkFyZ3VtZW50Q29kZXI8UmVzb3VyY2VFcnJvcj46OmVuY29k ZSk6CisgICAgICAgIChJUEM6OkFyZ3VtZW50Q29kZXI8UmVzb3VyY2VFcnJvcj46OmRlY29kZSk6 CisgICAgICAgICogU2hhcmVkL1dlYkNvcmVBcmd1bWVudENvZGVycy5oOgorICAgICAgICAKKyAg ICAgICAgICAgIFNvdXAgaXMgdGhlIG9ubHkgY2xpZW50IGZvciB0aGlzIGNvZGUuIE1vdmUgaXQg dG8gKlNvdXAuY3BwCisKKyAgICAgICAgKiBTaGFyZWQvc291cC9XZWJDb3JlQXJndW1lbnRDb2Rl cnNTb3VwLmNwcDoKKyAgICAgICAgKElQQzo6QXJndW1lbnRDb2RlcjxSZXNvdXJjZVJlcXVlc3Q+ OjplbmNvZGVQbGF0Zm9ybURhdGEpOgorICAgICAgICAoSVBDOjpBcmd1bWVudENvZGVyPFJlc291 cmNlUmVxdWVzdD46OmRlY29kZVBsYXRmb3JtRGF0YSk6CisgICAgICAgIChJUEM6OkFyZ3VtZW50 Q29kZXI8UmVzb3VyY2VFcnJvcj46OmVuY29kZVBsYXRmb3JtRGF0YSk6CisgICAgICAgIChJUEM6 OkFyZ3VtZW50Q29kZXI8UmVzb3VyY2VFcnJvcj46OmRlY29kZVBsYXRmb3JtRGF0YSk6CisKIDIw MTQtMDgtMDYgIEFkcmlhbiBQZXJleiBkZSBDYXN0cm8gIDxhcGVyZXpAaWdhbGlhLmNvbT4KIAog ICAgICAgICBbR1RLXSBBZGQgc3VwcG9ydCBmb3IgdXNlciBzY3JpcHRzIHRvIFdlYktpdFVzZXJD b250ZW50TWFuYWdlcgpJbmRleDogU291cmNlL1dlYktpdDIvU2hhcmVkL1dlYkNvcmVBcmd1bWVu dENvZGVycy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvU2hhcmVkL1dlYkNvcmVB cmd1bWVudENvZGVycy5jcHAJKHJldmlzaW9uIDE3MjAyNykKKysrIFNvdXJjZS9XZWJLaXQyL1No YXJlZC9XZWJDb3JlQXJndW1lbnRDb2RlcnMuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC02MzIsMjIg KzYzMiw2IEBAIGJvb2wgQXJndW1lbnRDb2RlcjxDdXJzb3I+OjpkZWNvZGUoQXJndW0KIAogdm9p ZCBBcmd1bWVudENvZGVyPFJlc291cmNlUmVxdWVzdD46OmVuY29kZShBcmd1bWVudEVuY29kZXIm IGVuY29kZXIsIGNvbnN0IFJlc291cmNlUmVxdWVzdCYgcmVzb3VyY2VSZXF1ZXN0KQogewotICAg IGlmIChrU2hvdWxkU2VyaWFsaXplV2ViQ29yZURhdGEpIHsKLSAgICAgICAgZW5jb2RlciA8PCBy ZXNvdXJjZVJlcXVlc3QudXJsKCkuc3RyaW5nKCk7Ci0gICAgICAgIGVuY29kZXIgPDwgcmVzb3Vy Y2VSZXF1ZXN0Lmh0dHBNZXRob2QoKTsKLSAgICAgICAgZW5jb2RlciA8PCByZXNvdXJjZVJlcXVl c3QuaHR0cEhlYWRlckZpZWxkcygpOwotCi0gICAgICAgIC8vIEZJWE1FOiBEbyBub3QgZW5jb2Rl IEhUVFAgbWVzc2FnZSBib2R5LgotICAgICAgICAvLyAxLiBJdCBjYW4gYmUgbGFyZ2UgYW5kIHRo dXMgY29zdGx5IHRvIHNlbmQgYWNyb3NzLgotICAgICAgICAvLyAyLiBJdCBpcyBtaXNsZWFkaW5n IHRvIHByb3ZpZGUgYSBib2R5IHdpdGggc29tZSByZXF1ZXN0cywgd2hpbGUgb3RoZXJzIHVzZSBi b2R5IHN0cmVhbXMsIHdoaWNoIGNhbm5vdCBiZSBzZXJpYWxpemVkIGF0IGFsbC4KLSAgICAgICAg Rm9ybURhdGEqIGh0dHBCb2R5ID0gcmVzb3VyY2VSZXF1ZXN0Lmh0dHBCb2R5KCk7Ci0gICAgICAg IGVuY29kZXIgPDwgc3RhdGljX2Nhc3Q8Ym9vbD4oaHR0cEJvZHkpOwotICAgICAgICBpZiAoaHR0 cEJvZHkpCi0gICAgICAgICAgICBlbmNvZGVyIDw8IGh0dHBCb2R5LT5mbGF0dGVuVG9TdHJpbmco KTsKLQotICAgICAgICBlbmNvZGVyIDw8IHJlc291cmNlUmVxdWVzdC5maXJzdFBhcnR5Rm9yQ29v a2llcygpLnN0cmluZygpOwotICAgIH0KLQogI2lmIEVOQUJMRShDQUNIRV9QQVJUSVRJT05JTkcp CiAgICAgZW5jb2RlciA8PCByZXNvdXJjZVJlcXVlc3QuY2FjaGVQYXJ0aXRpb24oKTsKICNlbmRp ZgpAQCAtNjY3LDQyICs2NTEsNiBAQCB2b2lkIEFyZ3VtZW50Q29kZXI8UmVzb3VyY2VSZXF1ZXN0 Pjo6ZW5jCiAKIGJvb2wgQXJndW1lbnRDb2RlcjxSZXNvdXJjZVJlcXVlc3Q+OjpkZWNvZGUoQXJn dW1lbnREZWNvZGVyJiBkZWNvZGVyLCBSZXNvdXJjZVJlcXVlc3QmIHJlc291cmNlUmVxdWVzdCkK IHsKLSAgICBpZiAoa1Nob3VsZFNlcmlhbGl6ZVdlYkNvcmVEYXRhKSB7Ci0gICAgICAgIFJlc291 cmNlUmVxdWVzdCByZXF1ZXN0OwotCi0gICAgICAgIFN0cmluZyB1cmw7Ci0gICAgICAgIGlmICgh ZGVjb2Rlci5kZWNvZGUodXJsKSkKLSAgICAgICAgICAgIHJldHVybiBmYWxzZTsKLSAgICAgICAg cmVxdWVzdC5zZXRVUkwoVVJMKFVSTCgpLCB1cmwpKTsKLQotICAgICAgICBTdHJpbmcgaHR0cE1l dGhvZDsKLSAgICAgICAgaWYgKCFkZWNvZGVyLmRlY29kZShodHRwTWV0aG9kKSkKLSAgICAgICAg ICAgIHJldHVybiBmYWxzZTsKLSAgICAgICAgcmVxdWVzdC5zZXRIVFRQTWV0aG9kKGh0dHBNZXRo b2QpOwotCi0gICAgICAgIEhUVFBIZWFkZXJNYXAgaGVhZGVyczsKLSAgICAgICAgaWYgKCFkZWNv ZGVyLmRlY29kZShoZWFkZXJzKSkKLSAgICAgICAgICAgIHJldHVybiBmYWxzZTsKLSAgICAgICAg cmVxdWVzdC5zZXRIVFRQSGVhZGVyRmllbGRzKFdURjo6bW92ZShoZWFkZXJzKSk7Ci0KLSAgICAg ICAgYm9vbCBoYXNIVFRQQm9keTsKLSAgICAgICAgaWYgKCFkZWNvZGVyLmRlY29kZShoYXNIVFRQ Qm9keSkpCi0gICAgICAgICAgICByZXR1cm4gZmFsc2U7Ci0gICAgICAgIGlmIChoYXNIVFRQQm9k eSkgewotICAgICAgICAgICAgU3RyaW5nIGh0dHBCb2R5OwotICAgICAgICAgICAgaWYgKCFkZWNv ZGVyLmRlY29kZShodHRwQm9keSkpCi0gICAgICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwotICAg ICAgICAgICAgcmVxdWVzdC5zZXRIVFRQQm9keShGb3JtRGF0YTo6Y3JlYXRlKGh0dHBCb2R5LnV0 ZjgoKSkpOwotICAgICAgICB9Ci0KLSAgICAgICAgU3RyaW5nIGZpcnN0UGFydHlGb3JDb29raWVz OwotICAgICAgICBpZiAoIWRlY29kZXIuZGVjb2RlKGZpcnN0UGFydHlGb3JDb29raWVzKSkKLSAg ICAgICAgICAgIHJldHVybiBmYWxzZTsKLSAgICAgICAgcmVxdWVzdC5zZXRGaXJzdFBhcnR5Rm9y Q29va2llcyhVUkwoVVJMKCksIGZpcnN0UGFydHlGb3JDb29raWVzKSk7Ci0KLSAgICAgICAgcmVz b3VyY2VSZXF1ZXN0ID0gcmVxdWVzdDsKLSAgICB9Ci0KICNpZiBFTkFCTEUoQ0FDSEVfUEFSVElU SU9OSU5HKQogICAgIFN0cmluZyBjYWNoZVBhcnRpdGlvbjsKICAgICBpZiAoIWRlY29kZXIuZGVj b2RlKGNhY2hlUGFydGl0aW9uKSkKQEAgLTg1MSw2MyArNzk5LDExIEBAIGJvb2wgQXJndW1lbnRD b2RlcjxSZXNvdXJjZVJlc3BvbnNlPjo6ZGUKIAogdm9pZCBBcmd1bWVudENvZGVyPFJlc291cmNl RXJyb3I+OjplbmNvZGUoQXJndW1lbnRFbmNvZGVyJiBlbmNvZGVyLCBjb25zdCBSZXNvdXJjZUVy cm9yJiByZXNvdXJjZUVycm9yKQogewotICAgIGlmIChrU2hvdWxkU2VyaWFsaXplV2ViQ29yZURh dGEpIHsKLSAgICAgICAgYm9vbCBlcnJvcklzTnVsbCA9IHJlc291cmNlRXJyb3IuaXNOdWxsKCk7 Ci0gICAgICAgIGVuY29kZXIgPDwgZXJyb3JJc051bGw7Ci0gICAgICAgIGlmIChlcnJvcklzTnVs bCkKLSAgICAgICAgICAgIHJldHVybjsKLQotICAgICAgICBlbmNvZGVyIDw8IHJlc291cmNlRXJy b3IuZG9tYWluKCk7Ci0gICAgICAgIGVuY29kZXIgPDwgcmVzb3VyY2VFcnJvci5lcnJvckNvZGUo KTsKLSAgICAgICAgZW5jb2RlciA8PCByZXNvdXJjZUVycm9yLmZhaWxpbmdVUkwoKTsKLSAgICAg ICAgZW5jb2RlciA8PCByZXNvdXJjZUVycm9yLmxvY2FsaXplZERlc2NyaXB0aW9uKCk7Ci0gICAg ICAgIGVuY29kZXIgPDwgcmVzb3VyY2VFcnJvci5pc0NhbmNlbGxhdGlvbigpOwotICAgICAgICBl bmNvZGVyIDw8IHJlc291cmNlRXJyb3IuaXNUaW1lb3V0KCk7Ci0gICAgfQotCiAgICAgZW5jb2Rl UGxhdGZvcm1EYXRhKGVuY29kZXIsIHJlc291cmNlRXJyb3IpOwogfQogCiBib29sIEFyZ3VtZW50 Q29kZXI8UmVzb3VyY2VFcnJvcj46OmRlY29kZShBcmd1bWVudERlY29kZXImIGRlY29kZXIsIFJl c291cmNlRXJyb3ImIHJlc291cmNlRXJyb3IpCiB7Ci0gICAgaWYgKGtTaG91bGRTZXJpYWxpemVX ZWJDb3JlRGF0YSkgewotICAgICAgICBib29sIGVycm9ySXNOdWxsOwotICAgICAgICBpZiAoIWRl Y29kZXIuZGVjb2RlKGVycm9ySXNOdWxsKSkKLSAgICAgICAgICAgIHJldHVybiBmYWxzZTsKLSAg ICAgICAgaWYgKGVycm9ySXNOdWxsKSB7Ci0gICAgICAgICAgICByZXNvdXJjZUVycm9yID0gUmVz b3VyY2VFcnJvcigpOwotICAgICAgICAgICAgcmV0dXJuIHRydWU7Ci0gICAgICAgIH0KLQotICAg ICAgICBTdHJpbmcgZG9tYWluOwotICAgICAgICBpZiAoIWRlY29kZXIuZGVjb2RlKGRvbWFpbikp Ci0gICAgICAgICAgICByZXR1cm4gZmFsc2U7Ci0KLSAgICAgICAgaW50IGVycm9yQ29kZTsKLSAg ICAgICAgaWYgKCFkZWNvZGVyLmRlY29kZShlcnJvckNvZGUpKQotICAgICAgICAgICAgcmV0dXJu IGZhbHNlOwotCi0gICAgICAgIFN0cmluZyBmYWlsaW5nVVJMOwotICAgICAgICBpZiAoIWRlY29k ZXIuZGVjb2RlKGZhaWxpbmdVUkwpKQotICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwotCi0gICAg ICAgIFN0cmluZyBsb2NhbGl6ZWREZXNjcmlwdGlvbjsKLSAgICAgICAgaWYgKCFkZWNvZGVyLmRl Y29kZShsb2NhbGl6ZWREZXNjcmlwdGlvbikpCi0gICAgICAgICAgICByZXR1cm4gZmFsc2U7Ci0K LSAgICAgICAgYm9vbCBpc0NhbmNlbGxhdGlvbjsKLSAgICAgICAgaWYgKCFkZWNvZGVyLmRlY29k ZShpc0NhbmNlbGxhdGlvbikpCi0gICAgICAgICAgICByZXR1cm4gZmFsc2U7Ci0KLSAgICAgICAg Ym9vbCBpc1RpbWVvdXQ7Ci0gICAgICAgIGlmICghZGVjb2Rlci5kZWNvZGUoaXNUaW1lb3V0KSkK LSAgICAgICAgICAgIHJldHVybiBmYWxzZTsKLQotICAgICAgICByZXNvdXJjZUVycm9yID0gUmVz b3VyY2VFcnJvcihkb21haW4sIGVycm9yQ29kZSwgZmFpbGluZ1VSTCwgbG9jYWxpemVkRGVzY3Jp cHRpb24pOwotICAgICAgICByZXNvdXJjZUVycm9yLnNldElzQ2FuY2VsbGF0aW9uKGlzQ2FuY2Vs bGF0aW9uKTsKLSAgICAgICAgcmVzb3VyY2VFcnJvci5zZXRJc1RpbWVvdXQoaXNUaW1lb3V0KTsK LSAgICB9Ci0KICAgICByZXR1cm4gZGVjb2RlUGxhdGZvcm1EYXRhKGRlY29kZXIsIHJlc291cmNl RXJyb3IpOwogfQogCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9TaGFyZWQvV2ViQ29yZUFyZ3VtZW50 Q29kZXJzLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvU2hhcmVkL1dlYkNvcmVBcmd1 bWVudENvZGVycy5oCShyZXZpc2lvbiAxNzIwMjcpCisrKyBTb3VyY2UvV2ViS2l0Mi9TaGFyZWQv V2ViQ29yZUFyZ3VtZW50Q29kZXJzLmgJKHdvcmtpbmcgY29weSkKQEAgLTI0NSwxMiArMjQ1LDYg QEAgdGVtcGxhdGU8PiBzdHJ1Y3QgQXJndW1lbnRDb2RlcjxXZWJDb3JlOgogfTsKIAogdGVtcGxh dGU8PiBzdHJ1Y3QgQXJndW1lbnRDb2RlcjxXZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3Q+IHsKLSNp ZiBQTEFURk9STShDT0NPQSkKLSAgICBzdGF0aWMgY29uc3QgYm9vbCBrU2hvdWxkU2VyaWFsaXpl V2ViQ29yZURhdGEgPSBmYWxzZTsKLSNlbHNlCi0gICAgc3RhdGljIGNvbnN0IGJvb2wga1Nob3Vs ZFNlcmlhbGl6ZVdlYkNvcmVEYXRhID0gdHJ1ZTsKLSNlbmRpZgotCiAgICAgc3RhdGljIHZvaWQg ZW5jb2RlKEFyZ3VtZW50RW5jb2RlciYsIGNvbnN0IFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdCYp OwogICAgIHN0YXRpYyBib29sIGRlY29kZShBcmd1bWVudERlY29kZXImLCBXZWJDb3JlOjpSZXNv dXJjZVJlcXVlc3QmKTsKICAgICBzdGF0aWMgdm9pZCBlbmNvZGVQbGF0Zm9ybURhdGEoQXJndW1l bnRFbmNvZGVyJiwgY29uc3QgV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0Jik7CkBAIC0yNjUsMTIg KzI1OSw2IEBAIHRlbXBsYXRlPD4gc3RydWN0IEFyZ3VtZW50Q29kZXI8V2ViQ29yZToKIH07CiAK IHRlbXBsYXRlPD4gc3RydWN0IEFyZ3VtZW50Q29kZXI8V2ViQ29yZTo6UmVzb3VyY2VFcnJvcj4g ewotI2lmIFBMQVRGT1JNKENPQ09BKQotICAgIHN0YXRpYyBjb25zdCBib29sIGtTaG91bGRTZXJp YWxpemVXZWJDb3JlRGF0YSA9IGZhbHNlOwotI2Vsc2UKLSAgICBzdGF0aWMgY29uc3QgYm9vbCBr U2hvdWxkU2VyaWFsaXplV2ViQ29yZURhdGEgPSB0cnVlOwotI2VuZGlmCi0KICAgICBzdGF0aWMg dm9pZCBlbmNvZGUoQXJndW1lbnRFbmNvZGVyJiwgY29uc3QgV2ViQ29yZTo6UmVzb3VyY2VFcnJv ciYpOwogICAgIHN0YXRpYyBib29sIGRlY29kZShBcmd1bWVudERlY29kZXImLCBXZWJDb3JlOjpS ZXNvdXJjZUVycm9yJik7CiAgICAgc3RhdGljIHZvaWQgZW5jb2RlUGxhdGZvcm1EYXRhKEFyZ3Vt ZW50RW5jb2RlciYsIGNvbnN0IFdlYkNvcmU6OlJlc291cmNlRXJyb3ImKTsKSW5kZXg6IFNvdXJj ZS9XZWJLaXQyL1NoYXJlZC9zb3VwL1dlYkNvcmVBcmd1bWVudENvZGVyc1NvdXAuY3BwCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1NoYXJlZC9zb3VwL1dlYkNvcmVBcmd1bWVudENvZGVy c1NvdXAuY3BwCShyZXZpc2lvbiAxNzIwMjcpCisrKyBTb3VyY2UvV2ViS2l0Mi9TaGFyZWQvc291 cC9XZWJDb3JlQXJndW1lbnRDb2RlcnNTb3VwLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNDEsMTIg KzQxLDU2IEBAIG5hbWVzcGFjZSBJUEMgewogCiB2b2lkIEFyZ3VtZW50Q29kZXI8UmVzb3VyY2VS ZXF1ZXN0Pjo6ZW5jb2RlUGxhdGZvcm1EYXRhKEFyZ3VtZW50RW5jb2RlciYgZW5jb2RlciwgY29u c3QgUmVzb3VyY2VSZXF1ZXN0JiByZXNvdXJjZVJlcXVlc3QpCiB7CisgICAgZW5jb2RlciA8PCBy ZXNvdXJjZVJlcXVlc3QudXJsKCkuc3RyaW5nKCk7CisgICAgZW5jb2RlciA8PCByZXNvdXJjZVJl cXVlc3QuaHR0cE1ldGhvZCgpOworICAgIGVuY29kZXIgPDwgcmVzb3VyY2VSZXF1ZXN0Lmh0dHBI ZWFkZXJGaWVsZHMoKTsKKworICAgIC8vIEZJWE1FOiBEbyBub3QgZW5jb2RlIEhUVFAgbWVzc2Fn ZSBib2R5LgorICAgIC8vIDEuIEl0IGNhbiBiZSBsYXJnZSBhbmQgdGh1cyBjb3N0bHkgdG8gc2Vu ZCBhY3Jvc3MuCisgICAgLy8gMi4gSXQgaXMgbWlzbGVhZGluZyB0byBwcm92aWRlIGEgYm9keSB3 aXRoIHNvbWUgcmVxdWVzdHMsIHdoaWxlIG90aGVycyB1c2UgYm9keSBzdHJlYW1zLCB3aGljaCBj YW5ub3QgYmUgc2VyaWFsaXplZCBhdCBhbGwuCisgICAgRm9ybURhdGEqIGh0dHBCb2R5ID0gcmVz b3VyY2VSZXF1ZXN0Lmh0dHBCb2R5KCk7CisgICAgZW5jb2RlciA8PCBzdGF0aWNfY2FzdDxib29s PihodHRwQm9keSk7CisgICAgaWYgKGh0dHBCb2R5KQorICAgICAgICBlbmNvZGVyIDw8IGh0dHBC b2R5LT5mbGF0dGVuVG9TdHJpbmcoKTsKKworICAgIGVuY29kZXIgPDwgcmVzb3VyY2VSZXF1ZXN0 LmZpcnN0UGFydHlGb3JDb29raWVzKCkuc3RyaW5nKCk7CisKICAgICBlbmNvZGVyIDw8IHN0YXRp Y19jYXN0PHVpbnQzMl90PihyZXNvdXJjZVJlcXVlc3Quc291cE1lc3NhZ2VGbGFncygpKTsKICAg ICBlbmNvZGVyIDw8IHJlc291cmNlUmVxdWVzdC5pbml0aWF0aW5nUGFnZUlEKCk7CiB9CiAKIGJv b2wgQXJndW1lbnRDb2RlcjxSZXNvdXJjZVJlcXVlc3Q+OjpkZWNvZGVQbGF0Zm9ybURhdGEoQXJn dW1lbnREZWNvZGVyJiBkZWNvZGVyLCBSZXNvdXJjZVJlcXVlc3QmIHJlc291cmNlUmVxdWVzdCkK IHsKKyAgICBTdHJpbmcgdXJsOworICAgIGlmICghZGVjb2Rlci5kZWNvZGUodXJsKSkKKyAgICAg ICAgcmV0dXJuIGZhbHNlOworICAgIHJlc291cmNlUmVxdWVzdC5zZXRVUkwoVVJMKFVSTCgpLCB1 cmwpKTsKKworICAgIFN0cmluZyBodHRwTWV0aG9kOworICAgIGlmICghZGVjb2Rlci5kZWNvZGUo aHR0cE1ldGhvZCkpCisgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICByZXNvdXJjZVJlcXVlc3Qu c2V0SFRUUE1ldGhvZChodHRwTWV0aG9kKTsKKworICAgIEhUVFBIZWFkZXJNYXAgaGVhZGVyczsK KyAgICBpZiAoIWRlY29kZXIuZGVjb2RlKGhlYWRlcnMpKQorICAgICAgICByZXR1cm4gZmFsc2U7 CisgICAgcmVzb3VyY2VSZXF1ZXN0LnNldEhUVFBIZWFkZXJGaWVsZHMoV1RGOjptb3ZlKGhlYWRl cnMpKTsKKworICAgIGJvb2wgaGFzSFRUUEJvZHk7CisgICAgaWYgKCFkZWNvZGVyLmRlY29kZSho YXNIVFRQQm9keSkpCisgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICBpZiAoaGFzSFRUUEJvZHkp IHsKKyAgICAgICAgU3RyaW5nIGh0dHBCb2R5OworICAgICAgICBpZiAoIWRlY29kZXIuZGVjb2Rl KGh0dHBCb2R5KSkKKyAgICAgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICAgICAgcmVzb3VyY2VS ZXF1ZXN0LnNldEhUVFBCb2R5KEZvcm1EYXRhOjpjcmVhdGUoaHR0cEJvZHkudXRmOCgpKSk7Cisg ICAgfQorCisgICAgU3RyaW5nIGZpcnN0UGFydHlGb3JDb29raWVzOworICAgIGlmICghZGVjb2Rl ci5kZWNvZGUoZmlyc3RQYXJ0eUZvckNvb2tpZXMpKQorICAgICAgICByZXR1cm4gZmFsc2U7Cisg ICAgcmVzb3VyY2VSZXF1ZXN0LnNldEZpcnN0UGFydHlGb3JDb29raWVzKFVSTChVUkwoKSwgZmly c3RQYXJ0eUZvckNvb2tpZXMpKTsKKwogICAgIHVpbnQzMl90IHNvdXBNZXNzYWdlRmxhZ3M7CiAg ICAgaWYgKCFkZWNvZGVyLmRlY29kZShzb3VwTWVzc2FnZUZsYWdzKSkKICAgICAgICAgcmV0dXJu IGZhbHNlOwpAQCAtNjAsNyArMTA0LDYgQEAgYm9vbCBBcmd1bWVudENvZGVyPFJlc291cmNlUmVx dWVzdD46OmRlYwogICAgIHJldHVybiB0cnVlOwogfQogCi0KIHZvaWQgQXJndW1lbnRDb2RlcjxS ZXNvdXJjZVJlc3BvbnNlPjo6ZW5jb2RlUGxhdGZvcm1EYXRhKEFyZ3VtZW50RW5jb2RlciYgZW5j b2RlciwgY29uc3QgUmVzb3VyY2VSZXNwb25zZSYgcmVzb3VyY2VSZXNwb25zZSkKIHsKICAgICBl bmNvZGVyIDw8IHN0YXRpY19jYXN0PHVpbnQzMl90PihyZXNvdXJjZVJlc3BvbnNlLnNvdXBNZXNz YWdlRmxhZ3MoKSk7CkBAIC0xMjcsMTEgKzE3MCw1OSBAQCBib29sIEFyZ3VtZW50Q29kZXI8Q2Vy dGlmaWNhdGVJbmZvPjo6ZGVjCiAKIHZvaWQgQXJndW1lbnRDb2RlcjxSZXNvdXJjZUVycm9yPjo6 ZW5jb2RlUGxhdGZvcm1EYXRhKEFyZ3VtZW50RW5jb2RlciYgZW5jb2RlciwgY29uc3QgUmVzb3Vy Y2VFcnJvciYgcmVzb3VyY2VFcnJvcikKIHsKKyAgICBib29sIGVycm9ySXNOdWxsID0gcmVzb3Vy Y2VFcnJvci5pc051bGwoKTsKKyAgICBlbmNvZGVyIDw8IGVycm9ySXNOdWxsOworICAgIGlmIChl cnJvcklzTnVsbCkKKyAgICAgICAgcmV0dXJuOworCisgICAgZW5jb2RlciA8PCByZXNvdXJjZUVy cm9yLmRvbWFpbigpOworICAgIGVuY29kZXIgPDwgcmVzb3VyY2VFcnJvci5lcnJvckNvZGUoKTsK KyAgICBlbmNvZGVyIDw8IHJlc291cmNlRXJyb3IuZmFpbGluZ1VSTCgpOworICAgIGVuY29kZXIg PDwgcmVzb3VyY2VFcnJvci5sb2NhbGl6ZWREZXNjcmlwdGlvbigpOworICAgIGVuY29kZXIgPDwg cmVzb3VyY2VFcnJvci5pc0NhbmNlbGxhdGlvbigpOworICAgIGVuY29kZXIgPDwgcmVzb3VyY2VF cnJvci5pc1RpbWVvdXQoKTsKKwogICAgIGVuY29kZXIgPDwgQ2VydGlmaWNhdGVJbmZvKHJlc291 cmNlRXJyb3IpOwogfQogCiBib29sIEFyZ3VtZW50Q29kZXI8UmVzb3VyY2VFcnJvcj46OmRlY29k ZVBsYXRmb3JtRGF0YShBcmd1bWVudERlY29kZXImIGRlY29kZXIsIFJlc291cmNlRXJyb3ImIHJl c291cmNlRXJyb3IpCiB7CisgICAgYm9vbCBlcnJvcklzTnVsbDsKKyAgICBpZiAoIWRlY29kZXIu ZGVjb2RlKGVycm9ySXNOdWxsKSkKKyAgICAgICAgcmV0dXJuIGZhbHNlOworICAgIGlmIChlcnJv cklzTnVsbCkgeworICAgICAgICByZXNvdXJjZUVycm9yID0gUmVzb3VyY2VFcnJvcigpOworICAg ICAgICByZXR1cm4gdHJ1ZTsKKyAgICB9CisKKyAgICBTdHJpbmcgZG9tYWluOworICAgIGlmICgh ZGVjb2Rlci5kZWNvZGUoZG9tYWluKSkKKyAgICAgICAgcmV0dXJuIGZhbHNlOworCisgICAgaW50 IGVycm9yQ29kZTsKKyAgICBpZiAoIWRlY29kZXIuZGVjb2RlKGVycm9yQ29kZSkpCisgICAgICAg IHJldHVybiBmYWxzZTsKKworICAgIFN0cmluZyBmYWlsaW5nVVJMOworICAgIGlmICghZGVjb2Rl ci5kZWNvZGUoZmFpbGluZ1VSTCkpCisgICAgICAgIHJldHVybiBmYWxzZTsKKworICAgIFN0cmlu ZyBsb2NhbGl6ZWREZXNjcmlwdGlvbjsKKyAgICBpZiAoIWRlY29kZXIuZGVjb2RlKGxvY2FsaXpl ZERlc2NyaXB0aW9uKSkKKyAgICAgICAgcmV0dXJuIGZhbHNlOworCisgICAgYm9vbCBpc0NhbmNl bGxhdGlvbjsKKyAgICBpZiAoIWRlY29kZXIuZGVjb2RlKGlzQ2FuY2VsbGF0aW9uKSkKKyAgICAg ICAgcmV0dXJuIGZhbHNlOworCisgICAgYm9vbCBpc1RpbWVvdXQ7CisgICAgaWYgKCFkZWNvZGVy LmRlY29kZShpc1RpbWVvdXQpKQorICAgICAgICByZXR1cm4gZmFsc2U7CisKKyAgICByZXNvdXJj ZUVycm9yID0gUmVzb3VyY2VFcnJvcihkb21haW4sIGVycm9yQ29kZSwgZmFpbGluZ1VSTCwgbG9j YWxpemVkRGVzY3JpcHRpb24pOworICAgIHJlc291cmNlRXJyb3Iuc2V0SXNDYW5jZWxsYXRpb24o aXNDYW5jZWxsYXRpb24pOworICAgIHJlc291cmNlRXJyb3Iuc2V0SXNUaW1lb3V0KGlzVGltZW91 dCk7CisKICAgICBDZXJ0aWZpY2F0ZUluZm8gY2VydGlmaWNhdGVJbmZvOwogICAgIGlmICghZGVj b2Rlci5kZWNvZGUoY2VydGlmaWNhdGVJbmZvKSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwo=