Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4

* 'PHP-5.4' of https://git.php.net/repository/php-src:
  Improved fix for bug #44686 (SOAP-ERROR: Parsing WSDL)
  Fixed bug #65018 (SoapHeader problems with SoapServer)
  MFH: fixed #65045: mb_convert_encoding breaks well-formed character.
Revert "Allow 'make distclean' to clean up the 'generated' phar.inc"

This reverts commit 017145bc57e604153f2a2400dd6e73a397f52f96.
Merge branch 'PHP-5.5'

* PHP-5.5:
  Revert "Allow 'make distclean' to clean up the 'generated' phar.inc"
Clean up the 'generated' phar.inc file.
When building outside the source tree the copied phar.inc needs to be removed,
but when building in the tree, the file must remain since it is part of the source.
See the copying logic in ext/phar/Makefile.frag.
Merge branch 'PHP-5.5'

* PHP-5.5:
  Clean up the 'generated' phar.inc file. When building outside the source tree the copied phar.inc needs to be removed, but when building in the tree, the file must remain since it is part of the source. See the copying logic in ext/phar/Makefile.frag.
Add user contributed test. Bug #61748
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Add user contributed test. Bug #61748
Merge branch 'PHP-5.5'

* PHP-5.5:
  Add user contributed test. Bug #61748
Fixed bug Bug #65372 (Segfault in gc_zval_possible_root when return reference fails)
Merge branch 'PHP-5.4' into PHP-5.5
Update NEWS
Merge branch 'PHP-5.5'
Fixed tests (inet_pton behaves differently on Darwin)
Merge branch 'PHP-5.5'
fix generating config.nice

Configure runs like:
$./configure -C CFLAGS="-ggdb" --enable-debug --prefix=$(pwd)/usr
did result in an empty config.nice

* allow single dash flags like -C, -s etc.
* allow passing evnironment variables as arguments
Make sure test.php isn't coming in from the include_path
Merge commit '5753b74'

* commit '5753b74':
  Make sure test.php isn't coming in from the include_path
This test will only work if gc is enabled
Merge commit 'e55f08a'

* commit 'e55f08a':
  This test will only work if gc is enabled
This test needs local infile enabled