[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r37897 - in libmicrohttpd: . doc src/include src/microhttpd
From: |
gnunet |
Subject: |
[GNUnet-SVN] r37897 - in libmicrohttpd: . doc src/include src/microhttpd |
Date: |
Tue, 6 Sep 2016 21:31:25 +0200 |
Author: grothoff
Date: 2016-09-06 21:31:25 +0200 (Tue, 06 Sep 2016)
New Revision: 37897
Modified:
libmicrohttpd/ChangeLog
libmicrohttpd/doc/libmicrohttpd.texi
libmicrohttpd/src/include/microhttpd.h
libmicrohttpd/src/microhttpd/connection.c
Log:
-add back Martin's fix, he was right
Modified: libmicrohttpd/ChangeLog
===================================================================
--- libmicrohttpd/ChangeLog 2016-09-06 14:05:44 UTC (rev 37896)
+++ libmicrohttpd/ChangeLog 2016-09-06 19:31:25 UTC (rev 37897)
@@ -1,7 +1,7 @@
-2016-09-05 gettextize <address@hidden>
+Tue Sep 6 21:29:09 CEST 2016
+ Martin was right, "socket_context" should be "void *"
+ in `union MHD_ConnectionInfo`. -MS
- * configure.ac (AM_GNU_GETTEXT_VERSION): Bump to 0.19.8.
-
Sun Sep 4 18:16:32 CEST 2016
Fixing potential memory leak (#4634). -CG
Modified: libmicrohttpd/doc/libmicrohttpd.texi
===================================================================
--- libmicrohttpd/doc/libmicrohttpd.texi 2016-09-06 14:05:44 UTC (rev
37896)
+++ libmicrohttpd/doc/libmicrohttpd.texi 2016-09-06 19:31:25 UTC (rev
37897)
@@ -2725,14 +2725,17 @@
@item MHD_CONNECTION_INFO_CIPHER_ALGO
What cipher algorithm is being used (HTTPS connections only).
-Takes no extra arguments.
@code{NULL} is returned for non-HTTPS connections.
+Takes no extra arguments.
+
@item MHD_CONNECTION_INFO_PROTOCOL,
-Takes no extra arguments. Allows finding out the TLS/SSL protocol used
+Allows finding out the TLS/SSL protocol used
(HTTPS connections only).
@code{NULL} is returned for non-HTTPS connections.
+Takes no extra arguments.
+
@item MHD_CONNECTION_INFO_CLIENT_ADDRESS
Returns information about the address of the client. Returns
essentially a @code{struct sockaddr **} (since the API returns
@@ -2739,6 +2742,8 @@
a @code{union MHD_ConnectionInfo *} and that union contains
a @code{struct sockaddr *}).
+Takes no extra arguments.
+
@item MHD_CONNECTION_INFO_GNUTLS_SESSION,
Takes no extra arguments. Allows access to the underlying GNUtls session,
including access to the underlying GNUtls client certificate
@@ -2745,6 +2750,8 @@
(HTTPS connections only). Takes no extra arguments.
@code{NULL} is returned for non-HTTPS connections.
+Takes no extra arguments.
+
@item MHD_CONNECTION_INFO_GNUTLS_CLIENT_CERT,
Dysfunctional (never implemented, deprecated). Use
MHD_CONNECTION_INFO_GNUTLS_SESSION to get the @code{gnutls_session_t}
@@ -2754,6 +2761,8 @@
Returns information about @code{struct MHD_Daemon} which manages
this connection.
+Takes no extra arguments.
+
@item MHD_CONNECTION_INFO_CONNECTION_FD
Returns the file descriptor (usually a TCP socket) associated with
this connection (in the ``connect-fd'' member of the returned struct).
@@ -2766,11 +2775,15 @@
callbacks are invoked in between, those might be used to set different
values for TCP-CORK and TCP-NODELAY in the meantime.
+Takes no extra arguments.
+
@item MHD_CONNECTION_INFO_CONNECTION_SUSPENDED
Returns pointer to an integer that is @code{MHD_YES} if the connection
is currently suspended (and thus can be safely resumed) and
@code{MHD_NO} otherwise.
+Takes no extra arguments.
+
@item MHD_CONNECTION_INFO_SOCKET_CONTEXT
Returns the client-specific pointer to a @code{void *} that was
(possibly) set during a @code{MHD_NotifyConnectionCallback} when the
@@ -2779,6 +2792,8 @@
@code{con_cls} is fresh for each HTTP request, while the
@code{socket_context} is fresh for each socket.
+Takes no extra arguments.
+
@end table
@end deftp
Modified: libmicrohttpd/src/include/microhttpd.h
===================================================================
--- libmicrohttpd/src/include/microhttpd.h 2016-09-06 14:05:44 UTC (rev
37896)
+++ libmicrohttpd/src/include/microhttpd.h 2016-09-06 19:31:25 UTC (rev
37897)
@@ -1217,7 +1217,7 @@
* Socket-specific client context. Points to the same address as
* the "socket_context" of the #MHD_NotifyConnectionCallback.
*/
- void **socket_context;
+ void *socket_context;
};
Modified: libmicrohttpd/src/microhttpd/connection.c
===================================================================
--- libmicrohttpd/src/microhttpd/connection.c 2016-09-06 14:05:44 UTC (rev
37896)
+++ libmicrohttpd/src/microhttpd/connection.c 2016-09-06 19:31:25 UTC (rev
37897)
@@ -3205,7 +3205,8 @@
*/
const union MHD_ConnectionInfo *
MHD_get_connection_info (struct MHD_Connection *connection,
- enum MHD_ConnectionInfoType info_type, ...)
+ enum MHD_ConnectionInfoType info_type,
+ ...)
{
switch (info_type)
{
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r37897 - in libmicrohttpd: . doc src/include src/microhttpd,
gnunet <=