httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@apache.org
Subject svn commit: r930254 - in /httpd/httpd/trunk: CHANGES modules/proxy/mod_proxy.c modules/proxy/mod_proxy_balancer.c
Date Fri, 02 Apr 2010 12:19:22 GMT
Author: trawick
Date: Fri Apr  2 12:19:22 2010
New Revision: 930254

URL: http://svn.apache.org/viewvc?rev=930254&view=rev
Log:
small style tweaks to r930125

Modified:
    httpd/httpd/trunk/CHANGES
    httpd/httpd/trunk/modules/proxy/mod_proxy.c
    httpd/httpd/trunk/modules/proxy/mod_proxy_balancer.c

Modified: httpd/httpd/trunk/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/CHANGES?rev=930254&r1=930253&r2=930254&view=diff
==============================================================================
--- httpd/httpd/trunk/CHANGES [utf-8] (original)
+++ httpd/httpd/trunk/CHANGES [utf-8] Fri Apr  2 12:19:22 2010
@@ -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.

Modified: httpd/httpd/trunk/modules/proxy/mod_proxy.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/mod_proxy.c?rev=930254&r1=930253&r2=930254&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/mod_proxy.c (original)
+++ httpd/httpd/trunk/modules/proxy/mod_proxy.c Fri Apr  2 12:19:22 2010
@@ -393,7 +393,7 @@ static const char *set_balancer_param(pr
         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";

Modified: httpd/httpd/trunk/modules/proxy/mod_proxy_balancer.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/mod_proxy_balancer.c?rev=930254&r1=930253&r2=930254&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/mod_proxy_balancer.c (original)
+++ httpd/httpd/trunk/modules/proxy/mod_proxy_balancer.c Fri Apr  2 12:19:22 2010
@@ -609,10 +609,10 @@ static int proxy_balancer_post_request(p
         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);



Mime
View raw message