httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s.@apache.org
Subject svn commit: r1180687 - in /httpd/httpd/trunk: modules/aaa/mod_auth_form.c modules/cache/mod_cache_disk.c modules/filters/mod_buffer.c modules/filters/mod_request.c server/mpm_common.c
Date Sun, 09 Oct 2011 18:58:22 GMT
Author: sf
Date: Sun Oct  9 18:58:21 2011
New Revision: 1180687

URL: http://svn.apache.org/viewvc?rev=1180687&view=rev
Log:
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.

Modified:
    httpd/httpd/trunk/modules/aaa/mod_auth_form.c
    httpd/httpd/trunk/modules/cache/mod_cache_disk.c
    httpd/httpd/trunk/modules/filters/mod_buffer.c
    httpd/httpd/trunk/modules/filters/mod_request.c
    httpd/httpd/trunk/server/mpm_common.c

Modified: httpd/httpd/trunk/modules/aaa/mod_auth_form.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/aaa/mod_auth_form.c?rev=1180687&r1=1180686&r2=1180687&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/aaa/mod_auth_form.c (original)
+++ httpd/httpd/trunk/modules/aaa/mod_auth_form.c Sun Oct  9 18:58:21 2011
@@ -277,7 +277,7 @@ static const char *set_cookie_form_size(
     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.";
     }

Modified: httpd/httpd/trunk/modules/cache/mod_cache_disk.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/cache/mod_cache_disk.c?rev=1180687&r1=1180686&r2=1180687&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/cache/mod_cache_disk.c (original)
+++ httpd/httpd/trunk/modules/cache/mod_cache_disk.c Sun Oct  9 18:58:21 2011
@@ -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.";

Modified: httpd/httpd/trunk/modules/filters/mod_buffer.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/filters/mod_buffer.c?rev=1180687&r1=1180686&r2=1180687&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/filters/mod_buffer.c (original)
+++ httpd/httpd/trunk/modules/filters/mod_buffer.c Sun Oct  9 18:58:21 2011
@@ -311,7 +311,7 @@ static void *merge_buffer_config(apr_poo
 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";
     }

Modified: httpd/httpd/trunk/modules/filters/mod_request.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/filters/mod_request.c?rev=1180687&r1=1180686&r2=1180687&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/filters/mod_request.c (original)
+++ httpd/httpd/trunk/modules/filters/mod_request.c Sun Oct  9 18:58:21 2011
@@ -357,7 +357,7 @@ static const char *set_kept_body_size(cm
     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.";
     }

Modified: httpd/httpd/trunk/server/mpm_common.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm_common.c?rev=1180687&r1=1180686&r2=1180687&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm_common.c (original)
+++ httpd/httpd/trunk/server/mpm_common.c Sun Oct  9 18:58:21 2011
@@ -372,7 +372,7 @@ const char *ap_mpm_set_max_mem_free(cmd_
         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(
         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);



Mime
View raw message