From 6625c31ba1211386c4b6d49711e0e7db31017320 Mon Sep 17 00:00:00 2001 From: Christophe Jaillet Date: Sun, 15 Dec 2013 07:53:09 +0000 Subject: [PATCH] 'ap_getword_conf' does not return NULL but an empty string if nothing could be got. So the message 02173 can never trigger. Actually, this is not a problem because all calls to 'ap_unixd_set_rlimit' are done in configuration parsing functions guarded with AP_INIT_TAKE12, so we are guaranteed to have something. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1551005 13f79535-47bb-0310-9956-ffa450edef68 --- os/unix/unixd.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/os/unix/unixd.c b/os/unix/unixd.c index a86630f39b..c10ea9d699 100644 --- a/os/unix/unixd.c +++ b/os/unix/unixd.c @@ -74,7 +74,7 @@ AP_DECLARE(void) ap_unixd_set_rlimit(cmd_parms *cmd, struct rlimit **plimit, return; } - if ((str = ap_getword_conf(cmd->pool, &arg))) { + if (*(str = ap_getword_conf(cmd->pool, &arg)) != '\0') { if (!strcasecmp(str, "max")) { cur = limit->rlim_max; } @@ -88,7 +88,7 @@ AP_DECLARE(void) ap_unixd_set_rlimit(cmd_parms *cmd, struct rlimit **plimit, return; } - if (arg2 && (str = ap_getword_conf(cmd->pool, &arg2))) { + if (arg2 && (*(str = ap_getword_conf(cmd->pool, &arg2)) != '\0')) { max = atol(str); } -- 2.40.0