aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2011-02-07 12:56:20 +0000
committerChristian Grothoff <christian@grothoff.org>2011-02-07 12:56:20 +0000
commit5eba2735dcd3e185920de5114fd89c57c3503232 (patch)
treec30e3276df3e2fe9ff49543bd55d8413c8d2f2e7
parentd251f28095446c57221a94d3d4ccaf200149bf61 (diff)
downloadlibmicrohttpd-5eba2735dcd3e185920de5114fd89c57c3503232.tar.gz
libmicrohttpd-5eba2735dcd3e185920de5114fd89c57c3503232.zip
Patch für libmicrohttpd-Doku
From: Michael Wiegand <michael.wiegand@greenbone.net> (Greenbone Networks GmbH) To: christian@grothoff.org Date: Today 12:39:11 pm Attachments: microhttpd.texi-typo-fixes.patch Hallo Christian, ich habe ein paar Typos in der Doku von libmicrohttpd gefunden, siehe angehängter Patch. Oder nimmst du Patches lieber über die Liste? Habe mich jetzt auch endlich angemeldet. :) Grüße aus Osnabrück Michael
-rw-r--r--doc/microhttpd.texi24
-rw-r--r--src/daemon/daemon_test.c2
2 files changed, 13 insertions, 13 deletions
diff --git a/doc/microhttpd.texi b/doc/microhttpd.texi
index aefeba2d..86ed2481 100644
--- a/doc/microhttpd.texi
+++ b/doc/microhttpd.texi
@@ -344,7 +344,7 @@ default is 32 kB (32*1024 bytes) as defined by the internal constant
344 344
345@item MHD_OPTION_CONNECTION_LIMIT 345@item MHD_OPTION_CONNECTION_LIMIT
346@cindex connection, limiting number of connections 346@cindex connection, limiting number of connections
347Maximum number of concurrenct connections to accept (followed by an 347Maximum number of concurrent connections to accept (followed by an
348@code{unsigned int}). The default is @code{FD_SETSIZE - 4} (the 348@code{unsigned int}). The default is @code{FD_SETSIZE - 4} (the
349maximum number of file descriptors supported by @code{select} minus 349maximum number of file descriptors supported by @code{select} minus
350four for @code{stdin}, @code{stdout}, @code{stderr} and the server 350four for @code{stdin}, @code{stdout}, @code{stderr} and the server
@@ -406,7 +406,7 @@ Bind daemon to the supplied socket address. This option should be followed by a
406@code{struct sockaddr *}. If @code{MHD_USE_IPv6} is specified, 406@code{struct sockaddr *}. If @code{MHD_USE_IPv6} is specified,
407the @code{struct sockaddr*} should point to a @code{struct sockaddr_in6}, 407the @code{struct sockaddr*} should point to a @code{struct sockaddr_in6},
408otherwise to a @code{struct sockaddr_in}. If this option is not specified, 408otherwise to a @code{struct sockaddr_in}. If this option is not specified,
409the daemon will listen to incomming connections from anywhere. 409the daemon will listen to incoming connections from anywhere.
410 410
411@item MHD_OPTION_URI_LOG_CALLBACK 411@item MHD_OPTION_URI_LOG_CALLBACK
412@cindex debugging 412@cindex debugging
@@ -456,7 +456,7 @@ HTTPS daemon to authenticate and trust clients certificates.
456This option should be followed by an "const char*" argument. 456This option should be followed by an "const char*" argument.
457The presence of this option activates the request of certificate 457The presence of this option activates the request of certificate
458to the client. The request to the client is marked optional, and 458to the client. The request to the client is marked optional, and
459it is the responsability of the server to check the presence 459it is the responsibility of the server to check the presence
460of the certificate if needed. 460of the certificate if needed.
461Note that most browsers will only present a client certificate 461Note that most browsers will only present a client certificate
462only if they have one matching the specified CA, not sending 462only if they have one matching the specified CA, not sending
@@ -474,7 +474,7 @@ this option should be followed by one of the values listed in
474@cindex TLS 474@cindex TLS
475@cindex cipher 475@cindex cipher
476SSL/TLS protocol version and ciphers. 476SSL/TLS protocol version and ciphers.
477This option must be followwed by an "const char *" argument 477This option must be followed by an "const char *" argument
478specifying the SSL/TLS protocol versions and ciphers that 478specifying the SSL/TLS protocol versions and ciphers that
479are acceptable for the application. The string is passed 479are acceptable for the application. The string is passed
480unchanged to gnutls_priority_init. If this option is not 480unchanged to gnutls_priority_init. If this option is not
@@ -489,7 +489,7 @@ This option should be followed by two arguments. First an integer of
489type "size_t" which specifies the size of the buffer pointed to by the 489type "size_t" which specifies the size of the buffer pointed to by the
490second argument in bytes. Note that the application must ensure that 490second argument in bytes. Note that the application must ensure that
491the buffer of the second argument remains allocated and unmodified 491the buffer of the second argument remains allocated and unmodified
492while the deamon is running. For security, you SHOULD provide a fresh 492while the daemon is running. For security, you SHOULD provide a fresh
493random nonce when using MHD with Digest Authentication. 493random nonce when using MHD with Digest Authentication.
494 494
495@item MHD_OPTION_NONCE_NC_SIZE 495@item MHD_OPTION_NONCE_NC_SIZE
@@ -741,7 +741,7 @@ including access to the underlying GNUtls client certificate
741 741
742@deftp {Enumeration} MHD_DaemonInfoType 742@deftp {Enumeration} MHD_DaemonInfoType
743Values of this enum are used to specify what 743Values of this enum are used to specify what
744information about a deamon is desired. 744information about a daemon is desired.
745@table @code 745@table @code
746@item MHD_DAEMON_INFO_KEY_SIZE 746@item MHD_DAEMON_INFO_KEY_SIZE
747Request information about the key size for a particular cipher 747Request information about the key size for a particular cipher
@@ -1043,7 +1043,7 @@ Set a handler for fatal errors.
1043 1043
1044@table @var 1044@table @var
1045@item cb 1045@item cb
1046function to call if MHD encounteres a fatal internal error. If no handler was set explicitly, MHD will call @code{abort}. 1046function to call if MHD encounters a fatal internal error. If no handler was set explicitly, MHD will call @code{abort}.
1047 1047
1048@item cls 1048@item cls
1049closure argument for cb; the other arguments are the name of the source file, line number and a string describing the nature of the fatal error (which can be NULL) 1049closure argument for cb; the other arguments are the name of the source file, line number and a string describing the nature of the fatal error (which can be NULL)
@@ -1224,7 +1224,7 @@ for each response, we use it once and finally we destroy it.
1224 1224
1225Example: we allocate a new @code{MHD_Response} structure for each 1225Example: we allocate a new @code{MHD_Response} structure for each
1226response @strong{kind}, we use it every time we have to give that 1226response @strong{kind}, we use it every time we have to give that
1227responce and we finally destroy it only when the daemon shuts down. 1227response and we finally destroy it only when the daemon shuts down.
1228 1228
1229@menu 1229@menu
1230* microhttpd-response enqueue:: Enqueuing a response. 1230* microhttpd-response enqueue:: Enqueuing a response.
@@ -1269,7 +1269,7 @@ error (i.e. reply already sent).
1269Destroy a response object and associated resources (decrement the 1269Destroy a response object and associated resources (decrement the
1270reference counter). Note that @mhd{} may keep some of the resources 1270reference counter). Note that @mhd{} may keep some of the resources
1271around if the response is still in the queue for some clients, so the 1271around if the response is still in the queue for some clients, so the
1272memory may not necessarily be freed immediatley. 1272memory may not necessarily be freed immediately.
1273@end deftypefun 1273@end deftypefun
1274 1274
1275 1275
@@ -1547,7 +1547,7 @@ on BASE64 algorithm. Username and password are exchanged in clear
1547between the client and the server, so this method must only be used 1547between the client and the server, so this method must only be used
1548for non-sensitive content or when the session is protected with https. 1548for non-sensitive content or when the session is protected with https.
1549When using basic authentication @mhd{} will have access to the clear 1549When using basic authentication @mhd{} will have access to the clear
1550password, possibily allowing to create a chained authentication 1550password, possibly allowing to create a chained authentication
1551toward an external authentication server. 1551toward an external authentication server.
1552 1552
1553Digest authentication uses a one-way authentication method based 1553Digest authentication uses a one-way authentication method based
@@ -1717,7 +1717,7 @@ ahc_echo (void *cls,
1717 1717
1718 1718
1719@noindent 1719@noindent
1720@mhd{} provides the post procesor API to make it easier for applications to 1720@mhd{} provides the post processor API to make it easier for applications to
1721parse the data of a client's @code{POST} request: the 1721parse the data of a client's @code{POST} request: the
1722@code{MHD_AccessHandlerCallback} will be invoked multiple times to 1722@code{MHD_AccessHandlerCallback} will be invoked multiple times to
1723process data as it arrives; at each invocation a new chunk of data must 1723process data as it arrives; at each invocation a new chunk of data must
@@ -1732,7 +1732,7 @@ that the pointer was initially @mynull{} can be used to detect that
1732this is a new request. 1732this is a new request.
1733 1733
1734One method to detect that a new connection was established is 1734One method to detect that a new connection was established is
1735to set @code{*con_cls} to anunused integer: 1735to set @code{*con_cls} to an unused integer:
1736 1736
1737@example 1737@example
1738int 1738int
diff --git a/src/daemon/daemon_test.c b/src/daemon/daemon_test.c
index 6340a2e7..ed4844b8 100644
--- a/src/daemon/daemon_test.c
+++ b/src/daemon/daemon_test.c
@@ -19,7 +19,7 @@
19*/ 19*/
20 20
21/** 21/**
22 * @file daemontest.c 22 * @file daemon_test.c
23 * @brief Testcase for libmicrohttpd starts and stops 23 * @brief Testcase for libmicrohttpd starts and stops
24 * @author Christian Grothoff 24 * @author Christian Grothoff
25 */ 25 */