[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r15192 - in libmicrohttpd: . src/daemon src/include
From: |
gnunet |
Subject: |
[GNUnet-SVN] r15192 - in libmicrohttpd: . src/daemon src/include |
Date: |
Sun, 8 May 2011 21:55:23 +0200 |
Author: grothoff
Date: 2011-05-08 21:55:23 +0200 (Sun, 08 May 2011)
New Revision: 15192
Modified:
libmicrohttpd/ChangeLog
libmicrohttpd/configure.ac
libmicrohttpd/src/daemon/response.c
libmicrohttpd/src/include/microhttpd.h
Log:
fixing 1679
Modified: libmicrohttpd/ChangeLog
===================================================================
--- libmicrohttpd/ChangeLog 2011-05-07 19:32:50 UTC (rev 15191)
+++ libmicrohttpd/ChangeLog 2011-05-08 19:55:23 UTC (rev 15192)
@@ -1,3 +1,10 @@
+Sun May 8 21:52:47 CEST 2011
+ Allow MHD_SIZE_UNKNOWN to be used in conjunction with
+ MHD_create_response_from_fd (fixing #1679). -TG
+
+Wed Apr 27 16:11:18 CEST 2011
+ Releasing libmicrohttpd 0.9.10. -CG
+
Fri Apr 8 11:40:35 CEST 2011
Workaround for cygwin poll brokenness. -TS
Modified: libmicrohttpd/configure.ac
===================================================================
--- libmicrohttpd/configure.ac 2011-05-07 19:32:50 UTC (rev 15191)
+++ libmicrohttpd/configure.ac 2011-05-08 19:55:23 UTC (rev 15192)
@@ -21,15 +21,15 @@
#
#
AC_PREREQ(2.57)
-AC_INIT([libmicrohttpd], [0.9.9],address@hidden)
-AM_INIT_AUTOMAKE([libmicrohttpd], [0.9.9])
+AC_INIT([libmicrohttpd], [0.9.10],address@hidden)
+AM_INIT_AUTOMAKE([libmicrohttpd], [0.9.10])
AM_CONFIG_HEADER([MHD_config.h])
AC_CONFIG_MACRO_DIR([m4])
AH_TOP([#define _GNU_SOURCE 1])
-LIB_VERSION_CURRENT=17
+LIB_VERSION_CURRENT=18
LIB_VERSION_REVISION=0
-LIB_VERSION_AGE=7
+LIB_VERSION_AGE=8
AC_SUBST(LIB_VERSION_CURRENT)
AC_SUBST(LIB_VERSION_REVISION)
AC_SUBST(LIB_VERSION_AGE)
Modified: libmicrohttpd/src/daemon/response.c
===================================================================
--- libmicrohttpd/src/daemon/response.c 2011-05-07 19:32:50 UTC (rev 15191)
+++ libmicrohttpd/src/daemon/response.c 2011-05-08 19:55:23 UTC (rev 15192)
@@ -270,9 +270,15 @@
file_reader (void *cls, uint64_t pos, char *buf, size_t max)
{
struct MHD_Response *response = cls;
+ ssize_t n;
(void) lseek (response->fd, pos + response->fd_off, SEEK_SET);
- return read (response->fd, buf, max);
+ n = read (response->fd, buf, max);
+ if (n == 0)
+ return MHD_CONTENT_READER_END_OF_STREAM;
+ if (n < 0)
+ return MHD_CONTENT_READER_END_WITH_ERROR;
+ return n;
}
Modified: libmicrohttpd/src/include/microhttpd.h
===================================================================
--- libmicrohttpd/src/include/microhttpd.h 2011-05-07 19:32:50 UTC (rev
15191)
+++ libmicrohttpd/src/include/microhttpd.h 2011-05-08 19:55:23 UTC (rev
15192)
@@ -106,7 +106,7 @@
/**
* Current version of the library.
*/
-#define MHD_VERSION 0x00090900
+#define MHD_VERSION 0x00090A00
/**
* MHD-internal return code for "YES".
@@ -1298,7 +1298,9 @@
* header information and then be used any number of times.
*
* @param size size of the data portion of the response
- * @param fd file descriptor referring to a file on disk with the data; will
be closed when response is destroyed
+ * @param fd file descriptor referring to a file on disk with the
+ * data; will be closed when response is destroyed;
+ * fd should be in 'blocking' mode
* @return NULL on error (i.e. invalid arguments, out of memory)
* @deprecated use MHD_create_response_from_fd_at_offset instead
*/
@@ -1311,7 +1313,9 @@
* header information and then be used any number of times.
*
* @param size size of the data portion of the response
- * @param fd file descriptor referring to a file on disk with the data; will
be closed when response is destroyed
+ * @param fd file descriptor referring to a file on disk with the
+ * data; will be closed when response is destroyed;
+ * fd should be in 'blocking' mode
* @param off offset to start reading from in the file
* @return NULL on error (i.e. invalid arguments, out of memory)
*/
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r15192 - in libmicrohttpd: . src/daemon src/include,
gnunet <=