diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2018-10-08 12:32:21 +0200 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2018-10-08 12:32:52 +0200 |
| commit | 6178786233cef6bb984ad3fc7bd196aedf5f7e61 (patch) | |
| tree | bc5592a99960573b38f0cb2ebb48f25c8108e0e8 /sapi/cgi/cgi_main.c | |
| parent | e68f60b087b49390b477844a3c5783849ba7d8c4 (diff) | |
| parent | 879c937a272328d9d333a4188acc98b53f45fcb1 (diff) | |
| download | php-git-6178786233cef6bb984ad3fc7bd196aedf5f7e61.tar.gz | |
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix #76954: apache_response_headers removes last character from header name
Diffstat (limited to 'sapi/cgi/cgi_main.c')
| -rw-r--r-- | sapi/cgi/cgi_main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sapi/cgi/cgi_main.c b/sapi/cgi/cgi_main.c index 2174729eee..336bee186c 100644 --- a/sapi/cgi/cgi_main.c +++ b/sapi/cgi/cgi_main.c @@ -1689,9 +1689,9 @@ static void add_response_header(sapi_header_struct *h, zval *return_value) /* {{ len = p - h->header; } if (len > 0) { - do { + while (len != 0 && (h->header[len-1] == ' ' || h->header[len-1] == '\t')) { len--; - } while (len != 0 && (h->header[len-1] == ' ' || h->header[len-1] == '\t')); + } if (len) { s = do_alloca(len + 1, use_heap); memcpy(s, h->header, len); |