2017-02-28 12:29:04 +00:00
|
|
|
diff -up php-7.0.17RC1/sapi/litespeed/lsapilib.c.dlopen php-7.0.17RC1/sapi/litespeed/lsapilib.c
|
|
|
|
--- php-7.0.17RC1/sapi/litespeed/lsapilib.c.dlopen 2017-02-28 12:11:33.000000000 +0100
|
|
|
|
+++ php-7.0.17RC1/sapi/litespeed/lsapilib.c 2017-02-28 13:06:07.493838664 +0100
|
|
|
|
@@ -616,7 +616,7 @@ static int (*fp_lve_leave)(struct liblve
|
2016-06-27 13:05:34 +00:00
|
|
|
static int (*fp_lve_jail)( struct passwd *, char *) = NULL;
|
|
|
|
static int lsapi_load_lve_lib()
|
|
|
|
{
|
|
|
|
- s_liblve = dlopen("liblve.so.0", RTLD_LAZY);
|
|
|
|
+ s_liblve = dlopen("liblve.so.0", RTLD_NOW);
|
|
|
|
if (s_liblve)
|
|
|
|
{
|
|
|
|
fp_lve_is_available = dlsym(s_liblve, "lve_is_available");
|
2017-02-28 12:29:04 +00:00
|
|
|
diff -up php-7.0.17RC1/Zend/zend_portability.h.dlopen php-7.0.17RC1/Zend/zend_portability.h
|
|
|
|
--- php-7.0.17RC1/Zend/zend_portability.h.dlopen 2017-02-28 13:06:07.493838664 +0100
|
|
|
|
+++ php-7.0.17RC1/Zend/zend_portability.h 2017-02-28 13:07:10.626118397 +0100
|
|
|
|
@@ -146,11 +146,11 @@
|
2016-06-27 13:05:34 +00:00
|
|
|
# endif
|
|
|
|
|
|
|
|
# if defined(RTLD_GROUP) && defined(RTLD_WORLD) && defined(RTLD_PARENT)
|
|
|
|
-# define DL_LOAD(libname) dlopen(libname, RTLD_LAZY | RTLD_GLOBAL | RTLD_GROUP | RTLD_WORLD | RTLD_PARENT)
|
|
|
|
+# define DL_LOAD(libname) dlopen(libname, RTLD_NOW | RTLD_GLOBAL | RTLD_GROUP | RTLD_WORLD | RTLD_PARENT)
|
2017-02-28 12:29:04 +00:00
|
|
|
# elif defined(RTLD_DEEPBIND) && !defined(__SANITIZE_ADDRESS__)
|
2016-06-27 13:05:34 +00:00
|
|
|
-# define DL_LOAD(libname) dlopen(libname, RTLD_LAZY | RTLD_GLOBAL | RTLD_DEEPBIND)
|
|
|
|
+# define DL_LOAD(libname) dlopen(libname, RTLD_NOW | RTLD_GLOBAL | RTLD_DEEPBIND)
|
|
|
|
# else
|
|
|
|
-# define DL_LOAD(libname) dlopen(libname, RTLD_LAZY | RTLD_GLOBAL)
|
|
|
|
+# define DL_LOAD(libname) dlopen(libname, RTLD_NOW | RTLD_GLOBAL)
|
|
|
|
# endif
|
|
|
|
# define DL_UNLOAD dlclose
|
|
|
|
# if defined(DLSYM_NEEDS_UNDERSCORE)
|