76297 2012-01-13 12:22:14 -0800 Partially revert r104756 - multipart bugs 2012-01-13 15:33:05 -0800 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 japhet japhet abarth ap koivisto webkit.review.bot oldest_to_newest 535881 0 japhet 2012-01-13 12:22:14 -0800 The multipart code in SubresourceLoader has some subtleties I misunderstood when I tried to change them in http://trac.webkit.org/changeset/104756. That patch is causing a multipart test to assert in chromium win, and I suspect there are other issues I haven't found yet. I'm going to revert all the multipart changes (except the changes to CachedImage and when we call clear()) and give them more thought before trying again. 535915 1 122485 japhet 2012-01-13 12:54:45 -0800 Created attachment 122485 patch 535917 2 122485 ap 2012-01-13 12:55:38 -0800 Comment on attachment 122485 patch rs=me 535927 3 122485 webkit-ews 2012-01-13 13:04:40 -0800 Comment on attachment 122485 patch Attachment 122485 did not pass qt-ews (qt): Output: http://queues.webkit.org/results/11152701 536010 4 122505 japhet 2012-01-13 14:51:18 -0800 Created attachment 122505 Patch for landing 536045 5 122505 webkit.review.bot 2012-01-13 15:33:00 -0800 Comment on attachment 122505 Patch for landing Clearing flags on attachment: 122505 Committed r105000: <http://trac.webkit.org/changeset/105000> 536046 6 webkit.review.bot 2012-01-13 15:33:05 -0800 All reviewed patches have been landed. Closing bug. 122485 2012-01-13 12:54:45 -0800 2012-01-13 14:51:09 -0800 patch multipart.txt text/plain 4711 japhet SW5kZXg6IExheW91dFRlc3RzL3BsYXRmb3JtL2Nocm9taXVtL3Rlc3RfZXhwZWN0YXRpb25zLnR4 dAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9wbGF0Zm9ybS9jaHJvbWl1bS90ZXN0X2V4cGVj dGF0aW9ucy50eHQJKHJldmlzaW9uIDEwNDgzMSkKKysrIExheW91dFRlc3RzL3BsYXRmb3JtL2No cm9taXVtL3Rlc3RfZXhwZWN0YXRpb25zLnR4dAkod29ya2luZyBjb3B5KQpAQCAtMTIzNSw4ICsx MjM1LDcgQEAKIEJVR0NSMTAzNjEgV0lOIDogaHR0cC90ZXN0cy9taXNjL3NpbmdsZS1jaGFyYWN0 ZXItcGktc3R5bGVzaGVldC54aHRtbCA9IEZBSUwKIAogLy8gV2luZG93cyBpcyBtaXNzaW5nIHRo ZSBncmVlbiBib3guIFN0YXJ0ZWQgdG8gcGFzcyBpbiByb2xsIHRvIFdlYktpdCByNTAzMTMKLS8v IFN0YXJ0ZWQgY3Jhc2hpbmcgb24gWFAgYWZ0ZXIgaHR0cDovL3RyYWMud2Via2l0Lm9yZy9jaGFu Z2VzZXQvMTA0NzU2Ci1CVUdDUjg3MjkgV0lOIDogaHR0cC90ZXN0cy9tdWx0aXBhcnQvaW52YWxp ZC1pbWFnZS1kYXRhLmh0bWwgPSBJTUFHRStURVhUIENSQVNICitCVUdDUjg3MjkgV0lOIDogaHR0 cC90ZXN0cy9tdWx0aXBhcnQvaW52YWxpZC1pbWFnZS1kYXRhLmh0bWwgPSBJTUFHRStURVhUCiAK IC8vIC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tCiAvLyBNQUMgUE9SVCBURVNUUwpJbmRleDogTGF5b3V0VGVzdHMvQ2hhbmdl TG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL0NoYW5nZUxvZwkocmV2aXNpb24gMTA0OTQ2 KQorKysgTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTMg QEAKKzIwMTItMDEtMTMgIE5hdGUgQ2hhcGluICA8amFwaGV0QGNocm9taXVtLm9yZz4KKworICAg ICAgICBodHRwL3Rlc3RzL211bHRpcGFydC9pbnZhbGlkLWltYWdlLWRhdGEuaHRtbCBzaG91bGQg bm8gbG9uZ2VyCisgICAgICAgIGJlIGNyYXNoaW5nIG9uIGNocm9taXVtIHdpbiBkYmcuCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03NjI5NworCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogcGxhdGZvcm0vY2hy b21pdW0vdGVzdF9leHBlY3RhdGlvbnMudHh0OgorCiAyMDEyLTAxLTEzICBKYW1lcyBSb2JpbnNv biAgPGphbWVzckBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgW2Nocm9taXVtXSBNYXJrIGEgZmxh a3kgdGVzdCBhcyBmbGFreQpJbmRleDogU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTA0OTQ2KQorKysgU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTkgQEAKKzIw MTItMDEtMTMgIE5hdGUgQ2hhcGluICA8amFwaGV0QGNocm9taXVtLm9yZz4KKworICAgICAgICBS ZXZlcnQgbW9zdCBvZiB0aGUgbXVsdGlwYXJ0IGNoYW5nZXMgaW4KKyAgICAgICAgaHR0cDovL3Ry YWMud2Via2l0Lm9yZy9jaGFuZ2VzZXQvMTA0NzU2LgorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzYyOTcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBodHRwL3Rlc3RzL211bHRpcGFydC9pbnZhbGlkLWltYWdl LWRhdGEuaHRtbAorICAgICAgICBzaG91bGQgc3RvcCBhc3NlcnRpbmcgb24gY2hyb21pdW0gd2lu IGRiZy4KKworICAgICAgICAqIGxvYWRlci9TdWJyZXNvdXJjZUxvYWRlci5jcHA6CisgICAgICAg IChXZWJDb3JlOjpTdWJyZXNvdXJjZUxvYWRlcjo6ZGlkUmVjZWl2ZVJlc3BvbnNlKToKKyAgICAg ICAgKFdlYkNvcmU6OlN1YnJlc291cmNlTG9hZGVyOjpkaWRSZWNlaXZlRGF0YSk6CisgICAgICAg IChXZWJDb3JlOjpTdWJyZXNvdXJjZUxvYWRlcjo6c2VuZERhdGFUb1Jlc291cmNlKToKKwogMjAx Mi0wMS0xMyAgS29ucmFkIFBpYXNjaWsgIDxrcGlhc2Npa0ByaW0uY29tPgogCiAgICAgICAgIFdl YiBJbnNwZWN0b3I6IERpc2Nvbm5lY3RpbmcgdGhlIGZyb250LWVuZCBkb2VzIG5vdCBkaXNhYmxl IHByb2ZpbGluZy4KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2xvYWRlci9TdWJyZXNvdXJjZUxvYWRl ci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvbG9hZGVyL1N1YnJlc291cmNlTG9h ZGVyLmNwcAkocmV2aXNpb24gMTA0ODMxKQorKysgU291cmNlL1dlYkNvcmUvbG9hZGVyL1N1YnJl c291cmNlTG9hZGVyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTk3LDEyICsxOTcsMjEgQEAKIAog ICAgICAgICAvLyBXZSBkb24ndCBjb3VudCBtdWx0aVBhcnRzIGluIGEgQ2FjaGVkUmVzb3VyY2VM b2FkZXIncyByZXF1ZXN0IGNvdW50CiAgICAgICAgIG1fcmVxdWVzdENvdW50VHJhY2tlci5jbGVh cigpOwotICAgICAgICBzZXRTaG91bGRCdWZmZXJEYXRhKERvTm90QnVmZmVyRGF0YSk7CiAgICAg ICAgIGlmICghbV9yZXNvdXJjZS0+aXNJbWFnZSgpKSB7CiAgICAgICAgICAgICBjYW5jZWwoKTsK ICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgfQogICAgIH0KKworICAgIFJlZlB0cjxTaGFy ZWRCdWZmZXI+IGJ1ZmZlciA9IHJlc291cmNlRGF0YSgpOworICAgIGlmIChtX2xvYWRpbmdNdWx0 aXBhcnRDb250ZW50ICYmIGJ1ZmZlciAmJiBidWZmZXItPnNpemUoKSkgeworICAgICAgICBzZW5k RGF0YVRvUmVzb3VyY2UoYnVmZmVyLT5kYXRhKCksIGJ1ZmZlci0+c2l6ZSgpKTsKKyAgICAgICAg Y2xlYXJSZXNvdXJjZURhdGEoKTsKKyAgICAgICAgLy8gU2luY2UgYSBzdWJyZXNvdXJjZSBsb2Fk ZXIgZG9lcyBub3QgbG9hZCBtdWx0aXBhcnQgc2VjdGlvbnMgcHJvZ3Jlc3NpdmVseSwgZGF0YSB3 YXMgZGVsaXZlcmVkIHRvIHRoZSBsb2FkZXIgYWxsIGF0IG9uY2UuICAgICAgICAKKyAgICAgICAg Ly8gQWZ0ZXIgdGhlIGZpcnN0IG11bHRpcGFydCBzZWN0aW9uIGlzIGNvbXBsZXRlLCBzaWduYWwg dG8gZGVsZWdhdGVzIHRoYXQgdGhpcyBsb2FkIGlzICJmaW5pc2hlZCIgCisgICAgICAgIG1fZG9j dW1lbnRMb2FkZXItPnN1YnJlc291cmNlTG9hZGVyRmluaXNoZWRMb2FkaW5nT25lUGFydCh0aGlz KTsKKyAgICAgICAgZGlkRmluaXNoTG9hZGluZ09uZVBhcnQoMCk7CisgICAgfQogfQogCiB2b2lk IFN1YnJlc291cmNlTG9hZGVyOjpkaWRSZWNlaXZlRGF0YShjb25zdCBjaGFyKiBkYXRhLCBpbnQg bGVuZ3RoLCBsb25nIGxvbmcgZW5jb2RlZERhdGFMZW5ndGgsIGJvb2wgYWxsQXRPbmNlKQpAQCAt MjE1LDE3ICsyMjQsMTAgQEAKICAgICBSZWZQdHI8U3VicmVzb3VyY2VMb2FkZXI+IHByb3RlY3Qo dGhpcyk7CiAgICAgUmVzb3VyY2VMb2FkZXI6OmRpZFJlY2VpdmVEYXRhKGRhdGEsIGxlbmd0aCwg ZW5jb2RlZERhdGFMZW5ndGgsIGFsbEF0T25jZSk7CiAKLSAgICBpZiAoZXJyb3JMb2FkaW5nUmVz b3VyY2UoKSkKKyAgICBpZiAoZXJyb3JMb2FkaW5nUmVzb3VyY2UoKSB8fCBtX2xvYWRpbmdNdWx0 aXBhcnRDb250ZW50KQogICAgICAgICByZXR1cm47CiAKICAgICBzZW5kRGF0YVRvUmVzb3VyY2Uo ZGF0YSwgbGVuZ3RoKTsKLSAgICAKLSAgICBpZiAobV9sb2FkaW5nTXVsdGlwYXJ0Q29udGVudCkg ewotICAgICAgICAvLyBTaW5jZSBhIHN1YnJlc291cmNlIGxvYWRlciBkb2VzIG5vdCBsb2FkIG11 bHRpcGFydCBzZWN0aW9ucyBwcm9ncmVzc2l2ZWx5LCBkYXRhIHdhcyBkZWxpdmVyZWQgdG8gdGhl IGxvYWRlciBhbGwgYXQgb25jZS4gICAgICAgIAotICAgICAgICAvLyBBZnRlciB0aGUgZmlyc3Qg bXVsdGlwYXJ0IHNlY3Rpb24gaXMgY29tcGxldGUsIHNpZ25hbCB0byBkZWxlZ2F0ZXMgdGhhdCB0 aGlzIGxvYWQgaXMgImZpbmlzaGVkIiAKLSAgICAgICAgbV9kb2N1bWVudExvYWRlci0+c3VicmVz b3VyY2VMb2FkZXJGaW5pc2hlZExvYWRpbmdPbmVQYXJ0KHRoaXMpOwotICAgICAgICBkaWRGaW5p c2hMb2FkaW5nT25lUGFydCgwKTsKLSAgICB9CiB9CiAKIGJvb2wgU3VicmVzb3VyY2VMb2FkZXI6 OmVycm9yTG9hZGluZ1Jlc291cmNlKCkKQEAgLTI0MSw3ICsyNDMsNyBAQAogCiB2b2lkIFN1YnJl c291cmNlTG9hZGVyOjpzZW5kRGF0YVRvUmVzb3VyY2UoY29uc3QgY2hhciogZGF0YSwgaW50IGxl bmd0aCkKIHsKLSAgICBSZWZQdHI8U2hhcmVkQnVmZmVyPiBidWZmZXIgPSByZXNvdXJjZURhdGEo KSA/IHJlc291cmNlRGF0YSgpIDogU2hhcmVkQnVmZmVyOjpjcmVhdGUoZGF0YSwgbGVuZ3RoKTsK KyAgICBSZWZQdHI8U2hhcmVkQnVmZmVyPiBidWZmZXIgPSByZXNvdXJjZURhdGEoKSAmJiAhbV9s b2FkaW5nTXVsdGlwYXJ0Q29udGVudCA/IHJlc291cmNlRGF0YSgpIDogU2hhcmVkQnVmZmVyOjpj cmVhdGUoZGF0YSwgbGVuZ3RoKTsKICAgICBtX3Jlc291cmNlLT5kYXRhKGJ1ZmZlci5yZWxlYXNl KCksIG1fbG9hZGluZ011bHRpcGFydENvbnRlbnQpOwogfQogCg== 122505 2012-01-13 14:51:18 -0800 2012-01-13 15:33:00 -0800 Patch for landing bug-76297-20120113145116.patch text/plain 5764 japhet SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDEwNDk0NikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE5IEBACisyMDEyLTAxLTEzICBOYXRlIENo YXBpbiAgPGphcGhldEBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2ZXJ0IG1vc3Qgb2YgdGhl IG11bHRpcGFydCBjaGFuZ2VzIGluCisgICAgICAgIGh0dHA6Ly90cmFjLndlYmtpdC5vcmcvY2hh bmdlc2V0LzEwNDc1Ni4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTc2Mjk3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgQWxleGV5IFByb3NrdXJ5YWtvdi4K KworICAgICAgICBodHRwL3Rlc3RzL211bHRpcGFydC9pbnZhbGlkLWltYWdlLWRhdGEuaHRtbAor ICAgICAgICBzaG91bGQgc3RvcCBhc3NlcnRpbmcgb24gY2hyb21pdW0gd2luIGRiZy4KKworICAg ICAgICAqIGxvYWRlci9TdWJyZXNvdXJjZUxvYWRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpT dWJyZXNvdXJjZUxvYWRlcjo6ZGlkUmVjZWl2ZVJlc3BvbnNlKToKKyAgICAgICAgKFdlYkNvcmU6 OlN1YnJlc291cmNlTG9hZGVyOjpkaWRSZWNlaXZlRGF0YSk6CisgICAgICAgIChXZWJDb3JlOjpT dWJyZXNvdXJjZUxvYWRlcjo6c2VuZERhdGFUb1Jlc291cmNlKToKKwogMjAxMi0wMS0xMyAgS29u cmFkIFBpYXNjaWsgIDxrcGlhc2Npa0ByaW0uY29tPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6 IERpc2Nvbm5lY3RpbmcgdGhlIGZyb250LWVuZCBkb2VzIG5vdCBkaXNhYmxlIHByb2ZpbGluZy4K SW5kZXg6IFNvdXJjZS9XZWJDb3JlL2xvYWRlci9TdWJyZXNvdXJjZUxvYWRlci5jcHAKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL1dlYkNvcmUvbG9hZGVyL1N1YnJlc291cmNlTG9hZGVyLmNwcAkocmV2 aXNpb24gMTA0ODMxKQorKysgU291cmNlL1dlYkNvcmUvbG9hZGVyL1N1YnJlc291cmNlTG9hZGVy LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTk3LDEyICsxOTcsMjEgQEAgdm9pZCBTdWJyZXNvdXJj ZUxvYWRlcjo6ZGlkUmVjZWl2ZVJlc3BvbgogCiAgICAgICAgIC8vIFdlIGRvbid0IGNvdW50IG11 bHRpUGFydHMgaW4gYSBDYWNoZWRSZXNvdXJjZUxvYWRlcidzIHJlcXVlc3QgY291bnQKICAgICAg ICAgbV9yZXF1ZXN0Q291bnRUcmFja2VyLmNsZWFyKCk7Ci0gICAgICAgIHNldFNob3VsZEJ1ZmZl ckRhdGEoRG9Ob3RCdWZmZXJEYXRhKTsKICAgICAgICAgaWYgKCFtX3Jlc291cmNlLT5pc0ltYWdl KCkpIHsKICAgICAgICAgICAgIGNhbmNlbCgpOwogICAgICAgICAgICAgcmV0dXJuOwogICAgICAg ICB9CiAgICAgfQorCisgICAgUmVmUHRyPFNoYXJlZEJ1ZmZlcj4gYnVmZmVyID0gcmVzb3VyY2VE YXRhKCk7CisgICAgaWYgKG1fbG9hZGluZ011bHRpcGFydENvbnRlbnQgJiYgYnVmZmVyICYmIGJ1 ZmZlci0+c2l6ZSgpKSB7CisgICAgICAgIHNlbmREYXRhVG9SZXNvdXJjZShidWZmZXItPmRhdGEo KSwgYnVmZmVyLT5zaXplKCkpOworICAgICAgICBjbGVhclJlc291cmNlRGF0YSgpOworICAgICAg ICAvLyBTaW5jZSBhIHN1YnJlc291cmNlIGxvYWRlciBkb2VzIG5vdCBsb2FkIG11bHRpcGFydCBz ZWN0aW9ucyBwcm9ncmVzc2l2ZWx5LCBkYXRhIHdhcyBkZWxpdmVyZWQgdG8gdGhlIGxvYWRlciBh bGwgYXQgb25jZS4gICAgICAgIAorICAgICAgICAvLyBBZnRlciB0aGUgZmlyc3QgbXVsdGlwYXJ0 IHNlY3Rpb24gaXMgY29tcGxldGUsIHNpZ25hbCB0byBkZWxlZ2F0ZXMgdGhhdCB0aGlzIGxvYWQg aXMgImZpbmlzaGVkIiAKKyAgICAgICAgbV9kb2N1bWVudExvYWRlci0+c3VicmVzb3VyY2VMb2Fk ZXJGaW5pc2hlZExvYWRpbmdPbmVQYXJ0KHRoaXMpOworICAgICAgICBkaWRGaW5pc2hMb2FkaW5n T25lUGFydCgwKTsKKyAgICB9CiB9CiAKIHZvaWQgU3VicmVzb3VyY2VMb2FkZXI6OmRpZFJlY2Vp dmVEYXRhKGNvbnN0IGNoYXIqIGRhdGEsIGludCBsZW5ndGgsIGxvbmcgbG9uZyBlbmNvZGVkRGF0 YUxlbmd0aCwgYm9vbCBhbGxBdE9uY2UpCkBAIC0yMTUsMTcgKzIyNCwxMCBAQCB2b2lkIFN1YnJl c291cmNlTG9hZGVyOjpkaWRSZWNlaXZlRGF0YShjCiAgICAgUmVmUHRyPFN1YnJlc291cmNlTG9h ZGVyPiBwcm90ZWN0KHRoaXMpOwogICAgIFJlc291cmNlTG9hZGVyOjpkaWRSZWNlaXZlRGF0YShk YXRhLCBsZW5ndGgsIGVuY29kZWREYXRhTGVuZ3RoLCBhbGxBdE9uY2UpOwogCi0gICAgaWYgKGVy cm9yTG9hZGluZ1Jlc291cmNlKCkpCisgICAgaWYgKGVycm9yTG9hZGluZ1Jlc291cmNlKCkgfHwg bV9sb2FkaW5nTXVsdGlwYXJ0Q29udGVudCkKICAgICAgICAgcmV0dXJuOwogCiAgICAgc2VuZERh dGFUb1Jlc291cmNlKGRhdGEsIGxlbmd0aCk7Ci0gICAgCi0gICAgaWYgKG1fbG9hZGluZ011bHRp cGFydENvbnRlbnQpIHsKLSAgICAgICAgLy8gU2luY2UgYSBzdWJyZXNvdXJjZSBsb2FkZXIgZG9l cyBub3QgbG9hZCBtdWx0aXBhcnQgc2VjdGlvbnMgcHJvZ3Jlc3NpdmVseSwgZGF0YSB3YXMgZGVs aXZlcmVkIHRvIHRoZSBsb2FkZXIgYWxsIGF0IG9uY2UuICAgICAgICAKLSAgICAgICAgLy8gQWZ0 ZXIgdGhlIGZpcnN0IG11bHRpcGFydCBzZWN0aW9uIGlzIGNvbXBsZXRlLCBzaWduYWwgdG8gZGVs ZWdhdGVzIHRoYXQgdGhpcyBsb2FkIGlzICJmaW5pc2hlZCIgCi0gICAgICAgIG1fZG9jdW1lbnRM b2FkZXItPnN1YnJlc291cmNlTG9hZGVyRmluaXNoZWRMb2FkaW5nT25lUGFydCh0aGlzKTsKLSAg ICAgICAgZGlkRmluaXNoTG9hZGluZ09uZVBhcnQoMCk7Ci0gICAgfQogfQogCiBib29sIFN1YnJl c291cmNlTG9hZGVyOjplcnJvckxvYWRpbmdSZXNvdXJjZSgpCkBAIC0yNDEsOCArMjQzLDE3IEBA IGJvb2wgU3VicmVzb3VyY2VMb2FkZXI6OmVycm9yTG9hZGluZ1Jlc28KIAogdm9pZCBTdWJyZXNv dXJjZUxvYWRlcjo6c2VuZERhdGFUb1Jlc291cmNlKGNvbnN0IGNoYXIqIGRhdGEsIGludCBsZW5n dGgpCiB7Ci0gICAgUmVmUHRyPFNoYXJlZEJ1ZmZlcj4gYnVmZmVyID0gcmVzb3VyY2VEYXRhKCkg PyByZXNvdXJjZURhdGEoKSA6IFNoYXJlZEJ1ZmZlcjo6Y3JlYXRlKGRhdGEsIGxlbmd0aCk7Ci0g ICAgbV9yZXNvdXJjZS0+ZGF0YShidWZmZXIucmVsZWFzZSgpLCBtX2xvYWRpbmdNdWx0aXBhcnRD b250ZW50KTsKKyAgICAvLyBUaGVyZSBhcmUgdHdvIGNhc2VzIHdoZXJlIHdlIG1pZ2h0IG5lZWQg dG8gY3JlYXRlIG91ciBvd24gU2hhcmVkQnVmZmVyIGluc3RlYWQgb2YgY29weWluZyB0aGUgb25l IGluIFJlc291cmNlTG9hZGVyLiAKKyAgICAvLyAoMSkgTXVsdGlwYXJ0IGNvbnRlbnQ6IFRoZSBs b2FkZXIgZGVsaXZlcnMgdGhlIGRhdGEgaW4gYSBtdWx0aXBhcnQgc2VjdGlvbiBhbGwgYXQgb25j ZSwgdGhlbiBzZW5kcyBlb2YuIAorICAgIC8vICAgICBUaGUgcmVzb3VyY2UgZGF0YSB3aWxsIGNo YW5nZSBhcyB0aGUgbmV4dCBwYXJ0IGlzIGxvYWRlZCwgc28gd2UgbmVlZCB0byBtYWtlIGEgY29w eS4gCisgICAgLy8gKDIpIE91ciBjbGllbnQgcmVxdWVzdGVkIHRoYXQgdGhlIGRhdGEgbm90IGJl IGJ1ZmZlcmVkIGF0IHRoZSBSZXNvdXJjZUxvYWRlciBsZXZlbCB2aWEgUmVzb3VyY2VMb2FkZXJP cHRpb25zLiBJbiB0aGlzIGNhc2UsIAorICAgIC8vICAgICBSZXNvdXJjZUxvYWRlcjo6cmVzb3Vy Y2VEYXRhKCkgd2lsbCBiZSBudWxsLiBIb3dldmVyLCB1bmxpa2UgdGhlIG11bHRpcGFydCBjYXNl LCB3ZSBkb24ndCB3YW50IHRvIHRlbGwgdGhlIENhY2hlZFJlc291cmNlIAorICAgIC8vICAgICB0 aGF0IGFsbCBkYXRhIGhhcyBiZWVuIHJlY2VpdmVkIHlldC4gCisgICAgaWYgKG1fbG9hZGluZ011 bHRpcGFydENvbnRlbnQgfHwgIXJlc291cmNlRGF0YSgpKSB7IAorICAgICAgICBSZWZQdHI8U2hh cmVkQnVmZmVyPiBjb3BpZWREYXRhID0gU2hhcmVkQnVmZmVyOjpjcmVhdGUoZGF0YSwgbGVuZ3Ro KTsgCisgICAgICAgIG1fcmVzb3VyY2UtPmRhdGEoY29waWVkRGF0YS5yZWxlYXNlKCksIG1fbG9h ZGluZ011bHRpcGFydENvbnRlbnQpOyAKKyAgICB9IGVsc2UgCisgICAgICAgIG1fcmVzb3VyY2Ut PmRhdGEocmVzb3VyY2VEYXRhKCksIGZhbHNlKTsKIH0KIAogdm9pZCBTdWJyZXNvdXJjZUxvYWRl cjo6ZGlkUmVjZWl2ZUNhY2hlZE1ldGFkYXRhKGNvbnN0IGNoYXIqIGRhdGEsIGludCBsZW5ndGgp CkluZGV4OiBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMv Q2hhbmdlTG9nCShyZXZpc2lvbiAxMDQ5NDYpCisrKyBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cJKHdv cmtpbmcgY29weSkKQEAgLTEsMyArMSwxMyBAQAorMjAxMi0wMS0xMyAgTmF0ZSBDaGFwaW4gIDxq YXBoZXRAY2hyb21pdW0ub3JnPgorCisgICAgICAgIGh0dHAvdGVzdHMvbXVsdGlwYXJ0L2ludmFs aWQtaW1hZ2UtZGF0YS5odG1sIHNob3VsZCBubyBsb25nZXIKKyAgICAgICAgYmUgY3Jhc2hpbmcg b24gY2hyb21pdW0gd2luIGRiZy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTc2Mjk3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgQWxleGV5IFByb3NrdXJ5 YWtvdi4KKworICAgICAgICAqIHBsYXRmb3JtL2Nocm9taXVtL3Rlc3RfZXhwZWN0YXRpb25zLnR4 dDoKKwogMjAxMi0wMS0xMyAgSmFtZXMgUm9iaW5zb24gIDxqYW1lc3JAY2hyb21pdW0ub3JnPgog CiAgICAgICAgIFtjaHJvbWl1bV0gTWFyayBhIGZsYWt5IHRlc3QgYXMgZmxha3kKSW5kZXg6IExh eW91dFRlc3RzL3BsYXRmb3JtL2Nocm9taXVtL3Rlc3RfZXhwZWN0YXRpb25zLnR4dAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBMYXlvdXRUZXN0cy9wbGF0Zm9ybS9jaHJvbWl1bS90ZXN0X2V4cGVjdGF0aW9ucy50 eHQJKHJldmlzaW9uIDEwNDgzMSkKKysrIExheW91dFRlc3RzL3BsYXRmb3JtL2Nocm9taXVtL3Rl c3RfZXhwZWN0YXRpb25zLnR4dAkod29ya2luZyBjb3B5KQpAQCAtMTIzNSw4ICsxMjM1LDcgQEAg QlVHQ1IxMDM1NyA6IGZhc3QvZG9tL2Nzc1RhcmdldC1jcmFzaC5odAogQlVHQ1IxMDM2MSBXSU4g OiBodHRwL3Rlc3RzL21pc2Mvc2luZ2xlLWNoYXJhY3Rlci1waS1zdHlsZXNoZWV0LnhodG1sID0g RkFJTAogCiAvLyBXaW5kb3dzIGlzIG1pc3NpbmcgdGhlIGdyZWVuIGJveC4gU3RhcnRlZCB0byBw YXNzIGluIHJvbGwgdG8gV2ViS2l0IHI1MDMxMwotLy8gU3RhcnRlZCBjcmFzaGluZyBvbiBYUCBh ZnRlciBodHRwOi8vdHJhYy53ZWJraXQub3JnL2NoYW5nZXNldC8xMDQ3NTYKLUJVR0NSODcyOSBX SU4gOiBodHRwL3Rlc3RzL211bHRpcGFydC9pbnZhbGlkLWltYWdlLWRhdGEuaHRtbCA9IElNQUdF K1RFWFQgQ1JBU0gKK0JVR0NSODcyOSBXSU4gOiBodHRwL3Rlc3RzL211bHRpcGFydC9pbnZhbGlk LWltYWdlLWRhdGEuaHRtbCA9IElNQUdFK1RFWFQKIAogLy8gLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIC8vIE1BQyBQT1JU IFRFU1RTCg==