From: Jérôme Loyet <fat@php.net>
Date: Sat, 19 Jun 2010 16:31:19 +0000 (+0000)
Subject: - Fixed bug #52086 (No new line at the end of a included file crahes the PHP FPM... 
X-Git-Tag: php-5.4.0alpha1~191^2~1266
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=84d268f63b80cf0dbfebfbec263e84ecc20889cb;p=php

- Fixed bug #52086 (No new line at the end of a included file crahes the PHP FPM daemon)
---

diff --git a/sapi/fpm/fpm/fpm_conf.c b/sapi/fpm/fpm/fpm_conf.c
index e2c0e30a13..711624f600 100644
--- a/sapi/fpm/fpm/fpm_conf.c
+++ b/sapi/fpm/fpm/fpm_conf.c
@@ -950,9 +950,7 @@ int fpm_conf_load_ini_file(char *filename TSRMLS_DC) /* {{{ */
 		for (n=0; n<1024 && (nb_read = read(fd, &c, sizeof(char))) == sizeof(char) && c != '\n'; n++) {
 			buf[n] = c;
 		}
-		if (c == '\n') {
-			buf[n++] = c;
-		}
+		buf[n++] = '\n';
 		ini_lineno++;
 		ini_filename = filename;
 		tmp = zend_parse_ini_string(buf, 1, ZEND_INI_SCANNER_RAW, (zend_ini_parser_cb_t)fpm_conf_ini_parser, &error TSRMLS_CC);
@@ -972,7 +970,7 @@ int fpm_conf_load_ini_file(char *filename TSRMLS_DC) /* {{{ */
 				free(tmp);
 				ini_recursion--;
 				close(fd);
-				ret = -1;
+				return -1;
 			}
 			free(tmp);
 		}