Fix some typographical and grammatical errors
This commit is contained in:
Peter Pentchev
Andy Green
parent
91fe5aa64f
commit
e46f4125ef
6 changed files with 22 additions and 21 deletions
|
|
@ -45,13 +45,13 @@ endif()
|
|||
option(LWS_WITH_STATIC "Build the static version of the library" ON)
|
||||
option(LWS_WITH_SHARED "Build the shared version of the library" ON)
|
||||
option(LWS_WITH_SSL "Include SSL support (default OpenSSL, wolfSSL if LWS_USE_WOLFSSL is set)" ON)
|
||||
option(LWS_USE_CYASSL "Use CyaSSL replacement for OpenSSL. When settings this, you also need to specify LWS_CYASSL_LIBRARIES and LWS_CYASSL_INCLUDE_DIRS" OFF)
|
||||
option(LWS_USE_WOLFSSL "Use wolfSSL replacement for OpenSSL. When settings this, you also need to specify LWS_WOLFSSL_LIBRARIES and LWS_WOLFSSL_INCLUDE_DIRS" OFF)
|
||||
option(LWS_USE_CYASSL "Use CyaSSL replacement for OpenSSL. When setting this, you also need to specify LWS_CYASSL_LIBRARIES and LWS_CYASSL_INCLUDE_DIRS" OFF)
|
||||
option(LWS_USE_WOLFSSL "Use wolfSSL replacement for OpenSSL. When setting this, you also need to specify LWS_WOLFSSL_LIBRARIES and LWS_WOLFSSL_INCLUDE_DIRS" OFF)
|
||||
option(LWS_WITH_ZLIB "Include zlib support (required for extensions)" ON)
|
||||
option(LWS_WITH_LIBEV "Compile with support for libev" OFF)
|
||||
option(LWS_USE_BUNDLED_ZLIB "Use bundled zlib version (Windows only)" ${LWS_USE_BUNDLED_ZLIB_DEFAULT})
|
||||
option(LWS_SSL_CLIENT_USE_OS_CA_CERTS "SSL support should make use of OS installed CA root certs" ON)
|
||||
option(LWS_WITHOUT_BUILTIN_GETIFADDRS "Don't use BSD getifaddrs implementation from libwebsockets if it is missing (this will result in a compilation error) ... Default is your libc provides it. On some systems such as uclibc it doesn't exist." OFF)
|
||||
option(LWS_SSL_CLIENT_USE_OS_CA_CERTS "SSL support should make use of the OS-installed CA root certs" ON)
|
||||
option(LWS_WITHOUT_BUILTIN_GETIFADDRS "Don't use the BSD getifaddrs implementation from libwebsockets if it is missing (this will result in a compilation error) ... The default is to assume that your libc provides it. On some systems such as uclibc it doesn't exist." OFF)
|
||||
option(LWS_WITHOUT_BUILTIN_SHA1 "Don't build the lws sha-1 (eg, because openssl will provide it" OFF)
|
||||
option(LWS_WITHOUT_CLIENT "Don't build the client part of the library" OFF)
|
||||
option(LWS_WITHOUT_SERVER "Don't build the server part of the library" OFF)
|
||||
|
|
@ -86,11 +86,11 @@ if (LWS_USE_CYASSL)
|
|||
endif()
|
||||
|
||||
if (LWS_WITHOUT_CLIENT AND LWS_WITHOUT_SERVER)
|
||||
message(FATAL_ERROR "Makes no sense to compile without both client or server.")
|
||||
message(FATAL_ERROR "Makes no sense to compile with neither client nor server.")
|
||||
endif()
|
||||
|
||||
if (NOT (LWS_WITH_STATIC OR LWS_WITH_SHARED))
|
||||
message(FATAL_ERROR "Makes no sense to compile without both static or shared libraries.")
|
||||
message(FATAL_ERROR "Makes no sense to compile with neither static nor shared libraries.")
|
||||
endif()
|
||||
|
||||
if (NOT LWS_WITHOUT_EXTENSIONS)
|
||||
|
|
@ -163,7 +163,7 @@ if (WIN32)
|
|||
|
||||
if (LWS_IPV6)
|
||||
set(LWS_IPV6 OFF)
|
||||
message(WARNING "IPv6 does currently not work on Windows!")
|
||||
message(WARNING "IPv6 does not currently work on Windows!")
|
||||
endif()
|
||||
else()
|
||||
set(LWS_OPENSSL_CLIENT_CERTS /etc/pki/tls/certs/ CACHE PATH "Client SSL certificate directory")
|
||||
|
|
@ -292,7 +292,7 @@ CHECK_INCLUDE_FILE(unistd.h LWS_HAVE_UNISTD_H)
|
|||
CHECK_INCLUDE_FILE(vfork.h LWS_HAVE_VFORK_H)
|
||||
CHECK_INCLUDE_FILE(zlib.h LWS_HAVE_ZLIB_H)
|
||||
|
||||
# TODO: These can be tested if they actually work also...
|
||||
# TODO: These can also be tested to see whether they actually work...
|
||||
set(LWS_HAVE_WORKING_FORK LWS_HAVE_FORK)
|
||||
set(LWS_HAVE_WORKING_VFORK LWS_HAVE_VFORK)
|
||||
|
||||
|
|
@ -569,6 +569,7 @@ if (LWS_WITH_SSL)
|
|||
# Additional to the root directory we need to include
|
||||
# the wolfssl/ subdirectory which contains the OpenSSL
|
||||
# compatability layer headers.
|
||||
|
||||
if (LWS_USE_CYASSL)
|
||||
foreach(inc ${WOLFSSL_INCLUDE_DIRS})
|
||||
include_directories("${inc}" "${inc}/cyassl")
|
||||
|
|
@ -659,13 +660,13 @@ if (NOT LWS_WITHOUT_TESTAPPS)
|
|||
|
||||
if (LWS_LINK_TESTAPPS_DYNAMIC)
|
||||
if (NOT LWS_WITH_SHARED)
|
||||
message(FATAL_ERROR "Build of shared library is disabled. LWS_LINK_TESTAPPS_DYNAMIC must be combined with LWS_WITH_SHARED.")
|
||||
message(FATAL_ERROR "Build of the shared library is disabled. LWS_LINK_TESTAPPS_DYNAMIC must be combined with LWS_WITH_SHARED.")
|
||||
endif()
|
||||
target_link_libraries(${TEST_NAME} websockets_shared)
|
||||
add_dependencies(${TEST_NAME} websockets_shared)
|
||||
else()
|
||||
if (NOT LWS_WITH_STATIC)
|
||||
message(FATAL_ERROR "Build of static library is disabled. Disabled LWS_LINK_TESTAPPS_DYNAMIC must be combined with LWS_WITH_STATIC.")
|
||||
message(FATAL_ERROR "Build of the static library is disabled. Disabled LWS_LINK_TESTAPPS_DYNAMIC must be combined with LWS_WITH_STATIC.")
|
||||
endif()
|
||||
target_link_libraries(${TEST_NAME} websockets)
|
||||
add_dependencies(${TEST_NAME} websockets)
|
||||
|
|
@ -773,7 +774,7 @@ if (NOT LWS_WITHOUT_TESTAPPS)
|
|||
if (OPENSSL_RETURN_CODE)
|
||||
message(WARNING "!!! Failed to generate SSL certificate for Test Server!!!:\nOpenSSL return code = ${OPENSSL_RETURN_CODE}")
|
||||
else()
|
||||
message("SUCCSESFULLY generated SSL certificate")
|
||||
message("SUCCESSFULLY generated SSL certificate")
|
||||
endif()
|
||||
endif()
|
||||
|
||||
|
|
|
|||
|
|
@ -141,7 +141,7 @@ or
|
|||
|
||||
Unix GUI
|
||||
--------
|
||||
If you have a curses enabled build you simply type:
|
||||
If you have a curses-enabled build you simply type:
|
||||
(not all packages include this, my debian install does not for example).
|
||||
|
||||
ccmake
|
||||
|
|
@ -156,7 +156,7 @@ wolfSSL/CyaSSL replacement for OpenSSL
|
|||
wolfSSL/CyaSSL is a lightweight SSL library targeted at embedded systems:
|
||||
https://www.wolfssl.com/wolfSSL/Products-wolfssl.html
|
||||
|
||||
It contains a OpenSSL compatability layer which makes it possible to pretty
|
||||
It contains a OpenSSL compatibility layer which makes it possible to pretty
|
||||
much link to it instead of OpenSSL, giving a much smaller footprint.
|
||||
|
||||
**NOTE**: wolfssl needs to be compiled using the `--enable-opensslextra` flag for
|
||||
|
|
@ -214,7 +214,7 @@ $ nghttp -nvas https://localhost:7681/test.html
|
|||
|
||||
Cross compiling
|
||||
---------------
|
||||
To enable cross compiling **libwebsockets** using CMake you need to create
|
||||
To enable cross-compiling **libwebsockets** using CMake you need to create
|
||||
a "Toolchain file" that you supply to CMake when generating your build files.
|
||||
CMake will then use the cross compilers and build paths specified in this file
|
||||
to look for dependencies and such.
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@
|
|||
*
|
||||
* I cleaned it up quite a bit to match the (linux kernel) style of the rest
|
||||
* of libwebsockets; this version is under LGPL2 like the rest of libwebsockets
|
||||
* since he explictly allows sublicensing, but I give the URL above so you can
|
||||
* since he explicitly allows sublicensing, but I give the URL above so you can
|
||||
* get the original with Bob's super-liberal terms directly if you prefer.
|
||||
*/
|
||||
|
||||
|
|
|
|||
|
|
@ -41,7 +41,7 @@ child_handler(int signum)
|
|||
|
||||
switch (signum) {
|
||||
|
||||
case SIGALRM: /* timedout daemonizing */
|
||||
case SIGALRM: /* timed out daemonizing */
|
||||
exit(1);
|
||||
break;
|
||||
|
||||
|
|
@ -59,7 +59,7 @@ child_handler(int signum)
|
|||
sent = write(fd, sz, len);
|
||||
if (sent != len)
|
||||
fprintf(stderr,
|
||||
"unable write pid to lock file %s, code=%d (%s)\n",
|
||||
"unable to write pid to lock file %s, code=%d (%s)\n",
|
||||
lock_path, errno, strerror(errno));
|
||||
|
||||
close(fd);
|
||||
|
|
@ -130,7 +130,7 @@ lws_daemonize(const char *_lock_path)
|
|||
}
|
||||
strcpy(lock_path, _lock_path);
|
||||
|
||||
/* Trap signals that we expect to recieve */
|
||||
/* Trap signals that we expect to receive */
|
||||
signal(SIGCHLD, child_handler); /* died */
|
||||
signal(SIGUSR1, child_handler); /* was happy */
|
||||
signal(SIGALRM, child_handler); /* timeout daemonizing */
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
#include <time.h>
|
||||
#include <windows.h> //I've ommited context line
|
||||
#include <windows.h> //I've omitted context line
|
||||
|
||||
#if defined(_MSC_VER) || defined(_MSC_EXTENSIONS)
|
||||
#define DELTA_EPOCH_IN_MICROSECS 11644473600000000Ui64
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
#endif
|
||||
#endif
|
||||
|
||||
#include <windows.h> //I've ommited context line.
|
||||
#include <windows.h> //I've omitted context line.
|
||||
#if defined(_MSC_VER) || defined(_MSC_EXTENSIONS)
|
||||
#define DELTA_EPOCH_IN_MICROSECS 11644473600000000Ui64
|
||||
#else
|
||||
|
|
@ -28,4 +28,4 @@ int gettimeofday(struct timeval *tv, struct timezone *tz);
|
|||
#endif
|
||||
|
||||
|
||||
#endif
|
||||
#endif
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue