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
1=== modified file 'OpenSSL/ssl/context.c'
2--- OpenSSL/ssl/context.c 2011-09-11 13:35:32 +0000
3+++ OpenSSL/ssl/context.c 2011-10-05 19:33:26 +0000
4@@ -984,6 +984,24 @@
5 return PyLong_FromLong(ret);
6 }
7
8+static char ssl_Context_set_session_cache_mode_doc[] = "\n\
9+Set session cache mode\n\
10+\n\
11+:param timeout: The mode as an integer\n\
12+:return: The previous set cache mode\n\
13+";
14+static PyObject *
15+ssl_Context_set_session_cache_mode(ssl_ContextObj *self, PyObject *args)
16+{
17+ long t, ret;
18+
19+ if (!PyArg_ParseTuple(args, "l:set_session_cache_mode", &t))
20+ return NULL;
21+
22+ ret = SSL_CTX_set_session_cache_mode(self->ctx, t);
23+ return PyLong_FromLong(ret);
24+}
25+
26 static char ssl_Context_get_timeout_doc[] = "\n\
27 Get the session timeout\n\
28 \n\
29@@ -1186,6 +1204,7 @@
30 ADD_METHOD(add_client_ca),
31 ADD_METHOD(set_timeout),
32 ADD_METHOD(get_timeout),
33+ ADD_METHOD(set_session_cache_mode),
34 ADD_METHOD(set_info_callback),
35 ADD_METHOD(get_app_data),
36 ADD_METHOD(set_app_data),

Subscribers

People subscribed via source and target branches

to status/vote changes: