Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
Happy new year (Update copyright to 2016)

Happy new year (Update copyright to 2016)

Improved optimizer dubugging facility

Merge branch 'PHP-7.0'

* PHP-7.0:
update NEWS
Fixed bug #71024 Unable to use PHP 7.0 x64 side-by-side with PHP 5.6 x32 on the same server

Fixed bug #71024 Unable to use PHP 7.0 x64 side-by-side with PHP 5.6 x32 on the same server

Break dependency between opcache and optimizer. Remove copatibility macros.

Implemented file_cache_fallback mechanism

which is essential as an attempt to fix the "failed to reattach"
error on Windows. If file_cache is enabled, Opcache will
automaticaly switc

Implemented file_cache_fallback mechanism

which is essential as an attempt to fix the "failed to reattach"
error on Windows. If file_cache is enabled, Opcache will
automaticaly switch to file_cache_only mode in the case a process
failed to map the shared segment at the required address. The
important small part of the SHM will still be mapped, which
allows information exchange between normal processes using SHM
and those using the fallback mechanism.

This is based on Dmitry's, Matt's and mine ideas. So many thanks for
support!

show more ...

Use shorter php.ini directive name "opcache.huge_code_pages" and disable it by default.

Added an experemental ability to move PHP code pages (PHP TEXT segment) into HUGE pages.
PHP should be configured and built with --enable-huge-code-pages, OS should be configured to provide huge

Added an experemental ability to move PHP code pages (PHP TEXT segment) into HUGE pages.
PHP should be configured and built with --enable-huge-code-pages, OS should be configured to provide huge pages.
It's possible to enable/disable this future in php.ini through opcache.enable_huge_code_pages=0/1.
The feature was tested on Linux and provided 2% improvement on real-life apps, because of 2-3 times reduction in number of iTLB misses.

show more ...

Removed opcache.load_comments configuration directive. Now doc comments loading costs nothing and always enabled.

Added experimental (disabled by default) file based opcode cache.

Merge branch 'PHP-5.5' into PHP-5.6

Update version

Keep realpath and PCRE caches in consistency with opcache SHM.

What should we version the bundled opcache?

Improved hash key manangement code

Improved hash key manangement code

made ZEND_TSRMLS_CACHE_* macros look like function calls

which also comply with the current semantics for such macros

Avoid repeatable calls to strstr()

bump year

bump year

Bump year

first shot remove TSRMLS_* things

Merge remote-tracking branch 'origin/master' into native-tls

* origin/master: (398 commits)
NEWS
add test for bug #68381
Fixed bug #68381 Set FPM log level earlier during i

Merge remote-tracking branch 'origin/master' into native-tls

* origin/master: (398 commits)
NEWS
add test for bug #68381
Fixed bug #68381 Set FPM log level earlier during init
proper dllexport
move to size_t where zend_string is used internally
fix some datatype mismatches
return after the warning, to fix uninitialized salt usage
fix datatype mismatches
add missing type specifier
fix datatype mismatches
fix unsigned check
"extern" shouldn't be used for definitions
joined identical conditional blocks
simplify fpm tests
SEND_VAR_NO_REF optimization
Add test for bug #68442
Add various tests for FPM - covering recent bugs (68420, 68421, 68423, 68428) - for UDS - for ping and status URI - for multi pool and multi mode
Include small MIT FastCGI client library from https://github.com/adoy/PHP-FastCGI-Client
Get rid of zend_free_op structure (use zval* instead). Get rid of useless TSRMLS arguments.
Add new FPM test for IPv4/IPv6
...

Conflicts:
win32/build/config.w32

show more ...

Merge branch 'PHP-5.6'

* PHP-5.6:
Fix opcache.revalidate_freq per-request behavior

Conflicts:
ext/opcache/ZendAccelerator.h