diff options
| author | Stanislav Malyshev <stas@php.net> | 2015-02-01 00:36:53 -0800 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2015-02-01 00:36:53 -0800 |
| commit | c440043de55646567ffac2e0c8d3340ad8793268 (patch) | |
| tree | f19f2ba9c03ab5efea5cacdc073a66eb5ce29eba | |
| parent | 62d6f91b3ec694b699b8801171343ddb00b574e1 (diff) | |
| parent | 1106b10ae8729a23fbc99366dc12731a8140b775 (diff) | |
| download | php-git-c440043de55646567ffac2e0c8d3340ad8793268.tar.gz | |
Merge branch 'pull-request/884'
* pull-request/884:
Fix #66479: Wrong response to FCGI_GET_VALUES
| -rw-r--r-- | sapi/cgi/fastcgi.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sapi/cgi/fastcgi.c b/sapi/cgi/fastcgi.c index 1e0702b793..7d6fd649ea 100644 --- a/sapi/cgi/fastcgi.c +++ b/sapi/cgi/fastcgi.c @@ -1021,6 +1021,7 @@ static int fcgi_read_request(fcgi_request *req) q = req->env.list; while (q != NULL) { if ((value = zend_hash_str_find(&fcgi_mgmt_vars, q->var, q->var_len)) == NULL) { + q = q->list_next; continue; } zlen = (unsigned int)Z_STRLEN_P(value); @@ -1047,6 +1048,7 @@ static int fcgi_read_request(fcgi_request *req) p += q->var_len; memcpy(p, Z_STRVAL_P(value), zlen); p += zlen; + q = q->list_next; } len = (int)(p - buf - sizeof(fcgi_header)); len += fcgi_make_header((fcgi_header*)buf, FCGI_GET_VALUES_RESULT, 0, len); |