From 89420700e792a6588248365033a14296e5f80138 Mon Sep 17 00:00:00 2001 From: Jakub Bogusz Date: Mon, 26 Aug 2013 20:11:36 +0200 Subject: [PATCH] - updated to 0.9.29 - updated messages patch --- libmicrohttpd-messages.patch | 27 ++++++++++++++------------- libmicrohttpd.spec | 4 ++-- 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/libmicrohttpd-messages.patch b/libmicrohttpd-messages.patch index 06610ec..884f0c7 100644 --- a/libmicrohttpd-messages.patch +++ b/libmicrohttpd-messages.patch @@ -1,6 +1,6 @@ ---- libmicrohttpd-0.9.28/src/microhttpd/daemon.c.orig 2013-07-19 17:32:13.000000000 +0200 -+++ libmicrohttpd-0.9.28/src/microhttpd/daemon.c 2013-07-19 20:31:23.474232117 +0200 -@@ -612,9 +612,11 @@ +--- libmicrohttpd-0.9.29/src/microhttpd/daemon.c.orig 2013-08-22 08:09:22.000000000 +0200 ++++ libmicrohttpd-0.9.29/src/microhttpd/daemon.c 2013-08-26 20:01:42.635866349 +0200 +@@ -620,9 +620,11 @@ break; } } @@ -12,15 +12,16 @@ return MHD_YES; } -@@ -3112,9 +3114,11 @@ - int sk_flags = fcntl (socket_fd, F_GETFL); - if (0 != fcntl (socket_fd, F_SETFL, sk_flags | O_NONBLOCK)) - { +@@ -1272,8 +1274,11 @@ + if ( (MHD_YES == external_add) && + (-1 != daemon->wpipe[1]) && + (1 != WRITE (daemon->wpipe[1], "n", 1)) ) +#if HAVE_MESSAGES - MHD_DLOG (daemon, - "Failed to make listen socket non-blocking: %s\n", - STRERROR (errno)); + MHD_DLOG (daemon, +- "failed to signal new connection via pipe"); ++ "failed to signal new connection via pipe") +#endif - if (0 != CLOSE (socket_fd)) - MHD_PANIC ("close failed\n"); - goto free_and_fail; ++ ; + + #if EPOLL_SUPPORT + if (0 != (daemon->options & MHD_USE_EPOLL_LINUX_ONLY)) diff --git a/libmicrohttpd.spec b/libmicrohttpd.spec index ebd8d82..b527a2e 100644 --- a/libmicrohttpd.spec +++ b/libmicrohttpd.spec @@ -5,12 +5,12 @@ Summary: Embeded HTTP server library Summary(pl.UTF-8): Biblioteka wbudowanego serwera HTTP Name: libmicrohttpd -Version: 0.9.28 +Version: 0.9.29 Release: 1 License: LGPL v2.1+ Group: Libraries Source0: http://ftp.gnu.org/gnu/libmicrohttpd/%{name}-%{version}.tar.gz -# Source0-md5: 16c3cb66c839c6f929677471401a5b53 +# Source0-md5: ead86d88e8b71ad99a2273bca438536c Patch0: %{name}-info.patch Patch1: %{name}-messages.patch Patch2: %{name}-link.patch -- 2.44.0