mirror of
https://github.com/apache/httpd.git
synced 2025-08-01 07:26:57 +03:00
s/tab/space/
Remove empty lines git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1629738 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
@ -500,10 +500,10 @@ static int firehose_open_logs(apr_pool_t *p, apr_pool_t *plog,
|
|||||||
| conn->nonblock, APR_OS_DEFAULT, plog))) {
|
| conn->nonblock, APR_OS_DEFAULT, plog))) {
|
||||||
ap_log_error(APLOG_MARK, APLOG_WARNING, rv, s,
|
ap_log_error(APLOG_MARK, APLOG_WARNING, rv, s,
|
||||||
"mod_firehose: could not open '%s' for write, "
|
"mod_firehose: could not open '%s' for write, "
|
||||||
"disabling firehose %s%s %s filter",
|
"disabling firehose %s%s %s filter",
|
||||||
conn->filename, conn->proxy == FIREHOSE_PROXY ? "proxy " : "",
|
conn->filename, conn->proxy == FIREHOSE_PROXY ? "proxy " : "",
|
||||||
conn->request == FIREHOSE_REQUEST ? " request" : "connection",
|
conn->request == FIREHOSE_REQUEST ? " request" : "connection",
|
||||||
conn->direction == FIREHOSE_IN ? "input" : "output");
|
conn->direction == FIREHOSE_IN ? "input" : "output");
|
||||||
}
|
}
|
||||||
conn++;
|
conn++;
|
||||||
}
|
}
|
||||||
@ -580,7 +580,7 @@ static const char *firehose_enable_connection(cmd_parms *cmd,
|
|||||||
firehose->nonblock = APR_FOPEN_NONBLOCK;
|
firehose->nonblock = APR_FOPEN_NONBLOCK;
|
||||||
#else
|
#else
|
||||||
return "The parameter 'nonblock' is not supported by APR on this "
|
return "The parameter 'nonblock' is not supported by APR on this "
|
||||||
"platform";
|
"platform";
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
else if (!strcmp(arg1, "block")) {
|
else if (!strcmp(arg1, "block")) {
|
||||||
@ -604,7 +604,6 @@ static const char *firehose_enable_connection_input(cmd_parms *cmd,
|
|||||||
const char *arg1,
|
const char *arg1,
|
||||||
const char *arg2)
|
const char *arg2)
|
||||||
{
|
{
|
||||||
|
|
||||||
const char *err = ap_check_cmd_context(cmd, GLOBAL_ONLY | NOT_IN_LIMIT);
|
const char *err = ap_check_cmd_context(cmd, GLOBAL_ONLY | NOT_IN_LIMIT);
|
||||||
if (err != NULL) {
|
if (err != NULL) {
|
||||||
return err;
|
return err;
|
||||||
@ -612,7 +611,6 @@ static const char *firehose_enable_connection_input(cmd_parms *cmd,
|
|||||||
|
|
||||||
return firehose_enable_connection(cmd, arg1, arg2, FIREHOSE_NORMAL,
|
return firehose_enable_connection(cmd, arg1, arg2, FIREHOSE_NORMAL,
|
||||||
FIREHOSE_IN, FIREHOSE_CONNECTION);
|
FIREHOSE_IN, FIREHOSE_CONNECTION);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static const char *firehose_enable_connection_output(cmd_parms *cmd,
|
static const char *firehose_enable_connection_output(cmd_parms *cmd,
|
||||||
@ -620,7 +618,6 @@ static const char *firehose_enable_connection_output(cmd_parms *cmd,
|
|||||||
const char *arg1,
|
const char *arg1,
|
||||||
const char *arg2)
|
const char *arg2)
|
||||||
{
|
{
|
||||||
|
|
||||||
const char *err = ap_check_cmd_context(cmd, GLOBAL_ONLY | NOT_IN_LIMIT);
|
const char *err = ap_check_cmd_context(cmd, GLOBAL_ONLY | NOT_IN_LIMIT);
|
||||||
if (err != NULL) {
|
if (err != NULL) {
|
||||||
return err;
|
return err;
|
||||||
@ -628,14 +625,12 @@ static const char *firehose_enable_connection_output(cmd_parms *cmd,
|
|||||||
|
|
||||||
return firehose_enable_connection(cmd, arg1, arg2, FIREHOSE_NORMAL,
|
return firehose_enable_connection(cmd, arg1, arg2, FIREHOSE_NORMAL,
|
||||||
FIREHOSE_OUT, FIREHOSE_CONNECTION);
|
FIREHOSE_OUT, FIREHOSE_CONNECTION);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static const char *firehose_enable_request_input(cmd_parms *cmd, void *dummy,
|
static const char *firehose_enable_request_input(cmd_parms *cmd, void *dummy,
|
||||||
const char *arg1,
|
const char *arg1,
|
||||||
const char *arg2)
|
const char *arg2)
|
||||||
{
|
{
|
||||||
|
|
||||||
const char *err = ap_check_cmd_context(cmd, GLOBAL_ONLY | NOT_IN_LIMIT);
|
const char *err = ap_check_cmd_context(cmd, GLOBAL_ONLY | NOT_IN_LIMIT);
|
||||||
if (err != NULL) {
|
if (err != NULL) {
|
||||||
return err;
|
return err;
|
||||||
@ -643,14 +638,12 @@ static const char *firehose_enable_request_input(cmd_parms *cmd, void *dummy,
|
|||||||
|
|
||||||
return firehose_enable_connection(cmd, arg1, arg2, FIREHOSE_NORMAL,
|
return firehose_enable_connection(cmd, arg1, arg2, FIREHOSE_NORMAL,
|
||||||
FIREHOSE_IN, FIREHOSE_REQUEST);
|
FIREHOSE_IN, FIREHOSE_REQUEST);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static const char *firehose_enable_request_output(cmd_parms *cmd, void *dummy,
|
static const char *firehose_enable_request_output(cmd_parms *cmd, void *dummy,
|
||||||
const char *arg1,
|
const char *arg1,
|
||||||
const char *arg2)
|
const char *arg2)
|
||||||
{
|
{
|
||||||
|
|
||||||
const char *err = ap_check_cmd_context(cmd, GLOBAL_ONLY | NOT_IN_LIMIT);
|
const char *err = ap_check_cmd_context(cmd, GLOBAL_ONLY | NOT_IN_LIMIT);
|
||||||
if (err != NULL) {
|
if (err != NULL) {
|
||||||
return err;
|
return err;
|
||||||
@ -658,7 +651,6 @@ static const char *firehose_enable_request_output(cmd_parms *cmd, void *dummy,
|
|||||||
|
|
||||||
return firehose_enable_connection(cmd, arg1, arg2, FIREHOSE_NORMAL,
|
return firehose_enable_connection(cmd, arg1, arg2, FIREHOSE_NORMAL,
|
||||||
FIREHOSE_OUT, FIREHOSE_REQUEST);
|
FIREHOSE_OUT, FIREHOSE_REQUEST);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static const char *firehose_enable_proxy_connection_input(cmd_parms *cmd,
|
static const char *firehose_enable_proxy_connection_input(cmd_parms *cmd,
|
||||||
@ -666,7 +658,6 @@ static const char *firehose_enable_proxy_connection_input(cmd_parms *cmd,
|
|||||||
const char *arg1,
|
const char *arg1,
|
||||||
const char *arg2)
|
const char *arg2)
|
||||||
{
|
{
|
||||||
|
|
||||||
const char *err = ap_check_cmd_context(cmd, GLOBAL_ONLY | NOT_IN_LIMIT);
|
const char *err = ap_check_cmd_context(cmd, GLOBAL_ONLY | NOT_IN_LIMIT);
|
||||||
if (err != NULL) {
|
if (err != NULL) {
|
||||||
return err;
|
return err;
|
||||||
@ -674,7 +665,6 @@ static const char *firehose_enable_proxy_connection_input(cmd_parms *cmd,
|
|||||||
|
|
||||||
return firehose_enable_connection(cmd, arg1, arg2, FIREHOSE_PROXY,
|
return firehose_enable_connection(cmd, arg1, arg2, FIREHOSE_PROXY,
|
||||||
FIREHOSE_IN, FIREHOSE_CONNECTION);
|
FIREHOSE_IN, FIREHOSE_CONNECTION);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static const char *firehose_enable_proxy_connection_output(cmd_parms *cmd,
|
static const char *firehose_enable_proxy_connection_output(cmd_parms *cmd,
|
||||||
@ -682,7 +672,6 @@ static const char *firehose_enable_proxy_connection_output(cmd_parms *cmd,
|
|||||||
const char *arg1,
|
const char *arg1,
|
||||||
const char *arg2)
|
const char *arg2)
|
||||||
{
|
{
|
||||||
|
|
||||||
const char *err = ap_check_cmd_context(cmd, GLOBAL_ONLY | NOT_IN_LIMIT);
|
const char *err = ap_check_cmd_context(cmd, GLOBAL_ONLY | NOT_IN_LIMIT);
|
||||||
if (err != NULL) {
|
if (err != NULL) {
|
||||||
return err;
|
return err;
|
||||||
@ -690,7 +679,6 @@ static const char *firehose_enable_proxy_connection_output(cmd_parms *cmd,
|
|||||||
|
|
||||||
return firehose_enable_connection(cmd, arg1, arg2, FIREHOSE_PROXY,
|
return firehose_enable_connection(cmd, arg1, arg2, FIREHOSE_PROXY,
|
||||||
FIREHOSE_OUT, FIREHOSE_CONNECTION);
|
FIREHOSE_OUT, FIREHOSE_CONNECTION);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static const command_rec firehose_cmds[] =
|
static const command_rec firehose_cmds[] =
|
||||||
|
Reference in New Issue
Block a user