Merge branch 'PHP-5.6'

* PHP-5.6:
  fixed the cast and incompatible pointer warning

Conflicts:
	sapi/cgi/fastcgi.c
This commit is contained in:
Anatol Belski 2014-09-12 14:37:54 +02:00
commit 69d6e093e9

View File

@ -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