diff options
| author | Rasmus Lerdorf <rasmus@php.net> | 2014-11-10 10:36:57 -0800 |
|---|---|---|
| committer | Rasmus Lerdorf <rasmus@php.net> | 2014-11-10 10:36:57 -0800 |
| commit | 5464e331d18241c497529ac7306e0f58fb9c47b6 (patch) | |
| tree | 58f76ba2cfc11bb7c46ab4a58e485e2b85ae2b0e /sapi/cli/php_cli_server.c | |
| parent | 53f258e2d409679989430147a43ce0c5bb29775f (diff) | |
| parent | 44bc735a62dcbfbd628d8721c2ee83491dcb073c (diff) | |
| download | php-git-5464e331d18241c497529ac7306e0f58fb9c47b6.tar.gz | |
Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src: (70 commits)
convert_to_string also does the check
A better fix(do the convertion in compile time)
update UPGRADING.INTERNALS
better description for the toolset config option
use proper declarations for zend_stat_t
move these functions to the appropriate place
Fixed segfault in bug62500.phpt
Update NEWS
Fixed bug #68370 ("unset($this)" can make the program crash)
move more common ldflags into function
rename intel toolset to icc - shorter
fix gd compilation with icc toolset
either ms or intel linker is used, /libpath is supported
further catch up with phpize and improved clang arch setup
add /fallback for clang-cl
parametrize WINVER and update its value
further refactoring of toolset+phpize stuff
catch up the toolset changes with phpize
fix linking for clang, using linker directly
adjust pid_t declaration so it doesn't conflict with apache one
...
Diffstat (limited to 'sapi/cli/php_cli_server.c')
0 files changed, 0 insertions, 0 deletions