summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of https://git.php.net/repository/php-srcChristopher Jones2013-09-2677-123/+201
|\
| * Merge branch 'pull-request/473'Sara Golemon2013-09-2674-114/+190
| |\
| | * fix missing change from 'tcp_socket' to the more common 'server'ptarjan2013-09-261-3/+3
| | * fix many parallel test issuesptarjan2013-09-2674-111/+187
| * | Don't track parameter number in separate znodeNikita Popov2013-09-263-9/+11
* | | Merge branch 'master' of https://git.php.net/repository/php-srcChristopher Jones2013-09-2643-2276/+2906
|\ \ \ | |/ /
| * | Implement variadic function syntaxNikita Popov2013-09-2643-2276/+2906
| |/
* | Merge branch 'master' of https://git.php.net/repository/php-srcChristopher Jones2013-09-253-5/+59
|\ \ | |/
| * Merge branch 'PHP-5.5'Dmitry Stogov2013-09-253-1/+49
| |\
| | * Added function opcache_compile_file() to load PHP scripts into cache without ...Dmitry Stogov2013-09-254-1/+51
| * | Merge branch 'PHP-5.5'Dmitry Stogov2013-09-251-4/+10
| |\ \ | | |/
| | * Fixed issue #135 (segfault in interned strings if initial memory is too low)Dmitry Stogov2013-09-252-4/+12
* | | Merge branch 'master' of https://git.php.net/repository/php-srcChristopher Jones2013-09-241-1/+1
|\ \ \ | |/ /
| * | Fix typo: HTTP_ROW_POST_DATA → HTTP_RAW_POST_DATA.Adam Harvey2013-09-231-1/+1
* | | Merge branch 'master' of https://git.php.net/repository/php-srcChristopher Jones2013-09-234-14/+65
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.5'Remi Collet2013-09-232-8/+8
| |\ \ | | |/
| | * Make message and format arguments const char * to avoidRemi Collet2013-09-232-8/+8
| * | Merge branch 'PHP-5.5'Adam Harvey2013-09-222-6/+57
| |\ \ | | |/
| | * Merge branch 'PHP-5.4' into PHP-5.5Adam Harvey2013-09-223-6/+61
| | |\
| | | * Copy dba_*() keys before converting to string.Adam Harvey2013-09-223-6/+61
* | | | Merge branch 'master' of https://git.php.net/repository/php-srcChristopher Jones2013-09-202-5/+6
|\ \ \ \ | |/ / /
| * | | Merge branch 'PHP-5.5'Adam Harvey2013-09-201-2/+2
| |\ \ \ | | |/ /
| | * | Merge branch 'PHP-5.4' into PHP-5.5Adam Harvey2013-09-202-2/+6
| | |\ \ | | | |/
| | | * Fix the broken sh syntax in ext/imap/config.m4.Adam Harvey2013-09-202-2/+6
| | | * Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4Christopher Jones2013-09-188-7/+47
| | | |\
| | | * \ Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4Christopher Jones2013-09-135-24/+71
| | | |\ \
| * | | \ \ Merge branch 'PHP-5.5'Anatol Belski2013-09-201-3/+4
| |\ \ \ \ \ | | |/ / / /
| | * | | | Fixed bug #65678 the test cli_process_title_windows will fails on particular ...Anatol Belski2013-09-201-3/+4
* | | | | | Merge branch 'master' of https://git.php.net/repository/php-srcChristopher Jones2013-09-191-0/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch 'PHP-5.5'Christopher Jones2013-09-191-0/+1
| |\ \ \ \ \ | | |/ / / /
| | * | | | Added application/pdf to PHP CLI Web Server mime types.Christopher Jones2013-09-192-0/+2
| * | | | | Merge branch 'PHP-5.5'Christopher Jones2013-09-190-0/+0
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5Christopher Jones2013-09-187-7/+38
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5Christopher Jones2013-09-165-5/+145
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5Christopher Jones2013-09-1313-58/+190
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5Christopher Jones2013-09-060-0/+0
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5Christopher Jones2013-09-053-4/+6
| | |\ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ Merge branch 'master' of https://git.php.net/repository/php-srcChristopher Jones2013-09-191-0/+1
| |\ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of https://git.php.net/repository/php-srcChristopher Jones2013-09-191-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | add note about request_body and php://inputMichael Wallner2013-09-191-0/+1
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch 'master' of https://git.php.net/repository/php-srcChristopher Jones2013-09-191-61/+17
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Build OCI8 2.0 on Windows with Oracle Database 12c libraries onlyChristopher Jones2013-09-181-61/+17
| * | | | | | | | | | Merge branch 'master' of https://git.php.net/repository/php-srcChristopher Jones2013-09-18110-501/+1218
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of https://git.php.net/repository/php-srcChristopher Jones2013-09-1611-22/+159
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of https://git.php.net/repository/php-srcChristopher Jones2013-09-131-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of https://git.php.net/repository/php-srcChristopher Jones2013-09-1347-1993/+1191
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of https://git.php.net/repository/php-srcChristopher Jones2013-09-0611-419/+615
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of https://git.php.net/repository/php-srcChristopher Jones2013-09-185-35/+310
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | better way to fix PRIu64 availability on windowsAnatol Belski2013-09-182-4/+308
| * | | | | | | | | | | | | | | Merge branch 'PHP-5.5'David Soria Parra2013-09-183-31/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | | | | |