diff options
Diffstat (limited to 'doc')
-rw-r--r-- | doc/chapters/basicauthentication.inc | 2 | ||||
-rw-r--r-- | doc/chapters/exploringrequests.inc | 2 | ||||
-rw-r--r-- | doc/chapters/hellobrowser.inc | 2 | ||||
-rw-r--r-- | doc/chapters/largerpost.inc | 4 | ||||
-rw-r--r-- | doc/chapters/processingpost.inc | 4 | ||||
-rw-r--r-- | doc/chapters/responseheaders.inc | 2 | ||||
-rw-r--r-- | doc/examples/basicauthentication.c | 2 | ||||
-rw-r--r-- | doc/examples/hellobrowser.c | 2 | ||||
-rw-r--r-- | doc/examples/largepost.c | 4 | ||||
-rw-r--r-- | doc/examples/logging.c | 2 | ||||
-rw-r--r-- | doc/examples/responseheaders.c | 2 | ||||
-rw-r--r-- | doc/examples/simplepost.c | 4 | ||||
-rw-r--r-- | doc/examples/tlsauthentication.c | 2 | ||||
-rw-r--r-- | doc/microhttpd.texi | 18 |
14 files changed, 26 insertions, 26 deletions
diff --git a/doc/chapters/basicauthentication.inc b/doc/chapters/basicauthentication.inc index 6b7dcdc6..fc2e45ca 100644 --- a/doc/chapters/basicauthentication.inc +++ b/doc/chapters/basicauthentication.inc | |||
@@ -44,7 +44,7 @@ Not even the headers will be looked at on the first iteration. | |||
44 | @verbatim | 44 | @verbatim |
45 | int answer_to_connection (void *cls, struct MHD_Connection *connection, | 45 | int answer_to_connection (void *cls, struct MHD_Connection *connection, |
46 | const char *url, const char *method, const char *version, | 46 | const char *url, const char *method, const char *version, |
47 | const char *upload_data, unsigned int *upload_data_size, | 47 | const char *upload_data, size_t *upload_data_size, |
48 | void **con_cls) | 48 | void **con_cls) |
49 | { | 49 | { |
50 | if (0 != strcmp(method, "GET")) return MHD_NO; | 50 | if (0 != strcmp(method, "GET")) return MHD_NO; |
diff --git a/doc/chapters/exploringrequests.inc b/doc/chapters/exploringrequests.inc index 11a169dd..d8790025 100644 --- a/doc/chapters/exploringrequests.inc +++ b/doc/chapters/exploringrequests.inc | |||
@@ -11,7 +11,7 @@ without much ado by the server. | |||
11 | @verbatim | 11 | @verbatim |
12 | int answer_to_connection (void *cls, struct MHD_Connection *connection, const char *url, | 12 | int answer_to_connection (void *cls, struct MHD_Connection *connection, const char *url, |
13 | const char *method, const char *version, const char *upload_data, | 13 | const char *method, const char *version, const char *upload_data, |
14 | unsigned int *upload_data_size, void **con_cls) | 14 | size_t *upload_data_size, void **con_cls) |
15 | { | 15 | { |
16 | ... | 16 | ... |
17 | return MHD_NO; | 17 | return MHD_NO; |
diff --git a/doc/chapters/hellobrowser.inc b/doc/chapters/hellobrowser.inc index 611463e2..444fcd8e 100644 --- a/doc/chapters/hellobrowser.inc +++ b/doc/chapters/hellobrowser.inc | |||
@@ -37,7 +37,7 @@ Talking about the reply, it is defined as a string right after the function head | |||
37 | @verbatim | 37 | @verbatim |
38 | int answer_to_connection (void *cls, struct MHD_Connection *connection, const char *url, | 38 | int answer_to_connection (void *cls, struct MHD_Connection *connection, const char *url, |
39 | const char *method, const char *version, const char *upload_data, | 39 | const char *method, const char *version, const char *upload_data, |
40 | unsigned int *upload_data_size, void **con_cls) | 40 | size_t *upload_data_size, void **con_cls) |
41 | { | 41 | { |
42 | const char *page = "<html><body>Hello, browser!</body></html>"; | 42 | const char *page = "<html><body>Hello, browser!</body></html>"; |
43 | @end verbatim | 43 | @end verbatim |
diff --git a/doc/chapters/largerpost.inc b/doc/chapters/largerpost.inc index d05dd46d..f1f0e060 100644 --- a/doc/chapters/largerpost.inc +++ b/doc/chapters/largerpost.inc | |||
@@ -86,7 +86,7 @@ a postprocessor has been created and the post iterator is called at least once. | |||
86 | @verbatim | 86 | @verbatim |
87 | int answer_to_connection (void *cls, struct MHD_Connection *connection, const char *url, | 87 | int answer_to_connection (void *cls, struct MHD_Connection *connection, const char *url, |
88 | const char *method, const char *version, const char *upload_data, | 88 | const char *method, const char *version, const char *upload_data, |
89 | unsigned int *upload_data_size, void **con_cls) | 89 | size_t *upload_data_size, void **con_cls) |
90 | { | 90 | { |
91 | if (NULL == *con_cls) | 91 | if (NULL == *con_cls) |
92 | { | 92 | { |
@@ -195,7 +195,7 @@ the posted data has to be written to the correct file. That is why we store a fi | |||
195 | @verbatim | 195 | @verbatim |
196 | int iterate_post (void *coninfo_cls, enum MHD_ValueKind kind, const char *key, | 196 | int iterate_post (void *coninfo_cls, enum MHD_ValueKind kind, const char *key, |
197 | const char *filename, const char *content_type, | 197 | const char *filename, const char *content_type, |
198 | const char *transfer_encoding, const char *data, size_t off, size_t size) | 198 | const char *transfer_encoding, const char *data, uint64_t off, size_t size) |
199 | { | 199 | { |
200 | struct connection_info_struct *con_info = (struct connection_info_struct*) coninfo_cls; | 200 | struct connection_info_struct *con_info = (struct connection_info_struct*) coninfo_cls; |
201 | @end verbatim | 201 | @end verbatim |
diff --git a/doc/chapters/processingpost.inc b/doc/chapters/processingpost.inc index 0677c7e8..f1085ce8 100644 --- a/doc/chapters/processingpost.inc +++ b/doc/chapters/processingpost.inc | |||
@@ -75,7 +75,7 @@ came in. But in this example, the name is assumed to fit entirely inside one sin | |||
75 | @verbatim | 75 | @verbatim |
76 | int iterate_post (void *coninfo_cls, enum MHD_ValueKind kind, const char *key, | 76 | int iterate_post (void *coninfo_cls, enum MHD_ValueKind kind, const char *key, |
77 | const char *filename, const char *content_type, | 77 | const char *filename, const char *content_type, |
78 | const char *transfer_encoding, const char *data, size_t off, size_t size) | 78 | const char *transfer_encoding, const char *data, uint64_t off, size_t size) |
79 | { | 79 | { |
80 | struct connection_info_struct *con_info = (struct connection_info_struct*) coninfo_cls; | 80 | struct connection_info_struct *con_info = (struct connection_info_struct*) coninfo_cls; |
81 | 81 | ||
@@ -150,7 +150,7 @@ iterations and other functions. | |||
150 | @verbatim | 150 | @verbatim |
151 | int answer_to_connection (void *cls, struct MHD_Connection *connection, const char *url, | 151 | int answer_to_connection (void *cls, struct MHD_Connection *connection, const char *url, |
152 | const char *method, const char *version, const char *upload_data, | 152 | const char *method, const char *version, const char *upload_data, |
153 | unsigned int *upload_data_size, void **con_cls) | 153 | size_t *upload_data_size, void **con_cls) |
154 | { | 154 | { |
155 | if(NULL == *con_cls) | 155 | if(NULL == *con_cls) |
156 | { | 156 | { |
diff --git a/doc/chapters/responseheaders.inc b/doc/chapters/responseheaders.inc index 19d10142..3fb9ac15 100644 --- a/doc/chapters/responseheaders.inc +++ b/doc/chapters/responseheaders.inc | |||
@@ -25,7 +25,7 @@ Once again, we can base the new example on the @code{hellobrowser} program. | |||
25 | 25 | ||
26 | int answer_to_connection (void *cls, struct MHD_Connection *connection, const char *url, | 26 | int answer_to_connection (void *cls, struct MHD_Connection *connection, const char *url, |
27 | const char *method, const char *version, const char *upload_data, | 27 | const char *method, const char *version, const char *upload_data, |
28 | unsigned int *upload_data_size, void **con_cls) | 28 | size_t *upload_data_size, void **con_cls) |
29 | { | 29 | { |
30 | unsigned char *buffer = NULL; | 30 | unsigned char *buffer = NULL; |
31 | struct MHD_Response *response; | 31 | struct MHD_Response *response; |
diff --git a/doc/examples/basicauthentication.c b/doc/examples/basicauthentication.c index f8c80a35..389d8bb7 100644 --- a/doc/examples/basicauthentication.c +++ b/doc/examples/basicauthentication.c | |||
@@ -109,7 +109,7 @@ int | |||
109 | answer_to_connection (void *cls, struct MHD_Connection *connection, | 109 | answer_to_connection (void *cls, struct MHD_Connection *connection, |
110 | const char *url, const char *method, | 110 | const char *url, const char *method, |
111 | const char *version, const char *upload_data, | 111 | const char *version, const char *upload_data, |
112 | unsigned int *upload_data_size, void **con_cls) | 112 | size_t *upload_data_size, void **con_cls) |
113 | { | 113 | { |
114 | if (0 != strcmp (method, "GET")) | 114 | if (0 != strcmp (method, "GET")) |
115 | return MHD_NO; | 115 | return MHD_NO; |
diff --git a/doc/examples/hellobrowser.c b/doc/examples/hellobrowser.c index 63b8d310..0f2a6762 100644 --- a/doc/examples/hellobrowser.c +++ b/doc/examples/hellobrowser.c | |||
@@ -7,7 +7,7 @@ int | |||
7 | answer_to_connection (void *cls, struct MHD_Connection *connection, | 7 | answer_to_connection (void *cls, struct MHD_Connection *connection, |
8 | const char *url, const char *method, | 8 | const char *url, const char *method, |
9 | const char *version, const char *upload_data, | 9 | const char *version, const char *upload_data, |
10 | unsigned int *upload_data_size, void **con_cls) | 10 | size_t *upload_data_size, void **con_cls) |
11 | { | 11 | { |
12 | const char *page = "<html><body>Hello, browser!</body></html>"; | 12 | const char *page = "<html><body>Hello, browser!</body></html>"; |
13 | struct MHD_Response *response; | 13 | struct MHD_Response *response; |
diff --git a/doc/examples/largepost.c b/doc/examples/largepost.c index 7a9c1ef1..aadb3306 100644 --- a/doc/examples/largepost.c +++ b/doc/examples/largepost.c | |||
@@ -65,7 +65,7 @@ send_page (struct MHD_Connection *connection, const char *page, | |||
65 | int | 65 | int |
66 | iterate_post (void *coninfo_cls, enum MHD_ValueKind kind, const char *key, | 66 | iterate_post (void *coninfo_cls, enum MHD_ValueKind kind, const char *key, |
67 | const char *filename, const char *content_type, | 67 | const char *filename, const char *content_type, |
68 | const char *transfer_encoding, const char *data, size_t off, | 68 | const char *transfer_encoding, const char *data, uint64_t off, |
69 | size_t size) | 69 | size_t size) |
70 | { | 70 | { |
71 | FILE *fp; | 71 | FILE *fp; |
@@ -136,7 +136,7 @@ int | |||
136 | answer_to_connection (void *cls, struct MHD_Connection *connection, | 136 | answer_to_connection (void *cls, struct MHD_Connection *connection, |
137 | const char *url, const char *method, | 137 | const char *url, const char *method, |
138 | const char *version, const char *upload_data, | 138 | const char *version, const char *upload_data, |
139 | unsigned int *upload_data_size, void **con_cls) | 139 | size_t *upload_data_size, void **con_cls) |
140 | { | 140 | { |
141 | if (NULL == *con_cls) | 141 | if (NULL == *con_cls) |
142 | { | 142 | { |
diff --git a/doc/examples/logging.c b/doc/examples/logging.c index 2daaa4d0..1bb2b054 100644 --- a/doc/examples/logging.c +++ b/doc/examples/logging.c | |||
@@ -16,7 +16,7 @@ int | |||
16 | answer_to_connection (void *cls, struct MHD_Connection *connection, | 16 | answer_to_connection (void *cls, struct MHD_Connection *connection, |
17 | const char *url, const char *method, | 17 | const char *url, const char *method, |
18 | const char *version, const char *upload_data, | 18 | const char *version, const char *upload_data, |
19 | unsigned int *upload_data_size, void **con_cls) | 19 | size_t *upload_data_size, void **con_cls) |
20 | { | 20 | { |
21 | printf ("New request %s for %s using version %s\n", method, url, version); | 21 | printf ("New request %s for %s using version %s\n", method, url, version); |
22 | 22 | ||
diff --git a/doc/examples/responseheaders.c b/doc/examples/responseheaders.c index a94e4433..c83b4480 100644 --- a/doc/examples/responseheaders.c +++ b/doc/examples/responseheaders.c | |||
@@ -33,7 +33,7 @@ int | |||
33 | answer_to_connection (void *cls, struct MHD_Connection *connection, | 33 | answer_to_connection (void *cls, struct MHD_Connection *connection, |
34 | const char *url, const char *method, | 34 | const char *url, const char *method, |
35 | const char *version, const char *upload_data, | 35 | const char *version, const char *upload_data, |
36 | unsigned int *upload_data_size, void **con_cls) | 36 | size_t *upload_data_size, void **con_cls) |
37 | { | 37 | { |
38 | unsigned char *buffer = NULL; | 38 | unsigned char *buffer = NULL; |
39 | struct MHD_Response *response; | 39 | struct MHD_Response *response; |
diff --git a/doc/examples/simplepost.c b/doc/examples/simplepost.c index d8172b87..83c2f3cd 100644 --- a/doc/examples/simplepost.c +++ b/doc/examples/simplepost.c | |||
@@ -53,7 +53,7 @@ send_page (struct MHD_Connection *connection, const char *page) | |||
53 | int | 53 | int |
54 | iterate_post (void *coninfo_cls, enum MHD_ValueKind kind, const char *key, | 54 | iterate_post (void *coninfo_cls, enum MHD_ValueKind kind, const char *key, |
55 | const char *filename, const char *content_type, | 55 | const char *filename, const char *content_type, |
56 | const char *transfer_encoding, const char *data, size_t off, | 56 | const char *transfer_encoding, const char *data, uint64_t off, |
57 | size_t size) | 57 | size_t size) |
58 | { | 58 | { |
59 | struct connection_info_struct *con_info = | 59 | struct connection_info_struct *con_info = |
@@ -108,7 +108,7 @@ int | |||
108 | answer_to_connection (void *cls, struct MHD_Connection *connection, | 108 | answer_to_connection (void *cls, struct MHD_Connection *connection, |
109 | const char *url, const char *method, | 109 | const char *url, const char *method, |
110 | const char *version, const char *upload_data, | 110 | const char *version, const char *upload_data, |
111 | unsigned int *upload_data_size, void **con_cls) | 111 | size_t *upload_data_size, void **con_cls) |
112 | { | 112 | { |
113 | if (NULL == *con_cls) | 113 | if (NULL == *con_cls) |
114 | { | 114 | { |
diff --git a/doc/examples/tlsauthentication.c b/doc/examples/tlsauthentication.c index efbc6e06..efb1e37e 100644 --- a/doc/examples/tlsauthentication.c +++ b/doc/examples/tlsauthentication.c | |||
@@ -162,7 +162,7 @@ int | |||
162 | answer_to_connection (void *cls, struct MHD_Connection *connection, | 162 | answer_to_connection (void *cls, struct MHD_Connection *connection, |
163 | const char *url, const char *method, | 163 | const char *url, const char *method, |
164 | const char *version, const char *upload_data, | 164 | const char *version, const char *upload_data, |
165 | unsigned int *upload_data_size, void **con_cls) | 165 | size_t *upload_data_size, void **con_cls) |
166 | { | 166 | { |
167 | if (0 != strcmp (method, "GET")) | 167 | if (0 != strcmp (method, "GET")) |
168 | return MHD_NO; | 168 | return MHD_NO; |
diff --git a/doc/microhttpd.texi b/doc/microhttpd.texi index 65b7682b..fcc714bf 100644 --- a/doc/microhttpd.texi +++ b/doc/microhttpd.texi | |||
@@ -251,7 +251,7 @@ No more options / last option. This is used to terminate the VARARGs | |||
251 | list. | 251 | list. |
252 | 252 | ||
253 | @item MHD_OPTION_CONNECTION_MEMORY_LIMIT | 253 | @item MHD_OPTION_CONNECTION_MEMORY_LIMIT |
254 | Maximum memory size per connection (followed by an @code{unsigned int}). | 254 | Maximum memory size per connection (followed by a @code{size_t}). |
255 | 255 | ||
256 | @item MHD_OPTION_CONNECTION_LIMIT | 256 | @item MHD_OPTION_CONNECTION_LIMIT |
257 | Maximum number of concurrenct connections to accept (followed by an | 257 | Maximum number of concurrenct connections to accept (followed by an |
@@ -551,7 +551,7 @@ length of the address information. | |||
551 | @end deftypefn | 551 | @end deftypefn |
552 | 552 | ||
553 | 553 | ||
554 | @deftypefn {Function Pointer} int {*MHD_AccessHandlerCallback} (void *cls, struct MHD_Connection * connection, const char *url, const char *method, const char *version, const char *upload_data, unsigned int *upload_data_size, void **con_cls) | 554 | @deftypefn {Function Pointer} int {*MHD_AccessHandlerCallback} (void *cls, struct MHD_Connection * connection, const char *url, const char *method, const char *version, const char *upload_data, size_t *upload_data_size, void **con_cls) |
555 | Invoked in the context of a connection to answer a request from the | 555 | Invoked in the context of a connection to answer a request from the |
556 | client. This callback must call @mhd{} functions (example: the | 556 | client. This callback must call @mhd{} functions (example: the |
557 | @code{MHD_Response} ones) to provide content to give back to the client | 557 | @code{MHD_Response} ones) to provide content to give back to the client |
@@ -654,7 +654,7 @@ iteration. | |||
654 | @end deftypefn | 654 | @end deftypefn |
655 | 655 | ||
656 | 656 | ||
657 | @deftypefn {Function Pointer} int {*MHD_ContentReaderCallback} (void *cls, size_t pos, char *buf, int max) | 657 | @deftypefn {Function Pointer} int {*MHD_ContentReaderCallback} (void *cls, uint64_t pos, char *buf, int max) |
658 | Callback used by @mhd{} in order to obtain content. The callback has to | 658 | Callback used by @mhd{} in order to obtain content. The callback has to |
659 | copy at most @var{max} bytes of content into @var{buf}. The total | 659 | copy at most @var{max} bytes of content into @var{buf}. The total |
660 | number of bytes that has been placed into @var{buf} should be returned. | 660 | number of bytes that has been placed into @var{buf} should be returned. |
@@ -691,7 +691,7 @@ It should be used to free resources associated with the content reader. | |||
691 | @end deftypefn | 691 | @end deftypefn |
692 | 692 | ||
693 | 693 | ||
694 | @deftypefn {Function Pointer} int {*MHD_PostDataIterator} (void *cls, enum MHD_ValueKind kind, const char *key, const char *filename, const char *content_type, const char *transfer_encoding, const char *data, size_t off, size_t size) | 694 | @deftypefn {Function Pointer} int {*MHD_PostDataIterator} (void *cls, enum MHD_ValueKind kind, const char *key, const char *filename, const char *content_type, const char *transfer_encoding, const char *data, uint64_t off, size_t size) |
695 | Iterator over key-value pairs where the value maybe made available in | 695 | Iterator over key-value pairs where the value maybe made available in |
696 | increments and/or may not be zero-terminated. Used for processing | 696 | increments and/or may not be zero-terminated. Used for processing |
697 | @code{POST} data. | 697 | @code{POST} data. |
@@ -1005,7 +1005,7 @@ the @code{MHD_Response} object is released. | |||
1005 | @section Creating response objects | 1005 | @section Creating response objects |
1006 | 1006 | ||
1007 | 1007 | ||
1008 | @deftypefun {struct MHD_Response *} MHD_create_response_from_callback (size_t size, unsigned int block_size, MHD_ContentReaderCallback crc, void *crc_cls, MHD_ContentReaderFreeCallback crfc) | 1008 | @deftypefun {struct MHD_Response *} MHD_create_response_from_callback (uint64_t size, size_t block_size, MHD_ContentReaderCallback crc, void *crc_cls, MHD_ContentReaderFreeCallback crfc) |
1009 | Create a response object. The response object can be extended with | 1009 | Create a response object. The response object can be extended with |
1010 | header information and then it can be used any number of times. | 1010 | header information and then it can be used any number of times. |
1011 | 1011 | ||
@@ -1167,7 +1167,7 @@ access_handler (void *cls, | |||
1167 | struct MHD_Connection * connection, | 1167 | struct MHD_Connection * connection, |
1168 | const char *url, | 1168 | const char *url, |
1169 | const char *method, const char *version, | 1169 | const char *method, const char *version, |
1170 | const char *upload_data, unsigned int *upload_data_size, | 1170 | const char *upload_data, size_t *upload_data_size, |
1171 | void **con_cls) | 1171 | void **con_cls) |
1172 | @{ | 1172 | @{ |
1173 | static int old_connection_marker; | 1173 | static int old_connection_marker; |
@@ -1195,7 +1195,7 @@ access_handler (void *cls, | |||
1195 | struct MHD_Connection * connection, | 1195 | struct MHD_Connection * connection, |
1196 | const char *url, | 1196 | const char *url, |
1197 | const char *method, const char *version, | 1197 | const char *method, const char *version, |
1198 | const char *upload_data, unsigned int *upload_data_size, | 1198 | const char *upload_data, size_t *upload_data_size, |
1199 | void **con_cls) | 1199 | void **con_cls) |
1200 | @{ | 1200 | @{ |
1201 | struct MHD_PostProcessor * pp = *con_cls; | 1201 | struct MHD_PostProcessor * pp = *con_cls; |
@@ -1234,7 +1234,7 @@ always terminate normally. | |||
1234 | 1234 | ||
1235 | 1235 | ||
1236 | 1236 | ||
1237 | @deftypefun {struct MHD_PostProcessor *} MHD_create_post_processor (struct MHD_Connection *connection, unsigned int buffer_size, MHD_PostDataIterator iterator, void *iterator_cls) | 1237 | @deftypefun {struct MHD_PostProcessor *} MHD_create_post_processor (struct MHD_Connection *connection, size_t buffer_size, MHD_PostDataIterator iterator, void *iterator_cls) |
1238 | Create a PostProcessor. A PostProcessor can be used to (incrementally) | 1238 | Create a PostProcessor. A PostProcessor can be used to (incrementally) |
1239 | parse the data portion of a @code{POST} request. | 1239 | parse the data portion of a @code{POST} request. |
1240 | 1240 | ||
@@ -1261,7 +1261,7 @@ a PP handle. | |||
1261 | @end deftypefun | 1261 | @end deftypefun |
1262 | 1262 | ||
1263 | 1263 | ||
1264 | @deftypefun int MHD_post_process (struct MHD_PostProcessor *pp, const char *post_data, unsigned int post_data_len) | 1264 | @deftypefun int MHD_post_process (struct MHD_PostProcessor *pp, const char *post_data, size_t post_data_len) |
1265 | Parse and process @code{POST} data. Call this function when @code{POST} | 1265 | Parse and process @code{POST} data. Call this function when @code{POST} |
1266 | data is available (usually during an @code{MHD_AccessHandlerCallback}) | 1266 | data is available (usually during an @code{MHD_AccessHandlerCallback}) |
1267 | with the @var{upload_data} and @var{upload_data_size}. Whenever | 1267 | with the @var{upload_data} and @var{upload_data_size}. Whenever |