Merge branch 'PHP-5.6'

Conflicts:
	sapi/cgi/cgi_main.c

diff --cc sapi/cgi/cgi_main.c
index 8f976a8b93ea724bf08a9fd93758f34803934a4b,de1be31c416393fac4f4d61d450aa23d863cb593..4259ef155437a1393e5a9c3c7bd7e86a7296f0c8
--- 1/sapi/cgi/cgi_main.c
--- 2/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);
                }

diff --cc sapi/cgi/fastcgi.c
Simple merge

diff --cc sapi/fpm/fpm/fastcgi.c
Simple merge

diff --cc sapi/fpm/fpm/fpm_main.c
Simple merge