Commit graph

1414 commits

Author SHA1 Message Date
=?UTF-8?q?Christoph=20M=C3=BCllner?=
87840d18e6 Subject: [PATCH] Fix error handling when calling "REQUIRES PRIVATE KEY"
callback.

A recent patch in ssl.c introduced a callback for setting the
private key of the SSL context. This code contained a bug, which
resulted in lws_context_init_server_ssl() returning always
with a return value of 1, indicating an error.

This patch introduces the missing curly braces to fix the code's
intended behaviour.
2015-01-26 11:18:30 +08:00
nsitter
976d9ebbe8 Subject: [PATCH] Fix deflate-frame extension TX log statement 2015-01-26 11:16:03 +08:00
José Luis Millán
080e6ddded fix #220. Add missing include statement for <cstdarg> 2014-12-16 22:13:53 +08:00
Octav Zlatior
cf5189614a Subject: [PATCH] Adds "REQUIRES PRIVATE KEY" callback
In some situations the private key is not directly available via
filesystem (for example, when stored on a smartcard). If this is
the case, the user can set the private key filepath to NULL and
expect this callback reason to set the key directly via openSSL
library calls.
2014-12-16 08:47:37 +08:00
Andy Green
4edb452969 clean unmix declarations and code
Signed-off-by: Andy Green <andy.green@linaro.org>
2014-12-15 15:08:13 +08:00
=?UTF-8?q?Jos=C3=A9=20Luis=20Mill=C3=A1n?=
fdde0f0a03 Subject: [PATCH] proxy protocol (version 1) parsing implementation
The proxy line is dumped in the token buffer as any other HTTP header

Adapted by AG to move token id to be last in the parsed list
2014-12-14 12:13:43 +08:00
Neal Horman
b399237fe8 Subject: [PATCH] add user context pointer to the protocol structure 2014-12-13 14:21:30 +08:00
Neal Horman
98e491fdff Subject: [PATCH] add _lws_logv to make loging accessible to other wrappers.
use _lws_logv in _lws_log
2014-12-13 14:18:27 +08:00
Neil Horman
fc98f9a4ca improve c++ compatibility
Adapted by Joakim
2014-12-13 14:15:48 +08:00
Alejandro Mery
31f9eeb9d6 client: fix verification of the accepted protocol
to properly take ", *" as delimiter

Signed-off-by: Alejandro Mery <amery@geeks.cl>
2014-12-13 14:00:42 +08:00
Alejandro Mery
95ab6ca557 libev: clean cast abuse
assuming that you can cast to the first field of an struct is very
risky

Signed-off-by: Alejandro Mery <amery@geeks.cl>
2014-12-13 13:59:58 +08:00
Alejandro Mery
ead8afe8a1 add container_of() macro
to be used to remove cast abuse and finding parent structs later

Signed-off-by: Alejandro Mery <amery@geeks.cl>
2014-12-13 13:58:34 +08:00
Octav Zlatior
d4dd69a254 Subject: [PATCH] Fixes occasional segfault in lws_chage_pollfd
* so it happens that sometimes lws_change_pollfd is called with
  bad or incomplete data structures, mainly the context pointer
  obtained from wsi->protocol is null or wsi->position_in_fds_table
  is -1; checks have been added to avoid this condition
