Merge branch 'PHP-5.6'

* PHP-5.6:
  Mitigate client-initiated SSL renegotiation DoS

1 files changed, 6 insertions, 0 deletions

diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c
index 6ad4065c6b..ba4b3a6847 100755
--- a/ext/openssl/openssl.c
+++ b/ext/openssl/openssl.c
@@ -585,6 +585,12 @@ 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)
+{
+	return (php_stream*)SSL_get_ex_data(ssl, ssl_stream_data_index);
+}
+/* }}} */
+
 /* openssl -> PHP "bridging" */
 /* true global; readonly after module startup */
 static char default_ssl_conf_filename[MAXPATHLEN];