Commit 60f3f6ac authored by Richard Levitte's avatar Richard Levitte
Browse files

merge changes from the 0.9.6 branch.

parent 595241e1

crypto/dso/dso_vms.c

+4 −0
Original line number Diff line number Diff line
@@ -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;

doc/ssl/SSL_get_session.pod

+4 −2
Original line number Diff line number Diff line
@@ -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.