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

# By Dmitry Stogov
# Via Dmitry Stogov
* 'PHP-5.5' of https://git.php.net/repository/php-src:
  Merge from GitHub
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5

# By Dmitry Stogov (5) and Rui Hirokawa (2)
# Via Dmitry Stogov (3) and others
* 'PHP-5.5' of https://git.php.net/repository/php-src:
  Fixed php-5.2 support
  added test script for bug65045.
  MFH: fixed #65045: mb_convert_encoding breaks well-formed character.
  Added support for glob symbols in blacklist entries (?, *, **)
  Improved implementation of NOP removal pass from O(n^2) to O(n) (hnw)
  A minor fix for configure outpu (Tony)
  Fixed bug #65338 (Enabling both php_opcache and php_wincache AVs on shutdown).
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5

# By Dmitry Stogov (3) and others
# Via Christopher Jones (6) and Dmitry Stogov (2)
* 'PHP-5.5' of https://git.php.net/repository/php-src:
  Fixed bug #62691 (solaris sed has no -i switch) Make 'make distclean' remove generated DTrace .h file
  Improved fix for bug #44686 (SOAP-ERROR: Parsing WSDL)
  Fixed bug #65018 (SoapHeader problems with SoapServer)
  Added opcache.restrict_api configuration directive that may limit usage of OPcahce API functions only to patricular script(s)
  MFH: fixed #65045: mb_convert_encoding breaks well-formed character.
  Fixed bug #65336
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5

* 'PHP-5.5' of https://git.php.net/repository/php-src:
  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.
  Revert "Allow 'make distclean' to clean up the 'generated' phar.inc"
  Use PHP's major version when cleaning up Apache .module files
  Allow 'make distclean' to clean up the 'generated' phar.inc
  Give 'make distclean' some love. Clean files created by AC_OUTPUT, shell redirection etc.
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5

# By Rasmus Lerdorf (6) and others
# Via Christopher Jones (5) and others
* 'PHP-5.5' of https://git.php.net/repository/php-src: (26 commits)
  NEWS for recent DTrace merges. Remove redundant 'cp' during DTrace install.
  Fixed bug #62691 (solaris sed has no -i switch) Make 'make distclean' remove generated DTrace .h file
  Enable dtrace probes on linux as they are compatible with systemtap
  Fixed bug #63706: Cannot build PHP-5.5 with --enable-dtrace on Fedora 17
  Add an empty make command for DTrace .d files to stop an implicit circular dependency in GNU Make which causes .d files to be overwritten (Bug 61268)
  Merge branch 'PHP-5.4'
  Merge branch 'PHP-5.5'
  Fixed bug #62978. pg_select()/etc may allow SQL injection when table name is user parameter, users are able to control table names.
  add news about session fix
  First fixes for a 64bit compatible ftp extension
  fix compiler warning, use longs for hashes
  fix crash, enable session_id and fix test
  Strict session. Detect session id collision
  Strict session
  non living code related typo fixes
  fix typo
  This doesn't fail in 5.5 anymore
  We shouldn't load any local ini files for these tests
  pcre_quote? No such thing. How did this ever pass?
  This test needs local infile enabled
  ...
Doh. PHP 5.5 NEWS needs own commit.
PHP 5.5.2 has already branched
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5

* 'PHP-5.5' of https://git.php.net/repository/php-src:
  PHP 5.5.2 has already branched
  Doh. PHP 5.5 NEWS needs own commit.
Re-fix Bug #65372 (Segfault in gc_zval_possible_root when return reference fails)

Missed a zval_copy_ctor there
Merge branch 'PHP-5.4' into PHP-5.5
Merge branch 'PHP-5.5'
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5

# By Xinchen Hui
# Via Xinchen Hui
* 'PHP-5.5' of https://git.php.net/repository/php-src:
  Re-fix Bug #65372 (Segfault in gc_zval_possible_root when return reference fails)
Merge branch 'master' of https://git.php.net/repository/php-src

# By Christopher Jones (2) and Xinchen Hui (1)
# Via Xinchen Hui
* 'master' of https://git.php.net/repository/php-src:
  Re-fix Bug #65372 (Segfault in gc_zval_possible_root when return reference fails)
  PHP 5.5.2 has already branched
  Doh. PHP 5.5 NEWS needs own commit.
Fix long-standing visual pain point: the misalignment of './configure help' text.
Whitespace changes and a couple of grammar fixes.
Merge branch 'PHP-5.5'

* PHP-5.5:
  Fix long-standing visual pain point: the misalignment of './configure help' text. Whitespace changes and a couple of grammar fixes.
One more './configure --help' alignment fix
Merge branch 'PHP-5.5'

* PHP-5.5:
  One more './configure --help' alignment fix