diff options
| author | Xinchen Hui <laruence@php.net> | 2015-01-27 22:25:45 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2015-01-27 22:25:45 +0800 |
| commit | b881de9937d7433533554603826aa4b14e08d47c (patch) | |
| tree | 0ab6c23b29b2d6f7374bed0665366e430f7314ba | |
| parent | 92d56b0af6e000d477a020fdcb07ddb5e98713b1 (diff) | |
| parent | 4c5995b1729b100b00707ddf32d072355dcc3ae8 (diff) | |
| download | php-git-b881de9937d7433533554603826aa4b14e08d47c.tar.gz | |
Merge branch 'PHP-5.5' into 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 b176516957..c217d7af44 100644 --- a/sapi/fpm/fpm/fpm_main.c +++ b/sapi/fpm/fpm/fpm_main.c @@ -673,7 +673,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")); |