Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

'ap_getword_conf' does not return NULL but an empty string if nothing…

… could be gotten.

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
  • Loading branch information...
commit 6c2bbfc20a9daea553699e79e9e42fce4a7af100 1 parent e34b0f1
Christophe Jaillet authored
Showing with 2 additions and 2 deletions.
  1. +2 −2 os/unix/unixd.c
View
4 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);
}
Please sign in to comment.
Something went wrong with that request. Please try again.