blob: 05880533f44cff1d747ed5c2155b09c20bc53501 [file] [log] [blame]
Andy Greena35c86f2013-01-31 10:16:44 +08001Changelog
2---------
3
Andy Green3df58002015-12-25 12:44:12 +08004User api additions
5------------------
6
Andy Green3246ebb2015-12-26 12:03:06 +080071) The info struct gained two new members
Andy Green3df58002015-12-25 12:44:12 +08008
9 - max_http_header_data: 0 for default (1024) or set the maximum amount of known
10 http header payload that lws can deal with. Payload in unknown http
11 headers is dropped silently. If for some reason you need to send huge
12 cookies or other HTTP-level headers, you can now increase this at context-
13 creation time.
14
15 - max_http_header_pool: 0 for default (16) or set the maximum amount of http
16 headers that can be tracked by lws in this context. For the server, if
17 the header pool is completely in use then accepts on the listen socket
18 are disabled until one becomes free. For the client, if you simultaneously
19 have pending connects for more than this number of client connections,
20 additional connects will fail until some of the pending connections timeout
21 or complete.
22
23HTTP header processing in lws only exists until just after the first main
24callback after the HTTP handshake... for ws connections that is ESTABLISHED and
25for HTTP connections the HTTP callback.
26
27So these settings are not related to the maximum number of simultaneous
Andy Green3246ebb2015-12-26 12:03:06 +080028connections, but the number of HTTP handshakes that may be expected or ongoing,
Andy Green3df58002015-12-25 12:44:12 +080029or have just completed, at one time. The reason it's useful is it changes the
30memory allocation for header processing to be one-time at context creation
31instead of every time there is a new connection, and gives you control over
32the peak allocation.
33
34Setting max_http_header_pool to 1 is fine it will just queue incoming
35connections before the accept as necessary, you can still have as many
Andy Green5b85e392015-12-26 13:23:11 +080036simultaneous post-header connections as you like. Since the http header
37processing is completed and the allocation released after ESTABLISHED or the
38HTTP callback, even with a pool of 1 many connections can be handled rapidly.
39
Andy Green3df58002015-12-25 12:44:12 +080040
Andy Green3246ebb2015-12-26 12:03:06 +080041User api changes
42----------------
43
441) LWS_SEND_BUFFER_POST_PADDING is now 0 and deprecated. You can remove it; if
45you still use it, obviously it does nothing. Old binary code with nonzero
46LWS_SEND_BUFFER_POST_PADDING is perfectly compatible, the old code just
Andy Green5b85e392015-12-26 13:23:11 +080047allocated a buffer bigger than the library is going to use.
Andy Green3246ebb2015-12-26 12:03:06 +080048
Andy Green5b85e392015-12-26 13:23:11 +080049The example apps no longer use LWS_SEND_BUFFER_POST_PADDING.
Andy Green3246ebb2015-12-26 12:03:06 +080050
51The only path who made use of it was sending with LWS_WRITE_CLOSE.
52
53If you use LWS_WRITE_CLOSE by hand in your user code, you need to allow an
54extra 2 bytes space at the end of your buffer. This ONLY applies to
55LWS_WRITE_CLOSE, which you normally don't send directly, but cause by returning
56nonzero from a callback letting the library actually send it.
57
58
Andy Green3df58002015-12-25 12:44:12 +080059
Andy Green9e8d1482015-12-18 11:01:03 +080060v1.6.0-chrome48-firefox42
61=======================
62
63Major API improvements
64----------------------
65
66v1.6.0 has many cleanups and improvements in the API. Although at first it
67looks pretty drastic, user code will only need four actions to update it.
68
69 - Do the three search/replaces in your user code, /libwebsocket_/lws_/,
70 /libwebsockets_/lws_/, and /struct\ libwebsocket/struct\ lws/
71
72 - Remove the context parameter from your user callbacks
73
74 - Remove context as the first parameter from the "Eleven APIS" listed in the
75 User Api Changes section
76
77 - Add lws_get_context(wsi) as the first parameter on the "Three APIS" listed
78 in the User Api Changes section, and anywhere else you still need context
79
80That's it... generally only a handful of the 14 affected APIs are actually in
81use in your user code and you can find them quickest by compiling and visiting
82the errors each in turn. And the end results are much cleaner, more
83predictable and maintainable.
84
85
Andy Green4e442b72015-12-10 07:58:58 +080086User api additions
87------------------
88
Andy Green3f628702015-12-14 07:16:32 +0800891) lws now exposes his internal platform file abstraction in a way that can be
Andy Green4e442b72015-12-10 07:58:58 +080090both used by user code to make it platform-agnostic, and be overridden or
91subclassed by user code. This allows things like handling the URI "directory
92space" as a virtual filesystem that may or may not be backed by a regular
93filesystem. One example use is serving files from inside large compressed
94archive storage without having to unpack anything except the file being
95requested.
96
97The test server shows how to use it, basically the platform-specific part of
98lws prepares a file operations structure that lives in the lws context.
99
Andy Green3f599962015-12-14 07:21:42 +0800100Helpers are provided to also leverage these platform-independent file handling
101apis
Andy Green4e442b72015-12-10 07:58:58 +0800102
103static inline lws_filefd_type
Andy Green3f599962015-12-14 07:21:42 +0800104lws_plat_file_open(struct lws *wsi, const char *filename,
Andy Green4e442b72015-12-10 07:58:58 +0800105 unsigned long *filelen, int flags)
Andy Green4e442b72015-12-10 07:58:58 +0800106static inline int
Andy Green3f599962015-12-14 07:21:42 +0800107lws_plat_file_close(struct lws *wsi, lws_filefd_type fd)
Andy Green4e442b72015-12-10 07:58:58 +0800108
109static inline unsigned long
Andy Green3f599962015-12-14 07:21:42 +0800110lws_plat_file_seek_cur(struct lws *wsi, lws_filefd_type fd, long offset)
Andy Green4e442b72015-12-10 07:58:58 +0800111
112static inline int
Andy Green3f599962015-12-14 07:21:42 +0800113lws_plat_file_read(struct lws *wsi, lws_filefd_type fd, unsigned long *amount,
114 unsigned char *buf, unsigned long len)
Andy Green4e442b72015-12-10 07:58:58 +0800115
116static inline int
Andy Green3f599962015-12-14 07:21:42 +0800117lws_plat_file_write(struct lws *wsi, lws_filefd_type fd, unsigned long *amount,
118 unsigned char *buf, unsigned long len)
Andy Green4e442b72015-12-10 07:58:58 +0800119
120The user code can also override or subclass the file operations, to either
121wrap or replace them. An example is shown in test server.
122
Andy Green3f599962015-12-14 07:21:42 +0800123A wsi can be associated with the file activity, allowing per-connection
124authentication and state to be used when interpreting the file request.
125
Andy Green3f628702015-12-14 07:16:32 +08001262) A new API void * lws_wsi_user(struct lws *wsi) lets you get the pointer to
127the user data associated with the wsi, just from the wsi.
128
Andy Green9e8d1482015-12-18 11:01:03 +08001293) URI argument handling. Libwebsockets parses and protects URI arguments
130like test.html?arg1=1&arg2=2, it decodes %xx uriencoding format and reduces
131path attacks like ../.../../etc/passwd so they cannot go behind the web
132server's /. There is a list of confirmed attacks we're proof against in
133./test-server/attack.sh.
134
135There is a new API lws_hdr_copy_fragment that should be used now to access
136the URI arguments (it returns the fragments length)
137
138 while (lws_hdr_copy_fragment(wsi, buf, sizeof(buf),
139 WSI_TOKEN_HTTP_URI_ARGS, n) > 0) {
140 lwsl_info("URI Arg %d: %s\n", ++n, buf);
141 }
142
143For the example above, calling with n=0 will return "arg1=1" and n=1 "arg2=2".
144All legal uriencodings will have been reduced in those strings.
145
146lws_hdr_copy_fragment() returns the length of the x=y fragment, so it's also
147possible to deal with arguments containing %00. If you don't care about that,
148the returned string has '\0' appended to simplify processing.
149
Andy Green4e442b72015-12-10 07:58:58 +0800150
Andy Green6d417202015-12-04 10:39:23 +0800151User api changes
152----------------
153
Andy Green1a366bf2015-12-14 07:02:51 +08001541) Three APIS
155
156 - lws_callback_on_writable_all_protocol(const struct lws_protocols *protocol)
157 - lws_callback_all_protocol(const struct lws_protocols *protocol)
158 - lws_rx_flow_allow_all_protocol(lws_rx_flow_allow_all_protocol)
159
160Now take an additional pointer to the lws_context in their first argument.
161
162The reason for this change is struct lws_protocols has been changed to remove
163members that lws used for private storage: so the protocols struct in now
164truly const and may be reused serially or simultaneously by different contexts.
165
Andy Green11c05bf2015-12-16 18:19:08 +08001662) Eleven APIs
167
168LWS_VISIBLE LWS_EXTERN int
169lws_add_http_header_by_name(struct lws_context *context,
170 struct lws *wsi,
171 const unsigned char *name,
172 const unsigned char *value,
173 int length,
174 unsigned char **p,
175 unsigned char *end);
176LWS_VISIBLE LWS_EXTERN int
177lws_finalize_http_header(struct lws_context *context,
178 struct lws *wsi,
179 unsigned char **p,
180 unsigned char *end);
181LWS_VISIBLE LWS_EXTERN int
182lws_add_http_header_by_token(struct lws_context *context,
183 struct lws *wsi,
184 enum lws_token_indexes token,
185 const unsigned char *value,
186 int length,
187 unsigned char **p,
188 unsigned char *end);
189LWS_VISIBLE LWS_EXTERN int
190lws_add_http_header_content_length(struct lws_context *context,
191 struct lws *wsi,
192 unsigned long content_length,
193 unsigned char **p,
194 unsigned char *end);
195LWS_VISIBLE LWS_EXTERN int
196lws_add_http_header_status(struct lws_context *context, struct lws *wsi,
197 unsigned int code, unsigned char **p,
198 unsigned char *end);
199
200LWS_VISIBLE LWS_EXTERN int
201lws_serve_http_file(struct lws_context *context, struct lws *wsi,
202 const char *file, const char *content_type,
203 const char *other_headers, int other_headers_len);
204LWS_VISIBLE LWS_EXTERN int
205lws_serve_http_file_fragment(struct lws_context *context, struct lws *wsi);
206
207LWS_VISIBLE LWS_EXTERN int
208lws_return_http_status(struct lws_context *context, struct lws *wsi,
209 unsigned int code, const char *html_body);
210
211LWS_VISIBLE LWS_EXTERN int
212lws_callback_on_writable(const struct lws_context *context, struct lws *wsi);
213
214LWS_VISIBLE LWS_EXTERN void
215lws_get_peer_addresses(struct lws_context *context, struct lws *wsi,
216 lws_sockfd_type fd, char *name, int name_len,
217 char *rip, int rip_len);
218
219LWS_VISIBLE LWS_EXTERN int
220lws_read(struct lws_context *context, struct lws *wsi,
221 unsigned char *buf, size_t len);
222
223no longer require their initial struct lws_context * parameter.
224
2253) Several older apis start with libwebsocket_ or libwebsockets_ while newer ones
Andy Green6d417202015-12-04 10:39:23 +0800226all begin lws_. These apis have been changed to all begin with lws_.
227
Andy Green11c05bf2015-12-16 18:19:08 +0800228To convert, search-replace
Andy Green6d417202015-12-04 10:39:23 +0800229
Andy Green11c05bf2015-12-16 18:19:08 +0800230 - libwebsockets_/lws_
231 - libwebsocket_/lws_
232 - struct\ libwebsocket/struct\ lws
Andy Green00c6d152015-12-17 07:54:44 +0800233
2344) context parameter removed from user callback.
235
236Since almost all apis no longer need the context as a parameter, it's no longer
237provided at the user callback directly.
238
239However if you need it, for ALL callbacks wsi is valid and has a valid context
Andy Green6d645392015-12-17 18:25:25 +0800240pointer you can recover using lws_get_context(wsi).
Andy Green6d417202015-12-04 10:39:23 +0800241
242
Andy Greenab620ff2015-10-28 08:39:09 +0800243v1.5-chrome47-firefox41
244=======================
MGadkari020c53c2015-08-21 16:15:36 +0530245
246User api changes
247----------------
248
249LWS_CALLBACK_CLIENT_CONNECTION_ERROR may provide an error string if in is
250non-NULL. If so, the string has length len.
251
Andy Green6d59f592015-10-15 09:12:58 +0800252LWS_SERVER_OPTION_PEER_CERT_NOT_REQUIRED is available to relax the requirement
253for peer certs if you are using the option to require client certs.
254
Andy Green4c79ee72015-10-15 11:20:40 +0800255LWS_WITHOUT_BUILTIN_SHA1 cmake option forces lws to use SHA1() defined
256externally, eg, byOpenSSL, and disables build of libwebsockets_SHA1()
257
258
Andy Green16fb0132015-03-28 11:35:40 +0800259v1.4-chrome43-firefox36
260=======================
Olehfaeac3c2014-07-29 23:18:41 +0800261
262User api additions
263------------------
264
265There's a new member in the info struct used to control context creation,
266ssl_private_key_password, which allows passing into lws the passphrase on
267an SSL cetificate
268
Andy Greeneabed8d2014-08-11 12:11:36 +0800269There's a new member in struct protocols, id, which is ignored by lws but can
270be used by the user code to mark the selected protocol by user-defined version
271or capabliity flag information, for the case multiple versions of a protocol are
272supported.
273
Andy Greenb128ccc2014-08-16 09:54:27 +0800274int lws_is_ssl(wsi) added to allow user code to know if the connection was made
275over ssl or not. If LWS_SERVER_OPTION_ALLOW_NON_SSL_ON_SSL_PORT is used, both
276ssl and non-ssl connections are possible and may need to be treated differently
277in the user code.
278
Andy Green14425ea2014-08-18 22:49:39 +0800279int lws_partial_buffered(wsi) added... should be checked after any
280libwebsocket_write that will be followed by another libwebsocket_write inside
281the same writeable callback. If set, you can't do any more writes until the
282writeable callback is called again. If you only do one write per writeable callback,
283you can ignore this.
284
Andy Green917f43a2014-10-12 14:31:47 +0800285HTTP2-related: HTTP2 changes how headers are handled, lws now has new version-
286agnositic header creation APIs. These do the right thing depending on each
287connection's HTTP version without the user code having to know or care, except
288to make sure to use the new APIs for headers (test-server is updated to use
289them already, so look there for examples)
290
291The APIs "render" the headers into a user-provided buffer and bump *p as it
292is used. If *p reaches end, then the APIs return nonzero for error.
293
294LWS_VISIBLE LWS_EXTERN int
295lws_add_http_header_status(struct libwebsocket_context *context,
296 struct libwebsocket *wsi,
297 unsigned int code,
298 unsigned char **p,
299 unsigned char *end);
300
301Start a response header reporting status like 200, 500, etc
302
303LWS_VISIBLE LWS_EXTERN int
304lws_add_http_header_by_name(struct libwebsocket_context *context,
305 struct libwebsocket *wsi,
306 const unsigned char *name,
307 const unsigned char *value,
308 int length,
309 unsigned char **p,
310 unsigned char *end);
311
312Add a header like name: value in HTTP1.x
313
314LWS_VISIBLE LWS_EXTERN int
315lws_finalize_http_header(struct libwebsocket_context *context,
316 struct libwebsocket *wsi,
317 unsigned char **p,
318 unsigned char *end);
319
320Finish off the headers, like add the extra \r\n in HTTP1.x
321
322LWS_VISIBLE LWS_EXTERN int
323lws_add_http_header_by_token(struct libwebsocket_context *context,
324 struct libwebsocket *wsi,
325 enum lws_token_indexes token,
326 const unsigned char *value,
327 int length,
328 unsigned char **p,
329 unsigned char *end);
330
331Add a header by using a lws token as the name part. In HTTP2, this can be
332compressed to one or two bytes.
333
Olehfaeac3c2014-07-29 23:18:41 +0800334
Andy Green822241c2014-08-18 22:21:51 +0800335User api removal
336----------------
337
338protocols struct member no_buffer_all_partial_tx is removed. Under some
Peter Pentchevbb085da2015-12-03 15:55:11 +0200339conditions like rewriting extension such as compression in use, the built-in
Andy Green822241c2014-08-18 22:21:51 +0800340partial send buffering is the only way to deal with the problem, so turning
341it off is deprecated.
342
343
Andy Green917f43a2014-10-12 14:31:47 +0800344User api changes
345----------------
346
347HTTP2-related: API libwebsockets_serve_http_file() takes an extra parameter at
348the end now
349
350int other_headers_len)
351
352If you are providing other headers, they must be generated using the new
353HTTP-version-agnostic APIs, and you must provide the length of them using this
354additional parameter.
355
joseph.urciuoli4d9c8fc2014-10-16 08:53:19 +0800356struct lws_context_creation_info now has an additional member
357SSL_CTX *provided_client_ssl_ctx you may set to an externally-initialized
358SSL_CTX managed outside lws. Defaulting to zero keeps the existing behaviour of
359lws managing the context, if you memset the struct to 0 or have as a filescope
360initialized struct in bss, no need to change anything.
361
Andy Green822241c2014-08-18 22:21:51 +0800362
Andy Greenc1fdd102014-07-06 09:56:11 +0800363v1.3-chrome37-firefox30
364=======================
365
366 .gitignore | 1 -
367 CMakeLists.txt | 447 +++--
368 README.build | 35 +-
369 README.coding | 14 +
370 changelog | 66 +
371 cmake/LibwebsocketsConfig.cmake.in | 17 +
372 cmake/LibwebsocketsConfigVersion.cmake.in | 11 +
373 config.h.cmake | 18 +
374 cross-ming.cmake | 31 +
375 cross-openwrt-makefile | 91 +
376 lib/client-handshake.c | 205 ++-
377 lib/client-parser.c | 58 +-
378 lib/client.c | 158 +-
379 lib/context.c | 341 ++++
380 lib/extension-deflate-frame.c | 2 +-
381 lib/extension.c | 178 ++
382 lib/handshake.c | 287 +---
383 lib/lextable.h | 338 ++++
384 lib/libev.c | 175 ++
385 lib/libwebsockets.c | 2089 +++--------------------
386 lib/libwebsockets.h | 253 ++-
387 lib/lws-plat-unix.c | 404 +++++
388 lib/lws-plat-win.c | 358 ++++
389 lib/minilex.c | 530 +++---
390 lib/output.c | 445 ++---
391 lib/parsers.c | 682 ++++----
392 lib/pollfd.c | 239 +++
393 lib/private-libwebsockets.h | 501 +++++-
394 lib/server-handshake.c | 274 +--
395 lib/server.c | 858 ++++++++--
396 lib/service.c | 517 ++++++
397 lib/sha-1.c | 38 +-
398 lib/ssl-http2.c | 78 +
399 lib/ssl.c | 571 +++++++
400 test-server/attack.sh | 101 +-
401 test-server/test-client.c | 9 +-
402 test-server/test-echo.c | 17 +-
403 test-server/test-fraggle.c | 7 -
404 test-server/test-ping.c | 12 +-
405 test-server/test-server.c | 330 ++--
406 test-server/test.html | 4 +-
407 win32port/client/client.vcxproj | 259 ---
408 win32port/client/client.vcxproj.filters | 39 -
409 .../libwebsocketswin32.vcxproj.filters | 93 -
410 win32port/server/server.vcxproj | 276 ---
411 win32port/server/server.vcxproj.filters | 51 -
412 win32port/win32helpers/gettimeofday.h | 59 +-
413 win32port/win32helpers/netdb.h | 1 -
414 win32port/win32helpers/strings.h | 0
415 win32port/win32helpers/sys/time.h | 1 -
416 win32port/win32helpers/unistd.h | 0
417 win32port/win32helpers/websock-w32.c | 104 --
418 win32port/win32helpers/websock-w32.h | 62 -
419 win32port/win32port.sln | 100 --
420 win32port/zlib/gzio.c | 3 +-
421 55 files changed, 6779 insertions(+), 5059 deletions(-)
422
Andy Green79002562013-11-09 11:04:35 +0800423
kapejodce64fb02013-11-19 13:38:16 +0100424User api additions
425------------------
426
427POST method is supported
428
429The protocol 0 / HTTP callback can now get two new kinds of callback,
430LWS_CALLBACK_HTTP_BODY (in and len are a chunk of the body of the HTTP request)
431and LWS_CALLBACK_HTTP_BODY_COMPLETION (the expected amount of body has arrived
432and been passed to the user code already). These callbacks are used with the
433post method (see the test server for details).
434
435The period between the HTTP header completion and the completion of the body
436processing is protected by a 5s timeout.
437
438The chunks are stored in a malloc'd buffer of size protocols[0].rx_buffer_size.
439
440
James Devine5b34c972013-12-14 11:41:29 +0800441New server option you can enable from user code
442LWS_SERVER_OPTION_ALLOW_NON_SSL_ON_SSL_PORT allows non-SSL connections to
443also be accepted on an SSL listening port. It's disabled unless you enable
444it explicitly.
445
446
Andy Green7a132792013-12-18 09:48:26 +0800447Two new callbacks are added in protocols[0] that are optional for allowing
448limited thread access to libwebsockets, LWS_CALLBACK_LOCK_POLL and
449LWS_CALLBACK_UNLOCK_POLL.
450
451If you use them, they protect internal and external poll list changes, but if
452you want to use external thread access to libwebsocket_callback_on_writable()
453you have to implement your locking here even if you don't use external
454poll support.
455
456If you will use another thread for this, take a lot of care about managing
457your list of live wsi by doing it from ESTABLISHED and CLOSED callbacks
458(with your own locking).
459
Andrew Canaday9769f4f2014-03-23 13:25:07 +0800460If you configure cmake with -DLWS_WITH_LIBEV=1 then the code allowing the libev
461eventloop instead of the default poll() one will also be compiled in. But to
462use it, you must also set the LWS_SERVER_OPTION_LIBEV flag on the context
463creation info struct options member.
Andy Green7a132792013-12-18 09:48:26 +0800464
Andy Greenc1fdd102014-07-06 09:56:11 +0800465IPV6 is supported and enabled by default except for Windows, you can disable
466the support at build-time by giving -DLWS_IPV6=, and disable use of it even if
James Devine3f13ea22014-03-24 16:09:25 +0800467compiled in by making sure the flag LWS_SERVER_OPTION_DISABLE_IPV6 is set on
468the context creation info struct options member.
469
Andy Greenc1fdd102014-07-06 09:56:11 +0800470You can give LWS_SERVER_OPTION_DISABLE_OS_CA_CERTS option flag to
471guarantee the OS CAs will not be used, even if that support was selected at
472build-time.
473
474Optional "token limits" may be enforced by setting the member "token_limits"
475in struct lws_context_creation_info to point to a struct lws_token_limits.
476NULL means no token limits used for compatibility.
477
Andy Green7a132792013-12-18 09:48:26 +0800478
Andy Green79002562013-11-09 11:04:35 +0800479User api changes
480----------------
481
482Extra optional argument to libwebsockets_serve_http_file() allows injecion
483of HTTP headers into the canned response. Eg, cookies may be added like
484that without getting involved in having to send the header by hand.
485
Patrick Gansterer148b9452014-02-28 02:31:23 +0100486A new info member http_proxy_address may be used at context creation time to
487set the http proxy. If non-NULL, it overrides http_proxy environment var.
Andy Green79002562013-11-09 11:04:35 +0800488
Andy Greend2ec7ad2014-03-15 10:39:29 +0800489Cmake supports LWS_SSL_CLIENT_USE_OS_CA_CERTS defaulting to on, which gets
490the client to use the OS CA Roots. If you're worried somebody with the
491ability to forge for force creation of a client cert from the root CA in
492your OS, you should disable this since your selfsigned $0 cert is a lot safer
493then...
494
Andy Green79002562013-11-09 11:04:35 +0800495
Andy Green81877e62013-10-26 20:36:08 +0800496v1.23-chrome32-firefox24
497========================
498
499 Android.mk | 29 +
500 CMakeLists.txt | 573 ++++++++----
501 COPYING | 503 -----------
502 INSTALL | 365 --------
503 Makefile.am | 13 -
504 README.build | 371 ++------
505 README.coding | 63 ++
506 autogen.sh | 1578 ---------------------------------
507 changelog | 69 ++
508 cmake/FindGit.cmake | 163 ++++
509 cmake/FindOpenSSLbins.cmake | 15 +-
510 cmake/UseRPMTools.cmake | 176 ++++
511 config.h.cmake | 25 +-
512 configure.ac | 226 -----
513 cross-arm-linux-gnueabihf.cmake | 28 +
514 lib/Makefile.am | 89 --
515 lib/base64-decode.c | 98 +-
516 lib/client-handshake.c | 123 ++-
517 lib/client-parser.c | 19 +-
518 lib/client.c | 145 ++-
519 lib/daemonize.c | 4 +-
520 lib/extension.c | 2 +-
521 lib/getifaddrs.h | 4 +-
522 lib/handshake.c | 76 +-
523 lib/libwebsockets.c | 491 ++++++----
524 lib/libwebsockets.h | 164 ++--
525 lib/output.c | 214 ++++-
526 lib/parsers.c | 102 +--
527 lib/private-libwebsockets.h | 66 +-
528 lib/server-handshake.c | 5 +-
529 lib/server.c | 29 +-
530 lib/sha-1.c | 2 +-
531 libwebsockets-api-doc.html | 249 +++---
532 libwebsockets.pc.in | 11 -
533 libwebsockets.spec | 14 +-
534 m4/ignore-me | 2 -
535 scripts/FindLibWebSockets.cmake | 33 +
536 scripts/kernel-doc | 1 +
537 test-server/Makefile.am | 131 ---
538 test-server/leaf.jpg | Bin 0 -> 2477518 bytes
539 test-server/test-client.c | 78 +-
540 test-server/test-echo.c | 33 +-
541 test-server/test-fraggle.c | 26 +-
542 test-server/test-ping.c | 15 +-
543 test-server/test-server.c | 197 +++-
544 test-server/test.html | 5 +-
545 win32port/win32helpers/gettimeofday.c | 74 +-
546 win32port/win32helpers/websock-w32.h | 6 +-
547 48 files changed, 2493 insertions(+), 4212 deletions(-)
548
Andy Green54cb3462013-02-14 22:23:54 +0800549
550User api additions
551------------------
552
553 - You can now call libwebsocket_callback_on_writable() on http connectons,
554 and get a LWS_CALLBACK_HTTP_WRITEABLE callback, the same way you can
555 regulate writes with a websocket protocol connection.
556
Andy Green2672fb22013-02-22 09:54:35 +0800557 - A new member in the context creation parameter struct "ssl_cipher_list" is
558 added, replacing CIPHERS_LIST_STRING. NULL means use the ssl library
559 default list of ciphers.
560
Andy Green58f214e2013-03-09 13:03:53 +0800561 - Not really an api addition, but libwebsocket_service_fd() will now zero
562 the revents field of the pollfd it was called with if it handled the
563 descriptor. So you can tell if it is a non-lws fd by checking revents
564 after the service call... if it's still nonzero, the descriptor
565 belongs to you and you need to take care of it.
566
Andy Greenb55451c2013-03-16 12:32:27 +0800567 - libwebsocket_rx_flow_allow_all_protocol(protocol) will unthrottle all
568 connections with the established protocol. It's designed to be
569 called from user server code when it sees it can accept more input
570 and may have throttled connections using the server rx flow apis
571 while it was unable to accept any other input The user server code
572 then does not have to try to track while connections it choked, this
573 will free up all of them in one call.
574
Andy Green0c9563b2013-06-10 22:54:40 +0800575 - there's a new, optional callback LWS_CALLBACK_CLOSED_HTTP which gets
576 called when an HTTP protocol socket closes
577
Andy Green96d48fd2013-09-18 08:32:55 +0800578 - for LWS_CALLBACK_FILTER_PROTOCOL_CONNECTION callback, the user_space alloc
579 has already been done before the callback happens. That means we can
580 use the user parameter to the callback to contain the user pointer, and
581 move the protocol name to the "in" parameter. The docs for this
582 callback are also updated to reflect how to check headers in there.
583
Andy Green5dc62ea2013-09-20 20:26:12 +0800584 - libwebsocket_client_connect() is now properly nonblocking and async. See
585 README.coding and test-client.c for information on the callbacks you
586 can rely on controlling the async connection period with.
587
Andy Green81877e62013-10-26 20:36:08 +0800588 - if your OS does not support the http_proxy environment variable convention
589 (eg, reportedly OSX), you can use a new api libwebsocket_set_proxy()
Peter Pentchevbb085da2015-12-03 15:55:11 +0200590 to set the proxy details in between context creation and the connection
Andy Green81877e62013-10-26 20:36:08 +0800591 action. For OSes that support http_proxy, that's used automatically.
Andy Greenb55451c2013-03-16 12:32:27 +0800592
Andy Green50097dd2013-02-15 22:36:30 +0800593User api changes
594----------------
595
596 - the external poll callbacks now get the socket descriptor coming from the
597 "in" parameter. The user parameter provides the user_space for the
598 wsi as it normally does on the other callbacks.
Edwin van den Oetelaar8c8a8e12013-02-20 20:56:59 +0800599 LWS_CALLBACK_FILTER_NETWORK_CONNECTION also has the socket descriptor
600 delivered by @in now instead of @user.
Andy Green50097dd2013-02-15 22:36:30 +0800601
Andy Greenfc7c5e42013-02-23 10:50:10 +0800602 - libwebsocket_write() now returns -1 for error, or the amount of data
603 actually accepted for send. Under load, the OS may signal it is
604 ready to send new data on the socket, but have only a restricted
605 amount of memory to buffer the packet compared to usual.
606
Andy Green50097dd2013-02-15 22:36:30 +0800607
Andy Greendc914cf2013-02-18 16:54:26 +0800608User api removal
609----------------
610
611 - libwebsocket_ensure_user_space() is removed from the public api, if you
612 were using it to get user_space, you need to adapt your code to only
613 use user_space inside the user callback.
614
Andy Green2672fb22013-02-22 09:54:35 +0800615 - CIPHERS_LIST_STRING is removed
616
Andy Green0097a992013-03-09 13:06:37 +0800617 - autotools build has been removed. See README.build for info on how to
618 use CMake for your platform
619
Andy Green54cb3462013-02-14 22:23:54 +0800620
Andy Green53a46782013-02-14 11:23:49 +0800621v1.21-chrome26-firefox18
622========================
623
624 - Fixes buffer overflow bug in max frame size handling if you used the
625 default protocol buffer size. If you declared rx_buffer_size in your
626 protocol, which is recommended anyway, your code was unaffected.
627
Andy Green182cb9a2013-02-13 11:54:08 +0800628v1.2-chrome26-firefox18
629=======================
630
631Diffstat
632--------
633
634 .gitignore | 16 +++
635 CMakeLists.txt | 544 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
636 LICENSE | 526 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
637 Makefile.am | 1 +
638 README | 20 +++
639 README.build | 258 ++++++++++++++++++++++++++++++++-----
640 README.coding | 52 ++++++++
641 changelog | 136 ++++++++++++++++++++
642 cmake/FindOpenSSLbins.cmake | 33 +++++
643 config.h.cmake | 173 +++++++++++++++++++++++++
644 configure.ac | 22 +++-
645 lib/Makefile.am | 20 ++-
646 lib/base64-decode.c | 2 +-
647 lib/client-handshake.c | 190 +++++++++++-----------------
648 lib/client-parser.c | 88 +++++++------
649 lib/client.c | 384 ++++++++++++++++++++++++++++++-------------------------
650 lib/daemonize.c | 32 +++--
651 lib/extension-deflate-frame.c | 58 +++++----
652 lib/extension-deflate-stream.c | 19 ++-
653 lib/extension-deflate-stream.h | 4 +-
654 lib/extension.c | 11 +-
655 lib/getifaddrs.c | 315 +++++++++++++++++++++++-----------------------
656 lib/getifaddrs.h | 30 ++---
657 lib/handshake.c | 124 +++++++++++-------
658 lib/libwebsockets.c | 736 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------
659 lib/libwebsockets.h | 237 ++++++++++++++++++++++------------
660 lib/output.c | 192 +++++++++++-----------------
661 lib/parsers.c | 966 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------------------------------------
662 lib/private-libwebsockets.h | 225 +++++++++++++++++++++------------
663 lib/server-handshake.c | 82 ++++++------
664 lib/server.c | 96 +++++++-------
665 libwebsockets-api-doc.html | 189 ++++++++++++++++++----------
666 libwebsockets.spec | 17 +--
667 test-server/attack.sh | 148 ++++++++++++++++++++++
668 test-server/test-client.c | 125 +++++++++---------
669 test-server/test-echo.c | 31 +++--
670 test-server/test-fraggle.c | 32 ++---
671 test-server/test-ping.c | 52 ++++----
672 test-server/test-server.c | 129 ++++++++++++-------
673 win32port/libwebsocketswin32/libwebsocketswin32.vcxproj | 279 ----------------------------------------
674 win32port/libwebsocketswin32/libwebsocketswin32.vcxproj.filters | 23 +++-
675 41 files changed, 4398 insertions(+), 2219 deletions(-)
676
Andy Green7b405452013-02-01 10:50:15 +0800677
678User api additions
679------------------
680
681 - lws_get_library_version() returns a const char * with a string like
682 "1.1 9e7f737", representing the library version from configure.ac
683 and the git HEAD hash the library was built from
684
Andy Greena47865f2013-02-10 09:39:47 +0800685 - TCP Keepalive can now optionally be applied to all lws sockets, on Linux
686 also with controllable timeout, number of probes and probe interval.
687 (On BSD type OS, you can only use system default settings for the
688 timing and retries, although enabling it is supported by setting
689 ka_time to nonzero, the exact value has no meaning.)
690 This enables detection of idle connections which are logically okay,
691 but are in fact dead, due to network connectivity issues at the server,
Andy Greena690cd02013-02-09 12:25:31 +0800692 client, or any intermediary. By default it's not enabled, but you
693 can enable it by setting a non-zero timeout (in seconds) at the new
694 ka_time member at context creation time.
695
Andy Greena7109e62013-02-11 12:05:54 +0800696 - Two new optional user callbacks added, LWS_CALLBACK_PROTOCOL_DESTROY which
697 is called one-time per protocol as the context is being destroyed, and
698 LWS_CALLBACK_PROTOCOL_INIT which is called when the context is created
699 and the protocols are added, again it's a one-time affair.
700 This lets you manage per-protocol allocations properly including
701 cleaning up after yourself when the server goes down.
Andy Green7b405452013-02-01 10:50:15 +0800702
Andy Greened334462013-02-07 21:14:33 +0800703User api changes
704----------------
705
Andy Green1b265272013-02-09 14:01:09 +0800706 - libwebsocket_create_context() has changed from taking a ton of parameters
707 to just taking a pointer to a struct containing the parameters. The
708 struct lws_context_creation_info is in libwebsockets.h, the members
709 are in the same order as when they were parameters to the call
710 previously. The test apps are all updated accordingly so you can
711 see example code there.
712
Andy Greened334462013-02-07 21:14:33 +0800713 - Header tokens are now deleted after the websocket connection is
Andy Green54495112013-02-06 21:10:16 +0900714 established. Not just the header data is saved, but the pointer and
715 length array is also removed from (union) scope saving several hundred
716 bytes per connection once it is established
717
718 - struct libwebsocket_protocols has a new member rx_buffer_size, this
719 controls rx buffer size per connection of that protocol now. Sources
720 for apps built against older versions of the library won't declare
721 this in their protocols, defaulting it to 0. Zero buffer is legal,
722 it causes a default buffer to be allocated (currently 4096)
723
724 If you want to receive only atomic frames in your user callback, you
725 should set this to greater than your largest frame size. If a frame
726 comes that exceeds that, no error occurs but the callback happens as
727 soon as the buffer limit is reached, and again if it is reached again
728 or the frame completes. You can detect that has happened by seeing
729 there is still frame content pending using
730 libwebsockets_remaining_packet_payload()
731
732 By correctly setting this, you can save a lot of memory when your
733 protocol has small frames (see the test server and client sources).
734
Andy Green16ab3182013-02-10 18:02:31 +0800735 - LWS_MAX_HEADER_LEN now defaults to 1024 and is the total amount of known
736 header payload lws can cope with, that includes the GET URL, origin
737 etc. Headers not understood by lws are ignored and their payload
738 not included in this.
739
Andy Green54495112013-02-06 21:10:16 +0900740
741User api removals
742-----------------
743
Andy Green16ab3182013-02-10 18:02:31 +0800744 - The configuration-time option MAX_USER_RX_BUFFER has been replaced by a
745 buffer size chosen per-protocol. For compatibility, there's a default
746 of 4096 rx buffer, but user code should set the appropriate size for
747 the protocol frames.
748
749 - LWS_INITIAL_HDR_ALLOC and LWS_ADDITIONAL_HDR_ALLOC are no longer needed
750 and have been removed. There's a new header management scheme that
751 handles them in a much more compact way.
Andy Greened334462013-02-07 21:14:33 +0800752
Andy Green70edd6f2013-02-12 10:15:25 +0800753 - libwebsockets_hangup_on_client() is removed. If you want to close the
754 connection you must do so from the user callback and by returning
755 -1 from there.
756
Andy Green508946c2013-02-12 10:19:08 +0800757 - libwebsocket_close_and_free_session() is now private to the library code
758 only and not exposed for user code. If you want to close the
759 connection, you must do so from the user callback by returning -1
760 from there.
761
Andy Greened334462013-02-07 21:14:33 +0800762
Andy Greendf60b0c2013-02-06 19:57:12 +0900763New features
764------------
765
Andy Green9b09dc02013-02-08 12:48:36 +0800766 - Cmake project file added, aimed initially at Windows support: this replaces
Andy Green16ab3182013-02-10 18:02:31 +0800767 the visual studio project files that were in the tree until now.
Andy Greendf60b0c2013-02-06 19:57:12 +0900768
Andy Greenc3ef0d62013-02-12 10:50:49 +0800769 - CyaSSL now supported in place of OpenSSL (--use-cyassl on configure)
770
Andy Green9b09dc02013-02-08 12:48:36 +0800771 - PATH_MAX or MAX_PATH no longer needed
Andy Greendf60b0c2013-02-06 19:57:12 +0900772
Andy Green54495112013-02-06 21:10:16 +0900773 - cutomizable frame rx buffer size by protocol
774
Andy Greenc3ef0d62013-02-12 10:50:49 +0800775 - optional TCP keepalive so dead peers can be detected, can be enabled at
776 context-creation time
777
778 - valgrind-clean: no SSL or CyaSSL: completely clean. With OpenSSL, 88 bytes
779 lost at OpenSSL library init and symptomless reports of uninitialized
780 memory usage... seems to be a known and ignored problem at OpenSSL
781
Andy Greena3957ef2013-02-11 09:31:43 +0800782 - By default debug is enabled and the library is built for -O0 -g to faclitate
783 that. Use --disable-debug configure option to build instead with -O4
784 and no -g (debug info), obviously providing best performance and
785 reduced binary size.
Andy Green7b405452013-02-01 10:50:15 +0800786
Andy Green895d56d2013-02-11 09:32:53 +0800787 - 1.0 introduced some code to try to not deflate small frames, however this
788 seems to break when confronted with a mixture of frames above and
789 below the threshold, so it's removed. Veto the compression extension
790 in your user callback if you will typically have very small frames.
791
Andy Green16ab3182013-02-10 18:02:31 +0800792 - There are many memory usage improvements, both a reduction in malloc/
793 realloc and architectural changes. A websocket connection now
794 consumes only 296 bytes with SSL or 272 bytes without on x86_64,
795 during header processing an additional 1262 bytes is allocated in a
796 single malloc, but is freed when the websocket connection starts.
797 The RX frame buffer defined by the protocol in user
798 code is also allocated per connection, this represents the largest
799 frame you can receive atomically in that protocol.
800
Andy Greenc3ef0d62013-02-12 10:50:49 +0800801 - On ARM9 build, just http+ws server no extensions or ssl, <12Kbytes .text
802 and 112 bytes per connection (+1328 only during header processing)
803
Andy Green895d56d2013-02-11 09:32:53 +0800804
Andy Greenbd1132f2013-01-31 19:53:05 +0800805v1.1-chrome26-firefox18
Andy Greena35c86f2013-01-31 10:16:44 +0800806=======================
807
808Diffstat
809--------
810
811 Makefile.am | 4 +
812 README-test-server | 291 ---
813 README.build | 239 ++
814 README.coding | 138 ++
815 README.rst | 72 -
816 README.test-apps | 272 +++
817 configure.ac | 116 +-
818 lib/Makefile.am | 55 +-
819 lib/base64-decode.c | 5 +-
820 lib/client-handshake.c | 121 +-
821 lib/client-parser.c | 394 ++++
822 lib/client.c | 807 +++++++
823 lib/daemonize.c | 212 ++
824 lib/extension-deflate-frame.c | 132 +-
825 lib/extension-deflate-stream.c | 12 +-
826 lib/extension-x-google-mux.c | 1223 ----------
827 lib/extension-x-google-mux.h | 96 -
828 lib/extension.c | 8 -
829 lib/getifaddrs.c | 271 +++
830 lib/getifaddrs.h | 76 +
831 lib/handshake.c | 582 +----
832 lib/libwebsockets.c | 2493 ++++++---------------
833 lib/libwebsockets.h | 115 +-
834 lib/md5.c | 217 --
835 lib/minilex.c | 440 ++++
836 lib/output.c | 628 ++++++
837 lib/parsers.c | 2016 +++++------------
838 lib/private-libwebsockets.h | 284 +--
839 lib/server-handshake.c | 275 +++
840 lib/server.c | 377 ++++
841 libwebsockets-api-doc.html | 300 +--
842 m4/ignore-me | 2 +
843 test-server/Makefile.am | 111 +-
844 test-server/libwebsockets.org-logo.png | Bin 0 -> 7029 bytes
845 test-server/test-client.c | 45 +-
846 test-server/test-echo.c | 330 +++
847 test-server/test-fraggle.c | 20 +-
848 test-server/test-ping.c | 22 +-
849 test-server/test-server-extpoll.c | 554 -----
850 test-server/test-server.c | 349 ++-
851 test-server/test.html | 3 +-
852 win32port/zlib/ZLib.vcxproj | 749 ++++---
853 win32port/zlib/ZLib.vcxproj.filters | 188 +-
854 win32port/zlib/adler32.c | 348 ++-
855 win32port/zlib/compress.c | 160 +-
856 win32port/zlib/crc32.c | 867 ++++----
857 win32port/zlib/crc32.h | 882 ++++----
858 win32port/zlib/deflate.c | 3799 +++++++++++++++-----------------
859 win32port/zlib/deflate.h | 688 +++---
860 win32port/zlib/gzclose.c | 50 +-
861 win32port/zlib/gzguts.h | 325 ++-
862 win32port/zlib/gzlib.c | 1157 +++++-----
863 win32port/zlib/gzread.c | 1242 ++++++-----
864 win32port/zlib/gzwrite.c | 1096 +++++----
865 win32port/zlib/infback.c | 1272 ++++++-----
866 win32port/zlib/inffast.c | 680 +++---
867 win32port/zlib/inffast.h | 22 +-
868 win32port/zlib/inffixed.h | 188 +-
869 win32port/zlib/inflate.c | 2976 +++++++++++++------------
870 win32port/zlib/inflate.h | 244 +-
871 win32port/zlib/inftrees.c | 636 +++---
872 win32port/zlib/inftrees.h | 124 +-
873 win32port/zlib/trees.c | 2468 +++++++++++----------
874 win32port/zlib/trees.h | 256 +--
875 win32port/zlib/uncompr.c | 118 +-
876 win32port/zlib/zconf.h | 934 ++++----
877 win32port/zlib/zlib.h | 3357 ++++++++++++++--------------
878 win32port/zlib/zutil.c | 642 +++---
879 win32port/zlib/zutil.h | 526 ++---
880 69 files changed, 19556 insertions(+), 20145 deletions(-)
881
882user api changes
883----------------
884
885 - libwebsockets_serve_http_file() now takes a context as first argument
886
887 - libwebsockets_get_peer_addresses() now takes a context and wsi as first
888 two arguments
889
890
891user api additions
892------------------
893
894 - lwsl_...() logging apis, default to stderr but retargetable by user code;
895 may be used also by user code
896
897 - lws_set_log_level() set which logging apis are able to emit (defaults to
898 notice, warn, err severities), optionally set the emit callback
899
900 - lwsl_emit_syslog() helper callback emits to syslog
901
902 - lws_daemonize() helper code that forks the app into a headless daemon
903 properly, maintains a lock file with pid in suitable for sysvinit etc to
904 control lifecycle
905
906 - LWS_CALLBACK_HTTP_FILE_COMPLETION callback added since http file
907 transfer is now asynchronous (see test server code)
908
909 - lws_frame_is_binary() from a wsi pointer, let you know if the received
910 data was sent in BINARY mode
911
912
913user api removals
914-----------------
915
916 - libwebsockets_fork_service_loop() - no longer supported (had intractable problems)
917 arrange your code to act from the user callback instead from same
918 process context as the service loop
919
920 - libwebsockets_broadcast() - use libwebsocket_callback_on_writable[_all_protocol]()
921 instead from same process context as the service loop. See the test apps
922 for examples.
923
924 - x-google-mux() removed until someone wants it
925
926 - pre -v13 (ancient) protocol support removed
927
928
929New features
930------------
931
932 - echo test server and client compatible with echo.websocket.org added
933
934 - many new configure options (see README.build) to reduce footprint of the
935 library to what you actually need, eg, --without-client and
936 --without-server
937
938 - http + websocket server can build to as little as 12K .text for ARM
939
940 - no more MAX_CLIENTS limitation; adapts to support the max number of fds
941 allowed to the process by ulimit, defaults to 1024 on Fedora and
942 Ubuntu. Use ulimit to control this without needing to configure
943 the library. Code here is smaller and faster.
944
945 - adaptive ratio of listen socket to connection socket service allows
946 good behaviour under Apache ab test load. Tested with thousands
947 of simultaneous connections
948
949 - reduction in per-connection memory footprint by moving to a union to hold
950 mutually-exclusive state for the connection
951
952 - robustness: Out of Memory taken care of for all allocation code now
953
954 - internal getifaddrs option if your toolchain lacks it (some uclibc)
955
956 - configurable memory limit for deflate operations
957
958 - improvements in SSL code nonblocking operation, possible hang solved,
959 some SSL operations broken down into pollable states so there is
960 no library blocking, timeout coverage for SSL_connect
961
962 - extpoll test server merged into single test server source
963
964 - robustness: library should deal with all recoverable socket conditions
965
966 - rx flowcontrol for backpressure notification fixed and implmeneted
967 correctly in the test server
968
969 - optimal lexical parser added for header processing; all headers in a
970 single 276-byte state table
971
972 - latency tracking api added (configure --with-latency)
973
974 - Improved in-tree documentation, REAME.build, README.coding,
975 README.test-apps, changelog
976
977 - Many small fixes
978
979
980v1.0-chrome25-firefox17 (6cd1ea9b005933f)