com php-src: Merge branch 'PHP-5.4' into PHP-5.5: ext/date/php _date.c ext/intl/resourcebundle/resourcebundle_class. c ext/openssl/openssl.c
ext/openssl/xp_ssl.c ext/se ssion/session.c ext/simplexml/simplexml.c ext/snmp/snmp .c ext/spl/spl_array.c ext/spl/spl_dllist.c ext /standard/array.c
ext/standard/string.c ext/zip/php_z ip.c main/php_variables.c main/rfc1867.c sapi/cli/php_cli_server.c
| From: | Christopher Jones | Date: | Thu, 15 Aug 2013 03:43:25 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.4' into PHP-5.5: ext/date/php _date.c ext/intl/resourcebundle/resourcebundle_class. c ext/openssl/openssl.c ext/openssl/xp_ssl.c ext/se ssion/session.c ext/simplexml/simplexml.c ext/snmp/snmp .c ext/spl/spl_array.c ext/spl/spl_dllist.c ext /standard/array.c ext/standard/string.c ext/zip/php_z ip.c main/php_variables.c main/rfc1867.c sapi/cli/php_cli_server.c |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-72942@lists.php.net to get a copy of this message | ||
Commit: 39612afc72623e89a2bc595c9be4be497568d1be
Author: Christopher Jones <sixd@php.net> Wed, 14 Aug 2013 20:43:25 -0700
Parents: 8c61758dc772345636e436e3f69bef7323f8b339 9ad97cd48903ea5454853960f2c14de326e0f624
Branches: PHP-5.5 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=39612afc72623e89a2bc595c9be4be497568d1be
Log:
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
Changed paths:
MM ext/date/php_date.c
MM ext/intl/resourcebundle/resourcebundle_class.c
MM ext/openssl/openssl.c
MM ext/openssl/xp_ssl.c
MM ext/session/session.c
MM ext/simplexml/simplexml.c
MM ext/snmp/snmp.c
MM ext/spl/spl_array.c
MM ext/spl/spl_dllist.c
MM ext/standard/array.c
MM ext/standard/string.c
MM ext/zip/php_zip.c
MM main/php_variables.c
MM main/rfc1867.c
MM sapi/cli/php_cli_server.c
Diff:
diff --cc ext/openssl/openssl.c
index 05e1e79,68be86f..4c3b2ec
--- a/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);