httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From n..@apache.org
Subject svn commit: r429890 - /httpd/httpd/trunk/modules/proxy/proxy_util.c
Date Tue, 08 Aug 2006 23:50:33 GMT
Author: niq
Date: Tue Aug  8 16:50:33 2006
New Revision: 429890

URL: http://svn.apache.org/viewvc?rev=429890&view=rev
Log:
Fix tabs introduced in r429875

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

Modified: httpd/httpd/trunk/modules/proxy/proxy_util.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/proxy_util.c?rev=429890&r1=429889&r2=429890&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/proxy_util.c (original)
+++ httpd/httpd/trunk/modules/proxy/proxy_util.c Tue Aug  8 16:50:33 2006
@@ -330,7 +330,7 @@
         for (wk = 0; wk < 7; wk++) {
             if (strcmp(x, lwday[wk]) == 0) {
                 break;
-	    }
+            }
         }
         *q = ',';
         if (wk == 7) {
@@ -346,7 +346,7 @@
         }
         if (year < 70) {
             year += 2000;
-	}
+        }
         else {
             year += 1900;
         }
@@ -356,26 +356,26 @@
         if (x[3] != ' ' || x[7] != ' ' || x[10] != ' ' || x[13] != ':' ||
             x[16] != ':' || x[19] != ' ' || x[24] != '\0') {
             return x;
-	}
+        }
         if (sscanf(x, "%3s %3s %u %u:%u:%u %u", week, month, &mday, &hour,
                    &min, &sec, &year) != 7) {
             return x;
-	}
+        }
         for (wk = 0; wk < 7; wk++) {
             if (strcmp(week, apr_day_snames[wk]) == 0) {
                 break;
-	    }
-	}
+            }
+        }
         if (wk == 7) {
             return x;
-	}
+        }
     }
 
 /* check date */
     for (mon = 0; mon < 12; mon++) {
         if (strcmp(month, apr_month_snames[mon]) == 0) {
             break;
-	}
+        }
     }
     if (mon == 12) {
         return x;
@@ -472,25 +472,25 @@
             i = p - list;
             do {
                 p++;
-	    } while (apr_isspace(*p));
+            } while (apr_isspace(*p));
         }
         else {
             i = strlen(list);
-	}
+        }
 
         while (i > 0 && apr_isspace(list[i - 1])) {
             i--;
-	}
+        }
         if (i == len && strncasecmp(list, val, len) == 0) {
             /* do nothing */
         }
         else {
             if (new) {
                 new = apr_pstrcat(pool, new, ",", apr_pstrndup(pool, list, i), NULL);
-	    }
+            }
             else {
                 new = apr_pstrndup(pool, list, i);
-	    }
+            }
         }
         list = p;
     }
@@ -510,13 +510,13 @@
         j <<= 4;
         if (apr_isdigit(ch)) {
             j |= ch - '0';
-	}
+        }
         else if (apr_isupper(ch)) {
             j |= ch - ('A' - 10);
-	}
+        }
         else {
             j |= ch - ('a' - 10);
-	}
+        }
     }
     if (j == 0xffffffff) {
         return -1;      /* so that it works with 8-byte ints */
@@ -539,10 +539,10 @@
         j >>= 4;
         if (ch >= 10) {
             y[i] = ch + ('A' - 10);
-	}
+        }
         else {
             y[i] = ch + '0';
-	}
+        }
     }
     y[8] = '\0';
 }
