#
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 |
|
#
48e6adee |
| 19-Aug-2014 |
Anatol Belski |
ported ext/session |
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 |
|
#
f2d1ace1 |
| 19-May-2014 |
Xinchen Hui |
This should be this (broken compiling before) |
#
0ba3aec5 |
| 17-May-2014 |
Pierre Joye |
only used if HAVE_NOFOLLOW |
Revision tags: php-5.5.13RC1, php-5.6.0beta3, php-5.4.29RC1 |
|
#
920d298f |
| 13-May-2014 |
Felipe Pena |
- Fixed ZTS build |
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 ...
|
#
7584ae32 |
| 22-Apr-2014 |
Dmitry Stogov |
Fixed compilaation warnings |
Revision tags: php-5.4.28RC1, php-5.5.12RC1 |
|
#
793f67e8 |
| 14-Apr-2014 |
Anatol Belski |
Merge branch 'PHP-5.4' into PHP-5.5 * PHP-5.4: fix windows build
|
#
24b72e7a |
| 14-Apr-2014 |
Anatol Belski |
fix windows build |
#
8bc82718 |
| 14-Apr-2014 |
Stanislav Malyshev |
Merge branch 'PHP-5.4' into PHP-5.5 * PHP-5.4: Fix #66942: openssl_seal() memory leak ws fix Conflicts: ext/openssl/openssl.c
|
#
56f97273 |
| 14-Apr-2014 |
Stanislav Malyshev |
ws fix |
#
7f43aeb1 |
| 14-Apr-2014 |
Stanislav Malyshev |
Fix bug #66171: better handling of symlinks |
#
40a9316d |
| 14-Apr-2014 |
Stanislav Malyshev |
Fix bug #66171: better handling of symlinks |
Revision tags: php-5.6.0beta1, php-5.4.27, php-5.5.11 |
|
#
3647fc6f |
| 28-Mar-2014 |
Xinchen Hui |
Refactor session (incompleted) |
Revision tags: 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 |
|
#
b1c0614e |
| 30-Jan-2014 |
Yasuo Ohgaki |
Merge branch 'PHP-5.4' into PHP-5.5 * PHP-5.4: Fixed bug data->fd not set to -1 for open_basedir failure.
|
#
f5e097d1 |
| 30-Jan-2014 |
Yasuo Ohgaki |
Fixed bug data->fd not set to -1 for open_basedir failure. |
Revision tags: php-5.5.9RC1, php-5.4.25RC1, php-5.6.0alpha1 |
|
#
f52c251f |
| 15-Jan-2014 |
Yasuo Ohgaki |
Fixed session module is sending multiple set-cookie headers when session.use_strict_mode=1 |
Revision tags: php-5.5.8, php-5.4.24 |
|
#
47c90277 |
| 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 |
|
#
16411586 |
| 20-Aug-2013 |
Yasuo Ohgaki |
Fixed Bug #65475 |
Revision tags: php-5.5.3, php-5.4.19, php-5.5.2, php-5.4.18 |
|
#
b80d73ce |
| 05-Aug-2013 |
Stanislav Malyshev |
fix crash, enable session_id and fix test |
Revision tags: php-5.5.2RC1, php-5.4.18RC2, php-5.5.1, php-5.4.18RC1, php-5.3.27, php-5.4.17 |
|
#
82b0e8be |
| 25-Jun-2013 |
Yasuo Ohgaki |
Strict session. Detect session id collision |
#
25e8fcc8 |
| 25-Jun-2013 |
Yasuo Ohgaki |
Strict session |
Revision tags: 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 |
|
#
748b3765 |
| 29-Jan-2013 |
Stanislav Malyshev |
complete zts fix |
Revision tags: 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 |