lorenz.stechauner/sesimos
1
1
Fork 0
Code Issues Pull Requests Projects Releases Activity

fixed error status codes

Browse Source
This commit is contained in:
Lorenz Stechauner
2021-08-03 23:09:57 +02:00
parent 4994b4375b
commit aebc731c4e
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/client.c
View File

@ -379,7 +379,7 @@ int client_request_handler(sock *client, unsigned long client_num, unsigned int
res.status = http_get_status(200); res.status = http_get_status(200);
if (fastcgi_init(&php_fpm, client_num, req_num, client, &req, &uri) != 0) { if (fastcgi_init(&php_fpm, client_num, req_num, client, &req, &uri) != 0) {
res.status = http_get_status(502); res.status = http_get_status(503);
sprintf(err_msg, "Unable to communicate with PHP-FPM."); sprintf(err_msg, "Unable to communicate with PHP-FPM.");
goto respond; goto respond;
} }

12
src/lib/rev_proxy.c
View File

@ -186,7 +186,7 @@ int rev_proxy_init(http_req *req, http_res *res, host_config *conf, sock *client
goto rev_proxy_timeout_err; goto rev_proxy_timeout_err;
if (setsockopt(client->socket, SOL_SOCKET, SO_SNDTIMEO, &server_timeout, sizeof(server_timeout)) < 0) { if (setsockopt(client->socket, SOL_SOCKET, SO_SNDTIMEO, &server_timeout, sizeof(server_timeout)) < 0) {
rev_proxy_timeout_err: rev_proxy_timeout_err:
res->status = http_get_status(502); res->status = http_get_status(500);
print(ERR_STR "Unable to set timeout for socket: %s" CLR_STR, strerror(errno)); print(ERR_STR "Unable to set timeout for socket: %s" CLR_STR, strerror(errno));
sprintf(err_msg, "Unable to set timeout for socket: %s", strerror(errno)); sprintf(err_msg, "Unable to set timeout for socket: %s", strerror(errno));
goto proxy_err; goto proxy_err;
@ -194,7 +194,7 @@ int rev_proxy_init(http_req *req, http_res *res, host_config *conf, sock *client
struct hostent *host_ent = gethostbyname(conf->rev_proxy.hostname); struct hostent *host_ent = gethostbyname(conf->rev_proxy.hostname);
if (host_ent == NULL) { if (host_ent == NULL) {
res->status = http_get_status(502); res->status = http_get_status(503);
print(ERR_STR "Unable to connect to server: Name or service not known" CLR_STR); print(ERR_STR "Unable to connect to server: Name or service not known" CLR_STR);
sprintf(err_msg, "Unable to connect to server: Name or service not known."); sprintf(err_msg, "Unable to connect to server: Name or service not known.");
goto proxy_err; goto proxy_err;
@ -210,7 +210,13 @@ int rev_proxy_init(http_req *req, http_res *res, host_config *conf, sock *client
} }
if (connect(rev_proxy.socket, (struct sockaddr *) &address, sizeof(address)) < 0) { if (connect(rev_proxy.socket, (struct sockaddr *) &address, sizeof(address)) < 0) {
res->status = http_get_status(502); if (errno == ETIMEDOUT) {
res->status = http_get_status(504);
} else if (errno == ECONNREFUSED) {
res->status = http_get_status(503);
} else {
res->status = http_get_status(500);
}
print(ERR_STR "Unable to connect to server: %s" CLR_STR, strerror(errno)); print(ERR_STR "Unable to connect to server: %s" CLR_STR, strerror(errno));
sprintf(err_msg, "Unable to connect to server: %s.", strerror(errno)); sprintf(err_msg, "Unable to connect to server: %s.", strerror(errno));
goto proxy_err; goto proxy_err;