227464 2021-06-28 15:11:01 -0700 Encoding specified in the 'charset' attribute should have precedence over 'content' attribute 2021-06-29 15:26:04 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 johnson.zhou.sh johnson.zhou.sh achristensen cdumez changseok esprehn+autocc ews-watchlist ggaren gyuyoung.kim webkit-bug-importer oldest_to_newest 1773219 0 johnson.zhou.sh 2021-06-28 15:11:01 -0700 Encoding specified in the 'charset' attribute should have precedence over 'content' attribute 1773221 1 achristensen 2021-06-28 15:12:13 -0700 *** Bug 227463 has been marked as a duplicate of this bug. *** 1773222 2 432428 johnson.zhou.sh 2021-06-28 15:14:11 -0700 Created attachment 432428 Patch 1773227 3 432428 achristensen 2021-06-28 15:23:32 -0700 Comment on attachment 432428 Patch Hooray! You successfully uploaded a patch. 1773273 4 432444 johnson.zhou.sh 2021-06-28 16:59:41 -0700 Created attachment 432444 Patch 1773288 5 432444 ggaren 2021-06-28 18:03:44 -0700 Comment on attachment 432444 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=432444&action=review r=me > Source/WebCore/ChangeLog:9 > + (WebCore::HTMLMetaCharsetParser::encodingFromMetaAttributes): It's nice to write a little explanation here about what made the previous logic incorrect, and how the new logic corrects it. Even if the case is pretty simple like this one. 1773291 6 432444 cdumez 2021-06-28 18:30:49 -0700 Comment on attachment 432444 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=432444&action=review >> Source/WebCore/ChangeLog:9 >> + (WebCore::HTMLMetaCharsetParser::encodingFromMetaAttributes): > > It's nice to write a little explanation here about what made the previous logic incorrect, and how the new logic corrects it. Even if the case is pretty simple like this one. Also, for compatibility changes such as this one, please make sure to test the behavior in Chrome and Firefox and provide the results in the ChangeLog. It is important as fixing tests may break compatibility with other browsers in some cases (because other browsers also fail said test). 1773292 7 cdumez 2021-06-28 18:31:18 -0700 (In reply to Chris Dumez from comment #6) > Comment on attachment 432444 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=432444&action=review > > >> Source/WebCore/ChangeLog:9 > >> + (WebCore::HTMLMetaCharsetParser::encodingFromMetaAttributes): > > > > It's nice to write a little explanation here about what made the previous logic incorrect, and how the new logic corrects it. Even if the case is pretty simple like this one. > > Also, for compatibility changes such as this one, please make sure to test > the behavior in Chrome and Firefox and provide the results in the ChangeLog. > It is important as fixing tests may break compatibility with other browsers > in some cases (because other browsers also fail said test). For this particular test, I have verified via https://wpt.live/html/syntax/parsing/meta-inhead-insertion-mode.html that it passes on both Firefox and Chrome. 1773295 8 432444 achristensen 2021-06-28 18:37:03 -0700 Comment on attachment 432444 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=432444&action=review > Source/WebCore/html/parser/HTMLMetaCharsetParser.cpp:115 > mode = Charset; We could also increase performance a little by putting "break;" after this line instead of checking if mode != Charset for the rest of the attributes. 1773509 9 432516 johnson.zhou.sh 2021-06-29 13:25:56 -0700 Created attachment 432516 Patch 1773510 10 432516 cdumez 2021-06-29 13:28:57 -0700 Comment on attachment 432516 Patch Where are the layout test changes? 1773522 11 432522 johnson.zhou.sh 2021-06-29 13:53:04 -0700 Created attachment 432522 Patch 1773524 12 432522 cdumez 2021-06-29 13:54:08 -0700 Comment on attachment 432522 Patch Again this patch does not contain any test or test rebaseline. 1773525 13 432523 johnson.zhou.sh 2021-06-29 13:57:09 -0700 Created attachment 432523 Patch 1773583 14 ews-feeder 2021-06-29 15:25:37 -0700 Committed r279391 (239256@main): <https://commits.webkit.org/239256@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 432523. 432428 2021-06-28 15:14:11 -0700 2021-06-28 16:59:37 -0700 Patch bug-227464-20210628151410.patch text/plain 1474 johnson.zhou.sh U3VidmVyc2lvbiBSZXZpc2lvbjogMjc5MzQ3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGU0Y2NjZTg4YTZlYmE0MmY1 OTRlYzdkY2JiZjY0MDg1YWY5NjU3NjYuLmYxOGM4ZDU0MzNmMmQ1ZTRjOTcxMTJjNDUyMTIyZjQ3 NmE1NzdlOWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMjEtMDYtMjggIEpvaG5zb24g WmhvdSAgPHFpYW9zb25nX3pob3VAYXBwbGUuY29tPgorCisgICAgICAgIEVuY29kaW5nIHNwZWNp ZmllZCBpbiB0aGUgJ2NoYXJzZXQnIGF0dHJpYnV0ZSBzaG91bGQgaGF2ZSBwcmVjZWRlbmNlIG92 ZXIgJ2NvbnRlbnQnIGF0dHJpYnV0ZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MjI3NDY0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzIChPT1BTISkuCisKKyAgICAgICAgKiBXZWJLaXQu eGNvZGVwcm9qL3hjc2hhcmVkZGF0YS94Y3NjaGVtZXMvV2ViS2l0Lnhjc2NoZW1lOgorCiAyMDIx LTA2LTI4ICBQZXIgQXJuZSAgPHB2b2xsYW5AYXBwbGUuY29tPgogCiAgICAgICAgIFBhc3MgY29y cmVjdCB2YWx1ZSBvZiBBWCBwZXIgYXBwIHNldHRpbmdzIHRvIHRoZSBXZWJDb250ZW50IHByb2Nl c3MKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViS2l0Lnhjb2RlcHJvai94Y3NoYXJlZGRh dGEveGNzY2hlbWVzL1dlYktpdC54Y3NjaGVtZSBiL1NvdXJjZS9XZWJLaXQvV2ViS2l0Lnhjb2Rl cHJvai94Y3NoYXJlZGRhdGEveGNzY2hlbWVzL1dlYktpdC54Y3NjaGVtZQppbmRleCA2MTAzOWIx YzcxNzM4ZjMyMzNkYjhiMzU5ODQzYzQ0YzgzZWY5YzlmLi4yMThkYjJiMzc2OTkwYzQ1OGI1ZTk4 M2IxNWQ4MmY5ZGM0YTMxODZhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dlYktpdC54Y29k ZXByb2oveGNzaGFyZWRkYXRhL3hjc2NoZW1lcy9XZWJLaXQueGNzY2hlbWUKKysrIGIvU291cmNl L1dlYktpdC9XZWJLaXQueGNvZGVwcm9qL3hjc2hhcmVkZGF0YS94Y3NjaGVtZXMvV2ViS2l0Lnhj c2NoZW1lCkBAIC0zMSw3ICszMSw3IEBACiAgICAgICA8L1Rlc3RhYmxlcz4KICAgIDwvVGVzdEFj dGlvbj4KICAgIDxMYXVuY2hBY3Rpb24KLSAgICAgIGJ1aWxkQ29uZmlndXJhdGlvbiA9ICJSZWxl YXNlIgorICAgICAgYnVpbGRDb25maWd1cmF0aW9uID0gIkRlYnVnIgogICAgICAgc2VsZWN0ZWRE ZWJ1Z2dlcklkZW50aWZpZXIgPSAiWGNvZGUuRGVidWdnZXJGb3VuZGF0aW9uLkRlYnVnZ2VyLkxM REIiCiAgICAgICBzZWxlY3RlZExhdW5jaGVySWRlbnRpZmllciA9ICJYY29kZS5EZWJ1Z2dlckZv dW5kYXRpb24uTGF1bmNoZXIuTExEQiIKICAgICAgIGxhdW5jaFN0eWxlID0gIjAiCg== 432444 2021-06-28 16:59:41 -0700 2021-06-29 13:25:54 -0700 Patch bug-227464-20210628165940.patch text/plain 3125 johnson.zhou.sh U3VidmVyc2lvbiBSZXZpc2lvbjogMjc5MzQ3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMmZiZDM4NDRiMzEwM2Ri NWU5YjRhMTdhZDE4ZGNhMDE4YmZjODQ0Ny4uNjM4YjIxMjc4ODQ2ZWQwNDg0N2JkMTY4Zjg0ZjA5 OTU3NzI0NmYyYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEzIEBACisyMDIxLTA2LTI4ICBKb2hu c29uIFpob3UgIDxxaWFvc29uZ196aG91QGFwcGxlLmNvbT4KKworICAgICAgICBFbmNvZGluZyBz cGVjaWZpZWQgaW4gdGhlICdjaGFyc2V0JyBhdHRyaWJ1dGUgc2hvdWxkIGhhdmUgcHJlY2VkZW5j ZSBvdmVyICdjb250ZW50JyBhdHRyaWJ1dGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTIyNzQ2NAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgICogaHRtbC9wYXJzZXIvSFRNTE1ldGFDaGFyc2V0UGFyc2VyLmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxNZXRhQ2hhcnNldFBhcnNlcjo6ZW5jb2RpbmdGcm9t TWV0YUF0dHJpYnV0ZXMpOgorCiAyMDIxLTA2LTI4ICBTYW0gV2VpbmlnICA8d2VpbmlnQGFwcGxl LmNvbT4KIAogICAgICAgICBbTW9kZXJuIE1lZGlhIENvbnRyb2xzXSBTdXBwb3J0IGN1c3RvbWl6 aW5nIHRoZSBtZWRpYSBjb250cm9scyB2aWEgV2ViS2l0QWRkaXRpb25zCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9odG1sL3BhcnNlci9IVE1MTWV0YUNoYXJzZXRQYXJzZXIuY3BwIGIvU291 cmNlL1dlYkNvcmUvaHRtbC9wYXJzZXIvSFRNTE1ldGFDaGFyc2V0UGFyc2VyLmNwcAppbmRleCA4 ZTBiY2IwNDBjMTEzMzdhZmMwMzQ5MTk4MzBmMmQyN2VhOTk0MTE0Li40MWQ0ZjE4ZGM1YzJhMWRk NzVmNzczYjNkNzg0OTQzM2JlNzJhMjVlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1s L3BhcnNlci9IVE1MTWV0YUNoYXJzZXRQYXJzZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0 bWwvcGFyc2VyL0hUTUxNZXRhQ2hhcnNldFBhcnNlci5jcHAKQEAgLTEwOSw3ICsxMDksNyBAQCBU ZXh0RW5jb2RpbmcgSFRNTE1ldGFDaGFyc2V0UGFyc2VyOjplbmNvZGluZ0Zyb21NZXRhQXR0cmli dXRlcyhjb25zdCBBdHRyaWJ1dGVMaQogICAgICAgICBpZiAoYXR0cmlidXRlTmFtZSA9PSBodHRw X2VxdWl2QXR0cikgewogICAgICAgICAgICAgaWYgKGVxdWFsTGV0dGVyc0lnbm9yaW5nQVNDSUlD YXNlKGF0dHJpYnV0ZVZhbHVlLCAiY29udGVudC10eXBlIikpCiAgICAgICAgICAgICAgICAgZ290 UHJhZ21hID0gdHJ1ZTsKLSAgICAgICAgfSBlbHNlIGlmIChjaGFyc2V0LmlzRW1wdHkoKSkgewor ICAgICAgICB9IGVsc2UgaWYgKG1vZGUgIT0gQ2hhcnNldCkgewogICAgICAgICAgICAgaWYgKGF0 dHJpYnV0ZU5hbWUgPT0gY2hhcnNldEF0dHIpIHsKICAgICAgICAgICAgICAgICBjaGFyc2V0ID0g YXR0cmlidXRlVmFsdWU7CiAgICAgICAgICAgICAgICAgbW9kZSA9IENoYXJzZXQ7CmRpZmYgLS1n aXQgYS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2MvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvaW1w b3J0ZWQvdzNjL0NoYW5nZUxvZwppbmRleCBjOWVlNDRlZTIxZjEyODBkMzEwNjY3YjAzMjhiZTJm ODMyYmEzNzMwLi5jYWJlOTEyNDg5ZTRkMzg1ODc1MjEyMWU3MjgzNmVmN2JhNmExMmI4IDEwMDY0 NAotLS0gYS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2MvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRl c3RzL2ltcG9ydGVkL3czYy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMiBAQAorMjAyMS0wNi0yOCAg Sm9obnNvbiBaaG91ICA8cWlhb3NvbmdfemhvdUBhcHBsZS5jb20+CisKKyAgICAgICAgRW5jb2Rp bmcgc3BlY2lmaWVkIGluIHRoZSAnY2hhcnNldCcgYXR0cmlidXRlIHNob3VsZCBoYXZlIHByZWNl ZGVuY2Ugb3ZlciAnY29udGVudCcgYXR0cmlidXRlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjc0NjQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICAqIHdlYi1wbGF0Zm9ybS10ZXN0cy9odG1sL3N5bnRheC9w YXJzaW5nL21ldGEtaW5oZWFkLWluc2VydGlvbi1tb2RlLWV4cGVjdGVkLnR4dDoKKwogMjAyMS0w Ni0yOCAgQ2hyaXMgRHVtZXogIDxjZHVtZXpAYXBwbGUuY29tPgogCiAgICAgICAgIFJlc3luYyBm ZXRjaCBXUFQgdGVzdHMgZnJvbSB1cHN0cmVhbQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW1w b3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9odG1sL3N5bnRheC9wYXJzaW5nL21ldGEtaW5o ZWFkLWluc2VydGlvbi1tb2RlLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3cz Yy93ZWItcGxhdGZvcm0tdGVzdHMvaHRtbC9zeW50YXgvcGFyc2luZy9tZXRhLWluaGVhZC1pbnNl cnRpb24tbW9kZS1leHBlY3RlZC50eHQKaW5kZXggOWU5MGJmMTcxY2VjYjlkMTIyOTc1ZGQyMGVl ZDA1YzFlMTgxMDZlYS4uYmU4ZDljMTg0YzA3MTI1NjAwMjVhNDdiOWQ3MTg2MzJiMzI2OGYyMyAx MDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9o dG1sL3N5bnRheC9wYXJzaW5nL21ldGEtaW5oZWFkLWluc2VydGlvbi1tb2RlLWV4cGVjdGVkLnR4 dAorKysgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2h0bWwv c3ludGF4L3BhcnNpbmcvbWV0YS1pbmhlYWQtaW5zZXJ0aW9uLW1vZGUtZXhwZWN0ZWQudHh0CkBA IC0xLDMgKzEsMyBAQAogCi1GQUlMIEVuY29kaW5nIHNwZWNpZmllZCBpbiB0aGUgJ2NoYXJzZXQn IGF0dHJpYnV0ZSBzaG91bGQgaGF2ZSBwcmVjZWRlbmNlIG92ZXIgJ2NvbnRlbnQnIGF0dHJpYnV0 ZS4gYXNzZXJ0X2VxdWFsczogZXhwZWN0ZWQgIklTTy04ODU5LTE1IiBidXQgZ290ICJLT0k4LVIi CitQQVNTIEVuY29kaW5nIHNwZWNpZmllZCBpbiB0aGUgJ2NoYXJzZXQnIGF0dHJpYnV0ZSBzaG91 bGQgaGF2ZSBwcmVjZWRlbmNlIG92ZXIgJ2NvbnRlbnQnIGF0dHJpYnV0ZS4KIAo= 432516 2021-06-29 13:25:56 -0700 2021-06-29 13:53:01 -0700 Patch bug-227464-20210629132555.patch text/plain 2371 johnson.zhou.sh U3VidmVyc2lvbiBSZXZpc2lvbjogMjc5MzQ3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMmZiZDM4NDRiMzEwM2Ri NWU5YjRhMTdhZDE4ZGNhMDE4YmZjODQ0Ny4uYTI1N2QyYzY5N2EwNzgwMWRmZmUzMzA5NWU1OTdi NzFkYzEyZjU3MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDIxLTA2LTI5ICBKb2hu c29uIFpob3UgIDxxaWFvc29uZ196aG91QGFwcGxlLmNvbT4KKworICAgICAgICBFbmNvZGluZyBz cGVjaWZpZWQgaW4gdGhlICdjaGFyc2V0JyBhdHRyaWJ1dGUgc2hvdWxkIGhhdmUgcHJlY2VkZW5j ZSBvdmVyICdjb250ZW50JyBhdHRyaWJ1dGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTIyNzQ2NAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIFB1dHMgcHJlY2VkZW5jZSBvbiAnY2hhcnNldCcgYXR0cmlidXRl IGJ5IGJyZWFraW5nIG91dCBvZiB0aGUgcGFyc2luZyBwcm9jZXNzLgorCisgICAgICAgIFRoaXMg dGVzdCBwYXNzZXMgRmlyZWZveCBhbmQgQ2hyb21lLiBUZXN0ZWQgdXNpbmcKKyAgICAgICAgaHR0 cDovL3dwdC5saXZlL2h0bWwvc3ludGF4L3BhcnNpbmcvbWV0YS1pbmhlYWQtaW5zZXJ0aW9uLW1v ZGUuaHRtbAorCisgICAgICAgICogaHRtbC9wYXJzZXIvSFRNTE1ldGFDaGFyc2V0UGFyc2VyLmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxNZXRhQ2hhcnNldFBhcnNlcjo6ZW5jb2RpbmdGcm9t TWV0YUF0dHJpYnV0ZXMpOgorCisKIDIwMjEtMDYtMjggIFNhbSBXZWluaWcgIDx3ZWluaWdAYXBw bGUuY29tPgogCiAgICAgICAgIFtNb2Rlcm4gTWVkaWEgQ29udHJvbHNdIFN1cHBvcnQgY3VzdG9t aXppbmcgdGhlIG1lZGlhIGNvbnRyb2xzIHZpYSBXZWJLaXRBZGRpdGlvbnMKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL2h0bWwvcGFyc2VyL0hUTUxNZXRhQ2hhcnNldFBhcnNlci5jcHAgYi9T b3VyY2UvV2ViQ29yZS9odG1sL3BhcnNlci9IVE1MTWV0YUNoYXJzZXRQYXJzZXIuY3BwCmluZGV4 IDhlMGJjYjA0MGMxMTMzN2FmYzAzNDkxOTgzMGYyZDI3ZWE5OTQxMTQuLjNiMDY2OGQyNGIyOTZh OTQ2NjExZjAyNTNkZTg0YThlOTBmZTNhOTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0 bWwvcGFyc2VyL0hUTUxNZXRhQ2hhcnNldFBhcnNlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv aHRtbC9wYXJzZXIvSFRNTE1ldGFDaGFyc2V0UGFyc2VyLmNwcApAQCAtMTA5LDE1ICsxMDksMTUg QEAgVGV4dEVuY29kaW5nIEhUTUxNZXRhQ2hhcnNldFBhcnNlcjo6ZW5jb2RpbmdGcm9tTWV0YUF0 dHJpYnV0ZXMoY29uc3QgQXR0cmlidXRlTGkKICAgICAgICAgaWYgKGF0dHJpYnV0ZU5hbWUgPT0g aHR0cF9lcXVpdkF0dHIpIHsKICAgICAgICAgICAgIGlmIChlcXVhbExldHRlcnNJZ25vcmluZ0FT Q0lJQ2FzZShhdHRyaWJ1dGVWYWx1ZSwgImNvbnRlbnQtdHlwZSIpKQogICAgICAgICAgICAgICAg IGdvdFByYWdtYSA9IHRydWU7Ci0gICAgICAgIH0gZWxzZSBpZiAoY2hhcnNldC5pc0VtcHR5KCkp IHsKLSAgICAgICAgICAgIGlmIChhdHRyaWJ1dGVOYW1lID09IGNoYXJzZXRBdHRyKSB7Ci0gICAg ICAgICAgICAgICAgY2hhcnNldCA9IGF0dHJpYnV0ZVZhbHVlOwotICAgICAgICAgICAgICAgIG1v ZGUgPSBDaGFyc2V0OwotICAgICAgICAgICAgfSBlbHNlIGlmIChhdHRyaWJ1dGVOYW1lID09IGNv bnRlbnRBdHRyKSB7Ci0gICAgICAgICAgICAgICAgY2hhcnNldCA9IGV4dHJhY3RDaGFyc2V0KGF0 dHJpYnV0ZVZhbHVlKTsKLSAgICAgICAgICAgICAgICBpZiAoY2hhcnNldC5sZW5ndGgoKSkKLSAg ICAgICAgICAgICAgICAgICAgbW9kZSA9IFByYWdtYTsKLSAgICAgICAgICAgIH0KKyAgICAgICAg fSBlbHNlIGlmIChhdHRyaWJ1dGVOYW1lID09IGNoYXJzZXRBdHRyKSB7CisgICAgICAgICAgICBj aGFyc2V0ID0gYXR0cmlidXRlVmFsdWU7CisgICAgICAgICAgICBtb2RlID0gQ2hhcnNldDsKKyAg ICAgICAgICAgIC8vIENoYXJzZXQgYXR0cmlidXRlIHRha2VzIHByZWNlZGVuY2UKKyAgICAgICAg ICAgIGJyZWFrOworICAgICAgICB9IGVsc2UgaWYgKGF0dHJpYnV0ZU5hbWUgPT0gY29udGVudEF0 dHIpIHsKKyAgICAgICAgICAgIGNoYXJzZXQgPSBleHRyYWN0Q2hhcnNldChhdHRyaWJ1dGVWYWx1 ZSk7CisgICAgICAgICAgICBpZiAoY2hhcnNldC5sZW5ndGgoKSkKKyAgICAgICAgICAgICAgICBt b2RlID0gUHJhZ21hOwogICAgICAgICB9CiAgICAgfQogCg== 432522 2021-06-29 13:53:04 -0700 2021-06-29 13:57:06 -0700 Patch bug-227464-20210629135303.patch text/plain 2371 johnson.zhou.sh U3VidmVyc2lvbiBSZXZpc2lvbjogMjc5MzQ3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMmZiZDM4NDRiMzEwM2Ri NWU5YjRhMTdhZDE4ZGNhMDE4YmZjODQ0Ny4uYzM2MjAxN2JmMWZmZGI0ODE3MWNlZmU2OWRjZjE0 OWI0OWE3MDgwYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDIxLTA2LTI5ICBKb2hu c29uIFpob3UgIDxxaWFvc29uZ196aG91QGFwcGxlLmNvbT4KKworICAgICAgICBFbmNvZGluZyBz cGVjaWZpZWQgaW4gdGhlICdjaGFyc2V0JyBhdHRyaWJ1dGUgc2hvdWxkIGhhdmUgcHJlY2VkZW5j ZSBvdmVyICdjb250ZW50JyBhdHRyaWJ1dGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTIyNzQ2NAorCisgICAgICAgIFJldmlld2VkIGJ5IEdlb2ZmcmV5 IEdhcmVuLgorCisgICAgICAgIFB1dHMgcHJlY2VkZW5jZSBvbiAnY2hhcnNldCcgYXR0cmlidXRl IGJ5IGJyZWFraW5nIG91dCBvZiB0aGUgcGFyc2luZyBwcm9jZXNzLgorCisgICAgICAgIFRoaXMg dGVzdCBwYXNzZXMgRmlyZWZveCBhbmQgQ2hyb21lLiBUZXN0ZWQgdXNpbmcKKyAgICAgICAgaHR0 cDovL3dwdC5saXZlL2h0bWwvc3ludGF4L3BhcnNpbmcvbWV0YS1pbmhlYWQtaW5zZXJ0aW9uLW1v ZGUuaHRtbAorCisgICAgICAgICogaHRtbC9wYXJzZXIvSFRNTE1ldGFDaGFyc2V0UGFyc2VyLmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxNZXRhQ2hhcnNldFBhcnNlcjo6ZW5jb2RpbmdGcm9t TWV0YUF0dHJpYnV0ZXMpOgorCisKIDIwMjEtMDYtMjggIFNhbSBXZWluaWcgIDx3ZWluaWdAYXBw bGUuY29tPgogCiAgICAgICAgIFtNb2Rlcm4gTWVkaWEgQ29udHJvbHNdIFN1cHBvcnQgY3VzdG9t aXppbmcgdGhlIG1lZGlhIGNvbnRyb2xzIHZpYSBXZWJLaXRBZGRpdGlvbnMKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL2h0bWwvcGFyc2VyL0hUTUxNZXRhQ2hhcnNldFBhcnNlci5jcHAgYi9T b3VyY2UvV2ViQ29yZS9odG1sL3BhcnNlci9IVE1MTWV0YUNoYXJzZXRQYXJzZXIuY3BwCmluZGV4 IDhlMGJjYjA0MGMxMTMzN2FmYzAzNDkxOTgzMGYyZDI3ZWE5OTQxMTQuLjNiMDY2OGQyNGIyOTZh OTQ2NjExZjAyNTNkZTg0YThlOTBmZTNhOTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0 bWwvcGFyc2VyL0hUTUxNZXRhQ2hhcnNldFBhcnNlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv aHRtbC9wYXJzZXIvSFRNTE1ldGFDaGFyc2V0UGFyc2VyLmNwcApAQCAtMTA5LDE1ICsxMDksMTUg QEAgVGV4dEVuY29kaW5nIEhUTUxNZXRhQ2hhcnNldFBhcnNlcjo6ZW5jb2RpbmdGcm9tTWV0YUF0 dHJpYnV0ZXMoY29uc3QgQXR0cmlidXRlTGkKICAgICAgICAgaWYgKGF0dHJpYnV0ZU5hbWUgPT0g aHR0cF9lcXVpdkF0dHIpIHsKICAgICAgICAgICAgIGlmIChlcXVhbExldHRlcnNJZ25vcmluZ0FT Q0lJQ2FzZShhdHRyaWJ1dGVWYWx1ZSwgImNvbnRlbnQtdHlwZSIpKQogICAgICAgICAgICAgICAg IGdvdFByYWdtYSA9IHRydWU7Ci0gICAgICAgIH0gZWxzZSBpZiAoY2hhcnNldC5pc0VtcHR5KCkp IHsKLSAgICAgICAgICAgIGlmIChhdHRyaWJ1dGVOYW1lID09IGNoYXJzZXRBdHRyKSB7Ci0gICAg ICAgICAgICAgICAgY2hhcnNldCA9IGF0dHJpYnV0ZVZhbHVlOwotICAgICAgICAgICAgICAgIG1v ZGUgPSBDaGFyc2V0OwotICAgICAgICAgICAgfSBlbHNlIGlmIChhdHRyaWJ1dGVOYW1lID09IGNv bnRlbnRBdHRyKSB7Ci0gICAgICAgICAgICAgICAgY2hhcnNldCA9IGV4dHJhY3RDaGFyc2V0KGF0 dHJpYnV0ZVZhbHVlKTsKLSAgICAgICAgICAgICAgICBpZiAoY2hhcnNldC5sZW5ndGgoKSkKLSAg ICAgICAgICAgICAgICAgICAgbW9kZSA9IFByYWdtYTsKLSAgICAgICAgICAgIH0KKyAgICAgICAg fSBlbHNlIGlmIChhdHRyaWJ1dGVOYW1lID09IGNoYXJzZXRBdHRyKSB7CisgICAgICAgICAgICBj aGFyc2V0ID0gYXR0cmlidXRlVmFsdWU7CisgICAgICAgICAgICBtb2RlID0gQ2hhcnNldDsKKyAg ICAgICAgICAgIC8vIENoYXJzZXQgYXR0cmlidXRlIHRha2VzIHByZWNlZGVuY2UKKyAgICAgICAg ICAgIGJyZWFrOworICAgICAgICB9IGVsc2UgaWYgKGF0dHJpYnV0ZU5hbWUgPT0gY29udGVudEF0 dHIpIHsKKyAgICAgICAgICAgIGNoYXJzZXQgPSBleHRyYWN0Q2hhcnNldChhdHRyaWJ1dGVWYWx1 ZSk7CisgICAgICAgICAgICBpZiAoY2hhcnNldC5sZW5ndGgoKSkKKyAgICAgICAgICAgICAgICBt b2RlID0gUHJhZ21hOwogICAgICAgICB9CiAgICAgfQogCg== 432523 2021-06-29 13:57:09 -0700 2021-06-29 15:25:38 -0700 Patch bug-227464-20210629135708.patch text/plain 3909 johnson.zhou.sh U3VidmVyc2lvbiBSZXZpc2lvbjogMjc5MzQ3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMmZiZDM4NDRiMzEwM2Ri NWU5YjRhMTdhZDE4ZGNhMDE4YmZjODQ0Ny4uYzM2MjAxN2JmMWZmZGI0ODE3MWNlZmU2OWRjZjE0 OWI0OWE3MDgwYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDIxLTA2LTI5ICBKb2hu c29uIFpob3UgIDxxaWFvc29uZ196aG91QGFwcGxlLmNvbT4KKworICAgICAgICBFbmNvZGluZyBz cGVjaWZpZWQgaW4gdGhlICdjaGFyc2V0JyBhdHRyaWJ1dGUgc2hvdWxkIGhhdmUgcHJlY2VkZW5j ZSBvdmVyICdjb250ZW50JyBhdHRyaWJ1dGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTIyNzQ2NAorCisgICAgICAgIFJldmlld2VkIGJ5IEdlb2ZmcmV5 IEdhcmVuLgorCisgICAgICAgIFB1dHMgcHJlY2VkZW5jZSBvbiAnY2hhcnNldCcgYXR0cmlidXRl IGJ5IGJyZWFraW5nIG91dCBvZiB0aGUgcGFyc2luZyBwcm9jZXNzLgorCisgICAgICAgIFRoaXMg dGVzdCBwYXNzZXMgRmlyZWZveCBhbmQgQ2hyb21lLiBUZXN0ZWQgdXNpbmcKKyAgICAgICAgaHR0 cDovL3dwdC5saXZlL2h0bWwvc3ludGF4L3BhcnNpbmcvbWV0YS1pbmhlYWQtaW5zZXJ0aW9uLW1v ZGUuaHRtbAorCisgICAgICAgICogaHRtbC9wYXJzZXIvSFRNTE1ldGFDaGFyc2V0UGFyc2VyLmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxNZXRhQ2hhcnNldFBhcnNlcjo6ZW5jb2RpbmdGcm9t TWV0YUF0dHJpYnV0ZXMpOgorCisKIDIwMjEtMDYtMjggIFNhbSBXZWluaWcgIDx3ZWluaWdAYXBw bGUuY29tPgogCiAgICAgICAgIFtNb2Rlcm4gTWVkaWEgQ29udHJvbHNdIFN1cHBvcnQgY3VzdG9t aXppbmcgdGhlIG1lZGlhIGNvbnRyb2xzIHZpYSBXZWJLaXRBZGRpdGlvbnMKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL2h0bWwvcGFyc2VyL0hUTUxNZXRhQ2hhcnNldFBhcnNlci5jcHAgYi9T b3VyY2UvV2ViQ29yZS9odG1sL3BhcnNlci9IVE1MTWV0YUNoYXJzZXRQYXJzZXIuY3BwCmluZGV4 IDhlMGJjYjA0MGMxMTMzN2FmYzAzNDkxOTgzMGYyZDI3ZWE5OTQxMTQuLjNiMDY2OGQyNGIyOTZh OTQ2NjExZjAyNTNkZTg0YThlOTBmZTNhOTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0 bWwvcGFyc2VyL0hUTUxNZXRhQ2hhcnNldFBhcnNlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv aHRtbC9wYXJzZXIvSFRNTE1ldGFDaGFyc2V0UGFyc2VyLmNwcApAQCAtMTA5LDE1ICsxMDksMTUg QEAgVGV4dEVuY29kaW5nIEhUTUxNZXRhQ2hhcnNldFBhcnNlcjo6ZW5jb2RpbmdGcm9tTWV0YUF0 dHJpYnV0ZXMoY29uc3QgQXR0cmlidXRlTGkKICAgICAgICAgaWYgKGF0dHJpYnV0ZU5hbWUgPT0g aHR0cF9lcXVpdkF0dHIpIHsKICAgICAgICAgICAgIGlmIChlcXVhbExldHRlcnNJZ25vcmluZ0FT Q0lJQ2FzZShhdHRyaWJ1dGVWYWx1ZSwgImNvbnRlbnQtdHlwZSIpKQogICAgICAgICAgICAgICAg IGdvdFByYWdtYSA9IHRydWU7Ci0gICAgICAgIH0gZWxzZSBpZiAoY2hhcnNldC5pc0VtcHR5KCkp IHsKLSAgICAgICAgICAgIGlmIChhdHRyaWJ1dGVOYW1lID09IGNoYXJzZXRBdHRyKSB7Ci0gICAg ICAgICAgICAgICAgY2hhcnNldCA9IGF0dHJpYnV0ZVZhbHVlOwotICAgICAgICAgICAgICAgIG1v ZGUgPSBDaGFyc2V0OwotICAgICAgICAgICAgfSBlbHNlIGlmIChhdHRyaWJ1dGVOYW1lID09IGNv bnRlbnRBdHRyKSB7Ci0gICAgICAgICAgICAgICAgY2hhcnNldCA9IGV4dHJhY3RDaGFyc2V0KGF0 dHJpYnV0ZVZhbHVlKTsKLSAgICAgICAgICAgICAgICBpZiAoY2hhcnNldC5sZW5ndGgoKSkKLSAg ICAgICAgICAgICAgICAgICAgbW9kZSA9IFByYWdtYTsKLSAgICAgICAgICAgIH0KKyAgICAgICAg fSBlbHNlIGlmIChhdHRyaWJ1dGVOYW1lID09IGNoYXJzZXRBdHRyKSB7CisgICAgICAgICAgICBj aGFyc2V0ID0gYXR0cmlidXRlVmFsdWU7CisgICAgICAgICAgICBtb2RlID0gQ2hhcnNldDsKKyAg ICAgICAgICAgIC8vIENoYXJzZXQgYXR0cmlidXRlIHRha2VzIHByZWNlZGVuY2UKKyAgICAgICAg ICAgIGJyZWFrOworICAgICAgICB9IGVsc2UgaWYgKGF0dHJpYnV0ZU5hbWUgPT0gY29udGVudEF0 dHIpIHsKKyAgICAgICAgICAgIGNoYXJzZXQgPSBleHRyYWN0Q2hhcnNldChhdHRyaWJ1dGVWYWx1 ZSk7CisgICAgICAgICAgICBpZiAoY2hhcnNldC5sZW5ndGgoKSkKKyAgICAgICAgICAgICAgICBt b2RlID0gUHJhZ21hOwogICAgICAgICB9CiAgICAgfQogCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0 cy9pbXBvcnRlZC93M2MvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL0NoYW5n ZUxvZwppbmRleCBjOWVlNDRlZTIxZjEyODBkMzEwNjY3YjAzMjhiZTJmODMyYmEzNzMwLi4wMTQ0 YTZhZDVlYTQ0ZDE0YjYyNTNkMWRlOGE4MzM5OTg2NzYzNjczIDEwMDY0NAotLS0gYS9MYXlvdXRU ZXN0cy9pbXBvcnRlZC93M2MvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3cz Yy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMiBAQAorMjAyMS0wNi0yOSAgSm9obnNvbiBaaG91ICA8 cWlhb3NvbmdfemhvdUBhcHBsZS5jb20+CisKKyAgICAgICAgRW5jb2Rpbmcgc3BlY2lmaWVkIGlu IHRoZSAnY2hhcnNldCcgYXR0cmlidXRlIHNob3VsZCBoYXZlIHByZWNlZGVuY2Ugb3ZlciAnY29u dGVudCcgYXR0cmlidXRlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0yMjc0NjQKKworICAgICAgICBSZXZpZXdlZCBieSBHZW9mZnJleSBHYXJlbi4gCisK KyAgICAgICAgKiB3ZWItcGxhdGZvcm0tdGVzdHMvaHRtbC9zeW50YXgvcGFyc2luZy9tZXRhLWlu aGVhZC1pbnNlcnRpb24tbW9kZS1leHBlY3RlZC50eHQ6CisKIDIwMjEtMDYtMjggIENocmlzIER1 bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KIAogICAgICAgICBSZXN5bmMgZmV0Y2ggV1BUIHRlc3Rz IGZyb20gdXBzdHJlYW0KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWIt cGxhdGZvcm0tdGVzdHMvaHRtbC9zeW50YXgvcGFyc2luZy9tZXRhLWluaGVhZC1pbnNlcnRpb24t bW9kZS1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3Jt LXRlc3RzL2h0bWwvc3ludGF4L3BhcnNpbmcvbWV0YS1pbmhlYWQtaW5zZXJ0aW9uLW1vZGUtZXhw ZWN0ZWQudHh0CmluZGV4IDllOTBiZjE3MWNlY2I5ZDEyMjk3NWRkMjBlZWQwNWMxZTE4MTA2ZWEu LmJlOGQ5YzE4NGMwNzEyNTYwMDI1YTQ3YjlkNzE4NjMyYjMyNjhmMjMgMTAwNjQ0Ci0tLSBhL0xh eW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvaHRtbC9zeW50YXgvcGFy c2luZy9tZXRhLWluaGVhZC1pbnNlcnRpb24tbW9kZS1leHBlY3RlZC50eHQKKysrIGIvTGF5b3V0 VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9odG1sL3N5bnRheC9wYXJzaW5n L21ldGEtaW5oZWFkLWluc2VydGlvbi1tb2RlLWV4cGVjdGVkLnR4dApAQCAtMSwzICsxLDMgQEAK IAotRkFJTCBFbmNvZGluZyBzcGVjaWZpZWQgaW4gdGhlICdjaGFyc2V0JyBhdHRyaWJ1dGUgc2hv dWxkIGhhdmUgcHJlY2VkZW5jZSBvdmVyICdjb250ZW50JyBhdHRyaWJ1dGUuIGFzc2VydF9lcXVh bHM6IGV4cGVjdGVkICJJU08tODg1OS0xNSIgYnV0IGdvdCAiS09JOC1SIgorUEFTUyBFbmNvZGlu ZyBzcGVjaWZpZWQgaW4gdGhlICdjaGFyc2V0JyBhdHRyaWJ1dGUgc2hvdWxkIGhhdmUgcHJlY2Vk ZW5jZSBvdmVyICdjb250ZW50JyBhdHRyaWJ1dGUuCiAK