diff options
| author | Anatol Belski <ab@php.net> | 2014-09-12 14:36:54 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-09-12 14:36:54 +0200 |
| commit | bcdbd471179eccd924ef39dd43a7f84ee054c742 (patch) | |
| tree | 3b70c8be90a38a9cfe126995a75971e1f09e3311 /sapi | |
| parent | 13280a9e36174c02aa923647fbf9a38a1a5182d3 (diff) | |
| parent | fdfc31a4f720ae21c214f40cf514ed1744081e51 (diff) | |
| download | php-git-bcdbd471179eccd924ef39dd43a7f84ee054c742.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
fixed the cast and incompatible pointer warning
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 8ddc2e4577..6133668306 100644 --- a/sapi/cgi/fastcgi.c +++ b/sapi/cgi/fastcgi.c @@ -1112,7 +1112,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); } closesocket(req->fd); } @@ -1122,7 +1122,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 |