From fa9327321d7c72b4523b7cd52b5ba4a4c74092c7 Mon Sep 17 00:00:00 2001 From: Reese Norris Date: Sun, 13 Oct 2024 11:36:44 -0700 Subject: [PATCH] change newlines to be MS-DOS style --- web/serverlist_handler.go | 9 ++++++++- web/statustxt_handler.go | 8 +++++++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/web/serverlist_handler.go b/web/serverlist_handler.go index b59488c..6c58f4f 100644 --- a/web/serverlist_handler.go +++ b/web/serverlist_handler.go @@ -37,7 +37,14 @@ func formatServerListTxt() string { } serversList := fmt.Sprintf("OPENFSD:%s:Everywhere:OPENFSD:1:", domainName) - return strings.Replace(serverlistTextFormat, "{SERVERS_LIST}", serversList, -1) + + // Format with built server list + formatted := strings.Replace(serverlistTextFormat, "{SERVERS_LIST}", serversList, -1) + + // Ensure all line feeds also have carriage returns + formatted = strings.Replace(formatted, "\n", "\r\n", -1) + + return formatted } var formattedServerListTxtEtag string diff --git a/web/statustxt_handler.go b/web/statustxt_handler.go index 1eb7f01..c09f73e 100644 --- a/web/statustxt_handler.go +++ b/web/statustxt_handler.go @@ -37,7 +37,13 @@ func formatStatusTxt() string { openfsdAddress += servercontext.Config().DomainName } - return strings.Replace(statusFormat, "{OPENFSD_ADDRESS}", openfsdAddress, -1) + // Format string with {OPENFSD_ADDRESS} + formatted := strings.Replace(statusFormat, "{OPENFSD_ADDRESS}", openfsdAddress, -1) + + // Ensure all line feeds also have carriage returns + formatted = strings.Replace(formatted, "\n", "\r\n", -1) + + return formatted } var formattedStatusTxtEtag string