Merge r1422135 from trunk:

httxt2dbm: Correct length computation for the 'value' stored in the DBM file  PR 47650
Submitted by: jailletc36
Reviewed/backported by: jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1430298 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index d8356dc7ad160d18aa614841e0a55838e470dbf1..7afac8c4b25c4064275cb5c4b1dd5a64650f802a 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,9 @@
 
 Changes with Apache 2.4.4
 
+  *) httxt2dbm: Correct length computation for the 'value' stored in the DBM file
+     PR 47650 [jon buckybox com]
+
   *) core: Be more correct about rejecting directives that cannot work in <If>
      sections. [Stefan Fritsch]
 

diff --git a/STATUS b/STATUS
index f23dad97b4cfde18a8c1108ebb8763d3767c4283..660a2a448eaf4f4b6e277fa142783c0730fea749 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -97,12 +97,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
      trunk patch: https://svn.apache.org/viewvc?view=revision&revision=1422937
      2.4.x patch: trunk patch works + CHANGES to be added
      +1: jailletc36, jorton, humbedooh
-
-   * support/httxt2dbm: Correct length computation for the 'value' stored in the DBM file
-     PR 47650
-     trunk patch: https://svn.apache.org/viewvc?view=revision&revision=1422135
-     2.4.x patch: trunk patch works
-     +1: jailletc36, jorton, humbedooh
      
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:

diff --git a/support/httxt2dbm.c b/support/httxt2dbm.c
index 8792f944b9df04a5556cca0decc13054a8160550..12606c3a5eb0e1c42f0205d13755162f87a9cc10 100644 (file)
--- a/support/httxt2dbm.c
+++ b/support/httxt2dbm.c
@@ -154,7 +154,7 @@ static apr_status_t to_dbm(apr_dbm_t *dbm, apr_file_t *fp, apr_pool_t *pool)
         }
 
         dbmval.dptr = apr_pstrmemdup(p, value,  c - value);
-        dbmval.dsize = (c - line);
+        dbmval.dsize = (c - value);
 
         if (verbose) {
             apr_file_printf(errfile, "    '%s' -> '%s'"NL,