technocloud-public/nginx-unit
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

PHP: improved response status code handling.

Browse Source 
There's no reason to parse "http_status_line"; the PHP interpreter already
does this.  If the line contains a valid status code, it's assigned to
"http_response_code".

This also fixes invalid status line handling, where the nxt_int_parse()
function returned -1; it was cast to unsigned, yielding response code 65535.
This commit is contained in:
Valentin Bartenev
2019-07-05 18:42:30 +03:00
parent e1de5bcfab
commit 924165c90b
3 changed files with 46 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/nxt_php_sapi.c
View File

@@ -730,7 +730,7 @@ static int
nxt_php_send_headers(sapi_headers_struct *sapi_headers TSRMLS_DC)
{
int rc, fields_count;
char *colon, *status_line, *value;
char *colon, *value;
uint16_t status;
uint32_t resp_size;
nxt_php_run_ctx_t *ctx;
@@ -762,17 +762,7 @@ nxt_php_send_headers(sapi_headers_struct *sapi_headers TSRMLS_DC)
resp_size += h->header_len;
}
if (SG(sapi_headers).http_status_line) {
status_line = SG(sapi_headers).http_status_line;
status = nxt_int_parse((u_char *) status_line + 9, 3);
} else if (SG(sapi_headers).http_response_code) {
status = SG(sapi_headers).http_response_code;
} else {
status = 200;
}
status = SG(sapi_headers).http_response_code;
rc = nxt_unit_response_init(req, status, fields_count, resp_size);
if (nxt_slow_path(rc != NXT_UNIT_OK)) {