summaryrefslogtreecommitdiff
path: root/main/php_ini.c
Commit message (Collapse)AuthorAgeFilesLines
* Future-proof email addressesZeev Suraski2018-11-011-1/+1
|
* Remove unused Git attributes identPeter Kokot2018-07-251-2/+0
| | | | | | | | | | | | | | | The $Id$ keywords were used in Subversion where they can be substituted with filename, last revision number change, last changed date, and last user who changed it. In Git this functionality is different and can be done with Git attribute ident. These need to be defined manually for each file in the .gitattributes file and are afterwards replaced with 40-character hexadecimal blob object name which is based only on the particular file contents. This patch simplifies handling of $Id$ keywords by removing them since they are not used anymore.
* Use zend_string_release_ex() instread of zend_string_release() in places, ↵Dmitry Stogov2018-05-281-2/+2
| | | | where we sure about string persistence.
* main/php_ini.c: build empty php_load_zend_extension_cb() when !HAVE_LIBDLThomas Petazzoni2018-03-231-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 0782a7fc6314c8bd3cbfd57f12d0479bf9cc8dc7 ("Fixed bug #74866 extension_dir = "./ext" now use current directory for base") modified the php_load_zend_extension_cb() function to use php_load_shlib(), and pass a handle to the newly introduced zend_load_extension_handle() function instead of passing the extension path to zend_load_extension(). While doing so, it introduced a call to php_load_shlib() from code that is built even when HAVE_LIBDL is not defined. However, php_load_shlib() is not implemented when HAVE_LIBDL is not defined, for obvious reasons. It turns out that zend_load_extension_handle() anyway doesn't do anything when ZEND_EXTENSIONS_SUPPORT is defined to 0, and ZEND_EXTENSIONS_SUPPORT is not defined when HAVE_LIBDL is not defined (Zend/zend_portability.h). Fixes the following build failure when building on a system that doesn't have libdl: main/php_ini.o: In function `php_load_zend_extension_cb': php_ini.c:(.text+0x478): undefined reference to `php_load_shlib' php_ini.c:(.text+0x4b0): undefined reference to `php_load_shlib' collect2: error: ld returned 1 exit status Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
* year++Xinchen Hui2018-01-021-1/+1
|
* remove casts and ensure no out of bounds accessAnatol Belski2017-07-211-3/+7
|
* Fixed bug #74866 extension_dir = "./ext" now use current directory for baseFrancois Laupretre2017-07-131-5/+12
|
* replace the stack var by a macroAnatol Belski2017-07-061-6/+2
|
* Minor refactor of load extension by name implSara Golemon2017-06-221-14/+13
| | | | | | Minimize the #ifdef surface area Localize orig_libpath to retry scope Send errors to php_error() rathern than stderr
* Allow loading PHP and Zend extensions by nameFrancois Laupretre2017-06-221-5/+33
| | | | | | | Allow extension name as INI 'extension=' and dl() argument No BC break, as file name is still accepted. When using the '-z' command line option (CLI/CGI), an absolute file name must still be provided (nothing changed here) Change comments in example INI files
* Merge branch 'PHP-7.0' into PHP-7.1Xinchen Hui2017-06-121-3/+5
|\ | | | | | | | | | | * PHP-7.0: Add simple cli test for PATH/HOST ini sections Fixed bug #74600
| * Fixed bug #74600Manuel Mausz2017-06-091-3/+5
| | | | | | | | | | | | | | | | Make sure the hash entry is an array. The origin fix broke support for HOST/PATH ini sections. Only the beginning of the string has to match. Revert this check but use zend_binary_strncasecmp instead of strncasecmp.
* | Merge branch 'PHP-7.0' into PHP-7.1Xinchen Hui2017-05-161-2/+2
|\ \ | |/ | | | | | | * PHP-7.0: Fixed bug #74600 (crash (SIGSEGV) in _zend_hash_add_or_update_i)
| * Fixed bug #74600 (crash (SIGSEGV) in _zend_hash_add_or_update_i)Xinchen Hui2017-05-161-2/+2
| |
* | Merge branch 'PHP-7.0' into PHP-7.1Xinchen Hui2017-04-101-3/+3
|\ \ | |/ | | | | | | * PHP-7.0: Fixed condition check
| * Fixed condition checkXinchen Hui2017-04-101-3/+3
| |
| * Update copyright headers to 2017Sammy Kaye Powers2017-01-041-1/+1
| |
* | Update copyright headers to 2017Sammy Kaye Powers2017-01-041-1/+1
| |
* | Merge branch 'PHP-7.0'Lior Kaplan2016-01-011-1/+1
|\ \ | |/ | | | | | | | | | | * PHP-7.0: Update header to PHP Version 7 Happy new year (Update copyright to 2016) Happy new year (Update copyright to 2016)
| * Merge branch 'PHP-5.6' into PHP-7.0Lior Kaplan2016-01-011-1/+1
| |\ | | | | | | | | | | | | * PHP-5.6: Happy new year (Update copyright to 2016)
| | * Happy new year (Update copyright to 2016)Lior Kaplan2016-01-011-1/+1
| | |
| | * bump yearXinchen Hui2015-01-151-1/+1
| | |
| * | SpellingRichard Quadling2015-09-301-1/+1
| | | | | | | | | | | | bugger => buffer
* | | Update php_ini.cElan Ruusamäe2015-11-111-1/+1
| | | | | | | | | trivial typo fix
* | | SpellingRichard Quadling2015-09-251-1/+1
|/ / | | | | bugger => buffer
* | Fixed bug #70431 (Memory leak in php_ini.c)Xinchen Hui2015-09-101-1/+2
| |
* | Use ZSTR_ API to access zend_string elements (this is just renaming without ↵Dmitry Stogov2015-06-301-10/+10
| | | | | | | | semantick changes).
* | further cleanups with S_IF* macros generalized declarationsAnatol Belski2015-05-251-4/+0
| |
* | Clean up some type conversionsNikita Popov2015-04-271-8/+4
| | | | | | | | | | While at it also fix some type checks in iconv and drop dead and unported code in standard/filters.
* | Use zend_string* instead of char* for opened_patch handling. Avoid ↵Dmitry Stogov2015-03-041-7/+9
| | | | | | | | reallocations and improve string reuse.
* | Use new ZEND_HASH_FOREACH_... API.Dmitry Stogov2015-02-101-7/+2
| |
* | fix warningsMichael Wallner2015-01-301-0/+4
| |
* | bump yearXinchen Hui2015-01-151-1/+1
| |
* | trailing whitespace removalStanislav Malyshev2015-01-101-2/+2
| |
* | Drop duplicate arg from hash_get_current_key_exNikita Popov2014-12-261-1/+1
| |
* | first shot remove TSRMLS_* thingsAnatol Belski2014-12-131-34/+33
| |
* | fix datatype mismatchesAnatol Belski2014-12-021-3/+3
| |
* | fix datatype mismatches and warnsAnatol Belski2014-10-271-9/+10
| |
* | s/PHP 5/PHP 7/Johannes Schlüter2014-09-191-1/+1
| |
* | restore the length var and fix the com_dotnet iniAnatol Belski2014-09-011-0/+1
| |
* | Refactored INI subsystem to use zend_string* instead of char*Dmitry Stogov2014-09-011-10/+17
| |
* | master renames phase 7PRE_AST_MERGEAnatol Belski2014-08-251-1/+1
| |
* | master renames phase 3Anatol Belski2014-08-251-3/+3
| |
* | master renames phase 1Anatol Belski2014-08-251-15/+15
| |
* | first shot on merging the core fro the int64 branchAnatol Belski2014-08-161-15/+15
| |
* | There should been memory leaks(and don't use pointer cast)Xinchen Hui2014-05-081-2/+2
| |
* | -- missing length declaration, may have worked w/some gcc as length is not ↵Pierre Joye2014-05-071-0/+1
| | | | | | | | used in the macro but still need it, ifdef just make code uncertain. will get opt out anyway if not used
* | Merge mainstream 'master' branch into refactoringDmitry Stogov2014-04-261-44/+62
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * \ Merge branch 'PHP-5.6'Andrey Hristov2014-01-291-44/+62
| |\ \ | | |/ | | | | | | | | | | | | Conflicts: NEWS ext/openssl/xp_ssl.c
| | * Fixed Request #66574 Allow multiple paths in php_ini_scanned_pathRemi Collet2014-01-291-44/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | php_ini_scanned_path, from --with-config-file-scan-dir option or from PHP_INI_SCAN_DIR environment variable allow a single path. In some case it could be useful to allow multiple. In the proposed patch, multiple paths are allow, using syntax inspired from Unix MANPATH (: separated list, empty string for builtin value). For example, this allow to use: PHP_INI_SCAN_DIR=/foo/php.d:/bar/php.d php PHP_INI_SCAN_DIR=:/myproject/php.d php PHP_INI_SCAN_DIR=/myproject/php.d: php Real use case: in SCL for dependent collections where each collection provides a separate tree for extensions, libraries and ini files.
View Lorry Controller Status