]> granicus.if.org Git - apache/commitdiff
move scope
authorJim Jagielski <jim@apache.org>
Sat, 16 Jan 2016 15:18:22 +0000 (15:18 +0000)
committerJim Jagielski <jim@apache.org>
Sat, 16 Jan 2016 15:18:22 +0000 (15:18 +0000)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1724993 13f79535-47bb-0310-9956-ffa450edef68

modules/proxy/mod_proxy_hcheck.c

index 3198eba5ed7a4da4bdbb55db3507d6a9c543789a..13f4d0ef7a358b08fc1b44a66efc86139d3013a0 100644 (file)
@@ -303,7 +303,6 @@ static void backend_cleanup(const char *proxy_function, proxy_conn_rec *backend,
 static apr_status_t hc_check_tcp(sctx_t *ctx, apr_pool_t *p, proxy_worker *worker)
 {
     int status;
-    apr_status_t err = APR_SUCCESS;
     proxy_conn_rec *backend = NULL;
     proxy_conn_pool *saved_cp = ctx->hc->cp;
 
@@ -415,6 +414,7 @@ static apr_status_t hc_watchdog_callback(int state, void *data,
                              */
                             if (!worker->cp) {
                                 apr_status_t rv;
+                                apr_status_t err = APR_SUCCESS;
                                 rv = ap_proxy_initialize_worker(worker, ctx->s, ctx->p);
                                 if (rv != APR_SUCCESS) {
                                     ap_log_error(APLOG_MARK, APLOG_EMERG, rv, ctx->s, APLOGNO() "Cannot init worker");