diff options
author | Christian Grothoff <christian@grothoff.org> | 2011-02-07 12:56:20 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2011-02-07 12:56:20 +0000 |
commit | 5eba2735dcd3e185920de5114fd89c57c3503232 (patch) | |
tree | c30e3276df3e2fe9ff49543bd55d8413c8d2f2e7 | |
parent | d251f28095446c57221a94d3d4ccaf200149bf61 (diff) | |
download | libmicrohttpd-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.texi | 24 | ||||
-rw-r--r-- | src/daemon/daemon_test.c | 2 |
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 |
347 | Maximum number of concurrenct connections to accept (followed by an | 347 | Maximum 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 |
349 | maximum number of file descriptors supported by @code{select} minus | 349 | maximum number of file descriptors supported by @code{select} minus |
350 | four for @code{stdin}, @code{stdout}, @code{stderr} and the server | 350 | four 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, |
407 | the @code{struct sockaddr*} should point to a @code{struct sockaddr_in6}, | 407 | the @code{struct sockaddr*} should point to a @code{struct sockaddr_in6}, |
408 | otherwise to a @code{struct sockaddr_in}. If this option is not specified, | 408 | otherwise to a @code{struct sockaddr_in}. If this option is not specified, |
409 | the daemon will listen to incomming connections from anywhere. | 409 | the 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. | |||
456 | This option should be followed by an "const char*" argument. | 456 | This option should be followed by an "const char*" argument. |
457 | The presence of this option activates the request of certificate | 457 | The presence of this option activates the request of certificate |
458 | to the client. The request to the client is marked optional, and | 458 | to the client. The request to the client is marked optional, and |
459 | it is the responsability of the server to check the presence | 459 | it is the responsibility of the server to check the presence |
460 | of the certificate if needed. | 460 | of the certificate if needed. |
461 | Note that most browsers will only present a client certificate | 461 | Note that most browsers will only present a client certificate |
462 | only if they have one matching the specified CA, not sending | 462 | only 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 |
476 | SSL/TLS protocol version and ciphers. | 476 | SSL/TLS protocol version and ciphers. |
477 | This option must be followwed by an "const char *" argument | 477 | This option must be followed by an "const char *" argument |
478 | specifying the SSL/TLS protocol versions and ciphers that | 478 | specifying the SSL/TLS protocol versions and ciphers that |
479 | are acceptable for the application. The string is passed | 479 | are acceptable for the application. The string is passed |
480 | unchanged to gnutls_priority_init. If this option is not | 480 | unchanged 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 | |||
489 | type "size_t" which specifies the size of the buffer pointed to by the | 489 | type "size_t" which specifies the size of the buffer pointed to by the |
490 | second argument in bytes. Note that the application must ensure that | 490 | second argument in bytes. Note that the application must ensure that |
491 | the buffer of the second argument remains allocated and unmodified | 491 | the buffer of the second argument remains allocated and unmodified |
492 | while the deamon is running. For security, you SHOULD provide a fresh | 492 | while the daemon is running. For security, you SHOULD provide a fresh |
493 | random nonce when using MHD with Digest Authentication. | 493 | random 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 |
743 | Values of this enum are used to specify what | 743 | Values of this enum are used to specify what |
744 | information about a deamon is desired. | 744 | information 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 |
747 | Request information about the key size for a particular cipher | 747 | Request 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 |
1046 | function to call if MHD encounteres a fatal internal error. If no handler was set explicitly, MHD will call @code{abort}. | 1046 | function 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 |
1049 | closure 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) | 1049 | closure 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 | ||
1225 | Example: we allocate a new @code{MHD_Response} structure for each | 1225 | Example: we allocate a new @code{MHD_Response} structure for each |
1226 | response @strong{kind}, we use it every time we have to give that | 1226 | response @strong{kind}, we use it every time we have to give that |
1227 | responce and we finally destroy it only when the daemon shuts down. | 1227 | response 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). | |||
1269 | Destroy a response object and associated resources (decrement the | 1269 | Destroy a response object and associated resources (decrement the |
1270 | reference counter). Note that @mhd{} may keep some of the resources | 1270 | reference counter). Note that @mhd{} may keep some of the resources |
1271 | around if the response is still in the queue for some clients, so the | 1271 | around if the response is still in the queue for some clients, so the |
1272 | memory may not necessarily be freed immediatley. | 1272 | memory 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 | |||
1547 | between the client and the server, so this method must only be used | 1547 | between the client and the server, so this method must only be used |
1548 | for non-sensitive content or when the session is protected with https. | 1548 | for non-sensitive content or when the session is protected with https. |
1549 | When using basic authentication @mhd{} will have access to the clear | 1549 | When using basic authentication @mhd{} will have access to the clear |
1550 | password, possibily allowing to create a chained authentication | 1550 | password, possibly allowing to create a chained authentication |
1551 | toward an external authentication server. | 1551 | toward an external authentication server. |
1552 | 1552 | ||
1553 | Digest authentication uses a one-way authentication method based | 1553 | Digest 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 |
1721 | parse the data of a client's @code{POST} request: the | 1721 | parse 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 |
1723 | process data as it arrives; at each invocation a new chunk of data must | 1723 | process 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 | |||
1732 | this is a new request. | 1732 | this is a new request. |
1733 | 1733 | ||
1734 | One method to detect that a new connection was established is | 1734 | One method to detect that a new connection was established is |
1735 | to set @code{*con_cls} to anunused integer: | 1735 | to set @code{*con_cls} to an unused integer: |
1736 | 1736 | ||
1737 | @example | 1737 | @example |
1738 | int | 1738 | int |
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 | */ |