summaryrefslogtreecommitdiff
path: root/main
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into native-tlsAnatol Belski2014-10-162-7/+4
|\
| * Merge branch 'PHP-5.6'Ferenc Kovacs2014-10-152-7/+4
| |\
| | * Revert "Merge branch 'PHP-5.4' into PHP-5.5"Ferenc Kovacs2014-10-152-7/+4
| | * PHP-5.6.3 is nextFerenc Kovacs2014-10-151-3/+3
* | | move SG to use global tsrmls pointerAnatol Belski2014-10-152-1/+4
* | | moved most of the core to use static tsrm ls cache pointerAnatol Belski2014-10-151-1/+2
* | | bring back all the TSRMLS_FETCH() stuffAnatol Belski2014-10-158-0/+37
* | | Merge remote-tracking branch 'origin/master' into native-tlsAnatol Belski2014-10-101-1/+1
|\ \ \ | |/ /
| * | use php_socket_t instead of intAnatol Belski2014-10-101-1/+1
* | | force more static tsrmls cache usageAnatol Belski2014-10-072-2/+2
* | | Merge remote-tracking branch 'origin/master' into native-tlsAnatol Belski2014-10-061-4/+4
|\ \ \ | |/ /
| * | bring back the correct php_version.hAnatol Belski2014-10-061-4/+4
* | | Merge remote-tracking branch 'origin/master' into native-tlsAnatol Belski2014-10-062-6/+6
|\ \ \ | |/ /
| * | Merge branch 'pr/647'Tjerk Meesters2014-10-061-4/+4
| |\ \
| | * | zend_uint -> uint32_tTimm Friebe2014-09-251-4/+4
| * | | Remove <% and <script language="php"> tagsNikita Popov2014-10-051-2/+2
* | | | Merge remote-tracking branch 'origin/master' into native-tlsAnatol Belski2014-10-011-0/+28
|\ \ \ \ | |/ / /
| * | | Merge branch 'PHP-5.6'Anatol Belski2014-09-291-1/+1
| |\ \ \ | | | |/ | | |/|
| | * | Merge branch 'PHP-5.5' into PHP-5.6Anatol Belski2014-09-291-1/+1
| | |\ \
| | | * | increase the polling period to not to break existing behavioursAnatol Belski2014-09-291-1/+1
| * | | | Merge branch 'PHP-5.6'Anatol Belski2014-09-291-0/+28
| |\ \ \ \ | | |/ / / | | | | / | | |_|/ | |/| |
| | * | Merge branch 'PHP-5.5' into PHP-5.6Anatol Belski2014-09-291-0/+28
| | |\ \ | | | |/
| | | * Fixed bug #51800 proc_open on Windows hangs foreverAnatol Belski2014-09-291-0/+28
| | | * 5.5.18 nowJulien Pauli2014-09-031-3/+3
* | | | some cleanups for TSRMLS_FETCH and direct tsrm_ls usage in mainAnatol Belski2014-09-268-40/+0
* | | | reworked the patch, less new stuff but workyAnatol Belski2014-09-257-11/+11
* | | | Merge remote-tracking branch 'origin/master' into native-tlsAnatol Belski2014-09-222-2/+2
|\ \ \ \ | |/ / /
| * | | Move smart_str implementation into Zend/Nikita Popov2014-09-212-2/+2
* | | | native tls initial patchkrakjoe2014-09-207-11/+11
|/ / /
* | | s/PHP 5/PHP 7/Johannes Schlüter2014-09-1966-66/+66
* | | reverted too muchAnatol Belski2014-09-191-2/+6
* | | reverted some previous IS_ABSOLUTE_PATH related changesAnatol Belski2014-09-191-6/+2
* | | fix printf formatAnatol Belski2014-09-191-3/+3
* | | Fix GMP serializationNikita Popov2014-09-181-1/+0
* | | fix signed/unsigned mismatchAnatol Belski2014-09-151-1/+1
* | | optimize path length retrievalKalle Sommer Nielsen2014-09-151-2/+6
* | | fix typeAnatol Belski2014-09-141-1/+1
* | | avoid multiple strlen() usageAnatol Belski2014-09-131-4/+5
* | | avoid multiple strlen() calls for the sameAnatol Belski2014-09-131-2/+3
* | | reduce the struct size by 8 bytes on 64 bitAnatol Belski2014-09-121-5/+5
* | | reduce the struct size by 8 byte on x64Anatol Belski2014-09-121-1/+1
* | | better alignment, reduced the struct by 8 byte on 64 bitAnatol Belski2014-09-121-3/+3
* | | fix typeAnatol Belski2014-09-121-1/+1
* | | Merge branch 'PHP-5.6'Anatol Belski2014-09-111-0/+1
|\ \ \ | |/ /
| * | 5.6.2 nowJulien Pauli2014-09-111-3/+3
* | | Merge branch 'PHP-5.6'Michael Wallner2014-09-091-5/+7
|\ \ \ | |/ /
| * | duplicate value's string for the SAPI filterMichael Wallner2014-09-091-5/+7
* | | Fix a number of format issuesNikita Popov2014-09-031-1/+1
* | | Revert "remove a few gcc format attributes from some printf-like functions"Nikita Popov2014-09-034-11/+17
* | | Merge branch 'PHP-5.6'Stanislav Malyshev2014-09-021-6/+0
|\ \ \ | |/ /