summaryrefslogtreecommitdiff
path: root/main
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'PHP-5.6'krakjoe2014-01-011-18/+25
|\
| * Merge branch 'PHP-5.5' into PHP-5.6krakjoe2014-01-011-18/+25
| |\
| | * Merge branch 'PHP-5.4' into PHP-5.5krakjoe2014-01-011-18/+25
| | |\
| | | * fix #66375 bad logic in sapi header callback routinekrakjoe2014-01-011-18/+25
| | | * 5.4.25 nextStanislav Malyshev2013-12-241-3/+3
| * | | Add E_DEPRECATED when populating $HTTP_RAW_POST_DATAMichael Wallner2013-12-302-1/+6
| * | | add 'never'Michael Wallner2013-12-301-0/+3
| * | | fix typeMichael Wallner2013-12-301-1/+1
| * | | s/BOOLEAN/ENTRY/Michael Wallner2013-12-301-1/+1
| * | | re-introduce always_populate_raw_post_dataMichael Wallner2013-12-303-0/+57
* | | | Fixed ZTS build. Needed to bump API version number.Bob Weinand2013-12-181-1/+1
* | | | Eliminate the TSRMLS_FETCH() calls in the ticks functions and hookKalle Sommer Nielsen2013-12-182-12/+6
* | | | Kill a TSRMLS_FETCH() in php_stream_context_set() by passing TSRMLS_CC to itKalle Sommer Nielsen2013-12-183-4/+3
* | | | Pass the TSRMLS parameters to the sapi flush hook, this shaves off a few TSRM...Kalle Sommer Nielsen2013-12-182-2/+2
* | | | Kill another TSRMLS_FETCH() in the zend extension loading codeKalle Sommer Nielsen2013-12-181-2/+2
* | | | Eliminate another TSRMLS_FETCH() in i_zend_is_true()Kalle Sommer Nielsen2013-12-181-2/+2
* | | | Kill another TSRMLS_FETCH() in zend_indent()Kalle Sommer Nielsen2013-12-121-2/+2
* | | | Merge branch 'PHP-5.6'Anatol Belski2013-12-121-1/+1
|\ \ \ \ | |/ / /
| * | | Merge branch 'PHP-5.5' into PHP-5.6Anatol Belski2013-12-121-1/+1
| |\ \ \ | | |/ /
| | * | Fixed bug #65486 mysqli_poll() is broken on Win x64Anatol Belski2013-12-121-1/+1
* | | | Merge branch 'PHP-5.6'Michael Wallner2013-12-061-5/+7
|\ \ \ \ | |/ / /
| * | | Merge branch 'PHP-5.5' into PHP-5.6Michael Wallner2013-12-061-5/+7
| |\ \ \ | | |/ /
| | * | Merge branch 'PHP-5.4' into PHP-5.5Michael Wallner2013-12-061-5/+7
| | |\ \ | | | |/
| | | * Fixed bug #61645 (fopen and O_NONBLOCK)Michael Wallner2013-12-061-5/+7
| | | * 5.4.24-dev nowStanislav Malyshev2013-11-271-3/+3
| | | * 5.4.23-devStanislav Malyshev2013-10-291-3/+3
| | | * 5.4.22-dev nowStanislav Malyshev2013-10-011-3/+3
* | | | Renumber the comments in php_request_shutdown() to be in order.Adam Harvey2013-12-041-8/+8
* | | | Merge branch 'PHP-5.6'Andrey Hristov2013-12-041-1/+18
|\ \ \ \ | |/ / /
| * | | Merge branch 'PHP-5.5' into PHP-5.6Sara Golemon2013-12-031-1/+18
| |\ \ \ | | |/ /
| | * | Fix php_module_startup() when loading more than one additional moduleSara Golemon2013-12-031-1/+18
| | * | 5.5.8-dev nowJulien Pauli2013-11-271-3/+3
| | * | 5.5.7 nowJulien Pauli2013-11-121-3/+3
| | * | Increment version number, since this will be 5.5.6.Adam Harvey2013-10-231-3/+3
| * | | bump API versionsFerenc Kovacs2013-11-061-1/+1
* | | | Eliminated the TSRMLS_FETCH() in zend_set_memory_limit()Kalle Sommer Nielsen2013-11-181-2/+2
* | | | bump version, empty NEWS, UPGRADING and UPGRADING.INTERNALSFerenc Kovacs2013-11-061-3/+3
* | | | bump API versionsFerenc Kovacs2013-11-061-1/+1
|/ / /
* | | back to do_alloca()Anatol Belski2013-10-311-3/+4
* | | back to do_alloca(), reverted the wrong replacementAnatol Belski2013-10-301-2/+3
* | | Merge branch 'bug50333' of github.com:weltling/php-src into bug50333Anatol Belski2013-10-296-22/+18
|\ \ \
| * | | applied and fixed the original patchAnatol Belski2013-10-175-21/+17
| * | | initial move on renaming files and fixing includesAnatol Belski2013-10-171-1/+1
* | | | Added support for TLSv1.1 and TLSv1.2Daniel Lowrey2013-10-081-1/+5
|/ / /
* | | add note about request_body and php://inputMichael Wallner2013-09-191-0/+1
* | | better way to fix PRIu64 availability on windowsAnatol Belski2013-09-181-4/+3
* | | Merge branch 'PHP-5.5'Michael Wallner2013-09-181-1/+6
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.4' into PHP-5.5Michael Wallner2013-09-181-1/+6
| |\ \ | | |/
| | * fix a very rare case of use of uninitialized value combined with aMichael Wallner2013-09-181-1/+6
| | * 5.4.21 nowStanislav Malyshev2013-09-031-3/+3