Merge branch 'PHP-5.5' into PHP-5.6

Conflicts:
ext/fileinfo/data_file.c
ext/fileinfo/libmagic/softmagic.c
ext/fileinfo/magicdata.patch

Merge branch 'PHP-5.4' into PHP-5.5

Conflicts:
NEWS
configure.in
main/php_version.h

backport the fix for bug #67739

Merge branch 'pull-request/756'

Patches #67739

Fixes #67739: Windows 8.1/Server 2012 R2 OS build number reported as 6.2 (instead of 6.3)

Merge branch 'master' into phpng

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
Backported the patch from bug #67407 into 5.5+
Backported the patch from bug #67407 into 5.4
NEWS
NEWS
Fix Bug #6

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
Backported the patch from bug #67407 into 5.5+
Backported the patch from bug #67407 into 5.4
NEWS
NEWS
Fix Bug #67530 error_log=syslog ignored

Conflicts:
sapi/fpm/fpm/fpm_stdio.c

show more ...

Backported the patch from bug #67407 into 5.5+

Backported the patch from bug #67407 into 5.4

Merge branch 'pull-request/691'

Merge branch 'master' into test

* master: (67 commits)
remove the NEWS entry for the reverted fpm fix
remove the NEWS entry for the reverted fpm fix
remove the NEWS entry f

Merge branch 'master' into test

* master: (67 commits)
remove the NEWS entry for the reverted fpm fix
remove the NEWS entry for the reverted fpm fix
remove the NEWS entry for the reverted fpm fix
Revert "Fix Bug #67530 error_log=syslog ignored"
--enable-fpm for the travis build
fix the last fpm NEWS entry, the other bug is related, but not the same what we fixed here
NEWS
NEWS
Fix bug #67091: make install fails to install libphp5.so on FreeBSD 10.0
adding NEWS entry for the fix for bug #65641
Updated NEWS file for recent phpdbg fixes
Fixed issue krakjoe/phpdbg#94 - List behavior is inconsistent
Fix issue krakjoe/phpdbg#97 - list now appends a newline if there is none The prompt should always ensure it is on a newline
Fixed test
Inform about back command existence in help - Fixes krakjoe/phpdbg#100 No way to list the current stack/frames
Fix issue krakjoe/phpdbg#98 break if does not seem to work
Fix issue krakjoe/phpdbg#99 register function has the same behavior as run
Fix readline/libedit (Thanks to @remicollet)
Replace incorrect `E` command with `ev` in watch help
Fix typo in `finish` help
...

Conflicts:
Zend/zend_ast.c
Zend/zend_highlight.c
Zend/zend_indent.c
ext/spl/spl_array.c
ext/spl/spl_observer.c
ext/standard/info.c

show more ...

Fix bug #67498 - phpinfo() Type Confusion Information Leak Vulnerability

Fix bug #67498 - phpinfo() Type Confusion Information Leak Vulnerability

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
5.4.30
Better fix for bug #67072 with more BC provisions
Fix bug #67498 - phpinfo() Type Confusion Information Leak Vulnerabi

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
5.4.30
Better fix for bug #67072 with more BC provisions
Fix bug #67498 - phpinfo() Type Confusion Information Leak Vulnerability
update CVE
Fix bug #67492: unserialize() SPL ArrayObject / SPLObjectStorage Type Confusion
Fix bug #67397 (Buffer overflow in locale_get_display_name->uloc_getDisplayName (libicu 4.8.1))
Fix bug #67349: Locale::parseLocale Double Free
add CVEs
Fix potential segfault in dns_get_record()
Fix bug #66127 (Segmentation fault with ArrayObject unset)
5.4.30 rc1

Conflicts:
ext/intl/locale/locale_methods.c

show more ...

Fix bug #67498 - phpinfo() Type Confusion Information Leak Vulnerability

Update info.c

Fixes #67407: Windows 8.1/Server 2012 R2 reported as Windows 8/Server 2012

Use new iterator macros

Refactored zend_hash_* iteration API zend_hash_fove_forward_ex(ht, pos) and family require second argument to be real pointer.
&(ht)->nInternalPointer should be passed instead of NULL.
zend_h

Refactored zend_hash_* iteration API zend_hash_fove_forward_ex(ht, pos) and family require second argument to be real pointer.
&(ht)->nInternalPointer should be passed instead of NULL.
zend_hash_update_current_key() may work only with internal pointer.

show more ...

Fixed memory leak in php_uname

Fixed php_info related

Use better data structures (incomplete)

Use better data structures (incomplete)

Here need to be str_efree

found by ext/standard/tests/general_functions/phpinfo2.php fails

Bump year

Bump year