]> granicus.if.org Git - apache/commitdiff
small style tweaks to r930125
authorJeff Trawick <trawick@apache.org>
Fri, 2 Apr 2010 12:19:22 +0000 (12:19 +0000)
committerJeff Trawick <trawick@apache.org>
Fri, 2 Apr 2010 12:19:22 +0000 (12:19 +0000)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@930254 13f79535-47bb-0310-9956-ffa450edef68

CHANGES
modules/proxy/mod_proxy.c
modules/proxy/mod_proxy_balancer.c

diff --git a/CHANGES b/CHANGES
index 833fda02c6551c9201f542b253eff47f998ead24..4a837250e612b9bbc7eb2ee083cfd7d3257cd312 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -28,9 +28,8 @@ Changes with Apache 2.3.7
      processing is completed, avoiding orphaned callback pointers.
      [Brett Gervasoni <brettg senseofsecurity.com>, Jeff Trawick]
 
-  *) Proxy balancer: support setting error status according to
-     HTTP response code from a backend.
-     PR 48939 [Daniel Ruggeri <DRuggeri primary.net>]
+  *) Proxy balancer: support setting error status according to HTTP response
+     code from a backend.  PR 48939.  [Daniel Ruggeri <DRuggeri primary.net>]
 
   *) htcacheclean: Introduce the ability to clean specific URLs from the
      cache, if provided as an optional parameter on the command line.
index 92975c4c995ccc6cacd59dc3d27796d38787754e..18dfc53d10391b81992ab8bd21a7928fe70626d1 100644 (file)
@@ -393,7 +393,7 @@ static const char *set_balancer_param(proxy_server_conf *conf,
         while (status != NULL) {
             ival = atoi(status);
             if (ap_is_HTTP_VALID_RESPONSE(ival)) {
-                *(int*)apr_array_push(balancer->errstatuses) = ival;
+                *(int *)apr_array_push(balancer->errstatuses) = ival;
             }
             else {
                 return "erroronstatus must be one or more HTTP response code";
index 1258f003a12275f81a6902abf5bb7e0abbb6a23f..ff25ed0fa507d6380b74247cda519792f6330c68 100644 (file)
@@ -609,10 +609,10 @@ static int proxy_balancer_post_request(proxy_worker *worker,
         return HTTP_INTERNAL_SERVER_ERROR;
     }
 
-    if (!apr_is_empty_array(balancer->errstatuses)){
+    if (!apr_is_empty_array(balancer->errstatuses)) {
         int i;
         for (i = 0; i < balancer->errstatuses->nelts; i++) {
-            int val=((int*)balancer->errstatuses->elts)[i];
+            int val = ((int *)balancer->errstatuses->elts)[i];
             if (r->status == val) {
                 ap_log_error(APLOG_MARK, APLOG_NOTICE, rv, r->server,
                     "Detected ErrorOnState (%d) for member (%s). Forcing worker into error state.", val, worker->name);