diff options
| author | Stefan Eissing <icing@apache.org> | 2016-10-11 15:34:13 +0200 |
|---|---|---|
| committer | Stefan Eissing <icing@apache.org> | 2016-10-11 15:34:13 +0200 |
| commit | 8770d40be1b4e5260fa7c8f241fefed82e359d63 (patch) | |
| tree | 74b3de616e468c4ae1460f840c5e8536acaefd52 /modules/http2/mod_proxy_http2.c | |
| parent | Following up on r1764040, add the CHANGES entry. (diff) | |
| download | apache2-8770d40be1b4e5260fa7c8f241fefed82e359d63.tar.xz apache2-8770d40be1b4e5260fa7c8f241fefed82e359d63.zip | |
mod_proxy_http2: renaming duplicate symbol clash between h2_proxy_util and h2_util externals
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1764236 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'modules/http2/mod_proxy_http2.c')
| -rw-r--r-- | modules/http2/mod_proxy_http2.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/http2/mod_proxy_http2.c b/modules/http2/mod_proxy_http2.c index d030714962..e2bf39ec95 100644 --- a/modules/http2/mod_proxy_http2.c +++ b/modules/http2/mod_proxy_http2.c @@ -342,7 +342,7 @@ static apr_status_t proxy_engine_run(h2_proxy_ctx *ctx) { ap_log_cerror(APLOG_MARK, APLOG_TRACE1, 0, ctx->owner, "eng(%s): setup session", ctx->engine_id); ctx->session = h2_proxy_session_setup(ctx->engine_id, ctx->p_conn, ctx->conf, - 30, h2_log2(ctx->req_buffer_size), + 30, h2_proxy_log2(ctx->req_buffer_size), request_done); if (!ctx->session) { ap_log_cerror(APLOG_MARK, APLOG_DEBUG, 0, ctx->owner, @@ -378,7 +378,7 @@ static apr_status_t proxy_engine_run(h2_proxy_ctx *ctx) { status = s2; break; } - if (!ctx->next && h2_ihash_empty(ctx->session->streams)) { + if (!ctx->next && h2_proxy_ihash_empty(ctx->session->streams)) { break; } } |