summaryrefslogtreecommitdiff
path: root/sapi/apache2handler/php_apache.h
diff options
context:
space:
mode:
authorAnatol Belski <ab@php.net>2014-09-22 10:26:17 +0200
committerAnatol Belski <ab@php.net>2014-09-22 10:26:17 +0200
commit6bb530d1eba583143efda0b4f49e43cb6d6fb203 (patch)
tree75f5432eac05df91defaf2f530efd08eb4796605 /sapi/apache2handler/php_apache.h
parent403709aaf46f2fe563df4d9f238528428287eb92 (diff)
parent065edced71c7f15f32fc2fb483a9048328b8108e (diff)
downloadphp-git-6bb530d1eba583143efda0b4f49e43cb6d6fb203.tar.gz
Merge remote-tracking branch 'origin/master' into native-tls
* origin/master: (24 commits) added a comment fix the REPARSE_DATA_BUFFER struct def simplify the condition Fix two memory errors by interning earlier Add smart_str_append for appending zend_strings Rename smart_str_append to smart_str_append_smart_str Use smart_str for exception stack traces Use smart_str in get_function_declaration Move smart_str implementation into Zend/ UPGRADING for Integer Semantics Fixed bug #66242 (don't assume char is signed) Fixed bug #67633 Fixed if/else if ordering Use SIZEOF_ZEND_LONG instead of SIZEOF_LONG Use zend_ polyfilled nan/finite, check finite Updated 32-bit << test Updated << 64-bit tests Prevent bit shift count wrapping quirkiness on some CPUs for left shift Cast NaN and Infinity to zero Updated >> 64-bit tests ...
Diffstat (limited to 'sapi/apache2handler/php_apache.h')
0 files changed, 0 insertions, 0 deletions