Skip to content

Remove \r\n for \n when writing to ostream #24980

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 18, 2020
Merged

Remove \r\n for \n when writing to ostream #24980

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
09c14d1
Remove \r\n for \n when writing to ostream
jkotalik Aug 17, 2020
538cf9d
confirm test
jkotalik Aug 18, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion src/Servers/IIS/AspNetCoreModuleV2/CommonLib/RedirectionOutput.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,18 @@ void FileRedirectionOutput::Append(const std::wstring& text)
{
if (m_file.is_open())
{
const auto multiByte = to_multi_byte_string(text, CP_UTF8);
auto multiByte = to_multi_byte_string(text, CP_UTF8);

// Writing \r\n to an ostream will cause two new lines to be written rather
Copy link
Member

@BrennanConroy BrennanConroy Aug 17, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will \n will be written without \r in the final file output?

Also, I don't think ostream was the issue, iirc it was a Windows API we were calling the duplicated the newline

Copy link
Contributor Author

@jkotalik jkotalik Aug 17, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hm, when I was testing it, I called ostream << "test\r\n" and I see two new lines in the file.

Copy link
Member

@BrennanConroy BrennanConroy Aug 17, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Isn't this ostream the fake file that is then redirected? I could be wrong, it has been a long time since I looked at this

Copy link
Contributor Author

@jkotalik jkotalik Aug 17, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't believe so, the m_file points directly to the stdout file.

// than one. Change all \r\n to \n.
std::string slashRslashN = "\r\n";
std::string slashN = "\n";
size_t start_pos = 0;
while ((start_pos = multiByte.find(slashRslashN, start_pos)) != std::string::npos) {
multiByte.replace(start_pos, slashRslashN.length(), slashN);
start_pos += slashN.length();
}

m_file << multiByte;
}
}
Expand Down
2 changes: 2 additions & 0 deletions src/Servers/IIS/IIS/test/Common.FunctionalTests/LogFileTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,8 @@ private async Task CheckStdoutToFile(TestVariant variant, string path)
var contents = Helpers.ReadAllTextFromFile(Helpers.GetExpectedLogName(deploymentResult, _logFolderPath), Logger);

Assert.Contains("TEST MESSAGE", contents);
Assert.DoesNotContain("\r\n\r\n", contents);
Assert.Contains("\r\n", contents);
Copy link
Member

@BrennanConroy BrennanConroy Aug 18, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks

}

// Move to separate file
Expand Down