Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | Merge branch 'PHP-5.5' into PHP-5.6 | Ferenc Kovacs | 2015-07-07 | 1 | -1/+1 | |
| |\ \ | | |/ | | | | | | | | | | * PHP-5.5: add missing second argument for ucfirst to the proto | |||||
| | * | Merge branch 'PHP-5.4' into PHP-5.5 | Ferenc Kovacs | 2015-07-07 | 1 | -1/+1 | |
| | |\ | | | | | | | | | | | | | | | | | * PHP-5.4: add missing second argument for ucfirst to the proto | |||||
| | | * | add missing second argument for ucfirst to the proto | Ferenc Kovacs | 2015-07-07 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | Merge branch 'PHP-5.5' into PHP-5.6 | Stanislav Malyshev | 2015-05-12 | 1 | -1/+5 | |
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.5: fix format update NEWS Add test for bug #69522 Update tests Fix bug #69522 - do not allow int overflow Forgot test file Fix bug #69403 and other int overflows Fixed bug #69418 - more s->p fixes for filenames Fixed bug #69364 - use smart_str to assemble strings Fix bug #69453 - don't try to cut empty string Fix bug #69545 - avoid overflow when reading list Conflicts: ext/standard/pack.c | |||||
| | * | | Merge branch 'PHP-5.4' into PHP-5.5 | Stanislav Malyshev | 2015-05-12 | 1 | -2/+6 | |
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.4: fix format update NEWS Add test for bug #69522 Update tests Fix bug #69522 - do not allow int overflow Forgot test file Fix bug #69403 and other int overflows Fixed bug #69418 - more s->p fixes for filenames Fixed bug #69364 - use smart_str to assemble strings Fix bug #69453 - don't try to cut empty string Fix bug #69545 - avoid overflow when reading list Conflicts: ext/pcntl/pcntl.c ext/standard/basic_functions.c ext/standard/pack.c ext/standard/tests/dir/opendir_variation1-win32.phpt | |||||
| | | * | Fix bug #69403 and other int overflows | Stanislav Malyshev | 2015-05-10 | 1 | -2/+6 | |
| | | | | ||||||
| * | | | Merge branch 'PHP-5.5' into PHP-5.6 | Stanislav Malyshev | 2015-01-31 | 1 | -1/+1 | |
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | * PHP-5.5: Add mitigation for CVE-2015-0235 (bug #68925) Add mitigation for CVE-2015-0235 (bug #68925) | |||||
| | * | | Add mitigation for CVE-2015-0235 (bug #68925) | Stanislav Malyshev | 2015-01-31 | 1 | -1/+1 | |
| | | | | ||||||
| | * | | Bump year | Xinchen Hui | 2015-01-15 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | bump year | Xinchen Hui | 2015-01-15 | 1 | -1/+1 | |
| | | | | ||||||
* | | | | Unnecessary duplication | Xinchen Hui | 2015-07-02 | 1 | -1/+1 | |
| | | | | ||||||
* | | | | Cleanup (avoid reallocatios and side effects in php_strip_tags) | Dmitry Stogov | 2015-07-01 | 1 | -27/+13 | |
| | | | | ||||||
* | | | | Use ZSTR_ API to access zend_string elements (this is just renaming without ↵ | Dmitry Stogov | 2015-06-30 | 1 | -396/+396 | |
| | | | | | | | | | | | | | | | | semantick changes). | |||||
* | | | | refix the negative zend_long to size_t casts | Anatol Belski | 2015-06-29 | 1 | -15/+12 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is no good way to fix this for 32-bit without enormously overcomplicating the logic. Therefore switching back to the previous code and adding the casts to ensure there are no sudden casts of negative to size_t. | |||||
* | | | | Improved zend_string API (Francois Laupretre) | Dmitry Stogov | 2015-06-29 | 1 | -14/+14 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Squashed commit of the following: commit d96eab8d79b75ac83d49d49ae4665f948d15a804 Author: Francois Laupretre <francois@tekwire.net> Date: Fri Jun 26 01:23:31 2015 +0200 Use the new 'ZSTR' macros in the rest of the code. Does not change anything to the generated code (thanks to compat macros) but cleaner. commit b3526439104ac7a89a8e0c79dbebf33b22bd01b8 Author: Francois Laupretre <francois@tekwire.net> Date: Thu Jun 25 13:45:06 2015 +0200 Improve zend_string API Add missing methods | |||||
* | | | | fix more places with subtle negative zend_long to size_t cast | Anatol Belski | 2015-06-29 | 1 | -4/+6 | |
| | | | | ||||||
* | | | | remove useless check | Anatol Belski | 2015-06-29 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | thanks Yasuo :) | |||||
* | | | | remove comment | Anatol Belski | 2015-06-29 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | f and l are the $start and $length, since they come from the user land, they only can be zend_long | |||||
* | | | | fix negative zend_long to size_t cast | Anatol Belski | 2015-06-29 | 1 | -2/+3 | |
| | | | | ||||||
* | | | | removed unreachable code in the substr_replace function | Edgar R. Sandi | 2015-06-29 | 1 | -3/+1 | |
| | | | | ||||||
* | | | | Micro optimization | Xinchen Hui | 2015-06-24 | 1 | -2/+3 | |
| | | | | ||||||
* | | | | Fix more proto comments | Rasmus Lerdorf | 2015-06-23 | 1 | -2/+2 | |
| | | | | ||||||
* | | | | Revert "Simplify php_implode(). Fill the resulting string in direct order." | Dmitry Stogov | 2015-06-23 | 1 | -13/+43 | |
| | | | | | | | | | | | | | | | | | | | | | | | | The patch slightly improved performance of string imploding, but reduced speed of integers imploding. This reverts commit 36d39b70443dcefeeb62d189ce67b414caf5486a. | |||||
* | | | | Simplify php_implode(). Fill the resulting string in direct order. | Dmitry Stogov | 2015-06-23 | 1 | -43/+13 | |
| | | | | ||||||
* | | | | Fix bug #62922 | Nikita Popov | 2015-06-20 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | Off by one error... | |||||
* | | | | Remove unused var | Xinchen Hui | 2015-06-20 | 1 | -2/+1 | |
| | | | | ||||||
* | | | | Improve strtr (Fixed a bug which the lenth check doesn't work at all) | Xinchen Hui | 2015-06-19 | 1 | -11/+12 | |
| | | | | ||||||
* | | | | Fixed bug #69872 (uninitialised value in strtr with array) | Xinchen Hui | 2015-06-18 | 1 | -11/+10 | |
| | | | | ||||||
* | | | | Get rid of more ZVAL_ZVAL() macros | Dmitry Stogov | 2015-06-12 | 1 | -1/+2 | |
| | | | | ||||||
* | | | | Avoid zval duplication in ZVAL_ZVAL() macro (it was necessary only in few ↵ | Dmitry Stogov | 2015-06-12 | 1 | -3/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | places). Switch from ZVAL_ZVAL() to simpler macros where possible (it makes sense to review remaining places) | |||||
* | | | | Ran wrong tests, fixed bug in impl; simplified | Bob Weinand | 2015-05-26 | 1 | -1/+9 | |
| | | | | ||||||
* | | | | Speed up implod()'ing between 5% and 30% (by time) | Bob Weinand | 2015-05-26 | 1 | -8/+30 | |
| | | | | | | | | | | | | | | | | | | | | Significantly speed up implode()'ing on integers now... Previously I accidentally committed the first part of the patch in 69b54ba926b714dff0f8b54bea385e9a278c5849 | |||||
* | | | | Also unreserve T_CLASS | Bob Weinand | 2015-05-25 | 1 | -52/+32 | |
| | | | | ||||||
* | | | | Improve strtr() | Dmitry Stogov | 2015-05-15 | 1 | -46/+24 | |
| | | | | ||||||
* | | | | e more efficient zend_hash_*() functions | Dmitry Stogov | 2015-05-05 | 1 | -7/+15 | |
| | | | | ||||||
* | | | | Cleanup substr_replace | Nikita Popov | 2015-04-27 | 1 | -67/+24 | |
| | | | | ||||||
* | | | | fix compilation with vc14 | Anatol Belski | 2015-04-22 | 1 | -1/+4 | |
| | | | | ||||||
* | | | | Optimize zend_string_realloc() add more specialized versions ↵ | Dmitry Stogov | 2015-03-20 | 1 | -7/+7 | |
| | | | | | | | | | | | | | | | | zend_string_extend() and zend_string_truncate() | |||||
* | | | | Use specialized macro for string zval creation | Dmitry Stogov | 2015-03-12 | 1 | -9/+9 | |
| | | | | ||||||
* | | | | Fixed bug #69144 (strtr not replacing with partly matching replace pairs) | Xinchen Hui | 2015-02-28 | 1 | -1/+1 | |
| | | | | ||||||
* | | | | fix incompatible pointer type | Anatol Belski | 2015-02-11 | 1 | -1/+1 | |
| | | | | ||||||
* | | | | Get rid of old HashTable iteration API | Dmitry Stogov | 2015-02-10 | 1 | -35/+60 | |
| | | | | ||||||
* | | | | Fixed segfault introduced in f869bf3829c6b2c94011747c69ed8f32412c9e03 | Xinchen Hui | 2015-01-30 | 1 | -0/+1 | |
| | | | | ||||||
* | | | | minor CS fix | Xinchen Hui | 2015-01-27 | 1 | -1/+1 | |
| | | | | ||||||
* | | | | fix failure with shared zvals in php_str_replace_in_subject | Márcio Almada | 2015-01-27 | 1 | -5/+10 | |
| | | | | ||||||
* | | | | remove unused var, make string.c compilation zero warnings | Márcio Almada | 2015-01-24 | 1 | -2/+0 | |
| | | | | ||||||
* | | | | Fix one more leak when wrong $needle type provide of strripos | Reeze Xia | 2015-01-23 | 1 | -0/+1 | |
| | | | | ||||||
* | | | | Fixed memory leak of strripos() when empty needle or haystack | Reeze Xia | 2015-01-23 | 1 | -0/+1 | |
| | | | | ||||||
* | | | | Revert "Fixed valgrind reported issue with setlocale" | Xinchen Hui | 2015-01-22 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | This reverts commit fa06343d7e0e04f4a660218f6dbb7ce18c3f090b. | |||||
* | | | | Fixed valgrind reported issue with setlocale | Xinchen Hui | 2015-01-21 | 1 | -1/+1 | |
| | | | |