You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by mi...@apache.org on 2011/12/02 19:16:58 UTC
svn commit: r1209620 - in /httpd/httpd/branches/2.4.x: ./
modules/session/mod_session_dbd.c
Author: minfrin
Date: Fri Dec 2 18:16:58 2011
New Revision: 1209620
URL: http://svn.apache.org/viewvc?rev=1209620&view=rev
Log:
Backport:
mod_session_dbd: Use apr_status_t as a return code across the mod_session API.
Modified:
httpd/httpd/branches/2.4.x/ (props changed)
httpd/httpd/branches/2.4.x/modules/session/mod_session_dbd.c
Propchange: httpd/httpd/branches/2.4.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec 2 18:16:58 2011
@@ -1,3 +1,3 @@
/httpd/httpd/branches/revert-ap-ldap:1150158-1150173
/httpd/httpd/branches/wombat-integration:723609-723841
-/httpd/httpd/trunk:1201042,1201111,1201194,1201198,1201202,1202456,1202886,1203859,1204630,1204968,1204990,1205061,1205075,1205379,1205885,1206291,1206587,1207719,1208753,1208835,1209053,1209085,1209417,1209432,1209461,1209601,1209603
+/httpd/httpd/trunk:1201042,1201111,1201194,1201198,1201202,1202456,1202886,1203859,1204630,1204968,1204990,1205061,1205075,1205379,1205885,1206291,1206587,1207719,1208753,1208835,1209053,1209085,1209417,1209432,1209461,1209601,1209603,1209618
Modified: httpd/httpd/branches/2.4.x/modules/session/mod_session_dbd.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/session/mod_session_dbd.c?rev=1209620&r1=1209619&r2=1209620&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/session/mod_session_dbd.c (original)
+++ httpd/httpd/branches/2.4.x/modules/session/mod_session_dbd.c Fri Dec 2 18:16:58 2011
@@ -161,7 +161,7 @@ static apr_status_t dbd_load(request_rec
*
* On success, this returns OK.
*/
-static int session_dbd_load(request_rec * r, session_rec ** z)
+static apr_status_t session_dbd_load(request_rec * r, session_rec ** z)
{
session_dbd_dir_conf *conf = ap_get_module_config(r->per_dir_config,
@@ -402,7 +402,7 @@ static apr_status_t dbd_clean(apr_pool_t
* @param r The request pointer.
* @param z A pointer to where the session will be written.
*/
-static int session_dbd_save(request_rec * r, session_rec * z)
+static apr_status_t session_dbd_save(request_rec * r, session_rec * z)
{
char *buffer;