You are viewing a plain text version of this content. The canonical link for it is here.
Posted to mod_python-commits@quetz.apache.org by gr...@apache.org on 2003/10/15 05:00:31 UTC
cvs commit: httpd-python/test test.py
grisha 2003/10/14 20:00:31
Modified: src mod_python.c
test test.py
Log:
Worker can return -1 for max_daemons, adjust for that, also add
load module mod_auth to the tests.
Revision Changes Path
1.104 +3 -3 httpd-python/src/mod_python.c
Index: mod_python.c
===================================================================
RCS file: /home/cvs/httpd-python/src/mod_python.c,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- mod_python.c 10 Oct 2003 14:16:18 -0000 1.103
+++ mod_python.c 15 Oct 2003 03:00:31 -0000 1.104
@@ -342,8 +342,8 @@
if (is_forked != AP_MPMQ_NOT_SUPPORTED) {
ap_mpm_query(AP_MPMQ_MAX_DAEMON_USED, &max_procs);
}
- max_clients = (((!max_threads) ? 1 : max_threads) *
- ((!max_procs) ? 1 : max_procs));
+ max_clients = (((max_threads <= 0) ? 1 : max_threads) *
+ ((max_procs <= 0) ? 1 : max_procs));
locks = max_clients; /* XXX this is completely out of the blue */
ap_log_error(APLOG_MARK, APLOG_NOTICE, 0, s,
1.39 +5 -2 httpd-python/test/test.py
Index: test.py
===================================================================
RCS file: /home/cvs/httpd-python/test/test.py,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- test.py 8 Oct 2003 03:48:17 -0000 1.38
+++ test.py 15 Oct 2003 03:00:31 -0000 1.39
@@ -264,7 +264,10 @@
ServerName("127.0.0.1"),
Listen(PORT),
DocumentRoot(DOCUMENT_ROOT),
- LoadModule("python_module %s" % MOD_PYTHON_SO))
+ LoadModule("python_module %s" % MOD_PYTHON_SO),
+ IfModule("!mod_auth.c",
+ LoadModule("auth_module %s" %
+ quoteIfSpace(os.path.join(modpath, "mod_auth.so")))))
f = open(CONFIG, "w")
f.write(str(s))