summaryrefslogtreecommitdiff
path: root/ext/mbstring
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into native-tlsAnatol Belski2014-12-175-1/+6
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * origin/master: fix unserializer patch move this entry to the correct version add missing NEWS entry add missing NEWS entry Updated or skipped certain 32-bit tests add NEWS entry for #68594 5.4.37 add more BC breaks update news add CVE add missing test file Fix bug #68594 - Use after free vulnerability in unserialize() Fix typo Hash value must not zero?
| * Updated or skipped certain 32-bit testsAndrea Faulds2014-12-175-1/+6
| |
* | first shot remove TSRMLS_* thingsAnatol Belski2014-12-139-267/+267
| |
* | Merge remote-tracking branch 'origin/master' into native-tlsAnatol Belski2014-11-271-40/+59
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * origin/master: updated NEWS refactored the mbstring config.w32 Update NEWS Fixed compilation warnings Fixed bug #68504 --with-libmbfl configure option not present on Windows Changed "finally" handling. Removed EX(fast_ret) and EX(delayed_exception). Allocate and use additional IS_TMP_VAR slot on VM stack instead. the darwin specific test fails for me with the same output which is the expected for the original test I couldn't find anybody who managed to see this test passing, but I found a bunch of other reports on qa.php.net/reports and on google which do see this test failing on mac. if this change causes you to have this test failing on Mac, please drop me a mail so we can improve the current test so it passes for everybody. #68446 is fixed Reimplemented silence operator (@) handling on exceptions. Now each silence region is stored in op_array->brk_cont_array. On exception ZEND_HANDLE_EXCEPTION handler traverse this array and restore original EG(error_reporting) if exception occured inside a "silence" region. remove the NEWS entries for the reverted stuff typo fix go back with phpdbg to the state of 5.6.3, reverting the controversial commits(remote debugging/xml protocol) 5.5.21 now New label length test Fix ext/filter/tests/033.phpt Fix filter_list test FILTER_VALIDATE_DOMAIN and RFC conformance for FILTER_VALIDATE_URL Conflicts: ext/mbstring/config.w32
| * Merge branch 'PHP-5.6'Anatol Belski2014-11-271-40/+59
| |\ | | | | | | | | | | | | | | | | | | * PHP-5.6: updated NEWS refactored the mbstring config.w32 Fixed bug #68504 --with-libmbfl configure option not present on Windows
| | * Merge branch 'PHP-5.5' into PHP-5.6Anatol Belski2014-11-271-40/+59
| | |\ | | | | | | | | | | | | | | | | | | | | * PHP-5.5: refactored the mbstring config.w32 Fixed bug #68504 --with-libmbfl configure option not present on Windows
| | | * refactored the mbstring config.w32Anatol Belski2014-11-271-28/+20
| | | |
| | | * Fixed bug #68504 --with-libmbfl configure option not present on WindowsAnatol Belski2014-11-271-46/+73
| | | |
| | * | typo fixes - https://github.com/vlajos/misspell_fixerVeres Lajos2014-11-235-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ext/ftp/ftp.h ext/pcre/pcrelib/pcre_printint.c ext/pcre/pcrelib/sljit/sljitLir.c ext/pcre/pcrelib/sljit/sljitLir.h ext/pcre/pcrelib/sljit/sljitNativeARM_32.c ext/pcre/pcrelib/sljit/sljitNativeTILEGX_64.c ext/pgsql/pgsql.c ext/phar/func_interceptors.c ext/soap/soap.c ext/standard/image.c
* | | | Merge remote-tracking branch 'origin/master' into native-tlsAnatol Belski2014-11-265-6/+6
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * origin/master: (102 commits) fix dir separator in test fix TS build fix TS build Better fix for bug #68446 Revert "Merge remote-tracking branch 'origin/PHP-5.6'" Revert NEWS and set test to XFAIL Revert "Fix bug #68446 (bug with constant defaults and type hints)" Improved zend_hash_clean() and added new optimized zend_symtable_clean() Use inline version of zval_ptr_dtor() Added new optimized zend_array_destroy() function Moved i_zval_ptr_dtor() from zend_execute.h to zend_variables.h fix REGISTER_NS_*_CONSTANT macros Removed useless assert. EG(uninitialized_zval) can't be refcounted. Use specialized destructors when types of zvals are known. move tests into proper place Improved assignment to object property Reuse zend_assign_to_variable() in zend_std_write_property() cleanup comments from svn/cvs era fix dir separator in test fork test for windows ...
| * | | typo fixes - https://github.com/vlajos/misspell_fixerVeres Lajos2014-11-235-6/+6
| | | |
* | | | fix arg order, CFLAGS is the fifth arg in m4Anatol Belski2014-10-171-2/+2
| | | |
* | | | more exts converted for static tsrm ls pointerAnatol Belski2014-10-154-3/+11
|/ / / | | | | | | | | | mbstring, pcre, reflection
* | | Review a few more SEPARATE_ZVAL_IF_NOT_REF usagesNikita Popov2014-10-091-2/+1
| | |
* | | removed *.dsw and *.dsp filesAnatol Belski2014-09-281-1112/+0
| | |
* | | Move smart_str implementation into Zend/Nikita Popov2014-09-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | Merge branch 'master' into issue-67910Florian MARGAINE2014-09-2012-46/+39
|\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: README.PARAMETER_PARSING_API ext/gmp/tests/001.phpt
| * | | reduce the struct size by 8 byte on 64 bitAnatol Belski2014-09-201-4/+4
| | | |
| * | | s/PHP 5/PHP 7/Johannes Schlüter2014-09-198-8/+8
| | | |
| * | | simplify conditionAnatol Belski2014-09-191-1/+1
| | | |
| * | | fix empty string checkAnatol Belski2014-09-191-1/+1
| | | |
| * | | remove useless conditionAnatol Belski2014-09-191-1/+1
| | | |
| * | | redo the fix casting to size_t where applicableAnatol Belski2014-09-162-2/+2
| | | |
| * | | fix signed/unsigned mismatch warningsAnatol Belski2014-09-161-2/+2
| | | |
| * | | fixed signed/unsigned mismatch warningAnatol Belski2014-09-161-1/+1
| | | |
| * | | Fix yy_limit computation after encoding switchNikita Popov2014-09-112-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The three assignments above this line are still broken - they assume that byte offsets in one encoding directly map to byte offsets in another encoding. I'm fixing the length here because it is the one causing out-of-bounds reads and is easy to fix. For the others we'd have to actually compute new offsets.
| * | | Remove self-contradictory zend multibyte assertionNikita Popov2014-09-112-2/+3
| | | | | | | | | | | | | | | | | | | | Code that explicitly exists to handle an incompatible internal encoding should not assert that the internal encoding is compatible.
| * | | Revert "Removing ext/ereg and dependencies"Dmitry Stogov2014-09-116-7/+41
| | | | | | | | | | | | | | | | This reverts commit 86de7963fe69638431c0aa8f413d25e01bf99d68.
| * | | Removing ext/ereg and dependenciesTjerk Meesters2014-09-116-41/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Affected extensions: - opcache (use pcre) - mbstring (removed ereg functions overloading) - pgsql (use pcre) - reflection (test cases using 'ereg') SAPI: - apache (header only) - apache_hooks (header only)
| * | | Refactored INI subsystem to use zend_string* instead of char*Dmitry Stogov2014-09-011-21/+19
| | | |
* | | | Replaces php5 with php7, without whitespace changes.Florian MARGAINE2014-09-202-5/+4
|/ / /
* | | 's' works with size_t round 3Anatol Belski2014-08-272-26/+28
| | |
* | | 's' works with size_t round 2Anatol Belski2014-08-271-2/+2
| | |
* | | first show to make 's' work with size_tAnatol Belski2014-08-272-28/+29
| | |
* | | Fix mbstring overloads in ztsNikita Popov2014-08-271-3/+6
| | |
* | | Unused varialeXinchen Hui2014-08-261-1/+0
| | |
* | | master renames phase 7PRE_AST_MERGEAnatol Belski2014-08-252-9/+9
| | |
* | | master renames phase 3Anatol Belski2014-08-251-1/+1
| | |
* | | master renames phase 1Anatol Belski2014-08-253-86/+86
| | |
* | | fixes to %pd format usageAnatol Belski2014-08-241-1/+1
| | |
* | | fixed incompatible types usageAnatol Belski2014-08-201-1/+1
| | |
* | | ported ext/mbstringAnatol Belski2014-08-192-22/+22
| | |
* | | basic macro replacements, all at onceAnatol Belski2014-08-192-64/+64
| | |
* | | Merge branch 'PHP-5.6'Lior Kaplan2014-08-171-1/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | * PHP-5.6: Correct typo in comments: 'initialized' Conflicts: ext/dom/php_dom.c ext/spl/php_spl.c
| * | Merge branch 'PHP-5.5' into PHP-5.6Lior Kaplan2014-08-171-1/+1
| |\ \ | | |/ | | | | | | | | | * PHP-5.5: Correct typo in comments: 'initialized'
| | * Merge branch 'PHP-5.4' into PHP-5.5Lior Kaplan2014-08-171-1/+1
| | |\ | | | | | | | | | | | | | | | | * PHP-5.4: Correct typo in comments: 'initialized'
| | | * Correct typo in comments: 'initialized'Lior Kaplan2014-08-171-1/+1
| | | |
| | | * tests still failing, so xfail for now until fixedStanislav Malyshev2014-01-292-2/+4
| | | |
| | * | put this test back to XFAIL, as it was before, since it is still leaking memoryFerenc Kovacs2014-04-291-0/+2
| | | |
| | * | tests still failing, so xfail for now until fixedStanislav Malyshev2014-01-292-2/+4
| | | |