Fixed ZEND_MM_MEM_TYPE=mmap_zero
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fixed ZEND_MM_MEM_TYPE=mmap_zero

Conflicts:
	NEWS
Merge branch 'PHP-5.6'

* PHP-5.6:
  Fixed ZEND_MM_MEM_TYPE=mmap_zero
Fixed warning "No new line at end of file"
Improved empty string handling. Now ZE uses an interned string instead of allocation new empty string each time. (Some extensions might need to be fixed using str_efree() instead of efree() to support interned strings).
Merge branch 'PHP-5.6'

* PHP-5.6:
  Improved empty string handling. Now ZE uses an interned string instead of allocation new empty string each time. (Some extensions might need to be fixed using str_efree() instead of efree() to support interned strings).

Conflicts:
	NEWS
	Zend/zend_extensions.h
	Zend/zend_modules.h
Fixed bug #66356 (Heap Overflow Vulnerability in imagecrop())

And also fixed the bug: arguments are altered after some calls
Merge branch 'PHP-5.5' into PHP-5.6

Conflicts:
	main/php_version.h
Merge branch 'PHP-5.6'
Revert accidented committed php_version.h
Merge branch 'PHP-5.5' into PHP-5.6

Conflicts:
	main/php_version.h
Merge branch 'PHP-5.6'
Fixed bug #66358 (fpm starts segfault)
Merge branch 'PHP-5.6'
update version output
Merge branch 'PHP-5.6'

* PHP-5.6:
  update version output
add initial, untested version of ldap_modify_batch

Add an initial, hitherto-untested version of ldap_modify_batch to the LDAP
module. It allows performing multiple modifications as part of a single
"transaction". This can be useful e.g. for the "change password" operation in
Active Directory (REMOVE the old unicodePwd and ADD the new one), but the
interface has been kept general.
fix redefinition of LDAP_DEREF_ALWAYS

By virtue of a copy-paste error, the constant LDAP_DEREF_ALWAYS was defined
multiple times. Now, it isn't anymore.
ldap_modify_batch: fix layers of indirection when fetching from hashtables

There is an additional layer of indirection between fetching a value from
a hash table and accessing its value. Fix the code of ldap_modify_batch to
reflect this.
ldap_modify_batch: hashtable key length includes NUL byte

The length of a key in a Zend hashtable also counts the terminating NUL
byte. Fix the code of ldap_modify_batch to reflect this.