2014-12-13 12:17:59 +08:00
Andy Green
f48ddd2a55 http2 remove some dead code
Signed-off-by: Andy Green <andy.green@linaro.org>
2014-12-10 10:53:46 +08:00
Andy Green
66ecc2538d NO_EXTENSION clean out handled var in handle_POLLOUT_event
Signed-off-by: Andy Green <andy.green@linaro.org>
2014-12-10 10:28:46 +08:00
Andy Green
a349367a0b NO_SERVER_fix cosmetic warning
Signed-off-by: Andy Green <andy.green@linaro.org>
2014-12-10 10:24:33 +08:00
Alejandro Mery
ac3ec39bb1 Subject: [PATCH] Introduce lws_free2() helper to free and re-NULL pointers
Signed-off-by: Alejandro Mery <amery@geeks.cl>
2014-12-05 07:27:52 +08:00
Alejandro Mery
6ff28248aa Subject: [PATCH] Use custom allocator
Signed-off-by: Alejandro Mery <amery@geeks.cl>
2014-12-05 07:26:26 +08:00
Alejandro Mery
cdc9717be1 Subject: [PATCH] Add custom allocator support using the realloc() interface
Signed-off-by: Alejandro Mery <amery@geeks.cl>
2014-12-05 07:25:24 +08:00
Michael Haberler
49d0ce17d5 Subject: [PATCH] serve_http_file: add feature test macro for API change
introduced in 917f43
2014-12-01 21:47:37 +08:00
Andy Green
62fe015455 revert 187
Signed-off-by: Andy Green <andy.green@linaro.org>
2014-12-01 19:28:28 +08:00
Andy Green
0c5f6709a8 coverity 83687 daemonize was not a close problem
Signed-off-by: Andy Green <andy.green@linaro.org>
2014-11-30 13:47:36 +08:00
Andy Green
b03430745b coverity 83682 base64 decode more dead code
Signed-off-by: Andy Green <andy.green@linaro.org>
2014-11-30 13:39:09 +08:00
Andy Green
28e2ab6a97 coverity 83684 more ways to close and use freed wsi
Signed-off-by: Andy Green <andy.green@linaro.org>
2014-11-30 13:35:24 +08:00
Andy Green
dfa0f9444e coverity 83685 daemonize put the close in the right place
Signed-off-by: Andy Green <andy.green@linaro.org>
2014-11-30 13:32:27 +08:00
Andy Green
9c8d590f9d coverity 83686 server close sockfd if failing out
Signed-off-by: Andy Green <andy.green@linaro.org>
2014-11-30 13:30:57 +08:00
Andy Green
a3439032db win32 does not know uint64_t without stdint.h
Signed-off-by: Andy Green <andy.green@linaro.org>
2014-11-30 13:17:35 +08:00
Andy Green
f38e7860f4 coverity 83656 server check setsockopt return
Signed-off-by: Andy Green <andy.green@linaro.org>
2014-11-30 13:10:26 +08:00
Andy Green
abb48113e7 coverity 83657 plat unix check setsockopt return
Signed-off-by: Andy Green <andy.green@linaro.org>
2014-11-30 13:10:26 +08:00
Andy Green
24109f40ae coverity 83659 plat unix check fstat return
Signed-off-by: Andy Green <andy.green@linaro.org>
2014-11-30 13:10:26 +08:00
Andy Green
956a08a9c0 coverity 83660 plat unix check fcntl return
Signed-off-by: Andy Green <andy.green@linaro.org>
2014-11-30 13:10:26 +08:00
Andy Green
7ef4b2e1f2 coverity 83661 output check lseek return
Signed-off-by: Andy Green <andy.green@linaro.org>
2014-11-30 13:10:26 +08:00
Andy Green
8ab2b5af8b coverity 83664 consistently check NULL
Signed-off-by: Andy Green <andy.green@linaro.org>
2014-11-30 13:10:26 +08:00
Andy Green
adc720dfb5 coverity 83665 fail on null buffer
Signed-off-by: Andy Green <andy.green@linaro.org>
2014-11-30 13:10:26 +08:00
Andy Green
cd838506a9 coverity 83666 fail on null buffer
Signed-off-by: Andy Green <andy.green@linaro.org>
2014-11-30 13:10:26 +08:00
Andy Green
c5814fbaa9 coverity 83667 dead code
Signed-off-by: Andy Green <andy.green@linaro.org>
2014-11-30 12:51:47 +08:00
Andy Green
66a5faa633 coverity 83671 dead code
Signed-off-by: Andy Green <andy.green@linaro.org>
2014-11-30 12:48:22 +08:00
Andy Green
4bd1a4d4e0 coverity 83672 dead code
Signed-off-by: Andy Green <andy.green@linaro.org>
2014-11-30 12:47:33 +08:00
Andy Green
f14ea7a906 coverity 83673 deference after NULL check
Signed-off-by: Andy Green <andy.green@linaro.org>
2014-11-30 12:45:39 +08:00
Andy Green
47afcddccf 83674 dereference after NULL check
Signed-off-by: Andy Green <andy.green@linaro.org>
2014-11-30 12:43:51 +08:00
Andy Green
5549998ac3 coverity 83678 unused assignment
Signed-off-by: Andy Green <andy.green@linaro.org>
2014-11-30 12:40:32 +08:00
Andy Green
59800b764e coverity 83679 default int expansion might bloat byte reassembly
Signed-off-by: Andy Green <andy.green@linaro.org>
2014-11-30 12:37:50 +08:00
Andy Green
74f93d190b coverity 83680 kill needless semicolons
Signed-off-by: Andy Green <andy.green@linaro.org>
2014-11-30 12:30:36 +08:00
Andy Green
2c8161c9eb coverity 83681 unused assignment
Signed-off-by: Andy Green <andy.green@linaro.org>
2014-11-30 12:29:04 +08:00
Andy Green
e4d6f1c116 coverity 83670 daemonize can leak lock handle
Signed-off-by: Andy Green <andy.green@linaro.org>
2014-11-30 12:21:40 +08:00
Andy Green
26193fab34 coverity 83684 let parent close if ssl service fails
Signed-off-by: Andy Green <andy.green@linaro.org>
2014-11-30 12:14:23 +08:00
Andy Green
904b07d08c remove duplicate const
Signed-off-by: Andy Green <andy.green@linaro.org>
2014-11-26 14:38:04 +08:00
Andy Green
70b543f7c2 move bind passphrase out of LWS_NO_SERVER
Signed-off-by: Andy Green <andy.green@linaro.org>
2014-11-26 14:29:03 +08:00
Roger A. Light
d893d96f8f Subject: [PATCH] SSL: Disable support for SSLv2 and SSLv3. 2014-11-25 05:55:41 +08:00
Joakim Soderberg
1b97ec2efa Subject: [PATCH] Enable usage of ancient OpenSSL.
Yes people should be upgrading their OpenSSL, but there are still old versions without Heartbleed out there being used...
2014-11-25 05:53:31 +08:00