#
49493a2d |
| 01-Jan-2016 |
Lior Kaplan |
Happy new year (Update copyright to 2016) |
Revision tags: php-7.0.2RC1, php-5.6.17RC1, php-7.0.1RC1, php-7.0.0, php-5.6.16, php-7.0.0RC8 |
|
#
9134f9e9 |
| 16-Nov-2015 |
Xinchen Hui |
Merge branch 'PHP-5.6' into PHP-7.0 Conflicts: ext/mysql/php_mysql.c
|
#
be6fd4ba |
| 16-Nov-2015 |
Xinchen Hui |
Fixed bug #68077 (LOAD DATA LOCAL INFILE / open_basedir restriction) Actually, this only be fixed if php uses mysqlnd |
Revision tags: php-7.0.0RC7, php-5.6.16RC1, php-5.6.15, php-7.0.0RC6, php-7.0.1, php-5.6.15RC1, php-7.0.0RC5, php-5.5.30, php-5.6.14, php-7.0.0RC4, php-5.6.14RC1, php-7.0.0RC3, php-5.6.13, php-7.0.0RC2, php-5.5.29, php-5.4.45, php-5.6.13RC1, php-7.0.0RC1, php-5.6.12, php-5.5.28, php-7.0.0beta3, php-5.4.44, php-5.6.12RC1, php-7.0.0beta2, php-7.0.0beta1, php-5.6.11, php-5.5.27, php-5.4.43 |
|
#
819fd30c |
| 01-Jul-2015 |
Dmitry Stogov |
Cleanup (replce hack by a clean implementation) |
#
4a2e40bb |
| 30-Jun-2015 |
Dmitry Stogov |
Use ZSTR_ API to access zend_string elements (this is just renaming without semantick changes). |
Revision tags: php-5.6.11RC1, php-5.5.27RC1, php-7.0.0alpha2, php-5.5.26, php-7.0.0alpha1, php-5.6.10, php-5.4.42, POST_PHP7_NSAPI_REMOVAL, PRE_PHP7_NSAPI_REMOVAL, php-5.6.10RC1, php-5.5.26RC1, php-5.5.25, php-5.6.9, php-5.4.41, php-5.6.9RC1, php-5.5.25RC1, php-5.6.8, php-5.5.24, php-5.4.40, php-5.6.8RC1, php-5.5.24RC1, php-5.6.7, php-5.5.23, php-5.4.39, php-5.6.7RC1, php-5.5.23RC1, POST_PHP7_EREG_MYSQL_REMOVALS, PRE_PHP7_EREG_MYSQL_REMOVALS, php-5.6.6, php-5.5.22, php-5.4.38, POST_PHP7_REMOVALS, PRE_PHP7_REMOVALS, php-5.6.6RC1, php-5.5.22RC1, php-5.5.21, php-5.6.5, php-5.4.37 |
|
#
fc33f52d |
| 15-Jan-2015 |
Xinchen Hui |
bump year |
#
0579e827 |
| 15-Jan-2015 |
Xinchen Hui |
bump year |
Revision tags: php-5.5.21RC1, php-5.6.5RC1 |
|
#
b7a7b1a6 |
| 03-Jan-2015 |
Stanislav Malyshev |
trailing whitespace removal |
Revision tags: POST_NATIVE_TLS_MERGE, PRE_NATIVE_TLS_MERGE, php-5.5.20, php-5.4.36, php-5.6.4 |
|
#
bdeb220f |
| 13-Dec-2014 |
Anatol Belski |
first shot remove TSRMLS_* things |
Revision tags: php-5.6.4RC1, php-5.5.20RC1, php-5.6.3, php-5.5.19, php-5.4.35, php-5.6.3RC1, php-5.5.19RC1, php-5.5.18, php-5.4.34, php-5.5.18RC1, php-5.6.1, php-5.6.2 |
|
#
e33f3d3b |
| 20-Sep-2014 |
Nikita Popov |
Move smart_str implementation into Zend/ So we can use it there as well... For now I've retained the zend_smart_str_public.h header, though it would probably be better to just m
Move smart_str implementation into Zend/ So we can use it there as well... For now I've retained the zend_smart_str_public.h header, though it would probably be better to just move that one struct into zend_types.h.
show more ...
|
#
d0cb7153 |
| 19-Sep-2014 |
Johannes Schlüter |
s/PHP 5/PHP 7/ |
Revision tags: php-5.4.33, php-5.5.17, php-5.6.1RC1, php-5.5.17RC1, php-5.4.33RC1 |
|
#
257ed406 |
| 27-Aug-2014 |
Anatol Belski |
's' works with size_t round 2 |
#
32344808 |
| 27-Aug-2014 |
Anatol Belski |
first show to make 's' work with size_t |
Revision tags: php-5.6.0, POST_AST_MERGE, PRE_AST_MERGE |
|
#
c3e3c98e |
| 25-Aug-2014 |
Anatol Belski |
master renames phase 1 |
#
70de6180 |
| 24-Aug-2014 |
Anatol Belski |
fixes to %pd format usage |
Revision tags: POST_64BIT_BRANCH_MERGE, PRE_64BIT_BRANCH_MERGE, php-5.5.16, php-5.4.32 |
|
#
c517d6d8 |
| 19-Aug-2014 |
Anatol Belski |
ported ext/mysqli |
#
63d3f0b8 |
| 19-Aug-2014 |
Anatol Belski |
basic macro replacements, all at once |
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 |
|
#
e2b182b2 |
| 19-Jun-2014 |
Xinchen Hui |
Fixed mysqli_get_links_stats |
#
4cc3c738 |
| 19-Jun-2014 |
Xinchen Hui |
Fixed hash key in persistent hash |
#
b7b5fa11 |
| 19-Jun-2014 |
Xinchen Hui |
Fixed MySQLi built with mysqlnd |
Revision tags: 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 |
|
#
2402d6cb |
| 11-May-2014 |
Xinchen Hui |
Refactor MySQLi (incompleted, only compilable now) |
#
cd4b4dfc |
| 05-May-2014 |
Dmitry Stogov |
Merge branch 'master' into refactoring2 Conflicts: Zend/zend_hash.c ext/date/php_date.c
|
#
06a03bbf |
| 02-May-2014 |
Adam Harvey |
Fix mysqli build when building against libmysqlclient. |
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 ...
|
Revision tags: php-5.4.28RC1, php-5.5.12RC1 |
|
#
050d7e38 |
| 15-Apr-2014 |
Dmitry Stogov |
Cleanup (1-st round) |