| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | first shot remove TSRMLS_* things | Anatol Belski | 2014-12-13 | 1 | -34/+33 |
| | | |||||
| * | fix datatype mismatches | Anatol Belski | 2014-12-02 | 1 | -3/+3 |
| | | |||||
| * | fix datatype mismatches and warns | Anatol Belski | 2014-10-27 | 1 | -9/+10 |
| | | |||||
| * | s/PHP 5/PHP 7/ | Johannes Schlüter | 2014-09-19 | 1 | -1/+1 |
| | | |||||
| * | restore the length var and fix the com_dotnet ini | Anatol Belski | 2014-09-01 | 1 | -0/+1 |
| | | |||||
| * | Refactored INI subsystem to use zend_string* instead of char* | Dmitry Stogov | 2014-09-01 | 1 | -10/+17 |
| | | |||||
| * | master renames phase 7PRE_AST_MERGE | Anatol Belski | 2014-08-25 | 1 | -1/+1 |
| | | |||||
| * | master renames phase 3 | Anatol Belski | 2014-08-25 | 1 | -3/+3 |
| | | |||||
| * | master renames phase 1 | Anatol Belski | 2014-08-25 | 1 | -15/+15 |
| | | |||||
| * | first shot on merging the core fro the int64 branch | Anatol Belski | 2014-08-16 | 1 | -15/+15 |
| | | |||||
| * | There should been memory leaks(and don't use pointer cast) | Xinchen Hui | 2014-05-08 | 1 | -2/+2 |
| | | |||||
| * | -- missing length declaration, may have worked w/some gcc as length is not ↵ | Pierre Joye | 2014-05-07 | 1 | -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 refactoring | Dmitry Stogov | 2014-04-26 | 1 | -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 Hristov | 2014-01-29 | 1 | -44/+62 |
| | |\ | | | | | | | | | | | | | | | | Conflicts: NEWS ext/openssl/xp_ssl.c | ||||
| | | * | Fixed Request #66574 Allow multiple paths in php_ini_scanned_path | Remi Collet | 2014-01-29 | 1 | -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 year | Xinchen Hui | 2014-01-03 | 1 | -1/+1 |
| | | | | |||||
| * | | | Combine HashTable.flags and HashTable.nApplyCount into single 32-bit word | Dmitry Stogov | 2014-04-21 | 1 | -5/+3 |
| | | | | |||||
| * | | | Refactored zend_hash_* iteration API zend_hash_fove_forward_ex(ht, pos) and ↵ | Dmitry Stogov | 2014-04-07 | 1 | -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 Stogov | 2014-04-03 | 1 | -1/+1 |
| | | | | | | | | | | | | | candidate for GC, etc) | ||||
| * | | | Fixed php_info related | Xinchen Hui | 2014-03-02 | 1 | -9/+13 |
| | | | | |||||
| * | | | Use better data structures (incomplete; able to run bench.php) | Dmitry Stogov | 2014-02-18 | 1 | -4/+2 |
| | | | | |||||
| * | | | Use better data structures (incomplete) | Dmitry Stogov | 2014-02-17 | 1 | -4/+2 |
| | | | | |||||
| * | | | Use better data structures (incomplete) | Dmitry Stogov | 2014-02-10 | 1 | -49/+32 |
| |/ / | |||||
| * | | Merge branch 'PHP-5.6' | Xinchen Hui | 2014-01-03 | 1 | -1/+1 |
| |\ \ | |||||
| | * | | Bump year | Xinchen Hui | 2014-01-03 | 1 | -1/+1 |
| | |/ | |||||
| * | | Kill another TSRMLS_FETCH() in the zend extension loading code | Kalle Sommer Nielsen | 2013-12-18 | 1 | -2/+2 |
| |/ | |||||
| * | Merge branch 'PHP-5.4' into PHP-5.5 | Anatol Belski | 2013-07-15 | 1 | -0/+5 |
| |\ | | | | | | | | | * PHP-5.4: fix buffer overrun | ||||
| | * | fix buffer overrun | Anatol Belski | 2013-07-15 | 1 | -0/+5 |
| | | | |||||
| * | | Merge branch 'PHP-5.4' into PHP-5.5 | David Soria Parra | 2013-03-19 | 1 | -1/+1 |
| |\ \ | |/ | | | | | | | * PHP-5.4: Fix typos | ||||
| | * | Fix typos | Carson McDonald | 2013-03-19 | 1 | -1/+1 |
| | | | |||||
| | * | Happy New Year | Xinchen Hui | 2013-01-01 | 1 | -1/+1 |
| | | | |||||
| | * | - Year++ | Felipe Pena | 2012-01-01 | 1 | -1/+1 |
| | | | |||||
| | * | Implemented FR #54514 (Get php binary path during script execution). | Xinchen Hui | 2011-12-07 | 1 | -46/+5 |
| | | | |||||
| | * | - be sure to check if the var ha not been removed between the two calls | Pierre Joye | 2011-09-26 | 1 | -1/+5 |
| | | | |||||
| | * | Fix another Coverity warning by initializing this to NULL prior to the ↵ | Rasmus Lerdorf | 2011-08-06 | 1 | -1/+1 |
| | | | | | | | | | strtok_r call | ||||
| | * | - fix bug #54204, Can't set a value with a PATH section in php.ini | Pierre Joye | 2011-07-18 | 1 | -1/+1 |
| | | | |||||
| * | | Added ability to load zend_extensions without absolute path names | Dmitry Stogov | 2013-03-17 | 1 | -1/+18 |
| | | | |||||
| * | | Happy New Year | Xinchen Hui | 2013-01-01 | 1 | -1/+1 |
| | | | |||||
| * | | - Year++ | Felipe Pena | 2012-01-01 | 1 | -1/+1 |
| | | | |||||
| * | | Implemented FR #54514 (Get php binary path during script execution). | Xinchen Hui | 2011-12-07 | 1 | -46/+5 |
| | | | |||||
| * | | Merge -r317306 to trunk | Xinchen Hui | 2011-12-07 | 1 | -1/+5 |
| | | | |||||
| * | | Fix another Coverity warning by initializing this to NULL prior to the ↵ | Rasmus Lerdorf | 2011-08-06 | 1 | -1/+1 |
| | | | | | | | | | strtok_r call | ||||
| * | | - fix bug #54204, Can't set a value with a PATH section in php.ini | Pierre Joye | 2011-07-18 | 1 | -1/+1 |
| |/ | |||||
| * | - path len check and fix buffer overrun | Pierre Joye | 2011-01-19 | 1 | -1/+4 |
| | | |||||
| * | - path len sanity check | Pierre Joye | 2011-01-17 | 1 | -0/+4 |
| | | |||||
| * | - remove local redeclaration | Pierre Joye | 2011-01-10 | 1 | -9/+9 |
| | | |||||
| * | - Year++ | Felipe Pena | 2011-01-01 | 1 | -1/+1 |
| | | |||||
| * | - Fixed #52045 (FPM tries to open php.ini from the current dir) | Jérôme Loyet | 2010-11-11 | 1 | -1/+1 |
| | | | | | | - Add php_ini_ignore_cwd to _sapi_module_struct | ||||
| * | Fix bug #52786 (PHP should reset section to [PHP] after ini sections). Patch by | Adam Harvey | 2010-09-09 | 1 | -3/+4 |
| | | | | | | Fedora at famillecollet dot com. | ||||
| * | - Fixed crash on non-Windows build | Felipe Pena | 2010-08-30 | 1 | -0/+4 |
| | | |||||
 |
index : delta/php-git.git | |
| git.php.net: repository/php-src.git |
| summaryrefslogtreecommitdiff |