Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Revert "Add CURL_WRAPPERS_ENABLE constant"

Conflicts:
	ext/curl/interface.c
Fixed compilation warnings (issue #92)
Avoid possible conditional jump depended on uninitialised value
 fix #64738, fix implicit type declaration
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
Added SoapClient constructor option 'ssl_method' to specify ssl method
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5

* 'PHP-5.5' of git.php.net:php-src:
  fix #64738, fix implicit type declaration
When Apache use RewriteRule to redirect, via mod_proxy_fgi, to php-fpm
the SCRIPT_FILENAME may contains the QUERY_STRING.

Ex : RewriteRule ^(.*)\.php$ fcgi://127.0.0.1:9000/$1.php [P]

From apache debug (build with -DFCGI_DUMP_ENV_VARS)
AH01062: sending env var 'SCRIPT_FILENAME' value 'proxy:fcgi://127.0.0.1:9000/var/www/html/info.php?foo'
AH01071: Got error 'Primary script unknown\n'
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  When Apache use RewriteRule to redirect, via mod_proxy_fgi, to php-fpm the SCRIPT_FILENAME may contains the QUERY_STRING.
NEWS
don't include smart_str.h in a too global header, fixes #64718
Fix bug #64729: compilation failure on x32
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fix bug #64729: compilation failure on x32

Conflicts:
	Zend/zend_alloc.c
NEWS for 514afd67
Remove trailing space in NEWS
updated lib versions
fix possible null deref (detected by code coverity scan)
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  fix possible null deref (detected by code coverity scan)
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fix possible null deref (detected by code coverity scan)
  Remove trailing space in NEWS
  NEWS for 514afd67
unused variable