"transfered" is not a word.

s/transfered/transferred/g;

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@111858 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index f99737d7595a0fe8448bfaffd9b968877a7f1dbc..b6e946cf1910198a9ccf0b863f18f5a20878fdfa 100644 (file)
--- 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 <glenebob nwlink.com>] PR#2277
 

diff --git a/docs/manual/mod/mod_rewrite.html.en b/docs/manual/mod/mod_rewrite.html.en
index 59425bcf27bc3b6ff92d50438f401ef17a926184..9407244a2a9fc101c9952228c795b7a4d228f979 100644 (file)
--- a/docs/manual/mod/mod_rewrite.html.en
+++ b/docs/manual/mod/mod_rewrite.html.en
@@ -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 />
@@ -1791,4 +1791,4 @@ RewriteRule  ^/([^/]+)/~([^/]+)/(.*)$   /u/${real-to-user:$2|nobody}/$3.$1
 </div><div id="footer">
 <p class="apache">Copyright 1999-2004 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
-</body></html>
\ No newline at end of file
+</body></html>

diff --git a/docs/manual/mod/mod_rewrite.xml b/docs/manual/mod/mod_rewrite.xml
index 9cf2ec915992d01a20fa653b3d3514f38b226879..186a18ada864e477fe3a4dbeea8d74d4d96e9d34 100644 (file)
--- a/docs/manual/mod/mod_rewrite.xml
+++ b/docs/manual/mod/mod_rewrite.xml
@@ -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"

diff --git a/modules/aaa/mod_auth_digest.c b/modules/aaa/mod_auth_digest.c
index 78b4fbc8d9875be47b52900eefb71b44913405a2..44c1060cbc515b54cbb3f44dee47485bc85fb38e 100644 (file)
--- a/modules/aaa/mod_auth_digest.c
+++ b/modules/aaa/mod_auth_digest.c
@@ -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

diff --git a/modules/proxy/mod_proxy.c b/modules/proxy/mod_proxy.c
index e2fcb78f19b216299be7e48d106a75fdd6b97143..4ce39f5cb97b2dc8e46d4a16236536d3bb7da51f 100644 (file)
--- a/modules/proxy/mod_proxy.c
+++ b/modules/proxy/mod_proxy.c
@@ -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);
 

diff --git a/modules/proxy/mod_proxy.h b/modules/proxy/mod_proxy.h
index 4286cd1679e9d5709200e25eff14ad8ae90afc87..b26265f4724ad11b47ab6a0793fd0975c2dbd9ed 100644 (file)
--- 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 a8fe033e044824cf0fd6a50abf88e6606f91374f..f2760631e929a3ef537fd23aeaa540e7293c2857 100644 (file)
--- 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 46bc741ccf489ca6136d49ce9ff29ea80695747c..2fc10c17ae2930eb7de9cd0fcadf32383b5ac047 100644 (file)
--- 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 0a6666eb25d59c7007c9c513e8d751db71713dd2..93a6f6a9cb50965cbbcd3f43954b1459cf9c70cd 100644 (file)
--- 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) {