You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by sf...@apache.org on 2011/09/23 20:08:44 UTC
svn commit: r1174929 [2/2] - in /httpd/httpd/trunk: include/ modules/aaa/
modules/arch/win32/ modules/cache/ modules/dav/main/ modules/filters/
modules/generators/ modules/http/ modules/ldap/ modules/lua/
modules/mappers/ modules/proxy/ modules/ssl/ os...
Modified: httpd/httpd/trunk/server/core.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/core.c?rev=1174929&r1=1174928&r2=1174929&view=diff
==============================================================================
--- httpd/httpd/trunk/server/core.c (original)
+++ httpd/httpd/trunk/server/core.c Fri Sep 23 18:08:42 2011
@@ -3733,12 +3733,12 @@ static apr_array_header_t *parse_errorlo
*err = "The '+' flag cannot be used in the main error log format";
return NULL;
}
- if (!is_main_fmt && item->min_loglevel) {
+ if (!is_main_fmt && item->min_loglevel) {
*err = "The loglevel cannot be used as a condition in "
- "once-per-request or once-per-connection formats";
+ "once-per-request or once-per-connection formats";
return NULL;
}
- if (item->min_loglevel > APLOG_TRACE8) {
+ if (item->min_loglevel > APLOG_TRACE8) {
*err = "The specified loglevel modifier is out of range";
return NULL;
}
Modified: httpd/httpd/trunk/server/request.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/request.c?rev=1174929&r1=1174928&r2=1174929&view=diff
==============================================================================
--- httpd/httpd/trunk/server/request.c (original)
+++ httpd/httpd/trunk/server/request.c Fri Sep 23 18:08:42 2011
@@ -1475,8 +1475,8 @@ AP_DECLARE(int) ap_file_walk(request_rec
int cached;
if (dconf->sec_file) {
- sec_ent = (ap_conf_vector_t **)dconf->sec_file->elts;
- num_sec = dconf->sec_file->nelts;
+ sec_ent = (ap_conf_vector_t **)dconf->sec_file->elts;
+ num_sec = dconf->sec_file->nelts;
}
/* To allow broken modules to proceed, we allow missing filenames to pass.
@@ -1640,8 +1640,8 @@ AP_DECLARE(int) ap_if_walk(request_rec *
walk_walked_t *last_walk;
if (dconf->sec_if) {
- sec_ent = (ap_conf_vector_t **)dconf->sec_if->elts;
- num_sec = dconf->sec_if->nelts;
+ sec_ent = (ap_conf_vector_t **)dconf->sec_if->elts;
+ num_sec = dconf->sec_if->nelts;
}
/* No tricks here, there are just no <If > to parse in this context.
Modified: httpd/httpd/trunk/server/scoreboard.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/scoreboard.c?rev=1174929&r1=1174928&r2=1174929&view=diff
==============================================================================
--- httpd/httpd/trunk/server/scoreboard.c (original)
+++ httpd/httpd/trunk/server/scoreboard.c Fri Sep 23 18:08:42 2011
@@ -486,7 +486,7 @@ static int update_child_status_internal(
REMOTE_NOLOOKUP, NULL), sizeof(ws->client));
copy_request(ws->request, sizeof(ws->request), r);
if (r->server) {
- apr_cpystrn(ws->vhost, r->server->server_hostname,
+ apr_cpystrn(ws->vhost, r->server->server_hostname,
sizeof(ws->vhost));
}
}
Modified: httpd/httpd/trunk/server/util_expr_eval.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/util_expr_eval.c?rev=1174929&r1=1174928&r2=1174929&view=diff
==============================================================================
--- httpd/httpd/trunk/server/util_expr_eval.c (original)
+++ httpd/httpd/trunk/server/util_expr_eval.c Fri Sep 23 18:08:42 2011
@@ -719,7 +719,7 @@ AP_DECLARE(int) ap_expr_exec_ctx(ap_expr
ctx->info->filename, ctx->info->line_number,
*ctx->result_string);
return 1;
- }
+ }
}
else {
rc = ap_expr_eval(ctx, ctx->info->root_node);
@@ -980,9 +980,9 @@ static const char *unescape_func(ap_expr
if (ret == OK)
return result;
ap_log_rerror(LOG_MARK(ctx->info), APLOG_DEBUG, 0, ctx->r,
- "%s %% escape in unescape('%s') at %s:%d",
- ret == HTTP_BAD_REQUEST ? "Bad" : "Forbidden", arg,
- ctx->info->filename, ctx->info->line_number);
+ "%s %% escape in unescape('%s') at %s:%d",
+ ret == HTTP_BAD_REQUEST ? "Bad" : "Forbidden", arg,
+ ctx->info->filename, ctx->info->line_number);
return "";
}
@@ -1055,7 +1055,7 @@ static int op_url_subr(ap_expr_eval_ctx_
ap_log_rerror(LOG_MARK(ctx->info), APLOG_TRACE5, 0, r,
"Subrequest for -U %s at %s:%d gave status: %d",
arg, ctx->info->filename, ctx->info->line_number,
- rsub->status);
+ rsub->status);
ap_destroy_sub_req(rsub);
return rc;
}
@@ -1076,7 +1076,7 @@ static int op_file_subr(ap_expr_eval_ctx
ap_log_rerror(LOG_MARK(ctx->info), APLOG_TRACE5, 0, r,
"Subrequest for -F %s at %s:%d gave status: %d",
arg, ctx->info->filename, ctx->info->line_number,
- rsub->status);
+ rsub->status);
ap_destroy_sub_req(rsub);
return rc;
}
Modified: httpd/httpd/trunk/support/ab.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/support/ab.c?rev=1174929&r1=1174928&r2=1174929&view=diff
==============================================================================
--- httpd/httpd/trunk/support/ab.c (original)
+++ httpd/httpd/trunk/support/ab.c Fri Sep 23 18:08:42 2011
@@ -1592,7 +1592,7 @@ static void test(void)
*/
stats = calloc(requests, sizeof(struct data));
if (stats == NULL || con == NULL) {
- err("Cannot allocate memory for result statistics");
+ err("Cannot allocate memory for result statistics");
}
if ((status = apr_pollset_create(&readbits, concurrency, cntxt,