summaryrefslogtreecommitdiff
path: root/ext/com_dotnet
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into refactoring2Dmitry Stogov2014-05-054-1/+113
|\ | | | | | | | | | | Conflicts: Zend/zend_hash.c ext/date/php_date.c
| * Merge branch 'PHP-5.5' into PHP-5.6Anatol Belski2014-04-294-1/+113
| |\ | | | | | | | | | | | | | | | * PHP-5.5: updated NEWS Fixed bug #66431 Special Character via COM Interface (CP_UTF8)
| | * Merge branch 'PHP-5.4' into PHP-5.5Anatol Belski2014-04-294-1/+113
| | |\ | | | | | | | | | | | | | | | | * PHP-5.4: Fixed bug #66431 Special Character via COM Interface (CP_UTF8)
| | | * Fixed bug #66431 Special Character via COM Interface (CP_UTF8)Anatol Belski2014-04-294-1/+113
| | | |
| | | * Bump yearXinchen Hui2014-01-0314-14/+14
| | | |
| | * | Bump yearXinchen Hui2014-01-0314-14/+14
| | | |
* | | | Merge mainstream 'master' branch into refactoringDmitry Stogov2014-04-261-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | Fix bug #66015 by reverting "Removed operations on constant arrays."Bob Weinand2014-04-111-1/+1
| | | |
* | | | Use better data structures (incomplete)Dmitry Stogov2014-02-101-3/+3
|/ / /
* | | Bump yearXinchen Hui2014-01-0314-14/+14
|/ /
* | HASH_KEY_NON_EXISTANT fixVeres Lajos2013-07-212-4/+4
| |
* | Merge branch 'PHP-5.4' into PHP-5.5Felipe Pena2013-06-251-1/+2
|\ \ | |/ | | | | | | | | | | * PHP-5.4: - Fixed bug #62475 (variant_* functions causes crash when null given as an argument) Update NEWS - BFN
| * - Fixed bug #62475 (variant_* functions causes crash when null given as an ↵Felipe Pena2013-06-251-1/+2
| | | | | | | | argument)
| * Merge branch 'pull-request/341'Stanislav Malyshev2013-06-101-1/+1
| | | | | | | | | | * pull-request/341: (23 commits) typofixes
| * Happy New YearXinchen Hui2013-01-0114-14/+14
| |
* | Merge branch 'pull-request/341'Stanislav Malyshev2013-06-101-1/+1
| | | | | | | | | | * pull-request/341: (23 commits) typofixes
* | Add support for non-scalar Iterator keys in foreachNikita Popov2013-03-122-10/+8
| | | | | | | | RFC: https://wiki.php.net/rfc/foreach-non-scalar-keys
* | Happy New YearXinchen Hui2013-01-0114-14/+14
|/
* Merge branch 'PHP-5.3' into PHP-5.4Xinchen Hui2012-10-101-0/+0
|\
| * Remove executable permission on phptXinchen Hui2012-10-101-0/+0
| |
* | Merge branch 'PHP-5.3' into PHP-5.4Xinchen Hui2012-10-091-0/+0
|\ \ | |/
| * Fixed bug #63236 (Executable permission on various source files)Xinchen Hui2012-10-091-0/+0
| |
* | Merge branch 'PHP-5.3' into PHP-5.4Johannes Schlüter2012-05-258-28/+36
|\ \ | |/ | | | | | | | | | | * PHP-5.3: Fix bug #62146 com_dotnet cannot be built shared, tested by Anatoliy Those changes are in 5.3.15 - BFN
| * Fix bug #62146 com_dotnet cannot be built shared, tested by AnatoliyJohannes Schlüter2012-05-258-28/+36
| |
* | Merge branch 'PHP-5.3' into PHP-5.4Anatoliy Belsky2012-04-031-0/+14
|\ \ | |/ | | | | | | * PHP-5.3: Fix bug #61481 Test Bug - ext/com_dotnet/tests/bug49192
| * Fix bug #61481 Test Bug - ext/com_dotnet/tests/bug49192Anatoliy Belsky2012-04-031-0/+14
| |
| * - Year++Felipe Pena2012-01-0114-14/+14
| |
| * - Fix #55301 (com_dotnet part) check if malloc succededPierre Joye2011-07-281-0/+3
| |
| * - Make usage of new PHP_FE_END macroFelipe Pena2011-07-252-2/+2
| |
| * - this function is only in trunkPierre Joye2011-01-201-1/+1
| |
| * - fail when no known op are givenPierre Joye2011-01-201-0/+2
| |
| * - unused varPierre Joye2011-01-201-1/+0
| |
| * - fail when no known op are givenPierre Joye2011-01-201-0/+3
| |
| * - kill local redeclarationPierre Joye2011-01-201-5/+5
| |
| * - init err (and simplify)Pierre Joye2011-01-201-2/+1
| |
| * - Year++Felipe Pena2011-01-0114-14/+14
| |
| * - fix #39863, do not accept paths with NULL in them. See ↵Pierre Joye2010-11-181-0/+7
| | | | | | | | http://news.php.net/php.internals/50191, trunk will have the patch later (adding a macro and/or changing (some) APIs. Patch by Rasmus
| * fix #49192 - crash in GC when get_properties handler returns nullStanislav Malyshev2010-04-011-0/+13
| |
* | - Year++Felipe Pena2012-01-0114-14/+14
| |
* | Fixed bug #60167 (Crash / memory corruption in ext/com_dotnet) (Timm Friebe).Dmitry Stogov2011-11-252-9/+12
| |
* | fixes for bug #55748Stanislav Malyshev2011-11-181-0/+4
| |
* | - Fix #55301 (com_dotnet part) check if malloc succededPierre Joye2011-07-281-0/+3
| |
* | - Make usage of new PHP_FE_END macroFelipe Pena2011-07-252-2/+2
| |
* | - Added new parameter parsing option (p - for valid path (string without ↵Felipe Pena2011-06-061-2/+2
| | | | | | | | | | | | | | | | null byte in the middle)) # The tests will be fixed in the next commits
* | - fail when no known op are givenPierre Joye2011-01-201-0/+2
| |
* | - unused varPierre Joye2011-01-201-1/+0
| |
* | - fail when no known op are givenPierre Joye2011-01-201-0/+3
| |
* | - kill local redeclarationPierre Joye2011-01-201-5/+5
| |
* | - init err (and simplify)Pierre Joye2011-01-201-3/+1
| |
* | - init errPierre Joye2011-01-201-2/+3
| |
View Lorry Controller Status