diff options
| author | Stefan Fritsch <sf@sfritsch.de> | 2014-03-29 21:56:19 +0100 |
|---|---|---|
| committer | Stefan Fritsch <sf@sfritsch.de> | 2014-03-29 21:56:45 +0100 |
| commit | 2a463b3cd73c32ee9dcd508248d0194923f435f4 (patch) | |
| tree | 2ff478255a77a55031056790918b6f983bb7b20a /modules/core | |
| parent | 86d5cc79d9d6750da8771fdb0c9ab22c19b8ad45 (diff) | |
| download | apache2-2a463b3cd73c32ee9dcd508248d0194923f435f4.tar.gz | |
Imported Upstream version 2.4.9upstream/2.4.9
Diffstat (limited to 'modules/core')
| -rw-r--r-- | modules/core/mod_macro.c | 4 | ||||
| -rw-r--r-- | modules/core/mod_watchdog.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/modules/core/mod_macro.c b/modules/core/mod_macro.c index ad730054..75180930 100644 --- a/modules/core/mod_macro.c +++ b/modules/core/mod_macro.c @@ -15,7 +15,7 @@ */ /* - $Id: mod_macro.c 1455215 2013-03-11 16:28:43Z jim $ + $Id: mod_macro.c 1562134 2014-01-28 18:11:59Z jim $ */ #include "httpd.h" @@ -468,7 +468,7 @@ static const char *process_content(apr_pool_t * pool, int i; if (result) { - *result = apr_array_make(pool, 1, sizeof(char *)); + *result = apr_array_make(pool, contents->nelts, sizeof(char *)); } /* for each line of the macro body */ diff --git a/modules/core/mod_watchdog.c b/modules/core/mod_watchdog.c index 7ad13bf8..dfdff2f9 100644 --- a/modules/core/mod_watchdog.c +++ b/modules/core/mod_watchdog.c @@ -388,7 +388,7 @@ static apr_status_t ap_watchdog_register_callback(ap_watchdog_t *w, /* */ /* Pre config hook. */ /* Create default watchdogs for parent and child */ -/* Parent watchdog executes inside parent proces so it doesn't need the */ +/* Parent watchdog executes inside parent process so it doesn't need the */ /* singleton mutex */ /* */ /*--------------------------------------------------------------------------*/ |