diff --git a/CHANGES b/CHANGES index f99737d759..b6e946cf19 100644 --- a/CHANGES +++ b/CHANGES @@ -9264,7 +9264,7 @@ Changes with Apache 1.3.1 *) Cache a proxied request in the event that the client cancels the transfer, provided that the configured percentage of the file has - already been transfered. It works for HTTP transfers only. The + already been transferred. It works for HTTP transfers only. The new configuration directive is called CacheForceCompletion. [Glen Parker ] PR#2277 diff --git a/docs/manual/mod/mod_rewrite.html.en b/docs/manual/mod/mod_rewrite.html.en index 59425bcf27..9407244a2a 100644 --- a/docs/manual/mod/mod_rewrite.html.en +++ b/docs/manual/mod/mod_rewrite.html.en @@ -256,7 +256,7 @@ URLs on the fly %N (see below). These are available for creating the strings Substitution and TestString. Figure 2 shows to which locations the back-references are - transfered for expansion.

+ transferred for expansion.

[Needs graphics capability to display]
@@ -1791,4 +1791,4 @@ RewriteRule ^/([^/]+)/~([^/]+)/(.*)$ /u/${real-to-user:$2|nobody}/$3.$1

- \ No newline at end of file + diff --git a/docs/manual/mod/mod_rewrite.xml b/docs/manual/mod/mod_rewrite.xml index 9cf2ec9159..186a18ada8 100644 --- a/docs/manual/mod/mod_rewrite.xml +++ b/docs/manual/mod/mod_rewrite.xml @@ -242,7 +242,7 @@ URLs on the fly %N (see below). These are available for creating the strings Substitution and TestString. Figure 2 shows to which locations the back-references are - transfered for expansion.

+ transferred for expansion.

", worker->s->redirect, NULL); ap_rprintf(r, "%d", worker->s->lbfactor); ap_rprintf(r, "%d", (int)(worker->s->elected)); - ap_rputs(apr_strfsize(worker->s->transfered, fbuf), r); + ap_rputs(apr_strfsize(worker->s->transferred, fbuf), r); ap_rputs("", r); ap_rputs(apr_strfsize(worker->s->read, fbuf), r); ap_rputs("\n", r); @@ -1747,7 +1747,7 @@ static int proxy_status_hook(request_rec *r, int flags) "RedirSession Route Redirection\n" "FLoad Balancer Factor in %\n" "AccNumber of requests\n" - "WrNumber of bytes transfered\n" + "WrNumber of bytes transferred\n" "RdNumber of bytes read\n" "", r); diff --git a/modules/proxy/mod_proxy.h b/modules/proxy/mod_proxy.h index 4286cd1679..b26265f472 100644 --- a/modules/proxy/mod_proxy.h +++ b/modules/proxy/mod_proxy.h @@ -242,7 +242,7 @@ typedef struct { int retries; /* number of retries on this worker */ int lbstatus; /* Current lbstatus */ int lbfactor; /* dynamic lbfactor */ - apr_off_t transfered; /* Number of bytes transfered to remote */ + apr_off_t transferred;/* Number of bytes transferred to remote */ apr_off_t read; /* Number of bytes read from remote */ apr_size_t elected; /* Number of times the worker was elected */ char route[PROXY_WORKER_MAX_ROUTE_SIZ+1]; diff --git a/modules/proxy/proxy_ajp.c b/modules/proxy/proxy_ajp.c index a8fe033e04..f2760631e9 100644 --- a/modules/proxy/proxy_ajp.c +++ b/modules/proxy/proxy_ajp.c @@ -193,7 +193,7 @@ static int ap_proxy_ajp_request(apr_pool_t *p, request_rec *r, conn->worker->hostname); return HTTP_SERVICE_UNAVAILABLE; } - conn->worker->s->transfered += bufsiz; + conn->worker->s->transferred += bufsiz; } } @@ -249,7 +249,7 @@ static int ap_proxy_ajp_request(apr_pool_t *p, request_rec *r, "ajp_send_data_msg failed"); break; } - conn->worker->s->transfered += bufsiz; + conn->worker->s->transferred += bufsiz; } else { /* something is wrong TC asks for more body but we are * already at the end of the body data diff --git a/modules/proxy/proxy_http.c b/modules/proxy/proxy_http.c index 46bc741ccf..2fc10c17ae 100644 --- a/modules/proxy/proxy_http.c +++ b/modules/proxy/proxy_http.c @@ -250,7 +250,7 @@ apr_status_t ap_proxy_http_request(apr_pool_t *p, request_rec *r, int counter, seen_eos, send_chunks; apr_status_t status; apr_bucket_brigade *header_brigade, *body_brigade, *input_brigade; - apr_off_t transfered = 0; + apr_off_t transferred = 0; header_brigade = apr_brigade_create(p, origin->bucket_alloc); body_brigade = apr_brigade_create(p, origin->bucket_alloc); @@ -484,9 +484,9 @@ apr_status_t ap_proxy_http_request(apr_pool_t *p, request_rec *r, e = apr_bucket_flush_create(c->bucket_alloc); APR_BRIGADE_INSERT_TAIL(header_brigade, e); - apr_brigade_length(header_brigade, 0, &transfered); - if (transfered != -1) - conn->worker->s->transfered += transfered; + apr_brigade_length(header_brigade, 0, &transferred); + if (transferred != -1) + conn->worker->s->transferred += transferred; if (send_chunks) { status = ap_pass_brigade(origin->output_filters, header_brigade); @@ -634,9 +634,9 @@ apr_status_t ap_proxy_http_request(apr_pool_t *p, request_rec *r, conn->addr, conn->hostname); return status; } - apr_brigade_length(body_brigade, 0, &transfered); - if (transfered != -1) - conn->worker->s->transfered += transfered; + apr_brigade_length(body_brigade, 0, &transferred); + if (transferred != -1) + conn->worker->s->transferred += transferred; apr_brigade_cleanup(body_brigade); return APR_SUCCESS; diff --git a/test/zb.c b/test/zb.c index 0a6666eb25..93a6f6a9cb 100644 --- a/test/zb.c +++ b/test/zb.c @@ -202,8 +202,8 @@ void output_results() if(bad) printf(" (Connect: %d, Length: %d, Exceptions: %d)\n", err_conn, err_length, err_except); if(keepalive) printf("Keep-Alive requests: %d\n", doneka); - printf("Bytes transfered: %d\n", totalread); - printf("HTML transfered: %d\n", totalbread); + printf("Bytes transferred: %d\n", totalread); + printf("HTML transferred: %d\n", totalbread); /* avoid divide by zero */ if(timetaken) {