Merge branch 'main' into beta

symplely · Apr 13, 2023 · aa8f32b · aa8f32b
2 parents fbb8844 + ba28440
commit aa8f32b
Show file tree

Hide file tree

Showing 10 changed files with 2 additions and 29 deletions.
diff --git a/headers/ze81ts.h b/headers/ze81ts.h
@@ -2476,9 +2476,6 @@ extern zend_string *(*zend_resolve_path)(const char *filename, size_t filename_l
 extern int (*zend_post_startup_cb)(void);
 extern void (*zend_post_shutdown_cb)(void);
 
-/* Callback for loading of not preloaded part of the script */
-extern int (*zend_preload_autoload)(zend_string *filename);
-
 extern void (*zend_execute_ex)(zend_execute_data *execute_data);
 extern void (*zend_execute_internal)(zend_execute_data *execute_data, zval *return_value);
 

diff --git a/headers/ze82ts.h b/headers/ze82ts.h
@@ -2304,7 +2304,7 @@ void php_output_deactivate(void);
 /* MSHUTDOWN */
 void php_output_shutdown(void);
 
-zend_result php_module_startup(sapi_module_struct *sf, zend_module_entry *additional_module);num_additional_modules);
+zend_result php_module_startup(sapi_module_struct *sf, zend_module_entry *additional_module);
 void php_module_shutdown(void);
 int php_module_shutdown_wrapper(sapi_module_struct *sapi_globals);
 int zend_ini_global_shutdown(void);
@@ -2494,9 +2494,6 @@ extern zend_string *(*zend_resolve_path)(const char *filename, size_t filename_l
 extern int (*zend_post_startup_cb)(void);
 extern void (*zend_post_shutdown_cb)(void);
 
-/* Callback for loading of not preloaded part of the script */
-extern int (*zend_preload_autoload)(zend_string *filename);
-
 extern void (*zend_execute_ex)(zend_execute_data *execute_data);
 extern void (*zend_execute_internal)(zend_execute_data *execute_data, zval *return_value);
 

diff --git a/headers/ze83ts.h b/headers/ze83ts.h
@@ -2555,9 +2555,6 @@ extern zend_string *(*zend_resolve_path)(const char *filename, size_t filename_l
 extern int (*zend_post_startup_cb)(void);
 extern void (*zend_post_shutdown_cb)(void);
 
-/* Callback for loading of not preloaded part of the script */
-extern int (*zend_preload_autoload)(zend_string *filename);
-
 extern void (*zend_execute_ex)(zend_execute_data *execute_data);
 extern void (*zend_execute_internal)(zend_execute_data *execute_data, zval *return_value);
 

diff --git a/headers/ze8ts.h b/headers/ze8ts.h
@@ -2322,9 +2322,6 @@ extern zend_string *(*zend_resolve_path)(const char *filename, size_t filename_l
 extern int (*zend_post_startup_cb)(void);
 extern void (*zend_post_shutdown_cb)(void);
 
-/* Callback for loading of not preloaded part of the script */
-extern int (*zend_preload_autoload)(zend_string *filename);
-
 extern void (*zend_execute_ex)(zend_execute_data *execute_data);
 extern void (*zend_execute_internal)(zend_execute_data *execute_data, zval *return_value);
 

diff --git a/headers/zeWin7ts.h b/headers/zeWin7ts.h
@@ -2557,8 +2557,5 @@ extern zend_string *(*zend_resolve_path)(const char *filename, size_t filename_l
 extern int (*zend_post_startup_cb)(void);
 extern void (*zend_post_shutdown_cb)(void);
 
-/* Callback for loading of not preloaded part of the script */
-extern int (*zend_preload_autoload)(zend_string *filename);
-
 extern void (*zend_execute_ex)(zend_execute_data *execute_data);
 extern void (*zend_execute_internal)(zend_execute_data *execute_data, zval *return_value);
diff --git a/headers/zeWin81ts.h b/headers/zeWin81ts.h
@@ -2629,9 +2629,6 @@ extern zend_string *(*zend_resolve_path)(const char *filename, size_t filename_l
 extern int (*zend_post_startup_cb)(void);
 extern void (*zend_post_shutdown_cb)(void);
 
-/* Callback for loading of not preloaded part of the script */
-extern int (*zend_preload_autoload)(zend_string *filename);
-
 extern void (*zend_execute_ex)(zend_execute_data *execute_data);
 extern void (*zend_execute_internal)(zend_execute_data *execute_data, zval *return_value);
 

diff --git a/headers/zeWin82ts.h b/headers/zeWin82ts.h
@@ -2648,9 +2648,6 @@ extern zend_string *(*zend_resolve_path)(const char *filename, size_t filename_l
 extern int (*zend_post_startup_cb)(void);
 extern void (*zend_post_shutdown_cb)(void);
 
-/* Callback for loading of not preloaded part of the script */
-extern int (*zend_preload_autoload)(zend_string *filename);
-
 extern void (*zend_execute_ex)(zend_execute_data *execute_data);
 extern void (*zend_execute_internal)(zend_execute_data *execute_data, zval *return_value);
 

diff --git a/headers/zeWin83ts.h b/headers/zeWin83ts.h
@@ -2711,9 +2711,6 @@ extern zend_string *(*zend_resolve_path)(const char *filename, size_t filename_l
 extern int (*zend_post_startup_cb)(void);
 extern void (*zend_post_shutdown_cb)(void);
 
-/* Callback for loading of not preloaded part of the script */
-extern int (*zend_preload_autoload)(zend_string *filename);
-
 extern void (*zend_execute_ex)(zend_execute_data *execute_data);
 extern void (*zend_execute_internal)(zend_execute_data *execute_data, zval *return_value);
 

diff --git a/headers/zeWin8ts.h b/headers/zeWin8ts.h
@@ -2476,9 +2476,6 @@ extern zend_string *(*zend_resolve_path)(const char *filename, size_t filename_l
 extern int (*zend_post_startup_cb)(void);
 extern void (*zend_post_shutdown_cb)(void);
 
-/* Callback for loading of not preloaded part of the script */
-extern int (*zend_preload_autoload)(zend_string *filename);
-
 extern void (*zend_execute_ex)(zend_execute_data *execute_data);
 extern void (*zend_execute_internal)(zend_execute_data *execute_data, zval *return_value);
 

diff --git a/preload.php b/preload.php
@@ -786,7 +786,7 @@ function zend_preloader(): void
               $like = \trim((string) $os['ID_LIKE']);
               if ($like == 'debian')
                 $platform = '/lib/x86_64-linux-gnu/libpthread.so.0';
-              elseif ($like == 'redhat')
+              elseif ($like =='redhat' || $like === 'fedora')
                 $platform = '/usr/lib64/libpthread.so';
             }