roman/webserv
1
0
Fork 0
mirror of https://github.com/3lswear/webserv.git synced 2025-10-29 05:17:59 +03:00
Code Issues Packages Projects Releases Wiki Activity

upstream changes (src)

Browse Source
This commit is contained in:
3lswear
2022-03-06 14:21:11 +03:00
parent 1c034c465c
commit c6e54a0c05
8 changed files with 31 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/CGI/CgiHandle.cpp
View File

@@ -92,7 +92,7 @@ std::string CgiHandle::executeCgi()
} }
catch(const std::bad_alloc& e) catch(const std::bad_alloc& e)
{ {
std::cerr << WARNING << getDebugTime() << FAIL << " " << e.what() << ENDL; std::cerr << WARNING << getDebugTime() << FAIL << e.what() << ENDL;
} }
sI = dup(STDIN_FILENO); sI = dup(STDIN_FILENO);
sO = dup(STDOUT_FILENO); sO = dup(STDOUT_FILENO);

2
src/Client/Client.cpp
View File

@@ -185,7 +185,7 @@ std::string Client::generateRespons(std::vector<ServerConfig *> &configs)
std::memcpy(_to_send_char, _toSend->c_str(), len + 1); std::memcpy(_to_send_char, _toSend->c_str(), len + 1);
//print request //print request
std::cerr << WARNING << getDebugTime() << GREEN; std::cerr << WARNING << getDebugTime() << TURGUOISE;
if (_request.getCode() != 200) if (_request.getCode() != 200)
std::cerr << FAIL ; std::cerr << FAIL ;
std::cerr << "[ request ] : " std::cerr << "[ request ] : "

2
src/Client/Response.cpp
View File

@@ -239,7 +239,7 @@ std::string Response::getContentType(void)
else if (type == "pdf") else if (type == "pdf")
return ("application/pdf"); return ("application/pdf");
else else
return ("application/octet-stream"); return ("text/plain");
} }

11
src/Server/ServerConfig.cpp
View File

@@ -22,17 +22,14 @@ std::string getDebugTime(void)
{ {
time_t rawtime; time_t rawtime;
struct tm *timeinfo; struct tm *timeinfo;
char buf[32];
time(&rawtime); time(&rawtime);
timeinfo = localtime(&rawtime); timeinfo = localtime(&rawtime);
std::string ret = std::string(asctime(timeinfo)); int tmp = strftime(buf, 32, "%T", timeinfo);
for (size_t i = 0; i < 3; i++) buf[tmp] = '\0';
{ std::string ret = std::string(buf);
ret.erase(0, ret.find(" ") + 1);
}
ret.erase(ret.find(" "));
ret = std::string(WARNING) + "[ " + ret + " ] " ret = std::string(WARNING) + "[ " + ret + " ] "
+ std::string(RESET) + std::string(RESET)
+ std::string(OKCYAN); + std::string(OKCYAN);

2
src/main.cpp
View File

@@ -24,7 +24,7 @@ int main(int argc, char **argv)
catch(const ConfigException& e) catch(const ConfigException& e)
{ {
std::cerr << RED << "\n" << WARNING << getDebugTime() std::cerr << RED << "\n" << WARNING << getDebugTime()
<< FAIL << " " << e.getMessage() << ENDL; << FAIL << e.getMessage() << ENDL;
} }
catch (std::domain_error &e) catch (std::domain_error &e)
{ {