Changeset 2172

Timestamp:

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

Author:

moo

Message:

sync the "if" logic block with mod_fastcgi to make the indention same

Files:

• branches/lighttpd-1.4.x/src/mod_scgi.c (modified) (4 diffs)

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

@@ -2673 +2673 @@
         buffer *fn;
         scgi_extension *extension = NULL;
+        scgi_extension_host *host = NULL;
 
         /* Possibly, we processed already this request */
@@ -2727 +2728 @@
 
         /* found a server */
-        if (ndx != -1) {
-                scgi_extension_host *host = extension->hosts[ndx];
-
-                /*
-                 * if check-local is disabled, use the uri.path handler
-                 *
-                 */
-
-                /* init handler-context */
-                if (uri_path_handler) {
-                        if (host->check_local == 0) {
-                                handler_ctx *hctx;
-                                char *pathinfo;
-
-                                hctx = handler_ctx_init();
-
-                                hctx->remote_conn      = con;
-                                hctx->plugin_data      = p;
-                                hctx->host             = host;
-                                hctx->proc             = NULL;
-
-                                hctx->conf.exts        = p->conf.exts;
-                                hctx->conf.debug       = p->conf.debug;
-
-                                con->plugin_ctx[p->id] = hctx;
-
-                                host->load++;
-
-                                con->mode = p->id;
-
-                                if (con->conf.log_request_handling) {
-                                        log_error_write(srv, __FILE__, __LINE__, "s", "handling it in mod_scgi");
-                                }
-
-                                /* the prefix is the SCRIPT_NAME,
-                                 * everthing from start to the next slash
-                                 * this is important for check-local = "disable"
-                                 *
-                                 * if prefix = /admin.fcgi
-                                 *
-                                 * /admin.fcgi/foo/bar
-                                 *
-                                 * SCRIPT_NAME = /admin.fcgi
-                                 * PATH_INFO   = /foo/bar
-                                 *
-                                 * if prefix = /fcgi-bin/
-                                 *
-                                 * /fcgi-bin/foo/bar
-                                 *
-                                 * SCRIPT_NAME = /fcgi-bin/foo
-                                 * PATH_INFO   = /bar
-                                 *
-                                 */
-
-                                /* the rewrite is only done for /prefix/? matches */
-                                if (extension->key->ptr[0] == '/' &&
-                                    con->uri.path->used > extension->key->used &&
-                                    NULL != (pathinfo = strchr(con->uri.path->ptr + extension->key->used - 1, '/'))) {
-                                        /* rewrite uri.path and pathinfo */
-
-                                        buffer_copy_string(con->request.pathinfo, pathinfo);
-
-                                        con->uri.path->used -= con->request.pathinfo->used - 1;
-                                        con->uri.path->ptr[con->uri.path->used - 1] = '\0';
-                                }
-                        }
-                        return HANDLER_GO_ON;
-                } else {
+        if (ndx == -1) {
+                /* no handler found */
+                buffer_reset(con->physical.path);
+                con->http_status = 500;
+
+                log_error_write(srv, __FILE__, __LINE__,  "sb",
+                                "no fcgi-handler found for:",
+                                fn);
+
+                return HANDLER_FINISHED;
+        }
+
+        host = extension->hosts[ndx];
+
+        /*
+         * if check-local is disabled, use the uri.path handler
+         *
+         */
+
+        /* init handler-context */
+        if (uri_path_handler) {
+                if (host->check_local == 0) {
                         handler_ctx *hctx;
+                        char *pathinfo;
+
                         hctx = handler_ctx_init();
 
@@ -2801 +2758 @@
                         hctx->plugin_data      = p;
                         hctx->host             = host;
-                        hctx->proc             = NULL;
+                        hctx->proc             = NULL;
 
                         hctx->conf.exts        = p->conf.exts;
@@ -2813 +2770 @@
 
                         if (con->conf.log_request_handling) {
-                                log_error_write(srv, __FILE__, __LINE__, "s", "handling it in mod_fastcgi");
-                        }
-
-                        return HANDLER_GO_ON;
-                }
+                                log_error_write(srv, __FILE__, __LINE__, "s", "handling it in mod_scgi");
+                        }
+
+                        /* the prefix is the SCRIPT_NAME,
+                         * everthing from start to the next slash
+                         * this is important for check-local = "disable"
+                         *
+                         * if prefix = /admin.fcgi
+                         *
+                         * /admin.fcgi/foo/bar
+                         *
+                         * SCRIPT_NAME = /admin.fcgi
+                         * PATH_INFO   = /foo/bar
+                         *
+                         * if prefix = /fcgi-bin/
+                         *
+                         * /fcgi-bin/foo/bar
+                         *
+                         * SCRIPT_NAME = /fcgi-bin/foo
+                         * PATH_INFO   = /bar
+                         *
+                         */
+
+                        /* the rewrite is only done for /prefix/? matches */
+                        if (extension->key->ptr[0] == '/' &&
+                            con->uri.path->used > extension->key->used &&
+                            NULL != (pathinfo = strchr(con->uri.path->ptr + extension->key->used - 1, '/'))) {
+                                /* rewrite uri.path and pathinfo */
+
+                                buffer_copy_string(con->request.pathinfo, pathinfo);
+
+                                con->uri.path->used -= con->request.pathinfo->used - 1;
+                                con->uri.path->ptr[con->uri.path->used - 1] = '\0';
+                        }
+                }
+                return HANDLER_GO_ON;
         } else {
-                /* no handler found */
-                buffer_reset(con->physical.path);
-                con->http_status = 500;
-
-                log_error_write(srv, __FILE__, __LINE__,  "sb",
-                                "no fcgi-handler found for:",
-                                fn);
-
-                return HANDLER_FINISHED;
+                handler_ctx *hctx;
+                hctx = handler_ctx_init();
+
+                hctx->remote_conn      = con;
+                hctx->plugin_data      = p;
+                hctx->host             = host;
+                hctx->proc             = NULL;
+
+                hctx->conf.exts        = p->conf.exts;
+                hctx->conf.debug       = p->conf.debug;
+
+                con->plugin_ctx[p->id] = hctx;
+
+                host->load++;
+
+                con->mode = p->id;
+
+                if (con->conf.log_request_handling) {
+                        log_error_write(srv, __FILE__, __LINE__, "s", "handling it in mod_fastcgi");
+                }
+
+                return HANDLER_GO_ON;
         }
         return HANDLER_GO_ON;