From b5aafabf6361c528edeadaf944e7dfc1b15f5a62 Mon Sep 17 00:00:00 2001 From: Stefan Fritsch Date: Sun, 9 Oct 2011 18:58:21 +0000 Subject: [PATCH] Consistently use base 10 for numbers when parsing config options. It may be confusing to the user if some directives treat a number with leading zero as octal while most don't. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1180687 13f79535-47bb-0310-9956-ffa450edef68 --- modules/aaa/mod_auth_form.c | 2 +- modules/cache/mod_cache_disk.c | 8 ++++---- modules/filters/mod_buffer.c | 2 +- modules/filters/mod_request.c | 2 +- server/mpm_common.c | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/modules/aaa/mod_auth_form.c b/modules/aaa/mod_auth_form.c index c713aac20b..1a60e2a5a1 100644 --- a/modules/aaa/mod_auth_form.c +++ b/modules/aaa/mod_auth_form.c @@ -277,7 +277,7 @@ static const char *set_cookie_form_size(cmd_parms * cmd, void *config, auth_form_config_rec *conf = config; apr_off_t size; - if (APR_SUCCESS != apr_strtoff(&size, arg, NULL, 0) + if (APR_SUCCESS != apr_strtoff(&size, arg, NULL, 10) || size < 0 || size > APR_SIZE_MAX) { return "AuthCookieFormSize must be a size in bytes, or zero."; } diff --git a/modules/cache/mod_cache_disk.c b/modules/cache/mod_cache_disk.c index 847135ce35..1ceb962bea 100644 --- a/modules/cache/mod_cache_disk.c +++ b/modules/cache/mod_cache_disk.c @@ -1396,7 +1396,7 @@ static const char { disk_cache_dir_conf *dconf = (disk_cache_dir_conf *)in_struct_ptr; - if (apr_strtoff(&dconf->minfs, arg, NULL, 0) != APR_SUCCESS || + if (apr_strtoff(&dconf->minfs, arg, NULL, 10) != APR_SUCCESS || dconf->minfs < 0) { return "CacheMinFileSize argument must be a non-negative integer representing the min size of a file to cache in bytes."; @@ -1409,7 +1409,7 @@ static const char { disk_cache_dir_conf *dconf = (disk_cache_dir_conf *)in_struct_ptr; - if (apr_strtoff(&dconf->maxfs, arg, NULL, 0) != APR_SUCCESS || + if (apr_strtoff(&dconf->maxfs, arg, NULL, 10) != APR_SUCCESS || dconf->maxfs < 0) { return "CacheMaxFileSize argument must be a non-negative integer representing the max size of a file to cache in bytes."; @@ -1422,7 +1422,7 @@ static const char { disk_cache_dir_conf *dconf = (disk_cache_dir_conf *)in_struct_ptr; - if (apr_strtoff(&dconf->readsize, arg, NULL, 0) != APR_SUCCESS || + if (apr_strtoff(&dconf->readsize, arg, NULL, 10) != APR_SUCCESS || dconf->readsize < 0) { return "CacheReadSize argument must be a non-negative integer representing the max amount of data to cache in go."; @@ -1437,7 +1437,7 @@ static const char disk_cache_dir_conf *dconf = (disk_cache_dir_conf *)in_struct_ptr; apr_off_t milliseconds; - if (apr_strtoff(&milliseconds, arg, NULL, 0) != APR_SUCCESS || + if (apr_strtoff(&milliseconds, arg, NULL, 10) != APR_SUCCESS || milliseconds < 0) { return "CacheReadTime argument must be a non-negative integer representing the max amount of time taken to cache in go."; diff --git a/modules/filters/mod_buffer.c b/modules/filters/mod_buffer.c index dac24e77f8..5e9625de22 100644 --- a/modules/filters/mod_buffer.c +++ b/modules/filters/mod_buffer.c @@ -311,7 +311,7 @@ static void *merge_buffer_config(apr_pool_t *p, void *basev, void *addv) { static const char *set_buffer_size(cmd_parms *cmd, void *dconf, const char *arg) { buffer_conf *conf = dconf; - if (APR_SUCCESS != apr_strtoff(&(conf->size), arg, NULL, 0) || conf->size + if (APR_SUCCESS != apr_strtoff(&(conf->size), arg, NULL, 10) || conf->size <= 0) { return "BufferSize must be a size in bytes, and greater than zero"; } diff --git a/modules/filters/mod_request.c b/modules/filters/mod_request.c index cebe539a19..77842c6f6d 100644 --- a/modules/filters/mod_request.c +++ b/modules/filters/mod_request.c @@ -357,7 +357,7 @@ static const char *set_kept_body_size(cmd_parms *cmd, void *dconf, request_dir_conf *conf = dconf; char *end = NULL; - if (APR_SUCCESS != apr_strtoff(&(conf->keep_body), arg, &end, 0) + if (APR_SUCCESS != apr_strtoff(&(conf->keep_body), arg, &end, 10) || conf->keep_body < 0 || end) { return "KeptBodySize must be a valid size in bytes, or zero."; } diff --git a/server/mpm_common.c b/server/mpm_common.c index aee3f18c1f..d35d349a50 100644 --- a/server/mpm_common.c +++ b/server/mpm_common.c @@ -372,7 +372,7 @@ const char *ap_mpm_set_max_mem_free(cmd_parms *cmd, void *dummy, return err; } - value = strtol(arg, NULL, 0); + value = strtol(arg, NULL, 10); if (value < 0 || errno == ERANGE) return apr_pstrcat(cmd->pool, "Invalid MaxMemFree value: ", arg, NULL); @@ -391,7 +391,7 @@ const char *ap_mpm_set_thread_stacksize(cmd_parms *cmd, void *dummy, return err; } - value = strtol(arg, NULL, 0); + value = strtol(arg, NULL, 10); if (value < 0 || errno == ERANGE) return apr_pstrcat(cmd->pool, "Invalid ThreadStackSize value: ", arg, NULL); -- 2.40.0