httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject svn commit: r1430298 - in /httpd/httpd/branches/2.4.x: ./ CHANGES STATUS support/httxt2dbm.c
Date Tue, 08 Jan 2013 14:22:47 GMT
Author: jim
Date: Tue Jan  8 14:22:46 2013
New Revision: 1430298

URL: http://svn.apache.org/viewvc?rev=1430298&view=rev
Log:
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

Modified:
    httpd/httpd/branches/2.4.x/   (props changed)
    httpd/httpd/branches/2.4.x/CHANGES
    httpd/httpd/branches/2.4.x/STATUS
    httpd/httpd/branches/2.4.x/support/httxt2dbm.c

Propchange: httpd/httpd/branches/2.4.x/
------------------------------------------------------------------------------
  Merged /httpd/httpd/trunk:r1422135

Modified: httpd/httpd/branches/2.4.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/CHANGES?rev=1430298&r1=1430297&r2=1430298&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.4.x/CHANGES [utf-8] Tue Jan  8 14:22:46 2013
@@ -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]
 

Modified: httpd/httpd/branches/2.4.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1430298&r1=1430297&r2=1430298&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Tue Jan  8 14:22:46 2013
@@ -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:

Modified: httpd/httpd/branches/2.4.x/support/httxt2dbm.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/support/httxt2dbm.c?rev=1430298&r1=1430297&r2=1430298&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/support/httxt2dbm.c (original)
+++ httpd/httpd/branches/2.4.x/support/httxt2dbm.c Tue Jan  8 14:22:46 2013
@@ -154,7 +154,7 @@ static apr_status_t to_dbm(apr_dbm_t *db
         }
 
         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,



Mime
View raw message