167903 2017-02-06 13:26:23 -0800 File index appended to previous file in svn-create-patch with SVN 1.9 2017-02-07 13:04:19 -0800 1 1 1 Unclassified WebKit Tools / Tests WebKit Local Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 sam jbedard ap commit-queue dbates jbedard lforschler webkit-bug-importer oldest_to_newest 1273694 0 sam 2017-02-06 13:26:23 -0800 The EWS bot does not seem to be able to apply the patch in 167806. The patch posted using webkit-patch post from an up-to-date tree. 1273767 1 webkit-bug-importer 2017-02-06 16:37:16 -0800 <rdar://problem/30387395> 1273994 2 jbedard 2017-02-07 08:07:36 -0800 *** This bug has been marked as a duplicate of bug 167906 *** 1274015 3 ap 2017-02-07 09:04:42 -0800 Let's track the issue in this older bug. 1274017 4 ap 2017-02-07 09:05:01 -0800 *** Bug 167906 has been marked as a duplicate of this bug. *** 1274065 5 jbedard 2017-02-07 11:06:28 -0800 Actually, this is an issue I've seen locally, it's just now that I've noticed what the root cause is. SVN 1.9 doesn't always emit newlines at the end of patches, and we don't explicitly add them. Sometimes the index line of the next file gets appended to the last line of the previous file. 1274066 6 300822 jbedard 2017-02-07 11:08:37 -0800 Created attachment 300822 Patch 1274070 7 jbedard 2017-02-07 11:17:32 -0800 If you search for 'Index: Source/WebCore/bindings/js/JSDOMConvertBase.h' in https://bug-167806-attachments.webkit.org/attachment.cgi?id=300583, you will see an example of a file index being appended to the previous change. 1274081 8 300829 jbedard 2017-02-07 11:43:47 -0800 Created attachment 300829 Patch 1274087 9 300829 dbates 2017-02-07 11:53:39 -0800 Comment on attachment 300829 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=300829&action=review > Tools/Scripts/svn-create-patch:245 > + $patch eq "" or (substr $patch, -1) eq "\n" or die; We need to make this work for arbitrary end-of-line characters. I would also write this in the form: die if ($patch && $patch =~ /\r?$/); (The regular expression used may not be correct. Please check.) 1274088 10 300829 dbates 2017-02-07 11:56:46 -0800 Comment on attachment 300829 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=300829&action=review > Tools/Scripts/VCSUtils.pm:1782 > + return join($lineEnding, @lines) . $lineEnding; Is it OK to use $lineEnding here?fixChangeLogPatch() has similar logic and emits a new-line character because "patch(1) expects an extra trailing newline". 1274092 11 dbates 2017-02-07 12:06:00 -0800 (In reply to comment #9) > Comment on attachment 300829 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=300829&action=review > > > Tools/Scripts/svn-create-patch:245 > > + $patch eq "" or (substr $patch, -1) eq "\n" or die; > > We need to make this work for arbitrary end-of-line characters. I would also > write this in the form: > > die if ($patch && $patch =~ /\r?$/); > Assuming the comment in fixChangeLogPatch() is true [1], we should write this as: die if ($patch && substr($patch, -1) ne "\n"); [1] <https://trac.webkit.org/browser/trunk/Tools/Scripts/VCSUtils.pm?rev=211828#L1935> 1274094 12 300829 dbates 2017-02-07 12:09:58 -0800 Comment on attachment 300829 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=300829&action=review > Tools/Scripts/webkitperl/VCSUtils_unittest/fixSVNPatchForAdditionWithHistory.pl:47 > + Actually we shouldn't add this line here. Instead we should remove the chomp() from <https://trac.webkit.org/browser/trunk/Tools/Scripts/webkitperl/VCSUtils_unittest/fixSVNPatchForAdditionWithHistory.pl?rev=211828#L285>. 1274101 13 300832 dbates 2017-02-07 12:19:31 -0800 Created attachment 300832 Patch and unit tests 1274104 14 300833 dbates 2017-02-07 12:20:50 -0800 Created attachment 300833 Patch and unit tests 1274120 15 300833 commit-queue 2017-02-07 13:04:15 -0800 Comment on attachment 300833 Patch and unit tests Clearing flags on attachment: 300833 Committed r211833: <http://trac.webkit.org/changeset/211833> 1274121 16 commit-queue 2017-02-07 13:04:19 -0800 All reviewed patches have been landed. Closing bug. 300822 2017-02-07 11:08:37 -0800 2017-02-07 11:43:43 -0800 Patch bug-167903-20170207110615.patch text/plain 1195 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDIxMTgyMSkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDEzIEBACisyMDE3LTAyLTA3ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICBGaWxlIGluZGV4IGFwcGVuZGVkIHRvIHByZXZpb3VzIGZpbGUgaW4gc3Zu LWNyZWF0ZS1wYXRjaCB3aXRoIFNWTiAxLjkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTE2NzkwMworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgICogU2NyaXB0cy9zdm4tY3JlYXRlLXBhdGNoOgorICAgICAgICAo Z2VuZXJhdGVEaWZmKTogQWRkIG5ld2xpbmUgYXQgdGhlIGVuZCBvZiBhIHBhdGNoLgorCiAyMDE3 LTAyLTA3ICBPbGl2aWVyIEJsaW4gIDxvbGl2aWVyLmJsaW5Ac29mdGF0aG9tZS5jb20+CiAKICAg ICAgICAgW3dlYmtpdGRpcnNdIHJlbW92ZSB1bnVzZWQgaG9zdF9wcm9jZXNzb3IgdmFyaWFibGUg aW4gZGV0ZXJtaW5lQXJjaGl0ZWN0dXJlKCkKSW5kZXg6IFRvb2xzL1NjcmlwdHMvc3ZuLWNyZWF0 ZS1wYXRjaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL3N2bi1jcmVhdGUtcGF0Y2gJKHJl dmlzaW9uIDIxMTc0OSkKKysrIFRvb2xzL1NjcmlwdHMvc3ZuLWNyZWF0ZS1wYXRjaAkod29ya2lu ZyBjb3B5KQpAQCAtMjQyLDYgKzI0Miw5IEBAIHN1YiBnZW5lcmF0ZURpZmYoJCQpCiAgICAgICAg IG15ICRjaGFuZ2VMb2dIYXNoID0gZml4Q2hhbmdlTG9nUGF0Y2goJHBhdGNoKTsKICAgICAgICAg JHBhdGNoID0gJGNoYW5nZUxvZ0hhc2gtPntwYXRjaH07ICAgCiAgICAgfQorICAgIGlmICgoc3Vi c3RyICRwYXRjaCwgLTEpIG5lICJcbiIpIHsKKyAgICAgICAgJHBhdGNoIC49ICJcbiI7CisgICAg fQogICAgIHByaW50ICRwYXRjaDsKICAgICBpZiAoJGZpbGVEYXRhLT57aXNCaW5hcnl9KSB7CiAg ICAgICAgIHByaW50ICJcbiIgaWYgKCRwYXRjaCAmJiAkcGF0Y2ggPX4gbS9cblxTKyQvbSk7Cg== 300829 2017-02-07 11:43:47 -0800 2017-02-07 12:19:31 -0800 Patch bug-167903-20170207114124.patch text/plain 3333 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDIxMTgyMykKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE2IEBACisyMDE3LTAyLTA3ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICBGaWxlIGluZGV4IGFwcGVuZGVkIHRvIHByZXZpb3VzIGZpbGUgaW4gc3Zu LWNyZWF0ZS1wYXRjaCB3aXRoIFNWTiAxLjkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTE2NzkwMworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgICogU2NyaXB0cy9WQ1NVdGlscy5wbToKKyAgICAgICAgKGZpeFNW TlBhdGNoRm9yQWRkaXRpb25XaXRoSGlzdG9yeSk6IEFwcGVuZCBuZXdsaW5lIGFmdGVyIGNvbmNh dGVuYXRpbmcgbGlzdC4KKyAgICAgICAgKiBTY3JpcHRzL3N2bi1jcmVhdGUtcGF0Y2g6CisgICAg ICAgIChnZW5lcmF0ZURpZmYpOiBDaGVjayB0aGF0IHRoZSBwYXRjaCBlbmRzIHdpdGggYSBuZXds aW5lLgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cGVybC9WQ1NVdGlsc191bml0dGVzdC9maXhT Vk5QYXRjaEZvckFkZGl0aW9uV2l0aEhpc3RvcnkucGw6IEFkZCBuZXdsaW5lcyB0byBleHBlY3Rl ZFJldHVybiBmb3IgYWxsIHRlc3RzLgorCiAyMDE3LTAyLTA3ICBPbGl2aWVyIEJsaW4gIDxvbGl2 aWVyLmJsaW5Ac29mdGF0aG9tZS5jb20+CiAKICAgICAgICAgW3dlYmtpdGRpcnNdIHJlbW92ZSB1 bnVzZWQgaG9zdF9wcm9jZXNzb3IgdmFyaWFibGUgaW4gZGV0ZXJtaW5lQXJjaGl0ZWN0dXJlKCkK SW5kZXg6IFRvb2xzL1NjcmlwdHMvVkNTVXRpbHMucG0KPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2Ny aXB0cy9WQ1NVdGlscy5wbQkocmV2aXNpb24gMjExNzQ5KQorKysgVG9vbHMvU2NyaXB0cy9WQ1NV dGlscy5wbQkod29ya2luZyBjb3B5KQpAQCAtMTc3OSw3ICsxNzc5LDcgQEAgc3ViIGZpeFNWTlBh dGNoRm9yQWRkaXRpb25XaXRoSGlzdG9yeSgkKQogICAgICAgICByZXR1cm4gIiI7CiAgICAgfQog ICAgIHNwbGljZShAbGluZXMsIDAsIDIpIGlmICRsaW5lc1syXSA9fiAvJHN2bkRpZmZTdGFydFJl Z0V4LzsKLSAgICByZXR1cm4gam9pbigkbGluZUVuZGluZywgQGxpbmVzKTsKKyAgICByZXR1cm4g am9pbigkbGluZUVuZGluZywgQGxpbmVzKSAuICRsaW5lRW5kaW5nOwogfQogCiAjIElmIHBvc3Np YmxlLCByZXR1cm5zIGEgQ2hhbmdlTG9nIHBhdGNoIGVxdWl2YWxlbnQgdG8gdGhlIGdpdmVuIG9u ZSwKSW5kZXg6IFRvb2xzL1NjcmlwdHMvc3ZuLWNyZWF0ZS1wYXRjaAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBU b29scy9TY3JpcHRzL3N2bi1jcmVhdGUtcGF0Y2gJKHJldmlzaW9uIDIxMTc0OSkKKysrIFRvb2xz L1NjcmlwdHMvc3ZuLWNyZWF0ZS1wYXRjaAkod29ya2luZyBjb3B5KQpAQCAtMjQyLDYgKzI0Miw3 IEBAIHN1YiBnZW5lcmF0ZURpZmYoJCQpCiAgICAgICAgIG15ICRjaGFuZ2VMb2dIYXNoID0gZml4 Q2hhbmdlTG9nUGF0Y2goJHBhdGNoKTsKICAgICAgICAgJHBhdGNoID0gJGNoYW5nZUxvZ0hhc2gt PntwYXRjaH07ICAgCiAgICAgfQorICAgICRwYXRjaCBlcSAiIiBvciAoc3Vic3RyICRwYXRjaCwg LTEpIGVxICJcbiIgb3IgZGllOwogICAgIHByaW50ICRwYXRjaDsKICAgICBpZiAoJGZpbGVEYXRh LT57aXNCaW5hcnl9KSB7CiAgICAgICAgIHByaW50ICJcbiIgaWYgKCRwYXRjaCAmJiAkcGF0Y2gg PX4gbS9cblxTKyQvbSk7CkluZGV4OiBUb29scy9TY3JpcHRzL3dlYmtpdHBlcmwvVkNTVXRpbHNf dW5pdHRlc3QvZml4U1ZOUGF0Y2hGb3JBZGRpdGlvbldpdGhIaXN0b3J5LnBsCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFRvb2xzL1NjcmlwdHMvd2Via2l0cGVybC9WQ1NVdGlsc191bml0dGVzdC9maXhTVk5QYXRj aEZvckFkZGl0aW9uV2l0aEhpc3RvcnkucGwJKHJldmlzaW9uIDIxMTc0OSkKKysrIFRvb2xzL1Nj cmlwdHMvd2Via2l0cGVybC9WQ1NVdGlsc191bml0dGVzdC9maXhTVk5QYXRjaEZvckFkZGl0aW9u V2l0aEhpc3RvcnkucGwJKHdvcmtpbmcgY29weSkKQEAgLTQ0LDYgKzQ0LDcgQEAgSW5kZXg6IHRl c3RfZmlsZS50eHQKIEBAIC0xICsxIEBACiAtQQogK0EyCisKIEVORAogICAgIGV4cGVjdGVkUmV0 dXJuID0+IDw8J0VORCcKIEluZGV4OiB0ZXN0X2ZpbGUudHh0CkBAIC01Myw2ICs1NCw3IEBAIElu ZGV4OiB0ZXN0X2ZpbGUudHh0CiBAQCAtMSArMSBAQAogLUEKICtBMgorCiBFTkQKIH0sCiB7ICMg TmV3IHRlc3QKQEAgLTcyLDYgKzc0LDcgQEAgSW5kZXg6IHRlc3RfZmlsZS50eHQKICsrKyB0ZXN0 X2ZpbGUudHh0CShub25leGlzdGVudCkKIEBAIC0xICswLDAgQEAKIC1BCisKIEVORAogfSwKIHsg IyBOZXcgdGVzdApAQCAtMTAxLDYgKzEwNCw3IEBAIEFkZGVkOiBzdm46ZXhlY3V0YWJsZQogIyMg LTAsMCArMSAjIwogKyoKIFwgTm8gbmV3bGluZSBhdCBlbmQgb2YgcHJvcGVydHkKKwogRU5ECiB9 LAogeyAjIE5ldyB0ZXN0CkBAIC0xMzAsNiArMTM0LDcgQEAgRGVsZXRlZDogc3ZuOmV4ZWN1dGFi bGUKICMjIC0xICswLDAgIyMKIC0qCiBcIE5vIG5ld2xpbmUgYXQgZW5kIG9mIHByb3BlcnR5CisK IEVORAogfSwKICMjIwpAQCAtMTcyLDYgKzE3Nyw3IEBAIEFkZGVkOiBzdm46ZXhlY3V0YWJsZQog IyMgLTAsMCArMSAjIwogKyoKIFwgTm8gbmV3bGluZSBhdCBlbmQgb2YgcHJvcGVydHkKKwogRU5E CiB9LAogeyAjIE5ldyB0ZXN0CkBAIC0yMDMsNiArMjA5LDcgQEAgRGVsZXRlZDogc3ZuOmV4ZWN1 dGFibGUKICMjIC0xICswLDAgIyMKIC0qCiBcIE5vIG5ld2xpbmUgYXQgZW5kIG9mIHByb3BlcnR5 CisKIEVORAogfSwKIHsgIyBOZXcgdGVzdApAQCAtMjM2LDYgKzI0Myw3IEBAIEFkZGVkOiBkb2N1 bWVudGF0aW9uCiArQQogK2xvbmcgc2VudGVuY2UgdGhhdCBzcGFucwogK211bHRpcGxlIGxpbmVz LgorCiBFTkQKIH0sCiB7ICMgTmV3IHRlc3QKQEAgLTI3MSw2ICsyNzksNyBAQCBNb2RpZmllZDog ZG9jdW1lbnRhdGlvbgogK0Fub3RoZXIKICBsb25nIHNlbnRlbmNlIHRoYXQgc3BhbnMKICBtdWx0 aXBsZSBsaW5lcy4KKwogRU5ECiB9LAogKTsK 300832 2017-02-07 12:19:31 -0800 2017-02-07 12:20:50 -0800 Patch and unit tests Bug167903.patch text/plain 3193 dbates RnJvbSA3NmUzZDQyMTE3MDY0M2E3Mjk4NTBhNDIwOTllZjZhZjQ5YWFkYzE4IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBEYW5pZWwgQmF0ZXMgPGRiYXRlc0B3ZWJraXQub3JnPgpEYXRl OiBUdWUsIDcgRmViIDIwMTcgMTI6MTQ6NTIgLTA4MDAKU3ViamVjdDogW1BBVENIXSBGaWxlIGlu ZGV4IGFwcGVuZGVkIHRvIHByZXZpb3VzIGZpbGUgaW4gc3ZuLWNyZWF0ZS1wYXRjaCB3aXRoCiBT Vk4gMS45IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNjc5MDMKIDxy ZGFyOi8vcHJvYmxlbS8zMDM4NzM5NT4KClBhdGNoIGJ5IEpvbmF0aGFuIEJlZGFyZCA8amJlZGFy ZEBhcHBsZS5jb20+IG9uIDIwMTctMDItMDcKUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCgoq IFNjcmlwdHMvVkNTVXRpbHMucG06CihmaXhTVk5QYXRjaEZvckFkZGl0aW9uV2l0aEhpc3Rvcnkp OiBBcHBlbmQgYSB0cmFpbGluZyBuZXdsaW5lIGNoYXJhY3Rlci4KKiBTY3JpcHRzL3dlYmtpdHBl cmwvVkNTVXRpbHNfdW5pdHRlc3QvZml4U1ZOUGF0Y2hGb3JBZGRpdGlvbldpdGhIaXN0b3J5LnBs OiBEbyBub3QgcmVtb3ZlCnRyYWlsaW5nIG5ld2xpbmUgY2hhcmFjdGVyIGZyb20gdGhlIGV4cGVj dGVkIHJlc3VsdCBiZWZvcmUgY29tcGFyaW5nIGl0IHRvIHRoZSBhY3R1YWwgcmVzdWx0LgotLS0K IFRvb2xzL0NoYW5nZUxvZyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIHwgMTMgKysrKysrKysrKysrKwogVG9vbHMvU2NyaXB0cy9WQ1NVdGlscy5wbSAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgfCAgMiArLQogLi4uL1ZDU1V0aWxzX3VuaXR0ZXN0 L2ZpeFNWTlBhdGNoRm9yQWRkaXRpb25XaXRoSGlzdG9yeS5wbCAgfCAgMiArLQogMyBmaWxlcyBj aGFuZ2VkLCAxNSBpbnNlcnRpb25zKCspLCAyIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL1Rv b2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCBhN2I1Y2U1OTc4Yi4uNTJlNTgy Y2U2ZTUgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9Ub29scy9DaGFuZ2VMb2cK QEAgLTEsMyArMSwxNiBAQAorMjAxNy0wMi0wNyAgSm9uYXRoYW4gQmVkYXJkICA8amJlZGFyZEBh cHBsZS5jb20+CisKKyAgICAgICAgRmlsZSBpbmRleCBhcHBlbmRlZCB0byBwcmV2aW91cyBmaWxl IGluIHN2bi1jcmVhdGUtcGF0Y2ggd2l0aCBTVk4gMS45CisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNjc5MDMKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVt LzMwMzg3Mzk1PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgICogU2NyaXB0cy9WQ1NVdGlscy5wbToKKyAgICAgICAgKGZpeFNWTlBhdGNoRm9yQWRkaXRp b25XaXRoSGlzdG9yeSk6IEFwcGVuZCBhIHRyYWlsaW5nIG5ld2xpbmUgY2hhcmFjdGVyLgorICAg ICAgICAqIFNjcmlwdHMvd2Via2l0cGVybC9WQ1NVdGlsc191bml0dGVzdC9maXhTVk5QYXRjaEZv ckFkZGl0aW9uV2l0aEhpc3RvcnkucGw6IERvIG5vdCByZW1vdmUKKyAgICAgICAgdHJhaWxpbmcg bmV3bGluZSBjaGFyYWN0ZXIgZnJvbSB0aGUgZXhwZWN0ZWQgcmVzdWx0IGJlZm9yZSBjb21wYXJp bmcgaXQgdG8gdGhlIGFjdHVhbCByZXN1bHQuCisKIDIwMTctMDItMDMgIERhbmllbCBCYXRlcyAg PGRhYmF0ZXNAYXBwbGUuY29tPgogCiAgICAgICAgIFtNYWNdW1dLMl0gQWRkIFNQSSB0byBvdmVy cmlkZSB0aGUgQ29udGVudCBTZWN1cml0eSBQb2xpY3kgb2YgYSBwYWdlCmRpZmYgLS1naXQgYS9U b29scy9TY3JpcHRzL1ZDU1V0aWxzLnBtIGIvVG9vbHMvU2NyaXB0cy9WQ1NVdGlscy5wbQppbmRl eCBkZTRlZmZkMzYxMC4uYzVjNDRjNTMwNzMgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvVkNT VXRpbHMucG0KKysrIGIvVG9vbHMvU2NyaXB0cy9WQ1NVdGlscy5wbQpAQCAtMTc3OSw3ICsxNzc5 LDcgQEAgc3ViIGZpeFNWTlBhdGNoRm9yQWRkaXRpb25XaXRoSGlzdG9yeSgkKQogICAgICAgICBy ZXR1cm4gIiI7CiAgICAgfQogICAgIHNwbGljZShAbGluZXMsIDAsIDIpIGlmICRsaW5lc1syXSA9 fiAvJHN2bkRpZmZTdGFydFJlZ0V4LzsKLSAgICByZXR1cm4gam9pbigkbGluZUVuZGluZywgQGxp bmVzKTsKKyAgICByZXR1cm4gam9pbigkbGluZUVuZGluZywgQGxpbmVzKSAuICJcbiI7ICMgcGF0 Y2goMSkgZXhwZWN0cyBhbiBleHRyYSB0cmFpbGluZyBuZXdsaW5lLgogfQogCiAjIElmIHBvc3Np YmxlLCByZXR1cm5zIGEgQ2hhbmdlTG9nIHBhdGNoIGVxdWl2YWxlbnQgdG8gdGhlIGdpdmVuIG9u ZSwKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cGVybC9WQ1NVdGlsc191bml0dGVz dC9maXhTVk5QYXRjaEZvckFkZGl0aW9uV2l0aEhpc3RvcnkucGwgYi9Ub29scy9TY3JpcHRzL3dl YmtpdHBlcmwvVkNTVXRpbHNfdW5pdHRlc3QvZml4U1ZOUGF0Y2hGb3JBZGRpdGlvbldpdGhIaXN0 b3J5LnBsCmluZGV4IDdiMzkzOWVhN2ZhLi5jYTkxNTU3Mjk3NyAxMDA2NDQKLS0tIGEvVG9vbHMv U2NyaXB0cy93ZWJraXRwZXJsL1ZDU1V0aWxzX3VuaXR0ZXN0L2ZpeFNWTlBhdGNoRm9yQWRkaXRp b25XaXRoSGlzdG9yeS5wbAorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHBlcmwvVkNTVXRpbHNf dW5pdHRlc3QvZml4U1ZOUGF0Y2hGb3JBZGRpdGlvbldpdGhIaXN0b3J5LnBsCkBAIC0yODIsNyAr MjgyLDcgQEAgZm9yZWFjaCBteSAkdGVzdENhc2UgKEB0ZXN0Q2FzZUhhc2hSZWZzKSB7CiAgICAg bXkgJHRlc3ROYW1lU3RhcnQgPSAiZml4U1ZOUGF0Y2hGb3JBZGRpdGlvbldpdGhIaXN0b3J5KCk6 ICR0ZXN0Q2FzZS0+e2RpZmZOYW1lfTogY29tcGFyaW5nIjsKIAogICAgIG15ICRnb3QgPSBWQ1NV dGlsczo6Zml4U1ZOUGF0Y2hGb3JBZGRpdGlvbldpdGhIaXN0b3J5KCR0ZXN0Q2FzZS0+e2lucHV0 VGV4dH0pOwotICAgIGNob21wKG15ICRleHBlY3RlZFJldHVybiA9ICR0ZXN0Q2FzZS0+e2V4cGVj dGVkUmV0dXJufSk7CisgICAgbXkgJGV4cGVjdGVkUmV0dXJuID0gJHRlc3RDYXNlLT57ZXhwZWN0 ZWRSZXR1cm59OwogIAogICAgIGlzX2RlZXBseSgkZ290LCAkZXhwZWN0ZWRSZXR1cm4sICIkdGVz dE5hbWVTdGFydCByZXR1cm4gdmFsdWUuIik7CiB9Ci0tIAoyLjExLjAgKEFwcGxlIEdpdC04MCkK Cg== 300833 2017-02-07 12:20:50 -0800 2017-02-07 13:04:15 -0800 Patch and unit tests Bug167903.patch text/plain 3189 dbates RnJvbSA4Mjg3ZjJlYzkzMTY5NjM3ZDQ0NDdmYmIzMDYyNzk5NjYwNGRmZTczIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBEYW5pZWwgQmF0ZXMgPGRiYXRlc0B3ZWJraXQub3JnPgpEYXRl OiBUdWUsIDcgRmViIDIwMTcgMTI6MTg6MDAgLTA4MDAKU3ViamVjdDogW1BBVENIXSBGaWxlIGlu ZGV4IGFwcGVuZGVkIHRvIHByZXZpb3VzIGZpbGUgaW4gc3ZuLWNyZWF0ZS1wYXRjaCB3aXRoCiBT Vk4gMS45IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNjc5MDMKIDxy ZGFyOi8vcHJvYmxlbS8zMDM4NzM5NT4KClBhdGNoIGJ5IEpvbmF0aGFuIEJlZGFyZCA8amJlZGFy ZEBhcHBsZS5jb20+IG9uIDIwMTctMDItMDcKUmV2aWV3ZWQgYnkgRGFuaWVsIEJhdGVzLgoKKiBT Y3JpcHRzL1ZDU1V0aWxzLnBtOgooZml4U1ZOUGF0Y2hGb3JBZGRpdGlvbldpdGhIaXN0b3J5KTog QXBwZW5kIGEgdHJhaWxpbmcgbmV3bGluZSBjaGFyYWN0ZXIuCiogU2NyaXB0cy93ZWJraXRwZXJs L1ZDU1V0aWxzX3VuaXR0ZXN0L2ZpeFNWTlBhdGNoRm9yQWRkaXRpb25XaXRoSGlzdG9yeS5wbDog RG8gbm90IHJlbW92ZQp0cmFpbGluZyBuZXdsaW5lIGNoYXJhY3RlciBmcm9tIHRoZSBleHBlY3Rl ZCByZXN1bHQgYmVmb3JlIGNvbXBhcmluZyBpdCB0byB0aGUgYWN0dWFsIHJlc3VsdC4KLS0tCiBU b29scy9DaGFuZ2VMb2cgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICB8IDEzICsrKysrKysrKysrKysKIFRvb2xzL1NjcmlwdHMvVkNTVXRpbHMucG0gICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIHwgIDIgKy0KIC4uLi9WQ1NVdGlsc191bml0dGVzdC9m aXhTVk5QYXRjaEZvckFkZGl0aW9uV2l0aEhpc3RvcnkucGwgIHwgIDIgKy0KIDMgZmlsZXMgY2hh bmdlZCwgMTUgaW5zZXJ0aW9ucygrKSwgMiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9Ub29s cy9DaGFuZ2VMb2cgYi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYTdiNWNlNTk3OGIuLmFmNjQ1ZDgz ZmYyIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMTYgQEAKKzIwMTctMDItMDcgIEpvbmF0aGFuIEJlZGFyZCAgPGpiZWRhcmRAYXBw bGUuY29tPgorCisgICAgICAgIEZpbGUgaW5kZXggYXBwZW5kZWQgdG8gcHJldmlvdXMgZmlsZSBp biBzdm4tY3JlYXRlLXBhdGNoIHdpdGggU1ZOIDEuOQorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTY3OTAzCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8z MDM4NzM5NT4KKworICAgICAgICBSZXZpZXdlZCBieSBEYW5pZWwgQmF0ZXMuCisKKyAgICAgICAg KiBTY3JpcHRzL1ZDU1V0aWxzLnBtOgorICAgICAgICAoZml4U1ZOUGF0Y2hGb3JBZGRpdGlvbldp dGhIaXN0b3J5KTogQXBwZW5kIGEgdHJhaWxpbmcgbmV3bGluZSBjaGFyYWN0ZXIuCisgICAgICAg ICogU2NyaXB0cy93ZWJraXRwZXJsL1ZDU1V0aWxzX3VuaXR0ZXN0L2ZpeFNWTlBhdGNoRm9yQWRk aXRpb25XaXRoSGlzdG9yeS5wbDogRG8gbm90IHJlbW92ZQorICAgICAgICB0cmFpbGluZyBuZXds aW5lIGNoYXJhY3RlciBmcm9tIHRoZSBleHBlY3RlZCByZXN1bHQgYmVmb3JlIGNvbXBhcmluZyBp dCB0byB0aGUgYWN0dWFsIHJlc3VsdC4KKwogMjAxNy0wMi0wMyAgRGFuaWVsIEJhdGVzICA8ZGFi YXRlc0BhcHBsZS5jb20+CiAKICAgICAgICAgW01hY11bV0syXSBBZGQgU1BJIHRvIG92ZXJyaWRl IHRoZSBDb250ZW50IFNlY3VyaXR5IFBvbGljeSBvZiBhIHBhZ2UKZGlmZiAtLWdpdCBhL1Rvb2xz L1NjcmlwdHMvVkNTVXRpbHMucG0gYi9Ub29scy9TY3JpcHRzL1ZDU1V0aWxzLnBtCmluZGV4IGRl NGVmZmQzNjEwLi5jNWM0NGM1MzA3MyAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy9WQ1NVdGls cy5wbQorKysgYi9Ub29scy9TY3JpcHRzL1ZDU1V0aWxzLnBtCkBAIC0xNzc5LDcgKzE3NzksNyBA QCBzdWIgZml4U1ZOUGF0Y2hGb3JBZGRpdGlvbldpdGhIaXN0b3J5KCQpCiAgICAgICAgIHJldHVy biAiIjsKICAgICB9CiAgICAgc3BsaWNlKEBsaW5lcywgMCwgMikgaWYgJGxpbmVzWzJdID1+IC8k c3ZuRGlmZlN0YXJ0UmVnRXgvOwotICAgIHJldHVybiBqb2luKCRsaW5lRW5kaW5nLCBAbGluZXMp OworICAgIHJldHVybiBqb2luKCRsaW5lRW5kaW5nLCBAbGluZXMpIC4gIlxuIjsgIyBwYXRjaCgx KSBleHBlY3RzIGFuIGV4dHJhIHRyYWlsaW5nIG5ld2xpbmUuCiB9CiAKICMgSWYgcG9zc2libGUs IHJldHVybnMgYSBDaGFuZ2VMb2cgcGF0Y2ggZXF1aXZhbGVudCB0byB0aGUgZ2l2ZW4gb25lLApk aWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRwZXJsL1ZDU1V0aWxzX3VuaXR0ZXN0L2Zp eFNWTlBhdGNoRm9yQWRkaXRpb25XaXRoSGlzdG9yeS5wbCBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0 cGVybC9WQ1NVdGlsc191bml0dGVzdC9maXhTVk5QYXRjaEZvckFkZGl0aW9uV2l0aEhpc3Rvcnku cGwKaW5kZXggN2IzOTM5ZWE3ZmEuLmNhOTE1NTcyOTc3IDEwMDY0NAotLS0gYS9Ub29scy9TY3Jp cHRzL3dlYmtpdHBlcmwvVkNTVXRpbHNfdW5pdHRlc3QvZml4U1ZOUGF0Y2hGb3JBZGRpdGlvbldp dGhIaXN0b3J5LnBsCisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cGVybC9WQ1NVdGlsc191bml0 dGVzdC9maXhTVk5QYXRjaEZvckFkZGl0aW9uV2l0aEhpc3RvcnkucGwKQEAgLTI4Miw3ICsyODIs NyBAQCBmb3JlYWNoIG15ICR0ZXN0Q2FzZSAoQHRlc3RDYXNlSGFzaFJlZnMpIHsKICAgICBteSAk dGVzdE5hbWVTdGFydCA9ICJmaXhTVk5QYXRjaEZvckFkZGl0aW9uV2l0aEhpc3RvcnkoKTogJHRl c3RDYXNlLT57ZGlmZk5hbWV9OiBjb21wYXJpbmciOwogCiAgICAgbXkgJGdvdCA9IFZDU1V0aWxz OjpmaXhTVk5QYXRjaEZvckFkZGl0aW9uV2l0aEhpc3RvcnkoJHRlc3RDYXNlLT57aW5wdXRUZXh0 fSk7Ci0gICAgY2hvbXAobXkgJGV4cGVjdGVkUmV0dXJuID0gJHRlc3RDYXNlLT57ZXhwZWN0ZWRS ZXR1cm59KTsKKyAgICBteSAkZXhwZWN0ZWRSZXR1cm4gPSAkdGVzdENhc2UtPntleHBlY3RlZFJl dHVybn07CiAgCiAgICAgaXNfZGVlcGx5KCRnb3QsICRleHBlY3RlZFJldHVybiwgIiR0ZXN0TmFt ZVN0YXJ0IHJldHVybiB2YWx1ZS4iKTsKIH0KLS0gCjIuMTEuMCAoQXBwbGUgR2l0LTgwKQoK