com php-src: Merge branch 'PHP-5.6': sapi/cgi/cgi_main.c sapi/cgi/fastcgi.c sapi/fpm/fpm/fastcgi.c sapi/fpm/fpm/ fpm_main.c

Commit: 9fdf62d64aa08d0c62833ee34e54056baffc2730 Author: Xinchen Hui <laruence@php.net> Tue, 27 Jan 2015 22:15:12 +0800 Parents: 68f5eb7e71ad3293f11c96ee6d0684466e10a3a7 4f187dd44fb4d2387f2437bfe3b9596882185b27 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=9fdf62d64aa08d0c62833ee34e54056baffc2730 Log: Merge branch 'PHP-5.6' Conflicts: sapi/cgi/cgi_main.c Changed paths: MM sapi/cgi/cgi_main.c MM sapi/cgi/fastcgi.c MM sapi/fpm/fpm/fastcgi.c MM sapi/fpm/fpm/fpm_main.c Diff: diff --cc sapi/cgi/cgi_main.c index 8f976a8,de1be31..4259ef1 --- a/sapi/cgi/cgi_main.c +++ b/sapi/cgi/cgi_main.c @@@ -699,13 -733,16 +699,16 @@@ static void sapi_cgi_log_message(char * request = (fcgi_request*) SG(server_context); if (request) { - int len = (int)strlen(message); - int ret, len = strlen(message); ++ int ret, len = (int)strlen(message); char *buf = malloc(len+2); memcpy(buf, message, len); memcpy(buf + len, "\n", sizeof("\n")); - fcgi_write(request, FCGI_STDERR, buf, (int)(len+1)); - ret = fcgi_write(request, FCGI_STDERR, buf, len + 1); ++ ret = fcgi_write(request, FCGI_STDERR, buf, (int)(len + 1)); free(buf); + if (ret < 0) { + php_handle_aborted_connection(); + } } else { fprintf(stderr, "%s\n", message); }