diff options
| author | Christopher Jones <sixd@php.net> | 2013-08-14 20:43:25 -0700 |
|---|---|---|
| committer | Christopher Jones <sixd@php.net> | 2013-08-14 20:43:25 -0700 |
| commit | 39612afc72623e89a2bc595c9be4be497568d1be (patch) | |
| tree | ba336742c4b5ad3d4c8933748b91332f7436aa66 /ext/openssl | |
| parent | 8c61758dc772345636e436e3f69bef7323f8b339 (diff) | |
| parent | 9ad97cd48903ea5454853960f2c14de326e0f624 (diff) | |
| download | php-git-39612afc72623e89a2bc595c9be4be497568d1be.tar.gz | |
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
Diffstat (limited to 'ext/openssl')
| -rw-r--r-- | ext/openssl/openssl.c | 2 | ||||
| -rw-r--r-- | ext/openssl/xp_ssl.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c index 05e1e790e1..4c3b2ec39e 100644 --- a/ext/openssl/openssl.c +++ b/ext/openssl/openssl.c @@ -591,7 +591,7 @@ static void add_assoc_name_entry(zval * val, char * key, X509_NAME * name, int s 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 --git a/ext/openssl/xp_ssl.c b/ext/openssl/xp_ssl.c index e9a72e3f3e..a1a7ffc3f4 100644 --- a/ext/openssl/xp_ssl.c +++ b/ext/openssl/xp_ssl.c @@ -472,7 +472,7 @@ static inline int php_openssl_enable_crypto(php_stream *stream, do { struct timeval cur_time, - elapsed_time; + elapsed_time = {0}; if (sslsock->is_client) { n = SSL_connect(sslsock->ssl_handle); |