diff options
| author | Evgeny Grin (Karlson2k) <k2k@narod.ru> | 2017-03-14 12:42:10 +0300 |
|---|---|---|
| committer | Evgeny Grin (Karlson2k) <k2k@narod.ru> | 2017-03-14 12:42:10 +0300 |
| commit | 079b61496e6a977e4c804a01ab0e3d30d5ad98b8 (patch) | |
| tree | 46d3d5db86c384fe4d952c22edbc2d29e14be94d | |
| parent | b3dff1c71337c842196acf3fae0f94c1e80c67a8 (diff) | |
| download | libmicrohttpd-079b61496e6a977e4c804a01ab0e3d30d5ad98b8.tar.gz libmicrohttpd-079b61496e6a977e4c804a01ab0e3d30d5ad98b8.zip | |
Fixed typo in 1855c73cd340ae6273251728e8d6d500b2c1119b:
logic 'AND" instead of bitwise 'AND'
| -rw-r--r-- | src/microhttpd/daemon.c | 8 |
1 files changed, 4 insertions, 4 deletions
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, | |||
| 774 | const MHD_socket mhd_sckt = urh->mhd.socket; | 774 | const MHD_socket mhd_sckt = urh->mhd.socket; |
| 775 | 775 | ||
| 776 | /* Reset read/write ready, preserve error state. */ | 776 | /* Reset read/write ready, preserve error state. */ |
| 777 | urh->app.celi &= (~MHD_EPOLL_STATE_READ_READY && ~MHD_EPOLL_STATE_WRITE_READY); | 777 | urh->app.celi &= (~MHD_EPOLL_STATE_READ_READY & ~MHD_EPOLL_STATE_WRITE_READY); |
| 778 | urh->mhd.celi &= (~MHD_EPOLL_STATE_READ_READY && ~MHD_EPOLL_STATE_WRITE_READY); | 778 | urh->mhd.celi &= (~MHD_EPOLL_STATE_READ_READY & ~MHD_EPOLL_STATE_WRITE_READY); |
| 779 | 779 | ||
| 780 | if (MHD_INVALID_SOCKET != conn_sckt) | 780 | if (MHD_INVALID_SOCKET != conn_sckt) |
| 781 | { | 781 | { |
| @@ -867,8 +867,8 @@ urh_from_pollfd(struct MHD_UpgradeResponseHandle *urh, | |||
| 867 | struct pollfd p[2]) | 867 | struct pollfd p[2]) |
| 868 | { | 868 | { |
| 869 | /* Reset read/write ready, preserve error state. */ | 869 | /* Reset read/write ready, preserve error state. */ |
| 870 | urh->app.celi &= (~MHD_EPOLL_STATE_READ_READY && ~MHD_EPOLL_STATE_WRITE_READY); | 870 | urh->app.celi &= (~MHD_EPOLL_STATE_READ_READY & ~MHD_EPOLL_STATE_WRITE_READY); |
| 871 | urh->mhd.celi &= (~MHD_EPOLL_STATE_READ_READY && ~MHD_EPOLL_STATE_WRITE_READY); | 871 | urh->mhd.celi &= (~MHD_EPOLL_STATE_READ_READY & ~MHD_EPOLL_STATE_WRITE_READY); |
| 872 | 872 | ||
| 873 | if (0 != (p[0].revents & POLLIN)) | 873 | if (0 != (p[0].revents & POLLIN)) |
| 874 | urh->app.celi |= MHD_EPOLL_STATE_READ_READY; | 874 | urh->app.celi |= MHD_EPOLL_STATE_READ_READY; |