Author: jfrederic.clere(a)jboss.com Date: 2008-05-26 11:10:16 -0400 (Mon, 26 May 2008) New Revision: 1618 Modified: trunk/mod_cluster/native/mod_manager/mod_manager.c Log: Arrange buff size and error message. Modified: trunk/mod_cluster/native/mod_manager/mod_manager.c =================================================================== --- trunk/mod_cluster/native/mod_manager/mod_manager.c 2008-05-26 14:17:41 UTC (rev 1617) +++ trunk/mod_cluster/native/mod_manager/mod_manager.c 2008-05-26 15:10:16 UTC (rev 1618) @@ -62,7 +62,7 @@ #define STYPBIG "SYNTAX: Type field too big" #define SALIBAD "SYNTAX: Alias without Context" #define SCONBAD "SYNTAX: Context without Alias" -#define SBADFLD "SYNTAX: Invalid field name in message" +#define SBADFLD "SYNTAX: Invalid field \"%s\" in message" #define SCMDUNS "SYNTAX: Command is not supported" #define TYPEMEM 2 @@ -265,13 +265,13 @@ i++; } } - ptr = apr_palloc(r->pool, sizeof(char *) * (i + 1)); + ptr = apr_palloc(r->pool, sizeof(char *) * (i + 2)); if (ptr == NULL) return NULL; s = buff; ptr[0] = s; - ptr[i] = NULL; + ptr[i+1] = NULL; i = 1; for (; *s != '\0'; s++) { if (*s == '&' || *s == '=') { @@ -711,7 +711,7 @@ } else { *errtype = TYPESYNTAX; - return SBADFLD; + return apr_psprintf(r->pool, SBADFLD, ptr[i]); } i++; i++; @@ -813,7 +813,7 @@ return DECLINED; /* Use a buffer to read the message */ - buff = apr_palloc(r->pool, MAXMESSSIZE); + buff = apr_pcalloc(r->pool, MAXMESSSIZE); input_brigade = apr_brigade_create(r->connection->pool, r->connection->bucket_alloc); ap_get_brigade(r->input_filters, input_brigade, AP_MODE_READBYTES, APR_BLOCK_READ, MAXMESSSIZE); apr_brigade_flatten(input_brigade, buff, &bufsiz);