From da9adf9e29a1e7e0f914b494972013d0c0c35672 Mon Sep 17 00:00:00 2001 From: Peter Powell Date: Fri, 2 May 2014 16:39:40 +0100 Subject: Add formatting to InspIRCd::TimeString; switch all code to use it. m_httpd also now uses the correct timestamp format. Windows-specific fixes by @attilamolnar, original PR #849 --- src/modules/m_alltime.cpp | 4 +--- src/modules/m_httpd.cpp | 7 +------ 2 files changed, 2 insertions(+), 9 deletions(-) (limited to 'src/modules') diff --git a/src/modules/m_alltime.cpp b/src/modules/m_alltime.cpp index 58f7c4fb5..ceee4abbc 100644 --- a/src/modules/m_alltime.cpp +++ b/src/modules/m_alltime.cpp @@ -31,9 +31,7 @@ class CommandAlltime : public Command CmdResult Handle(const std::vector ¶meters, User *user) { - char fmtdate[64]; - time_t now = ServerInstance->Time(); - strftime(fmtdate, sizeof(fmtdate), "%Y-%m-%d %H:%M:%S", gmtime(&now)); + const std::string fmtdate = InspIRCd::TimeString(ServerInstance->Time(), "%Y-%m-%d %H:%M:%S"); std::string msg = ":" + ServerInstance->Config->ServerName + " NOTICE " + user->nick + " :System time is " + fmtdate + " (" + ConvToStr(ServerInstance->Time()) + ") on " + ServerInstance->Config->ServerName; diff --git a/src/modules/m_httpd.cpp b/src/modules/m_httpd.cpp index dda39afec..efd285f8c 100644 --- a/src/modules/m_httpd.cpp +++ b/src/modules/m_httpd.cpp @@ -185,12 +185,7 @@ class HttpServerSocket : public BufferedSocket WriteData(http_version + " "+ConvToStr(response)+" "+Response(response)+"\r\n"); - time_t local = ServerInstance->Time(); - struct tm *timeinfo = gmtime(&local); - char *date = asctime(timeinfo); - date[strlen(date) - 1] = '\0'; - rheaders.CreateHeader("Date", date); - + rheaders.CreateHeader("Date", InspIRCd::TimeString(ServerInstance->Time(), "%a, %d %b %Y %H:%M:%S GMT")); rheaders.CreateHeader("Server", INSPIRCD_BRANCH); rheaders.SetHeader("Content-Length", ConvToStr(size)); -- cgit v1.2.3