--- a/libidav/utils.c Thu Oct 15 15:01:50 2015 +0200 +++ b/libidav/utils.c Thu Oct 15 15:36:26 2015 +0200 @@ -283,6 +283,81 @@ return ret; } +static size_t util_header_callback(char *buffer, size_t size, + size_t nitems, void *data) { + + char *duped; // local variable for string duplicates + + UcxMap *map = (UcxMap*) data; + + // if we get a status line, clear the map and exit + if(size*nitems >= 5 && !strncmp("HTTP/", buffer, 5)) { + ucx_map_free_content(map, free); + ucx_map_clear(map); + return size*nitems; + } + + // if we get the terminating CRLF, just exit + if (size*nitems == 2 && !strncmp("\r\n", buffer, 2)) { + return 2; + } + + + // get header key + size_t s = 0; + do { + s++; + } while(buffer[s] != ':'); + char *value = buffer+s+1; + + // remove trailing spaces + while(isspace(buffer[s-1])) { + s--; + } + + // save key as all lower case + duped = malloc(s); + for(size_t i = 0;i<s;i++) { + duped[i] = tolower(buffer[i]); + } + UcxKey key = ucx_key(duped, s); + + // get trimmed header value + while(isspace(*value)) { + value++; + } + s = size*nitems - (value - buffer); + while(isspace(value[s-1])) { + s--; + } + + // copy header value and append NULL byte (curl does not provide one) + duped = malloc(s+1); + memcpy(duped, value, s+1); + duped[s] = '\0'; + + char *oldval = ucx_map_get(map, key); + if(oldval) { + free(oldval); + } + + ucx_map_put(map, key, duped); + free(key.data); // ucx_map_put made a copy, so we free this memory + + return nitems * size; +} + +void util_capture_header(CURL *handle, UcxMap* map) { + if(!map) { + // deactivate capturing + curl_easy_setopt(handle, CURLOPT_HEADERFUNCTION, NULL); + return; + } + + curl_easy_setopt(handle, CURLOPT_HEADERFUNCTION, util_header_callback); + curl_easy_setopt(handle, CURLOPT_HEADERDATA, map); +} + char* util_resource_name(char *url) { int si = 0; int osi = 0;