Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | second shot on removing TSRMLS_* | Anatol Belski | 2014-12-14 | 3 | -4/+4 |
| | |||||
* | first shot remove TSRMLS_* things | Anatol Belski | 2014-12-13 | 7 | -199/+198 |
| | |||||
* | cleanup comments from svn/cvs era | Popa Adrian Marius | 2014-11-24 | 7 | -7/+7 |
| | |||||
* | typo fixes - https://github.com/vlajos/misspell_fixer | Veres Lajos | 2014-11-23 | 1 | -1/+1 |
| | |||||
* | removed *.dsw and *.dsp files | Anatol Belski | 2014-09-28 | 1 | -135/+0 |
| | |||||
* | Merge branch 'master' into issue-67910 | Florian MARGAINE | 2014-09-20 | 8 | -8/+8 |
|\ | | | | | | | | | | | Conflicts: README.PARAMETER_PARSING_API ext/gmp/tests/001.phpt | ||||
| * | s/PHP 5/PHP 7/ | Johannes Schlüter | 2014-09-19 | 8 | -8/+8 |
| | | |||||
* | | Replaces php5 with php7, without whitespace changes. | Florian MARGAINE | 2014-09-20 | 2 | -6/+5 |
|/ | |||||
* | resource type is int | Xinchen Hui | 2014-08-29 | 2 | -2/+2 |
| | |||||
* | rename misleading define | Popa Adrian Marius | 2014-08-28 | 1 | -2/+1 |
| | |||||
* | solve conflicting type size_t vs int | Popa Adrian Marius | 2014-08-28 | 1 | -1/+1 |
| | |||||
* | first show to make 's' work with size_t | Anatol Belski | 2014-08-27 | 4 | -8/+8 |
| | |||||
* | master renames phase 7PRE_AST_MERGE | Anatol Belski | 2014-08-25 | 4 | -6/+6 |
| | |||||
* | master renames phase 1 | Anatol Belski | 2014-08-25 | 6 | -115/+115 |
| | |||||
* | basic macro replacements, all at once | Anatol Belski | 2014-08-19 | 6 | -118/+118 |
| | |||||
* | Fixed invalid free | Xinchen Hui | 2014-07-30 | 1 | -7/+0 |
| | |||||
* | ext/interbase support (incomplete) | Dmitry Stogov | 2014-07-29 | 9 | -279/+309 |
| | |||||
* | Merge branch 'master' into refactoring2 | Dmitry Stogov | 2014-05-05 | 1 | -0/+1 |
|\ | | | | | | | | | | | Conflicts: Zend/zend_hash.c ext/date/php_date.c | ||||
| * | Merge branch 'PHP-5.6' | Anatol Belski | 2014-05-05 | 1 | -0/+1 |
| |\ | | | | | | | | | | | | | * PHP-5.6: fixed ZEND_DEBUG usage | ||||
| | * | fixed ZEND_DEBUG usage | Anatol Belski | 2014-05-05 | 1 | -0/+1 |
| | | | |||||
* | | | Merge mainstream 'master' branch into refactoring | Dmitry Stogov | 2014-04-26 | 12 | -29/+2 |
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| * | | Merge branch 'PHP-5.6' | Popa Adrian Marius | 2014-04-10 | 12 | -23/+2 |
| |\ \ | | |/ | | | | | | | | | | * PHP-5.6: Cleanup $ is not needed for git | ||||
| | * | Merge branch 'PHP-5.4' into PHP-5.5 | Popa Adrian Marius | 2014-04-10 | 12 | -23/+2 |
| | |\ | | | | | | | | | | | | | | | | | * PHP-5.4: Cleanup $ is not needed for git | ||||
| | | * | Cleanup $ is not needed for git | Popa Adrian Marius | 2014-04-10 | 12 | -23/+2 |
| | | | | |||||
| | | * | Bump year | Xinchen Hui | 2014-01-03 | 8 | -8/+8 |
| | | | | |||||
| | | * | Merge branch 'pull-request/341' | Stanislav Malyshev | 2013-06-10 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | * pull-request/341: (23 commits) typofixes | ||||
| | | * | Happy New Year | Xinchen Hui | 2013-01-01 | 8 | -8/+8 |
| | | | | |||||
| | * | | Bump year | Xinchen Hui | 2014-01-03 | 8 | -8/+8 |
| | | | | |||||
| * | | | cleanup old unsupported versions of Firebird 1.0.x | Popa Adrian Marius | 2014-04-08 | 1 | -6/+0 |
| | | | | |||||
* | | | | Cleanup (1-st round) | Dmitry Stogov | 2014-04-15 | 2 | -17/+17 |
|/ / / | |||||
* | | | Bump year | Xinchen Hui | 2014-01-03 | 8 | -8/+8 |
|/ / | |||||
* | | Fix long-standing visual pain point: the misalignment of './configure help' ↵ | Christopher Jones | 2013-08-06 | 1 | -1/+1 |
| | | | | | | | | | | | | text. Whitespace changes and a couple of grammar fixes. | ||||
* | | Merge branch 'pull-request/341' | Stanislav Malyshev | 2013-06-10 | 1 | -2/+2 |
| | | | | | | | | | | * pull-request/341: (23 commits) typofixes | ||||
* | | Happy New Year | Xinchen Hui | 2013-01-01 | 8 | -8/+8 |
| | | |||||
* | | Merge branch 'PHP-5.4' | Xinchen Hui | 2012-10-10 | 2 | -0/+0 |
|\ \ | |/ | |||||
| * | Merge branch 'PHP-5.3' into PHP-5.4 | Xinchen Hui | 2012-10-10 | 2 | -0/+0 |
| |\ | |||||
| | * | Remove executable permission on inc | Xinchen Hui | 2012-10-10 | 2 | -0/+0 |
| | | | |||||
* | | | Merge branch 'PHP-5.4' | Xinchen Hui | 2012-10-10 | 1 | -0/+0 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'PHP-5.3' into PHP-5.4 | Xinchen Hui | 2012-10-10 | 1 | -0/+0 |
| |\ \ | | |/ | |||||
| | * | Remove executable permission on phpt | Xinchen Hui | 2012-10-10 | 1 | -0/+0 |
| | | | |||||
* | | | Merge branch 'PHP-5.4' | Xinchen Hui | 2012-10-09 | 1 | -0/+0 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'PHP-5.3' into PHP-5.4 | Xinchen Hui | 2012-10-09 | 1 | -0/+0 |
| |\ \ | | |/ | |||||
| | * | Fixed bug #63236 (Executable permission on various source files) | Xinchen Hui | 2012-10-09 | 1 | -0/+0 |
| | | | |||||
| | * | year++ | Xinchen Hui | 2012-09-05 | 1 | -1/+1 |
| | | | |||||
* | | | Merge branch 'PHP-5.4' | Popa Adrian Marius | 2012-03-29 | 1 | -2/+2 |
|\ \ \ | |/ / | | | | | | | | | | * PHP-5.4: Fix firebird bug #60947 , tested and now it prints the header page information from database | ||||
| * | | Merge branch 'PHP-5.3' into PHP-5.4 | Popa Adrian Marius | 2012-03-29 | 1 | -2/+2 |
| |\ \ | | |/ | | | | | | | | | | * PHP-5.3: Fix firebird bug #60947 , tested and now it prints the header page information from database | ||||
| | * | Fix firebird bug #60947 , tested and now it prints the header page ↵ | Popa Adrian Marius | 2012-03-29 | 1 | -2/+2 |
| | | | | | | | | | | | | information from database | ||||
| | * | Fixed bug #60947 (Segmentation fault while executing ibase_db_info) | Ilia Alshanetsky | 2012-03-15 | 1 | -0/+1 |
| | | | |||||
| | * | Fix #60802 ibase_trans() gives segfault when passing params (The &argn ↵ | Popa Adrian Marius | 2012-01-19 | 1 | -1/+2 |
| | | | | | | | | | | | | passed to zend_parse_parameters shall be a pointer to an integer, not to an unsigned short.) | ||||
| | * | sync firebird test 003 with the 5.4 branch , eliminate failing test ↵ | Popa Adrian Marius | 2012-01-10 | 1 | -12/+12 |
| | | | | | | | | | | | | http://gcov.php.net/viewer.php?version=PHP_5_3&func=tests&file=ext%2Finterbase%2Ftests%2F003.phpt |