|
Revision tags: POST_PHPNG_MERGE, PRE_PHPNG_MERGE, php-5.6.0RC4, php-5.3.29, php-5.5.16RC1, php-5.4.32RC1, php-5.3.29RC1, php-5.6.0RC3, php-5.5.15, php-5.4.31, php-5.4.31RC1, php-5.5.15RC1, php-5.6.0RC2, php-5.4.30, php-5.5.14, php-5.6.0RC1, php-5.5.14RC1, php-5.4.30RC1, php-5.6.0beta4, php-5.4.29, php-5.5.13, php-5.5.13RC1, php-5.6.0beta3, php-5.4.29RC1 |
|
| #
c242518b |
| 08-May-2014 |
Xinchen Hui |
There should been memory leaks(and don't use pointer cast) |
| #
38c886a4 |
| 07-May-2014 |
Pierre Joye |
-- missing length declaration, may have worked w/some gcc as length is not used in the macro but still need it, ifdef just make code uncertain. will get opt out anyway if not used |
|
Revision tags: php-5.6.0beta2, php-5.5.12, php-5.4.28 |
|
| #
f9927a6c |
| 25-Apr-2014 |
Dmitry Stogov |
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 patch
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
show more ...
|
| #
72c287bd |
| 21-Apr-2014 |
Dmitry Stogov |
Combine HashTable.flags and HashTable.nApplyCount into single 32-bit word |
|
Revision tags: php-5.4.28RC1, php-5.5.12RC1, php-5.6.0beta1 |
|
| #
3d17219c |
| 07-Apr-2014 |
Dmitry Stogov |
Refactored zend_hash_* iteration API zend_hash_fove_forward_ex(ht, pos) and family require second argument to be real pointer.
&(ht)->nInternalPointer should be passed instead of NULL.
zend_h
Refactored zend_hash_* iteration API zend_hash_fove_forward_ex(ht, pos) and 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.
show more ...
|
| #
76cc99fe |
| 03-Apr-2014 |
Dmitry Stogov |
Refactored ZVAL flags usage to simplify various checks (e.g. Z_REFCOUNTED(), candidate for GC, etc) |
|
Revision tags: php-5.4.27, php-5.5.11, php-5.5.11RC1, php-5.4.27RC1, php-5.5.10, php-5.4.26 |
|
| #
069c158c |
| 02-Mar-2014 |
Xinchen Hui |
Fixed php_info related |
|
Revision tags: php-5.6.0alpha3, php-5.4.26RC1, php-5.5.10RC1 |
|
| #
5de71156 |
| 18-Feb-2014 |
Dmitry Stogov |
Use better data structures (incomplete; able to run bench.php) |
| #
2b9b9afa |
| 17-Feb-2014 |
Dmitry Stogov |
Use better data structures (incomplete) |
|
Revision tags: php-5.6.0alpha2 |
|
| #
f4cfaf36 |
| 10-Feb-2014 |
Dmitry Stogov |
Use better data structures (incomplete) |
|
Revision tags: php-5.5.9, php-5.4.25 |
|
| #
1c7f54d4 |
| 29-Jan-2014 |
Andrey Hristov |
Merge branch 'PHP-5.6'
Conflicts:
NEWS
ext/openssl/xp_ssl.c
|
| #
da84f3af |
| 29-Jan-2014 |
Remi Collet |
Fixed Request #66574 Allow multiple paths in php_ini_scanned_path
php_ini_scanned_path, from --with-config-file-scan-dir option or
from PHP_INI_SCAN_DIR environment variable allow a sing
Fixed Request #66574 Allow multiple paths in php_ini_scanned_path
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.
show more ...
|
|
Revision tags: php-5.5.9RC1, php-5.4.25RC1, php-5.6.0alpha1, php-5.5.8, php-5.4.24 |
|
| #
0f53e374 |
| 03-Jan-2014 |
Xinchen Hui |
Merge branch 'PHP-5.6'
|
| #
c081ce62 |
| 03-Jan-2014 |
Xinchen Hui |
Bump year |
| #
47c90277 |
| 03-Jan-2014 |
Xinchen Hui |
Bump year |
|
Revision tags: php-5.4.24RC1, php-5.5.8RC1 |
|
| #
bd58146a |
| 18-Dec-2013 |
Kalle Sommer Nielsen |
Kill another TSRMLS_FETCH() in the zend extension loading code |
|
Revision tags: php-5.5.7, php-5.4.23, php-5.3.28, php-5.5.7RC1, php-5.4.23RC1, php-5.4.22, php-5.5.6, php-5.4.22RC1, php-5.5.6RC1, php-5.4.21, php-5.5.5, php-5.4.21RC1, php-5.5.5RC1, php-5.5.4, php-5.4.20, php-5.5.4RC1, php-5.4.20RC1, php-5.5.3, php-5.4.19, php-5.5.2, php-5.4.18, php-5.5.2RC1, php-5.4.18RC2, php-5.5.1, php-5.4.18RC1 |
|
| #
e7a4cf8d |
| 15-Jul-2013 |
Anatol Belski |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
fix buffer overrun
|
| #
9561e598 |
| 15-Jul-2013 |
Anatol Belski |
fix buffer overrun |
|
Revision tags: php-5.3.27, php-5.4.17, php-5.5.0, php-5.3.27RC1, php-5.4.17RC1, php-5.5.0RC3, php-5.3.26, php-5.4.16, php-5.5.0RC2, php-5.3.26RC1, php-5.4.16RC1, php-5.5.0RC1, php-5.3.25, php-5.4.15, php-5.3.25RC1, php-5.5.0beta4, php-5.4.15RC1, php-5.4.14, php-5.3.24, php-5.5.0beta3, php-5.3.24RC1, php-5.4.14RC1, php-5.5.0beta2, php-5.5.0beta1 |
|
| #
c542e969 |
| 19-Mar-2013 |
David Soria Parra |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fix typos
|
|
Revision tags: php-5.3.23, php-5.4.13 |
|
| #
c6f6bf88 |
| 12-Mar-2013 |
Carson McDonald |
Fix typos |
| #
0b8b6a72 |
| 17-Mar-2013 |
Dmitry Stogov |
Added ability to load zend_extensions without absolute path names |
|
Revision tags: php-5.5.0alpha6, php-5.3.23RC1, php-5.4.13RC1, php-5.3.22, php-5.5.0alpha5, php-5.4.12, php-5.3.22RC2, php-5.4.12RC2, php-5.3.22RC1, php-5.4.12RC1, php-5.5.0alpha4, php-5.3.21, php-5.4.11, php-5.5.0alpha3, php-5.3.21RC1, php-5.4.11RC1 |
|
| #
a666285b |
| 01-Jan-2013 |
Xinchen Hui |
Happy New Year |
| #
0a7395e0 |
| 01-Jan-2013 |
Xinchen Hui |
Happy New Year |
|
Revision tags: php-5.3.20, php-5.4.10, php-5.5.0alpha2, php-5.3.20RC1, php-5.4.10RC1, php-5.3.19, php-5.4.9, php-5.5.0alpha1, php-5.3.19RC1, php-5.4.9RC1, php-5.3.18, php-5.4.8, php-5.3.18RC1, php-5.4.8RC1, php-5.3.17, php-5.4.7, php-5.4.7RC1, php-5.3.16, php-5.4.6, php-5.4.6RC1, php-5.4.5, php-5.3.15, php-5.3.15RC1, php-5.4.5RC1, php-5.3.14, php-5.4.4, php-5.3.14RC2, php-5.4.4RC2, php-5.3.14RC1, php-5.4.4RC1, php-5.3.13, php-5.4.3, php-5.4.2, php-5.3.12, php-5.3.11, php-5.4.1, php-5.3.11RC2, php-5.4.1RC2, php-5.3.11RC1, php-5.4.1RC1, PHP-5.4.1-RC1, php-5.4.0, php-5.4.0RC8, php-5.3.10, php-5.4.0RC7, php-5.4.0RC6, php-5.3.9, php-5.4.0RC5 |
|
| #
8775a375 |
| 01-Jan-2012 |
Felipe Pena |
- Year++ |
| #
4e198252 |
| 01-Jan-2012 |
Felipe Pena |
- Year++ |
