www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-08-08 15:02:10 +03:00
Code Activity

"transfered" is not a word.

Browse Source 
s/transfered/transferred/g;



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@111858 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Cliff Woolley
2004-12-14 18:58:25 +00:00
parent fee1fd1b45
commit a89bce3fd9
9 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES
View File

@@ -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 <glenebob nwlink.com>] PR#2277

2
docs/manual/mod/mod_rewrite.html.en
View File

@@ -256,7 +256,7 @@ URLs on the fly</td></tr>
<code>%N</code> (see below). These are available for creating
the strings <em>Substitution</em> and <em>TestString</em>.
Figure 2 shows to which locations the back-references are
transfered for expansion.</p>
transferred for expansion.</p>
<p class="figure">
<img src="../images/mod_rewrite_fig2.gif" width="381" height="179" alt="[Needs graphics capability to display]" /><br />

2
docs/manual/mod/mod_rewrite.xml
View File

@@ -242,7 +242,7 @@ URLs on the fly</description>
<code>%N</code> (see below). These are available for creating
the strings <em>Substitution</em> and <em>TestString</em>.
Figure 2 shows to which locations the back-references are
transfered for expansion.</p>
transferred for expansion.</p>
<p class="figure">
<img src="../images/mod_rewrite_fig2.gif" width="381"

2
modules/aaa/mod_auth_digest.c
View File

@@ -669,7 +669,7 @@ static const command_rec digest_cmds[] =
/*
* client list code
*
* Each client is assigned a number, which is transfered in the opaque
* Each client is assigned a number, which is transferred in the opaque
* field of the WWW-Authenticate and Authorization headers. The number
* is just a simple counter which is incremented for each new client.
* Clients can't forge this number because it is hashed up into the

4
modules/proxy/mod_proxy.c
View File

@@ -1724,7 +1724,7 @@ static int proxy_status_hook(request_rec *r, int flags)
ap_rvputs(r, "</td><td>", worker->s->redirect, NULL);
ap_rprintf(r, "</td><td>%d</td>", worker->s->lbfactor);
ap_rprintf(r, "<td>%d</td><td>", (int)(worker->s->elected));
ap_rputs(apr_strfsize(worker->s->transfered, fbuf), r);
ap_rputs(apr_strfsize(worker->s->transferred, fbuf), r);
ap_rputs("</td><td>", r);
ap_rputs(apr_strfsize(worker->s->read, fbuf), r);
ap_rputs("</td>\n", r);
@@ -1747,7 +1747,7 @@ static int proxy_status_hook(request_rec *r, int flags)
"<tr><th>Redir</th><td>Session Route Redirection</td></tr>\n"
"<tr><th>F</th><td>Load Balancer Factor in %</td></tr>\n"
"<tr><th>Acc</th><td>Number of requests</td></tr>\n"
"<tr><th>Wr</th><td>Number of bytes transfered</td></tr>\n"
"<tr><th>Wr</th><td>Number of bytes transferred</td></tr>\n"
"<tr><th>Rd</th><td>Number of bytes read</td></tr>\n"
"</table>", r);

2
modules/proxy/mod_proxy.h
View File

@@ -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];

4
modules/proxy/proxy_ajp.c
View File

@@ -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

14
modules/proxy/proxy_http.c
View File

@@ -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;

4
test/zb.c
View File

@@ -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) {