184570 2018-04-12 16:24:02 -0700 REGRESSION: Using the reload button while offline pushes identical pages onto the back/forward list 2018-04-18 10:50:22 -0700 1 1 1 Unclassified WebKit History WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 sihui_liu sihui_liu cdumez commit-queue dbates ews-watchlist japhet sihui_liu webkit-bug-importer oldest_to_newest 1414225 0 sihui_liu 2018-04-12 16:24:02 -0700 If device is not connected to the internet, pressing reload button will add item to the history list. 1414228 1 sihui_liu 2018-04-12 16:26:11 -0700 <rdar://problem/34807323> 1414736 2 337989 sihui_liu 2018-04-15 23:37:21 -0700 Created attachment 337989 Patch 1415564 3 337989 cdumez 2018-04-18 09:29:13 -0700 Comment on attachment 337989 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=337989&action=review r=me with nit fixes. > Source/WebCore/loader/FrameLoader.cpp:1443 > + } else if (shouldTreatURLAsSameAsCurrent(newDocumentLoader->unreachableURL()) && (m_loadType == FrameLoadType::Reload || m_loadType == FrameLoadType::ReloadExpiredOnly || m_loadType == FrameLoadType::ReloadFromOrigin)) There is a isReload(FrameLoadType) utility function that does what you want. > Tools/TestWebKitAPI/Tests/WebKitCocoa/LoadAlternateHTMLString.mm:139 > + NSURL* targetURL = WebCore::URLWithData([NSData dataWithBytes:literal length:strlen(literal)], nil); I would suggest: NSURL *invalidURL = [NSURL URLWithString:@"https://www.example.com<>/"]; And dropping your literal variable. 1415574 4 338222 sihui_liu 2018-04-18 10:00:43 -0700 Created attachment 338222 Patch 1415575 5 338223 sihui_liu 2018-04-18 10:09:31 -0700 Created attachment 338223 Patch 1415588 6 338223 commit-queue 2018-04-18 10:50:20 -0700 Comment on attachment 338223 Patch Clearing flags on attachment: 338223 Committed r230767: <https://trac.webkit.org/changeset/230767> 1415589 7 commit-queue 2018-04-18 10:50:22 -0700 All reviewed patches have been landed. Closing bug. 337989 2018-04-15 23:37:21 -0700 2018-04-18 10:00:42 -0700 Patch bug-184570-20180415233720.patch text/plain 4567 sihui_liu U3VidmVyc2lvbiBSZXZpc2lvbjogMjMwNjYwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODFjZTYzNTdkODYyMGQw YTkzOGMwNTViNmQ5NDNkYmY0NTRhNTEzYi4uOTRkNWIzYjYyYzY5N2I0MmFmNjhjMDZmMzAzMzg1 NmRjNDk4ZDQwMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDE4LTA0LTE1ICBTaWh1 aSBMaXUgIDxzaWh1aV9saXVAYXBwbGUuY29tPgorCisgICAgICAgIFJFR1JFU1NJT046IFVzaW5n IHRoZSByZWxvYWQgYnV0dG9uIHdoaWxlIG9mZmxpbmUgcHVzaGVzIGlkZW50aWNhbCBwYWdlcyBv bnRvIHRoZSBiYWNrL2ZvcndhcmQgbGlzdAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTg0NTcwCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8zNDgwNzMy Mz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBTZXQg RnJhbWVMb2FkVHlwZSBwcm9wZXJseSB3aGVuIGVycm9yIG9jY3VycyBpbiByZWxvYWQuCisKKyAg ICAgICAgdGVzdHM6IFRvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvTG9hZEFs dGVybmF0ZUhUTUxTdHJpbmcubW0KKworICAgICAgICAqIGxvYWRlci9GcmFtZUxvYWRlci5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpGcmFtZUxvYWRlcjo6bG9hZCk6CisKIDIwMTgtMDQtMTQgIFRo aWJhdWx0IFNhdW5pZXIgIDx0c2F1bmllckBpZ2FsaWEuY29tPgogCiAgICAgICAgIFtHU3RyZWFt ZXJdIEV4cG9zZSBhIG1ldGhvZCB0byByZXRyaWV2ZSB0aGUgR3N0U3RyZWFtIGZyb20gYSBUcmFj a1ByaXZhdGVCYXNlR1N0cmVhbWVyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIv RnJhbWVMb2FkZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcApp bmRleCA1Y2FhMTFiOTRmMTQ0NDI3N2NkM2EyOGFmMWRmYmRjZTYyNWE3Y2MxLi44NjEzMjMwY2E4 MjJmZTM3NjYzYzg1ODdkZDE3Y2Y3MjhjYWUzZDEzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFt ZUxvYWRlci5jcHAKQEAgLTE0NDAsOCArMTQ0MCw4IEBAIHZvaWQgRnJhbWVMb2FkZXI6OmxvYWQo RG9jdW1lbnRMb2FkZXIqIG5ld0RvY3VtZW50TG9hZGVyKQogICAgIGlmIChzaG91bGRUcmVhdFVS TEFzU2FtZUFzQ3VycmVudChuZXdEb2N1bWVudExvYWRlci0+b3JpZ2luYWxSZXF1ZXN0KCkudXJs KCkpKSB7CiAgICAgICAgIHIuc2V0Q2FjaGVQb2xpY3koUmVsb2FkSWdub3JpbmdDYWNoZURhdGEp OwogICAgICAgICB0eXBlID0gRnJhbWVMb2FkVHlwZTo6U2FtZTsKLSAgICB9IGVsc2UgaWYgKHNo b3VsZFRyZWF0VVJMQXNTYW1lQXNDdXJyZW50KG5ld0RvY3VtZW50TG9hZGVyLT51bnJlYWNoYWJs ZVVSTCgpKSAmJiBtX2xvYWRUeXBlID09IEZyYW1lTG9hZFR5cGU6OlJlbG9hZCkKLSAgICAgICAg dHlwZSA9IEZyYW1lTG9hZFR5cGU6OlJlbG9hZDsKKyAgICB9IGVsc2UgaWYgKHNob3VsZFRyZWF0 VVJMQXNTYW1lQXNDdXJyZW50KG5ld0RvY3VtZW50TG9hZGVyLT51bnJlYWNoYWJsZVVSTCgpKSAm JiAobV9sb2FkVHlwZSA9PSBGcmFtZUxvYWRUeXBlOjpSZWxvYWQgfHwgbV9sb2FkVHlwZSA9PSBG cmFtZUxvYWRUeXBlOjpSZWxvYWRFeHBpcmVkT25seSB8fCBtX2xvYWRUeXBlID09IEZyYW1lTG9h ZFR5cGU6OlJlbG9hZEZyb21PcmlnaW4pKQorICAgICAgICB0eXBlID0gbV9sb2FkVHlwZTsKICAg ICBlbHNlIGlmIChtX2xvYWRUeXBlID09IEZyYW1lTG9hZFR5cGU6OlJlZGlyZWN0V2l0aExvY2tl ZEJhY2tGb3J3YXJkTGlzdCAmJiAhbmV3RG9jdW1lbnRMb2FkZXItPnVucmVhY2hhYmxlVVJMKCku aXNFbXB0eSgpICYmIG5ld0RvY3VtZW50TG9hZGVyLT5zdWJzdGl0dXRlRGF0YSgpLmlzVmFsaWQo KSkKICAgICAgICAgdHlwZSA9IEZyYW1lTG9hZFR5cGU6OlJlZGlyZWN0V2l0aExvY2tlZEJhY2tG b3J3YXJkTGlzdDsKICAgICBlbHNlCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cgYi9Ub29s cy9DaGFuZ2VMb2cKaW5kZXggZmM0OGY1Y2NhMTgwZDM1YTFiYjI3YzZiZDZjZmZmZmVkMmJkYTgx Mi4uNDA0MGY5OTFiNDAyYTUyNjA4OTExNzBlN2ZkMzg5MjRlNzhlYWM4NSAxMDA2NDQKLS0tIGEv VG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisy MDE4LTA0LTE1ICBTaWh1aSBMaXUgIDxzaWh1aV9saXVAYXBwbGUuY29tPgorCisgICAgICAgIFJF R1JFU1NJT046IFVzaW5nIHRoZSByZWxvYWQgYnV0dG9uIHdoaWxlIG9mZmxpbmUgcHVzaGVzIGlk ZW50aWNhbCBwYWdlcyBvbnRvIHRoZSBiYWNrL2ZvcndhcmQgbGlzdAorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTg0NTcwCisgICAgICAgIDxyZGFyOi8v cHJvYmxlbS8zNDgwNzMyMz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBBZGQgQVBJIHRlc3QgY292ZXJhZ2UuCisKKyAgICAgICAgKiBUZXN0V2ViS2l0 QVBJL1Rlc3RzL1dlYktpdENvY29hL0xvYWRBbHRlcm5hdGVIVE1MU3RyaW5nLm1tOgorICAgICAg ICAoVEVTVCk6CisKIDIwMTgtMDQtMTMgIFphbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4K IAogICAgICAgICBbTGF5b3V0UmVsb2FkZWRdIFVwZGF0ZSBjbGFzcyBkb2N1bWVudGF0aW9uCmRp ZmYgLS1naXQgYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL0xvYWRBbHRl cm5hdGVIVE1MU3RyaW5nLm1tIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2Nv YS9Mb2FkQWx0ZXJuYXRlSFRNTFN0cmluZy5tbQppbmRleCBhYjc2YTg1MGEwNTM1MjVkNWVmY2Zi NGVkM2JlMTliMzc0YjU1MTAxLi5lNWNiYWQ2NTQyOTNmNWQxYzg5MDdhNWI2ZTgzODg2MjQyZTli Yjk4IDEwMDY0NAotLS0gYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL0xv YWRBbHRlcm5hdGVIVE1MU3RyaW5nLm1tCisrKyBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMv V2ViS2l0Q29jb2EvTG9hZEFsdGVybmF0ZUhUTUxTdHJpbmcubW0KQEAgLTEyOCw0ICsxMjgsMzQg QEAgVEVTVChXS1dlYlZpZXcsIExvYWRBbHRlcm5hdGVIVE1MU3RyaW5nTm9GaWxlU3lzdGVtUGF0 aCkKICAgICBbd2ViVmlldyBsb2FkSFRNTFN0cmluZzpAIjxodG1sPmhpPC9odG1sPiIgYmFzZVVS TDpbTlNVUkwgVVJMV2l0aFN0cmluZzpAImZpbGU6Ly8vLmZpbGUvaWQ9Il1dOwogfQogCitURVNU KFdLV2ViVmlldywgTG9hZEFsdGVybmF0ZUhUTUxTdHJpbmdGcm9tUHJvdmlzaW9uYWxMb2FkRXJy b3JSZWxvYWQpCit7CisgICAgQGF1dG9yZWxlYXNlcG9vbCB7CisgICAgICAgIGF1dG8gd2ViVmll dyA9IGFkb3B0TlMoW1tXS1dlYlZpZXcgYWxsb2NdIGluaXRXaXRoRnJhbWU6TlNNYWtlUmVjdCgw LCAwLCA4MDAsIDYwMCldKTsKKyAgICAgICAgYXV0byBjb250cm9sbGVyID0gYWRvcHROUyhbW0xv YWRBbHRlcm5hdGVIVE1MU3RyaW5nRnJvbVByb3Zpc2lvbmFsTG9hZEVycm9yQ29udHJvbGxlciBh bGxvY10gaW5pdF0pOworICAgICAgICBbd2ViVmlldyBzZXROYXZpZ2F0aW9uRGVsZWdhdGU6Y29u dHJvbGxlci5nZXQoKV07CisgICAgICAgIAorICAgICAgICBjaGFyIGxpdGVyYWxbXSA9ICJodHRw czovL3d3dy5leGFtcGxlLmNvbTw+LyI7CisgICAgICAgIE5TVVJMKiB0YXJnZXRVUkwgPSBXZWJD b3JlOjpVUkxXaXRoRGF0YShbTlNEYXRhIGRhdGFXaXRoQnl0ZXM6bGl0ZXJhbCBsZW5ndGg6c3Ry bGVuKGxpdGVyYWwpXSwgbmlsKTsKKyAgICAgICAgW3dlYlZpZXcgbG9hZFJlcXVlc3Q6W05TVVJM UmVxdWVzdCByZXF1ZXN0V2l0aFVSTDp0YXJnZXRVUkxdXTsKKyAgICAgICAgVGVzdFdlYktpdEFQ STo6VXRpbDo6cnVuKCZpc0RvbmUpOworICAgICAgICBpc0RvbmUgPSBmYWxzZTsKKworICAgICAg ICBbd2ViVmlldyByZWxvYWRdOworICAgICAgICBUZXN0V2ViS2l0QVBJOjpVdGlsOjpydW4oJmlz RG9uZSk7CisgICAgICAgIGlzRG9uZSA9IGZhbHNlOworICAgICAgICAKKyAgICAgICAgW3dlYlZp ZXcgcmVsb2FkRnJvbU9yaWdpbl07CisgICAgICAgIFRlc3RXZWJLaXRBUEk6OlV0aWw6OnJ1bigm aXNEb25lKTsKKyAgICAgICAgaXNEb25lID0gZmFsc2U7CisKKyAgICAgICAgW3dlYlZpZXcgX3Jl bG9hZEV4cGlyZWRPbmx5XTsKKyAgICAgICAgVGVzdFdlYktpdEFQSTo6VXRpbDo6cnVuKCZpc0Rv bmUpOworICAgICAgICBpc0RvbmUgPSBmYWxzZTsKKyAgICAgICAgCisgICAgICAgIFdLQmFja0Zv cndhcmRMaXN0ICpsaXN0ID0gW3dlYlZpZXcgYmFja0ZvcndhcmRMaXN0XTsKKyAgICAgICAgRVhQ RUNUX0VRKChOU1VJbnRlZ2VyKTAsIGxpc3QuYmFja0xpc3QuY291bnQpOworICAgIH0KK30KKwog I2VuZGlmCg== 338222 2018-04-18 10:00:43 -0700 2018-04-18 10:09:30 -0700 Patch bug-184570-20180418100042.patch text/plain 4361 sihui_liu U3VidmVyc2lvbiBSZXZpc2lvbjogMjMwNzYyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTMyOTlmYTc3MDMxY2I0 NDRiMDA4OWEwYTljMmVjMjhjOTEwYzNlMy4uMWUyOTg4MjBhMTBhNjhjYTg5MDJkNWI4MzRkYTBk ZTM5NTIzZWVlOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDE4LTA0LTE4ICBTaWh1 aSBMaXUgIDxzaWh1aV9saXVAYXBwbGUuY29tPgorCisgICAgICAgIFJFR1JFU1NJT046IFVzaW5n IHRoZSByZWxvYWQgYnV0dG9uIHdoaWxlIG9mZmxpbmUgcHVzaGVzIGlkZW50aWNhbCBwYWdlcyBv bnRvIHRoZSBiYWNrL2ZvcndhcmQgbGlzdAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTg0NTcwCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8zNDgwNzMy Mz4KKworICAgICAgICBSZXZpZXdlZCBieSBDaHJpcyBEdW1lei4KKworICAgICAgICBTZXQgRnJh bWVMb2FkVHlwZSBwcm9wZXJseSB3aGVuIGVycm9yIG9jY3VycyBpbiByZWxvYWQuCisKKyAgICAg ICAgdGVzdHM6IFRvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvTG9hZEFsdGVy bmF0ZUhUTUxTdHJpbmcubW0KKworICAgICAgICAqIGxvYWRlci9GcmFtZUxvYWRlci5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpGcmFtZUxvYWRlcjo6bG9hZCk6CisKIDIwMTgtMDQtMTcgIFphbiBE b2JlcnNlayAgPHpkb2JlcnNla0BpZ2FsaWEuY29tPgogCiAgICAgICAgIFtDTWFrZV0gQWRkIGFu ZCBlbmFibGUgdGhlIEVOQUJMRV9DU1NfQU5JTUFUSU9OU19MRVZFTF8yIGZlYXR1cmUgZGVmaW5l CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3BwIGIvU291 cmNlL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcAppbmRleCBhNWM2ZTNkMGJlYmJkZWI2 NDU2YTJjYTYwMWQ2YWJkYjk4MzAyMjE0Li5hNDU0ZGQ5NmI5NGE1NWMwMzA5YzRlNjQzNjcyM2Vh YmY0OTUzZDY1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIu Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5jcHAKQEAgLTE0Mjgs OCArMTQyOCw4IEBAIHZvaWQgRnJhbWVMb2FkZXI6OmxvYWQoRG9jdW1lbnRMb2FkZXIqIG5ld0Rv Y3VtZW50TG9hZGVyKQogICAgIGlmIChzaG91bGRUcmVhdFVSTEFzU2FtZUFzQ3VycmVudChuZXdE b2N1bWVudExvYWRlci0+b3JpZ2luYWxSZXF1ZXN0KCkudXJsKCkpKSB7CiAgICAgICAgIHIuc2V0 Q2FjaGVQb2xpY3koUmVsb2FkSWdub3JpbmdDYWNoZURhdGEpOwogICAgICAgICB0eXBlID0gRnJh bWVMb2FkVHlwZTo6U2FtZTsKLSAgICB9IGVsc2UgaWYgKHNob3VsZFRyZWF0VVJMQXNTYW1lQXND dXJyZW50KG5ld0RvY3VtZW50TG9hZGVyLT51bnJlYWNoYWJsZVVSTCgpKSAmJiBtX2xvYWRUeXBl ID09IEZyYW1lTG9hZFR5cGU6OlJlbG9hZCkKLSAgICAgICAgdHlwZSA9IEZyYW1lTG9hZFR5cGU6 OlJlbG9hZDsKKyAgICB9IGVsc2UgaWYgKHNob3VsZFRyZWF0VVJMQXNTYW1lQXNDdXJyZW50KG5l d0RvY3VtZW50TG9hZGVyLT51bnJlYWNoYWJsZVVSTCgpKSAmJiBpc1JlbG9hZChtX2xvYWRUeXBl KSkKKyAgICAgICAgdHlwZSA9IG1fbG9hZFR5cGU7CiAgICAgZWxzZSBpZiAobV9sb2FkVHlwZSA9 PSBGcmFtZUxvYWRUeXBlOjpSZWRpcmVjdFdpdGhMb2NrZWRCYWNrRm9yd2FyZExpc3QgJiYgIW5l d0RvY3VtZW50TG9hZGVyLT51bnJlYWNoYWJsZVVSTCgpLmlzRW1wdHkoKSAmJiBuZXdEb2N1bWVu dExvYWRlci0+c3Vic3RpdHV0ZURhdGEoKS5pc1ZhbGlkKCkpCiAgICAgICAgIHR5cGUgPSBGcmFt ZUxvYWRUeXBlOjpSZWRpcmVjdFdpdGhMb2NrZWRCYWNrRm9yd2FyZExpc3Q7CiAgICAgZWxzZQpk aWZmIC0tZ2l0IGEvVG9vbHMvQ2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdlTG9nCmluZGV4IGMxYzY1 ZGY3YjE3NjlkM2ZjNDYwMDc2OWE2MzNkNDVmODczNTE4Y2IuLjdiMjZkYjM0MjQyMGNhYjdiMzlj NDY3MzE3ZGEyNDNlMjdmMTRlMmQgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9U b29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNiBAQAorMjAxOC0wNC0xOCAgU2lodWkgTGl1ICA8 c2lodWlfbGl1QGFwcGxlLmNvbT4KKworICAgICAgICBSRUdSRVNTSU9OOiBVc2luZyB0aGUgcmVs b2FkIGJ1dHRvbiB3aGlsZSBvZmZsaW5lIHB1c2hlcyBpZGVudGljYWwgcGFnZXMgb250byB0aGUg YmFjay9mb3J3YXJkIGxpc3QKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTE4NDU3MAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vMzQ4MDczMjM+CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgQ2hyaXMgRHVtZXouCisKKyAgICAgICAgQWRkIEFQSSB0ZXN0IGNv dmVyYWdlLgorCisgICAgICAgICogVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9Mb2Fk QWx0ZXJuYXRlSFRNTFN0cmluZy5tbToKKyAgICAgICAgKFRFU1QpOgorCiAyMDE4LTA0LTE4ICBZ dXN1a2UgU3V6dWtpICA8dXRhdGFuZS50ZWFAZ21haWwuY29tPgogCiAgICAgICAgIFVucmV2aWV3 ZWQsIHJlbGFuZCByMjMwNjk3LCByMjMwNzIwLCBhbmQgcjIzMDcyNC4KZGlmZiAtLWdpdCBhL1Rv b2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvTG9hZEFsdGVybmF0ZUhUTUxTdHJp bmcubW0gYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL0xvYWRBbHRlcm5h dGVIVE1MU3RyaW5nLm1tCmluZGV4IGFiNzZhODUwYTA1MzUyNWQ1ZWZjZmI0ZWQzYmUxOWIzNzRi NTUxMDEuLjNiOTNiM2Q2ZGQ1Njg5YmFiOTViZjAzNzhmZGE4YTVmZDM3NDRmZDAgMTAwNjQ0Ci0t LSBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvTG9hZEFsdGVybmF0ZUhU TUxTdHJpbmcubW0KKysrIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9M b2FkQWx0ZXJuYXRlSFRNTFN0cmluZy5tbQpAQCAtMTI4LDQgKzEyOCwzMyBAQCBURVNUKFdLV2Vi VmlldywgTG9hZEFsdGVybmF0ZUhUTUxTdHJpbmdOb0ZpbGVTeXN0ZW1QYXRoKQogICAgIFt3ZWJW aWV3IGxvYWRIVE1MU3RyaW5nOkAiPGh0bWw+aGk8L2h0bWw+IiBiYXNlVVJMOltOU1VSTCBVUkxX aXRoU3RyaW5nOkAiZmlsZTovLy8uZmlsZS9pZD0iXV07CiB9CiAKK1RFU1QoV0tXZWJWaWV3LCBM b2FkQWx0ZXJuYXRlSFRNTFN0cmluZ0Zyb21Qcm92aXNpb25hbExvYWRFcnJvclJlbG9hZCkKK3sK KyAgICBAYXV0b3JlbGVhc2Vwb29sIHsKKyAgICAgICAgYXV0byB3ZWJWaWV3ID0gYWRvcHROUyhb W1dLV2ViVmlldyBhbGxvY10gaW5pdFdpdGhGcmFtZTpOU01ha2VSZWN0KDAsIDAsIDgwMCwgNjAw KV0pOworICAgICAgICBhdXRvIGNvbnRyb2xsZXIgPSBhZG9wdE5TKFtbTG9hZEFsdGVybmF0ZUhU TUxTdHJpbmdGcm9tUHJvdmlzaW9uYWxMb2FkRXJyb3JDb250cm9sbGVyIGFsbG9jXSBpbml0XSk7 CisgICAgICAgIFt3ZWJWaWV3IHNldE5hdmlnYXRpb25EZWxlZ2F0ZTpjb250cm9sbGVyLmdldCgp XTsKKyAgICAgICAgCisgICAgICAgIE5TVVJMICppbnZhbGlkVVJMID0gW05TVVJMIFVSTFdpdGhT dHJpbmc6QCJodHRwczovL3d3dy5leGFtcGxlLmNvbSUzQyUzRS8iXTsKKyAgICAgICAgW3dlYlZp ZXcgbG9hZFJlcXVlc3Q6W05TVVJMUmVxdWVzdCByZXF1ZXN0V2l0aFVSTDppbnZhbGlkVVJMXV07 CisgICAgICAgIFRlc3RXZWJLaXRBUEk6OlV0aWw6OnJ1bigmaXNEb25lKTsKKyAgICAgICAgaXNE b25lID0gZmFsc2U7CisKKyAgICAgICAgW3dlYlZpZXcgcmVsb2FkXTsKKyAgICAgICAgVGVzdFdl YktpdEFQSTo6VXRpbDo6cnVuKCZpc0RvbmUpOworICAgICAgICBpc0RvbmUgPSBmYWxzZTsKKyAg ICAgICAgCisgICAgICAgIFt3ZWJWaWV3IHJlbG9hZEZyb21PcmlnaW5dOworICAgICAgICBUZXN0 V2ViS2l0QVBJOjpVdGlsOjpydW4oJmlzRG9uZSk7CisgICAgICAgIGlzRG9uZSA9IGZhbHNlOwor CisgICAgICAgIFt3ZWJWaWV3IF9yZWxvYWRFeHBpcmVkT25seV07CisgICAgICAgIFRlc3RXZWJL aXRBUEk6OlV0aWw6OnJ1bigmaXNEb25lKTsKKyAgICAgICAgaXNEb25lID0gZmFsc2U7CisgICAg ICAgIAorICAgICAgICBXS0JhY2tGb3J3YXJkTGlzdCAqbGlzdCA9IFt3ZWJWaWV3IGJhY2tGb3J3 YXJkTGlzdF07CisgICAgICAgIEVYUEVDVF9FUSgoTlNVSW50ZWdlcikwLCBsaXN0LmJhY2tMaXN0 LmNvdW50KTsKKyAgICB9Cit9CisKICNlbmRpZgo= 338223 2018-04-18 10:09:31 -0700 2018-04-18 10:50:20 -0700 Patch bug-184570-20180418100931.patch text/plain 4234 sihui_liu U3VidmVyc2lvbiBSZXZpc2lvbjogMjMwNzYyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTMyOTlmYTc3MDMxY2I0 NDRiMDA4OWEwYTljMmVjMjhjOTEwYzNlMy4uMWUyOTg4MjBhMTBhNjhjYTg5MDJkNWI4MzRkYTBk ZTM5NTIzZWVlOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDE4LTA0LTE4ICBTaWh1 aSBMaXUgIDxzaWh1aV9saXVAYXBwbGUuY29tPgorCisgICAgICAgIFJFR1JFU1NJT046IFVzaW5n IHRoZSByZWxvYWQgYnV0dG9uIHdoaWxlIG9mZmxpbmUgcHVzaGVzIGlkZW50aWNhbCBwYWdlcyBv bnRvIHRoZSBiYWNrL2ZvcndhcmQgbGlzdAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTg0NTcwCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8zNDgwNzMy Mz4KKworICAgICAgICBSZXZpZXdlZCBieSBDaHJpcyBEdW1lei4KKworICAgICAgICBTZXQgRnJh bWVMb2FkVHlwZSBwcm9wZXJseSB3aGVuIGVycm9yIG9jY3VycyBpbiByZWxvYWQuCisKKyAgICAg ICAgdGVzdHM6IFRvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvTG9hZEFsdGVy bmF0ZUhUTUxTdHJpbmcubW0KKworICAgICAgICAqIGxvYWRlci9GcmFtZUxvYWRlci5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpGcmFtZUxvYWRlcjo6bG9hZCk6CisKIDIwMTgtMDQtMTcgIFphbiBE b2JlcnNlayAgPHpkb2JlcnNla0BpZ2FsaWEuY29tPgogCiAgICAgICAgIFtDTWFrZV0gQWRkIGFu ZCBlbmFibGUgdGhlIEVOQUJMRV9DU1NfQU5JTUFUSU9OU19MRVZFTF8yIGZlYXR1cmUgZGVmaW5l CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3BwIGIvU291 cmNlL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcAppbmRleCBhNWM2ZTNkMGJlYmJkZWI2 NDU2YTJjYTYwMWQ2YWJkYjk4MzAyMjE0Li5hNDU0ZGQ5NmI5NGE1NWMwMzA5YzRlNjQzNjcyM2Vh YmY0OTUzZDY1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIu Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5jcHAKQEAgLTE0Mjgs OCArMTQyOCw4IEBAIHZvaWQgRnJhbWVMb2FkZXI6OmxvYWQoRG9jdW1lbnRMb2FkZXIqIG5ld0Rv Y3VtZW50TG9hZGVyKQogICAgIGlmIChzaG91bGRUcmVhdFVSTEFzU2FtZUFzQ3VycmVudChuZXdE b2N1bWVudExvYWRlci0+b3JpZ2luYWxSZXF1ZXN0KCkudXJsKCkpKSB7CiAgICAgICAgIHIuc2V0 Q2FjaGVQb2xpY3koUmVsb2FkSWdub3JpbmdDYWNoZURhdGEpOwogICAgICAgICB0eXBlID0gRnJh bWVMb2FkVHlwZTo6U2FtZTsKLSAgICB9IGVsc2UgaWYgKHNob3VsZFRyZWF0VVJMQXNTYW1lQXND dXJyZW50KG5ld0RvY3VtZW50TG9hZGVyLT51bnJlYWNoYWJsZVVSTCgpKSAmJiBtX2xvYWRUeXBl ID09IEZyYW1lTG9hZFR5cGU6OlJlbG9hZCkKLSAgICAgICAgdHlwZSA9IEZyYW1lTG9hZFR5cGU6 OlJlbG9hZDsKKyAgICB9IGVsc2UgaWYgKHNob3VsZFRyZWF0VVJMQXNTYW1lQXNDdXJyZW50KG5l d0RvY3VtZW50TG9hZGVyLT51bnJlYWNoYWJsZVVSTCgpKSAmJiBpc1JlbG9hZChtX2xvYWRUeXBl KSkKKyAgICAgICAgdHlwZSA9IG1fbG9hZFR5cGU7CiAgICAgZWxzZSBpZiAobV9sb2FkVHlwZSA9 PSBGcmFtZUxvYWRUeXBlOjpSZWRpcmVjdFdpdGhMb2NrZWRCYWNrRm9yd2FyZExpc3QgJiYgIW5l d0RvY3VtZW50TG9hZGVyLT51bnJlYWNoYWJsZVVSTCgpLmlzRW1wdHkoKSAmJiBuZXdEb2N1bWVu dExvYWRlci0+c3Vic3RpdHV0ZURhdGEoKS5pc1ZhbGlkKCkpCiAgICAgICAgIHR5cGUgPSBGcmFt ZUxvYWRUeXBlOjpSZWRpcmVjdFdpdGhMb2NrZWRCYWNrRm9yd2FyZExpc3Q7CiAgICAgZWxzZQpk aWZmIC0tZ2l0IGEvVG9vbHMvQ2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdlTG9nCmluZGV4IGMxYzY1 ZGY3YjE3NjlkM2ZjNDYwMDc2OWE2MzNkNDVmODczNTE4Y2IuLjdiMjZkYjM0MjQyMGNhYjdiMzlj NDY3MzE3ZGEyNDNlMjdmMTRlMmQgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9U b29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNiBAQAorMjAxOC0wNC0xOCAgU2lodWkgTGl1ICA8 c2lodWlfbGl1QGFwcGxlLmNvbT4KKworICAgICAgICBSRUdSRVNTSU9OOiBVc2luZyB0aGUgcmVs b2FkIGJ1dHRvbiB3aGlsZSBvZmZsaW5lIHB1c2hlcyBpZGVudGljYWwgcGFnZXMgb250byB0aGUg YmFjay9mb3J3YXJkIGxpc3QKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTE4NDU3MAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vMzQ4MDczMjM+CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgQ2hyaXMgRHVtZXouCisKKyAgICAgICAgQWRkIEFQSSB0ZXN0IGNv dmVyYWdlLgorCisgICAgICAgICogVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9Mb2Fk QWx0ZXJuYXRlSFRNTFN0cmluZy5tbToKKyAgICAgICAgKFRFU1QpOgorCiAyMDE4LTA0LTE4ICBZ dXN1a2UgU3V6dWtpICA8dXRhdGFuZS50ZWFAZ21haWwuY29tPgogCiAgICAgICAgIFVucmV2aWV3 ZWQsIHJlbGFuZCByMjMwNjk3LCByMjMwNzIwLCBhbmQgcjIzMDcyNC4KZGlmZiAtLWdpdCBhL1Rv b2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvTG9hZEFsdGVybmF0ZUhUTUxTdHJp bmcubW0gYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL0xvYWRBbHRlcm5h dGVIVE1MU3RyaW5nLm1tCmluZGV4IGFiNzZhODUwYTA1MzUyNWQ1ZWZjZmI0ZWQzYmUxOWIzNzRi NTUxMDEuLjUwNWFmMzU3ZTVkMTAxZDE3NmI1MjNkMTU1YTYyOTRiYmU4ZjdmZGYgMTAwNjQ0Ci0t LSBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvTG9hZEFsdGVybmF0ZUhU TUxTdHJpbmcubW0KKysrIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9M b2FkQWx0ZXJuYXRlSFRNTFN0cmluZy5tbQpAQCAtMTI4LDQgKzEyOCwzMSBAQCBURVNUKFdLV2Vi VmlldywgTG9hZEFsdGVybmF0ZUhUTUxTdHJpbmdOb0ZpbGVTeXN0ZW1QYXRoKQogICAgIFt3ZWJW aWV3IGxvYWRIVE1MU3RyaW5nOkAiPGh0bWw+aGk8L2h0bWw+IiBiYXNlVVJMOltOU1VSTCBVUkxX aXRoU3RyaW5nOkAiZmlsZTovLy8uZmlsZS9pZD0iXV07CiB9CiAKK1RFU1QoV0tXZWJWaWV3LCBM b2FkQWx0ZXJuYXRlSFRNTFN0cmluZ0Zyb21Qcm92aXNpb25hbExvYWRFcnJvclJlbG9hZCkKK3sK KyAgICBhdXRvIHdlYlZpZXcgPSBhZG9wdE5TKFtbV0tXZWJWaWV3IGFsbG9jXSBpbml0V2l0aEZy YW1lOk5TTWFrZVJlY3QoMCwgMCwgODAwLCA2MDApXSk7CisgICAgYXV0byBjb250cm9sbGVyID0g YWRvcHROUyhbW0xvYWRBbHRlcm5hdGVIVE1MU3RyaW5nRnJvbVByb3Zpc2lvbmFsTG9hZEVycm9y Q29udHJvbGxlciBhbGxvY10gaW5pdF0pOworICAgIFt3ZWJWaWV3IHNldE5hdmlnYXRpb25EZWxl Z2F0ZTpjb250cm9sbGVyLmdldCgpXTsKKworICAgIE5TVVJMICppbnZhbGlkVVJMID0gW05TVVJM IFVSTFdpdGhTdHJpbmc6QCJodHRwczovL3d3dy5leGFtcGxlLmNvbSUzQyUzRS8iXTsKKyAgICBb d2ViVmlldyBsb2FkUmVxdWVzdDpbTlNVUkxSZXF1ZXN0IHJlcXVlc3RXaXRoVVJMOmludmFsaWRV UkxdXTsKKyAgICBUZXN0V2ViS2l0QVBJOjpVdGlsOjpydW4oJmlzRG9uZSk7CisgICAgaXNEb25l ID0gZmFsc2U7CisKKyAgICBbd2ViVmlldyByZWxvYWRdOworICAgIFRlc3RXZWJLaXRBUEk6OlV0 aWw6OnJ1bigmaXNEb25lKTsKKyAgICBpc0RvbmUgPSBmYWxzZTsKKworICAgIFt3ZWJWaWV3IHJl bG9hZEZyb21PcmlnaW5dOworICAgIFRlc3RXZWJLaXRBUEk6OlV0aWw6OnJ1bigmaXNEb25lKTsK KyAgICBpc0RvbmUgPSBmYWxzZTsKKworICAgIFt3ZWJWaWV3IF9yZWxvYWRFeHBpcmVkT25seV07 CisgICAgVGVzdFdlYktpdEFQSTo6VXRpbDo6cnVuKCZpc0RvbmUpOworICAgIGlzRG9uZSA9IGZh bHNlOworCisgICAgV0tCYWNrRm9yd2FyZExpc3QgKmxpc3QgPSBbd2ViVmlldyBiYWNrRm9yd2Fy ZExpc3RdOworICAgIEVYUEVDVF9FUSgoTlNVSW50ZWdlcikwLCBsaXN0LmJhY2tMaXN0LmNvdW50 KTsKK30KKwogI2VuZGlmCg==