From 7eaa62261f87bfba49a01c87a356466f14698aac Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 28 Feb 2017 15:15:49 +0100 Subject: PHP 7.0.17RC1 --- php-7.0.17-dlopen.patch | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 php-7.0.17-dlopen.patch (limited to 'php-7.0.17-dlopen.patch') diff --git a/php-7.0.17-dlopen.patch b/php-7.0.17-dlopen.patch new file mode 100644 index 0000000..37a461c --- /dev/null +++ b/php-7.0.17-dlopen.patch @@ -0,0 +1,30 @@ +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 + 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"); +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 @@ + # 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) + # elif defined(RTLD_DEEPBIND) && !defined(__SANITIZE_ADDRESS__) +-# 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) -- cgit