[packages/php/PHP_7_4] Drop fcgi-error_log-no-newlines.patch

glen glen at pld-linux.org
Thu Feb 4 09:38:17 CET 2021


commit 2c143cf48cd58c2d79dac4df697cfb207117b4ee
Author: Elan Ruusamäe <glen at pld-linux.org>
Date:   Tue Dec 29 13:35:47 2020 +0200

    Drop fcgi-error_log-no-newlines.patch
    
    It's needed to have newlines for fcgi messages,
    or with php-fpm messages from same request are shown on single line.
    
    refs:
    - https://redmine.lighttpd.net/issues/998
    - 6dfef97671da10588cbc7c696875b2c22ad9d5e7
    - 1961f48f01e54fa06fdb02f661db0c05d11ff4e4

 php-fcgi-error_log-no-newlines.patch | 16 ----------------
 php.spec                             |  2 --
 2 files changed, 18 deletions(-)
---
diff --git a/php.spec b/php.spec
index c90ac7c..ec7fb22 100644
--- a/php.spec
+++ b/php.spec
@@ -189,7 +189,6 @@ Patch24:	%{orgname}-zlib-for-getimagesize.patch
 Patch25:	%{orgname}-stupidapache_version.patch
 Patch27:	%{orgname}-config-dir.patch
 Patch29:	%{orgname}-fcgi-graceful.patch
-Patch31:	%{orgname}-fcgi-error_log-no-newlines.patch
 Patch39:	%{orgname}-use-prog_sendmail.patch
 Patch41:	%{orgname}-fpm-config.patch
 Patch43:	%{orgname}-silent-session-cleanup.patch
@@ -1890,7 +1889,6 @@ cp -p php.ini-production php.ini
 %patch25 -p1
 %patch27 -p1
 %patch29 -p1
-%patch31 -p1
 %patch39 -p1
 %patch41 -p1
 %patch43 -p1
diff --git a/php-fcgi-error_log-no-newlines.patch b/php-fcgi-error_log-no-newlines.patch
deleted file mode 100644
index 83c4509..0000000
--- a/php-fcgi-error_log-no-newlines.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- 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, (int)(len + 1));
--			free(buf);
-+			ret = fcgi_write(request, FCGI_STDERR, message, len);
- 			if (ret < 0) {
- 				php_handle_aborted_connection();
- 			}
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/php.git/commitdiff/34c18912ac23138652ce38e57418aee0d65c9837



More information about the pld-cvs-commit mailing list