Merge tag 'upstream/3.2.3' into tizen

Change-Id: I538a1ab537c64150323a469f40078bf001a42c33

diff --cc CMakeLists.txt
Simple merge

diff --cc lib/core-net/close.c
Simple merge

diff --cc lib/core-net/connect.c
Simple merge

diff --cc lib/core-net/dummy-callback.c
Simple merge

diff --cc lib/core-net/lws-dsh.c
Simple merge

diff --cc lib/core-net/output.c
Simple merge

diff --cc lib/core-net/private-lib-core-net.h
Simple merge

diff --cc lib/core-net/sequencer.c
Simple merge

diff --cc lib/core-net/sorted-usec-list.c
Simple merge

diff --cc lib/core-net/vhost.c
Simple merge

diff --cc lib/core-net/wsi-timeout.c
Simple merge

diff --cc lib/core/context.c
Simple merge

diff --cc lib/core/private-lib-core.h
Simple merge

diff --cc lib/event-libs/libev/libev.c
Simple merge

diff --cc lib/event-libs/libevent/libevent.c
Simple merge

diff --cc lib/event-libs/libuv/libuv.c
Simple merge

diff --cc lib/jose/jws/jws.c
Simple merge

diff --cc lib/misc/daemonize.c
Simple merge

diff --cc lib/plat/esp32/esp32-service.c
Simple merge

diff --cc lib/plat/optee/network.c
Simple merge

diff --cc lib/plat/unix/private-lib-plat-unix.h
Simple merge

diff --cc lib/plat/unix/unix-init.c
Simple merge

diff --cc lib/plat/unix/unix-misc.c
Simple merge

diff --cc lib/plat/unix/unix-pipe.c
Simple merge

diff --cc lib/plat/unix/unix-service.c
Simple merge

diff --cc lib/plat/windows/windows-service.c
index cb2aba0,4036528..7e35daa
--- 1/lib/plat/windows/windows-service.c
--- 2/lib/plat/windows/windows-service.c
+++ b/lib/plat/windows/windows-service.c
@@@ -22,9 -22,36 +22,36 @@@
  #ifndef _WINSOCK_DEPRECATED_NO_WARNINGS
  #define _WINSOCK_DEPRECATED_NO_WARNINGS
  #endif
 -#include "core/private.h"
 +#include "private-lib-core.h"
  
  
+ int
+ _lws_plat_service_forced_tsi(struct lws_context *context, int tsi)
+ {
+       struct lws_context_per_thread *pt = &context->pt[tsi];
+       int m, n;
+ 
+       lws_service_flag_pending(context, tsi);
+ 
+       /* any socket with events to service? */
+       for (n = 0; n < (int)pt->fds_count; n++) {
+               if (!pt->fds[n].revents)
+                       continue;
+ 
+               m = lws_service_fd_tsi(context, &pt->fds[n], tsi);
+               if (m < 0)
+                       return -1;
+               /* if something closed, retry this slot */
+               if (m)
+                       n--;
+       }
+ 
+       lws_service_do_ripe_rxflow(pt);
+ 
+       return 0;
+ }
+ 
+ 
  LWS_EXTERN int
  _lws_plat_service_tsi(struct lws_context *context, int timeout_ms, int tsi)
  {

diff --cc lib/plat/windows/windows-sockets.c
Simple merge

diff --cc lib/roles/cgi/cgi-server.c
Simple merge

diff --cc lib/roles/h1/ops-h1.c
Simple merge

diff --cc lib/roles/h2/http2.c
Simple merge

diff --cc lib/roles/http/client/client-handshake.c
Simple merge

diff --cc lib/roles/http/client/client-http.c
Simple merge

diff --cc lib/roles/http/private-lib-roles-http.h
Simple merge

diff --cc lib/roles/http/server/lws-spa.c
Simple merge

diff --cc lib/roles/http/server/server.c
Simple merge

diff --cc lib/roles/listen/ops-listen.c
Simple merge

diff --cc lib/roles/pipe/ops-pipe.c
Simple merge

diff --cc lib/roles/ws/client-ws.c
Simple merge

diff --cc lib/roles/ws/ops-ws.c
Simple merge

diff --cc lib/tls/lws-gencrypto-common.c
Simple merge

diff --cc lib/tls/mbedtls/lws-genec.c
Simple merge

diff --cc lib/tls/openssl/openssl-client.c
Simple merge

diff --cc lib/tls/openssl/openssl-x509.c
Simple merge

diff --cc lib/tls/tls-client.c
Simple merge

diff --cc lib/tls/tls.c
Simple merge

diff --cc packaging/libwebsockets.spec
index 031d1b4,0000000..920e611
mode 100644,000000..100644
--- 1/packaging/libwebsockets.spec
--- /dev/null
+++ b/packaging/libwebsockets.spec
@@@ -1,67 -1,0 +1,67 @@@
- Version:    3.2.0
 +Name:       libwebsockets
 +Summary:    WebSocket Library
++Version:    3.2.3
 +Release:    1
 +Group:      System/Libraries
 +License:    LGPLv2 with exceptions
 +URL:        https://github.com/warmcat/libwebsockets
 +Source0:    %{name}-%{version}.tar.gz
 +Requires(post): /sbin/ldconfig
 +Requires(postun): /sbin/ldconfig
 +BuildRequires: zlib-devel
 +BuildRequires: pkgconfig(openssl1.1)
 +BuildRequires: openssl1.1
 +BuildRequires: cmake
 +
 +%define _optdeveldir /opt/usr/devel/usr/
 +
 +%description
 +C Websockets Server Library
 +
 +%package devel
 +Summary:    Development files for %{name}
 +Group:      Development/Libraries
 +Requires:   %{name} = %{version}-%{release}
 +
 +%description devel
 +Development files needed for building websocket clients and servers
 +
 +%prep
 +%setup -q -n %{name}-%{version}
 +
 +%build
 +
 +%cmake -DLWS_WITH_SSL=On \
 +      -DLWS_WITHOUT_TESTAPPS=ON \
 +      -DLWS_WITH_SERVER_STATUS=ON \
 +      -DLWS_IPV6=ON \
 +      -DLWS_WITH_SO_BINDTODEVICE=ON \
 +      -DLWS_WITH_HTTP2=OFF\
 +      .
 +
 +make %{?jobs:-j%jobs}
 +
 +%install
 +rm -rf %{buildroot}
 +
 +%make_install
 +
 +%post -p /sbin/ldconfig
 +
 +%postun -p /sbin/ldconfig
 +
 +%files
 +%manifest %{name}.manifest
 +%defattr(-,root,root,-)
 +%{_libdir}/libwebsockets*.so.*
 +%license LICENSE
 +
 +%files devel
 +%defattr(-,root,root,-)
 +%{_includedir}/libwebsockets.h
 +%{_includedir}/lws-plugin-ssh.h
 +%{_includedir}/lws_config.h
 +%{_includedir}/libwebsockets/*
 +%{_libdir}/libwebsockets.so
 +%{_libdir}/pkgconfig/*
 +%{_libdir}/cmake/*