v0.9.8, latest merges from httpd/trunk

Author: Stefan Eissing

configure.ac

@@ -14,7 +14,7 @@
 #
 
 AC_PREREQ([2.69])
-AC_INIT([mod_h2], [0.9.7], [[email protected]])
+AC_INIT([mod_h2], [0.9.8], [[email protected]])
 
 LT_PREREQ([2.2.6])
 LT_INIT()

mod-h2.xcodeproj/project.pbxproj

@@ -62,6 +62,9 @@
 		B27D32E91A9487B4003DBAF4 /* h2_mplx.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = h2_mplx.h; sourceTree = "<group>"; };
 		B284ACC91A7B9DF900C35863 /* h2_task_input.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = h2_task_input.c; sourceTree = "<group>"; };
 		B284ACCA1A7B9DF900C35863 /* h2_task_input.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = h2_task_input.h; sourceTree = "<group>"; };
+		B2876C101BA707FD00762ECD /* core-h2-all-in-one-v5.patch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "core-h2-all-in-one-v5.patch"; sourceTree = "<group>"; };
+		B2876C111BA7082400762ECD /* core-protocols-v5.patch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "core-protocols-v5.patch"; sourceTree = "<group>"; };
+		B2876C121BA70B8000762ECD /* core-protocols-release-v5.patch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "core-protocols-release-v5.patch"; sourceTree = "<group>"; };
 		B2A6EF171A9B598B005DFC5B /* h2_request.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = h2_request.c; sourceTree = "<group>"; };
 		B2A6EF181A9B598B005DFC5B /* h2_request.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = h2_request.h; sourceTree = "<group>"; };
 		B2A6EF2A1A9E3A93005DFC5B /* INSTALL */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = INSTALL; sourceTree = "<group>"; };
@@ -474,8 +477,11 @@
 			isa = PBXGroup;
 			children = (
 				B249BBF61B99AA6D00434956 /* core-h2-all-in-one-v4.patch */,
+				B2876C101BA707FD00762ECD /* core-h2-all-in-one-v5.patch */,
 				B2E17FBE1B96EFB100F352BA /* core-protocols-release-v4.patch */,
+				B2876C121BA70B8000762ECD /* core-protocols-release-v5.patch */,
 				B249BBF31B9998D000434956 /* core-protocols-v4.patch */,
+				B2876C111BA7082400762ECD /* core-protocols-v5.patch */,
 			);
 			path = patches;
 			sourceTree = "<group>";

mod_h2/h2_config.c

