Merge branch 'PHP-8.0'

nikic · nikic · commit f06895488a5f · 2021-02-11T16:50:14.000+01:00
* PHP-8.0:
  Fixed bug #80718
diff --git a/ext/standard/dl.c b/ext/standard/dl.c
@@ -247,8 +247,9 @@ static void php_dl_error(const char *filename)
 
 PHPAPI void *php_load_shlib(const char *path, char **errp)
 {
-    php_dl_error(filename);
-    (*errp) = estrdup("No DL support");
+	php_dl_error(path);
+	(*errp) = estrdup("No DL support");
+	return NULL;
 }
 
 PHPAPI int php_load_extension(const char *filename, int type, int start_now)

Original file line number	Diff line number	Diff line change
`@@ -247,8 +247,9 @@ static void php_dl_error(const char *filename)`
`247`	`247`
`248`	`248`	`PHPAPI void php_load_shlib(const char path, char **errp)`
`249`	`249`	`{`
`250`		`- php_dl_error(filename);`
`251`		`- (*errp) = estrdup("No DL support");`
	`250`	`+ php_dl_error(path);`
	`251`	`+ (*errp) = estrdup("No DL support");`
	`252`	`+ return NULL;`
`252`	`253`	`}`
`253`	`254`
`254`	`255`	`PHPAPI int php_load_extension(const char *filename, int type, int start_now)`