Add test
Merge branch 'PHP-5.5' into PHP-5.6

Conflicts:
	ext/mysqli/tests/mysqli_change_user_old.phpt
Merge branch 'PHP-5.6'
Fix bug #66171: better handling of symlinks
Fix null byte in LDAP bindings
Fix bug #66171: better handling of symlinks
Fix null byte in LDAP bindings
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fix null byte in LDAP bindings
  Fix bug #66171: better handling of symlinks
Fix bug #66171: better handling of symlinks
Fix null byte in LDAP bindings
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fix null byte in LDAP bindings
  Fix bug #66171: better handling of symlinks
  Fix null byte in LDAP bindings
  Fix bug #66171: better handling of symlinks
Fix bug #66171: better handling of symlinks
Fix null byte in LDAP bindings
Merge branch 'PHP-5.6'

* PHP-5.6:
  Fix null byte in LDAP bindings
  Fix bug #66171: better handling of symlinks
  Fix null byte in LDAP bindings
  Fix bug #66171: better handling of symlinks
  Fix null byte in LDAP bindings
  Fix bug #66171: better handling of symlinks
Merge branch 'master' of git.php.net:php-src
Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
ws fix
Fix #66942: openssl_seal() memory leak

Fix #66952: memory leak in openssl_open()
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fix #66942: openssl_seal() memory leak
  ws fix

Conflicts:
	ext/openssl/openssl.c