diff options
| author | Xinchen Hui <laruence@php.net> | 2015-01-27 22:25:55 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2015-01-27 22:25:55 +0800 |
| commit | 95142d901568963b3f9d0cf0d9782021bd83f35f (patch) | |
| tree | 5c63adbfecf6c566b423a24953f2bcb552212f13 | |
| parent | 737b6f69e366dcc386f66f9626d2583e809e2bc6 (diff) | |
| parent | b881de9937d7433533554603826aa4b14e08d47c (diff) | |
| download | php-git-95142d901568963b3f9d0cf0d9782021bd83f35f.tar.gz | |
Merge branch 'PHP-5.6'
| -rw-r--r-- | sapi/fpm/fpm/fpm_main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sapi/fpm/fpm/fpm_main.c b/sapi/fpm/fpm/fpm_main.c index cf1076ed59..c4ebc8bd3b 100644 --- a/sapi/fpm/fpm/fpm_main.c +++ b/sapi/fpm/fpm/fpm_main.c @@ -614,7 +614,7 @@ void sapi_cgi_log_fastcgi(int level, char *message, size_t len) * - the message is not empty */ if (CGIG(fcgi_logging) && request && message && len > 0) { - int ret; + ssize_t ret; char *buf = malloc(len + 2); memcpy(buf, message, len); memcpy(buf + len, "\n", sizeof("\n")); |