summaryrefslogtreecommitdiff
path: root/ext
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into phpngPOST_PHPNG_MERGEDmitry Stogov2014-08-151-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | * master: add NEWS for 5.6 too Fix bug #67716 - Segfault in cdf.c Fix bug #67716 - Segfault in cdf.c fix test split the glob() test to test different basedir fixed glob() edge case on windows, ref bug #47358 - fix bug #47358, glob returns error, should be empty array() Add NEWS entry for log() improvements
| * Merge branch 'PHP-5.6'Stanislav Malyshev2014-08-141-1/+1
| |\ | | | | | | | | | | | | | | | * PHP-5.6: Fix bug #67716 - Segfault in cdf.c Fix bug #67716 - Segfault in cdf.c
| | * Merge branch 'PHP-5.5' into PHP-5.6Stanislav Malyshev2014-08-141-1/+1
| | |\ | | | | | | | | | | | | | | | | | | | | * PHP-5.5: Fix bug #67716 - Segfault in cdf.c Fix bug #67716 - Segfault in cdf.c
| | | * Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2014-08-141-1/+1
| | | |\ | | | | | | | | | | | | | | | | | | | | * PHP-5.4: Fix bug #67716 - Segfault in cdf.c
| | | | * Fix bug #67716 - Segfault in cdf.cRemi Collet2014-08-141-1/+1
| | | | |
| | | * | Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2014-08-141-1/+2
| | | |\ \ | | | | |/ | | | | | | | | | | | | | | | * PHP-5.4: fix test
| | | | * fix testStanislav Malyshev2014-08-141-1/+2
| | | | |
| | | * | Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2014-08-144-39/+99
| | | |\ \ | | | | |/ | | | | | | | | | | | | | | | * PHP-5.4: split the glob() test to test different basedir
| | | | * split the glob() test to test different basedirAnatol Belski2014-08-144-39/+99
| | | | |
| | | * | Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2014-08-142-4/+60
| | | |\ \ | | | | |/ | | | | | | | | | | | | | | | | | | | | * PHP-5.4: fixed glob() edge case on windows, ref bug #47358 - fix bug #47358, glob returns error, should be empty array()
| | | | * fixed glob() edge case on windows, ref bug #47358Anatol Belski2014-08-142-0/+57
| | | | |
| | | | * - fix bug #47358, glob returns error, should be empty array()Pierre Joye2014-08-142-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ext/standard/dir.c
| | | * | Some changes were lost in the merge commit of #66091Tjerk Meesters2014-08-131-4/+14
| | | | |
| | | * | Fixed #66091Tjerk Meesters2014-08-132-16/+22
| | | | |
* | | | | Fixed modeDmitry Stogov2014-08-142-0/+0
| | | | |
* | | | | Fixed compilation warningsDmitry Stogov2014-08-142-2/+2
| | | | |
* | | | | Fixed windows buildDmitry Stogov2014-08-141-1/+1
| | | | |
* | | | | Merge branch 'master' into phpngDmitry Stogov2014-08-144-26/+73
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (51 commits) Update Git rules Back to -dev (with EOL notice in NEWS) new NEWS block for the next release It's 2014 already, fix copyright year where user visible PHP 5.3.29 Some changes were lost in the merge commit of #66091 Updated NEWS for #66091 Fixed #66091 Updated NEWS for #66091 Updated NEWS for #66091 Fixed #66091 updated NEWS updated NEWS updated NEWS backported the fix for bug #41577 NEWS entry for e6d93a1 / d73d44c restore FPM compatibility with mod_fastcgi broken since #694 / 67541, fixes bug 67606 Revert "Merge branch 'pull-request/694' into PHP-5.6" PHP 5.3.29RC1 Fix missing type checks in various functions ... Conflicts: ext/date/php_date.c ext/standard/math.c
| * | | | Merge branch 'pull-request/658'Sara Golemon2014-08-142-8/+21
| |\ \ \ \
| | * | | | Improved logarithm of base 2 and 10 of standard math functionsMarc Bennewitz2014-04-282-8/+21
| | | | | |
| * | | | | Merge branch 'PHP-5.6'Tjerk Meesters2014-08-132-20/+28
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.6: Updated NEWS for #66091 Updated NEWS for #66091 Fixed #66091
| | * | | | Merge branch 'PHP-5.5' into PHP-5.6Tjerk Meesters2014-08-132-20/+28
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.5: Updated NEWS for #66091 Fixed #66091 Conflicts: ext/date/php_date.c
| | | * \ \ \ Merge branch 'PHP-5.4' into PHP-5.5Tjerk Meesters2014-08-132-20/+36
| | | |\ \ \ \ | | | | |_|/ / | | | |/| | / | | | | | |/ | | | | |/| | | | | | | | | | | | | | | | | | | * PHP-5.4: Fixed #66091 Conflicts: ext/date/php_date.c
| | | | * | Fixed #66091Tjerk Meesters2014-08-132-15/+21
| | | | | |
| | * | | | Merge branch 'PHP-5.5' into PHP-5.6Anatol Belski2014-08-121-3/+30
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.5: updated NEWS updated NEWS backported the fix for bug #41577
| | | * | | Merge branch 'PHP-5.4' into PHP-5.5Anatol Belski2014-08-121-3/+30
| | | |\ \ \ | | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.4: updated NEWS backported the fix for bug #41577
| | | | * | backported the fix for bug #41577Anatol Belski2014-08-121-3/+30
| | | | | |
| * | | | | Merge branch 'pull-request/681'Anatol Belski2014-08-121-3/+30
| |\ \ \ \ \
| | * | | | | Bug #41577 fix: reinitialization of dotnet_domain structure memberAidas Kasparas2014-05-221-3/+30
| | | | | | |
* | | | | | | Restored "???" mark in the place that might be changed laterDmitry Stogov2014-08-141-2/+2
| | | | | | |
* | | | | | | It's okey for use a stack value here (deleted immediately after use)Xinchen Hui2014-08-141-1/+1
| | | | | | |
* | | | | | | cleanupXinchen Hui2014-08-141-6/+4
| | | | | | |
* | | | | | | Merge branch 'phpng' of https://git.php.net/repository/php-src into phpngXinchen Hui2014-08-1422-457/+335
|\ \ \ \ \ \ \
| * | | | | | | Avoid reallocationDmitry Stogov2014-08-132-57/+51
| | | | | | | |
| * | | | | | | cleanuo (use zend_string instead of char*)Dmitry Stogov2014-08-131-5/+3
| | | | | | | |
| * | | | | | | cleanupDmitry Stogov2014-08-131-1/+0
| | | | | | | |
| * | | | | | | cleanupDmitry Stogov2014-08-136-57/+30
| | | | | | | |
| * | | | | | | cleanupDmitry Stogov2014-08-137-240/+188
| | | | | | | |
| * | | | | | | cleanupDmitry Stogov2014-08-131-2/+2
| | | | | | | |
| * | | | | | | cleanup (use zend_string* instead of char*)Dmitry Stogov2014-08-136-80/+56
| | | | | | | |
| * | | | | | | cleanupDmitry Stogov2014-08-131-15/+5
| | | | | | | |
* | | | | | | | clean up - remove checked questionsXinchen Hui2014-08-133-6/+4
|/ / / / / / /
* | | | | | | clean up - avoid reallocXinchen Hui2014-08-137-27/+24
| | | | | | |
* | | | | | | Merge branch 'master' into phpngDmitry Stogov2014-08-125-12/+12
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: fix the failing date tests introduced with the latest timezonedb update Derick confirmed on irc that the new/current behavior is the correct and that the tests should be updated to reflect it Fixed bug #67813 (CachingIterator::__construct InvalidArgumentException wrong message)
| * | | | | | Merge branch 'PHP-5.6'Ferenc Kovacs2014-08-123-10/+10
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | * PHP-5.6: fix the failing date tests introduced with the latest timezonedb update Derick confirmed on irc that the new/current behavior is the correct and that the tests should be updated to reflect it
| | * | | | | Merge branch 'PHP-5.5' into PHP-5.6Ferenc Kovacs2014-08-123-10/+10
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | | | | | | | | | | | | | | | | * PHP-5.5: fix the failing date tests introduced with the latest timezonedb update Derick confirmed on irc that the new/current behavior is the correct and that the tests should be updated to reflect it
| | | * | | | Merge branch 'PHP-5.4' into PHP-5.5Ferenc Kovacs2014-08-123-10/+10
| | | |\ \ \ \ | | | | | |/ / | | | | |/| | | | | | | | | | | | | | | | * PHP-5.4: fix the failing date tests introduced with the latest timezonedb update Derick confirmed on irc that the new/current behavior is the correct and that the tests should be updated to reflect it
| | | | * | | fix the failing date tests introduced with the latest timezonedb updateFerenc Kovacs2014-08-123-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Derick confirmed on irc that the new/current behavior is the correct and that the tests should be updated to reflect it
| * | | | | | Merge branch 'PHP-5.6'Xinchen Hui2014-08-116-6/+10
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge branch 'PHP-5.5' into PHP-5.6Xinchen Hui2014-08-116-6/+10
| | |\ \ \ \ \ | | | |/ / / /
View Lorry Controller Status