httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From n..@apache.org
Subject svn commit: r396310 - /httpd/httpd/trunk/modules/database/mod_dbd.c
Date Sun, 23 Apr 2006 19:59:25 GMT
Author: niq
Date: Sun Apr 23 12:59:23 2006
New Revision: 396310

URL: http://svn.apache.org/viewcvs?rev=396310&view=rev
Log:
PR#39386: Fix merge-config to support prepared statements (Brian J. France)

Modified:
    httpd/httpd/trunk/modules/database/mod_dbd.c

Modified: httpd/httpd/trunk/modules/database/mod_dbd.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/database/mod_dbd.c?rev=396310&r1=396309&r2=396310&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/database/mod_dbd.c (original)
+++ httpd/httpd/trunk/modules/database/mod_dbd.c Sun Apr 23 12:59:23 2006
@@ -192,6 +192,7 @@
     cfg->exptime = (add->set&EXPTIME_SET) ? add->exptime : base->exptime;
 #endif
     cfg->set = add->set | base->set;
+    cfg->prepared = (add->prepared != NULL) ? add->prepared : base->prepared;
     return (void*) cfg;
 }
 /* A default nmin of >0 will help with generating meaningful



Mime
View raw message