Add configuration of the Flush provider for mod_proxy_fdpass.

pquerna · pquerna · commit ebddc380db0d · 2008-12-12T08:46:47.000Z
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@725946 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/modules/proxy/mod_proxy.c b/modules/proxy/mod_proxy.c
@@ -297,6 +297,9 @@ static const char *set_worker_param(apr_pool_t *p,
         worker->conn_timeout = timeout;
         worker->conn_timeout_set = 1;
     }
+    else if (!strcasecmp(key, "flusher")) {
+        worker->flusher = apr_pstrdup(p, val);
+    }
     else {
         return "unknown Worker parameter";
     }
diff --git a/modules/proxy/mod_proxy.h b/modules/proxy/mod_proxy.h
@@ -354,6 +354,7 @@ struct proxy_worker {
     char            disablereuse_set;
     apr_interval_time_t conn_timeout;
     char            conn_timeout_set;
+    const char      *flusher;  /* flush provider used by mod_proxy_fdpass */
 };
 
 /*
diff --git a/modules/proxy/mod_proxy_fdpass.c b/modules/proxy/mod_proxy_fdpass.c
@@ -194,7 +194,7 @@ static int proxy_fdpass_handler(request_rec *r, proxy_worker *worker,
 
     {
         int status;
-        const char *flush_method = "flush";
+        const char *flush_method = worker->flusher ? worker->flusher : "flush";
 
         proxy_fdpass_flush *flush = ap_lookup_provider(PROXY_FDPASS_FLUSHER, flush_method, "0");
 

Original file line number	Diff line number	Diff line change
`@@ -297,6 +297,9 @@ static const char set_worker_param(apr_pool_t p,`
`297`	`297`	`worker->conn_timeout = timeout;`
`298`	`298`	`worker->conn_timeout_set = 1;`
`299`	`299`	`}`
	`300`	`+ else if (!strcasecmp(key, "flusher")) {`
	`301`	`+ worker->flusher = apr_pstrdup(p, val);`
	`302`	`+ }`
`300`	`303`	`else {`
`301`	`304`	`return "unknown Worker parameter";`
`302`	`305`	`}`
Original file line number	Diff line number	Diff line change
`@@ -194,7 +194,7 @@ static int proxy_fdpass_handler(request_rec r, proxy_worker worker,`
`194`	`194`
`195`	`195`	`{`
`196`	`196`	`int status;`
`197`		`- const char *flush_method = "flush";`
	`197`	`+ const char *flush_method = worker->flusher ? worker->flusher : "flush";`
`198`	`198`
`199`	`199`	`proxy_fdpass_flush *flush = ap_lookup_provider(PROXY_FDPASS_FLUSHER, flush_method, "0");`
`200`	`200`