From 8e82bda330264d290a5e55580eea2eb875d4cb69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gustavo=20Andr=C3=A9=20dos=20Santos=20Lopes?= Date: Fri, 3 Feb 2012 08:48:34 +0000 Subject: - Merging r323033 into 5.3 (see bug #60227). --- main/SAPI.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'main') diff --git a/main/SAPI.c b/main/SAPI.c index 154ab6bf29..693cad3429 100644 --- a/main/SAPI.c +++ b/main/SAPI.c @@ -591,10 +591,11 @@ SAPI_API int sapi_header_op(sapi_header_op_enum op, void *arg TSRMLS_DC) } } else { /* new line safety check */ - char *s = header_line, *e = header_line + header_line_len, *p; - while (s < e && ((p = memchr(s, '\n', (e - s))) || (p = memchr(s, '\r', (e - s))))) { - if (*(p + 1) == ' ' || *(p + 1) == '\t') { - s = p + 1; + char *s = header_line; + while (s = strpbrk(s, "\n\r")) { + if (s[1] == ' ' || s[1] == '\t') { + /* RFC 2616 allows new lines if followed by SP or HT */ + s++; continue; } efree(header_line); -- cgit v1.2.1