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

* 'PHP-5.3' of https://git.php.net/repository/php-src:
  fix using wrong buffer pointer
cli: don't cast away const in select() timeout argument

The timeout argument to select() is modified to reflect the time
remaining when the function returns on a non-timeout condition.
Passing a pointer to const data and casting away the const-ness is
asking for trouble, but for some reason, this trouble manifests
itself only on non-x86 architectures [whose implementation of select()
in glibc is different from the one supplied for x86]

Fix this by passing a stack copy of the timeout argument to select()
Arguments passed to user function have to be properly allocated on heap
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Arguments passed to user function have to be properly allocated on heap
Fixed bug #66252 (Problems in AST evaluation invalidating valid parent:: reference. Constant expessions have to be evaluated in context of defining class).
Zend: fix overflow handling bug in non-x86 fast_add_function()

The 'result' argument of fast_add_function() may alias with either
of its operands (or both). Take care not to write to 'result' before
reading op1 and op2.
Fixed memory leaks introdused by:
	commit 611da37617749c81ab22b1e44a0cc1f294cc493a
	Author: Igor Wiedler <igor@wiedler.ch>
	Date:   Sat Nov 9 13:48:23 2013 -0500
Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6

* 'PHP-5.6' of git.php.net:php-src:
  Zend: fix overflow handling bug in non-x86 fast_add_function()
Revered func_get_args() changes, because they were not completly transparent and broke some tricky PHP code that worked because of luck before php-5.5.6 (see Bug #66107). The changes are going to be kept in PHP-5.6.
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Revered func_get_args() changes, because they were not completly transparent and broke some tricky PHP code that worked because of luck before php-5.5.6 (see Bug #66107). The changes are going to be kept in PHP-5.6.
Fixed bug #66251 (Constants get statically bound at compile time when Optimized)
Fixed bug #66112 (Use after free condition in SOAP extension). (martin dot koegler at brz dot gv dot at)
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fixed bug #66112 (Use after free condition in SOAP extension). (martin dot koegler at brz dot gv dot at)

Conflicts:
	NEWS
Fixed Bug #66218 zend_register_functions breaks reflection

Functions registered using zend_register_functions instead of zend_module_entry.functions are not seen on reflection.

Ex: additional_functions from api_module_entry.
Ex: in CLI, dl, cli_set_process_title and cli_get_process_title

Note:
- also affects functions overrided in extension
  (should be be reported in extension, where overrided, not in original extension)
- also allow extension to call zend_register_functions for various list
  (instead of having a single bug list)
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fixed Bug #66218 zend_register_functions breaks reflection
NEWS
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  NEWS
  Fixed Bug #66218 zend_register_functions breaks reflection
Fix CVE-2013-6420 - memory corruption in openssl_x509_parse
5.3.29-dev
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  5.3.29-dev
  Fix CVE-2013-6420 - memory corruption in openssl_x509_parse

Conflicts:
	configure.in
	main/php_version.h