VladPolskiy/apache_httpd
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-08-16 16:17:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

*) mod_http2: using new session ids also in logging for connection

Browse Source 
contexts and bucket beams.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1900031 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Stefan Eissing
2022-04-19 10:36:53 +00:00
parent 887ffec712
commit b737bb8468
5 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/http2/h2_c1.c
View File

@ -109,7 +109,7 @@ apr_status_t h2_c1_setup(conn_rec *c, request_rec *r, server_rec *s)
ctx = h2_conn_ctx_get(c);
ap_assert(ctx);
ctx->session = session;
h2_conn_ctx_assign_session(ctx, session);
/* remove the input filter of mod_reqtimeout, now that the connection
* is established and we have switched to h2. reqtimeout has supervised
* possibly configured handshake timeouts and needs to get out of the way

6
modules/http2/h2_conn_ctx.c
View File

@ -68,6 +68,12 @@ h2_conn_ctx_t *h2_conn_ctx_create_for_c1(conn_rec *c1, server_rec *s, const char
return ctx;
}
void h2_conn_ctx_assign_session(h2_conn_ctx_t *ctx, struct h2_session *session)
{
ctx->session = session;
ctx->id = apr_psprintf(session->pool, "%d-%lu", session->child_num, (unsigned long)session->id);
}
apr_status_t h2_conn_ctx_init_for_c2(h2_conn_ctx_t **pctx, conn_rec *c2,
struct h2_mplx *mplx, struct h2_stream *stream,
struct h2_c2_transit *transit)

2
modules/http2/h2_conn_ctx.h
View File

@ -79,6 +79,8 @@ typedef struct h2_conn_ctx_t h2_conn_ctx_t;
*/
h2_conn_ctx_t *h2_conn_ctx_create_for_c1(conn_rec *c, server_rec *s, const char *protocol);
void h2_conn_ctx_assign_session(h2_conn_ctx_t *ctx, struct h2_session *session);
apr_status_t h2_conn_ctx_init_for_c2(h2_conn_ctx_t **pctx, conn_rec *c,
struct h2_mplx *mplx, struct h2_stream *stream,
struct h2_c2_transit *transit);

2
modules/http2/mod_http2.c
View File

@ -278,7 +278,7 @@ static const char *val_H2_STREAM_ID(apr_pool_t *p, server_rec *s,
conn_rec *c, request_rec *r, h2_conn_ctx_t *ctx)
{
const char *cp = val_H2_STREAM_TAG(p, s, c, r, ctx);
if (cp && (cp = ap_strchr_c(cp, '-'))) {
if (cp && (cp = ap_strrchr_c(cp, '-'))) {
return ++cp;
}
return NULL;

2
test/modules/http2/test_004_post.py
View File

@ -69,7 +69,7 @@ class TestPost:
("H2_PUSHED", ""),
("H2_PUSHED_ON", ""),
("H2_STREAM_ID", "1"),
("H2_STREAM_TAG", r'\d+-1'),
("H2_STREAM_TAG", r'\d+-\d+-1'),
])
def test_h2_004_07(self, env, name, value):
url = env.mkurl("https", "cgi", "/env.py")