120681 2013-09-04 07:38:30 -0700 REGRESSION(r154977): Do not urlencode soup message on ResourceRequest::toSoupMessage() 2013-09-04 10:53:02 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 0 andrunko webkit-unassigned cdumez commit-queue danw eflews.bot gtk-ews gustavo gyuyoung.kim mrobinson rakuco rego+ews xan.lopez zan oldest_to_newest 924419 0 andrunko 2013-09-04 07:38:30 -0700 This accidentally regressed in http://trac.webkit.org/changeset/154977 because the old code behaved correctly when toSoupMessage was called. 924420 1 210458 andrunko 2013-09-04 07:47:03 -0700 Created attachment 210458 Patch 924422 2 210458 gtk-ews 2013-09-04 07:58:28 -0700 Comment on attachment 210458 Patch Attachment 210458 did not pass gtk-ews (gtk): Output: http://webkit-queues.appspot.com/results/1697288 924429 3 210458 eflews.bot 2013-09-04 08:10:33 -0700 Comment on attachment 210458 Patch Attachment 210458 did not pass efl-ews (efl): Output: http://webkit-queues.appspot.com/results/1685622 924430 4 210458 eflews.bot 2013-09-04 08:12:20 -0700 Comment on attachment 210458 Patch Attachment 210458 did not pass efl-wk2-ews (efl-wk2): Output: http://webkit-queues.appspot.com/results/1695468 924471 5 210469 andrunko 2013-09-04 09:21:57 -0700 Created attachment 210469 Patch Updated patch that actually builds (I blame slow builds :D). What happened is that the buildbot failed for media fragments tests on http://build.webkit.org/builders/GTK%20Linux%2064-bit%20Release/builds/40360 (78 failures over 50 failures on build 40359, all 28 new failures on media fragments tests) with only the changeset from http://trac.webkit.org/changeset/154977. What I find strange is that all media fragments tests work fine here with and without this new patch to fix the regression (same results): $ Tools/Scripts/run-webkit-tests --no-new-test-results --debug-rwt-logging --no-sample-on-timeout --webkit-test-runner LayoutTests/media/media-fragments/ --debug --gtk --iteration=1 ... => Results: 68/68 tests passed (100.0%) So, not sure what is happening with the buildbot failures. 924491 6 mrobinson 2013-09-04 10:02:18 -0700 This probably needs a test or to unskip a test. 924503 7 zan 2013-09-04 10:42:45 -0700 It fixes a bunch of media fragment failures on the builders that regressed with r154977. The patch is also just extracting duplicated code into a single method. 924504 8 mrobinson 2013-09-04 10:44:05 -0700 (In reply to comment #7) > It fixes a bunch of media fragment failures on the builders that regressed with r154977. The patch is also just extracting duplicated code into a single method. So the tests are failing now or are they skipped? 924505 9 zan 2013-09-04 10:45:14 -0700 Now. http://build.webkit.org/results/GTK%20Linux%2064-bit%20Release/r155047%20(40401)/results.html 924508 10 andrunko 2013-09-04 10:49:26 -0700 (In reply to comment #9) > Now. > http://build.webkit.org/results/GTK%20Linux%2064-bit%20Release/r155047%20(40401)/results.html Point is they don't fail here (local) even without this patch, wonder why :/. In any case I think this patch is correct and restores the behaviour of toSoupMessage (apart from also updating the message to respect acceptEncoding) before the changeset that caused the regressions. 924509 11 210469 mrobinson 2013-09-04 10:49:58 -0700 Comment on attachment 210469 Patch Let's do this thing. 924512 12 210469 commit-queue 2013-09-04 10:52:58 -0700 Comment on attachment 210469 Patch Clearing flags on attachment: 210469 Committed r155049: <http://trac.webkit.org/changeset/155049> 924513 13 commit-queue 2013-09-04 10:53:02 -0700 All reviewed patches have been landed. Closing bug. 210458 2013-09-04 07:47:03 -0700 2013-09-04 09:21:57 -0700 Patch 0001-REGRESSION-r154977-Do-not-urlencode-soup-message-on-.patch text/plain 4929 andrunko RnJvbSA0NmU0ZmE3ZGRlZmY1MzI4YjUyYmI3NTgxMjNmNzhkMTkyODhhZTMxIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiAiQW5kcmUgTW9yZWlyYSBNYWdhbGhhZXMgKGFuZHJ1bmtvKSIg PGFuZHJlLm1hZ2FsaGFlc0Bjb2xsYWJvcmEuY28udWs+CkRhdGU6IFdlZCwgNCBTZXAgMjAxMyAx MTozOToyMyAtMDMwMApTdWJqZWN0OiBbUEFUQ0hdIFJFR1JFU1NJT04ocjE1NDk3Nyk6IERvIG5v dCB1cmxlbmNvZGUgc291cCBtZXNzYWdlIG9uCiBSZXNvdXJjZVJlcXVlc3Q6OnRvU291cE1lc3Nh Z2UoKQogaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyMDY4MQoKUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCgpEbyBub3QgY2FsbCBzb3VwX21lc3NhZ2Vfc2V0X3Vy aSB3aXRoIHNvdXBVUkkoKSAodXJsIGVuY29kZWQgdXJpKSBvbgpSZXNvdXJjZVJlcXVlc3Q6OnRv U291cE1lc3NhZ2UoKS4KCiogcGxhdGZvcm0vbmV0d29yay9zb3VwL1Jlc291cmNlUmVxdWVzdC5o OgoqIHBsYXRmb3JtL25ldHdvcmsvc291cC9SZXNvdXJjZVJlcXVlc3RTb3VwLmNwcDoKKFdlYkNv cmU6OlJlc291cmNlUmVxdWVzdDo6dXBkYXRlU291cE1lc3NhZ2VNZW1iZXJzKToKKFdlYkNvcmU6 OlJlc291cmNlUmVxdWVzdDo6dXBkYXRlU291cE1lc3NhZ2UpOgooV2ViQ29yZTo6UmVzb3VyY2VS ZXF1ZXN0Ojp0b1NvdXBNZXNzYWdlKToKU3BsaXQgY29tbW9uIGNvZGUgZnJvbSB1cGRhdGVTb3Vw TWVzc2FnZS90b1NvdXBNZXNzYWdlIGludG8gdXBkYXRlU291cE1lc3NhZ2VNZW1iZXJzLgotLS0K IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyAgICAgICAgICAgICAgICAgICAgICAgICAgIHwgMTcg KysrKysrKysrKysrCiAuLi4vcGxhdGZvcm0vbmV0d29yay9zb3VwL1Jlc291cmNlUmVxdWVzdC5o ICAgICAgICB8ICAxICsKIC4uLi9wbGF0Zm9ybS9uZXR3b3JrL3NvdXAvUmVzb3VyY2VSZXF1ZXN0 U291cC5jcHAgIHwgMzEgKysrKysrKysrKysrKy0tLS0tLS0tLQogMyBmaWxlcyBjaGFuZ2VkLCAz NiBpbnNlcnRpb25zKCspLCAxMyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjRkN2FiOC4u ZTZjZTEzZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDEzLTA5LTA0ICBBbmRyZSBN b3JlaXJhIE1hZ2FsaGFlcyAgIDxhbmRyZS5tYWdhbGhhZXNAY29sbGFib3JhLmNvLnVrPgorCisg ICAgICAgIFJFR1JFU1NJT04ocjE1NDk3Nyk6IERvIG5vdCB1cmxlbmNvZGUgc291cCBtZXNzYWdl IG9uIFJlc291cmNlUmVxdWVzdDo6dG9Tb3VwTWVzc2FnZSgpCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjA2ODEKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBEbyBub3QgY2FsbCBzb3VwX21lc3NhZ2Vfc2V0 X3VyaSB3aXRoIHNvdXBVUkkoKSAodXJsIGVuY29kZWQgdXJpKSBvbgorICAgICAgICBSZXNvdXJj ZVJlcXVlc3Q6OnRvU291cE1lc3NhZ2UoKS4KKworICAgICAgICAqIHBsYXRmb3JtL25ldHdvcmsv c291cC9SZXNvdXJjZVJlcXVlc3QuaDoKKyAgICAgICAgKiBwbGF0Zm9ybS9uZXR3b3JrL3NvdXAv UmVzb3VyY2VSZXF1ZXN0U291cC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZXNvdXJjZVJlcXVl c3Q6OnVwZGF0ZVNvdXBNZXNzYWdlTWVtYmVycyk6CisgICAgICAgIChXZWJDb3JlOjpSZXNvdXJj ZVJlcXVlc3Q6OnVwZGF0ZVNvdXBNZXNzYWdlKToKKyAgICAgICAgKFdlYkNvcmU6OlJlc291cmNl UmVxdWVzdDo6dG9Tb3VwTWVzc2FnZSk6CisgICAgICAgIFNwbGl0IGNvbW1vbiBjb2RlIGZyb20g dXBkYXRlU291cE1lc3NhZ2UvdG9Tb3VwTWVzc2FnZSBpbnRvIHVwZGF0ZVNvdXBNZXNzYWdlTWVt YmVycy4KKwogMjAxMy0wOS0wMyAgQW5kcmUgTW9yZWlyYSBNYWdhbGhhZXMgICA8YW5kcmUubWFn YWxoYWVzQGNvbGxhYm9yYS5jby51az4KIAogICAgICAgICBbR1N0cmVhbWVyXSBjYW5ub3QgcGxh eSBsaXZlIHN0cmVhbXMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdv cmsvc291cC9SZXNvdXJjZVJlcXVlc3QuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdv cmsvc291cC9SZXNvdXJjZVJlcXVlc3QuaAppbmRleCA3MzBhMjg3Li5kNmE4M2Y2IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL3NvdXAvUmVzb3VyY2VSZXF1ZXN0 LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9zb3VwL1Jlc291cmNlUmVx dWVzdC5oCkBAIC05Myw2ICs5Myw3IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAgICAgYm9v bCBtX2FjY2VwdEVuY29kaW5nIDogMTsKICAgICAgICAgU291cE1lc3NhZ2VGbGFncyBtX3NvdXBG bGFnczsKIAorICAgICAgICB2b2lkIHVwZGF0ZVNvdXBNZXNzYWdlTWVtYmVycyhTb3VwTWVzc2Fn ZUhlYWRlcnMqKSBjb25zdDsKICAgICAgICAgdm9pZCBkb1VwZGF0ZVBsYXRmb3JtUmVxdWVzdCgp IHsgfQogICAgICAgICB2b2lkIGRvVXBkYXRlUmVzb3VyY2VSZXF1ZXN0KCkgeyB9CiAgICAgICAg IHZvaWQgZG9VcGRhdGVQbGF0Zm9ybUhUVFBCb2R5KCkgeyB9CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL3NvdXAvUmVzb3VyY2VSZXF1ZXN0U291cC5jcHAgYi9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL3NvdXAvUmVzb3VyY2VSZXF1ZXN0U291cC5j cHAKaW5kZXggMmU2YjNhNi4uYTI0MDRlMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vbmV0d29yay9zb3VwL1Jlc291cmNlUmVxdWVzdFNvdXAuY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvc291cC9SZXNvdXJjZVJlcXVlc3RTb3VwLmNwcApAQCAt MzIsNiArMzIsMjIgQEAgdXNpbmcgbmFtZXNwYWNlIHN0ZDsKIAogbmFtZXNwYWNlIFdlYkNvcmUg ewogCit2b2lkIFJlc291cmNlUmVxdWVzdDo6dXBkYXRlU291cE1lc3NhZ2VNZW1iZXJzKFNvdXBN ZXNzYWdlICptZXNzYWdlKSBjb25zdAoreworICAgIHVwZGF0ZVNvdXBNZXNzYWdlSGVhZGVycyhz b3VwTWVzc2FnZS0+cmVxdWVzdF9oZWFkZXJzKTsKKworICAgIFN0cmluZyBmaXJzdFBhcnR5U3Ry aW5nID0gZmlyc3RQYXJ0eUZvckNvb2tpZXMoKS5zdHJpbmcoKTsKKyAgICBpZiAoIWZpcnN0UGFy dHlTdHJpbmcuaXNFbXB0eSgpKSB7CisgICAgICAgIEdPd25QdHI8U291cFVSST4gZmlyc3RQYXJ0 eShzb3VwX3VyaV9uZXcoZmlyc3RQYXJ0eVN0cmluZy51dGY4KCkuZGF0YSgpKSk7CisgICAgICAg IHNvdXBfbWVzc2FnZV9zZXRfZmlyc3RfcGFydHkoc291cE1lc3NhZ2UsIGZpcnN0UGFydHkuZ2V0 KCkpOworICAgIH0KKworICAgIHNvdXBfbWVzc2FnZV9zZXRfZmxhZ3Moc291cE1lc3NhZ2UsIG1f c291cEZsYWdzKTsKKworICAgIGlmICghYWNjZXB0RW5jb2RpbmcoKSkKKyAgICAgICAgc291cF9t ZXNzYWdlX2Rpc2FibGVfZmVhdHVyZShzb3VwTWVzc2FnZSwgU09VUF9UWVBFX0NPTlRFTlRfREVD T0RFUik7Cit9CisKIHZvaWQgUmVzb3VyY2VSZXF1ZXN0Ojp1cGRhdGVTb3VwTWVzc2FnZUhlYWRl cnMoU291cE1lc3NhZ2VIZWFkZXJzKiBzb3VwSGVhZGVycykgY29uc3QKIHsKICAgICBjb25zdCBI VFRQSGVhZGVyTWFwJiBoZWFkZXJzID0gaHR0cEhlYWRlckZpZWxkcygpOwpAQCAtNjAsMTggKzc2 LDcgQEAgdm9pZCBSZXNvdXJjZVJlcXVlc3Q6OnVwZGF0ZVNvdXBNZXNzYWdlKFNvdXBNZXNzYWdl KiBzb3VwTWVzc2FnZSkgY29uc3QKICAgICBHT3duUHRyPFNvdXBVUkk+IHVyaShzb3VwVVJJKCkp OwogICAgIHNvdXBfbWVzc2FnZV9zZXRfdXJpKHNvdXBNZXNzYWdlLCB1cmkuZ2V0KCkpOwogCi0g ICAgdXBkYXRlU291cE1lc3NhZ2VIZWFkZXJzKHNvdXBNZXNzYWdlLT5yZXF1ZXN0X2hlYWRlcnMp OwotCi0gICAgU3RyaW5nIGZpcnN0UGFydHlTdHJpbmcgPSBmaXJzdFBhcnR5Rm9yQ29va2llcygp LnN0cmluZygpOwotICAgIGlmICghZmlyc3RQYXJ0eVN0cmluZy5pc0VtcHR5KCkpIHsKLSAgICAg ICAgR093blB0cjxTb3VwVVJJPiBmaXJzdFBhcnR5KHNvdXBfdXJpX25ldyhmaXJzdFBhcnR5U3Ry aW5nLnV0ZjgoKS5kYXRhKCkpKTsKLSAgICAgICAgc291cF9tZXNzYWdlX3NldF9maXJzdF9wYXJ0 eShzb3VwTWVzc2FnZSwgZmlyc3RQYXJ0eS5nZXQoKSk7Ci0gICAgfQotCi0gICAgc291cF9tZXNz YWdlX3NldF9mbGFncyhzb3VwTWVzc2FnZSwgbV9zb3VwRmxhZ3MpOwotCi0gICAgaWYgKCFhY2Nl cHRFbmNvZGluZygpKQotICAgICAgICBzb3VwX21lc3NhZ2VfZGlzYWJsZV9mZWF0dXJlKHNvdXBN ZXNzYWdlLCBTT1VQX1RZUEVfQ09OVEVOVF9ERUNPREVSKTsKKyAgICB1cGRhdGVTb3VwTWVzc2Fn ZU1lbWJlcnMoc291cE1lc3NhZ2UpOwogfQogCiBTb3VwTWVzc2FnZSogUmVzb3VyY2VSZXF1ZXN0 Ojp0b1NvdXBNZXNzYWdlKCkgY29uc3QKQEAgLTgwLDcgKzg1LDcgQEAgU291cE1lc3NhZ2UqIFJl c291cmNlUmVxdWVzdDo6dG9Tb3VwTWVzc2FnZSgpIGNvbnN0CiAgICAgaWYgKCFzb3VwTWVzc2Fn ZSkKICAgICAgICAgcmV0dXJuIDA7CiAKLSAgICB1cGRhdGVTb3VwTWVzc2FnZShzb3VwTWVzc2Fn ZSk7CisgICAgdXBkYXRlU291cE1lc3NhZ2VNZW1iZXJzKHNvdXBNZXNzYWdlKTsKIAogICAgIC8v IEJvZHkgZGF0YSBpcyBvbmx5IGhhbmRsZWQgYXQgUmVzb3VyY2VIYW5kbGVTb3VwOjpzdGFydEh0 dHAgZm9yCiAgICAgLy8gbm93OyB0aGlzIGlzIGJlY2F1c2UgdGhpcyBtYXkgbm90IGJlIGEgZ29v ZCBwbGFjZSB0byBnbwotLSAKMS44LjEuMgoK 210469 2013-09-04 09:21:57 -0700 2013-09-04 10:52:58 -0700 Patch 0001-REGRESSION-r154977-Do-not-urlencode-soup-message-on-.patch text/plain 4926 andrunko RnJvbSBlZTJmNjBlN2I0ZjY1MDdlYzZlZWJlM2I3MzkwZDJjMDI2ZGYyNTc1IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiAiQW5kcmUgTW9yZWlyYSBNYWdhbGhhZXMgKGFuZHJ1bmtvKSIg PGFuZHJlLm1hZ2FsaGFlc0Bjb2xsYWJvcmEuY28udWs+CkRhdGU6IFdlZCwgNCBTZXAgMjAxMyAx MTozOToyMyAtMDMwMApTdWJqZWN0OiBbUEFUQ0hdIFJFR1JFU1NJT04ocjE1NDk3Nyk6IERvIG5v dCB1cmxlbmNvZGUgc291cCBtZXNzYWdlIG9uCiBSZXNvdXJjZVJlcXVlc3Q6OnRvU291cE1lc3Nh Z2UoKQogaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyMDY4MQoKUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCgpEbyBub3QgY2FsbCBzb3VwX21lc3NhZ2Vfc2V0X3Vy aSB3aXRoIHNvdXBVUkkoKSAodXJsIGVuY29kZWQgdXJpKSBvbgpSZXNvdXJjZVJlcXVlc3Q6OnRv U291cE1lc3NhZ2UoKS4KCiogcGxhdGZvcm0vbmV0d29yay9zb3VwL1Jlc291cmNlUmVxdWVzdC5o OgoqIHBsYXRmb3JtL25ldHdvcmsvc291cC9SZXNvdXJjZVJlcXVlc3RTb3VwLmNwcDoKKFdlYkNv cmU6OlJlc291cmNlUmVxdWVzdDo6dXBkYXRlU291cE1lc3NhZ2VNZW1iZXJzKToKKFdlYkNvcmU6 OlJlc291cmNlUmVxdWVzdDo6dXBkYXRlU291cE1lc3NhZ2UpOgooV2ViQ29yZTo6UmVzb3VyY2VS ZXF1ZXN0Ojp0b1NvdXBNZXNzYWdlKToKU3BsaXQgY29tbW9uIGNvZGUgZnJvbSB1cGRhdGVTb3Vw TWVzc2FnZS90b1NvdXBNZXNzYWdlIGludG8gdXBkYXRlU291cE1lc3NhZ2VNZW1iZXJzLgotLS0K IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyAgICAgICAgICAgICAgICAgICAgICAgICAgIHwgMTcg KysrKysrKysrKysrCiAuLi4vcGxhdGZvcm0vbmV0d29yay9zb3VwL1Jlc291cmNlUmVxdWVzdC5o ICAgICAgICB8ICAxICsKIC4uLi9wbGF0Zm9ybS9uZXR3b3JrL3NvdXAvUmVzb3VyY2VSZXF1ZXN0 U291cC5jcHAgIHwgMzEgKysrKysrKysrKysrKy0tLS0tLS0tLQogMyBmaWxlcyBjaGFuZ2VkLCAz NiBpbnNlcnRpb25zKCspLCAxMyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjRkN2FiOC4u ZTZjZTEzZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDEzLTA5LTA0ICBBbmRyZSBN b3JlaXJhIE1hZ2FsaGFlcyAgIDxhbmRyZS5tYWdhbGhhZXNAY29sbGFib3JhLmNvLnVrPgorCisg ICAgICAgIFJFR1JFU1NJT04ocjE1NDk3Nyk6IERvIG5vdCB1cmxlbmNvZGUgc291cCBtZXNzYWdl IG9uIFJlc291cmNlUmVxdWVzdDo6dG9Tb3VwTWVzc2FnZSgpCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjA2ODEKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBEbyBub3QgY2FsbCBzb3VwX21lc3NhZ2Vfc2V0 X3VyaSB3aXRoIHNvdXBVUkkoKSAodXJsIGVuY29kZWQgdXJpKSBvbgorICAgICAgICBSZXNvdXJj ZVJlcXVlc3Q6OnRvU291cE1lc3NhZ2UoKS4KKworICAgICAgICAqIHBsYXRmb3JtL25ldHdvcmsv c291cC9SZXNvdXJjZVJlcXVlc3QuaDoKKyAgICAgICAgKiBwbGF0Zm9ybS9uZXR3b3JrL3NvdXAv UmVzb3VyY2VSZXF1ZXN0U291cC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZXNvdXJjZVJlcXVl c3Q6OnVwZGF0ZVNvdXBNZXNzYWdlTWVtYmVycyk6CisgICAgICAgIChXZWJDb3JlOjpSZXNvdXJj ZVJlcXVlc3Q6OnVwZGF0ZVNvdXBNZXNzYWdlKToKKyAgICAgICAgKFdlYkNvcmU6OlJlc291cmNl UmVxdWVzdDo6dG9Tb3VwTWVzc2FnZSk6CisgICAgICAgIFNwbGl0IGNvbW1vbiBjb2RlIGZyb20g dXBkYXRlU291cE1lc3NhZ2UvdG9Tb3VwTWVzc2FnZSBpbnRvIHVwZGF0ZVNvdXBNZXNzYWdlTWVt YmVycy4KKwogMjAxMy0wOS0wMyAgQW5kcmUgTW9yZWlyYSBNYWdhbGhhZXMgICA8YW5kcmUubWFn YWxoYWVzQGNvbGxhYm9yYS5jby51az4KIAogICAgICAgICBbR1N0cmVhbWVyXSBjYW5ub3QgcGxh eSBsaXZlIHN0cmVhbXMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdv cmsvc291cC9SZXNvdXJjZVJlcXVlc3QuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdv cmsvc291cC9SZXNvdXJjZVJlcXVlc3QuaAppbmRleCA3MzBhMjg3Li5hMGQwYjRjIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL3NvdXAvUmVzb3VyY2VSZXF1ZXN0 LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9zb3VwL1Jlc291cmNlUmVx dWVzdC5oCkBAIC05Myw2ICs5Myw3IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAgICAgYm9v bCBtX2FjY2VwdEVuY29kaW5nIDogMTsKICAgICAgICAgU291cE1lc3NhZ2VGbGFncyBtX3NvdXBG bGFnczsKIAorICAgICAgICB2b2lkIHVwZGF0ZVNvdXBNZXNzYWdlTWVtYmVycyhTb3VwTWVzc2Fn ZSopIGNvbnN0OwogICAgICAgICB2b2lkIGRvVXBkYXRlUGxhdGZvcm1SZXF1ZXN0KCkgeyB9CiAg ICAgICAgIHZvaWQgZG9VcGRhdGVSZXNvdXJjZVJlcXVlc3QoKSB7IH0KICAgICAgICAgdm9pZCBk b1VwZGF0ZVBsYXRmb3JtSFRUUEJvZHkoKSB7IH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL25ldHdvcmsvc291cC9SZXNvdXJjZVJlcXVlc3RTb3VwLmNwcCBiL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvc291cC9SZXNvdXJjZVJlcXVlc3RTb3VwLmNwcAppbmRl eCAyZTZiM2E2Li5iNWE0YTBkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9u ZXR3b3JrL3NvdXAvUmVzb3VyY2VSZXF1ZXN0U291cC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vbmV0d29yay9zb3VwL1Jlc291cmNlUmVxdWVzdFNvdXAuY3BwCkBAIC0zMiw2ICsz MiwyMiBAQCB1c2luZyBuYW1lc3BhY2Ugc3RkOwogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKK3Zv aWQgUmVzb3VyY2VSZXF1ZXN0Ojp1cGRhdGVTb3VwTWVzc2FnZU1lbWJlcnMoU291cE1lc3NhZ2Uq IHNvdXBNZXNzYWdlKSBjb25zdAoreworICAgIHVwZGF0ZVNvdXBNZXNzYWdlSGVhZGVycyhzb3Vw TWVzc2FnZS0+cmVxdWVzdF9oZWFkZXJzKTsKKworICAgIFN0cmluZyBmaXJzdFBhcnR5U3RyaW5n ID0gZmlyc3RQYXJ0eUZvckNvb2tpZXMoKS5zdHJpbmcoKTsKKyAgICBpZiAoIWZpcnN0UGFydHlT dHJpbmcuaXNFbXB0eSgpKSB7CisgICAgICAgIEdPd25QdHI8U291cFVSST4gZmlyc3RQYXJ0eShz b3VwX3VyaV9uZXcoZmlyc3RQYXJ0eVN0cmluZy51dGY4KCkuZGF0YSgpKSk7CisgICAgICAgIHNv dXBfbWVzc2FnZV9zZXRfZmlyc3RfcGFydHkoc291cE1lc3NhZ2UsIGZpcnN0UGFydHkuZ2V0KCkp OworICAgIH0KKworICAgIHNvdXBfbWVzc2FnZV9zZXRfZmxhZ3Moc291cE1lc3NhZ2UsIG1fc291 cEZsYWdzKTsKKworICAgIGlmICghYWNjZXB0RW5jb2RpbmcoKSkKKyAgICAgICAgc291cF9tZXNz YWdlX2Rpc2FibGVfZmVhdHVyZShzb3VwTWVzc2FnZSwgU09VUF9UWVBFX0NPTlRFTlRfREVDT0RF Uik7Cit9CisKIHZvaWQgUmVzb3VyY2VSZXF1ZXN0Ojp1cGRhdGVTb3VwTWVzc2FnZUhlYWRlcnMo U291cE1lc3NhZ2VIZWFkZXJzKiBzb3VwSGVhZGVycykgY29uc3QKIHsKICAgICBjb25zdCBIVFRQ SGVhZGVyTWFwJiBoZWFkZXJzID0gaHR0cEhlYWRlckZpZWxkcygpOwpAQCAtNjAsMTggKzc2LDcg QEAgdm9pZCBSZXNvdXJjZVJlcXVlc3Q6OnVwZGF0ZVNvdXBNZXNzYWdlKFNvdXBNZXNzYWdlKiBz b3VwTWVzc2FnZSkgY29uc3QKICAgICBHT3duUHRyPFNvdXBVUkk+IHVyaShzb3VwVVJJKCkpOwog ICAgIHNvdXBfbWVzc2FnZV9zZXRfdXJpKHNvdXBNZXNzYWdlLCB1cmkuZ2V0KCkpOwogCi0gICAg dXBkYXRlU291cE1lc3NhZ2VIZWFkZXJzKHNvdXBNZXNzYWdlLT5yZXF1ZXN0X2hlYWRlcnMpOwot Ci0gICAgU3RyaW5nIGZpcnN0UGFydHlTdHJpbmcgPSBmaXJzdFBhcnR5Rm9yQ29va2llcygpLnN0 cmluZygpOwotICAgIGlmICghZmlyc3RQYXJ0eVN0cmluZy5pc0VtcHR5KCkpIHsKLSAgICAgICAg R093blB0cjxTb3VwVVJJPiBmaXJzdFBhcnR5KHNvdXBfdXJpX25ldyhmaXJzdFBhcnR5U3RyaW5n LnV0ZjgoKS5kYXRhKCkpKTsKLSAgICAgICAgc291cF9tZXNzYWdlX3NldF9maXJzdF9wYXJ0eShz b3VwTWVzc2FnZSwgZmlyc3RQYXJ0eS5nZXQoKSk7Ci0gICAgfQotCi0gICAgc291cF9tZXNzYWdl X3NldF9mbGFncyhzb3VwTWVzc2FnZSwgbV9zb3VwRmxhZ3MpOwotCi0gICAgaWYgKCFhY2NlcHRF bmNvZGluZygpKQotICAgICAgICBzb3VwX21lc3NhZ2VfZGlzYWJsZV9mZWF0dXJlKHNvdXBNZXNz YWdlLCBTT1VQX1RZUEVfQ09OVEVOVF9ERUNPREVSKTsKKyAgICB1cGRhdGVTb3VwTWVzc2FnZU1l bWJlcnMoc291cE1lc3NhZ2UpOwogfQogCiBTb3VwTWVzc2FnZSogUmVzb3VyY2VSZXF1ZXN0Ojp0 b1NvdXBNZXNzYWdlKCkgY29uc3QKQEAgLTgwLDcgKzg1LDcgQEAgU291cE1lc3NhZ2UqIFJlc291 cmNlUmVxdWVzdDo6dG9Tb3VwTWVzc2FnZSgpIGNvbnN0CiAgICAgaWYgKCFzb3VwTWVzc2FnZSkK ICAgICAgICAgcmV0dXJuIDA7CiAKLSAgICB1cGRhdGVTb3VwTWVzc2FnZShzb3VwTWVzc2FnZSk7 CisgICAgdXBkYXRlU291cE1lc3NhZ2VNZW1iZXJzKHNvdXBNZXNzYWdlKTsKIAogICAgIC8vIEJv ZHkgZGF0YSBpcyBvbmx5IGhhbmRsZWQgYXQgUmVzb3VyY2VIYW5kbGVTb3VwOjpzdGFydEh0dHAg Zm9yCiAgICAgLy8gbm93OyB0aGlzIGlzIGJlY2F1c2UgdGhpcyBtYXkgbm90IGJlIGEgZ29vZCBw bGFjZSB0byBnbwotLSAKMS44LjEuMgoK