Fixed timestamp update on Phar contents modification.
Fixed Bug #64340  (sockets tests failed) Patch by Reeze

Add __APPLE_USE_RFC_3542 for OS X 10.7 because IPv6 options are incompatible with RFC 2292.
Merge branch 'PHP-5.5'
Fixed bug #64290 (behavior change of converting to long)

convert_to_long behavior has been improved
As Cataphrace said in IRC, the test should be fixed.
Merge branch 'PHP-5.5'
Fix test after the convert_to_long be improved, see #64290
Merge branch 'PHP-5.5'
Fix test (skip on unable to create socket)
Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
Merge branch 'PHP-5.4' into PHP-5.5
Merge branch 'PHP-5.5'