summaryrefslogtreecommitdiff
path: root/server/mpm
diff options
context:
space:
mode:
Diffstat (limited to 'server/mpm')
-rw-r--r--server/mpm/event/event.c11
-rw-r--r--server/mpm/worker/worker.c8
2 files changed, 17 insertions, 2 deletions
diff --git a/server/mpm/event/event.c b/server/mpm/event/event.c
index 1b42e696..c64b08f5 100644
--- a/server/mpm/event/event.c
+++ b/server/mpm/event/event.c
@@ -2126,7 +2126,13 @@ static void child_main(int child_num_arg)
apr_threadattr_detach_set(thread_attr, 0);
if (ap_thread_stacksize != 0) {
- apr_threadattr_stacksize_set(thread_attr, ap_thread_stacksize);
+ rv = apr_threadattr_stacksize_set(thread_attr, ap_thread_stacksize);
+ if (rv != APR_SUCCESS && rv != APR_ENOTIMPL) {
+ ap_log_error(APLOG_MARK, APLOG_WARNING, rv, ap_server_conf, APLOGNO(02436)
+ "WARNING: ThreadStackSize of %" APR_SIZE_T_FMT " is "
+ "inappropriate, using default",
+ ap_thread_stacksize);
+ }
}
ts->threads = threads;
@@ -3235,6 +3241,9 @@ static const char *set_worker_factor(cmd_parms * cmd, void *dummy,
if (*endptr)
return "error parsing value";
+ if (val <= 0)
+ return "AsyncRequestWorkerFactor argument must be a positive number";
+
worker_factor = val * WORKER_FACTOR_SCALE;
if (worker_factor == 0)
worker_factor = 1;
diff --git a/server/mpm/worker/worker.c b/server/mpm/worker/worker.c
index 548fcaec..4d7a92a7 100644
--- a/server/mpm/worker/worker.c
+++ b/server/mpm/worker/worker.c
@@ -1276,7 +1276,13 @@ static void child_main(int child_num_arg)
apr_threadattr_detach_set(thread_attr, 0);
if (ap_thread_stacksize != 0) {
- apr_threadattr_stacksize_set(thread_attr, ap_thread_stacksize);
+ rv = apr_threadattr_stacksize_set(thread_attr, ap_thread_stacksize);
+ if (rv != APR_SUCCESS && rv != APR_ENOTIMPL) {
+ ap_log_error(APLOG_MARK, APLOG_WARNING, rv, ap_server_conf, APLOGNO(02435)
+ "WARNING: ThreadStackSize of %" APR_SIZE_T_FMT " is "
+ "inappropriate, using default",
+ ap_thread_stacksize);
+ }
}
ts->threads = threads;