diff options
| author | Stefan Fritsch <sf@sfritsch.de> | 2012-04-15 19:45:13 +0200 |
|---|---|---|
| committer | Stefan Fritsch <sf@sfritsch.de> | 2012-04-15 19:45:13 +0200 |
| commit | 8f9c15530d0bc387af114619b3ff3f930eb23d3c (patch) | |
| tree | f1d28a9206f9e18ed11c9d2bf302f0fb924b79c0 /server/util_script.c | |
| parent | 212cb6c2dcb419aaa6c848406136ec05e98c8632 (diff) | |
| download | apache2-8f9c15530d0bc387af114619b3ff3f930eb23d3c.tar.gz | |
Import httpd-2.4.2.tar.bz2upstream/2.4.2
Diffstat (limited to 'server/util_script.c')
| -rw-r--r-- | server/util_script.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/server/util_script.c b/server/util_script.c index 3f7d847a..18c4aea4 100644 --- a/server/util_script.c +++ b/server/util_script.c @@ -682,6 +682,7 @@ static int getsfunc_BRIGADE(char *buf, int len, void *arg) rv = apr_bucket_read(e, &bucket_data, &bucket_data_len, APR_BLOCK_READ); if (rv != APR_SUCCESS || (bucket_data_len == 0)) { + *dst = '\0'; return APR_STATUS_IS_TIMEUP(rv) ? -1 : 0; } src = bucket_data; @@ -738,8 +739,10 @@ static int getsfunc_STRING(char *w, int len, void *pvastrs) const char *p; int t; - if (!strs->curpos || !*strs->curpos) + if (!strs->curpos || !*strs->curpos) { + w[0] = '\0'; return 0; + } p = ap_strchr_c(strs->curpos, '\n'); if (p) ++p; |
