com php-src: fcgi_write in fpm returns ssizt_t , but it returns int in cgi: sapi/fpm/fpm/fpm _main.c
| From: | Xinchen Hui | Date: | Tue, 27 Jan 2015 14:25:38 +0000 |
| Subject: | com php-src: fcgi_write in fpm returns ssizt_t , but it returns int in cgi: sapi/fpm/fpm/fpm _main.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-84400@lists.php.net to get a copy of this message | ||
Commit: 4c5995b1729b100b00707ddf32d072355dcc3ae8
Author: Xinchen Hui <laruence@php.net> Tue, 27 Jan 2015 22:25:38 +0800
Parents: c3ff9aa17df760df9a015e7fdfb5d941f0c8e07b
Branches: PHP-5.5 PHP-5.6 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=4c5995b1729b100b00707ddf32d072355dcc3ae8
Log:
fcgi_write in fpm returns ssizt_t, but it returns int in cgi
Changed paths:
M sapi/fpm/fpm/fpm_main.c
Diff:
diff --git a/sapi/fpm/fpm/fpm_main.c b/sapi/fpm/fpm/fpm_main.c
index d3912de..3256c70 100644
--- a/sapi/fpm/fpm/fpm_main.c
+++ b/sapi/fpm/fpm/fpm_main.c
@@ -669,7 +669,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"));