Don't inline "slow" and rarely used functions.

Fixed typo that might cause serious bugs in MM. May be it was the reason of bug #70392 (SIGSEGV during PHP shutdown).

Use regular huge pages instead of anonymous if available.

Introduced additional check. Its miss might be the reason of bug #70392 (SIGSEGV during PHP shutdown)

Ensure proper data alignment

Simplified integer overflow checks

Removed useless signal protection

Fix issues with phpdbg SIGINT handler
Also fix valgrind warnings in allocator when not using mmap()ed memory

Mark error and exception functions as "cold" (Matt's idea)

Reimplemented ability to get debug info (C source file and line number) in phpdbg without hacks and ABI breaks.

Fixed bug #70098 (Real memory usage doesn't decrease)

Added missing API functions

Replace references to PHP_WIN32 and TSRM_WIN32 with ZEND_WIN32 in Zend/, this also fixes 1 instance of where fflush(stderr) was misplaced (zend_extensions.c)

Also try __has_builtin() where builtins are used

Fixed bug #69703 (Use __builtin_clzl on PowerPC) -- Patch by dja at axtens dot net

# Julien, even though 5.5 is still non security mode I don't think we should merge this patch but I leave t

Fixed bug #69703 (Use __builtin_clzl on PowerPC) -- Patch by dja at axtens dot net

# Julien, even though 5.5 is still non security mode I don't think we should merge this patch but I leave the choice with you

show more ...

Reset heap usage statistics on request shutdown

Fixed phpdbg build

Refactored custom storage API.

Merge branch 'PHP-5.6'

* PHP-5.6:
fix format
update NEWS
Add test for bug #69522
Update tests
Fix bug #69522 - do not allow int overflow
Forgot test file

Merge branch 'PHP-5.6'

* PHP-5.6:
fix format
update NEWS
Add test for bug #69522
Update tests
Fix bug #69522 - do not allow int overflow
Forgot test file
Fix bug #69403 and other int overflows
Fixed bug #69418 - more s->p fixes for filenames
Fixed bug #69364 - use smart_str to assemble strings
Fix bug #69453 - don't try to cut empty string
Fix bug #69545 - avoid overflow when reading list

Conflicts:
Zend/zend_alloc.c
Zend/zend_operators.c
ext/ftp/ftp.c
ext/pcntl/pcntl.c
ext/standard/basic_functions.c
ext/standard/dir.c
ext/standard/file.c
ext/standard/pack.c
ext/standard/string.c
main/rfc1867.c

show more ...

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
fix format
update NEWS
Add test for bug #69522
Update tests
Fix bug #69522 - do not allow int overflow
Forg

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
fix format
update NEWS
Add test for bug #69522
Update tests
Fix bug #69522 - do not allow int overflow
Forgot test file
Fix bug #69403 and other int overflows
Fixed bug #69418 - more s->p fixes for filenames
Fixed bug #69364 - use smart_str to assemble strings
Fix bug #69453 - don't try to cut empty string
Fix bug #69545 - avoid overflow when reading list

Conflicts:
ext/pcntl/pcntl.c
ext/standard/basic_functions.c
ext/standard/pack.c
ext/standard/tests/dir/opendir_variation1-win32.phpt

show more ...

Fix bug #69403 and other int overflows

Changed zend_smart_str allocation granularity to do the better job together with Zend MM and avoid useless calls to erealloc().
The actual reallocation routiones are seprated from inlined code to

Changed zend_smart_str allocation granularity to do the better job together with Zend MM and avoid useless calls to erealloc().
The actual reallocation routiones are seprated from inlined code to reduce code size.

show more ...

Revert "Changed zend_smart_str allocation granularity to do the better job together with Zend MM and avoid useless calls to erealloc()." That commit significantly increased the code size because of i

Revert "Changed zend_smart_str allocation granularity to do the better job together with Zend MM and avoid useless calls to erealloc()." That commit significantly increased the code size because of intensive inlining and more expensive reallocation code.

This reverts commit 5275e5560bb186bc3950a0dbf15fe0e54ee4c6ec.

show more ...

Changed zend_smart_str allocation granularity to do the better job together with Zend MM and avoid useless calls to erealloc().

Temorary fix for phpdbg segfault while use zend_mm_set_custom_handlers