- Fixed bug #66381 (__ss_family was changed on AIX 5.3)
Merge branch 'PHP-5.5' of git.php.net:/php-src into PHP-5.5
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  - Fixed bug #66381 (__ss_family was changed on AIX 5.3)
fix #66375 bad logic in sapi header callback routine
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fix #66375 bad logic in sapi header callback routine
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  fix #66375 bad logic in sapi header callback routine
- BFN
Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
Fixed (some of) add/sub.

This worked in PHP 5.4 already, but with the introduction of DateTimeImmutable
this code was not correctly merged.
Merge branch 'PHP-5.5' into PHP-5.6
Merge branch 'PHP-5.4' into PHP-5.5
Merge branch 'PHP-5.5' into PHP-5.6
Bump year
Merge branch 'PHP-5.4' into PHP-5.5
Bump year
Merge branch 'PHP-5.5' into PHP-5.6
Bump year
Here need to be str_efree

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