|
 |
8b11ee |
diff --git a/mod_http2/h2_request.c b/mod_http2/h2_request.c
|
|
|
8b11ee |
index 5893c8b..1131440 100644
|
|
|
8b11ee |
--- a/mod_http2/h2_request.c
|
|
|
8b11ee |
+++ b/mod_http2/h2_request.c
|
|
|
8b11ee |
@@ -206,75 +206,13 @@ h2_request *h2_request_clone(apr_pool_t *p, const h2_request *src)
|
|
|
8b11ee |
return dst;
|
|
|
8b11ee |
}
|
|
|
8b11ee |
|
|
|
8b11ee |
-#if !AP_MODULE_MAGIC_AT_LEAST(20150222, 13)
|
|
|
8b11ee |
-static request_rec *my_ap_create_request(conn_rec *c)
|
|
|
8b11ee |
-{
|
|
|
8b11ee |
- apr_pool_t *p;
|
|
|
8b11ee |
- request_rec *r;
|
|
|
8b11ee |
-
|
|
|
8b11ee |
- apr_pool_create(&p, c->pool);
|
|
|
8b11ee |
- apr_pool_tag(p, "request");
|
|
|
8b11ee |
- r = apr_pcalloc(p, sizeof(request_rec));
|
|
|
8b11ee |
- AP_READ_REQUEST_ENTRY((intptr_t)r, (uintptr_t)c);
|
|
|
8b11ee |
- r->pool = p;
|
|
|
8b11ee |
- r->connection = c;
|
|
|
8b11ee |
- r->server = c->base_server;
|
|
|
8b11ee |
-
|
|
|
8b11ee |
- r->user = NULL;
|
|
|
8b11ee |
- r->ap_auth_type = NULL;
|
|
|
8b11ee |
-
|
|
|
8b11ee |
- r->allowed_methods = ap_make_method_list(p, 2);
|
|
|
8b11ee |
-
|
|
|
8b11ee |
- r->headers_in = apr_table_make(r->pool, 5);
|
|
|
8b11ee |
- r->trailers_in = apr_table_make(r->pool, 5);
|
|
|
8b11ee |
- r->subprocess_env = apr_table_make(r->pool, 25);
|
|
|
8b11ee |
- r->headers_out = apr_table_make(r->pool, 12);
|
|
|
8b11ee |
- r->err_headers_out = apr_table_make(r->pool, 5);
|
|
|
8b11ee |
- r->trailers_out = apr_table_make(r->pool, 5);
|
|
|
8b11ee |
- r->notes = apr_table_make(r->pool, 5);
|
|
|
8b11ee |
-
|
|
|
8b11ee |
- r->request_config = ap_create_request_config(r->pool);
|
|
|
8b11ee |
- /* Must be set before we run create request hook */
|
|
|
8b11ee |
-
|
|
|
8b11ee |
- r->proto_output_filters = c->output_filters;
|
|
|
8b11ee |
- r->output_filters = r->proto_output_filters;
|
|
|
8b11ee |
- r->proto_input_filters = c->input_filters;
|
|
|
8b11ee |
- r->input_filters = r->proto_input_filters;
|
|
|
8b11ee |
- ap_run_create_request(r);
|
|
|
8b11ee |
- r->per_dir_config = r->server->lookup_defaults;
|
|
|
8b11ee |
-
|
|
|
8b11ee |
- r->sent_bodyct = 0; /* bytect isn't for body */
|
|
|
8b11ee |
-
|
|
|
8b11ee |
- r->read_length = 0;
|
|
|
8b11ee |
- r->read_body = REQUEST_NO_BODY;
|
|
|
8b11ee |
-
|
|
|
8b11ee |
- r->status = HTTP_OK; /* Until further notice */
|
|
|
8b11ee |
- r->header_only = 0;
|
|
|
8b11ee |
- r->the_request = NULL;
|
|
|
8b11ee |
-
|
|
|
8b11ee |
- /* Begin by presuming any module can make its own path_info assumptions,
|
|
|
8b11ee |
- * until some module interjects and changes the value.
|
|
|
8b11ee |
- */
|
|
|
8b11ee |
- r->used_path_info = AP_REQ_DEFAULT_PATH_INFO;
|
|
|
8b11ee |
-
|
|
|
8b11ee |
- r->useragent_addr = c->client_addr;
|
|
|
8b11ee |
- r->useragent_ip = c->client_ip;
|
|
|
8b11ee |
-
|
|
|
8b11ee |
- return r;
|
|
|
8b11ee |
-}
|
|
|
8b11ee |
-#endif
|
|
|
8b11ee |
-
|
|
|
8b11ee |
request_rec *h2_request_create_rec(const h2_request *req, conn_rec *c)
|
|
|
8b11ee |
{
|
|
|
8b11ee |
- int access_status = HTTP_OK;
|
|
|
8b11ee |
+ int access_status = HTTP_OK;
|
|
|
8b11ee |
const char *rpath;
|
|
|
8b11ee |
const char *s;
|
|
|
8b11ee |
|
|
|
8b11ee |
-#if AP_MODULE_MAGIC_AT_LEAST(20150222, 13)
|
|
|
8b11ee |
request_rec *r = ap_create_request(c);
|
|
|
8b11ee |
-#else
|
|
|
8b11ee |
- request_rec *r = my_ap_create_request(c);
|
|
|
8b11ee |
-#endif
|
|
|
8b11ee |
|
|
|
8b11ee |
r->headers_in = apr_table_clone(r->pool, req->headers);
|
|
|
8b11ee |
|