- Fix #429: rpz: url: with https: broken (regression in 1.13.1).

diff --git a/doc/Changelog b/doc/Changelog
index e04e0dbd5e0d96a166081662093c33f111c2a015..0c81a22a8915ec0a28a7e912279cd620511a4106 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -6,6 +6,7 @@
          With zonemd-reject-absence for an auth-zone the presence of a
          zonemd can be mandated for specific zones.
        - Fix doxygen and pydoc warnings.
+       - Fix #429: rpz: url: with https: broken (regression in 1.13.1).
 
 15 February 2021: Wouter
        - Fix #422: IPv6 fallback issues when IPv6 is not properly

diff --git a/util/netevent.c b/util/netevent.c
index 893c1ddbff41eefd02e1725f0d5bf7817da05157..5a71a82e4dfb262e0857f3fce1193638bc08bd5a 100644 (file)
--- a/util/netevent.c
+++ b/util/netevent.c
@@ -2197,6 +2197,8 @@ ssl_http_read_more(struct comm_point* c)
                log_crypto_err("could not SSL_read");
                return 0;
        }
+       verbose(VERB_ALGO, "ssl http read more skip to %d + %d",
+               (int)sldns_buffer_position(c->buffer), (int)r);
        sldns_buffer_skip(c->buffer, (ssize_t)r);
        return 1;
 #else
@@ -2233,6 +2235,8 @@ http_read_more(int fd, struct comm_point* c)
                        &c->repinfo.addr, c->repinfo.addrlen);
                return 0;
        }
+       verbose(VERB_ALGO, "http read more skip to %d + %d",
+               (int)sldns_buffer_position(c->buffer), (int)r);
        sldns_buffer_skip(c->buffer, r);
        return 1;
 }
@@ -2393,8 +2397,8 @@ http_nonchunk_segment(struct comm_point* c)
         * read more data collected into the buffer */
        remainbufferlen = sldns_buffer_capacity(c->buffer) -
                sldns_buffer_limit(c->buffer);
-       if(remainbufferlen >= c->tcp_byte_count ||
-               remainbufferlen >= 2048) {
+       if(remainbufferlen+got_now >= c->tcp_byte_count ||
+               remainbufferlen >= (c->ssl?16384:2048)) {
                size_t total = sldns_buffer_limit(c->buffer);
                sldns_buffer_clear(c->buffer);
                sldns_buffer_set_position(c->buffer, total);
@@ -2762,6 +2766,11 @@ comm_point_http_handle_read(int fd, struct comm_point* c)
                        return 0;
        }
 
+       if(c->http_stored >= sldns_buffer_position(c->buffer)) {
+               /* read did not work but we wanted more data, there is
+                * no bytes to process now. */
+               return 1;
+       }
        sldns_buffer_flip(c->buffer);
        /* if we are partway in a segment of data, position us at the point
         * where we left off previously */