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

diff --git a/php-fcgi-error_log-no-newlines.patch b/php-fcgi-error_log-no-newlines.patch
index e35648e..83c4509 100644
--- a/php-fcgi-error_log-no-newlines.patch
+++ b/php-fcgi-error_log-no-newlines.patch
@@ -1,16 +1,16 @@
---- ./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 @@
+--- 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 len = strlen(message);
+ 		if (request) {
+ 			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, len+1);
+-			ret = fcgi_write(request, FCGI_STDERR, buf, (int)(len + 1));
 -			free(buf);
-+			fcgi_write(request, FCGI_STDERR, message, len);
- 		} else {
- 			fprintf(stderr, "%s\n", message);
- 		}
++			ret = fcgi_write(request, FCGI_STDERR, message, len);
+ 			if (ret < 0) {
+ 				php_handle_aborted_connection();
+ 			}