Merge of r1769600 from trunk:

mod_http2: fixes for compiler warnings

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

diff --git a/modules/http2/h2_config.c b/modules/http2/h2_config.c
index fe076370043368cbf1eb18f486cb83a5f70e53a3..dec859705abe3c919e42c1baaa14ecf7b6f56af0 100644 (file)
--- a/modules/http2/h2_config.c
+++ b/modules/http2/h2_config.c
@@ -62,6 +62,7 @@ static h2_config defconf = {
     NULL,                   /* map of content-type to priorities */
     256,                    /* push diary size */
     0,                      /* copy files across threads */
+    NULL                    /* push list */
 };
 
 void h2_config_init(apr_pool_t *pool)

diff --git a/modules/http2/h2_from_h1.c b/modules/http2/h2_from_h1.c
index 372e0bfc780dc5174a2423a8ba8321012792069b..108e31827679caba7a9962468bab991f643cc5fd 100644 (file)
--- a/modules/http2/h2_from_h1.c
+++ b/modules/http2/h2_from_h1.c
@@ -615,8 +615,8 @@ static void make_chunk(h2_task *task, apr_bucket_brigade *bb,
     }
     task->input.chunked_total += chunk_len;
     ap_log_cerror(APLOG_MARK, APLOG_TRACE2, 0, task->c,
-                  "h2_task(%s): added chunk %"APR_OFF_T_FMT", total %"
-                  APR_OFF_T_FMT, task->id, chunk_len, task->input.chunked_total);
+                  "h2_task(%s): added chunk %ld, total %ld", 
+                  task->id, (long)chunk_len, (long)task->input.chunked_total);
 }
 
 static int ser_header(void *ctx, const char *name, const char *value) 

