mirror of
https://github.com/php/php-src.git
synced 2025-08-15 21:48:51 +02:00
Merge mainstream 'master' branch into refactoring
During merge I had to revert: Nikita's patch for php_splice() (it probably needs to be applyed again) Bob Weinand's patches related to constant expression handling (we need to review them carefully) I also reverted all our attempts to support sapi/phpdbg (we didn't test it anyway) Conflicts: Zend/zend.h Zend/zend_API.c Zend/zend_ast.c Zend/zend_compile.c Zend/zend_compile.h Zend/zend_constants.c Zend/zend_exceptions.c Zend/zend_execute.c Zend/zend_execute.h Zend/zend_execute_API.c Zend/zend_hash.c Zend/zend_highlight.c Zend/zend_language_parser.y Zend/zend_language_scanner.c Zend/zend_language_scanner_defs.h Zend/zend_variables.c Zend/zend_vm_def.h Zend/zend_vm_execute.h ext/date/php_date.c ext/dom/documenttype.c ext/hash/hash.c ext/iconv/iconv.c ext/mbstring/tests/zend_multibyte-10.phpt ext/mbstring/tests/zend_multibyte-11.phpt ext/mbstring/tests/zend_multibyte-12.phpt ext/mysql/php_mysql.c ext/mysqli/mysqli.c ext/mysqlnd/mysqlnd_reverse_api.c ext/mysqlnd/php_mysqlnd.c ext/opcache/ZendAccelerator.c ext/opcache/zend_accelerator_util_funcs.c ext/opcache/zend_persist.c ext/opcache/zend_persist_calc.c ext/pcre/php_pcre.c ext/pdo/pdo_dbh.c ext/pdo/pdo_stmt.c ext/pdo_pgsql/pgsql_driver.c ext/pgsql/pgsql.c ext/reflection/php_reflection.c ext/session/session.c ext/spl/spl_array.c ext/spl/spl_observer.c ext/standard/array.c ext/standard/basic_functions.c ext/standard/html.c ext/standard/mail.c ext/standard/php_array.h ext/standard/proc_open.c ext/standard/streamsfuncs.c ext/standard/user_filters.c ext/standard/var_unserializer.c ext/standard/var_unserializer.re main/php_variables.c sapi/phpdbg/phpdbg.c sapi/phpdbg/phpdbg_bp.c sapi/phpdbg/phpdbg_frame.c sapi/phpdbg/phpdbg_help.c sapi/phpdbg/phpdbg_list.c sapi/phpdbg/phpdbg_print.c sapi/phpdbg/phpdbg_prompt.c
This commit is contained in:
Dmitry Stogov
commit
f9927a6c97
777 changed files with 165051 additions and 96985 deletions
110
main/php_ini.c
110
main/php_ini.c
|
|
@ -620,63 +620,81 @@ int php_init_config(TSRMLS_D)
|
|||
zend_llist scanned_ini_list;
|
||||
zend_llist_element *element;
|
||||
int l, total_l = 0;
|
||||
char *bufpath, *debpath, *endpath;
|
||||
int lenpath;
|
||||
|
||||
if ((ndir = php_scandir(php_ini_scanned_path, &namelist, 0, php_alphasort)) > 0) {
|
||||
zend_llist_init(&scanned_ini_list, sizeof(char *), (llist_dtor_func_t) free_estring, 1);
|
||||
memset(&fh2, 0, sizeof(fh2));
|
||||
zend_llist_init(&scanned_ini_list, sizeof(char *), (llist_dtor_func_t) free_estring, 1);
|
||||
memset(&fh2, 0, sizeof(fh2));
|
||||
|
||||
for (i = 0; i < ndir; i++) {
|
||||
bufpath = estrdup(php_ini_scanned_path);
|
||||
for (debpath = bufpath ; debpath ; debpath=endpath) {
|
||||
endpath = strchr(debpath, DEFAULT_DIR_SEPARATOR);
|
||||
if (endpath) {
|
||||
*(endpath++) = 0;
|
||||
}
|
||||
if (!debpath[0]) {
|
||||
/* empty string means default builtin value
|
||||
to allow "/foo/phd.d:" or ":/foo/php.d" */
|
||||
debpath = PHP_CONFIG_FILE_SCAN_DIR;
|
||||
}
|
||||
lenpath = strlen(debpath);
|
||||
|
||||
/* check for any file with .ini extension */
|
||||
if (!(p = strrchr(namelist[i]->d_name, '.')) || (p && strcmp(p, ".ini"))) {
|
||||
free(namelist[i]);
|
||||
continue;
|
||||
}
|
||||
/* Reset active ini section */
|
||||
RESET_ACTIVE_INI_HASH();
|
||||
if (lenpath > 0 && (ndir = php_scandir(debpath, &namelist, 0, php_alphasort)) > 0) {
|
||||
|
||||
if (IS_SLASH(php_ini_scanned_path[php_ini_scanned_path_len - 1])) {
|
||||
snprintf(ini_file, MAXPATHLEN, "%s%s", php_ini_scanned_path, namelist[i]->d_name);
|
||||
} else {
|
||||
snprintf(ini_file, MAXPATHLEN, "%s%c%s", php_ini_scanned_path, DEFAULT_SLASH, namelist[i]->d_name);
|
||||
}
|
||||
if (VCWD_STAT(ini_file, &sb) == 0) {
|
||||
if (S_ISREG(sb.st_mode)) {
|
||||
if ((fh2.handle.fp = VCWD_FOPEN(ini_file, "r"))) {
|
||||
fh2.filename = ini_file;
|
||||
fh2.type = ZEND_HANDLE_FP;
|
||||
for (i = 0; i < ndir; i++) {
|
||||
|
||||
if (zend_parse_ini_file(&fh2, 1, ZEND_INI_SCANNER_NORMAL, (zend_ini_parser_cb_t) php_ini_parser_cb, &configuration_hash TSRMLS_CC) == SUCCESS) {
|
||||
/* Here, add it to the list of ini files read */
|
||||
l = strlen(ini_file);
|
||||
total_l += l + 2;
|
||||
p = estrndup(ini_file, l);
|
||||
zend_llist_add_element(&scanned_ini_list, &p);
|
||||
/* check for any file with .ini extension */
|
||||
if (!(p = strrchr(namelist[i]->d_name, '.')) || (p && strcmp(p, ".ini"))) {
|
||||
free(namelist[i]);
|
||||
continue;
|
||||
}
|
||||
/* Reset active ini section */
|
||||
RESET_ACTIVE_INI_HASH();
|
||||
|
||||
if (IS_SLASH(debpath[lenpath - 1])) {
|
||||
snprintf(ini_file, MAXPATHLEN, "%s%s", debpath, namelist[i]->d_name);
|
||||
} else {
|
||||
snprintf(ini_file, MAXPATHLEN, "%s%c%s", debpath, DEFAULT_SLASH, namelist[i]->d_name);
|
||||
}
|
||||
if (VCWD_STAT(ini_file, &sb) == 0) {
|
||||
if (S_ISREG(sb.st_mode)) {
|
||||
if ((fh2.handle.fp = VCWD_FOPEN(ini_file, "r"))) {
|
||||
fh2.filename = ini_file;
|
||||
fh2.type = ZEND_HANDLE_FP;
|
||||
|
||||
if (zend_parse_ini_file(&fh2, 1, ZEND_INI_SCANNER_NORMAL, (zend_ini_parser_cb_t) php_ini_parser_cb, &configuration_hash TSRMLS_CC) == SUCCESS) {
|
||||
/* Here, add it to the list of ini files read */
|
||||
l = strlen(ini_file);
|
||||
total_l += l + 2;
|
||||
p = estrndup(ini_file, l);
|
||||
zend_llist_add_element(&scanned_ini_list, &p);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
free(namelist[i]);
|
||||
}
|
||||
free(namelist[i]);
|
||||
free(namelist);
|
||||
}
|
||||
free(namelist);
|
||||
|
||||
if (total_l) {
|
||||
int php_ini_scanned_files_len = (php_ini_scanned_files) ? strlen(php_ini_scanned_files) + 1 : 0;
|
||||
php_ini_scanned_files = (char *) realloc(php_ini_scanned_files, php_ini_scanned_files_len + total_l + 1);
|
||||
if (!php_ini_scanned_files_len) {
|
||||
*php_ini_scanned_files = '\0';
|
||||
}
|
||||
total_l += php_ini_scanned_files_len;
|
||||
for (element = scanned_ini_list.head; element; element = element->next) {
|
||||
if (php_ini_scanned_files_len) {
|
||||
strlcat(php_ini_scanned_files, ",\n", total_l);
|
||||
}
|
||||
strlcat(php_ini_scanned_files, *(char **)element->data, total_l);
|
||||
strlcat(php_ini_scanned_files, element->next ? ",\n" : "\n", total_l);
|
||||
}
|
||||
}
|
||||
zend_llist_destroy(&scanned_ini_list);
|
||||
}
|
||||
efree(bufpath);
|
||||
|
||||
if (total_l) {
|
||||
int php_ini_scanned_files_len = (php_ini_scanned_files) ? strlen(php_ini_scanned_files) + 1 : 0;
|
||||
php_ini_scanned_files = (char *) realloc(php_ini_scanned_files, php_ini_scanned_files_len + total_l + 1);
|
||||
if (!php_ini_scanned_files_len) {
|
||||
*php_ini_scanned_files = '\0';
|
||||
}
|
||||
total_l += php_ini_scanned_files_len;
|
||||
for (element = scanned_ini_list.head; element; element = element->next) {
|
||||
if (php_ini_scanned_files_len) {
|
||||
strlcat(php_ini_scanned_files, ",\n", total_l);
|
||||
}
|
||||
strlcat(php_ini_scanned_files, *(char **)element->data, total_l);
|
||||
strlcat(php_ini_scanned_files, element->next ? ",\n" : "\n", total_l);
|
||||
}
|
||||
}
|
||||
zend_llist_destroy(&scanned_ini_list);
|
||||
} else {
|
||||
/* Make sure an empty php_ini_scanned_path ends up as NULL */
|
||||
php_ini_scanned_path = NULL;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue