Merged with 1.2 branch

dumbbell · Feb 14, 2010 · 1010e99 · 1010e99
2 parents c0f48bb + dc16895
commit 1010e99
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/.hgtags b/.hgtags
@@ -14,3 +14,4 @@ d82748c4d7a3c1d3fdb6df794241aaec6c76150e 1.1.0
 6d41a8a076413c441fd752cd889dad4e9872bcf7 1.2.1
 0aa6509343cce7e39d14573a10ef81a88d2fa69b 1.2.2
 82c315b53a5dce40df76d28244cdb678084fbb1b 1.2.3
+c826c624fbb845fd31efbd85cf475c7c0d416746 1.2.4
diff --git a/CHANGELOG b/CHANGELOG
@@ -15,6 +15,9 @@ Version ?:
       after completing requests which came from the lhttpc_client process.
       These are now avoided.
 
+Version 1.2.4:
+* Fix handling of HTTP response code 304 (patch by Ben Slavin)
+
 Version 1.2.3:
 * Fix handling of unexpected 100 Continue response (patch by Magnus Henoch)
 

diff --git a/util/releaser b/util/releaser
@@ -89,8 +89,6 @@ if ! [ "$(hg identify | awk '{print $2};')" = "tip" ]; then
     fi
 fi
 
-make clean && make && make dialyzer
-
 if ! yesno "Did the compilation run without warnings?"; then
     echo "Try again..."
     exit 1

diff --git a/vsn.mk b/vsn.mk
@@ -1 +1 @@
-VSN=1.2.3
+VSN=1.2.4