X-Git-Url: https://git.tld-linux.org/?p=packages%2Fphp.git;a=blobdiff_plain;f=php-fcgi-error_log-no-newlines.patch;h=321452f97514890793464c640e7697a9b99d0646;hp=e35648e84bfea474782e67f04731ac581a0439df;hb=a84fb7d2e9b9cdae9cb2d9e129019a05cb413adc;hpb=6e57d32938feb4423b061a44857002fcac0f18b3

diff --git a/php-fcgi-error_log-no-newlines.patch b/php-fcgi-error_log-no-newlines.patch
index e35648e..321452f 100644
--- a/php-fcgi-error_log-no-newlines.patch
+++ b/php-fcgi-error_log-no-newlines.patch
@@ -1,16 +1,14 @@
---- ./sapi/cgi/cgi_main.c~	2007-08-09 02:51:57.000000000 +0300
-+++ ./sapi/cgi/cgi_main.c	2007-09-05 20:54:19.390089070 +0300
-@@ -558,12 +558,7 @@
- 		request = (fcgi_request*) SG(server_context);
- 		if (request) {			
- 			int len = strlen(message);
--			char *buf = malloc(len+2);
--
+--- php-5.6.6/sapi/cgi/cgi_main.c.orig	2015-02-24 12:35:21.097436930 +0100
++++ php-5.6.6/sapi/cgi/cgi_main.c	2015-02-24 12:38:49.851431030 +0100
+@@ -739,10 +739,7 @@
+ 			int ret, len = strlen(message);
+ 			char *buf = malloc(len+2);
+ 
 -			memcpy(buf, message, len);
 -			memcpy(buf + len, "\n", sizeof("\n"));
--			fcgi_write(request, FCGI_STDERR, buf, len+1);
+-			ret = fcgi_write(request, FCGI_STDERR, buf, len + 1);
 -			free(buf);
 +			fcgi_write(request, FCGI_STDERR, message, len);
- 		} else {
- 			fprintf(stderr, "%s\n", message);
- 		}
+ 			if (ret < 0) {
+ 				php_handle_aborted_connection();
+ 			}