summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: bf4061d)
raw | patch | inline | side by side (parent: bf4061d)
author | Marc Fournier <marc.fournier@camptocamp.com> | |
Tue, 12 Jan 2016 12:48:15 +0000 (13:48 +0100) | ||
committer | Marc Fournier <marc.fournier@camptocamp.com> | |
Tue, 12 Jan 2016 13:07:29 +0000 (14:07 +0100) |
When the server doesn't return `Content-Type: text-plain`, it's a strong
hint that we're not querying the right URL.
Fixes #1170
hint that we're not querying the right URL.
Fixes #1170
src/apache.c | patch | blob | history |
diff --git a/src/apache.c b/src/apache.c
index 13c8db66801291fb05cac46171ce089e14175e47..ee062206516463371539228c56912db04461f85f 100644 (file)
--- a/src/apache.c
+++ b/src/apache.c
st = user_data->data;
+ int status;
+
+ char *content_type;
+ static const char *text_plain = "text/plain";
+
assert (st->url != NULL);
/* (Assured by `config_add') */
if (st->curl == NULL)
{
- int status;
-
status = init_host (st);
if (status != 0)
return (-1);
st->server_type = APACHE;
}
+ status = curl_easy_getinfo (st->curl, CURLINFO_CONTENT_TYPE, &content_type);
+ if ((status == CURLE_OK) && (content_type != NULL) &&
+ (strncasecmp (content_type, text_plain, strlen (text_plain)) != 0))
+ {
+ WARNING ("apache plugin: `Content-Type' response header is not `%s' "
+ "(received: `%s'). Expecting unparseable data. Please check `URL' "
+ "parameter (missing `?auto' suffix ?)",
+ text_plain, content_type);
+ }
+
ptr = st->apache_buffer;
saveptr = NULL;
while ((line = strtok_r (ptr, "\n\r", &saveptr)) != NULL)