summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Path handling related refactoringsAnatol Belski2016-12-2213-97/+54
* Finish remaining replacement uint => uint32_tAnatol Belski2016-12-2214-41/+41
* Merge branch 'PHP-7.1'Nikita Popov2016-12-221-2/+2
|\
| * Merge branch 'PHP-7.0' into PHP-7.1Nikita Popov2016-12-221-2/+2
| |\
| | * Fix IS_UNDEF comparisons in opcacheSébastien Santoro2016-12-221-2/+2
* | | fix min supported versionsAnatol Belski2016-12-222-3/+4
* | | Update NEWSYasuo Ohgaki2016-12-221-0/+1
* | | Fix bug #73100 - Improve bug fix. Forbid to set 'user' save handler other tha...Yasuo Ohgaki2016-12-225-6/+25
* | | Eliminate win95nt.hKalle Sommer Nielsen2016-12-225-85/+50
* | | Hmm actually it seems to be the other way around, Anatol?Kalle Sommer Nielsen2016-12-221-2/+2
* | | Merge branch 'master' of git.php.net:php-srcKalle Sommer Nielsen2016-12-222-9/+13
|\ \ \
| * | | move the defs to the right placeAnatol Belski2016-12-222-9/+13
* | | | Sync the default value of --with-odbcver with the hardcoded default for ODBCVERKalle Sommer Nielsen2016-12-221-1/+1
|/ / /
* | | Merge branch 'PHP-7.1'Bob Weinand2016-12-225-14/+61
|\ \ \ | |/ /
| * | Merge branch 'PHP-7.0' into PHP-7.1Bob Weinand2016-12-225-14/+61
| |\ \ | | |/
| | * Fixed bug #73704 (phpdbg shows the wrong line in files with shebang)Bob Weinand2016-12-225-14/+62
* | | Merge branch 'PHP-7.1'Nikita Popov2016-12-211-1/+1
|\ \ \ | |/ /
| * | Fix string extension in negate_num_stringNikita Popov2016-12-211-1/+1
* | | Merge branch 'PHP-7.1'Nikita Popov2016-12-211-3/+3
|\ \ \ | |/ /
| * | Merge branch 'PHP-7.0' into PHP-7.1Nikita Popov2016-12-211-3/+3
| |\ \ | | |/
| | * Increase timing quota for small string concat testNikita Popov2016-12-211-3/+3
* | | Merge branch 'PHP-7.1'Nikita Popov2016-12-212-3/+33
|\ \ \ | |/ /
| * | Merge branch 'PHP-7.0' into PHP-7.1Nikita Popov2016-12-213-3/+34
| |\ \ | | |/
| | * Fix #73753 - Unpacked Arrays and DuplicationDavid Walker2016-12-213-3/+34
* | | Drop some dead code in ext/reflectionNikita Popov2016-12-211-17/+0
* | | Merge branch 'PHP-7.1'Anatol Belski2016-12-211-10/+12
|\ \ \ | |/ /
| * | add foldsAnatol Belski2016-12-211-2/+2
| * | fix possible null dereferenceAnatol Belski2016-12-211-8/+10
* | | add UPGRADING and NEWS itemsAnatol Belski2016-12-213-1/+5
* | | Raise the supported API to win7/server 2008r2Anatol Belski2016-12-211-2/+2
* | | Merge branch 'PHP-7.1'Xinchen Hui2016-12-213-7/+17
|\ \ \ | |/ /
| * | Revert "Reorder the oplines" (Break Zend/tests/return_types/bug71092.phpt)Xinchen Hui2016-12-213-7/+17
* | | Merge branch 'PHP-7.1'Bob Weinand2016-12-211-1/+1
|\ \ \ | |/ /
| * | Merge branch 'PHP-7.0' into PHP-7.1Bob Weinand2016-12-211-1/+1
| |\ \ | | |/
| | * Fix issue with -- in phpdbg command lineBob Weinand2016-12-211-1/+1
* | | Update NEWS and UPGRADINGYasuo Ohgaki2016-12-212-1/+3
* | | Merge branch 'pull-request/2233'Yasuo Ohgaki2016-12-210-0/+0
|\ \ \
| * | | Remove "register_globals" support codes from php/php_binary serializers. As a...Yasuo Ohgaki2016-12-072-56/+28
* | | | Remove "register_globals" support codes from php/php_binary serializers.Yasuo Ohgaki2016-12-212-56/+28
* | | | Merge branch 'PHP-7.1'Bob Weinand2016-12-202-0/+17
|\ \ \ \ | | |/ / | |/| |
| * | | Fixed bug #73794 (Crash (out of memory) when using run and # command separator)Bob Weinand2016-12-203-0/+21
* | | | Merge branch 'PHP-7.1'Bob Weinand2016-12-201-1/+1
|\ \ \ \ | |/ / /
| * | | Fix segfault in ZTS mode when just printing and exiting in phpdbgBob Weinand2016-12-201-1/+1
* | | | Add "Sent SQL" to debug dump for emulated preparesAdam Baratz2016-12-205-8/+141
* | | | Remove PDOStatement::activeQueryString()Adam Baratz2016-12-204-94/+8
* | | | Merge branch 'master' of git.php.net:php-srcDmitry Stogov2016-12-200-0/+0
|\ \ \ \
| * \ \ \ Merge branch 'PHP-7.1'Xinchen Hui2016-12-202-9/+43
| |\ \ \ \
* | \ \ \ \ Merge branch 'PHP-7.1'Dmitry Stogov2016-12-204-9/+66
|\ \ \ \ \ \ | |/ / / / / |/| | / / / | | |/ / / | |/| | |
| * | | | Merge branch 'PHP-7.0' into PHP-7.1Dmitry Stogov2016-12-203-0/+24
| |\ \ \ \ | | |/ / / | |/| | / | | | |/ | | |/|
| | * | Fixed bug #73792 (invalid foreach loop hangs script)Dmitry Stogov2016-12-204-0/+51