[GNUnet-SVN] r35712 - in libmicrohttpd: . src/include src/microhttpd

[gnunet]

Author: grothoff
Date: 2015-05-06 18:05:43 +0200 (Wed, 06 May 2015)
New Revision: 35712

Modified:
   libmicrohttpd/ChangeLog
   libmicrohttpd/src/include/microhttpd.h
   libmicrohttpd/src/microhttpd/connection.c
Log:
fix #3784

Modified: libmicrohttpd/ChangeLog
===================================================================
--- libmicrohttpd/ChangeLog     2015-05-01 11:27:51 UTC (rev 35711)
+++ libmicrohttpd/ChangeLog     2015-05-06 16:05:43 UTC (rev 35712)
@@ -1,3 +1,6 @@
+Wed May  6 18:07:38 CEST 2015
+       Fix #3784: actually implement MHD_CONNECTION_INFO_SOCKET_CONTEXT. 
-asherkin
+
 Thu Apr 30 00:03::49 CEST 2015
        Releasing libmicrohttpd 0.9.41. -CG
 

Modified: libmicrohttpd/src/include/microhttpd.h
===================================================================
--- libmicrohttpd/src/include/microhttpd.h      2015-05-01 11:27:51 UTC (rev 
35711)
+++ libmicrohttpd/src/include/microhttpd.h      2015-05-06 16:05:43 UTC (rev 
35712)
@@ -130,7 +130,7 @@
  * Current version of the library.
  * 0x01093001 = 1.9.30-1.
  */
-#define MHD_VERSION 0x00094100
+#define MHD_VERSION 0x00094101
 
 /**
  * MHD-internal return code for "YES".

Modified: libmicrohttpd/src/microhttpd/connection.c
===================================================================
--- libmicrohttpd/src/microhttpd/connection.c   2015-05-01 11:27:51 UTC (rev 
35711)
+++ libmicrohttpd/src/microhttpd/connection.c   2015-05-06 16:05:43 UTC (rev 
35712)
@@ -2799,6 +2799,8 @@
       return (const union MHD_ConnectionInfo *) &connection->daemon;
     case MHD_CONNECTION_INFO_CONNECTION_FD:
       return (const union MHD_ConnectionInfo *) &connection->socket_fd;
+    case MHD_CONNECTION_INFO_SOCKET_CONTEXT:
+      return (const union MHD_ConnectionInfo *) &connection->socket_context;
     default:
       return NULL;
     };