]> git.pld-linux.org Git - packages/php.git/commitdiff
Drop fcgi-error_log-no-newlines.patch
authorElan Ruusamäe <glen@pld-linux.org>
Tue, 29 Dec 2020 11:35:47 +0000 (13:35 +0200)
committerElan Ruusamäe <glen@pld-linux.org>
Tue, 29 Dec 2020 11:38:17 +0000 (13:38 +0200)
It's need to have newlines for fcgi imessages, or php-fpm all messages
are shown on single line on single request

refs:
- https://redmine.lighttpd.net/issues/998
6dfef97671da10588cbc7c696875b2c22ad9d5e7

php-fcgi-error_log-no-newlines.patch [deleted file]
php.spec

diff --git a/php-fcgi-error_log-no-newlines.patch b/php-fcgi-error_log-no-newlines.patch
deleted file mode 100644 (file)
index 83c4509..0000000
+++ /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();
-                       }
index 0d62e8e8bc8d3f285459dc680f18e26efd278207..ffe54d4f6fdc3fd1110b490bc1403109a51da3b3 100644 (file)
--- a/php.spec
+++ b/php.spec
@@ -157,7 +157,7 @@ Summary(ru.UTF-8):  PHP Версии 7 - язык препроцессирова
 Summary(uk.UTF-8):     PHP Версії 7 - мова препроцесування HTML-файлів, виконувана на сервері
 Name:          %{orgname}%{php_suffix}
 Version:       7.3.24
-Release:       1
+Release:       2
 Epoch:         4
 # All files licensed under PHP version 3.01, except
 # Zend is licensed under Zend
@@ -200,7 +200,6 @@ Patch25:    %{orgname}-stupidapache_version.patch
 Patch26:       %{orgname}-pear.patch
 Patch27:       %{orgname}-config-dir.patch
 Patch29:       %{orgname}-fcgi-graceful.patch
-Patch31:       %{orgname}-fcgi-error_log-no-newlines.patch
 Patch34:       %{orgname}-libtool.patch
 Patch39:       %{orgname}-use-prog_sendmail.patch
 Patch41:       %{orgname}-fpm-config.patch
@@ -2000,7 +1999,6 @@ cp -p php.ini-production php.ini
 %patch26 -p1
 %patch27 -p1
 %patch29 -p1
-%patch31 -p1
 %if "%{pld_release}" != "ac"
 %patch34 -p1
 %endif
This page took 1.334484 seconds and 4 git commands to generate.