Add to the varbuf API in server/util.c

Author: Arturo Bernal

include/util_varbuf.h

@@ -36,6 +36,9 @@
 
 #include "httpd.h"
 
+#include "apr_pools.h"
+#include "apr_errno.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -66,6 +69,8 @@ struct ap_varbuf {
     struct ap_varbuf_info *info;
 };
 
+ typedef struct ap_varbuf ap_varbuf;
+
 /**
  * Initialize a resizable buffer. It is safe to re-initialize a previously
  * used ap_varbuf. The old buffer will be released when the corresponding
@@ -189,6 +194,35 @@ AP_DECLARE(apr_status_t) ap_varbuf_cfg_getline(struct ap_varbuf *vb,
                                                ap_configfile_t *cfp,
                                                apr_size_t max_len);
 
+/**
+ * @brief Allocate and initialize a new dynamic variable buffer.
+ *
+ * This function creates a new ap_varbuf structure, allocates an initial buffer
+ * of the specified size from the given APR pool, and initializes its members.
+ *
+ * @param vb Pointer to the pointer that will be set to the new ap_varbuf.
+ * @param p The APR memory pool from which to allocate the buffer.
+ * @param initial_size The initial size in bytes for the buffer.
+ * @return APR_SUCCESS on success.
+ */
+AP_DECLARE(apr_status_t) ap_varbuf_make(ap_varbuf **vb, apr_pool_t *p, apr_size_t initial_size);
+
+/**
+ * @brief Append a specified number of characters to a dynamic variable buffer.
+ *
+ * This function appends up to @c len characters from the string @c str to the
+ * dynamic buffer represented by @c vb. If the buffer is not large enough to hold
+ * the additional characters plus a null terminator, the function reallocates the
+ * buffer with a larger size. The buffer is always null-terminated after the operation.
+ *
+ * @param vb The dynamic variable buffer.
+ * @param str The string containing the characters to append.
+ * @param len The number of characters from @c str to append.
+ * @return APR_SUCCESS on success.
+ */
+AP_DECLARE(apr_status_t) ap_varbuf_strncat(ap_varbuf *vb, const char *str, apr_size_t len);
+
+
 #ifdef __cplusplus
 }
 #endif

modules/proxy/mod_proxy_fcgi.c

@@ -18,7 +18,7 @@
 #include "util_fcgi.h"
 #include "util_script.h"
 #include "ap_expr.h"
-#include <ctype.h>
+#include "util_varbuf.h"
 
 module AP_MODULE_DECLARE_DATA proxy_fcgi_module;
 
@@ -594,71 +594,6 @@ static int handle_headers(request_rec *r, int *state,
     return 0;
 }
 
