| #
c3e3c98e |
| 25-Aug-2014 |
Anatol Belski |
master renames phase 1 |
|
Revision tags: POST_64BIT_BRANCH_MERGE, PRE_64BIT_BRANCH_MERGE, php-5.5.16, php-5.4.32 |
|
| #
29dc15b0 |
| 19-Aug-2014 |
Anatol Belski |
fixes to ext/bz2 |
| #
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, php-5.6.0RC1, php-5.5.14RC1, php-5.4.30RC1, php-5.6.0beta4, php-5.4.29, php-5.5.13 |
|
| #
797c1660 |
| 16-May-2014 |
Pierre Joye |
test the right length and remove unused var (remaining from 'old' version) |
|
Revision tags: php-5.5.13RC1, php-5.6.0beta3, php-5.4.29RC1 |
|
| #
7fcd4064 |
| 13-May-2014 |
Dmitry Stogov |
Merge branch 'master' into phpng
* master: (41 commits)
fix test - output can be chunked
fix test
fix test
Fixed test for commit 997be125eb0228c5b1b6dd278f617791e7119
Merge branch 'master' into phpng
* master: (41 commits)
fix test - output can be chunked
fix test
fix test
Fixed test for commit 997be125eb0228c5b1b6dd278f617791e71192c6
Add bug fix to NEWS
Update UPGRADING according to bug fix
fix test
improve CURL tests to allow testing without separate server
improve CURL tests to allow testing without separate server
Fixed bug #67199 mb_regex_encoding mishmash
Fix bug #67248 (imageaffinematrixget missing check of parameters)
Fix bug #67247 spl_fixedarray_resize integer overflow
fix news
add tests stuff to README
Updated NEWS
Fix Linux specific fail in error traces (cherry-picked and fix for bug #67245) Linux apparently does not like memcpy in overlapping regions...
- Fixed off-by-one in phar_build (patch by crrodriguez at opensuse dot org)
- Move checking
- Fixed missing NULL check in SimpleXMLElement::xpath()
- Fixed missing NULL check
...
Conflicts:
ext/bz2/bz2.c
ext/gd/gd.c
ext/mbstring/php_mbregex.c
ext/session/tests/031.phpt
ext/simplexml/simplexml.c
ext/spl/spl_fixedarray.c
show more ...
|
| #
afa1de18 |
| 08-May-2014 |
Xinchen Hui |
Finish bz2 (all tests passed) |
| #
ebaee948 |
| 08-May-2014 |
krakjoe |
bz2 changes for phpng |
| #
a3f09eb3 |
| 08-May-2014 |
Stanislav Malyshev |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
oops, 5.4 and 5.5 use malloc in TSRM
|
| #
4392339c |
| 08-May-2014 |
Stanislav Malyshev |
oops, 5.4 and 5.5 use malloc in TSRM |
| #
0c709cc2 |
| 08-May-2014 |
Stanislav Malyshev |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fix memory leak in TSRM
|
| #
0cc18fdf |
| 07-May-2014 |
Stanislav Malyshev |
Fix memory leak in TSRM |
|
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) |
|
Revision tags: php-5.6.0beta1, php-5.4.27, php-5.5.11, php-5.5.11RC1, php-5.4.27RC1 |
|
| #
62f6c585 |
| 19-Mar-2014 |
Anatol Belski |
Fixes to various stream cast on win64
This fixes further issues on win64 with casts from the streams.
Sockets/descriptors handling was unitized. This has an impact only on
win64, php
Fixes to various stream cast on win64
This fixes further issues on win64 with casts from the streams.
Sockets/descriptors handling was unitized. This has an impact only on
win64, php_socket_t otherwise can be feed back to int datatype.
show more ...
|
|
Revision tags: 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 |
|
| #
c081ce62 |
| 03-Jan-2014 |
Xinchen Hui |
Bump year |
| #
c0d060f5 |
| 03-Jan-2014 |
Xinchen Hui |
Bump year |
|
Revision tags: 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, 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 |
|
| #
92d27ccb |
| 30-Jul-2013 |
Andrey Hristov |
Constify streams API and a few other calls down the rabbit hole.
(`char *` to `const char *` for parameters and few return values)
In a few places int len moved to size_t len. |
|
Revision tags: php-5.5.1, php-5.4.18RC1, php-5.3.27, php-5.4.17, php-5.5.0, php-5.3.27RC1, php-5.4.17RC1 |
|
| #
02e4d7a2 |
| 10-Jun-2013 |
Stanislav Malyshev |
Merge branch 'pull-request/341'
* pull-request/341: (23 commits)
typofixes |
| #
ac40c0b5 |
| 10-Jun-2013 |
Stanislav Malyshev |
Merge branch 'pull-request/341'
* pull-request/341: (23 commits)
typofixes |
|
Revision tags: 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 |
|
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++ |
|
Revision tags: php-5.3.9RC4, php-5.4.0RC4, php-5.3.9RC3, php-5.4.0RC3, php-5.3.9RC2, php-5.4.0RC2, php-5.4.0RC1, php-5.3.9RC1, php-5.4.0beta2, php-5.4.0beta1, yaf-2.1.0, php-5.3.8, php-5.3.7, php-5.3.7RC5, php-5.4.0alpha3, php-5.3.7RC4 |
|
| #
4b30846b |
| 25-Jul-2011 |
Felipe Pena |
- Make usage of new PHP_FE_END macro |
| #
da376383 |
| 25-Jul-2011 |
Felipe Pena |
- Make usage of new PHP_FE_END macro |
