FastCGI stdin implementation

This commit is contained in:
2020-12-27 23:57:14 +01:00
parent b7f574e2ed
commit c708633197
4 changed files with 62 additions and 5 deletions

View File

@ -238,10 +238,23 @@ int client_request_handler(sock *client, unsigned long client_num, unsigned int
} }
if (strncmp(req.method, "POST", 4) == 0 || strncmp(req.method, "PUT", 3) == 0) { if (strncmp(req.method, "POST", 4) == 0 || strncmp(req.method, "PUT", 3) == 0) {
// TODO send content to fastcgi char *client_content_length = http_get_header_field(&req.hdr, "Content-Length");
} else { unsigned long client_content_len = 0;
fastcgi_close_stdin(&php_fpm); if (client_content_length == NULL) {
goto fastcgi_end;
}
client_content_len = strtoul(client_content_length, NULL, 10);
ret = fastcgi_receive(&php_fpm, client, client_content_len);
if (ret != 0) {
if (ret < 0) {
goto abort;
}
res.status = http_get_status(502);
goto respond;
}
} }
fastcgi_end:
fastcgi_close_stdin(&php_fpm);
char *accept_encoding = http_get_header_field(&req.hdr, "Accept-Encoding"); char *accept_encoding = http_get_header_field(&req.hdr, "Accept-Encoding");
if (accept_encoding != NULL && strstr(accept_encoding, "deflate") != NULL) { if (accept_encoding != NULL && strstr(accept_encoding, "deflate") != NULL) {
@ -350,6 +363,7 @@ int client_request_handler(sock *client, unsigned long client_num, unsigned int
uri_free(&uri); uri_free(&uri);
abort: abort:
if (php_fpm.socket != 0) close(php_fpm.socket);
http_free_req(&req); http_free_req(&req);
http_free_res(&res); http_free_res(&res);
return !client_keep_alive; return !client_keep_alive;

View File

@ -476,3 +476,44 @@ int fastcgi_send(fastcgi_conn *conn, sock *client, int flags) {
free(content); free(content);
} }
} }
int fastcgi_receive(fastcgi_conn *conn, sock *client, unsigned long len) {
unsigned long rcv_len = 0;
char *buf[16384];
int ret;
FCGI_Header header = {
.version = FCGI_VERSION_1,
.type = FCGI_STDIN,
.requestIdB1 = conn->req_id >> 8,
.requestIdB0 = conn->req_id & 0xFF,
.contentLengthB1 = 0,
.contentLengthB0 = 0,
.paddingLength = 0,
.reserved = 0
};
while (rcv_len < len) {
if (client->enc) {
ret = SSL_read(client->ssl, buf, sizeof(buf));
if (ret <= 0) {
print(ERR_STR "Unable to receive: %s" CLR_STR, ssl_get_error(client->ssl, rcv_len));
return -1;
}
} else {
ret = recv(client->socket, buf, sizeof(buf), 0);
if (ret <= 0) {
print(ERR_STR "Unable to receive: %s" CLR_STR, strerror(errno));
return -1;
}
}
rcv_len += ret;
header.contentLengthB1 = (ret >> 8) & 0xFF;
header.contentLengthB0 = ret & 0xFF;
if (send(conn->socket, &header, sizeof(header), 0) != sizeof(header)) goto err;
if (send(conn->socket, buf, ret, 0) != ret) {
err:
fprintf(stderr, ERR_STR "Unable to send to PHP-FPM: %s" CLR_STR "\n", strerror(errno));
return -2;
}
}
return 0;
}

View File

@ -30,6 +30,8 @@ int fastcgi_header(fastcgi_conn *conn, http_res *res, char *err_msg);
int fastcgi_send(fastcgi_conn *conn, sock *client, int flags); int fastcgi_send(fastcgi_conn *conn, sock *client, int flags);
int fastcgi_receive(fastcgi_conn *conn, sock *client, unsigned long len);
/* /*
* Listening socket file number * Listening socket file number

View File

@ -54,13 +54,13 @@ int http_receive_request(sock *client, http_req *req) {
while (1) { while (1) {
if (client->enc) { if (client->enc) {
rcv_len = SSL_read(client->ssl, buf, CLIENT_MAX_HEADER_SIZE); rcv_len = SSL_read(client->ssl, buf, CLIENT_MAX_HEADER_SIZE);
if (rcv_len < 0) { if (rcv_len <= 0) {
print(ERR_STR "Unable to receive: %s" CLR_STR, ssl_get_error(client->ssl, rcv_len)); print(ERR_STR "Unable to receive: %s" CLR_STR, ssl_get_error(client->ssl, rcv_len));
return -1; return -1;
} }
} else { } else {
rcv_len = recv(client->socket, buf, CLIENT_MAX_HEADER_SIZE, 0); rcv_len = recv(client->socket, buf, CLIENT_MAX_HEADER_SIZE, 0);
if (rcv_len < 0) { if (rcv_len <= 0) {
print(ERR_STR "Unable to receive: %s" CLR_STR, strerror(errno)); print(ERR_STR "Unable to receive: %s" CLR_STR, strerror(errno));
return -1; return -1;
} }