diff options
| author | Igor Pashev <pashev.igor@gmail.com> | 2014-06-01 22:02:40 +0400 |
|---|---|---|
| committer | Igor Pashev <pashev.igor@gmail.com> | 2014-06-01 22:02:40 +0400 |
| commit | 8db6d32a2a611e388e84d96201bf224036f55c73 (patch) | |
| tree | 3c3266c612a46e29f5ecd18cbe57544ec4bc5a35 /modules/core/mod_macro.c | |
| parent | f5bfca799a746109a5b14f7541c86e9b88a8e696 (diff) | |
| parent | ed0624771068963e31e0450b8556b82c96a8cf37 (diff) | |
| download | apache2-8db6d32a2a611e388e84d96201bf224036f55c73.tar.gz | |
Merge branch 'master' of git://anonscm.debian.org/pkg-apache/apache2
Conflicts:
debian/changelog
Diffstat (limited to 'modules/core/mod_macro.c')
| -rw-r--r-- | modules/core/mod_macro.c | 4 |
1 files changed, 2 insertions, 2 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 */ |