Merge branch 'PHP-5.6'

* PHP-5.6: fix linkage More openssl UPGRADING updates Fix build against older OpenSSL libs Update NEWS/UPGRADING with openssl additions

Author: weltling

ext/openssl/openssl.c

@@ -585,7 +585,7 @@ inline static int php_openssl_open_base_dir_chk(char *filename TSRMLS_DC)
 }
 /* }}} */
 
-inline php_stream* php_openssl_get_stream_from_ssl_handle(const SSL *ssl)
+php_stream* php_openssl_get_stream_from_ssl_handle(const SSL *ssl)
 {
 return (php_stream*)SSL_get_ex_data(ssl, ssl_stream_data_index);
 }

ext/openssl/xp_ssl.c

@@ -51,7 +51,7 @@
 
 int php_openssl_apply_verification_policy(SSL *ssl, X509 *peer, php_stream *stream TSRMLS_DC);
 SSL *php_SSL_new_from_context(SSL_CTX *ctx, php_stream *stream TSRMLS_DC);
-php_stream* php_openssl_get_stream_from_ssl_handle(const SSL *ssl);
+extern php_stream* php_openssl_get_stream_from_ssl_handle(const SSL *ssl);
 int php_openssl_get_x509_list_id(void);
 
 php_stream_ops php_openssl_socket_ops;