merge changes from the 0.9.6 branch.

diff --git a/crypto/dso/dso_vms.c b/crypto/dso/dso_vms.c
index ab48b63eb76eca5007957f638c018ac80cc1fb3a..d8bf26b6d84a65f3696c74395ab43a379cfed6c7 100644 (file)
--- a/crypto/dso/dso_vms.c
+++ b/crypto/dso/dso_vms.c
@@ -259,8 +259,12 @@ void vms_bind_sym(DSO *dso, const char *symname, void **sym)
        {
        DSO_VMS_INTERNAL *ptr;
        int status;
+#if 0
        int flags = (1<<4); /* LIB$M_FIS_MIXEDCASE, but this symbol isn't
                                defined in VMS older than 7.0 or so */
+#else
+       int flags = 0;
+#endif
        struct dsc$descriptor_s symname_dsc;
        *sym = NULL;
 

diff --git a/doc/ssl/SSL_get_session.pod b/doc/ssl/SSL_get_session.pod
index 8547faa58b5d3e0bf707736b0ac885c160cf33fe..dd9aba40b6a43ee86975cf013e4313f07fe2a986 100644 (file)
--- a/doc/ssl/SSL_get_session.pod
+++ b/doc/ssl/SSL_get_session.pod
@@ -37,8 +37,10 @@ if the session is valid, it can be removed at any time due to timeout
 during L<SSL_CTX_flush_sessions(3)|SSL_CTX_flush_sessions(3)>.
 
 If the data is to be kept, SSL_get1_session() will increment the reference
-count and the session will stay in memory until explicitly freed with
-L<SSL_SESSION_free(3)|SSL_SESSION_free(3)>, regardless of its state.
+count, so that the session will not be implicitly removed by other operations
+but stays in memory. In order to remove the session
+L<SSL_SESSION_free(3)|SSL_SESSION_free(3)> must be explicitly called once
+to decrement the reference count again.
 
 SSL_SESSION objects keep internal link information about the session cache
 list, when being inserted into one SSL_CTX object's session cache.