Added ability to load zend_extensions without absolute path names

diff --git a/main/php_ini.c b/main/php_ini.c
index b15a3846dd3cfbe63583fd060669640141f3859f..59e9ae80d31db6b0a7b614a3e5bf99eff3937cb1 100644 (file)
--- a/main/php_ini.c
+++ b/main/php_ini.c
@@ -357,7 +357,24 @@ static void php_load_php_extension_cb(void *arg TSRMLS_DC)
  */
 static void php_load_zend_extension_cb(void *arg TSRMLS_DC)
 {
-       zend_load_extension(*((char **) arg));
+       char *filename = *((char **) arg);
+       int length = strlen(filename);
+
+       if (IS_ABSOLUTE_PATH(filename, length)) {
+               zend_load_extension(filename);
+       } else {
+           char *libpath;
+               char *extension_dir = INI_STR("extension_dir");
+               int extension_dir_len = strlen(extension_dir);
+
+               if (IS_SLASH(extension_dir[extension_dir_len-1])) {
+                       spprintf(&libpath, 0, "%s%s", extension_dir, filename);
+               } else {
+                       spprintf(&libpath, 0, "%s%c%s", extension_dir, DEFAULT_SLASH, filename);
+               }
+               zend_load_extension(libpath);
+               efree(libpath);
+       }
 }
 /* }}} */