sync with upstream

changelog

@@ -28,6 +28,9 @@ User api additions
 	then does not have to try to track while connections it choked, this
 	will free up all of them in one call.
 
+ - there's a new, optional callback LWS_CALLBACK_CLOSED_HTTP which gets
+	called when an HTTP protocol socket closes
+
 
 User api changes
 ----------------

scripts/FindLibWebSockets.cmake

@@ -0,0 +1,33 @@
+# This module tries to find libWebsockets library and include files
+#
+# LIBWEBSOCKETS_INCLUDE_DIR, path where to find libwebsockets.h
+# LIBWEBSOCKETS_LIBRARY_DIR, path where to find libwebsockets.so
+# LIBWEBSOCKETS_LIBRARIES, the library to link against
+# LIBWEBSOCKETS_FOUND, If false, do not try to use libWebSockets
+#
+# This currently works probably only for Linux
+
+FIND_PATH ( LIBWEBSOCKETS_INCLUDE_DIR libwebsockets.h
+    /usr/local/include
+    /usr/include
+)
+
+FIND_LIBRARY ( LIBWEBSOCKETS_LIBRARIES websockets
+    /usr/local/lib
+    /usr/lib
+)
+
+GET_FILENAME_COMPONENT( LIBWEBSOCKETS_LIBRARY_DIR ${LIBWEBSOCKETS_LIBRARIES} PATH )
+
+SET ( LIBWEBSOCKETS_FOUND "NO" )
+IF ( LIBWEBSOCKETS_INCLUDE_DIR )
+    IF ( LIBWEBSOCKETS_LIBRARIES )
+        SET ( LIBWEBSOCKETS_FOUND "YES" )
+    ENDIF ( LIBWEBSOCKETS_LIBRARIES )
+ENDIF ( LIBWEBSOCKETS_INCLUDE_DIR )
+
+MARK_AS_ADVANCED(
+    LIBWEBSOCKETS_LIBRARY_DIR
+    LIBWEBSOCKETS_INCLUDE_DIR
+    LIBWEBSOCKETS_LIBRARIES
+)