httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jwool...@apache.org
Subject svn commit: r111858 - in httpd/httpd/trunk: . docs/manual/mod modules/aaa modules/proxy test
Date Tue, 14 Dec 2004 18:58:27 GMT
Author: jwoolley
Date: Tue Dec 14 10:58:25 2004
New Revision: 111858

URL: http://svn.apache.org/viewcvs?view=rev&rev=111858
Log:
"transfered" is not a word.

s/transfered/transferred/g;


Modified:
   httpd/httpd/trunk/CHANGES
   httpd/httpd/trunk/docs/manual/mod/mod_rewrite.html.en
   httpd/httpd/trunk/docs/manual/mod/mod_rewrite.xml
   httpd/httpd/trunk/modules/aaa/mod_auth_digest.c
   httpd/httpd/trunk/modules/proxy/mod_proxy.c
   httpd/httpd/trunk/modules/proxy/mod_proxy.h
   httpd/httpd/trunk/modules/proxy/proxy_ajp.c
   httpd/httpd/trunk/modules/proxy/proxy_http.c
   httpd/httpd/trunk/test/zb.c

Modified: httpd/httpd/trunk/CHANGES
Url: http://svn.apache.org/viewcvs/httpd/httpd/trunk/CHANGES?view=diff&rev=111858&p1=httpd/httpd/trunk/CHANGES&r1=111857&p2=httpd/httpd/trunk/CHANGES&r2=111858
==============================================================================
--- httpd/httpd/trunk/CHANGES	(original)
+++ httpd/httpd/trunk/CHANGES	Tue Dec 14 10:58:25 2004
@@ -9264,7 +9264,7 @@
 
   *) 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
 

Modified: httpd/httpd/trunk/docs/manual/mod/mod_rewrite.html.en
Url: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/manual/mod/mod_rewrite.html.en?view=diff&rev=111858&p1=httpd/httpd/trunk/docs/manual/mod/mod_rewrite.html.en&r1=111857&p2=httpd/httpd/trunk/docs/manual/mod/mod_rewrite.html.en&r2=111858
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_rewrite.html.en	(original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_rewrite.html.en	Tue Dec 14 10:58:25 2004
@@ -256,7 +256,7 @@
       <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 @@
 </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>

Modified: httpd/httpd/trunk/docs/manual/mod/mod_rewrite.xml
Url: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/manual/mod/mod_rewrite.xml?view=diff&rev=111858&p1=httpd/httpd/trunk/docs/manual/mod/mod_rewrite.xml&r1=111857&p2=httpd/httpd/trunk/docs/manual/mod/mod_rewrite.xml&r2=111858
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_rewrite.xml	(original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_rewrite.xml	Tue Dec 14 10:58:25 2004
@@ -242,7 +242,7 @@
       <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"

Modified: httpd/httpd/trunk/modules/aaa/mod_auth_digest.c
Url: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/aaa/mod_auth_digest.c?view=diff&rev=111858&p1=httpd/httpd/trunk/modules/aaa/mod_auth_digest.c&r1=111857&p2=httpd/httpd/trunk/modules/aaa/mod_auth_digest.c&r2=111858
==============================================================================
--- httpd/httpd/trunk/modules/aaa/mod_auth_digest.c	(original)
+++ httpd/httpd/trunk/modules/aaa/mod_auth_digest.c	Tue Dec 14 10:58:25 2004
@@ -669,7 +669,7 @@
 /*
  * 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

Modified: httpd/httpd/trunk/modules/proxy/mod_proxy.c
Url: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/proxy/mod_proxy.c?view=diff&rev=111858&p1=httpd/httpd/trunk/modules/proxy/mod_proxy.c&r1=111857&p2=httpd/httpd/trunk/modules/proxy/mod_proxy.c&r2=111858
==============================================================================
--- httpd/httpd/trunk/modules/proxy/mod_proxy.c	(original)
+++ httpd/httpd/trunk/modules/proxy/mod_proxy.c	Tue Dec 14 10:58:25 2004
@@ -1724,7 +1724,7 @@
             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 @@
              "<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);
 

Modified: httpd/httpd/trunk/modules/proxy/mod_proxy.h
Url: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/proxy/mod_proxy.h?view=diff&rev=111858&p1=httpd/httpd/trunk/modules/proxy/mod_proxy.h&r1=111857&p2=httpd/httpd/trunk/modules/proxy/mod_proxy.h&r2=111858
==============================================================================
--- httpd/httpd/trunk/modules/proxy/mod_proxy.h	(original)
+++ httpd/httpd/trunk/modules/proxy/mod_proxy.h	Tue Dec 14 10:58:25 2004
@@ -242,7 +242,7 @@
     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];

Modified: httpd/httpd/trunk/modules/proxy/proxy_ajp.c
Url: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/proxy/proxy_ajp.c?view=diff&rev=111858&p1=httpd/httpd/trunk/modules/proxy/proxy_ajp.c&r1=111857&p2=httpd/httpd/trunk/modules/proxy/proxy_ajp.c&r2=111858
==============================================================================
--- httpd/httpd/trunk/modules/proxy/proxy_ajp.c	(original)
+++ httpd/httpd/trunk/modules/proxy/proxy_ajp.c	Tue Dec 14 10:58:25 2004
@@ -193,7 +193,7 @@
                              conn->worker->hostname);
                 return HTTP_SERVICE_UNAVAILABLE;
             }
-            conn->worker->s->transfered += bufsiz;
+            conn->worker->s->transferred += bufsiz;
         }
     }
 
@@ -249,7 +249,7 @@
                                      "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

Modified: httpd/httpd/trunk/modules/proxy/proxy_http.c
Url: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/proxy/proxy_http.c?view=diff&rev=111858&p1=httpd/httpd/trunk/modules/proxy/proxy_http.c&r1=111857&p2=httpd/httpd/trunk/modules/proxy/proxy_http.c&r2=111858
==============================================================================
--- httpd/httpd/trunk/modules/proxy/proxy_http.c	(original)
+++ httpd/httpd/trunk/modules/proxy/proxy_http.c	Tue Dec 14 10:58:25 2004
@@ -250,7 +250,7 @@
     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 @@
     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 @@
                       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;

Modified: httpd/httpd/trunk/test/zb.c
Url: http://svn.apache.org/viewcvs/httpd/httpd/trunk/test/zb.c?view=diff&rev=111858&p1=httpd/httpd/trunk/test/zb.c&r1=111857&p2=httpd/httpd/trunk/test/zb.c&r2=111858
==============================================================================
--- httpd/httpd/trunk/test/zb.c	(original)
+++ httpd/httpd/trunk/test/zb.c	Tue Dec 14 10:58:25 2004
@@ -202,8 +202,8 @@
   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) {

Mime
View raw message