Merge branch 'PHP-8.0'

cmb69 · cmb69 · commit 8667dc92aae7 · 2021-04-20T15:45:26.000+02:00
* PHP-8.0:
  Fix misleading error message
diff --git a/sapi/fpm/fpm/fpm_unix.c b/sapi/fpm/fpm/fpm_unix.c
@@ -458,7 +458,7 @@ int fpm_unix_init_main() /* {{{ */
 		r.rlim_max = r.rlim_cur = (rlim_t) fpm_global_config.rlimit_files;
 
 		if (0 > setrlimit(RLIMIT_NOFILE, &r)) {
-			zlog(ZLOG_SYSERROR, "failed to set rlimit_core for this pool. Please check your system limits or decrease rlimit_files. setrlimit(RLIMIT_NOFILE, %d)", fpm_global_config.rlimit_files);
+			zlog(ZLOG_SYSERROR, "failed to set rlimit_files for this pool. Please check your system limits or decrease rlimit_files. setrlimit(RLIMIT_NOFILE, %d)", fpm_global_config.rlimit_files);
 			return -1;
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -458,7 +458,7 @@ int fpm_unix_init_main() /* {{{ */`
`458`	`458`	`r.rlim_max = r.rlim_cur = (rlim_t) fpm_global_config.rlimit_files;`
`459`	`459`
`460`	`460`	`if (0 > setrlimit(RLIMIT_NOFILE, &r)) {`
`461`		`- zlog(ZLOG_SYSERROR, "failed to set rlimit_core for this pool. Please check your system limits or decrease rlimit_files. setrlimit(RLIMIT_NOFILE, %d)", fpm_global_config.rlimit_files);`
	`461`	`+ zlog(ZLOG_SYSERROR, "failed to set rlimit_files for this pool. Please check your system limits or decrease rlimit_files. setrlimit(RLIMIT_NOFILE, %d)", fpm_global_config.rlimit_files);`
`462`	`462`	`return -1;`
`463`	`463`	`}`
`464`	`464`	`}`