You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ic...@apache.org on 2022/05/25 11:45:06 UTC
svn commit: r1901231 - in /httpd/httpd/branches/2.4.x: ./ changes-entries/md_ocsp_query.txt modules/md/md_curl.c
Author: icing
Date: Wed May 25 11:45:05 2022
New Revision: 1901231
URL: http://svn.apache.org/viewvc?rev=1901231&view=rev
Log:
Merge /httpd/httpd/trunk:r1901230
*) mod_md: a logic bug in sending long OCSP HTTP request bodies was fixed.
This did not happen in normal use as request sizes for OSCP queries
never exceed that length.
Added:
httpd/httpd/branches/2.4.x/changes-entries/md_ocsp_query.txt
- copied unchanged from r1901230, httpd/httpd/trunk/changes-entries/md_ocsp_query.txt
Modified:
httpd/httpd/branches/2.4.x/ (props changed)
httpd/httpd/branches/2.4.x/modules/md/md_curl.c
Propchange: httpd/httpd/branches/2.4.x/
------------------------------------------------------------------------------
Merged /httpd/httpd/trunk:r1901230
Modified: httpd/httpd/branches/2.4.x/modules/md/md_curl.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/md/md_curl.c?rev=1901231&r1=1901230&r2=1901231&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/md/md_curl.c (original)
+++ httpd/httpd/branches/2.4.x/modules/md/md_curl.c Wed May 25 11:45:05 2022
@@ -64,6 +64,7 @@ static size_t req_data_cb(void *data, si
apr_bucket_brigade *body = baton;
size_t blen, read_len = 0, max_len = len * nmemb;
const char *bdata;
+ char *rdata = data;
apr_bucket *b;
apr_status_t rv;
@@ -81,9 +82,10 @@ static size_t req_data_cb(void *data, si
apr_bucket_split(b, max_len);
blen = max_len;
}
- memcpy(data, bdata, blen);
+ memcpy(rdata, bdata, blen);
read_len += blen;
max_len -= blen;
+ rdata += blen;
}
else {
body = NULL;