diff options
Diffstat (limited to 'doc/libmicrohttpd.texi')
-rw-r--r-- | doc/libmicrohttpd.texi | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/doc/libmicrohttpd.texi b/doc/libmicrohttpd.texi index c0ad91a1..3fa143cc 100644 --- a/doc/libmicrohttpd.texi +++ b/doc/libmicrohttpd.texi | |||
@@ -661,6 +661,19 @@ HTTPS daemon. This option should be followed by an | |||
661 | "const char*" argument. | 661 | "const char*" argument. |
662 | This should be used in conjunction with 'MHD_OPTION_HTTPS_MEM_CERT'. | 662 | This should be used in conjunction with 'MHD_OPTION_HTTPS_MEM_CERT'. |
663 | 663 | ||
664 | @item MHD_OPTION_HTTPS_KEY_PASSWORD | ||
665 | @cindex SSL | ||
666 | @cindex TLS | ||
667 | Memory pointer to the password that decrypts the | ||
668 | private key to be used by the HTTPS daemon. | ||
669 | This option should be followed by an | ||
670 | "const char*" argument. | ||
671 | This should be used in conjunction with 'MHD_OPTION_HTTPS_MEM_KEY'. | ||
672 | |||
673 | The password (or passphrase) is only used immediately during | ||
674 | @code{MHD_start_daemon()}. Thus, the application may want to | ||
675 | erase it from memory afterwards for additional security. | ||
676 | |||
664 | @item MHD_OPTION_HTTPS_MEM_CERT | 677 | @item MHD_OPTION_HTTPS_MEM_CERT |
665 | @cindex SSL | 678 | @cindex SSL |
666 | @cindex TLS | 679 | @cindex TLS |
@@ -1103,14 +1116,14 @@ data is available, the first time the callback is | |||
1103 | invoked there won't be upload data, as this is done | 1116 | invoked there won't be upload data, as this is done |
1104 | just after MHD parses the headers. If supported by | 1117 | just after MHD parses the headers. If supported by |
1105 | the client and the HTTP version, the application can | 1118 | the client and the HTTP version, the application can |
1106 | at this point queue an error response to possibly | 1119 | at this point queue an error response to possibly |
1107 | avoid the upload entirely. If no response is generated, | 1120 | avoid the upload entirely. If no response is generated, |
1108 | MHD will (if required) automatically send a 100 CONTINUE | 1121 | MHD will (if required) automatically send a 100 CONTINUE |
1109 | reply to the client. | 1122 | reply to the client. |
1110 | 1123 | ||
1111 | Afterwards, POST data will be passed to the callback | 1124 | Afterwards, POST data will be passed to the callback |
1112 | to be processed incrementally by the application. The | 1125 | to be processed incrementally by the application. The |
1113 | application may return @code{MHD_NO} to forcefully | 1126 | application may return @code{MHD_NO} to forcefully |
1114 | terminate the TCP connection without generating a | 1127 | terminate the TCP connection without generating a |
1115 | proper HTTP response. Once all of the upload data has | 1128 | proper HTTP response. Once all of the upload data has |
1116 | been provided to the application, the application | 1129 | been provided to the application, the application |