diff --git a/modules/http2/h2_proxy_session.c b/modules/http2/h2_proxy_session.c
index 9624bd1f2b10fc7b867d16a3f9369a9e1f62cab3..b1929f70b015fbfd25949f03b02023ed2e7ac789 100644 (file)
--- a/modules/http2/h2_proxy_session.c
+++ b/modules/http2/h2_proxy_session.c
@@ -403,9 +403,9 @@ static int stream_response_data(nghttp2_session *ngh2, uint8_t flags,
     
     status = ap_pass_brigade(stream->r->output_filters, stream->output);
     ap_log_rerror(APLOG_MARK, APLOG_DEBUG, status, stream->r, APLOGNO(03359)
-                  "h2_proxy_session(%s): stream=%d, response DATA %ld, %"
-                  APR_OFF_T_FMT " total", session->id, stream_id, (long)len,
-                  stream->data_received);
+                  "h2_proxy_session(%s): stream=%d, response DATA %ld, %ld"
+                  " total", session->id, stream_id, (long)len,
+                  (long)stream->data_received);
     if (status != APR_SUCCESS) {
         ap_log_cerror(APLOG_MARK, APLOG_DEBUG, status, session->c, APLOGNO(03344)
                       "h2_proxy_session(%s): passing output on stream %d", 
@@ -537,9 +537,9 @@ static ssize_t stream_request_data(nghttp2_session *ngh2, int32_t stream_id,
 
         stream->data_sent += readlen;
         ap_log_rerror(APLOG_MARK, APLOG_DEBUG, status, stream->r, APLOGNO(03468) 
-                      "h2_proxy_stream(%d): request DATA %ld, %"
-                      APR_OFF_T_FMT" total, flags=%d", 
-                      stream->id, (long)readlen, stream->data_sent,
+                      "h2_proxy_stream(%d): request DATA %ld, %ld"
+                      " total, flags=%d", 
+                      stream->id, (long)readlen, (long)stream->data_sent,
                       (int)*data_flags);
         return readlen;
     }

diff --git a/modules/http2/h2_proxy_util.c b/modules/http2/h2_proxy_util.c
index 8e1231c64251f1f1779c7a5ecaf53b21858cd4ec..b92a876f42ba035cd03073a0640fa75320dfeaa4 100644 (file)
--- a/modules/http2/h2_proxy_util.c
+++ b/modules/http2/h2_proxy_util.c
@@ -794,9 +794,9 @@ static int skip_ws(link_ctx *ctx)
     return (ctx->i < ctx->slen);
 }
 
-static int find_chr(link_ctx *ctx, char c, size_t *pidx)
+static int find_chr(link_ctx *ctx, char c, int *pidx)
 {
-    size_t j;
+    int j;
     for (j = ctx->i; j < ctx->slen; ++j) {
         if (ctx->s[j] == c) {
             *pidx = j;
@@ -818,7 +818,7 @@ static int read_chr(link_ctx *ctx, char c)
 static int skip_qstring(link_ctx *ctx)
 {
     if (skip_ws(ctx) && read_chr(ctx, '\"')) {
-        size_t end;
+        int end;
         if (find_chr(ctx, '\"', &end)) {
             ctx->i = end + 1;
             return 1;
@@ -830,7 +830,7 @@ static int skip_qstring(link_ctx *ctx)
 static int skip_ptoken(link_ctx *ctx)
 {
     if (skip_ws(ctx)) {
-        size_t i;
+        int i;
         for (i = ctx->i; i < ctx->slen && ptoken_char(ctx->s[i]); ++i) {
             /* nop */
         }
@@ -847,7 +847,7 @@ static int read_link(link_ctx *ctx)
 {
     ctx->link_start = ctx->link_end = 0;
     if (skip_ws(ctx) && read_chr(ctx, '<')) {
-        size_t end;
+        int end;
         if (find_chr(ctx, '>', &end)) {
             ctx->link_start = ctx->i;
             ctx->link_end = end;
@@ -909,7 +909,7 @@ static size_t subst_str(link_ctx *ctx, int start, int end, const char *ns)
     char *p;
     
     olen = end - start;
-    nlen = strlen(ns);
+    nlen = (int)strlen(ns);
     delta = nlen - olen;
     plen = ctx->slen + delta + 1;
     p = apr_pcalloc(ctx->pool, plen);
@@ -917,7 +917,7 @@ static size_t subst_str(link_ctx *ctx, int start, int end, const char *ns)
     strncpy(p + start, ns, nlen);
     strcpy(p + start + nlen, ctx->s + end);
     ctx->s = p;
-    ctx->slen = strlen(p);
+    ctx->slen = (int)strlen(p);
     if (ctx->i >= end) {
         ctx->i += delta;
     }
@@ -970,7 +970,7 @@ static void map_link(link_ctx *ctx)
             if (prepend_p_server) {
                 if (ctx->server_uri == NULL) {
                     ctx->server_uri = ap_construct_url(ctx->pool, "", ctx->r);
-                    ctx->su_len = strlen(ctx->server_uri);
+                    ctx->su_len = (int)strlen(ctx->server_uri);
                 }
                 if (!strncmp(mapped, ctx->server_uri, ctx->su_len)) {
                     mapped += ctx->su_len;
@@ -1035,11 +1035,11 @@ const char *h2_proxy_link_reverse_map(request_rec *r,
     ctx.pool = r->pool;
     ctx.conf = conf;
     ctx.real_backend_uri = real_backend_uri;
-    ctx.rbu_len = strlen(ctx.real_backend_uri);
+    ctx.rbu_len = (int)strlen(ctx.real_backend_uri);
     ctx.p_server_uri = proxy_server_uri;
-    ctx.psu_len = strlen(ctx.p_server_uri);
+    ctx.psu_len = (int)strlen(ctx.p_server_uri);
     ctx.s = s;
-    ctx.slen = strlen(s);
+    ctx.slen = (int)strlen(s);
     while (read_link(&ctx)) {
         while (skip_param(&ctx)) {
             /* nop */