diff options
author | Ondřej Surý <ondrej@sury.org> | 2013-03-22 08:32:53 +0100 |
---|---|---|
committer | Ondřej Surý <ondrej@sury.org> | 2013-03-22 08:32:53 +0100 |
commit | f21eff8954d5956842795ea5653a9a5b8d62caa3 (patch) | |
tree | adbe3c3feb67f383afe32b3974794eb1d5ec8cc8 /main | |
parent | 92984f18f6aee9c0f719febb9fc09a0c50262c2f (diff) | |
download | php-f21eff8954d5956842795ea5653a9a5b8d62caa3.tar.gz |
Imported Upstream version 5.5.0~beta1upstream/5.5.0_beta1
Diffstat (limited to 'main')
-rw-r--r-- | main/network.c | 2 | ||||
-rw-r--r-- | main/php_config.h.in | 27 | ||||
-rw-r--r-- | main/php_ini.c | 21 | ||||
-rw-r--r-- | main/php_version.h | 4 |
4 files changed, 49 insertions, 5 deletions
diff --git a/main/network.c b/main/network.c index 88e166311..5c0404b23 100644 --- a/main/network.c +++ b/main/network.c @@ -872,7 +872,7 @@ skip_bind: efree(local_address); } } - /* free error string recieved during previous iteration (if any) */ + /* free error string received during previous iteration (if any) */ if (error_string && *error_string) { efree(*error_string); *error_string = NULL; diff --git a/main/php_config.h.in b/main/php_config.h.in index 8cb230f2f..6e76a4abf 100644 --- a/main/php_config.h.in +++ b/main/php_config.h.in @@ -132,6 +132,9 @@ /* Whether to build odbc as dynamic module */ #undef COMPILE_DL_ODBC +/* Whether to build opcache as dynamic module */ +#undef COMPILE_DL_OPCACHE + /* Whether to build openssl as dynamic module */ #undef COMPILE_DL_OPENSSL @@ -1195,6 +1198,9 @@ /* Define to 1 if you have the <monetary.h> header file. */ #undef HAVE_MONETARY_H +/* Define if you have mprotect() function */ +#undef HAVE_MPROTECT + /* Define to 1 if you have the `mremap' function. */ #undef HAVE_MREMAP @@ -1435,6 +1441,9 @@ /* */ #undef HAVE_PSPELL +/* Define to 1 if the PS_STRINGS thing exists. */ +#undef HAVE_PS_STRINGS + /* do we have ptrace? */ #undef HAVE_PTRACE @@ -1543,6 +1552,21 @@ /* */ #undef HAVE_SHMOP +/* Define if you have SysV IPC SHM support */ +#undef HAVE_SHM_IPC + +/* Define if you have mmap(MAP_ANON) SHM support */ +#undef HAVE_SHM_MMAP_ANON + +/* Define if you have mmap() SHM support */ +#undef HAVE_SHM_MMAP_FILE + +/* Define if you have POSIX mmap() SHM support */ +#undef HAVE_SHM_MMAP_POSIX + +/* Define if you have mmap("/dev/zero") SHM support */ +#undef HAVE_SHM_MMAP_ZERO + /* Define to 1 if you have the `shutdown' function. */ #undef HAVE_SHUTDOWN @@ -1842,6 +1866,9 @@ /* Define to 1 if you have the <sys/poll.h> header file. */ #undef HAVE_SYS_POLL_H +/* Define to 1 if you have the <sys/pstat.h> header file. */ +#undef HAVE_SYS_PSTAT_H + /* Define to 1 if you have the <sys/resource.h> header file. */ #undef HAVE_SYS_RESOURCE_H diff --git a/main/php_ini.c b/main/php_ini.c index b15a3846d..cb2c7ea80 100644 --- a/main/php_ini.c +++ b/main/php_ini.c @@ -290,7 +290,7 @@ static void php_ini_parser_cb(zval *arg1, zval *arg2, zval *arg3, int callback_t is_special_section = 1; has_per_dir_config = 1; - /* make the path lowercase on Windows, for case insensitivty. Does nothign for other platforms */ + /* make the path lowercase on Windows, for case insensitivity. Does nothing for other platforms */ TRANSLATE_SLASHES_LOWER(key); /* HOST sections */ @@ -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); + } } /* }}} */ diff --git a/main/php_version.h b/main/php_version.h index 7a57019aa..61c507b32 100644 --- a/main/php_version.h +++ b/main/php_version.h @@ -3,6 +3,6 @@ #define PHP_MAJOR_VERSION 5 #define PHP_MINOR_VERSION 5 #define PHP_RELEASE_VERSION 0 -#define PHP_EXTRA_VERSION "alpha6" -#define PHP_VERSION "5.5.0alpha6" +#define PHP_EXTRA_VERSION "beta1" +#define PHP_VERSION "5.5.0beta1" #define PHP_VERSION_ID 50500 |