summaryrefslogtreecommitdiff
path: root/main/php_ini.c
Commit message (Collapse)AuthorAgeFilesLines
* 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.
| | * Bump yearXinchen Hui2014-01-031-1/+1
| | |
* | | Combine HashTable.flags and HashTable.nApplyCount into single 32-bit wordDmitry Stogov2014-04-211-5/+3
| | |
* | | Refactored zend_hash_* iteration API zend_hash_fove_forward_ex(ht, pos) and ↵Dmitry Stogov2014-04-071-1/+1
| | | | | | | | | | | | | | | | | | | | | family require second argument to be real pointer. &(ht)->nInternalPointer should be passed instead of NULL. zend_hash_update_current_key() may work only with internal pointer.
* | | Refactored ZVAL flags usage to simplify various checks (e.g. Z_REFCOUNTED(), ↵Dmitry Stogov2014-04-031-1/+1
| | | | | | | | | | | | candidate for GC, etc)
* | | Fixed php_info relatedXinchen Hui2014-03-021-9/+13
| | |
* | | Use better data structures (incomplete; able to run bench.php)Dmitry Stogov2014-02-181-4/+2
| | |
* | | Use better data structures (incomplete)Dmitry Stogov2014-02-171-4/+2
| | |
* | | Use better data structures (incomplete)Dmitry Stogov2014-02-101-49/+32
|/ /
* | Merge branch 'PHP-5.6'Xinchen Hui2014-01-031-1/+1
|\ \
| * | Bump yearXinchen Hui2014-01-031-1/+1
| |/
* | Kill another TSRMLS_FETCH() in the zend extension loading codeKalle Sommer Nielsen2013-12-181-2/+2
|/
* Merge branch 'PHP-5.4' into PHP-5.5Anatol Belski2013-07-151-0/+5
|\ | | | | | | | | * PHP-5.4: fix buffer overrun
| * fix buffer overrunAnatol Belski2013-07-151-0/+5
| |
* | Merge branch 'PHP-5.4' into PHP-5.5David Soria Parra2013-03-191-1/+1
|\ \ | |/ | | | | | | * PHP-5.4: Fix typos
| * Fix typosCarson McDonald2013-03-191-1/+1
| |
| * Happy New YearXinchen Hui2013-01-011-1/+1
| |
| * - Year++Felipe Pena2012-01-011-1/+1
| |
| * Implemented FR #54514 (Get php binary path during script execution).Xinchen Hui2011-12-071-46/+5
| |
View Lorry Controller Status