conffile: fix indentation in the directives definition.
Michael
This commit is contained in:
parent
e6ac4b28cd
commit
f52be1a2a1
@ -170,51 +170,51 @@ struct
|
|||||||
{ BEGIN "#", handle_nop, NULL },
|
{ BEGIN "#", handle_nop, NULL },
|
||||||
/* blank lines */
|
/* blank lines */
|
||||||
{ "^[[:space:]]+$", handle_nop, NULL },
|
{ "^[[:space:]]+$", handle_nop, NULL },
|
||||||
/* string arguments */
|
/* string arguments */
|
||||||
STDCONF ("logfile", STR, handle_logfile),
|
STDCONF ("logfile", STR, handle_logfile),
|
||||||
STDCONF ("pidfile", STR, handle_pidfile),
|
STDCONF ("pidfile", STR, handle_pidfile),
|
||||||
STDCONF ("anonymous", STR, handle_anonymous),
|
STDCONF ("anonymous", STR, handle_anonymous),
|
||||||
STDCONF ("viaproxyname", STR, handle_viaproxyname),
|
STDCONF ("viaproxyname", STR, handle_viaproxyname),
|
||||||
STDCONF ("defaulterrorfile", STR, handle_defaulterrorfile),
|
STDCONF ("defaulterrorfile", STR, handle_defaulterrorfile),
|
||||||
STDCONF ("statfile", STR, handle_statfile),
|
STDCONF ("statfile", STR, handle_statfile),
|
||||||
STDCONF ("stathost", STR, handle_stathost),
|
STDCONF ("stathost", STR, handle_stathost),
|
||||||
STDCONF ("xtinyproxy", STR, handle_xtinyproxy),
|
STDCONF ("xtinyproxy", STR, handle_xtinyproxy),
|
||||||
/* boolean arguments */
|
/* boolean arguments */
|
||||||
STDCONF ("syslog", BOOL, handle_syslog),
|
STDCONF ("syslog", BOOL, handle_syslog),
|
||||||
STDCONF ("bindsame", BOOL, handle_bindsame),
|
STDCONF ("bindsame", BOOL, handle_bindsame),
|
||||||
/* integer arguments */
|
/* integer arguments */
|
||||||
STDCONF ("port", INT, handle_port),
|
STDCONF ("port", INT, handle_port),
|
||||||
STDCONF ("maxclients", INT, handle_maxclients),
|
STDCONF ("maxclients", INT, handle_maxclients),
|
||||||
STDCONF ("maxspareservers", INT, handle_maxspareservers),
|
STDCONF ("maxspareservers", INT, handle_maxspareservers),
|
||||||
STDCONF ("minspareservers", INT, handle_minspareservers),
|
STDCONF ("minspareservers", INT, handle_minspareservers),
|
||||||
STDCONF ("startservers", INT, handle_startservers),
|
STDCONF ("startservers", INT, handle_startservers),
|
||||||
STDCONF ("maxrequestsperchild", INT, handle_maxrequestsperchild),
|
STDCONF ("maxrequestsperchild", INT, handle_maxrequestsperchild),
|
||||||
STDCONF ("timeout", INT, handle_timeout),
|
STDCONF ("timeout", INT, handle_timeout),
|
||||||
STDCONF ("connectport", INT, handle_connectport),
|
STDCONF ("connectport", INT, handle_connectport),
|
||||||
/* alphanumeric arguments */
|
/* alphanumeric arguments */
|
||||||
STDCONF ("user", ALNUM, handle_user),
|
STDCONF ("user", ALNUM, handle_user),
|
||||||
STDCONF ("group", ALNUM, handle_group),
|
STDCONF ("group", ALNUM, handle_group),
|
||||||
/* ip arguments */
|
/* ip arguments */
|
||||||
STDCONF ("listen", IP, handle_listen),
|
STDCONF ("listen", IP, handle_listen),
|
||||||
STDCONF ("allow", "(" IPMASK "|" ALNUM ")", handle_allow),
|
STDCONF ("allow", "(" IPMASK "|" ALNUM ")", handle_allow),
|
||||||
STDCONF ("deny", "(" IPMASK "|" ALNUM ")", handle_deny),
|
STDCONF ("deny", "(" IPMASK "|" ALNUM ")", handle_deny),
|
||||||
STDCONF ("bind", IP, handle_bind),
|
STDCONF ("bind", IP, handle_bind),
|
||||||
/* error files */
|
/* error files */
|
||||||
STDCONF ("errorfile", INT WS STR, handle_errorfile),
|
STDCONF ("errorfile", INT WS STR, handle_errorfile),
|
||||||
#ifdef FILTER_ENABLE
|
#ifdef FILTER_ENABLE
|
||||||
/* filtering */
|
/* filtering */
|
||||||
STDCONF ("filter", STR, handle_filter),
|
STDCONF ("filter", STR, handle_filter),
|
||||||
STDCONF ("filterurls", BOOL, handle_filterurls),
|
STDCONF ("filterurls", BOOL, handle_filterurls),
|
||||||
STDCONF ("filterextended", BOOL, handle_filterextended),
|
STDCONF ("filterextended", BOOL, handle_filterextended),
|
||||||
STDCONF ("filterdefaultdeny", BOOL, handle_filterdefaultdeny),
|
STDCONF ("filterdefaultdeny", BOOL, handle_filterdefaultdeny),
|
||||||
STDCONF ("filtercasesensitive", BOOL, handle_filtercasesensitive),
|
STDCONF ("filtercasesensitive", BOOL, handle_filtercasesensitive),
|
||||||
#endif
|
#endif
|
||||||
#ifdef REVERSE_SUPPORT
|
#ifdef REVERSE_SUPPORT
|
||||||
/* Reverse proxy arguments */
|
/* Reverse proxy arguments */
|
||||||
STDCONF ("reversebaseurl", STR, handle_reversebaseurl),
|
STDCONF ("reversebaseurl", STR, handle_reversebaseurl),
|
||||||
STDCONF ("reverseonly", BOOL, handle_reverseonly),
|
STDCONF ("reverseonly", BOOL, handle_reverseonly),
|
||||||
STDCONF ("reversemagic", BOOL, handle_reversemagic),
|
STDCONF ("reversemagic", BOOL, handle_reversemagic),
|
||||||
STDCONF ("reversepath", STR WS "(" STR ")?", handle_reversepath),
|
STDCONF ("reversepath", STR WS "(" STR ")?", handle_reversepath),
|
||||||
#endif
|
#endif
|
||||||
#ifdef UPSTREAM_SUPPORT
|
#ifdef UPSTREAM_SUPPORT
|
||||||
/* upstream is rather complicated */
|
/* upstream is rather complicated */
|
||||||
@ -225,9 +225,11 @@ struct
|
|||||||
NULL
|
NULL
|
||||||
},
|
},
|
||||||
#endif
|
#endif
|
||||||
/* loglevel */
|
/* loglevel */
|
||||||
STDCONF ("loglevel", "(critical|error|warning|notice|connect|info)",
|
STDCONF ("loglevel", "(critical|error|warning|notice|connect|info)",
|
||||||
handle_loglevel)};
|
handle_loglevel)
|
||||||
|
};
|
||||||
|
|
||||||
const unsigned int ndirectives = sizeof (directives) / sizeof (directives[0]);
|
const unsigned int ndirectives = sizeof (directives) / sizeof (directives[0]);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
Loading…
Reference in New Issue
Block a user