Merge remote-tracking branch 'origin/maint-0.2.2'

diff --cc src/common/util.c
Simple merge

diff --cc src/test/test_util.c
index d9fc6a33c581062f4738754fe44ea9d5357f38ed,f9a83a38a5895cc9e3403510a7bd5c944c985e4c..99c55445085173e668650bdec10cdcedb69f9ad0
--- 1/src/test/test_util.c
--- 2/src/test/test_util.c
+++ b/src/test/test_util.c
@@@ -2921,13 -1384,8 +2991,14 @@@ test_util_set_env_var_in_sl(void *ptr
  
  struct testcase_t util_tests[] = {
    UTIL_LEGACY(time),
+   UTIL_TEST(parse_http_time, 0),
    UTIL_LEGACY(config_line),
 +  UTIL_LEGACY(config_line_quotes),
 +  UTIL_LEGACY(config_line_comment_character),
 +  UTIL_LEGACY(config_line_escaped_content),
 +#ifndef _WIN32
 +  UTIL_LEGACY(expand_filename),
 +#endif
    UTIL_LEGACY(strmisc),
    UTIL_LEGACY(pow2),
    UTIL_LEGACY(gzip),