summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* noted the TSRM changes to UPGRADING.INTERNALSnative-tlsAnatol Belski2014-12-181-0/+42
* Merge remote-tracking branch 'origin/master' into native-tlsAnatol Belski2014-12-172-1/+17
|\
| * fix integral constant overflow warningPRE_NATIVE_TLS_MERGEAnatol Belski2014-12-171-1/+1
| * Use HUGE PAGES for opcahce SHM, if available.Dmitry Stogov2014-12-171-0/+16
* | integrated the static tsrmls cache into ext/skelAnatol Belski2014-12-173-10/+14
* | Merge remote-tracking branch 'origin/master' into native-tlsAnatol Belski2014-12-172-7/+7
|\ \ | |/
| * Merge branch 'PHP-5.6'Remi Collet2014-12-171-6/+6
| |\
| | * Merge branch 'PHP-5.5' into PHP-5.6Remi Collet2014-12-171-6/+6
| | |\
| | | * Better fix for #68601 for perfRemi Collet2014-12-171-6/+6
| * | | Added EXPECTED(). Most functions have arguments.Dmitry Stogov2014-12-171-1/+1
* | | | remove the thread ctx from curlAnatol Belski2014-12-172-9/+0
* | | | remove unused ZTS macrosAnatol Belski2014-12-171-6/+0
* | | | remove TSRMLS_* occurenceAnatol Belski2014-12-171-2/+2
* | | | enable static tsrmls cache in the embed SAPIAnatol Belski2014-12-172-2/+2
* | | | get rid of TSRMLS_* in the embed SAPIAnatol Belski2014-12-172-26/+12
* | | | Merge remote-tracking branch 'origin/master' into native-tlsAnatol Belski2014-12-1724-71/+109
|\ \ \ \ | |/ / /
| * | | Merge branch 'fix-typo' of https://github.com/gustavotemple/php-srcXinchen Hui2014-12-171-0/+1
| |\ \ \
| | * | | Fix typoGustavo Frederico Temple Pedrosa2014-12-151-0/+1
| * | | | Merge branch 'master' of https://git.php.net/repository/php-srcXinchen Hui2014-12-17143-998/+1373
| |\ \ \ \
| | * | | | fix unserializer patchStanislav Malyshev2014-12-162-36/+32
| | * | | | Merge branch 'PHP-5.6'Ferenc Kovacs2014-12-170-0/+0
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | | * | | move this entry to the correct versionFerenc Kovacs2014-12-171-3/+3
| | * | | | Merge branch 'PHP-5.6'Ferenc Kovacs2014-12-170-0/+0
| | |\ \ \ \ | | | |/ / /
| | | * | | Merge branch 'PHP-5.5' into PHP-5.6Ferenc Kovacs2014-12-170-0/+0
| | | |\ \ \ | | | | | |/ | | | | |/|
| | | | * | add missing NEWS entryFerenc Kovacs2014-12-171-0/+3
| | | | * | Merge branch 'PHP-5.4' into PHP-5.5Ferenc Kovacs2014-12-170-0/+0
| | | | |\ \
| | | | | * | add missing NEWS entryFerenc Kovacs2014-12-171-0/+3
| | | | | * | 5.4.37Stanislav Malyshev2014-12-163-5/+7
| | * | | | | Merge branch 'zppFailOnOverflow'Andrea Faulds2014-12-1718-11/+33
| | |\ \ \ \ \
| | | * | | | | Updated or skipped certain 32-bit testsAndrea Faulds2014-12-1718-11/+33
| | * | | | | | Merge branch 'PHP-5.6'Ferenc Kovacs2014-12-170-0/+0
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | |
| | | * | | | | add NEWS entry for #68594Ferenc Kovacs2014-12-171-0/+2
| | * | | | | | add more BC breaksStanislav Malyshev2014-12-161-0/+5
| | * | | | | | Merge branch 'PHP-5.6'Stanislav Malyshev2014-12-163-60/+72
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | Merge branch 'PHP-5.5' into PHP-5.6Stanislav Malyshev2014-12-163-32/+62
| | | |\ \ \ \ \ | | | | | |/ / / | | | | |/| | |
| | | | * | | | update newsStanislav Malyshev2014-12-161-0/+2
| | | | * | | | Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2014-12-163-32/+62
| | | | |\ \ \ \ | | | | | | |/ / | | | | | |/| |
| | | | | * | | add CVEStanislav Malyshev2014-12-161-1/+1
| | | | | * | | add missing test fileStanislav Malyshev2014-12-161-0/+7
| | | | | * | | Fix bug #68594 - Use after free vulnerability in unserialize()Stanislav Malyshev2014-12-164-32/+64
| * | | | | | | Hash value must not zero?Xinchen Hui2014-12-131-0/+2
* | | | | | | | Merge remote-tracking branch 'origin/master' into native-tlsAnatol Belski2014-12-166-65/+195
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Optimize argument passing handlers:Dmitry Stogov2014-12-165-64/+194
| | |_|_|_|/ / | |/| | | | |
| * | | | | | Fix pcre non-FAST_ZPP buildAndrea Faulds2014-12-161-1/+1
* | | | | | | don't need this in nts modeAnatol Belski2014-12-161-1/+0
* | | | | | | various fixes for removing explicit tsrm_ls usageAnatol Belski2014-12-167-558/+453
* | | | | | | Merge remote-tracking branch 'origin/master' into native-tlsAnatol Belski2014-12-163-5/+12
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | C89 fixesAnatol Belski2014-12-162-3/+5
| * | | | | | use portable struct statAnatol Belski2014-12-161-2/+2
| * | | | | | fixed macro va args expansion for vsAnatol Belski2014-12-161-0/+5