Changed the HTTP Status responses to be more accurate
the build was successful
Details
the build was successful
Details
This commit is contained in:
parent
1dad647059
commit
3e037d4936
|
@ -1,6 +1,6 @@
|
||||||
cmake_minimum_required (VERSION 3.2)
|
cmake_minimum_required (VERSION 3.2)
|
||||||
project(libravatarserv
|
project(libravatarserv
|
||||||
VERSION 0.6.0
|
VERSION 0.6.1
|
||||||
LANGUAGES CXX
|
LANGUAGES CXX
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
|
@ -29,7 +29,7 @@ const Request http::parse_request(const string &request)
|
||||||
if (request.substr(0, 8) != "/avatar/" ||
|
if (request.substr(0, 8) != "/avatar/" ||
|
||||||
request.find("..", 8) != std::string::npos)
|
request.find("..", 8) != std::string::npos)
|
||||||
{
|
{
|
||||||
cout << "Status: 404 Not Found\n\n";
|
cout << "Status: 400 Bad Request\n\n";
|
||||||
cerr << "Error: Invalid URL.\n";
|
cerr << "Error: Invalid URL.\n";
|
||||||
std::exit(0);
|
std::exit(0);
|
||||||
}
|
}
|
||||||
|
|
|
@ -40,14 +40,14 @@ int main()
|
||||||
const char *request = std::getenv("REQUEST_URI");
|
const char *request = std::getenv("REQUEST_URI");
|
||||||
if (request == nullptr)
|
if (request == nullptr)
|
||||||
{
|
{
|
||||||
cout << "Status: 404 Not Found\n\n";
|
cout << "Status: 400 Bad Request\n\n";
|
||||||
cerr << "Error: ${REQUEST_URI} is empty.\n";
|
cerr << "Error: ${REQUEST_URI} is empty.\n";
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!find_avatar_dir())
|
if (!find_avatar_dir())
|
||||||
{
|
{
|
||||||
cout << "Status: 404 Not Found\n\n";
|
cout << "Status: 503 Service Unavailable\n\n";
|
||||||
cerr << "Error: No avatars found.\n";
|
cerr << "Error: No avatars found.\n";
|
||||||
return 3;
|
return 3;
|
||||||
}
|
}
|
||||||
|
@ -108,7 +108,7 @@ int main()
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
cout << "Status: 404 Not Found\n\n";
|
cout << "Status: 500 Internal Server Error\n\n";
|
||||||
cerr << "Error: Couldn't generate identicon.\n";
|
cerr << "Error: Couldn't generate identicon.\n";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -117,11 +117,10 @@ int main()
|
||||||
if (global::settings.redirect_nofallback)
|
if (global::settings.redirect_nofallback)
|
||||||
{
|
{
|
||||||
http::send_redirect(avatar);
|
http::send_redirect(avatar);
|
||||||
return 0;
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
cout << "Status: 404 Not Found\n\n";
|
cout << "Status: 501 Not Implemented\n\n";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue