httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From minf...@apache.org
Subject svn commit: r1209466 - in /httpd/httpd/branches/2.4.x: ./ modules/session/mod_session_crypto.c
Date Fri, 02 Dec 2011 13:27:04 GMT
Author: minfrin
Date: Fri Dec  2 13:27:03 2011
New Revision: 1209466

URL: http://svn.apache.org/viewvc?rev=1209466&view=rev
Log:
Backport:
mod_session_crypto: Fix a pool lifetime problem when reading from
SessionCryptoPassphraseFile.

Modified:
    httpd/httpd/branches/2.4.x/   (props changed)
    httpd/httpd/branches/2.4.x/modules/session/mod_session_crypto.c

Propchange: httpd/httpd/branches/2.4.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec  2 13:27:03 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
+/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

Modified: httpd/httpd/branches/2.4.x/modules/session/mod_session_crypto.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/session/mod_session_crypto.c?rev=1209466&r1=1209465&r2=1209466&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/session/mod_session_crypto.c (original)
+++ httpd/httpd/branches/2.4.x/modules/session/mod_session_crypto.c Fri Dec  2 13:27:03 2011
@@ -567,7 +567,7 @@ static const char *set_crypto_passphrase
 
     while (!(ap_cfg_getline(buffer, sizeof(buffer), file))) {
         args = buffer;
-        while (*(arg = ap_getword_conf(cmd->temp_pool, &args)) != '\0') {
+        while (*(arg = ap_getword_conf(cmd->pool, &args)) != '\0') {
             if (*arg == '#' || *arg == 0) {
                 break;
             }



Mime
View raw message