diff options
| author | Anatol Belski <ab@php.net> | 2014-09-12 14:37:54 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-09-12 14:37:54 +0200 |
| commit | 69d6e093e91f5c166d5db983fe4efba8fe864f03 (patch) | |
| tree | 4265a3c6bc17a3c5c219dc0ddd4732b17e42515c /sapi | |
| parent | 0292c34b05663be32e623d1e1b65834186d481ee (diff) | |
| parent | bcdbd471179eccd924ef39dd43a7f84ee054c742 (diff) | |
| download | php-git-69d6e093e91f5c166d5db983fe4efba8fe864f03.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
fixed the cast and incompatible pointer warning
Conflicts:
sapi/cgi/fastcgi.c
Diffstat (limited to 'sapi')
| -rw-r--r-- | sapi/cgi/fastcgi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sapi/cgi/fastcgi.c b/sapi/cgi/fastcgi.c index 115c4289c0..c499fa2106 100644 --- a/sapi/cgi/fastcgi.c +++ b/sapi/cgi/fastcgi.c @@ -1111,7 +1111,7 @@ static inline void fcgi_close(fcgi_request *req, int force, int destroy) shutdown(req->fd, 1); /* read the last FCGI_STDIN header (it may be omitted) */ - recv(req->fd, (char *)&buf, sizeof(buf), 0); + recv(req->fd, (char *)(&buf), sizeof(buf), 0); } closesocket(req->fd); } @@ -1121,7 +1121,7 @@ static inline void fcgi_close(fcgi_request *req, int force, int destroy) shutdown(req->fd, 1); /* read the last FCGI_STDIN header (it may be omitted) */ - recv(req->fd, &buf, sizeof(buf), 0); + recv(req->fd, (char *)(&buf), sizeof(buf), 0); } close(req->fd); #endif |