[GNUnet-SVN] [libmicrohttpd] branch master updated (b3dff1c7 -> 6c67437c)

[gnunet]

This is an automated email from the git hooks/post-receive script.

karlson2k pushed a change to branch master
in repository libmicrohttpd.

    from b3dff1c7 process_urh(): reorganized code so error conditions are 
handled before normal processing Fixed error handling on socketpair (typo).
     new 079b6149 Fixed typo in 1855c73cd340ae6273251728e8d6d500b2c1119b: logic 
'AND" instead of bitwise 'AND'
     new 6c67437c configure.ac: fixed typo in report text

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 configure.ac            | 4 ++--
 src/microhttpd/daemon.c | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/configure.ac b/configure.ac
index 1340a212..f44802bf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1261,9 +1261,9 @@ AC_SUBST([GNUTLS_LIBS])
               MHD_LIBDEPS_PKGCFG="$GNUTLS_LIBS $LIBGCRYPT_LIBS 
$MHD_LIBDEPS_PKGCFG"
           ])
         ], [
-          AS_IF([test "x$have_gnutls" = "xyes"], [crypt_missing="libgrypt"],
+          AS_IF([test "x$have_gnutls" = "xyes"], [crypt_missing="libgcrypt"],
                 [test "x$have_gcrypt" = "xyes"], [crypt_missing="libgnutls"],
-                                                 [crypt_missing="libgrypt and 
libgnutls"])
+                                                 [crypt_missing="libgcrypt and 
libgnutls"])
           AS_IF([[test "x$enable_https" = "xyes" ]], [AC_MSG_ERROR([[HTTPS 
support cannot be enabled without $crypt_missing.]])])
           enable_https=no
           MSG_HTTPS="no (lacking $crypt_missing)"
diff --git a/src/microhttpd/daemon.c b/src/microhttpd/daemon.c
index 6aafffcd..3e48ef66 100644
--- a/src/microhttpd/daemon.c
+++ b/src/microhttpd/daemon.c
@@ -774,8 +774,8 @@ urh_from_fdset (struct MHD_UpgradeResponseHandle *urh,
   const MHD_socket mhd_sckt = urh->mhd.socket;
 
   /* Reset read/write ready, preserve error state. */
-  urh->app.celi &= (~MHD_EPOLL_STATE_READ_READY && 
~MHD_EPOLL_STATE_WRITE_READY);
-  urh->mhd.celi &= (~MHD_EPOLL_STATE_READ_READY && 
~MHD_EPOLL_STATE_WRITE_READY);
+  urh->app.celi &= (~MHD_EPOLL_STATE_READ_READY & 
~MHD_EPOLL_STATE_WRITE_READY);
+  urh->mhd.celi &= (~MHD_EPOLL_STATE_READ_READY & 
~MHD_EPOLL_STATE_WRITE_READY);
 
   if (MHD_INVALID_SOCKET != conn_sckt)
     {
@@ -867,8 +867,8 @@ urh_from_pollfd(struct MHD_UpgradeResponseHandle *urh,
                 struct pollfd p[2])
 {
   /* Reset read/write ready, preserve error state. */
-  urh->app.celi &= (~MHD_EPOLL_STATE_READ_READY && 
~MHD_EPOLL_STATE_WRITE_READY);
-  urh->mhd.celi &= (~MHD_EPOLL_STATE_READ_READY && 
~MHD_EPOLL_STATE_WRITE_READY);
+  urh->app.celi &= (~MHD_EPOLL_STATE_READ_READY & 
~MHD_EPOLL_STATE_WRITE_READY);
+  urh->mhd.celi &= (~MHD_EPOLL_STATE_READ_READY & 
~MHD_EPOLL_STATE_WRITE_READY);
 
   if (0 != (p[0].revents & POLLIN))
     urh->app.celi |= MHD_EPOLL_STATE_READ_READY;

-- 
To stop receiving notification emails like this one, please contact
address@hidden