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

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
--- 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();
-                       }

diff --git a/php.spec b/php.spec
index c90ac7cdf0039b7f444ca823d9e8374f81100bc1..ec7fb224014d30825b2724fef4560fbd7ca89edf 100644 (file)
--- 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