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

diff --git a/sapi/fpm/fpm/fpm_conf.c b/sapi/fpm/fpm/fpm_conf.c
index e2c0e30a134acc62b9020b3651f3339331937302..711624f600844eda06bce789bd736812507fb671 100644 (file)
--- 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);
                }