Merge branch 'PHP-5.5'

* PHP-5.5:
  Reduce (some) compile noise of 'unused variable' and 'may be used uninitialized' warnings.

Conflicts:
	ext/gmp/gmp.c

diff --cc ext/gmp/gmp.c
index 6b3dadf40576f4b748c8747107dd6d663af75efb,e3a3563aaca4fed99584179481f340d59676aece..8b5c131e76060556ce0d27c8baa87f069d5a1ebc
--- 1/ext/gmp/gmp.c
--- 2/ext/gmp/gmp.c
+++ b/ext/gmp/gmp.c
@@@ -1360,12 -1066,12 +1360,12 @@@ ZEND_FUNCTION(gmp_pow
     Raise base to power exp and take result modulo mod */
  ZEND_FUNCTION(gmp_powm)
  {
 -      zval **base_arg, **exp_arg, **mod_arg;
 -      mpz_t *gmpnum_base, *gmpnum_exp, *gmpnum_mod, *gmpnum_result;
 +      zval *base_arg, *exp_arg, *mod_arg;
 +      mpz_ptr gmpnum_base, gmpnum_exp, gmpnum_mod, gmpnum_result;
        int use_ui = 0;
-       gmp_temp_t temp_base, temp_exp, temp_mod;
 -      int temp_base = 0, temp_exp = 0, temp_mod;
++      gmp_temp_t temp_base = {0}, temp_exp = {0}, temp_mod;
  
 -      if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ZZZ", &base_arg, &exp_arg, &mod_arg) == FAILURE){
 +      if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "zzz", &base_arg, &exp_arg, &mod_arg) == FAILURE){
                return;
        }
  

diff --cc ext/openssl/openssl.c
Simple merge

diff --cc ext/openssl/xp_ssl.c
Simple merge

diff --cc ext/session/session.c
Simple merge

diff --cc ext/standard/string.c
Simple merge

diff --cc ext/zip/php_zip.c
Simple merge

diff --cc main/rfc1867.c
Simple merge