fix

4 files changed, 41 insertions, 6 deletions

diff --git a/ChangeLog b/ChangeLog
index 65a0fcd5..8a2c6bd0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Jul 13 09:26:17 CEST 2011
+        Fixing HTTP error status strings for certain high-numbered status codes.
+        Added support for some more (non-standard) status codes.
+        Releasing libmicrohttpd 0.9.13. -CG
+
 Thu Jul  7 10:24:20 CEST 2011
         Adding performance measurements. -CG
 
diff --git a/configure.ac b/configure.ac
index 31b4550d..ebea6113 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,15 +21,15 @@
 #
 #
 AC_PREREQ(2.57)
-AC_INIT([libmicrohttpd], [0.9.12],[libmicrohttpd@gnu.org])
-AM_INIT_AUTOMAKE([libmicrohttpd], [0.9.12])
+AC_INIT([libmicrohttpd], [0.9.13],[libmicrohttpd@gnu.org])
+AM_INIT_AUTOMAKE([libmicrohttpd], [0.9.13])
 AM_CONFIG_HEADER([MHD_config.h])
 AC_CONFIG_MACRO_DIR([m4])
 AH_TOP([#define _GNU_SOURCE  1])
 
-LIB_VERSION_CURRENT=20
+LIB_VERSION_CURRENT=21
 LIB_VERSION_REVISION=0
-LIB_VERSION_AGE=10
+LIB_VERSION_AGE=11
 AC_SUBST(LIB_VERSION_CURRENT)
 AC_SUBST(LIB_VERSION_REVISION)
 AC_SUBST(LIB_VERSION_AGE)
diff --git a/src/daemon/reason_phrase.c b/src/daemon/reason_phrase.c
index c02a0965..8f97ed5e 100644
--- a/src/daemon/reason_phrase.c
+++ b/src/daemon/reason_phrase.c
@@ -80,12 +80,39 @@ static const char *four_hundred[] = {
   "Unsupported Media Type",
   "Requested Range Not Satisfiable",
   "Expectation Failed",
+  "Unknown",
+  "Unknown",
+  "Unknown",
+  "Unknown",
   "Unprocessable Entity",
   "Locked",
   "Failed Dependency",
   "Unordered Collection",
   "Upgrade Required",
-  "Retry With"
+  "Unknown",
+  "Unknown",
+  "Unknown",
+  "Unknown",
+  "Unknown",
+  "Unknown",
+  "Unknown",
+  "Unknown",
+  "Unknown",
+  "Unknown",
+  "Unknown",
+  "Unknown",
+  "Unknown",
+  "Unknown",
+  "Unknown",
+  "Unknown",
+  "Unknown",
+  "No Response",
+  "Unknown",
+  "Unknown",
+  "Unknown",
+  "Unknown",
+  "Retry With",
+  "Blocked by Windows Parental Controls"
 };
 
 static const char *five_hundred[] = {
@@ -97,6 +124,7 @@ static const char *five_hundred[] = {
   "HTTP Version not supported",
   "Variant Also Negotiates",
   "Insufficient Storage",
+  "Unknown",
   "Bandwidth Limit Exceeded",
   "Not Extended"
 };
diff --git a/src/include/microhttpd.h b/src/include/microhttpd.h
index f46d0e49..9798327d 100644
--- a/src/include/microhttpd.h
+++ b/src/include/microhttpd.h
@@ -106,7 +106,7 @@ extern "C"
 /**
  * Current version of the library.
  */
-#define MHD_VERSION 0x00090C00
+#define MHD_VERSION 0x00090D00
 
 /**
  * MHD-internal return code for "YES".
@@ -206,7 +206,9 @@ extern "C"
 #define MHD_HTTP_FAILED_DEPENDENCY 424
 #define MHD_HTTP_UNORDERED_COLLECTION 425
 #define MHD_HTTP_UPGRADE_REQUIRED 426
+#define MHD_HTTP_NO_RESPONSE 444
 #define MHD_HTTP_RETRY_WITH 449
+#define MHD_HTTP_BLOCKED_BY_WINDOWS_PARENTAL_CONTROLS 450
 
 #define MHD_HTTP_INTERNAL_SERVER_ERROR 500
 #define MHD_HTTP_NOT_IMPLEMENTED 501