3 files changed, 10 insertions, 7 deletions

diff --git a/ChangeLog b/ChangeLog
index d295e795..c8e1f976 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+Thu May 31 13:33:45 CEST 2012
+        Releasing 0.9.20. -CG
+
 Tue May 29 13:55:03 CEST 2012
         Fixed some testcase build issues with disabled post processor. -CG
 
diff --git a/configure.ac b/configure.ac
index 27385c9a..41d54722 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,15 +21,15 @@
 #
 #
 AC_PREREQ(2.57)
-AC_INIT([libmicrohttpd], [0.9.19],[libmicrohttpd@gnu.org])
-AM_INIT_AUTOMAKE([libmicrohttpd], [0.9.19])
+AC_INIT([libmicrohttpd], [0.9.20],[libmicrohttpd@gnu.org])
+AM_INIT_AUTOMAKE([libmicrohttpd], [0.9.20])
 AM_CONFIG_HEADER([MHD_config.h])
 AC_CONFIG_MACRO_DIR([m4])
 AH_TOP([#define _GNU_SOURCE  1])
 
-LIB_VERSION_CURRENT=24
+LIB_VERSION_CURRENT=25
 LIB_VERSION_REVISION=0
-LIB_VERSION_AGE=14
+LIB_VERSION_AGE=15
 AC_SUBST(LIB_VERSION_CURRENT)
 AC_SUBST(LIB_VERSION_REVISION)
 AC_SUBST(LIB_VERSION_AGE)
diff --git a/src/include/microhttpd.h b/src/include/microhttpd.h
index cf5ca9ff..226ab65a 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 0x00091302
+#define MHD_VERSION 0x00091400
 
 /**
  * MHD-internal return code for "YES".
@@ -1414,7 +1414,7 @@ typedef void (*MHD_UpgradeHandler)(void *cls,
                                    void **con_cls,
                                    int upgrade_socket);
 
-
+#if 0
 /**
  * Create a response object that can be used for 101 UPGRADE
  * responses, for example to implement websockets.  After sending the
@@ -1447,7 +1447,7 @@ typedef void (*MHD_UpgradeHandler)(void *cls,
 struct MHD_Response *
 MHD_create_response_for_upgrade (MHD_UpgradeHandler upgrade_handler,
                                  void *upgrade_handler_cls);
-
+#endif
 
 /**
  * Destroy a response object and associated resources.  Note that