Changeset 2173

Timestamp:

05/22/2008 03:41:17 AM (3 months ago)

Author:

moo

Message:

sync code between fastcgi->scgi: copy note_is_sent, fix typos

Location:

branches/lighttpd-1.4.x/src

Files:

• mod_fastcgi.c (modified) (1 diff)
• mod_scgi.c (modified) (6 diffs)

branches/lighttpd-1.4.x/src/mod_fastcgi.c

@@ -3504 +3504 @@
         /* check if we have at least one server for this extension up and running */
         for (k = 0; k < extension->used; k++) {
-                host = extension->hosts[k];
+                fcgi_extension_host *h = extension->hosts[k];
 
                 /* we should have at least one proc that can do something */
-                if (host->active_procs == 0) {
-                        host = NULL;
-
+                if (h->active_procs == 0) {
                         continue;
                 }
 
                 /* we found one host that is alive */
+                host = h;
                 break;
         }

branches/lighttpd-1.4.x/src/mod_scgi.c

@@ -234 +234 @@
         buffer *key; /* like .php */
 
+        int note_is_sent;
         scgi_extension_host **hosts;
 
@@ -2669 +2670 @@
         size_t s_len;
         int used = -1;
-        int ndx;
         size_t k;
         buffer *fn;
@@ -2714 +2714 @@
 
         /* get best server */
-        for (k = 0, ndx = -1; k < extension->used; k++) {
-                scgi_extension_host *host = extension->hosts[k];
-
-                /* we should have at least one proc that can do somthing */
-                if (host->active_procs == 0) continue;
-
-                if (used == -1 || host->load < used) {
-                        used = host->load;
-
-                        ndx = k;
-                }
-        }
-
-        /* found a server */
-        if (ndx == -1) {
-                /* no handler found */
+        for (k = 0; k < extension->used; k++) {
+                scgi_extension_host *h = extension->hosts[k];
+
+                /* we should have at least one proc that can do something */
+                if (h->active_procs == 0) {
+                        continue;
+                }
+
+                if (used == -1 || h->load < used) {
+                        used = h->load;
+
+                        host = h;
+                }
+        }
+
+        if (!host) {
+                /* sorry, we don't have a server alive for this ext */
                 buffer_reset(con->physical.path);
                 con->http_status = 500;
 
-                log_error_write(srv, __FILE__, __LINE__,  "sb",
-                                "no fcgi-handler found for:",
-                                fn);
+                /* only send the 'no handler' once */
+                if (!extension->note_is_sent) {
+                        extension->note_is_sent = 1;
+
+                        log_error_write(srv, __FILE__, __LINE__, "sbsbs",
+                                        "all handlers for ", con->uri.path,
+                                        "on", extension->key,
+                                        "are down.");
+                }
 
                 return HANDLER_FINISHED;
         }
 
-        host = extension->hosts[ndx];
+        /* a note about no handler is not sent yet */
+        extension->note_is_sent = 0;
 
         /*
@@ -2770 +2778 @@
 
                         if (con->conf.log_request_handling) {
-                                log_error_write(srv, __FILE__, __LINE__, "s", "handling it in mod_scgi");
+                                log_error_write(srv, __FILE__, __LINE__, "s",
+                                "handling it in mod_fastcgi");
                         }
 
                         /* the prefix is the SCRIPT_NAME,
-                         * everthing from start to the next slash
+                         * everything from start to the next slash
                          * this is important for check-local = "disable"
                          *
@@ -2805 +2814 @@
                         }
                 }
-                return HANDLER_GO_ON;
         } else {
                 handler_ctx *hctx;
@@ -2827 +2835 @@
                         log_error_write(srv, __FILE__, __LINE__, "s", "handling it in mod_fastcgi");
                 }
-
-                return HANDLER_GO_ON;
-        }
+        }
+
         return HANDLER_GO_ON;
 }