httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject svn commit: r1722377 - /httpd/httpd/trunk/modules/proxy/mod_proxy_hcheck.c
Date Wed, 30 Dec 2015 16:44:46 GMT
Author: jim
Date: Wed Dec 30 16:44:46 2015
New Revision: 1722377

URL: http://svn.apache.org/viewvc?rev=1722377&view=rev
Log:
Don't bother w/ methods that return bodies. We don't
handle them now anyway.

Modified:
    httpd/httpd/trunk/modules/proxy/mod_proxy_hcheck.c

Modified: httpd/httpd/trunk/modules/proxy/mod_proxy_hcheck.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/mod_proxy_hcheck.c?rev=1722377&r1=1722376&r2=1722377&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/mod_proxy_hcheck.c (original)
+++ httpd/httpd/trunk/modules/proxy/mod_proxy_hcheck.c Wed Dec 30 16:44:46 2015
@@ -29,7 +29,7 @@ module AP_MODULE_DECLARE_DATA proxy_hche
 #define HCHECK_WATHCHDOG_INTERVAL (5)
 
 static char *methods[] = {
-      "NULL", "OPTIONS", "HEAD", "GET", "POST", "CPING", NULL
+      "NULL", "OPTIONS", "HEAD", "CPING", NULL
 };
 
 typedef struct {
@@ -257,12 +257,14 @@ static const char *set_hc_template(cmd_p
     return NULL;
 }
 
-static void hc_check(apr_pool_t *p, server_rec *s, apr_time_t now,
+static void hc_check(sctx_t *ctx, apr_pool_t *p, apr_time_t now,
                      proxy_worker *worker)
 {
+    server_rec *s = ctx->s;
     /* TODO: REMOVE ap_log_error call */
     ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, APLOGNO()
                  "Health check (%s).", worker->s->name);
+
     return;
 }
 
@@ -307,7 +309,7 @@ static apr_status_t hc_watchdog_callback
                                      worker->s->name, worker->s->method, (unsigned
long)now,
                                      (unsigned long)worker->s->updated, (unsigned long)worker->s->interval);
                         if (worker->s->method && (now > worker->s->updated
+ worker->s->interval)) {
-                            hc_check(p, s, now, worker);
+                            hc_check(ctx, p, now, worker);
                         }
                         workers++;
                     }



Mime
View raw message