diff options
Diffstat (limited to 'src/microhttpd/internal.h')
-rw-r--r-- | src/microhttpd/internal.h | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/src/microhttpd/internal.h b/src/microhttpd/internal.h index feee0aab..861ff39f 100644 --- a/src/microhttpd/internal.h +++ b/src/microhttpd/internal.h | |||
@@ -1,17 +1,17 @@ | |||
1 | /* | 1 | /* |
2 | This file is part of libmicrohttpd | 2 | This file is part of libmicrohttpd |
3 | (C) 2007-2013 Daniel Pittman and Christian Grothoff | 3 | (C) 2007-2013 Daniel Pittman and Christian Grothoff |
4 | 4 | ||
5 | This library is free software; you can redistribute it and/or | 5 | This library is free software; you can redistribute it and/or |
6 | modify it under the terms of the GNU Lesser General Public | 6 | modify it under the terms of the GNU Lesser General Public |
7 | License as published by the Free Software Foundation; either | 7 | License as published by the Free Software Foundation; either |
8 | version 2.1 of the License, or (at your option) any later version. | 8 | version 2.1 of the License, or (at your option) any later version. |
9 | 9 | ||
10 | This library is distributed in the hope that it will be useful, | 10 | This library is distributed in the hope that it will be useful, |
11 | but WITHOUT ANY WARRANTY; without even the implied warranty of | 11 | but WITHOUT ANY WARRANTY; without even the implied warranty of |
12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | 12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
13 | Lesser General Public License for more details. | 13 | Lesser General Public License for more details. |
14 | 14 | ||
15 | You should have received a copy of the GNU Lesser General Public | 15 | You should have received a copy of the GNU Lesser General Public |
16 | License along with this library; if not, write to the Free Software | 16 | License along with this library; if not, write to the Free Software |
17 | Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 17 | Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
@@ -70,14 +70,14 @@ extern void *mhd_panic_cls; | |||
70 | #if HAVE_MESSAGES | 70 | #if HAVE_MESSAGES |
71 | /** | 71 | /** |
72 | * Trigger 'panic' action based on fatal errors. | 72 | * Trigger 'panic' action based on fatal errors. |
73 | * | 73 | * |
74 | * @param msg error message (const char *) | 74 | * @param msg error message (const char *) |
75 | */ | 75 | */ |
76 | #define MHD_PANIC(msg) mhd_panic (mhd_panic_cls, __FILE__, __LINE__, msg) | 76 | #define MHD_PANIC(msg) mhd_panic (mhd_panic_cls, __FILE__, __LINE__, msg) |
77 | #else | 77 | #else |
78 | /** | 78 | /** |
79 | * Trigger 'panic' action based on fatal errors. | 79 | * Trigger 'panic' action based on fatal errors. |
80 | * | 80 | * |
81 | * @param msg error message (const char *) | 81 | * @param msg error message (const char *) |
82 | */ | 82 | */ |
83 | #define MHD_PANIC(msg) mhd_panic (mhd_panic_cls, __FILE__, __LINE__, NULL) | 83 | #define MHD_PANIC(msg) mhd_panic (mhd_panic_cls, __FILE__, __LINE__, NULL) |
@@ -142,12 +142,12 @@ enum MHD_ConnectionEventLoopInfo | |||
142 | 142 | ||
143 | /** | 143 | /** |
144 | * We are waiting for the application to provide data. | 144 | * We are waiting for the application to provide data. |
145 | */ | 145 | */ |
146 | MHD_EVENT_LOOP_INFO_BLOCK = 2, | 146 | MHD_EVENT_LOOP_INFO_BLOCK = 2, |
147 | 147 | ||
148 | /** | 148 | /** |
149 | * We are finished and are awaiting cleanup. | 149 | * We are finished and are awaiting cleanup. |
150 | */ | 150 | */ |
151 | MHD_EVENT_LOOP_INFO_CLEANUP = 3 | 151 | MHD_EVENT_LOOP_INFO_CLEANUP = 3 |
152 | }; | 152 | }; |
153 | 153 | ||
@@ -165,9 +165,9 @@ enum MHD_ConnectionEventLoopInfo | |||
165 | * A structure representing the internal holder of the | 165 | * A structure representing the internal holder of the |
166 | * nonce-nc map. | 166 | * nonce-nc map. |
167 | */ | 167 | */ |
168 | struct MHD_NonceNc | 168 | struct MHD_NonceNc |
169 | { | 169 | { |
170 | 170 | ||
171 | /** | 171 | /** |
172 | * Nonce counter, a value that increases for each subsequent | 172 | * Nonce counter, a value that increases for each subsequent |
173 | * request for the same nonce. | 173 | * request for the same nonce. |
@@ -175,7 +175,7 @@ struct MHD_NonceNc | |||
175 | unsigned long int nc; | 175 | unsigned long int nc; |
176 | 176 | ||
177 | /** | 177 | /** |
178 | * Nonce value: | 178 | * Nonce value: |
179 | */ | 179 | */ |
180 | char nonce[MAX_NONCE_LENGTH]; | 180 | char nonce[MAX_NONCE_LENGTH]; |
181 | 181 | ||
@@ -186,8 +186,8 @@ struct MHD_NonceNc | |||
186 | * fprintf-like helper function for logging debug | 186 | * fprintf-like helper function for logging debug |
187 | * messages. | 187 | * messages. |
188 | */ | 188 | */ |
189 | void | 189 | void |
190 | MHD_DLOG (const struct MHD_Daemon *daemon, | 190 | MHD_DLOG (const struct MHD_Daemon *daemon, |
191 | const char *format, ...); | 191 | const char *format, ...); |
192 | #endif | 192 | #endif |
193 | 193 | ||
@@ -202,7 +202,7 @@ MHD_DLOG (const struct MHD_Daemon *daemon, | |||
202 | * @return length of the resulting val (strlen(val) maybe | 202 | * @return length of the resulting val (strlen(val) maybe |
203 | * shorter afterwards due to elimination of escape sequences) | 203 | * shorter afterwards due to elimination of escape sequences) |
204 | */ | 204 | */ |
205 | size_t | 205 | size_t |
206 | MHD_http_unescape (void *cls, | 206 | MHD_http_unescape (void *cls, |
207 | struct MHD_Connection *connection, | 207 | struct MHD_Connection *connection, |
208 | char *val); | 208 | char *val); |
@@ -833,6 +833,7 @@ struct MHD_Connection | |||
833 | * even though the socket is not? | 833 | * even though the socket is not? |
834 | */ | 834 | */ |
835 | int tls_read_ready; | 835 | int tls_read_ready; |
836 | #endif | ||
836 | 837 | ||
837 | /** | 838 | /** |
838 | * Is the connection suspended? | 839 | * Is the connection suspended? |
@@ -843,7 +844,6 @@ struct MHD_Connection | |||
843 | * Is the connection wanting to resume? | 844 | * Is the connection wanting to resume? |
844 | */ | 845 | */ |
845 | int resuming; | 846 | int resuming; |
846 | #endif | ||
847 | }; | 847 | }; |
848 | 848 | ||
849 | /** | 849 | /** |
@@ -854,7 +854,7 @@ struct MHD_Connection | |||
854 | * @param con connection handle | 854 | * @param con connection handle |
855 | * @return new closure | 855 | * @return new closure |
856 | */ | 856 | */ |
857 | typedef void * (*LogCallback)(void * cls, | 857 | typedef void * (*LogCallback)(void * cls, |
858 | const char * uri, | 858 | const char * uri, |
859 | struct MHD_Connection *con); | 859 | struct MHD_Connection *con); |
860 | 860 | ||
@@ -1088,7 +1088,7 @@ struct MHD_Daemon | |||
1088 | int epoll_fd; | 1088 | int epoll_fd; |
1089 | 1089 | ||
1090 | /** | 1090 | /** |
1091 | * MHD_YES if the listen socket is in the 'epoll' set, | 1091 | * MHD_YES if the listen socket is in the 'epoll' set, |
1092 | * MHD_NO if not. | 1092 | * MHD_NO if not. |
1093 | */ | 1093 | */ |
1094 | int listen_socket_in_epoll; | 1094 | int listen_socket_in_epoll; |