Changeset 1858

Timestamp:

05/24/2007 01:05:37 AM (17 months ago)

Author:

moo

Message:

applied patch from #1195

Location:

trunk/src

Files:

• configfile.c (modified) (1 diff)
• mod_magnet.c (modified) (1 diff)
• mod_proxy.c (modified) (2 diffs)
• mod_proxy_core.c (modified) (11 diffs)
• response.c (modified) (1 diff)

trunk/src/configfile.c

@@ -1244 +1244 @@
                 if (FDEVENT_HANDLER_UNSET == srv->event_handler) {
                         log_error_write(srv, __FILE__, __LINE__, "sb",
-                                        "the selected event-handler in unknown or not supported:",
+                                        "the selected event-handler is unknown or not supported:",
                                         srv->srvconf.event_handler );
 

trunk/src/mod_magnet.c

@@ -709 +709 @@
          * lighty.request[] has the HTTP-request headers
          * lighty.content[] is a table of string/file
-         * lighty.header[] is a array to set response headers
+         * lighty.header[] is an array to set response headers
          */
 

trunk/src/mod_proxy.c

@@ -53 +53 @@
  *
  * TODO:      - delay upstream read if write_queue is too large
- *              (to prevent memory eating, like in apache). Shoud be
+ *              (to prevent memory eating, like in apache). Should be
  *              configurable).
  *            - persistent connection with upstream servers
@@ -942 +942 @@
                 case -1:
                         if (con->file_started == 0) {
-                                /* nothing has been send out yet, send a 500 */
+                                /* nothing has been sent out yet, send a 500 */
                                 con->http_status = 500;
                                 con->mode = DIRECT;

trunk/src/mod_proxy_core.c

@@ -323 +323 @@
                                 s->balancer = di->value;
                         } else {
-                                ERROR("proxy.balance has to be on of 'round-robin', 'carp', 'sqf', 'static' got %s", BUF_STR(p->balance_buf));
+                                ERROR("proxy.balance has to be one of 'round-robin', 'carp', 'sqf', 'static': got %s", BUF_STR(p->balance_buf));
                                 return HANDLER_ERROR;
                         }
@@ -331 +331 @@
                         proxy_protocol *protocol = NULL;
                         if (NULL == (protocol = proxy_get_protocol(p->protocol_buf))) {
-                                ERROR("proxy.protocol has to be on of { %s } got %s, you might have to load 'mod_proxy_backend_%s'",
+                                ERROR("proxy.protocol has to be one of { %s } got %s, you might have to load 'mod_proxy_backend_%s'",
                                                 proxy_available_protocols(),
                                                 BUF_STR(p->protocol_buf),
@@ -1023 +1023 @@
                 switch (srv->network_backend_read(srv, con, proxy_con->sock, proxy_con->recv)) {
                 case NETWORK_STATUS_CONNECTION_CLOSE:
-                        /* a close here mean we can't read/write anymore data. */
+                        /* a close here means we can't read/write any more data. */
                         sess->is_closed = 1;
                         proxy_con->send->is_closed = 1;
@@ -1077 +1077 @@
 
         /**
-         * on NETWORK_STATUS_WAIT_FOR_AIO_EVENT we are no allowed to call the state-engine 
+         * on NETWORK_STATUS_WAIT_FOR_AIO_EVENT we are not allowed to call the state-engine 
          * the connection has to sleep until our disk-read is finished 
          *
@@ -1105 +1105 @@
 
         /* the backend might have been disabled by a full connection pool, re-enable
-         * if there is atleast one active address.
+         * if there is at least one active address.
          */
         if (sess->proxy_backend->disabled_addresses <= sess->proxy_backend->address_pool->used) {
@@ -1124 +1124 @@
 
 /**
- * Recycle packend proxy connection.
+ * Recycle backend proxy connection.
  * 
  * 1. close the connection if keep-alive is disable
@@ -1179 +1179 @@
 
                 case PROXY_CONNECTION_STATE_CLOSED:
-                /* user terminate connection and proxy connection is still in CONNECTING mode.
-                 * this happends frequently when backends are slow
+                /* user terminated connection and proxy connection is still in CONNECTING mode.
+                 * this happens frequently when backends are slow
                  */
                 case PROXY_CONNECTION_STATE_CONNECTING: 
@@ -2260 +2260 @@
                 return HANDLER_GO_ON;
         case PROXY_STATE_CONNECTING:
-                /* this connections is waited 10 seconds to connect to the backend
+                /* this connections has waited 10 seconds to connect to the backend
                  * and didn't got a successful connection yet, sending timeout */
                 if (srv->cur_ts - sess->connect_start_ts > 10) {
@@ -2310 +2310 @@
                                 }
 
-                                /* no, not really a event,
+                                /* no, not really an event,
                                  * we just want to block the outer loop from stepping forward
                                  *
@@ -2344 +2344 @@
                                 }
 
-                                /* no, not really a event,
+                                /* no, not really an event,
                                  * we just want to block the outer loop from stepping forward
                                  *
@@ -2367 +2367 @@
                                 }
 
-                                /* no, not really a event,
+                                /* no, not really an event,
                                  * we just want to block the outer loop from stepping forward
                                  *

trunk/src/response.c

@@ -274 +274 @@
 
                 if (con->conf.log_request_handling) {
-                        TRACE("-- %s", "sanatising URI");
+                        TRACE("-- %s", "sanitizing URI");
                         TRACE("URI-path     : %s", BUF_STR(con->uri.path));
                 }