Revision tags: POST_64BIT_BRANCH_MERGE, PRE_64BIT_BRANCH_MERGE, php-5.5.16, php-5.4.32 |
|
#
b8324e6d |
| 18-Aug-2014 |
Anatol Belski |
further fixes to ext/standard |
#
77eb6e72 |
| 17-Aug-2014 |
Anatol Belski |
Merge branch 'master' of git.php.net:php-src # By Veres Lajos (2) and Lior Kaplan (1) # Via Lior Kaplan * 'master' of git.php.net:php-src: Correct typo in comments: 'initialize
Merge branch 'master' of git.php.net:php-src # By Veres Lajos (2) and Lior Kaplan (1) # Via Lior Kaplan * 'master' of git.php.net:php-src: Correct typo in comments: 'initialized' typofixes typofixes
show more ...
|
#
543d5eb4 |
| 17-Aug-2014 |
Lior Kaplan |
Merge branch 'PHP-5.6' * PHP-5.6: typofixes Conflicts: ext/spl/php_spl.c
|
Revision tags: POST_PHPNG_MERGE, PRE_PHPNG_MERGE, php-5.6.0RC4, php-5.3.29 |
|
#
3f42f2f5 |
| 12-Aug-2014 |
Veres Lajos |
typofixes |
#
cb25136f |
| 16-Aug-2014 |
Anatol Belski |
fix macros in the 5 basic extensions |
Revision tags: php-5.5.16RC1, php-5.4.32RC1, php-5.3.29RC1, php-5.6.0RC3, php-5.5.15, php-5.4.31 |
|
#
27f38798 |
| 11-Jul-2014 |
Dmitry Stogov |
Fast parameter parsing API This API is experemental. It may be changed or removed. It should be used only for really often used functions. (Keep the original parsing code and wrap us
Fast parameter parsing API This API is experemental. It may be changed or removed. It should be used only for really often used functions. (Keep the original parsing code and wrap usage with #ifndef FAST_ZPP)
show more ...
|
Revision tags: 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, 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 ...
|
#
a3288038 |
| 25-Apr-2014 |
Stanislav Malyshev |
Revert "Fixed bug #64604" This reverts commit b05c088a3abf8e4c6fb6e40418423a9e2dd3d929. Breaks parsing urls where query has : in it, like: /foo/bar?baz=goo:boo |
#
7652a977 |
| 18-Apr-2014 |
Dmitry Stogov |
Use ZEND_FETCH_FOREACH_* macros to iterate over HashTables instead of zend_hash_move_forward() and family. |
Revision tags: php-5.4.28RC1, php-5.5.12RC1 |
|
#
050d7e38 |
| 15-Apr-2014 |
Dmitry Stogov |
Cleanup (1-st round) |
Revision tags: php-5.6.0beta1, php-5.4.27, php-5.5.11, php-5.5.11RC1, php-5.4.27RC1, php-5.5.10, php-5.4.26, php-5.6.0alpha3, php-5.4.26RC1, php-5.5.10RC1, php-5.6.0alpha2, php-5.5.9, php-5.4.25, php-5.5.9RC1, php-5.4.25RC1, php-5.6.0alpha1, php-5.5.8, php-5.4.24, php-5.4.24RC1, php-5.5.8RC1, php-5.5.7, php-5.4.23, php-5.3.28, php-5.5.7RC1, php-5.4.23RC1 |
|
#
b05c088a |
| 23-Nov-2013 |
Ingo Walz |
Fixed bug #64604 |
#
76cc99fe |
| 03-Apr-2014 |
Dmitry Stogov |
Refactored ZVAL flags usage to simplify various checks (e.g. Z_REFCOUNTED(), candidate for GC, etc) |
#
a25a1ba0 |
| 01-Apr-2014 |
Dmitry Stogov |
STR_DUP() doesn't duplicate interned strings anymore. In case new string is required STR_INIT() or STR_ALLOC() should be used. |
#
497b918e |
| 18-Mar-2014 |
Mateusz Kocielski |
Merge branch 'PHP-5.3' into PHP-5.4 * PHP-5.3: Fixed off-by-one in php_url_parse_ex Conflicts: ext/standard/url.c
|
#
46566b78 |
| 18-Mar-2014 |
Mateusz Kocielski |
Fixed off-by-one in php_url_parse_ex Change order of condition, previously pointer could be derefrenced before bound check was done. |
#
b07d5913 |
| 03-Mar-2014 |
Xinchen Hui |
Refactor php_url_(en|de)code to return zend_string |
#
8ca824d6 |
| 03-Mar-2014 |
Xinchen Hui |
Fixed memory leak |
#
40e053e7 |
| 13-Feb-2014 |
Dmitry Stogov |
Use better data structures (incomplete) |
#
c081ce62 |
| 03-Jan-2014 |
Xinchen Hui |
Bump year |
#
c0d060f5 |
| 03-Jan-2014 |
Xinchen Hui |
Bump year |
Revision tags: 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 |
|
#
b79b13b4 |
| 13-Jul-2013 |
Veres Lajos |
less serious compatAbility fixes |
#
d17e8ac3 |
| 13-Jul-2013 |
Veres Lajos |
less serious compatAbility fixes |
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, php-5.3.23, php-5.4.13, 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 |
#
a2045ff3 |
| 01-Jan-2013 |
Xinchen Hui |
Happy New Year~ |