On Mon, 17 Mar 2008, Piotr Gackiewicz wrote:

        init_server_config(p, config);
+ +     config->ipc_comm_timeout=-1;
+       config->ipc_connect_timeout=-1;
+       config->busy_timeout=-1;
+


Uh, something broke this patch in my editor :-/ Correct one below:

[cut]
diff -ru mod_fcgid.2.2/fcgid_conf.c mod_fcgid.2.2-patched/fcgid_conf.c
--- mod_fcgid.2.2/fcgid_conf.c  2007-07-31 11:09:20.000000000 +0200
+++ mod_fcgid.2.2-patched/fcgid_conf.c  2008-03-04 15:04:51.000000000 +0100
@@ -68,6 +68,11 @@
        fcgid_server_conf *config = apr_pcalloc(p, sizeof(*config));

        init_server_config(p, config);
+ + config->ipc_comm_timeout=-1;
+       config->ipc_connect_timeout=-1;
+       config->busy_timeout=-1;
+
        return config;
 }

@@ -125,14 +130,21 @@
                                                  local->pass_headers);
        }
        // Merge the other configurations
-       merged_config->ipc_comm_timeout = base->ipc_comm_timeout;
-       merged_config->ipc_comm_timeout = local->ipc_comm_timeout;

-       merged_config->ipc_connect_timeout = base->ipc_connect_timeout;
-       merged_config->ipc_connect_timeout = local->ipc_connect_timeout;
-
-       merged_config->busy_timeout = base->busy_timeout;
-       merged_config->busy_timeout = local->busy_timeout;
+       if (base->ipc_comm_timeout>=0)
+               merged_config->ipc_comm_timeout = base->ipc_comm_timeout;
+       if (local->ipc_comm_timeout>=0)
+               merged_config->ipc_comm_timeout = local->ipc_comm_timeout;
+
+       if (base->ipc_connect_timeout>=0)
+               merged_config->ipc_connect_timeout = base->ipc_connect_timeout;
+       if (local->ipc_connect_timeout>=0)
+               merged_config->ipc_connect_timeout = local->ipc_connect_timeout;
+
+       if (base->busy_timeout>=0)
+               merged_config->busy_timeout = base->busy_timeout;
+       if (local->busy_timeout>=0)
+               merged_config->busy_timeout = local->busy_timeout;

        return merged_config;
 }
[cut]
--
Piotr Gackiewicz
Intertele S.A. - operator systemów ITL.PL i DOMENY.ITL.PL
al. T. Rejtana 1, 35-326 Rzeszów
TEL: +48 17 8507580, FAX: +48 17 8520275, INFOLINIA: 0 801 335523

http://www.itl.pl       - niezawodne serwery wirtualne
http://domeny.itl.pl    - tanie domeny internetowe
http://www.intertele.pl
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Mod-fcgid-users mailing list
Mod-fcgid-users@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/mod-fcgid-users

Reply via email to