You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ic...@apache.org on 2015/12/23 15:50:54 UTC
svn commit: r1721547 - in /httpd/httpd/trunk: CHANGES
modules/http2/h2_push.c modules/http2/h2_push.h modules/http2/h2_request.c
modules/http2/h2_request.h modules/http2/mod_http2.c
Author: icing
Date: Wed Dec 23 14:50:54 2015
New Revision: 1721547
URL: http://svn.apache.org/viewvc?rev=1721547&view=rev
Log:
fixed segfault in connection shutdown, added accept-push-policy support
Modified:
httpd/httpd/trunk/CHANGES
httpd/httpd/trunk/modules/http2/h2_push.c
httpd/httpd/trunk/modules/http2/h2_push.h
httpd/httpd/trunk/modules/http2/h2_request.c
httpd/httpd/trunk/modules/http2/h2_request.h
httpd/httpd/trunk/modules/http2/mod_http2.c
Modified: httpd/httpd/trunk/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/CHANGES?rev=1721547&r1=1721546&r2=1721547&view=diff
==============================================================================
--- httpd/httpd/trunk/CHANGES [utf-8] (original)
+++ httpd/httpd/trunk/CHANGES [utf-8] Wed Dec 23 14:50:54 2015
@@ -1,6 +1,12 @@
-*- coding: utf-8 -*-
Changes with Apache 2.5.0
+ *) mod_http2: Fixed segfault on connection shutdown, callback ran into a semi
+ dismantled session. Added support for experimental accept-push-policy draft
+ (https://tools.ietf.org/html/draft-ruellan-http-accept-push-policy-00). Clients
+ may now influence server pushes by sending accept-push-policy headers.
+ [Stefan Eissing]
+
*) mod_http2: On async MPMs (event), idle HTTP/2 connections will enter KEEPALIVE
state and become eligible for MPM cleanup under load. Rewrote connection
state handling. Defaults for H2KeepAliveTimeout shortened. Cleaned up logging.
Modified: httpd/httpd/trunk/modules/http2/h2_push.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/http2/h2_push.c?rev=1721547&r1=1721546&r2=1721547&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/http2/h2_push.c (original)
+++ httpd/httpd/trunk/modules/http2/h2_push.c Wed Dec 23 14:50:54 2015
@@ -30,6 +30,19 @@
#include "h2_request.h"
#include "h2_response.h"
+static const char *policy_str(h2_push_policy policy)
+{
+ switch (policy) {
+ case H2_PUSH_NONE:
+ return "none";
+ case H2_PUSH_FAST_LOAD:
+ return "fast-load";
+ case H2_PUSH_HEAD:
+ return "head";
+ default:
+ return "default";
+ }
+}
typedef struct {
const h2_request *req;
@@ -269,6 +282,7 @@ static int add_push(link_ctx *ctx)
if (apr_uri_parse(ctx->pool, ctx->link, &uri) == APR_SUCCESS) {
if (uri.path && same_authority(ctx->req, &uri)) {
char *path;
+ const char *method;
apr_table_t *headers;
h2_request *req;
h2_push *push;
@@ -283,6 +297,14 @@ static int add_push(link_ctx *ctx)
push = apr_pcalloc(ctx->pool, sizeof(*push));
+ switch (ctx->req->push_policy) {
+ case H2_PUSH_HEAD:
+ method = "HEAD";
+ break;
+ default:
+ method = "GET";
+ break;
+ }
headers = apr_table_make(ctx->pool, 5);
apr_table_do(set_header, headers, ctx->req->headers,
"User-Agent",
@@ -290,7 +312,7 @@ static int add_push(link_ctx *ctx)
"Accept-Language",
NULL);
req = h2_request_createn(0, ctx->pool, ctx->req->config,
- "GET", ctx->req->scheme,
+ method, ctx->req->scheme,
ctx->req->authority,
path, headers);
/* atm, we do not push on pushes */
@@ -374,23 +396,58 @@ static int head_iter(void *ctx, const ch
apr_array_header_t *h2_push_collect(apr_pool_t *p, const h2_request *req,
const h2_response *res)
{
- /* Collect push candidates from the request/response pair.
- *
- * One source for pushes are "rel=preload" link headers
- * in the response.
- *
- * TODO: This may be extended in the future by hooks or callbacks
- * where other modules can provide push information directly.
- */
- if (res->headers) {
- link_ctx ctx;
-
- memset(&ctx, 0, sizeof(ctx));
- ctx.req = req;
- ctx.pool = p;
-
- apr_table_do(head_iter, &ctx, res->headers, NULL);
- return ctx.pushes;
+ if (req && req->push_policy != H2_PUSH_NONE) {
+ /* Collect push candidates from the request/response pair.
+ *
+ * One source for pushes are "rel=preload" link headers
+ * in the response.
+ *
+ * TODO: This may be extended in the future by hooks or callbacks
+ * where other modules can provide push information directly.
+ */
+ if (res->headers) {
+ link_ctx ctx;
+
+ memset(&ctx, 0, sizeof(ctx));
+ ctx.req = req;
+ ctx.pool = p;
+
+ apr_table_do(head_iter, &ctx, res->headers, NULL);
+ if (ctx.pushes) {
+ apr_table_setn(res->headers, "push-policy", policy_str(req->push_policy));
+ }
+ return ctx.pushes;
+ }
}
return NULL;
}
+
+void h2_push_policy_determine(struct h2_request *req, apr_pool_t *p, int push_enabled)
+{
+ h2_push_policy policy = H2_PUSH_NONE;
+ if (push_enabled) {
+ const char *val = apr_table_get(req->headers, "accept-push-policy");
+ if (val) {
+ if (ap_find_token(p, val, "fast-load")) {
+ policy = H2_PUSH_FAST_LOAD;
+ }
+ else if (ap_find_token(p, val, "head")) {
+ policy = H2_PUSH_HEAD;
+ }
+ else if (ap_find_token(p, val, "default")) {
+ policy = H2_PUSH_DEFAULT;
+ }
+ else if (ap_find_token(p, val, "none")) {
+ policy = H2_PUSH_NONE;
+ }
+ else {
+ /* nothing known found in this header, go by default */
+ policy = H2_PUSH_DEFAULT;
+ }
+ }
+ else {
+ policy = H2_PUSH_DEFAULT;
+ }
+ }
+ req->push_policy = policy;
+}
Modified: httpd/httpd/trunk/modules/http2/h2_push.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/http2/h2_push.h?rev=1721547&r1=1721546&r2=1721547&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/http2/h2_push.h (original)
+++ httpd/httpd/trunk/modules/http2/h2_push.h Wed Dec 23 14:50:54 2015
@@ -19,6 +19,13 @@ struct h2_request;
struct h2_response;
struct h2_ngheader;
+typedef enum {
+ H2_PUSH_NONE,
+ H2_PUSH_DEFAULT,
+ H2_PUSH_HEAD,
+ H2_PUSH_FAST_LOAD,
+} h2_push_policy;
+
typedef struct h2_push {
const struct h2_request *req;
} h2_push;
@@ -28,4 +35,6 @@ apr_array_header_t *h2_push_collect(apr_
const struct h2_request *req,
const struct h2_response *res);
+void h2_push_policy_determine(struct h2_request *req, apr_pool_t *p, int push_enabled);
+
#endif /* defined(__mod_h2__h2_push__) */
Modified: httpd/httpd/trunk/modules/http2/h2_request.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/http2/h2_request.c?rev=1721547&r1=1721546&r2=1721547&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/http2/h2_request.c (original)
+++ httpd/httpd/trunk/modules/http2/h2_request.c Wed Dec 23 14:50:54 2015
@@ -32,6 +32,7 @@
#include "h2_private.h"
#include "h2_config.h"
#include "h2_mplx.h"
+#include "h2_push.h"
#include "h2_request.h"
#include "h2_task.h"
#include "h2_util.h"
@@ -272,7 +273,7 @@ apr_status_t h2_request_end_headers(h2_r
}
req->eoh = 1;
- req->push = push;
+ h2_push_policy_determine(req, pool, push);
/* In the presence of trailers, force behaviour of chunked encoding */
s = apr_table_get(req->headers, "Trailer");
Modified: httpd/httpd/trunk/modules/http2/h2_request.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/http2/h2_request.h?rev=1721547&r1=1721546&r2=1721547&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/http2/h2_request.h (original)
+++ httpd/httpd/trunk/modules/http2/h2_request.h Wed Dec 23 14:50:54 2015
@@ -44,8 +44,7 @@ struct h2_request {
unsigned int chunked : 1; /* iff requst body needs to be forwarded as chunked */
unsigned int eoh : 1; /* iff end-of-headers has been seen and request is complete */
unsigned int body : 1; /* iff this request has a body */
- unsigned int push : 1; /* iff server push is possible for this request */
-
+ unsigned int push_policy; /* which push policy to use for this request */
const struct h2_config *config;
};
Modified: httpd/httpd/trunk/modules/http2/mod_http2.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/http2/mod_http2.c?rev=1721547&r1=1721546&r2=1721547&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/http2/mod_http2.c (original)
+++ httpd/httpd/trunk/modules/http2/mod_http2.c Wed Dec 23 14:50:54 2015
@@ -32,6 +32,7 @@
#include "h2_config.h"
#include "h2_ctx.h"
#include "h2_h2.h"
+#include "h2_push.h"
#include "h2_request.h"
#include "h2_switch.h"
#include "h2_version.h"
@@ -171,7 +172,7 @@ static char *value_of_H2PUSH(apr_pool_t
ctx = h2_ctx_rget(r);
if (ctx) {
h2_task *task = h2_ctx_get_task(ctx);
- return task && task->request->push? "on" : "off";
+ return (task && task->request->push_policy != H2_PUSH_NONE)? "on" : "off";
}
}
else if (c) {