Merge branch 'PHP-5.6'

* PHP-5.6:
  Fix return code (merges are hard :( )
Fixed ext/standard/tests/strings/pack64_32.phpt failure (In PHP7, we must not free array of arguments recieved using "+")
update NEWS, 5.6.2 will be a security-only release
PHP-5.6.3 is next
Merge branch 'PHP-5.6'

* PHP-5.6:
  PHP-5.6.3 is next
  update NEWS, 5.6.2 will be a security-only release

Conflicts:
	configure.in
	main/php_version.h
Revert "Bug #41631: Observe socket read timeouts in SSL streams"

This reverts commit 6569db88081562f68a4f79e52cba83482bdf05fc.

Conflicts:
	ext/openssl/xp_ssl.c
Fixed bug #68215 (Behavior of foreach has changed)
Fixed bug #68234

Certificate will now expire in 2034
Merge branch 'PHP-5.6'

* PHP-5.6:
  Fixed bug #68234
Fixed Bug #65171 imagescale() fails

Third param (height) is set as optional,
but default value = -1 is incorrect

Compute correct height to preserve ratio.
NEWS
Revert "Bug #41631: Fix regression from first attempt (6569db8)"

This reverts commit 372844918a318ad712e16f9ec636682424a65403.
Revert "Bug #67965: Fix blocking behavior in non-blocking crypto streams"

This reverts commit f86b2193a483f56b0bd056570a0cdb57ebe66e2f.
Revert "Merge branch 'PHP-5.4' into PHP-5.5"

This reverts commit 30a73658c63a91c413305a4c4d49882fda4dab3e, reversing
changes made to 7fac56e0729385bbd2bb040f06a20a697d9de5fd.
Revert "fix TS build"

This reverts commit 84a4041ba47e92e7a0ba03938d0ebf88b5fcf6cf.
Revert "Merge branch 'PHP-5.5' into PHP-5.6"

This reverts commit 98e67add15a6b889efe152c23ed15a61f022a63a, reversing
changes made to 2cdc1a2b7473eff27c224c66dcb85118b553a147.
removing the NEWS entry as we had to revert this fix for now
Merge branch 'PHP-5.6'

* PHP-5.6:
  removing the NEWS entry as we had to revert this fix for now
  Revert "Merge branch 'PHP-5.5' into PHP-5.6"
  Revert "fix TS build"
  Revert "Merge branch 'PHP-5.4' into PHP-5.5"
  Revert "Bug #67965: Fix blocking behavior in non-blocking crypto streams"
  Revert "Bug #41631: Fix regression from first attempt (6569db8)"
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  NEWS
  Fixed Bug #65171 imagescale() fails
  Revert "Bug #41631: Observe socket read timeouts in SSL streams"

Conflicts:
	ext/openssl/xp_ssl.c
Merge branch 'PHP-5.6'

* PHP-5.6:
  NEWS
  Fixed Bug #65171 imagescale() fails
  Revert "Bug #41631: Observe socket read timeouts in SSL streams"