[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r8196 - in libmicrohttpd: . doc doc/chapters doc/examples s
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r8196 - in libmicrohttpd: . doc doc/chapters doc/examples src/daemon src/examples src/include src/testcurl src/testcurl/https src/testzzuf |
|
Date: |
Thu, 5 Feb 2009 23:12:34 -0700 (MST) |
Author: grothoff
Date: 2009-02-05 23:12:33 -0700 (Thu, 05 Feb 2009)
New Revision: 8196
Modified:
libmicrohttpd/ChangeLog
libmicrohttpd/configure.ac
libmicrohttpd/doc/chapters/basicauthentication.inc
libmicrohttpd/doc/chapters/exploringrequests.inc
libmicrohttpd/doc/chapters/hellobrowser.inc
libmicrohttpd/doc/chapters/largerpost.inc
libmicrohttpd/doc/chapters/processingpost.inc
libmicrohttpd/doc/chapters/responseheaders.inc
libmicrohttpd/doc/examples/basicauthentication.c
libmicrohttpd/doc/examples/hellobrowser.c
libmicrohttpd/doc/examples/largepost.c
libmicrohttpd/doc/examples/logging.c
libmicrohttpd/doc/examples/responseheaders.c
libmicrohttpd/doc/examples/simplepost.c
libmicrohttpd/doc/examples/tlsauthentication.c
libmicrohttpd/doc/microhttpd.texi
libmicrohttpd/src/daemon/connection.c
libmicrohttpd/src/daemon/daemon.c
libmicrohttpd/src/daemon/daemon_test.c
libmicrohttpd/src/daemon/internal.c
libmicrohttpd/src/daemon/internal.h
libmicrohttpd/src/daemon/memorypool.c
libmicrohttpd/src/daemon/memorypool.h
libmicrohttpd/src/daemon/postprocessor.c
libmicrohttpd/src/daemon/postprocessor_large_test.c
libmicrohttpd/src/daemon/postprocessor_test.c
libmicrohttpd/src/daemon/response.c
libmicrohttpd/src/examples/fileserver_example.c
libmicrohttpd/src/examples/fileserver_example_external_select.c
libmicrohttpd/src/examples/https_fileserver_example.c
libmicrohttpd/src/examples/minimal_example_comet.c
libmicrohttpd/src/include/microhttpd.h
libmicrohttpd/src/include/platform.h
libmicrohttpd/src/testcurl/daemon_options_test.c
libmicrohttpd/src/testcurl/daemontest_get.c
libmicrohttpd/src/testcurl/daemontest_get_chunked.c
libmicrohttpd/src/testcurl/daemontest_large_put.c
libmicrohttpd/src/testcurl/daemontest_long_header.c
libmicrohttpd/src/testcurl/daemontest_parse_cookies.c
libmicrohttpd/src/testcurl/daemontest_post.c
libmicrohttpd/src/testcurl/daemontest_post_loop.c
libmicrohttpd/src/testcurl/daemontest_postform.c
libmicrohttpd/src/testcurl/daemontest_process_arguments.c
libmicrohttpd/src/testcurl/daemontest_process_headers.c
libmicrohttpd/src/testcurl/daemontest_put.c
libmicrohttpd/src/testcurl/daemontest_put_chunked.c
libmicrohttpd/src/testcurl/https/mhds_session_info_test.c
libmicrohttpd/src/testcurl/https/tls_cipher_change_test.c
libmicrohttpd/src/testcurl/https/tls_test_common.c
libmicrohttpd/src/testzzuf/daemontest_get.c
libmicrohttpd/src/testzzuf/daemontest_get_chunked.c
libmicrohttpd/src/testzzuf/daemontest_large_put.c
libmicrohttpd/src/testzzuf/daemontest_long_header.c
libmicrohttpd/src/testzzuf/daemontest_post.c
libmicrohttpd/src/testzzuf/daemontest_postform.c
libmicrohttpd/src/testzzuf/daemontest_put.c
libmicrohttpd/src/testzzuf/daemontest_put_chunked.c
Log:
incompatible API change to allow 64-bit uploads and downloads on 32-bit systems
Modified: libmicrohttpd/ChangeLog
===================================================================
--- libmicrohttpd/ChangeLog 2009-02-06 03:22:00 UTC (rev 8195)
+++ libmicrohttpd/ChangeLog 2009-02-06 06:12:33 UTC (rev 8196)
@@ -1,3 +1,17 @@
+Thu Feb 5 22:43:45 MST 2009
+ Incompatible API change to allow 64-bit uploads and downloads.
+ Clients must use "uint64_t" for the "pos"
+ argument (MHD_ContentReaderCallback) and the "off"
+ argument (MHD_PostDataIterator) and the "size"
+ argument (MHD_create_response_from_callback) now.
+ Also, "unsigned int" was changed to "size_t" for
+ the "upload_data_size" argument (MHD_AccessHandlerCallback),
+ the argument to MHD_OPTION_CONNECTION_MEMORY_LIMIT,
+ the "block_size" argument (MHD_create_response_from_callback),
+ the "buffer_size" argument (MHD_create_post_processor) and
+ the "post_data_len" argument (MHD_post_process). You may
+ need to #include <stdint.h> before <microhttpd.h> from now on. -CG
+
Thu Feb 5 20:21:08 MST 2009
Allow getting address information about the connecting
client after the accept call. -CG
Modified: libmicrohttpd/configure.ac
===================================================================
--- libmicrohttpd/configure.ac 2009-02-06 03:22:00 UTC (rev 8195)
+++ libmicrohttpd/configure.ac 2009-02-06 06:12:33 UTC (rev 8196)
@@ -27,8 +27,8 @@
AH_TOP([#define _GNU_SOURCE 1])
-LIB_VERSION_CURRENT=4
-LIB_VERSION_REVISION=3
+LIB_VERSION_CURRENT=5
+LIB_VERSION_REVISION=0
LIB_VERSION_AGE=0
AC_SUBST(LIB_VERSION_CURRENT)
AC_SUBST(LIB_VERSION_REVISION)
Modified: libmicrohttpd/doc/chapters/basicauthentication.inc
===================================================================
--- libmicrohttpd/doc/chapters/basicauthentication.inc 2009-02-06 03:22:00 UTC
(rev 8195)
+++ libmicrohttpd/doc/chapters/basicauthentication.inc 2009-02-06 06:12:33 UTC
(rev 8196)
@@ -44,7 +44,7 @@
@verbatim
int answer_to_connection (void *cls, struct MHD_Connection *connection,
const char *url, const char *method, const char
*version,
- const char *upload_data, unsigned int
*upload_data_size,
+ const char *upload_data, size_t *upload_data_size,
void **con_cls)
{
if (0 != strcmp(method, "GET")) return MHD_NO;
Modified: libmicrohttpd/doc/chapters/exploringrequests.inc
===================================================================
--- libmicrohttpd/doc/chapters/exploringrequests.inc 2009-02-06 03:22:00 UTC
(rev 8195)
+++ libmicrohttpd/doc/chapters/exploringrequests.inc 2009-02-06 06:12:33 UTC
(rev 8196)
@@ -11,7 +11,7 @@
@verbatim
int answer_to_connection (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)
+ size_t *upload_data_size, void **con_cls)
{
...
return MHD_NO;
Modified: libmicrohttpd/doc/chapters/hellobrowser.inc
===================================================================
--- libmicrohttpd/doc/chapters/hellobrowser.inc 2009-02-06 03:22:00 UTC (rev
8195)
+++ libmicrohttpd/doc/chapters/hellobrowser.inc 2009-02-06 06:12:33 UTC (rev
8196)
@@ -37,7 +37,7 @@
@verbatim
int answer_to_connection (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)
+ size_t *upload_data_size, void **con_cls)
{
const char *page = "<html><body>Hello, browser!</body></html>";
@end verbatim
Modified: libmicrohttpd/doc/chapters/largerpost.inc
===================================================================
--- libmicrohttpd/doc/chapters/largerpost.inc 2009-02-06 03:22:00 UTC (rev
8195)
+++ libmicrohttpd/doc/chapters/largerpost.inc 2009-02-06 06:12:33 UTC (rev
8196)
@@ -86,7 +86,7 @@
@verbatim
int answer_to_connection (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)
+ size_t *upload_data_size, void **con_cls)
{
if (NULL == *con_cls)
{
@@ -195,7 +195,7 @@
@verbatim
int iterate_post (void *coninfo_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)
+ const char *transfer_encoding, const char *data, uint64_t
off, size_t size)
{
struct connection_info_struct *con_info = (struct connection_info_struct*)
coninfo_cls;
@end verbatim
Modified: libmicrohttpd/doc/chapters/processingpost.inc
===================================================================
--- libmicrohttpd/doc/chapters/processingpost.inc 2009-02-06 03:22:00 UTC
(rev 8195)
+++ libmicrohttpd/doc/chapters/processingpost.inc 2009-02-06 06:12:33 UTC
(rev 8196)
@@ -75,7 +75,7 @@
@verbatim
int iterate_post (void *coninfo_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)
+ const char *transfer_encoding, const char *data, uint64_t
off, size_t size)
{
struct connection_info_struct *con_info = (struct connection_info_struct*)
coninfo_cls;
@@ -150,7 +150,7 @@
@verbatim
int answer_to_connection (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)
+ size_t *upload_data_size, void **con_cls)
{
if(NULL == *con_cls)
{
Modified: libmicrohttpd/doc/chapters/responseheaders.inc
===================================================================
--- libmicrohttpd/doc/chapters/responseheaders.inc 2009-02-06 03:22:00 UTC
(rev 8195)
+++ libmicrohttpd/doc/chapters/responseheaders.inc 2009-02-06 06:12:33 UTC
(rev 8196)
@@ -25,7 +25,7 @@
int answer_to_connection (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)
+ size_t *upload_data_size, void **con_cls)
{
unsigned char *buffer = NULL;
struct MHD_Response *response;
Modified: libmicrohttpd/doc/examples/basicauthentication.c
===================================================================
--- libmicrohttpd/doc/examples/basicauthentication.c 2009-02-06 03:22:00 UTC
(rev 8195)
+++ libmicrohttpd/doc/examples/basicauthentication.c 2009-02-06 06:12:33 UTC
(rev 8196)
@@ -109,7 +109,7 @@
answer_to_connection (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)
+ size_t *upload_data_size, void **con_cls)
{
if (0 != strcmp (method, "GET"))
return MHD_NO;
Modified: libmicrohttpd/doc/examples/hellobrowser.c
===================================================================
--- libmicrohttpd/doc/examples/hellobrowser.c 2009-02-06 03:22:00 UTC (rev
8195)
+++ libmicrohttpd/doc/examples/hellobrowser.c 2009-02-06 06:12:33 UTC (rev
8196)
@@ -7,7 +7,7 @@
answer_to_connection (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)
+ size_t *upload_data_size, void **con_cls)
{
const char *page = "<html><body>Hello, browser!</body></html>";
struct MHD_Response *response;
Modified: libmicrohttpd/doc/examples/largepost.c
===================================================================
--- libmicrohttpd/doc/examples/largepost.c 2009-02-06 03:22:00 UTC (rev
8195)
+++ libmicrohttpd/doc/examples/largepost.c 2009-02-06 06:12:33 UTC (rev
8196)
@@ -65,7 +65,7 @@
int
iterate_post (void *coninfo_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,
+ const char *transfer_encoding, const char *data, uint64_t off,
size_t size)
{
FILE *fp;
@@ -136,7 +136,7 @@
answer_to_connection (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)
+ size_t *upload_data_size, void **con_cls)
{
if (NULL == *con_cls)
{
Modified: libmicrohttpd/doc/examples/logging.c
===================================================================
--- libmicrohttpd/doc/examples/logging.c 2009-02-06 03:22:00 UTC (rev
8195)
+++ libmicrohttpd/doc/examples/logging.c 2009-02-06 06:12:33 UTC (rev
8196)
@@ -16,7 +16,7 @@
answer_to_connection (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)
+ size_t *upload_data_size, void **con_cls)
{
printf ("New request %s for %s using version %s\n", method, url, version);
Modified: libmicrohttpd/doc/examples/responseheaders.c
===================================================================
--- libmicrohttpd/doc/examples/responseheaders.c 2009-02-06 03:22:00 UTC
(rev 8195)
+++ libmicrohttpd/doc/examples/responseheaders.c 2009-02-06 06:12:33 UTC
(rev 8196)
@@ -33,7 +33,7 @@
answer_to_connection (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)
+ size_t *upload_data_size, void **con_cls)
{
unsigned char *buffer = NULL;
struct MHD_Response *response;
Modified: libmicrohttpd/doc/examples/simplepost.c
===================================================================
--- libmicrohttpd/doc/examples/simplepost.c 2009-02-06 03:22:00 UTC (rev
8195)
+++ libmicrohttpd/doc/examples/simplepost.c 2009-02-06 06:12:33 UTC (rev
8196)
@@ -53,7 +53,7 @@
int
iterate_post (void *coninfo_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,
+ const char *transfer_encoding, const char *data, uint64_t off,
size_t size)
{
struct connection_info_struct *con_info =
@@ -108,7 +108,7 @@
answer_to_connection (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)
+ size_t *upload_data_size, void **con_cls)
{
if (NULL == *con_cls)
{
Modified: libmicrohttpd/doc/examples/tlsauthentication.c
===================================================================
--- libmicrohttpd/doc/examples/tlsauthentication.c 2009-02-06 03:22:00 UTC
(rev 8195)
+++ libmicrohttpd/doc/examples/tlsauthentication.c 2009-02-06 06:12:33 UTC
(rev 8196)
@@ -162,7 +162,7 @@
answer_to_connection (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)
+ size_t *upload_data_size, void **con_cls)
{
if (0 != strcmp (method, "GET"))
return MHD_NO;
Modified: libmicrohttpd/doc/microhttpd.texi
===================================================================
--- libmicrohttpd/doc/microhttpd.texi 2009-02-06 03:22:00 UTC (rev 8195)
+++ libmicrohttpd/doc/microhttpd.texi 2009-02-06 06:12:33 UTC (rev 8196)
@@ -251,7 +251,7 @@
list.
@item MHD_OPTION_CONNECTION_MEMORY_LIMIT
-Maximum memory size per connection (followed by an @code{unsigned int}).
+Maximum memory size per connection (followed by a @code{size_t}).
@item MHD_OPTION_CONNECTION_LIMIT
Maximum number of concurrenct connections to accept (followed by an
@@ -551,7 +551,7 @@
@end deftypefn
address@hidden {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)
address@hidden {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)
Invoked in the context of a connection to answer a request from the
client. This callback must call @mhd{} functions (example: the
@code{MHD_Response} ones) to provide content to give back to the client
@@ -654,7 +654,7 @@
@end deftypefn
address@hidden {Function Pointer} int {*MHD_ContentReaderCallback} (void *cls,
size_t pos, char *buf, int max)
address@hidden {Function Pointer} int {*MHD_ContentReaderCallback} (void *cls,
uint64_t pos, char *buf, int max)
Callback used by @mhd{} in order to obtain content. The callback has to
copy at most @var{max} bytes of content into @var{buf}. The total
number of bytes that has been placed into @var{buf} should be returned.
@@ -691,7 +691,7 @@
@end deftypefn
address@hidden {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)
address@hidden {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)
Iterator over key-value pairs where the value maybe made available in
increments and/or may not be zero-terminated. Used for processing
@code{POST} data.
@@ -1005,7 +1005,7 @@
@section Creating response objects
address@hidden {struct MHD_Response *} MHD_create_response_from_callback
(size_t size, unsigned int block_size, MHD_ContentReaderCallback crc, void
*crc_cls, MHD_ContentReaderFreeCallback crfc)
address@hidden {struct MHD_Response *} MHD_create_response_from_callback
(uint64_t size, size_t block_size, MHD_ContentReaderCallback crc, void
*crc_cls, MHD_ContentReaderFreeCallback crfc)
Create a response object. The response object can be extended with
header information and then it can be used any number of times.
@@ -1167,7 +1167,7 @@
struct MHD_Connection * connection,
const char *url,
const char *method, const char *version,
- const char *upload_data, unsigned int *upload_data_size,
+ const char *upload_data, size_t *upload_data_size,
void **con_cls)
@{
static int old_connection_marker;
@@ -1195,7 +1195,7 @@
struct MHD_Connection * connection,
const char *url,
const char *method, const char *version,
- const char *upload_data, unsigned int *upload_data_size,
+ const char *upload_data, size_t *upload_data_size,
void **con_cls)
@{
struct MHD_PostProcessor * pp = *con_cls;
@@ -1234,7 +1234,7 @@
address@hidden {struct MHD_PostProcessor *} MHD_create_post_processor (struct
MHD_Connection *connection, unsigned int buffer_size, MHD_PostDataIterator
iterator, void *iterator_cls)
address@hidden {struct MHD_PostProcessor *} MHD_create_post_processor (struct
MHD_Connection *connection, size_t buffer_size, MHD_PostDataIterator iterator,
void *iterator_cls)
Create a PostProcessor. A PostProcessor can be used to (incrementally)
parse the data portion of a @code{POST} request.
@@ -1261,7 +1261,7 @@
@end deftypefun
address@hidden int MHD_post_process (struct MHD_PostProcessor *pp, const char
*post_data, unsigned int post_data_len)
address@hidden int MHD_post_process (struct MHD_PostProcessor *pp, const char
*post_data, size_t post_data_len)
Parse and process @code{POST} data. Call this function when @code{POST}
data is available (usually during an @code{MHD_AccessHandlerCallback})
with the @var{upload_data} and @var{upload_data_size}. Whenever
Modified: libmicrohttpd/src/daemon/connection.c
===================================================================
--- libmicrohttpd/src/daemon/connection.c 2009-02-06 03:22:00 UTC (rev
8195)
+++ libmicrohttpd/src/daemon/connection.c 2009-02-06 06:12:33 UTC (rev
8196)
@@ -366,7 +366,7 @@
int ret;
char *buf;
struct MHD_Response *response;
- unsigned int size;
+ size_t size;
char cbuf[10]; /* 10: max strlen of "%x\r\n" */
int cblen;
@@ -466,7 +466,8 @@
MHD_HTTP_HEADER_CONTENT_LENGTH))
{
SPRINTF (buf,
- "%llu", (unsigned long long) connection->response->total_size);
+ "%llu",
+ connection->response->total_size);
MHD_add_response_header (connection->response,
MHD_HTTP_HEADER_CONTENT_LENGTH, buf);
}
@@ -1087,11 +1088,11 @@
static void
call_connection_handler (struct MHD_Connection *connection)
{
- unsigned int processed;
- unsigned int available;
- unsigned int used;
+ size_t processed;
+ size_t available;
+ size_t used;
+ size_t i;
int instant_retry;
- unsigned int i;
int malformed;
char *buffer_head;
Modified: libmicrohttpd/src/daemon/daemon.c
===================================================================
--- libmicrohttpd/src/daemon/daemon.c 2009-02-06 03:22:00 UTC (rev 8195)
+++ libmicrohttpd/src/daemon/daemon.c 2009-02-06 06:12:33 UTC (rev 8196)
@@ -861,7 +861,7 @@
switch (opt)
{
case MHD_OPTION_CONNECTION_MEMORY_LIMIT:
- retVal->pool_size = va_arg (ap, unsigned int);
+ retVal->pool_size = va_arg (ap, size_t);
break;
case MHD_OPTION_CONNECTION_LIMIT:
retVal->max_connections = va_arg (ap, unsigned int);
Modified: libmicrohttpd/src/daemon/daemon_test.c
===================================================================
--- libmicrohttpd/src/daemon/daemon_test.c 2009-02-06 03:22:00 UTC (rev
8195)
+++ libmicrohttpd/src/daemon/daemon_test.c 2009-02-06 06:12:33 UTC (rev
8196)
@@ -65,7 +65,7 @@
const char *url,
const char *method,
const char *version,
- const char *upload_data, unsigned int *upload_data_size,
+ const char *upload_data, size_t *upload_data_size,
void **unused)
{
return MHD_NO;
Modified: libmicrohttpd/src/daemon/internal.c
===================================================================
--- libmicrohttpd/src/daemon/internal.c 2009-02-06 03:22:00 UTC (rev 8195)
+++ libmicrohttpd/src/daemon/internal.c 2009-02-06 06:12:33 UTC (rev 8196)
@@ -118,7 +118,7 @@
/**
* Process escape sequences ('+'=space, %HH)
*/
-unsigned int
+size_t
MHD_http_unescape (char *val)
{
char *rpos = val;
Modified: libmicrohttpd/src/daemon/internal.h
===================================================================
--- libmicrohttpd/src/daemon/internal.h 2009-02-06 03:22:00 UTC (rev 8195)
+++ libmicrohttpd/src/daemon/internal.h 2009-02-06 06:12:33 UTC (rev 8196)
@@ -62,7 +62,7 @@
* @return length of the resulting val (strlen(val) maybe
* shorter afterwards due to elimination of escape sequences)
*/
-unsigned int MHD_http_unescape (char *val);
+size_t MHD_http_unescape (char *val);
/**
* Header or cookie in HTTP request or response.
@@ -145,7 +145,7 @@
/**
* Set to -1 if size is not known.
*/
- size_t total_size;
+ uint64_t total_size;
/**
* Size of data.
@@ -161,7 +161,7 @@
* At what offset in the stream is the
* beginning of data located?
*/
- size_t data_start;
+ uint64_t data_start;
};
@@ -485,14 +485,14 @@
* How many more bytes of the body do we expect
* to read? "-1" for unknown.
*/
- size_t remaining_upload_size;
+ uint64_t remaining_upload_size;
/**
* Current write position in the actual response
* (excluding headers, content only; should be 0
* while sending headers).
*/
- size_t response_write_position;
+ uint64_t response_write_position;
/**
* Position in the 100 CONTINUE message that
@@ -699,7 +699,7 @@
/**
* Size of the per-connection memory pools.
*/
- unsigned int pool_size;
+ size_t pool_size;
/**
* Limit on the number of parallel connections.
Modified: libmicrohttpd/src/daemon/memorypool.c
===================================================================
--- libmicrohttpd/src/daemon/memorypool.c 2009-02-06 03:22:00 UTC (rev
8195)
+++ libmicrohttpd/src/daemon/memorypool.c 2009-02-06 06:12:33 UTC (rev
8196)
@@ -1,6 +1,6 @@
/*
This file is part of libmicrohttpd
- (C) 2007 Daniel Pittman and Christian Grothoff
+ (C) 2007, 2009 Daniel Pittman and Christian Grothoff
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -44,17 +44,17 @@
/**
* Size of the pool.
*/
- unsigned int size;
+ size_t size;
/**
* Offset of the first unallocated byte.
*/
- unsigned int pos;
+ size_t pos;
/**
* Offset of the last unallocated byte.
*/
- unsigned int end;
+ size_t end;
/**
* MHD_NO if pool was malloc'ed, MHD_YES if mmapped.
@@ -68,7 +68,7 @@
* @param max maximum size of the pool
*/
struct MemoryPool *
-MHD_pool_create (unsigned int max)
+MHD_pool_create (size_t max)
{
struct MemoryPool *pool;
@@ -122,7 +122,8 @@
* bytes
*/
void *
-MHD_pool_allocate (struct MemoryPool *pool, unsigned int size, int from_end)
+MHD_pool_allocate (struct MemoryPool *pool,
+ size_t size, int from_end)
{
void *ret;
@@ -159,7 +160,9 @@
*/
void *
MHD_pool_reallocate (struct MemoryPool *pool,
- void *old, unsigned int old_size, unsigned int new_size)
+ void *old,
+ size_t old_size,
+ size_t new_size)
{
void *ret;
@@ -204,7 +207,9 @@
* @return addr new address of "keep" (if it had to change)
*/
void *
-MHD_pool_reset (struct MemoryPool *pool, void *keep, unsigned int size)
+MHD_pool_reset (struct MemoryPool *pool,
+ void *keep,
+ size_t size)
{
if (keep != NULL)
{
Modified: libmicrohttpd/src/daemon/memorypool.h
===================================================================
--- libmicrohttpd/src/daemon/memorypool.h 2009-02-06 03:22:00 UTC (rev
8195)
+++ libmicrohttpd/src/daemon/memorypool.h 2009-02-06 06:12:33 UTC (rev
8196)
@@ -1,6 +1,6 @@
/*
This file is part of libmicrohttpd
- (C) 2007 Daniel Pittman and Christian Grothoff
+ (C) 2007, 2009 Daniel Pittman and Christian Grothoff
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -42,7 +42,7 @@
*
* @param max maximum size of the pool
*/
-struct MemoryPool *MHD_pool_create (unsigned int max);
+struct MemoryPool *MHD_pool_create (size_t max);
/**
* Destroy a memory pool.
@@ -59,7 +59,7 @@
* bytes
*/
void *MHD_pool_allocate (struct MemoryPool *pool,
- unsigned int size, int from_end);
+ size_t size, int from_end);
/**
* Reallocate a block of memory obtained from the pool.
@@ -79,7 +79,8 @@
*/
void *MHD_pool_reallocate (struct MemoryPool *pool,
void *old,
- unsigned int old_size, unsigned int new_size);
+ size_t old_size,
+ size_t new_size);
/**
* Clear all entries from the memory pool except
@@ -89,6 +90,8 @@
* @param size how many bytes need to be kept at this address
* @return addr new address of "keep" (if it had to change)
*/
-void *MHD_pool_reset (struct MemoryPool *pool, void *keep, unsigned int size);
+void *MHD_pool_reset (struct MemoryPool *pool,
+ void *keep,
+ size_t size);
#endif
Modified: libmicrohttpd/src/daemon/postprocessor.c
===================================================================
--- libmicrohttpd/src/daemon/postprocessor.c 2009-02-06 03:22:00 UTC (rev
8195)
+++ libmicrohttpd/src/daemon/postprocessor.c 2009-02-06 06:12:33 UTC (rev
8196)
@@ -172,22 +172,22 @@
/**
* Size of our buffer for the key.
*/
- unsigned int buffer_size;
+ size_t buffer_size;
/**
* Current position in the key buffer.
*/
- unsigned int buffer_pos;
+ size_t buffer_pos;
/**
* Current position in xbuf.
*/
- unsigned int xbuf_pos;
+ size_t xbuf_pos;
/**
* Current offset in the value being processed.
*/
- unsigned int value_offset;
+ uint64_t value_offset;
/**
* strlen(boundary) -- if boundary != NULL.
@@ -247,7 +247,7 @@
*/
struct MHD_PostProcessor *
MHD_create_post_processor (struct MHD_Connection *connection,
- unsigned int buffer_size,
+ size_t buffer_size,
MHD_PostDataIterator ikvi, void *cls)
{
struct MHD_PostProcessor *ret;
@@ -304,13 +304,14 @@
*/
static int
post_process_urlencoded (struct MHD_PostProcessor *pp,
- const char *post_data, unsigned int post_data_len)
+ const char *post_data,
+ size_t post_data_len)
{
- unsigned int equals;
- unsigned int amper;
- unsigned int poff;
- unsigned int xoff;
- unsigned int delta;
+ size_t equals;
+ size_t amper;
+ size_t poff;
+ size_t xoff;
+ size_t delta;
int end_of_value_found;
char *buf;
char xbuf[XBUF_SIZE + 1];
@@ -472,7 +473,7 @@
find_boundary (struct MHD_PostProcessor *pp,
const char *boundary,
size_t blen,
- unsigned int *ioffptr,
+ size_t *ioffptr,
enum PP_State next_state, enum PP_State next_dash_state)
{
char *buf = (char *) &pp[1];
@@ -554,10 +555,10 @@
*/
static int
process_multipart_headers (struct MHD_PostProcessor *pp,
- unsigned int *ioffptr, enum PP_State next_state)
+ size_t *ioffptr, enum PP_State next_state)
{
char *buf = (char *) &pp[1];
- unsigned int newline;
+ size_t newline;
newline = 0;
while ((newline < pp->buffer_pos) &&
@@ -615,14 +616,14 @@
*/
static int
process_value_to_boundary (struct MHD_PostProcessor *pp,
- unsigned int *ioffptr,
+ size_t *ioffptr,
const char *boundary,
size_t blen,
enum PP_State next_state,
enum PP_State next_dash_state)
{
char *buf = (char *) &pp[1];
- unsigned int newline;
+ size_t newline;
/* all data in buf until the boundary
(\r\n--+boundary) is part of the value */
@@ -716,12 +717,13 @@
*/
static int
post_process_multipart (struct MHD_PostProcessor *pp,
- const char *post_data, unsigned int post_data_len)
+ const char *post_data,
+ size_t post_data_len)
{
char *buf;
- unsigned int max;
- unsigned int ioff;
- unsigned int poff;
+ size_t max;
+ size_t ioff;
+ size_t poff;
int state_changed;
buf = (char *) &pp[1];
@@ -999,7 +1001,7 @@
*/
int
MHD_post_process (struct MHD_PostProcessor *pp,
- const char *post_data, unsigned int post_data_len)
+ const char *post_data, size_t post_data_len)
{
if (post_data_len == 0)
return MHD_YES;
Modified: libmicrohttpd/src/daemon/postprocessor_large_test.c
===================================================================
--- libmicrohttpd/src/daemon/postprocessor_large_test.c 2009-02-06 03:22:00 UTC
(rev 8195)
+++ libmicrohttpd/src/daemon/postprocessor_large_test.c 2009-02-06 06:12:33 UTC
(rev 8196)
@@ -39,12 +39,12 @@
const char *filename,
const char *content_type,
const char *transfer_encoding,
- const char *data, size_t off, size_t size)
+ const char *data, uint64_t off, size_t size)
{
unsigned int *pos = cls;
#if 0
fprintf (stderr,
- "VC: %u %u `%s' `%s' `%s' `%s' `%.*s'\n",
+ "VC: %llu %u `%s' `%s' `%s' `%s' `%.*s'\n",
off, size,
key, filename, content_type, transfer_encoding, size, data);
#endif
Modified: libmicrohttpd/src/daemon/postprocessor_test.c
===================================================================
--- libmicrohttpd/src/daemon/postprocessor_test.c 2009-02-06 03:22:00 UTC
(rev 8195)
+++ libmicrohttpd/src/daemon/postprocessor_test.c 2009-02-06 06:12:33 UTC
(rev 8196)
@@ -79,7 +79,7 @@
const char *filename,
const char *content_type,
const char *transfer_encoding,
- const char *data, size_t off, size_t size)
+ const char *data, uint64_t off, size_t size)
{
int *want_off = cls;
int idx = *want_off;
Modified: libmicrohttpd/src/daemon/response.c
===================================================================
--- libmicrohttpd/src/daemon/response.c 2009-02-06 03:22:00 UTC (rev 8195)
+++ libmicrohttpd/src/daemon/response.c 2009-02-06 06:12:33 UTC (rev 8196)
@@ -1,6 +1,6 @@
/*
This file is part of libmicrohttpd
- (C) 2007 Daniel Pittman and Christian Grothoff
+ (C) 2007, 2009 Daniel Pittman and Christian Grothoff
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -175,8 +175,8 @@
* @return NULL on error (i.e. invalid arguments, out of memory)
*/
struct MHD_Response *
-MHD_create_response_from_callback (size_t size,
- unsigned int block_size,
+MHD_create_response_from_callback (uint64_t size,
+ size_t block_size,
MHD_ContentReaderCallback crc,
void *crc_cls,
MHD_ContentReaderFreeCallback crfc)
Modified: libmicrohttpd/src/examples/fileserver_example.c
===================================================================
--- libmicrohttpd/src/examples/fileserver_example.c 2009-02-06 03:22:00 UTC
(rev 8195)
+++ libmicrohttpd/src/examples/fileserver_example.c 2009-02-06 06:12:33 UTC
(rev 8196)
@@ -30,7 +30,7 @@
#define PAGE "<html><head><title>File not found</title></head><body>File not
found</body></html>"
static int
-file_reader (void *cls, size_t pos, char *buf, int max)
+file_reader (void *cls, uint64_t pos, char *buf, int max)
{
FILE *file = cls;
Modified: libmicrohttpd/src/examples/fileserver_example_external_select.c
===================================================================
--- libmicrohttpd/src/examples/fileserver_example_external_select.c
2009-02-06 03:22:00 UTC (rev 8195)
+++ libmicrohttpd/src/examples/fileserver_example_external_select.c
2009-02-06 06:12:33 UTC (rev 8196)
@@ -30,7 +30,7 @@
#define PAGE "<html><head><title>File not found</title></head><body>File not
found</body></html>"
static int
-file_reader (void *cls, size_t pos, char *buf, int max)
+file_reader (void *cls, uint64_t pos, char *buf, int max)
{
FILE *file = cls;
Modified: libmicrohttpd/src/examples/https_fileserver_example.c
===================================================================
--- libmicrohttpd/src/examples/https_fileserver_example.c 2009-02-06
03:22:00 UTC (rev 8195)
+++ libmicrohttpd/src/examples/https_fileserver_example.c 2009-02-06
06:12:33 UTC (rev 8196)
@@ -97,7 +97,7 @@
"-----END RSA PRIVATE KEY-----\n";
static int
-file_reader (void *cls, size_t pos, char *buf, int max)
+file_reader (void *cls, uint64_t pos, char *buf, int max)
{
FILE *file = cls;
@@ -112,7 +112,7 @@
const char *url,
const char *method,
const char *upload_data,
- const char *version, unsigned int *upload_data_size, void **ptr)
+ const char *version, size_t *upload_data_size, void **ptr)
{
static int aptr;
struct MHD_Response *response;
Modified: libmicrohttpd/src/examples/minimal_example_comet.c
===================================================================
--- libmicrohttpd/src/examples/minimal_example_comet.c 2009-02-06 03:22:00 UTC
(rev 8195)
+++ libmicrohttpd/src/examples/minimal_example_comet.c 2009-02-06 06:12:33 UTC
(rev 8196)
@@ -26,7 +26,7 @@
#include <microhttpd.h>
static int
-data_generator (void *cls, size_t pos, char *buf, int max)
+data_generator (void *cls, uint64_t pos, char *buf, int max)
{
if (max < 80)
return 0;
@@ -41,7 +41,7 @@
const char *url,
const char *method,
const char *version,
- const char *upload_data, unsigned int *upload_data_size, void **ptr)
+ const char *upload_data, size_t *upload_data_size, void **ptr)
{
static int aptr;
struct MHD_Response *response;
Modified: libmicrohttpd/src/include/microhttpd.h
===================================================================
--- libmicrohttpd/src/include/microhttpd.h 2009-02-06 03:22:00 UTC (rev
8195)
+++ libmicrohttpd/src/include/microhttpd.h 2009-02-06 06:12:33 UTC (rev
8196)
@@ -59,9 +59,9 @@
* thread-safe (with the exception of 'MHD_set_connection_value',
* which must only be used in a particular context).<p>
*
- * NEW: Before including "microhttpd.h" you should add the
- * necessary includes to define the "size_t", "fd_set", "socklen_t" and
- * "struct sockaddr" data types (which headers are needed may
+ * NEW: Before including "microhttpd.h" you should add the necessary
+ * includes to define the "uint64_t", "size_t", "fd_set", "socklen_t"
+ * and "struct sockaddr" data types (which headers are needed may
* depend on your platform; for possible suggestions consult
* "platform.h" in the MHD distribution).
*
@@ -297,8 +297,8 @@
MHD_OPTION_END = 0,
/**
- * Maximum memory size per connection (followed by an
- * unsigned int).
+ * Maximum memory size per connection (followed by a
+ * size_t).
*/
MHD_OPTION_CONNECTION_MEMORY_LIMIT = 1,
@@ -663,7 +663,7 @@
const char *method,
const char *version,
const char *upload_data,
- unsigned int *upload_data_size,
+ size_t *upload_data_size,
void **con_cls);
/**
@@ -731,7 +731,10 @@
* requests using the same TCP connection).
*/
typedef int
- (*MHD_ContentReaderCallback) (void *cls, size_t pos, char *buf, int max);
+ (*MHD_ContentReaderCallback) (void *cls,
+ uint64_t pos,
+ char *buf,
+ int max);
/**
* This method is called by libmicrohttpd if we
@@ -767,7 +770,7 @@
const char *filename,
const char *content_type,
const char *transfer_encoding,
- const char *data, size_t off, size_t size);
+ const char *data, uint64_t off, size_t size);
/* **************** Daemon handling functions ***************** */
@@ -967,9 +970,8 @@
* @param crfc callback to call to free crc_cls resources
* @return NULL on error (i.e. invalid arguments, out of memory)
*/
-struct MHD_Response *MHD_create_response_from_callback (size_t size,
- unsigned int
- block_size,
+struct MHD_Response *MHD_create_response_from_callback (uint64_t size,
+ size_t block_size,
MHD_ContentReaderCallback
crc, void *crc_cls,
MHD_ContentReaderFreeCallback
@@ -1079,7 +1081,7 @@
*/
struct MHD_PostProcessor *MHD_create_post_processor (struct MHD_Connection
*connection,
- unsigned int buffer_size,
+ size_t buffer_size,
MHD_PostDataIterator
iter, void *cls);
@@ -1099,7 +1101,7 @@
*/
int
MHD_post_process (struct MHD_PostProcessor *pp,
- const char *post_data, unsigned int post_data_len);
+ const char *post_data, size_t post_data_len);
/**
* Release PostProcessor resources.
Modified: libmicrohttpd/src/include/platform.h
===================================================================
--- libmicrohttpd/src/include/platform.h 2009-02-06 03:22:00 UTC (rev
8195)
+++ libmicrohttpd/src/include/platform.h 2009-02-06 06:12:33 UTC (rev
8196)
@@ -46,6 +46,7 @@
#include <stdio.h>
#include <stdlib.h>
+#include <stdint.h>
#include <string.h>
#include <unistd.h>
#include <stdarg.h>
@@ -54,7 +55,7 @@
#include <signal.h>
#include <pthread.h>
-/* different OSes have size_t, fd_set in
+/* different OSes have fd_set in
a broad range of header files;
we just include most of them (if they
are available) */
Modified: libmicrohttpd/src/testcurl/daemon_options_test.c
===================================================================
--- libmicrohttpd/src/testcurl/daemon_options_test.c 2009-02-06 03:22:00 UTC
(rev 8195)
+++ libmicrohttpd/src/testcurl/daemon_options_test.c 2009-02-06 06:12:33 UTC
(rev 8196)
@@ -40,7 +40,7 @@
const char *url,
const char *method,
const char *version,
- const char *upload_data, unsigned int *upload_data_size,
+ const char *upload_data, size_t *upload_data_size,
void **unused)
{
return 0;
Modified: libmicrohttpd/src/testcurl/daemontest_get.c
===================================================================
--- libmicrohttpd/src/testcurl/daemontest_get.c 2009-02-06 03:22:00 UTC (rev
8195)
+++ libmicrohttpd/src/testcurl/daemontest_get.c 2009-02-06 06:12:33 UTC (rev
8196)
@@ -26,6 +26,7 @@
*/
#include "MHD_config.h"
+#include "platform.h"
#include <curl/curl.h>
#include <microhttpd.h>
#include <stdlib.h>
@@ -63,7 +64,7 @@
const char *url,
const char *method,
const char *version,
- const char *upload_data, unsigned int *upload_data_size,
+ const char *upload_data, size_t *upload_data_size,
void **unused)
{
static int ptr;
Modified: libmicrohttpd/src/testcurl/daemontest_get_chunked.c
===================================================================
--- libmicrohttpd/src/testcurl/daemontest_get_chunked.c 2009-02-06 03:22:00 UTC
(rev 8195)
+++ libmicrohttpd/src/testcurl/daemontest_get_chunked.c 2009-02-06 06:12:33 UTC
(rev 8196)
@@ -29,6 +29,7 @@
*/
#include "MHD_config.h"
+#include "platform.h"
#include <curl/curl.h>
#include <microhttpd.h>
#include <stdlib.h>
@@ -63,7 +64,7 @@
* data in chunks.
*/
static int
-crc (void *cls, size_t pos, char *buf, int max)
+crc (void *cls, uint64_t pos, char *buf, int max)
{
struct MHD_Response **responseptr = cls;
@@ -93,7 +94,7 @@
const char *url,
const char *method,
const char *version,
- const char *upload_data, unsigned int *upload_data_size, void **ptr)
+ const char *upload_data, size_t *upload_data_size, void **ptr)
{
static int aptr;
const char *me = cls;
Modified: libmicrohttpd/src/testcurl/daemontest_large_put.c
===================================================================
--- libmicrohttpd/src/testcurl/daemontest_large_put.c 2009-02-06 03:22:00 UTC
(rev 8195)
+++ libmicrohttpd/src/testcurl/daemontest_large_put.c 2009-02-06 06:12:33 UTC
(rev 8196)
@@ -25,6 +25,7 @@
*/
#include "MHD_config.h"
+#include "platform.h"
#include <curl/curl.h>
#include <microhttpd.h>
#include <stdlib.h>
@@ -89,7 +90,7 @@
const char *url,
const char *method,
const char *version,
- const char *upload_data, unsigned int *upload_data_size,
+ const char *upload_data, size_t *upload_data_size,
void **unused)
{
int *done = cls;
Modified: libmicrohttpd/src/testcurl/daemontest_long_header.c
===================================================================
--- libmicrohttpd/src/testcurl/daemontest_long_header.c 2009-02-06 03:22:00 UTC
(rev 8195)
+++ libmicrohttpd/src/testcurl/daemontest_long_header.c 2009-02-06 06:12:33 UTC
(rev 8196)
@@ -25,6 +25,7 @@
*/
#include "MHD_config.h"
+#include "platform.h"
#include <curl/curl.h>
#include <microhttpd.h>
#include <stdlib.h>
@@ -69,7 +70,7 @@
const char *url,
const char *method,
const char *version,
- const char *upload_data, unsigned int *upload_data_size,
+ const char *upload_data, size_t *upload_data_size,
void **unused)
{
const char *me = cls;
Modified: libmicrohttpd/src/testcurl/daemontest_parse_cookies.c
===================================================================
--- libmicrohttpd/src/testcurl/daemontest_parse_cookies.c 2009-02-06
03:22:00 UTC (rev 8195)
+++ libmicrohttpd/src/testcurl/daemontest_parse_cookies.c 2009-02-06
06:12:33 UTC (rev 8196)
@@ -26,6 +26,7 @@
*/
#include "MHD_config.h"
+#include "platform.h"
#include <curl/curl.h>
#include <microhttpd.h>
#include <stdlib.h>
@@ -63,7 +64,7 @@
const char *url,
const char *method,
const char *version,
- const char *upload_data, unsigned int *upload_data_size,
+ const char *upload_data, size_t *upload_data_size,
void **unused)
{
static int ptr;
Modified: libmicrohttpd/src/testcurl/daemontest_post.c
===================================================================
--- libmicrohttpd/src/testcurl/daemontest_post.c 2009-02-06 03:22:00 UTC
(rev 8195)
+++ libmicrohttpd/src/testcurl/daemontest_post.c 2009-02-06 06:12:33 UTC
(rev 8196)
@@ -25,6 +25,7 @@
*/
#include "MHD_config.h"
+#include "platform.h"
#include <curl/curl.h>
#include <microhttpd.h>
#include <stdlib.h>
@@ -70,7 +71,7 @@
const char *filename,
const char *content_type,
const char *transfer_encoding,
- const char *value, size_t off, size_t size)
+ const char *value, uint64_t off, size_t size)
{
int *eok = cls;
@@ -89,7 +90,7 @@
const char *url,
const char *method,
const char *version,
- const char *upload_data, unsigned int *upload_data_size,
+ const char *upload_data, size_t *upload_data_size,
void **unused)
{
static int eok;
Modified: libmicrohttpd/src/testcurl/daemontest_post_loop.c
===================================================================
--- libmicrohttpd/src/testcurl/daemontest_post_loop.c 2009-02-06 03:22:00 UTC
(rev 8195)
+++ libmicrohttpd/src/testcurl/daemontest_post_loop.c 2009-02-06 06:12:33 UTC
(rev 8196)
@@ -25,6 +25,7 @@
*/
#include "MHD_config.h"
+#include "platform.h"
#include <curl/curl.h>
#include <microhttpd.h>
#include <stdlib.h>
@@ -66,7 +67,7 @@
const char *url,
const char *method,
const char *version,
- const char *upload_data, unsigned int *upload_data_size,
+ const char *upload_data, size_t *upload_data_size,
void **mptr)
{
static int marker;
Modified: libmicrohttpd/src/testcurl/daemontest_postform.c
===================================================================
--- libmicrohttpd/src/testcurl/daemontest_postform.c 2009-02-06 03:22:00 UTC
(rev 8195)
+++ libmicrohttpd/src/testcurl/daemontest_postform.c 2009-02-06 06:12:33 UTC
(rev 8196)
@@ -25,6 +25,7 @@
*/
#include "MHD_config.h"
+#include "platform.h"
#include <curl/curl.h>
#include <microhttpd.h>
#include <stdlib.h>
@@ -68,7 +69,7 @@
const char *filename,
const char *content_type,
const char *transfer_encoding,
- const char *value, size_t off, size_t size)
+ const char *value, uint64_t off, size_t size)
{
int *eok = cls;
@@ -90,7 +91,7 @@
const char *url,
const char *method,
const char *version,
- const char *upload_data, unsigned int *upload_data_size,
+ const char *upload_data, size_t *upload_data_size,
void **unused)
{
static int eok;
Modified: libmicrohttpd/src/testcurl/daemontest_process_arguments.c
===================================================================
--- libmicrohttpd/src/testcurl/daemontest_process_arguments.c 2009-02-06
03:22:00 UTC (rev 8195)
+++ libmicrohttpd/src/testcurl/daemontest_process_arguments.c 2009-02-06
06:12:33 UTC (rev 8196)
@@ -26,6 +26,7 @@
*/
#include "MHD_config.h"
+#include "platform.h"
#include <curl/curl.h>
#include <microhttpd.h>
#include <stdlib.h>
@@ -63,7 +64,7 @@
const char *url,
const char *method,
const char *version,
- const char *upload_data, unsigned int *upload_data_size,
+ const char *upload_data, size_t *upload_data_size,
void **unused)
{
static int ptr;
Modified: libmicrohttpd/src/testcurl/daemontest_process_headers.c
===================================================================
--- libmicrohttpd/src/testcurl/daemontest_process_headers.c 2009-02-06
03:22:00 UTC (rev 8195)
+++ libmicrohttpd/src/testcurl/daemontest_process_headers.c 2009-02-06
06:12:33 UTC (rev 8196)
@@ -26,6 +26,7 @@
*/
#include "MHD_config.h"
+#include "platform.h"
#include <curl/curl.h>
#include <microhttpd.h>
#include <stdlib.h>
@@ -75,7 +76,7 @@
const char *url,
const char *method,
const char *version,
- const char *upload_data, unsigned int *upload_data_size,
+ const char *upload_data, size_t *upload_data_size,
void **unused)
{
static int ptr;
Modified: libmicrohttpd/src/testcurl/daemontest_put.c
===================================================================
--- libmicrohttpd/src/testcurl/daemontest_put.c 2009-02-06 03:22:00 UTC (rev
8195)
+++ libmicrohttpd/src/testcurl/daemontest_put.c 2009-02-06 06:12:33 UTC (rev
8196)
@@ -25,6 +25,7 @@
*/
#include "MHD_config.h"
+#include "platform.h"
#include <curl/curl.h>
#include <microhttpd.h>
#include <stdlib.h>
@@ -76,7 +77,7 @@
const char *url,
const char *method,
const char *version,
- const char *upload_data, unsigned int *upload_data_size,
+ const char *upload_data, size_t *upload_data_size,
void **unused)
{
int *done = cls;
Modified: libmicrohttpd/src/testcurl/daemontest_put_chunked.c
===================================================================
--- libmicrohttpd/src/testcurl/daemontest_put_chunked.c 2009-02-06 03:22:00 UTC
(rev 8195)
+++ libmicrohttpd/src/testcurl/daemontest_put_chunked.c 2009-02-06 06:12:33 UTC
(rev 8196)
@@ -26,6 +26,7 @@
*/
#include "MHD_config.h"
+#include "platform.h"
#include <curl/curl.h>
#include <microhttpd.h>
#include <stdlib.h>
@@ -77,7 +78,7 @@
const char *url,
const char *method,
const char *version,
- const char *upload_data, unsigned int *upload_data_size,
+ const char *upload_data, size_t *upload_data_size,
void **unused)
{
int *done = cls;
Modified: libmicrohttpd/src/testcurl/https/mhds_session_info_test.c
===================================================================
--- libmicrohttpd/src/testcurl/https/mhds_session_info_test.c 2009-02-06
03:22:00 UTC (rev 8195)
+++ libmicrohttpd/src/testcurl/https/mhds_session_info_test.c 2009-02-06
06:12:33 UTC (rev 8196)
@@ -44,7 +44,7 @@
query_session_ahc (void *cls, struct MHD_Connection *connection,
const char *url, const char *method,
const char *upload_data, const char *version,
- unsigned int *upload_data_size, void **ptr)
+ size_t *upload_data_size, void **ptr)
{
struct MHD_Response *response;
int ret;
Modified: libmicrohttpd/src/testcurl/https/tls_cipher_change_test.c
===================================================================
--- libmicrohttpd/src/testcurl/https/tls_cipher_change_test.c 2009-02-06
03:22:00 UTC (rev 8195)
+++ libmicrohttpd/src/testcurl/https/tls_cipher_change_test.c 2009-02-06
06:12:33 UTC (rev 8196)
@@ -42,7 +42,7 @@
static int
rehandshake_ahc (void *cls, struct MHD_Connection *connection,
const char *url, const char *method, const char *upload_data,
- const char *version, unsigned int *upload_data_size,
+ const char *version, size_t *upload_data_size,
void **ptr)
{
int ret;
Modified: libmicrohttpd/src/testcurl/https/tls_test_common.c
===================================================================
--- libmicrohttpd/src/testcurl/https/tls_test_common.c 2009-02-06 03:22:00 UTC
(rev 8195)
+++ libmicrohttpd/src/testcurl/https/tls_test_common.c 2009-02-06 06:12:33 UTC
(rev 8196)
@@ -23,7 +23,6 @@
* @brief Common tls test functions
* @author Sagie Amir
*/
-
#include "tls_test_common.h"
#include "tls_test_keys.h"
#include "gnutls.h"
@@ -55,7 +54,7 @@
}
static int
-file_reader (void *cls, size_t pos, char *buf, int max)
+file_reader (void *cls, uint64_t pos, char *buf, int max)
{
FILE *file = cls;
fseek (file, pos, SEEK_SET);
@@ -68,7 +67,7 @@
int
http_ahc (void *cls, struct MHD_Connection *connection,
const char *url, const char *method, const char *upload_data,
- const char *version, unsigned int *upload_data_size, void **ptr)
+ const char *version, size_t *upload_data_size, void **ptr)
{
static int aptr;
struct MHD_Response *response;
@@ -112,7 +111,7 @@
int
http_dummy_ahc (void *cls, struct MHD_Connection *connection,
const char *url, const char *method, const char *upload_data,
- const char *version, unsigned int *upload_data_size,
+ const char *version, size_t *upload_data_size,
void **ptr)
{
return 0;
Modified: libmicrohttpd/src/testzzuf/daemontest_get.c
===================================================================
--- libmicrohttpd/src/testzzuf/daemontest_get.c 2009-02-06 03:22:00 UTC (rev
8195)
+++ libmicrohttpd/src/testzzuf/daemontest_get.c 2009-02-06 06:12:33 UTC (rev
8196)
@@ -25,6 +25,7 @@
*/
#include "MHD_config.h"
+#include "platform.h"
#include <curl/curl.h>
#include <microhttpd.h>
#include <stdlib.h>
@@ -64,7 +65,7 @@
const char *url,
const char *method,
const char *version,
- const char *upload_data, unsigned int *upload_data_size,
+ const char *upload_data, size_t *upload_data_size,
void **unused)
{
static int ptr;
Modified: libmicrohttpd/src/testzzuf/daemontest_get_chunked.c
===================================================================
--- libmicrohttpd/src/testzzuf/daemontest_get_chunked.c 2009-02-06 03:22:00 UTC
(rev 8195)
+++ libmicrohttpd/src/testzzuf/daemontest_get_chunked.c 2009-02-06 06:12:33 UTC
(rev 8196)
@@ -25,6 +25,7 @@
*/
#include "MHD_config.h"
+#include "platform.h"
#include <curl/curl.h>
#include <microhttpd.h>
#include <stdlib.h>
@@ -61,7 +62,7 @@
* data in chunks.
*/
static int
-crc (void *cls, size_t pos, char *buf, int max)
+crc (void *cls, uint64_t pos, char *buf, int max)
{
struct MHD_Response **responseptr = cls;
@@ -91,7 +92,7 @@
const char *url,
const char *method,
const char *version,
- const char *upload_data, unsigned int *upload_data_size, void **ptr)
+ const char *upload_data, size_t *upload_data_size, void **ptr)
{
static int aptr;
const char *me = cls;
Modified: libmicrohttpd/src/testzzuf/daemontest_large_put.c
===================================================================
--- libmicrohttpd/src/testzzuf/daemontest_large_put.c 2009-02-06 03:22:00 UTC
(rev 8195)
+++ libmicrohttpd/src/testzzuf/daemontest_large_put.c 2009-02-06 06:12:33 UTC
(rev 8196)
@@ -25,6 +25,7 @@
*/
#include "MHD_config.h"
+#include "platform.h"
#include <curl/curl.h>
#include <microhttpd.h>
#include <stdlib.h>
@@ -87,7 +88,7 @@
const char *url,
const char *method,
const char *version,
- const char *upload_data, unsigned int *upload_data_size,
+ const char *upload_data, size_t *upload_data_size,
void **unused)
{
int *done = cls;
Modified: libmicrohttpd/src/testzzuf/daemontest_long_header.c
===================================================================
--- libmicrohttpd/src/testzzuf/daemontest_long_header.c 2009-02-06 03:22:00 UTC
(rev 8195)
+++ libmicrohttpd/src/testzzuf/daemontest_long_header.c 2009-02-06 06:12:33 UTC
(rev 8196)
@@ -25,6 +25,7 @@
*/
#include "MHD_config.h"
+#include "platform.h"
#include <curl/curl.h>
#include <microhttpd.h>
#include <stdlib.h>
@@ -71,7 +72,7 @@
const char *url,
const char *method,
const char *version,
- const char *upload_data, unsigned int *upload_data_size,
+ const char *upload_data, size_t *upload_data_size,
void **unused)
{
const char *me = cls;
Modified: libmicrohttpd/src/testzzuf/daemontest_post.c
===================================================================
--- libmicrohttpd/src/testzzuf/daemontest_post.c 2009-02-06 03:22:00 UTC
(rev 8195)
+++ libmicrohttpd/src/testzzuf/daemontest_post.c 2009-02-06 06:12:33 UTC
(rev 8196)
@@ -25,6 +25,7 @@
*/
#include "MHD_config.h"
+#include "platform.h"
#include <curl/curl.h>
#include <microhttpd.h>
#include <stdlib.h>
@@ -73,7 +74,7 @@
const char *filename,
const char *content_type,
const char *transfer_encoding,
- const char *value, size_t off, size_t size)
+ const char *value, uint64_t off, size_t size)
{
int *eok = cls;
@@ -92,7 +93,7 @@
const char *url,
const char *method,
const char *version,
- const char *upload_data, unsigned int *upload_data_size,
+ const char *upload_data, size_t *upload_data_size,
void **unused)
{
static int eok;
Modified: libmicrohttpd/src/testzzuf/daemontest_postform.c
===================================================================
--- libmicrohttpd/src/testzzuf/daemontest_postform.c 2009-02-06 03:22:00 UTC
(rev 8195)
+++ libmicrohttpd/src/testzzuf/daemontest_postform.c 2009-02-06 06:12:33 UTC
(rev 8196)
@@ -25,6 +25,7 @@
*/
#include "MHD_config.h"
+#include "platform.h"
#include <curl/curl.h>
#include <microhttpd.h>
#include <stdlib.h>
@@ -71,7 +72,7 @@
const char *filename,
const char *content_type,
const char *transfer_encoding,
- const char *value, size_t off, size_t size)
+ const char *value, uint64_t off, size_t size)
{
int *eok = cls;
@@ -95,7 +96,7 @@
const char *url,
const char *method,
const char *version,
- const char *upload_data, unsigned int *upload_data_size,
+ const char *upload_data, size_t *upload_data_size,
void **unused)
{
static int eok;
Modified: libmicrohttpd/src/testzzuf/daemontest_put.c
===================================================================
--- libmicrohttpd/src/testzzuf/daemontest_put.c 2009-02-06 03:22:00 UTC (rev
8195)
+++ libmicrohttpd/src/testzzuf/daemontest_put.c 2009-02-06 06:12:33 UTC (rev
8196)
@@ -25,6 +25,7 @@
*/
#include "MHD_config.h"
+#include "platform.h"
#include <curl/curl.h>
#include <microhttpd.h>
#include <stdlib.h>
@@ -79,7 +80,7 @@
const char *url,
const char *method,
const char *version,
- const char *upload_data, unsigned int *upload_data_size,
+ const char *upload_data, size_t *upload_data_size,
void **unused)
{
int *done = cls;
Modified: libmicrohttpd/src/testzzuf/daemontest_put_chunked.c
===================================================================
--- libmicrohttpd/src/testzzuf/daemontest_put_chunked.c 2009-02-06 03:22:00 UTC
(rev 8195)
+++ libmicrohttpd/src/testzzuf/daemontest_put_chunked.c 2009-02-06 06:12:33 UTC
(rev 8196)
@@ -26,6 +26,7 @@
*/
#include "MHD_config.h"
+#include "platform.h"
#include <curl/curl.h>
#include <microhttpd.h>
#include <stdlib.h>
@@ -79,7 +80,7 @@
const char *url,
const char *method,
const char *version,
- const char *upload_data, unsigned int *upload_data_size,
+ const char *upload_data, size_t *upload_data_size,
void **unused)
{
int *done = cls;
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r8196 - in libmicrohttpd: . doc doc/chapters doc/examples src/daemon src/examples src/include src/testcurl src/testcurl/https src/testzzuf,
gnunet <=