Merge lp:~davidstrauss/pyopenssl/set_session_cache_mode into lp:~exarkun/pyopenssl/trunk

Proposed by David Strauss
Status: Merged
Merged at revision: 164
Proposed branch: lp:~davidstrauss/pyopenssl/set_session_cache_mode
Merge into: lp:~exarkun/pyopenssl/trunk
Diff against target: 36 lines (+19/-0)
1 file modified
OpenSSL/ssl/context.c (+19/-0)
To merge this branch: bzr merge lp:~davidstrauss/pyopenssl/set_session_cache_mode
Reviewer Review Type Date Requested Status
Jean-Paul Calderone Pending
Review via email: mp+78309@code.launchpad.net

Description of the change

Just proposing a merge to show the current diff.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'OpenSSL/ssl/context.c'
--- OpenSSL/ssl/context.c 2011-09-11 13:35:32 +0000
+++ OpenSSL/ssl/context.c 2011-10-05 19:33:26 +0000
@@ -984,6 +984,24 @@
984 return PyLong_FromLong(ret);984 return PyLong_FromLong(ret);
985}985}
986986
987static char ssl_Context_set_session_cache_mode_doc[] = "\n\
988Set session cache mode\n\
989\n\
990:param timeout: The mode as an integer\n\
991:return: The previous set cache mode\n\
992";
993static PyObject *
994ssl_Context_set_session_cache_mode(ssl_ContextObj *self, PyObject *args)
995{
996 long t, ret;
997
998 if (!PyArg_ParseTuple(args, "l:set_session_cache_mode", &t))
999 return NULL;
1000
1001 ret = SSL_CTX_set_session_cache_mode(self->ctx, t);
1002 return PyLong_FromLong(ret);
1003}
1004
987static char ssl_Context_get_timeout_doc[] = "\n\1005static char ssl_Context_get_timeout_doc[] = "\n\
988Get the session timeout\n\1006Get the session timeout\n\
989\n\1007\n\
@@ -1186,6 +1204,7 @@
1186 ADD_METHOD(add_client_ca),1204 ADD_METHOD(add_client_ca),
1187 ADD_METHOD(set_timeout),1205 ADD_METHOD(set_timeout),
1188 ADD_METHOD(get_timeout),1206 ADD_METHOD(get_timeout),
1207 ADD_METHOD(set_session_cache_mode),
1189 ADD_METHOD(set_info_callback),1208 ADD_METHOD(set_info_callback),
1190 ADD_METHOD(get_app_data),1209 ADD_METHOD(get_app_data),
1191 ADD_METHOD(set_app_data),1210 ADD_METHOD(set_app_data),

Subscribers

People subscribed via source and target branches

to status/vote changes: