You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ji...@apache.org on 2011/02/02 22:25:34 UTC
svn commit: r1066631 - in /httpd/httpd/trunk/modules/proxy: mod_proxy.h
proxy_util.c
Author: jim
Date: Wed Feb 2 21:25:34 2011
New Revision: 1066631
URL: http://svn.apache.org/viewvc?rev=1066631&view=rev
Log:
No need to pollute the whole namespace...
Modified:
httpd/httpd/trunk/modules/proxy/mod_proxy.h
httpd/httpd/trunk/modules/proxy/proxy_util.c
Modified: httpd/httpd/trunk/modules/proxy/mod_proxy.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/mod_proxy.h?rev=1066631&r1=1066630&r2=1066631&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/mod_proxy.h (original)
+++ httpd/httpd/trunk/modules/proxy/mod_proxy.h Wed Feb 2 21:25:34 2011
@@ -255,7 +255,6 @@ struct proxy_conn_pool {
};
/* Keep below in sync with proxy_util.c! */
-
/* worker status bits */
#define PROXY_WORKER_INITIALIZED 0x0001
#define PROXY_WORKER_IGNORE_ERRORS 0x0002
@@ -278,12 +277,6 @@ struct proxy_conn_pool {
#define PROXY_WORKER_HOT_STANDBY_FLAG 'H'
#define PROXY_WORKER_FREE_FLAG 'F'
-typedef struct wstat {
- unsigned int bit;
- char flag;
- const char *name;
-} wstat;
-
#define PROXY_WORKER_NOT_USABLE_BITMAP ( PROXY_WORKER_IN_SHUTDOWN | \
PROXY_WORKER_DISABLED | PROXY_WORKER_STOPPED | PROXY_WORKER_IN_ERROR )
Modified: httpd/httpd/trunk/modules/proxy/proxy_util.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/proxy_util.c?rev=1066631&r1=1066630&r2=1066631&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/proxy_util.c (original)
+++ httpd/httpd/trunk/modules/proxy/proxy_util.c Wed Feb 2 21:25:34 2011
@@ -45,7 +45,11 @@ typedef struct {
} forward_info;
/* Keep synced with mod_proxy.h! */
-wstat wstat_tbl[] = {
+static struct wstat {
+ unsigned int bit;
+ char flag;
+ const char *name;
+} wstat_tbl[] = {
{PROXY_WORKER_INITIALIZED, PROXY_WORKER_INITIALIZED_FLAG, "Init "},
{PROXY_WORKER_IGNORE_ERRORS, PROXY_WORKER_IGNORE_ERRORS_FLAG, "Ign "},
{PROXY_WORKER_DRAIN, PROXY_WORKER_DRAIN_FLAG, "Drn "},
@@ -2854,7 +2858,7 @@ PROXY_DECLARE(apr_status_t) ap_proxy_set
{
unsigned int *status = &w->s->status;
char flag = toupper(c);
- wstat *pwt = wstat_tbl;
+ struct wstat *pwt = wstat_tbl;
while (pwt->bit) {
if (flag == pwt->flag) {
if (set)
@@ -2872,7 +2876,7 @@ PROXY_DECLARE(char *) ap_proxy_parse_wst
{
char *ret = "";
unsigned int status = w->s->status;
- wstat *pwt = wstat_tbl;
+ struct wstat *pwt = wstat_tbl;
while (pwt->bit) {
if (status & pwt->bit)
ret = apr_pstrcat(p, ret, pwt->name, NULL);