aboutsummaryrefslogtreecommitdiff
path: root/contrib/serf/serf.h
diff options
context:
space:
mode:
authorPeter Wemm <peter@FreeBSD.org>2014-07-21 22:10:29 +0000
committerPeter Wemm <peter@FreeBSD.org>2014-07-21 22:10:29 +0000
commitb177c333d48cfdfabfb02333281c3e3d6c976a4b (patch)
tree4f95abc651e69aa245d8553eeaa196209f4bf3fc /contrib/serf/serf.h
parent1782c649a84c8502c09de9ab4a91d4987f440cba (diff)
parentb42ed207213a85ee3a7aa59fdb3d32627c2aadea (diff)
downloadsrc-b177c333d48cfdfabfb02333281c3e3d6c976a4b.tar.gz
src-b177c333d48cfdfabfb02333281c3e3d6c976a4b.zip
Merge serf-1.3.6
+ Revert r2319 from serf 1.3.5: this change was making serf call handle_response + multiple times in case of an error response, leading to unexpected behavior.
Notes
Notes: svn path=/head/; revision=268960
Diffstat (limited to 'contrib/serf/serf.h')
-rw-r--r--contrib/serf/serf.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/serf/serf.h b/contrib/serf/serf.h
index 55d6a3a1b43e..d3ac2f3548de 100644
--- a/contrib/serf/serf.h
+++ b/contrib/serf/serf.h
@@ -1062,7 +1062,7 @@ void serf_debug__bucket_alloc_check(
/* Version info */
#define SERF_MAJOR_VERSION 1
#define SERF_MINOR_VERSION 3
-#define SERF_PATCH_VERSION 5
+#define SERF_PATCH_VERSION 6
/* Version number string */
#define SERF_VERSION_STRING APR_STRINGIFY(SERF_MAJOR_VERSION) "." \