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

Remove parameter client_num from fastcgi_init()

Browse Source
This commit is contained in:
Lorenz Stechauner
2023-01-02 20:11:28 +01:00
parent fc9538fa6d
commit 24cb993cb8
3 changed files with 6 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/lib/fastcgi.c
View File

@ -53,15 +53,9 @@ char *fastcgi_add_param(char *buf, const char *key, const char *value) {
return ptr; return ptr;
} }
int fastcgi_init(fastcgi_cnx_t *conn, int mode, unsigned int client_num, unsigned int req_num, const sock *client, const http_req *req, const http_uri *uri) { int fastcgi_init(fastcgi_cnx_t *conn, int mode, unsigned int req_num, const sock *client, const http_req *req, const http_uri *uri) {
unsigned short req_id = (client_num & 0xFFF) << 4;
if (client_num == 0) {
req_id |= (req_num + 1) & 0xF;
} else {
req_id |= req_num & 0xF;
}
conn->mode = mode; conn->mode = mode;
conn->req_id = req_id; conn->req_id = (req_num + 1) & 0xFFFF;
conn->out_buf = NULL; conn->out_buf = NULL;
conn->out_off = 0; conn->out_off = 0;
conn->webroot = uri->webroot; conn->webroot = uri->webroot;
@ -87,8 +81,8 @@ int fastcgi_init(fastcgi_cnx_t *conn, int mode, unsigned int client_num, unsigne
FCGI_Header header = { FCGI_Header header = {
.version = FCGI_VERSION_1, .version = FCGI_VERSION_1,
.requestIdB1 = req_id >> 8, .requestIdB1 = conn->req_id >> 8,
.requestIdB0 = req_id & 0xFF, .requestIdB0 = conn->req_id & 0xFF,
.paddingLength = 0, .paddingLength = 0,
.reserved = 0 .reserved = 0
}; };

3
src/lib/fastcgi.h
View File

@ -42,8 +42,7 @@ typedef struct {
char *fastcgi_add_param(char *buf, const char *key, const char *value); char *fastcgi_add_param(char *buf, const char *key, const char *value);
int fastcgi_init(fastcgi_cnx_t *conn, int mode, unsigned int client_num, unsigned int req_num, const sock *client, int fastcgi_init(fastcgi_cnx_t *conn, int mode, unsigned int req_num, const sock *client, const http_req *req, const http_uri *uri);
const http_req *req, const http_uri *uri);
int fastcgi_close_stdin(fastcgi_cnx_t *conn); int fastcgi_close_stdin(fastcgi_cnx_t *conn);

2
src/worker/fastcgi_handler.c
View File

@ -62,7 +62,7 @@ static int fastcgi_handler_1(client_ctx_t *ctx, fastcgi_cnx_t *fcgi_cnx) {
http_add_header_field(&res->hdr, "Last-Modified", last_modified); http_add_header_field(&res->hdr, "Last-Modified", last_modified);
res->status = http_get_status(200); res->status = http_get_status(200);
if (fastcgi_init(fcgi_cnx, mode, 0 /* TODO */, ctx->req_num, client, req, uri) != 0) { if (fastcgi_init(fcgi_cnx, mode, ctx->req_num, client, req, uri) != 0) {
res->status = http_get_status(503); res->status = http_get_status(503);
sprintf(err_msg, "Unable to communicate with FastCGI socket."); sprintf(err_msg, "Unable to communicate with FastCGI socket.");
return 2; return 2;