-/**
- * @struct ap_varbuf
- * @brief Structure representing a dynamically resizable buffer.
- *
- * This structure holds a character buffer along with its current length and the total
- * allocated size. The buffer is allocated from the provided APR pool.
- */
-typedef struct {
-    char *buf;
-    apr_size_t cur_len;
-    apr_size_t size;
-    apr_pool_t *pool;
-} ap_varbuf;
-
-/**
- * @brief Allocate and initialize a new dynamic variable buffer.
- *
- * This function creates a new ap_varbuf structure, allocates an initial buffer
- * of the specified size from the given APR pool, and initializes its members.
- *
- * @param vb A pointer to the pointer that will hold the allocated ap_varbuf.
- * @param p The APR memory pool from which to allocate the buffer.
- * @param initial_size The initial size in bytes for the buffer.
- * @return APR_SUCCESS on success.
- */
-static apr_status_t ap_varbuf_make(ap_varbuf **vb, apr_pool_t *p, apr_size_t initial_size)
-{
-    *vb = apr_pcalloc(p, sizeof(ap_varbuf));
-    (*vb)->pool = p;
-    (*vb)->buf = apr_palloc(p, initial_size);
-    (*vb)->size = initial_size;
-    (*vb)->cur_len = 0;
-    (*vb)->buf[0] = '\0';
-    return APR_SUCCESS;
-}
-
-
-/**
- * @brief Append a specified number of characters to a dynamic variable buffer.
- *
- * This function appends up to @c len characters from the string @c str to the
- * dynamic buffer represented by @c vb. If the buffer is not large enough to hold
- * the additional characters plus a null terminator, the function reallocates the
- * buffer with a larger size. The buffer is always null-terminated after the operation.
- *
- * @param vb The dynamic variable buffer to which the string will be appended.
- * @param str The string containing the characters to append.
- * @param len The number of characters from @c str to append.
- * @return APR_SUCCESS on success.
- */
-static apr_status_t ap_varbuf_strncat(ap_varbuf *vb, const char *str, apr_size_t len)
-{
-    if (vb->cur_len + len + 1 > vb->size) {
-        apr_size_t new_size = vb->cur_len + len + 1;
-        char *newbuf = apr_palloc(vb->pool, new_size);
-        memcpy(newbuf, vb->buf, vb->cur_len);
-        vb->buf = newbuf;
-        vb->size = new_size;
-    }
-    memcpy(vb->buf + vb->cur_len, str, len);
-    vb->cur_len += len;
-    vb->buf[vb->cur_len] = '\0';
-    return APR_SUCCESS;
-}
-
 
 static apr_status_t dispatch(proxy_conn_rec *conn, proxy_dir_conf *conf,
                              request_rec *r, apr_pool_t *setaside_pool,
@@ -896,18 +831,18 @@ static apr_status_t dispatch(proxy_conn_rec *conn, proxy_dir_conf *conf,
                         /* Try our dynamic header buffer approach first */
                         ap_varbuf_strncat(header_vb, iobuf, readbuflen);
                         if (strstr(header_vb->buf, "\r\n\r\n") != NULL) {
-                            while (header_vb->cur_len > 0 &&
+                            while (header_vb->strlen > 0 &&
                                    isspace((unsigned char)header_vb->buf[0])) {
-                                memmove(header_vb->buf, header_vb->buf + 1, header_vb->cur_len - 1);
-                                header_vb->cur_len--;
-                                header_vb->buf[header_vb->cur_len] = '\0';
+                                memmove(header_vb->buf, header_vb->buf + 1, header_vb->strlen - 1);
+                                header_vb->strlen--;
+                                header_vb->buf[header_vb->strlen] = '\0';
                             }
                             seen_end_of_headers = 1;
                             {
                                 int status_hdr;
                                 apr_bucket_brigade *tmp_bb = apr_brigade_create(r->pool, c->bucket_alloc);
                                 apr_bucket *hdr_bucket = apr_bucket_heap_create(header_vb->buf,
-                                                            header_vb->cur_len, NULL, c->bucket_alloc);
+                                                            header_vb->strlen, NULL, c->bucket_alloc);
                                 APR_BRIGADE_INSERT_TAIL(tmp_bb, hdr_bucket);
                                 hdr_bucket = apr_bucket_eos_create(c->bucket_alloc);
                                 APR_BRIGADE_INSERT_TAIL(tmp_bb, hdr_bucket);
@@ -921,7 +856,7 @@ static apr_status_t dispatch(proxy_conn_rec *conn, proxy_dir_conf *conf,
                             }
                             {
                                 char *hdr_end = strstr(header_vb->buf, "\r\n\r\n") + 4;
-                                apr_size_t hdr_total = header_vb->cur_len;
+                                apr_size_t hdr_total = header_vb->strlen;
                                 apr_size_t remaining = hdr_total - (hdr_end - header_vb->buf);
                                 if (remaining > 0) {
                                     apr_bucket *rem_bucket = apr_bucket_heap_create(hdr_end,

server/util.c

@@ -3922,3 +3922,30 @@ AP_DECLARE(const char *)ap_dir_fnmatch(ap_dir_match_t *w, const char *path,
 
     return NULL;
 }
+
+AP_DECLARE(apr_status_t) ap_varbuf_make(ap_varbuf **vb, apr_pool_t *p, apr_size_t initial_size)
+{
+    *vb = apr_pcalloc(p, sizeof(ap_varbuf));
+    (*vb)->pool = p;
+    (*vb)->buf = apr_palloc(p, initial_size);
+    (*vb)->avail = initial_size;
+    (*vb)->strlen = 0;
+    (*vb)->buf[0] = '\0';
+    return APR_SUCCESS;
+}
+
+AP_DECLARE(apr_status_t) ap_varbuf_strncat(ap_varbuf *vb, const char *str, apr_size_t len)
+{
+    if (vb->strlen + len + 1 > vb->avail) {
+        apr_size_t new_size = vb->strlen + len + 1;
+        char *newbuf = apr_palloc(vb->pool, new_size);
+        memcpy(newbuf, vb->buf, vb->strlen);
+        vb->buf = newbuf;
+        vb->avail = new_size;
+    }
+    memcpy(vb->buf + vb->strlen, str, len);
+    vb->strlen += len;
+    vb->buf[vb->strlen] = '\0';
+    return APR_SUCCESS;
+}
+