@@ -372,41 +372,11 @@ h2_config *h2_config_rget(request_rec *r)
 h2_config *h2_config_get(conn_rec *c)
 {
     h2_ctx *ctx = h2_ctx_get(c);
+    
     if (ctx->config) {
         return ctx->config;
     }
-    if (!ctx->server && ctx->hostname) {
-        /* We have a host agreed upon via TLS SNI, but no request yet.
-         * The sni host was accepted and therefore does match a server record
-         * (vhost) for it. But we need to know which one.
-         * Normally, it is enough to be set on the initial request on a
-         * connection, but we need it earlier. Simulate a request and call
-         * the vhost matching stuff.
-         */
-        apr_uri_t uri;
-        request_rec r;
-        memset(&uri, 0, sizeof(uri));
-        uri.scheme = (char*)"https";
-        uri.hostinfo = (char*)ctx->hostname;
-        uri.hostname = (char*)ctx->hostname;
-        uri.port_str = (char*)"";
-        uri.port = c->local_addr->port;
-        uri.path = (char*)"/";
-        
-        memset(&r, 0, sizeof(r));
-        r.uri = (char*)"/";
-        r.connection = c;
-        r.pool = c->pool;
-        r.hostname = ctx->hostname;
-        r.headers_in = apr_table_make(c->pool, 1);
-        r.parsed_uri = uri;
-        r.status = HTTP_OK;
-        r.server = r.connection->base_server;
-        ap_update_vhost_from_headers(&r);
-        ctx->server = r.server;
-    }
-    
-    if (ctx->server) {
+    else if (ctx->server) {
         ctx->config = h2_config_sget(ctx->server);
         return ctx->config;
     }

mod_h2/h2_ctx.c

@@ -68,6 +68,12 @@ h2_ctx *h2_ctx_protocol_set(h2_ctx *ctx, const char *proto)
     return ctx;
 }
 
+h2_ctx *h2_ctx_server_set(h2_ctx *ctx, server_rec *s)
+{
+    ctx->server = s;
+    return ctx;
+}
+
 int h2_ctx_is_task(h2_ctx *ctx)
 {
     return ctx && !!ctx->task_env;

mod_h2/h2_ctx.h

@@ -46,6 +46,10 @@ h2_ctx *h2_ctx_create_for(const conn_rec *c, struct h2_task_env *env);
  */
 h2_ctx *h2_ctx_protocol_set(h2_ctx *ctx, const char *proto);
 
+/* Set the server_rec relevant for this context.
+ */
+h2_ctx *h2_ctx_server_set(h2_ctx *ctx, server_rec *s);
+
 /**
  * Get the h2 protocol negotiated for this connection, or NULL.
  */

mod_h2/h2_switch.c

@@ -141,6 +141,7 @@ static int h2_protocol_switch(conn_rec *c, request_rec *r, server_rec *s,
         ap_log_cerror(APLOG_MARK, APLOG_TRACE1, 0, c,
                       "switching protocol to '%s'", protocol);
         h2_ctx_protocol_set(ctx, protocol);
+        h2_ctx_server_set(ctx, s);
 
         if (r != NULL) {
             apr_status_t status;

mod_h2/h2_task.c

@@ -220,7 +220,7 @@ apr_status_t h2_task_do(h2_task *task, h2_worker *worker)
     task->mplx = NULL;
 
     env.input_eos = task->input_eos;
-    env.serialize_headers = !!h2_config_geti(cfg, H2_CONF_SER_HEADERS);
+    env.serialize_headers = h2_config_geti(cfg, H2_CONF_SER_HEADERS);
 
     /* Create a subpool from the worker one to be used for all things
      * with life-time of this task_env execution.
@@ -389,8 +389,8 @@ static request_rec *h2_task_create_request(h2_task_env *env)
     }
 
     ap_parse_uri(r, env->path);
-    r->protocol = (char*)"HTTP/1.1";
-    r->proto_num = HTTP_VERSION(1, 1);
+    r->protocol = (char*)"HTTP/2";
+    r->proto_num = HTTP_VERSION(2, 0);
 
     /* update what we think the virtual host is based on the headers we've
      * now read. may update status.

mod_h2/h2_task_input.c

@@ -51,6 +51,9 @@ h2_task_input *h2_task_input_create(h2_task_env *env, apr_pool_t *pool,
         input->bb = NULL;
 
         if (env->serialize_headers) {
+            ap_log_cerror(APLOG_MARK, APLOG_TRACE1, 0, &env->c,
+                          "h2_task_input(%s): serialize request %s %s", 
+                          env->id, env->method, env->path);
             input->bb = apr_brigade_create(pool, bucket_alloc);
             apr_brigade_printf(input->bb, NULL, NULL, "%s %s HTTP/1.1\r\n", 
                                env->method, env->path);

sandbox/httpd/Makefile

@@ -154,7 +154,7 @@ $(GEN)/$(HTTPD_DIR)/.httpd-configured: \
 $(GEN)/$(HTTPD_DIR)/.httpd-patched: \
 		$(GEN)/$(HTTPD_DIR)/.httpd-extracted
 	@echo applying patches...
-	@cd gen/$(HTTPD_DIR) && patch -p0 < ../../patches/core-protocols-release-v4.patch
+	@cd gen/$(HTTPD_DIR) && patch -p0 < ../../patches/core-protocols-release-v5.patch
 	@echo httpd patched.
 	@touch $(GEN)/$(HTTPD_DIR)/.httpd-patched