diff options
author | Christian Grothoff <christian@grothoff.org> | 2007-09-09 04:11:30 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2007-09-09 04:11:30 +0000 |
commit | 3750461e0ac7a17173c20e36f5469008341dbf86 (patch) | |
tree | 1afb4a0f6699cbb63974025f584c18a4ec4395bc | |
parent | 5176c75854736ad6514a76778cb81ba93bdfff71 (diff) | |
download | libmicrohttpd-3750461e0ac7a17173c20e36f5469008341dbf86.tar.gz libmicrohttpd-3750461e0ac7a17173c20e36f5469008341dbf86.zip |
better
-rw-r--r-- | src/daemon/daemontest_post.c | 6 | ||||
-rw-r--r-- | src/include/microhttpd.h | 21 |
2 files changed, 19 insertions, 8 deletions
diff --git a/src/daemon/daemontest_post.c b/src/daemon/daemontest_post.c index 00bec910..87eca380 100644 --- a/src/daemon/daemontest_post.c +++ b/src/daemon/daemontest_post.c | |||
@@ -71,7 +71,11 @@ copyBuffer (void *ptr, size_t size, size_t nmemb, void *ctx) | |||
71 | static int | 71 | static int |
72 | post_iterator (void *cls, | 72 | post_iterator (void *cls, |
73 | enum MHD_ValueKind kind, | 73 | enum MHD_ValueKind kind, |
74 | const char *key, const char *value, size_t off, size_t size) | 74 | const char *key, |
75 | const char *filename, | ||
76 | const char *content_type, | ||
77 | const char *transfer_encoding, | ||
78 | const char *value, size_t off, size_t size) | ||
75 | { | 79 | { |
76 | int *eok = cls; | 80 | int *eok = cls; |
77 | 81 | ||
diff --git a/src/include/microhttpd.h b/src/include/microhttpd.h index a7f846ca..9a298abc 100644 --- a/src/include/microhttpd.h +++ b/src/include/microhttpd.h | |||
@@ -84,7 +84,7 @@ extern "C" | |||
84 | /** | 84 | /** |
85 | * Current version of the library. | 85 | * Current version of the library. |
86 | */ | 86 | */ |
87 | #define MHD_VERSION 0x00000005 | 87 | #define MHD_VERSION 0x00000004 |
88 | 88 | ||
89 | /** | 89 | /** |
90 | * MHD-internal return codes. | 90 | * MHD-internal return codes. |
@@ -562,15 +562,19 @@ typedef void (*MHD_ContentReaderFreeCallback) (void *cls); | |||
562 | /** | 562 | /** |
563 | * Iterator over key-value pairs where the value | 563 | * Iterator over key-value pairs where the value |
564 | * maybe made available in increments and/or may | 564 | * maybe made available in increments and/or may |
565 | * not be zero-terminated. | 565 | * not be zero-terminated. Used for processing |
566 | * POST data. | ||
566 | * | 567 | * |
567 | * @param cls user-specified closure | 568 | * @param cls user-specified closure |
568 | * @param kind type of the value | 569 | * @param kind type of the value |
569 | * @param 0-terminated key for the value | 570 | * @param key 0-terminated key for the value |
570 | * @param value pointer to size bytes of data at the | 571 | * @param filename name of the uploaded file, NULL if not known |
572 | * @param content_type mime-type of the data, NULL if not known | ||
573 | * @param transfer_encoding encoding of the data, NULL if not known | ||
574 | * @param data pointer to size bytes of data at the | ||
571 | * specified offset | 575 | * specified offset |
572 | * @param off offset of value in the overall data | 576 | * @param off offset of data in the overall value |
573 | * @param size number of bytes in value available | 577 | * @param size number of bytes in data available |
574 | * @return MHD_YES to continue iterating, | 578 | * @return MHD_YES to continue iterating, |
575 | * MHD_NO to abort the iteration | 579 | * MHD_NO to abort the iteration |
576 | */ | 580 | */ |
@@ -578,7 +582,10 @@ typedef int | |||
578 | (*MHD_IncrementalKeyValueIterator) (void *cls, | 582 | (*MHD_IncrementalKeyValueIterator) (void *cls, |
579 | enum MHD_ValueKind kind, | 583 | enum MHD_ValueKind kind, |
580 | const char *key, | 584 | const char *key, |
581 | const char *value, | 585 | const char *filename, |
586 | const char *content_type, | ||
587 | const char *transfer_encoding, | ||
588 | const char *data, | ||
582 | size_t off, size_t size); | 589 | size_t off, size_t size); |
583 | 590 | ||
584 | /** | 591 | /** |