Merge branch 'PHP-5.4' into PHP-5.5

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

Conflicts:
	ext/dba/libinifile/inifile.c

diff --cc ext/date/php_date.c
Simple merge

diff --cc ext/intl/resourcebundle/resourcebundle_class.c
Simple merge

diff --cc ext/openssl/openssl.c
index 05e1e790e1e2616982f8d7ccc5d94873f1427d45,68be86f83381675f76913ba1ad8cb11d21dbdb58..4c3b2ec39e6b984645719c1b40bfabb5c22f164a
--- 1/ext/openssl/openssl.c
--- 2/ext/openssl/openssl.c
+++ b/ext/openssl/openssl.c
@@@ -588,10 -575,10 +588,10 @@@ static void add_assoc_name_entry(zval 
        } else {
                subitem = val;
        }
 -
 +      
        for (i = 0; i < X509_NAME_entry_count(name); i++) {
                unsigned char *to_add;
-               int to_add_len;
+               int to_add_len = 0;
  
  
                ne  = X509_NAME_get_entry(name, i);

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

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

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

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

diff --cc ext/spl/spl_array.c
Simple merge

diff --cc ext/spl/spl_dllist.c
Simple merge

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

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

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

diff --cc main/php_variables.c
Simple merge

diff --cc main/rfc1867.c
Simple merge

diff --cc sapi/cli/php_cli_server.c
Simple merge