From: Larry Hynes <larry@larryhynes.com>
Date: Thu, 16 Jun 2016 20:58:42 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: 1.3.0~311^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dc9be11f4a10c3181f285cad626877a47a1f32cd;p=thirdparty%2Frspamd.git

Merge remote-tracking branch 'upstream/master'

* upstream/master: (110 commits)
  [Fix] Fix detection of URLs in text parts
  [Fix] Strip '\r\n' properly
  [Fix] More fixes about shared memory in proxy
  [Fix] One more try to fix redis
  [Feature] Use one pass to remove newlines and store their positions
  [Fix] Fix descriptors leak on shmem detaching
  [Fix] More and more fixes to redis states
  [Fix] Another try to fix redis states
  [Fix] Set terminated state before calling of async free
  [Fix] Fix state on timeout
  [Fix] Another try to fix redis mess
  [Fix] Fix redis timeout events handling
  [Minor] Add some more tests
  [Feature] Try to read on fuzzy timeout to avoid fake timeouts
  [Feature] Add ESMTPSA received type
  [Fix] Fix stack growing
  [Feature] Further relax parser
  [Fix] Fix parsing of nested braces in SMTP comments
  [Minor] Add `application/octet-stream` mime type for `pdf` extension
  [Fix] Fix parser
  ...
---

dc9be11f4a10c3181f285cad626877a47a1f32cd