@@ -627,17 +627,17 @@
 
         if (*addr == '/' && quads > 0) {  /* netmask starts here. */
             break;
-	}
+        }
 
         if (!apr_isdigit(*addr)) {
             return 0;       /* no digit at start of quad */
-	}
+        }
 
         ip_addr[quads] = strtol(addr, &tmp, 0);
 
         if (tmp == addr) {  /* expected a digit, found something else */
             return 0;
-	}
+        }
 
         if (ip_addr[quads] < 0 || ip_addr[quads] > 255) {
             /* invalid octet */
@@ -648,7 +648,7 @@
 
         if (*addr == '.' && quads != 3) {
             ++addr;     /* after the 4th quad, a dot would be illegal */
-	}
+        }
     }
 
     for (This->addr.s_addr = 0, i = 0; i < quads; ++i) {
@@ -664,13 +664,13 @@
 
         if (tmp == addr) {   /* expected a digit, found something else */
             return 0;
-	}
+        }
 
         addr = tmp;
 
         if (bits < 0 || bits > 32) { /* netmask must be between 0 and 32 */
             return 0;
-	}
+        }
 
     }
     else {
@@ -681,12 +681,12 @@
          */
         while (quads > 0 && ip_addr[quads - 1] == 0) {
             --quads;
-	}
+        }
 
         /* "IP Address should be given in dotted-quad form, optionally followed by a netmask
(e.g., 192.168.111.0/24)"; */
         if (quads < 1) {
             return 0;
-	}
+        }
 
         /* every zero-byte counts as 8 zero-bits */
         bits = 8 * quads;
@@ -695,7 +695,7 @@
             ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL,
                          "Warning: NetMask not supplied with IP-Addr; guessing: %s/%ld",
                          inet_ntoa(This->addr), bits);
-	}
+        }
     }
 
     This->mask.s_addr = htonl(APR_INADDR_NONE << (32 - bits));
@@ -735,7 +735,7 @@
     if (4 == sscanf(host, "%d.%d.%d.%d", &ip_addr[0], &ip_addr[1], &ip_addr[2],
&ip_addr[3])) {
         for (addr.s_addr = 0, i = 0; i < 4; ++i) {
             addr.s_addr |= htonl(ip_addr[i] << (24 - 8 * i));
-	}
+        }
 
         if (This->addr.s_addr == (addr.s_addr & This->mask.s_addr)) {
 #if DEBUGGING
@@ -1264,7 +1264,7 @@
     for (i = 0; i < conf->balancers->nelts; i++) {
         if (strcasecmp(balancer->name, uri) == 0) {
             return balancer;
-	}
+        }
         balancer++;
     }
     return NULL;
@@ -1792,14 +1792,14 @@
         /* Set hard max to no more then mpm_threads */
         if (worker->hmax == 0 || worker->hmax > mpm_threads) {
             worker->hmax = mpm_threads;
-	}
+        }
         if (worker->smax == 0 || worker->smax > worker->hmax) {
             worker->smax = worker->hmax;
-	}
+        }
         /* Set min to be lower then smax */
         if (worker->min > worker->smax) {
             worker->min = worker->smax;
-	}
+        }
     }
     else {
         /* This will supress the apr_reslist creation */
@@ -1825,7 +1825,7 @@
         /* Set the acquire timeout */
         if (rv == APR_SUCCESS && worker->acquire_set) {
             apr_reslist_timeout_set(worker->cp->res, worker->acquire);
-	}
+        }
 #endif
     }
     else
@@ -1864,7 +1864,7 @@
         }
         else {
             return DECLINED;
-	}
+        }
     }
     else {
         return OK;
@@ -1899,7 +1899,7 @@
         /* create the new connection if the previous was destroyed */
         if (!worker->cp->conn) {
             connection_constructor((void **)conn, worker, worker->cp->pool);
-	}
+        }
         else {
             *conn = worker->cp->conn;
             worker->cp->conn = NULL;
@@ -2005,7 +2005,7 @@
             conn->hostname = apr_pstrdup(conn->pool, proxyname);
             conn->port = proxyport;
         }
-	else {
+        else {
             conn->hostname = apr_pstrdup(conn->pool, uri->hostname);
             conn->port = uri->port;
         }
@@ -2058,7 +2058,7 @@
         if (ap_is_default_port(server_port, r)) {
             strcpy(server_portstr,"");
         }
-	else {
+        else {
             apr_snprintf(server_portstr, server_portstr_size, ":%d",
                          server_port);
         }



Mime
View raw message