-const char urlmatch_rcs[] = "$Id: urlmatch.c,v 1.84 2014/06/20 09:47:10 fabiankeil Exp $";
+const char urlmatch_rcs[] = "$Id: urlmatch.c,v 1.87 2016/02/26 12:29:39 fabiankeil Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/urlmatch.c,v $
* 4 : regex = Where the compiled regex should be stored.
*
* Returns : JB_ERR_OK - Success
- * JB_ERR_MEMORY - Out of memory
* JB_ERR_PARSE - Cannot parse regex
*
*********************************************************************/
"Invalid anchoring in compile_pattern %d", anchoring);
}
- *regex = zalloc(sizeof(**regex));
- if (NULL == *regex)
- {
- free_pattern_spec(url);
- return JB_ERR_MEMORY;
- }
+ *regex = zalloc_or_die(sizeof(**regex));
snprintf(rebuf, sizeof(rebuf), fmt, pattern);
const unsigned flag;
} tag_pattern[] = {
{ "TAG:", 4, PATTERN_SPEC_TAG_PATTERN},
+ #ifdef FEATURE_CLIENT_TAGS
+ { "CLIENT-TAG:", 11, PATTERN_SPEC_CLIENT_TAG_PATTERN},
+ #endif
{ "NO-REQUEST-TAG:", 15, PATTERN_SPEC_NO_REQUEST_TAG_PATTERN},
{ "NO-RESPONSE-TAG:", 16, PATTERN_SPEC_NO_RESPONSE_TAG_PATTERN}
};
static int host_matches(const struct http_request *http,
const struct pattern_spec *pattern)
{
+ assert(http->host != NULL);
#ifdef FEATURE_EXTENDED_HOST_PATTERNS
return ((NULL == pattern->pattern.url_spec.host_regex)
|| (0 == regexec(pattern->pattern.url_spec.host_regex, http->host, 0, NULL, 0)));