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

--- 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();
 			}
Commit	Line	Data
f4ee12ea ER	1	--- php-7.0/sapi/cgi/cgi_main.c~ 2015-05-21 23:12:23.000000000 +0300
	2	+++ php-7.0/sapi/cgi/cgi_main.c 2015-05-21 23:13:24.947976867 +0300
	3	@@ -701,12 +701,8 @@
c0240cb1	4	request = (fcgi_request*) SG(server_context);
55766199	5	if (request) {
f4ee12ea	6	int ret, len = (int)strlen(message);
c0240cb1	7	- char *buf = malloc(len+2);
55766199	8
c0240cb1	9	- memcpy(buf, message, len);
c0240cb1	10	- memcpy(buf + len, "\n", sizeof("\n"));
f4ee12ea	11	- ret = fcgi_write(request, FCGI_STDERR, buf, (int)(len + 1));
c0240cb1	12	- free(buf);
55766199 ER	13	+ ret = fcgi_write(request, FCGI_STDERR, message, len);
	14	if (ret < 0) {
	15	php_handle_aborted_connection();
	16	}