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

diff --git a/php-fcgi-error_log-no-newlines.patch b/php-fcgi-error_log-no-newlines.patch
index 321452f..83c4509 100644
--- a/php-fcgi-error_log-no-newlines.patch
+++ b/php-fcgi-error_log-no-newlines.patch
@@ -1,14 +1,16 @@
---- 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);
+--- php-7.0/sapi/cgi/cgi_main.c~	2015-05-21 23:12:23.000000000 +0300
++++ php-7.0/sapi/cgi/cgi_main.c	2015-05-21 23:13:24.947976867 +0300
+@@ -701,12 +701,8 @@
+ 		request = (fcgi_request*) SG(server_context);
+ 		if (request) {
+ 			int ret, len = (int)strlen(message);
+-			char *buf = malloc(len+2);
  
 -			memcpy(buf, message, len);
 -			memcpy(buf + len, "\n", sizeof("\n"));
--			ret = fcgi_write(request, FCGI_STDERR, buf, len + 1);
+-			ret = fcgi_write(request, FCGI_STDERR, buf, (int)(len + 1));
 -			free(buf);
-+			fcgi_write(request, FCGI_STDERR, message, len);
++			ret = fcgi_write(request, FCGI_STDERR, message, len);
  			if (ret < 0) {
  				php_handle_aborted_connection();
  			}