blob: 101f57a41f3382f4d07675c92fb559de22a783a8 [file] [log] [blame]
Andy Greena35c86f2013-01-31 10:16:44 +08001Changelog
2---------
3
Andy Green0c3cc2e2016-02-20 09:12:52 +08004Fixes
5-----
6
71) MAJOR (Windows-only) fix assert firing
8
92) MAJOR http:/1.1 connections handled by lws_return_http_status() did not
10get sent a content-length resulting in the link hanging until the peer closed
11it. attack.sh updated to add a test for this.
12
Andy Green26d42492016-02-24 12:40:21 +0800133) MINOR An error about hdr struct in _lws_ws_related is corrected, it's not
14known to affect anything until after it was fixed
15
Andy Green5c0bcf42016-02-24 21:27:46 +0800164) MINOR During the close shutdown wait state introduced at v1.7, if something
17requests callback on writeable for the socket it will busywait until the
18socket closes
19
Andy Greendbfbbb42016-02-24 20:58:19 +0800205) MAJOR Although the test server has done it for a few versions already, it
21is now required for the user code to explicitly call
22
23 if (lws_http_transaction_completed(wsi))
24 return -1;
25
26when it finishes replying to a transaction in http. Previously the library
27did it for you, but that disallowed large, long transfers with multiple
28trips around the event loop (and cgi...).
29
Andy Green4ba798d2016-02-25 21:50:49 +0800306) MAJOR connections on ah waiting list that closed did not get removed from
31the waiting list...
32
Andy Green83af28a2016-02-28 10:55:31 +0800337) MAJOR since we added the ability to hold an ah across http keepalive
34transactions where more headers had already arrived, we broke the ability
35to tell if more headers had arrived. Result was if the browser didn't
36close the keepalive, we retained ah for the lifetime of the keepalive,
37using up the pool.
38
Andy Green442e1c82016-02-29 10:10:42 +0800398) MAJOR windows-only-POLLHUP was not coming
40
Andy Green4f5ebec2016-03-09 23:13:31 +0800419) Client should not send ext hdr if no exts
Andy Greendbfbbb42016-02-24 20:58:19 +080042
Andy Green0c3cc2e2016-02-20 09:12:52 +080043Changes
44-------
45
461) MINOR test-server gained some new switches
47
48 -C <file> use external SSL cert file
49 -K <file> use external SSL key file
50 -A <file> use external SSL CA cert file
51
52 -u <uid> set effective uid
53 -g <gid> set effective gid
54
55together you can use them like this to have the test-server work with the
56usual purchased SSL certs from an official CA.
57
58 --ssl -C your.crt -K your.key -A your.cer -u 99 -g 99
59
602) MINOR the OpenSSL magic to setup ECDH cipher usage is implemented in the
61library, and the ciphers restricted to use ECDH only.
62Using this, the lws test server can score an A at SSLLABS test
63
643) MINOR STS (SSL always) header is added to the test server if you use --ssl. With
65that, we score A+ at SSLLABS test
66
674) MINOR daemonize function (disabled at cmake by default) is updated to work
68with systemd
69
705) MINOR example systemd .service file now provided for test server
71(not installed by default)
72
Andy Green0ad1a6e2016-02-20 14:05:55 +0800736) test server html is updated with tabs and a new live server monitoring
74feature. Input sanitization added to the js.
75
Andy Green2d8d35a2016-02-29 14:19:16 +0800767) client connections attempted when no ah is free no longer fail, they are
77just deferred until an ah becomes available.
78
Andy Greena661ee52016-02-29 13:18:30 +0800798) The test client pays attention to if you give it an http:/ or https://
80protocol string to its argument in URL format. If so, it stays in http[s]
81client mode and doesn't upgrade to ws[s], allowing you to do generic http client
Andy Green5c8906e2016-03-13 16:44:19 +080082operations. Receiving transfer-encoding: chunked is supported.
Andy Greena661ee52016-02-29 13:18:30 +080083
Andy Green1e5a9ad2016-03-20 11:59:53 +0800849) If you enable -DLWS_WITH_HTTP_PROXY=1 at cmake, the test server has a
85new URI path http://localhost:7681/proxytest If you visit here, a client
86connection to http://example.com:80 is spawned, and the results piped on
87to your original connection.
88
8910) Also with LWS_WITH_HTTP_PROXY enabled at cmake, lws wants to link to an
90additional library, "libhubbub". This allows lws to do html rewriting on the
91fly, adjusting proxied urls in a lightweight and fast way.
Andy Greenfb5f33b2016-03-01 07:19:01 +080092
Andy Green2d8d35a2016-02-29 14:19:16 +080093
Andy Greend7fddad2016-02-18 20:36:55 +080094User API additions
95------------------
96
Andy Green0c3cc2e2016-02-20 09:12:52 +0800971) MINOR APIBREAK There's a new member in struct lws_context_creation_info, ecdh_curve,
Andy Greend7fddad2016-02-18 20:36:55 +080098which lets you set the name of the ECDH curve OpenSSL should use. By
99default (if you leave ecdh_curve NULL) it will use "prime256v1"
100
Andy Green51d9afa2016-02-24 11:05:56 +08001012) MINOR NEWAPI It was already possible to adopt a foreign socket that had not
102been read from using lws_adopt_socket() since v1.7. Now you can adopt a
103partially-used socket if you don't need SSL, by passing it what you read
104so it can drain that before reading from the socket.
105
106LWS_VISIBLE LWS_EXTERN struct lws *
107lws_adopt_socket_readbuf(struct lws_context *context, lws_sockfd_type accept_fd,
108 const char *readbuf, size_t len);
Andy Greend7fddad2016-02-18 20:36:55 +0800109
Andy Green6a8099b2016-02-21 21:25:48 +08001103) MINOR NEWAPI CGI type "network io" subprocess execution is now possible from
111a simple api.
112
113LWS_VISIBLE LWS_EXTERN int
Andy Green1a138852016-03-20 11:55:25 +0800114lws_cgi(struct lws *wsi, char * const *exec_array, int script_uri_path_len,
115 int timeout_secs);
Andy Green6a8099b2016-02-21 21:25:48 +0800116
117LWS_VISIBLE LWS_EXTERN int
118lws_cgi_kill(struct lws *wsi);
119
120To use it, you must first set the cmake option
121
122$ cmake .. -DLWS_WITH_CGI=1
123
124See test-server-http.c and test server path
125
126http://localhost:7681/cgitest
127
128stdin gets http body, you can test it with wget
129
130$ echo hello > hello.txt
131$ wget http://localhost:7681/cgitest --post-file=hello.txt -O- --quiet
132lwstest script
133read="hello"
134
Andy Green1a138852016-03-20 11:55:25 +0800135The test script returns text/html table showing /proc/meminfo. But the cgi
136support is complete enough to run cgit cgi.
137
Andy Greend61bed32016-02-25 15:01:55 +08001384) There is a helper api for forming logging timestamps
139
140LWS_VISIBLE int
141lwsl_timestamp(int level, char *p, int len)
142
143this generates this kind of timestamp for use as logging preamble
144
145lwsts[13116]: [2016/01/25 14:52:52:8386] NOTICE: Initial logging level 7
146
Andy Greena661ee52016-02-29 13:18:30 +08001475) struct lws_client_connect_info has a new member
148
149 const char *method
150
151If it's NULL, then everything happens as before, lws_client_connect_via_info()
152makes a ws or wss connection to the address given.
153
154If you set method to a valid http method like "GET", though, then this method
155is used and the connection remains in http[s], it's not upgraded to ws[s].
156
157So with this, you can perform http[s] client operations as well as ws[s] ones.
158
159There are 4 new related callbacks
160
161 LWS_CALLBACK_ESTABLISHED_CLIENT_HTTP = 44,
162 LWS_CALLBACK_CLOSED_CLIENT_HTTP = 45,
163 LWS_CALLBACK_RECEIVE_CLIENT_HTTP = 46,
164 LWS_CALLBACK_COMPLETED_CLIENT_HTTP = 47,
Andy Green6a8099b2016-02-21 21:25:48 +0800165
Andy Green494418a2016-03-02 09:17:22 +08001666) struct lws_client_connect_info has a new member
167
168 const char *parent_wsi
169
170if non-NULL, the client wsi is set to be a child of parent_wsi. This ensures
171if parent_wsi closes, then the client child is closed just before.
172
Andy Green0f9904f2016-03-17 15:26:49 +08001737) If you're using SSL, there's a new context creation-time option flag
174LWS_SERVER_OPTION_REDIRECT_HTTP_TO_HTTPS. If you give this, non-ssl
175connections to the server listen port are accepted and receive a 301
176redirect to / on the same host and port using https://
177
Andy Green0c3cc2e2016-02-20 09:12:52 +0800178
Andy Green9c60ed92016-02-16 12:32:18 +0800179v1.7.0
180======
181
Andy Green67112662016-01-11 11:34:01 +0800182Extension Changes
183-----------------
184
1851) There is now a "permessage-deflate" / RFC7692 implementation. It's very
186similar to "deflate-frame" we have offered for a long while; deflate-frame is
187now provided as an alias of permessage-deflate.
188
189The main differences are that the new permessage-deflate implementation:
190
191 - properly performs streaming respecting input and output buffer limits. The
192 old deflate-frame implementation could only work on complete deflate input
193 and produce complete inflate output for each frame. The new implementation
194 only mallocs buffers at initialization.
195
196 - goes around the event loop after each input package is processed allowing
197 interleaved output processing. The RX flow control api can be used to
198 force compressed input processing to match the rate of compressed output
199 processing (test--echo shows an example of how to do this).
200
201 - when being "deflate-frame" for compatibility he uses the same default zlib
202 settings as the old "deflate-frame", but instead of exponentially increasing
203 malloc allocations until the whole output will fit, he observes the default
204 input and output chunking buffer sizes of "permessage-deflate", that's
205 1024 in and 1024 out at a time.
206
2072) deflate-stream has been disabled for many versions (for over a year) and is
208now removed. Browsers are now standardizing on "permessage-deflate" / RFC7692
209
2103) struct lws_extension is simplified, and lws extensions now have a public
211api (their callback) for use in user code to compose extensions and options
212the user code wants. lws_get_internal_exts() is deprecated but kept around
213as a NOP. The changes allow one extension implementation to go by different
214names and allows the user client code to control option offers per-ext.
215
216The test client and server are updated to use the new way. If you use
217the old way it should still work, but extensions will be disabled until you
218update your code.
219
220Extensions are now responsible for allocating and per-instance private struct
221at instance construction time and freeing it when the instance is destroyed.
222Not needing to know the size means the extension's struct can be opaque
223to user code.
224
225
Andy Green3df58002015-12-25 12:44:12 +0800226User api additions
227------------------
228
Andy Green200a6a22016-02-15 20:36:02 +08002291) The info struct gained three new members
Andy Green3df58002015-12-25 12:44:12 +0800230
231 - max_http_header_data: 0 for default (1024) or set the maximum amount of known
232 http header payload that lws can deal with. Payload in unknown http
233 headers is dropped silently. If for some reason you need to send huge
234 cookies or other HTTP-level headers, you can now increase this at context-
235 creation time.
236
237 - max_http_header_pool: 0 for default (16) or set the maximum amount of http
238 headers that can be tracked by lws in this context. For the server, if
239 the header pool is completely in use then accepts on the listen socket
240 are disabled until one becomes free. For the client, if you simultaneously
241 have pending connects for more than this number of client connections,
242 additional connects will fail until some of the pending connections timeout
243 or complete.
244
Andy Green200a6a22016-02-15 20:36:02 +0800245 - timeout_secs: 0 for default (currently 20s), or set the library's
246 network activity timeout to the given number of seconds
247
Andy Green3df58002015-12-25 12:44:12 +0800248HTTP header processing in lws only exists until just after the first main
249callback after the HTTP handshake... for ws connections that is ESTABLISHED and
250for HTTP connections the HTTP callback.
251
252So these settings are not related to the maximum number of simultaneous
Andy Green3246ebb2015-12-26 12:03:06 +0800253connections, but the number of HTTP handshakes that may be expected or ongoing,
Andy Green3df58002015-12-25 12:44:12 +0800254or have just completed, at one time. The reason it's useful is it changes the
255memory allocation for header processing to be one-time at context creation
256instead of every time there is a new connection, and gives you control over
257the peak allocation.
258
259Setting max_http_header_pool to 1 is fine it will just queue incoming
260connections before the accept as necessary, you can still have as many
Andy Green5b85e392015-12-26 13:23:11 +0800261simultaneous post-header connections as you like. Since the http header
262processing is completed and the allocation released after ESTABLISHED or the
263HTTP callback, even with a pool of 1 many connections can be handled rapidly.
264
Andy Green066a7a12015-12-26 15:47:06 +08002652) There is a new callback that allows the user code to get acccess to the
266optional close code + aux data that may have been sent by the peer.
267
268LWS_CALLBACK_WS_PEER_INITIATED_CLOSE:
269 The peer has sent an unsolicited Close WS packet. @in and
270 @len are the optional close code (first 2 bytes, network
271 order) and the optional additional information which is not
272 defined in the standard, and may be a string or non-human-
273 readble data.
274 If you return 0 lws will echo the close and then close the
Andy Green67112662016-01-11 11:34:01 +0800275 connection. If you return nonzero lws will just close the
276 connection.
Andy Green066a7a12015-12-26 15:47:06 +0800277
278As usual not handling it does the right thing, if you're not interested in it
279just ignore it.
280
281The test server has "open and close" testing buttons at the bottom, if you
282open and close that connection, on close it will send a close code 3000 decimal
283and the string "Bye!" as the aux data.
284
285The test server dumb-increment callback handles this callback reason and prints
286
287lwsts[15714]: LWS_CALLBACK_WS_PEER_INITIATED_CLOSE: len 6
288lwsts[15714]: 0: 0x0B
289lwsts[15714]: 1: 0xB8
290lwsts[15714]: 2: 0x42
291lwsts[15714]: 3: 0x79
292lwsts[15714]: 4: 0x65
293lwsts[15714]: 5: 0x21
294
Andy Green1fb95e82015-12-26 17:20:34 +08002953) There is a new API to allow the user code to control the content of the
296close frame sent when about to return nonzero from the user callback to
297indicate the connection should close.
298
299/**
300 * lws_close_reason - Set reason and aux data to send with Close packet
301 * If you are going to return nonzero from the callback
302 * requesting the connection to close, you can optionally
303 * call this to set the reason the peer will be told if
304 * possible.
305 *
306 * @wsi: The websocket connection to set the close reason on
307 * @status: A valid close status from websocket standard
308 * @buf: NULL or buffer containing up to 124 bytes of auxiliary data
309 * @len: Length of data in @buf to send
310 */
311LWS_VISIBLE LWS_EXTERN void
312lws_close_reason(struct lws *wsi, enum lws_close_status status,
313 unsigned char *buf, size_t len);
314
315An extra button is added to the "open and close" test server page that requests
316that the test server close the connection from his end.
317
318The test server code will do so by
319
320 lws_close_reason(wsi, LWS_CLOSE_STATUS_GOINGAWAY,
321 (unsigned char *)"seeya", 5);
322 return -1;
323
324The browser shows the close code and reason he received
325
326websocket connection CLOSED, code: 1001, reason: seeya
327
Vijay Khurdiyae73d4462016-01-15 16:21:51 +08003284) There's a new context creation time option flag
Andy Green44a7f652015-12-29 11:20:09 +0800329
330LWS_SERVER_OPTION_VALIDATE_UTF8
331
332if you set it in info->options, then TEXT and CLOSE frames will get checked to
333confirm that they contain valid UTF-8. If they don't, the connection will get
334closed by lws.
335
Vijay Khurdiyae73d4462016-01-15 16:21:51 +08003365) ECDH Certs are now supported. Enable the CMake option
337
338cmake .. -DLWS_SSL_SERVER_WITH_ECDH_CERT=1
339
340**and** the info->options flag
341
Andy Greenff696482016-02-17 07:46:27 +0800342LWS_SERVER_OPTION_SSL_ECDH
Vijay Khurdiyae73d4462016-01-15 16:21:51 +0800343
344to build in support and select it at runtime.
345
Andy Greenff696482016-02-17 07:46:27 +08003466) There's a new api lws_parse_uri() that simplifies chopping up
Andy Green809d69a2016-01-14 11:37:56 +0800347https://xxx:yyy/zzz uris into parts nicely. The test client now uses this
Andy Greend3a55052016-01-19 03:34:24 +0800348to allow proper uris as well as the old address style.
349
3507) SMP support is integrated into LWS without any internal threading. It's
351very simple to use, libwebsockets-test-server-pthread shows how to do it,
352use -j <n> argument there to control the number of service threads up to 32.
353
354Two new members are added to the info struct
355
356 unsigned int count_threads;
357 unsigned int fd_limit_per_thread;
358
359leave them at the default 0 to get the normal singlethreaded service loop.
360
361Set count_threads to n to tell lws you will have n simultaneous service threads
362operating on the context.
363
364There is still a single listen socket on one port, no matter how many
365service threads.
366
367When a connection is made, it is accepted by the service thread with the least
368connections active to perform load balancing.
369
370The user code is responsible for spawning n threads running the service loop
371associated to a specific tsi (Thread Service Index, 0 .. n - 1). See
372the libwebsockets-test-server-pthread for how to do.
373
374If you leave fd_limit_per_thread at 0, then the process limit of fds is shared
375between the service threads; if you process was allowed 1024 fds overall then
376each thread is limited to 1024 / n.
377
378You can set fd_limit_per_thread to a nonzero number to control this manually, eg
379the overall supported fd limit is less than the process allowance.
380
381You can control the context basic data allocation for multithreading from Cmake
382using -DLWS_MAX_SMP=, if not given it's set to 32. The serv_buf allocation
383for the threads (currently 4096) is made at runtime only for active threads.
384
385Because lws will limit the requested number of actual threads supported
386according to LWS_MAX_SMP, there is an api lws_get_count_threads(context) to
387discover how many threads were actually allowed when the context was created.
388
389It's required to implement locking in the user code in the same way that
390libwebsockets-test-server-pthread does it, for the FD locking callbacks.
391
Andy Greenba119e92016-01-26 21:40:32 +0800392If LWS_MAX_SMP=1, then there is no code related to pthreads compiled in the
393library. If more than 1, a small amount of pthread mutex code is built into
394the library.
Andy Green809d69a2016-01-14 11:37:56 +0800395
Andy Greenba119e92016-01-26 21:40:32 +08003968) New API
397
398LWS_VISIBLE struct lws *
399lws_adopt_socket(struct lws_context *context, lws_sockfd_type accept_fd)
400
401allows foreign sockets accepted by non-lws code to be adopted by lws as if they
402had just been accepted by lws' own listen socket.
Andy Green3df58002015-12-25 12:44:12 +0800403
Danomi Czaski4e9c7f32016-01-28 09:40:53 +08004049) X-Real-IP: header has been added as WSI_TOKEN_HTTP_X_REAL_IP
405
Andy Green86ed65f2016-02-14 09:27:41 +080040610) Libuv support is added, there are new related user apis
407
408typedef void (lws_uv_signal_cb_t)(uv_loop_t *l, uv_signal_t *w, int revents);
409
410LWS_VISIBLE LWS_EXTERN int
411lws_uv_sigint_cfg(struct lws_context *context, int use_uv_sigint,
412 lws_uv_signal_cb_t *cb);
413
414LWS_VISIBLE LWS_EXTERN int
415lws_uv_initloop(struct lws_context *context, uv_loop_t *loop, int tsi);
416
417LWS_VISIBLE void
418lws_uv_sigint_cb(uv_loop_t *loop, uv_signal_t *watcher, int revents);
419
420and CMAKE option
421
422LWS_WITH_LIBUV
423
Danomi Czaski4e9c7f32016-01-28 09:40:53 +0800424
Andy Green3246ebb2015-12-26 12:03:06 +0800425User api changes
426----------------
427
4281) LWS_SEND_BUFFER_POST_PADDING is now 0 and deprecated. You can remove it; if
429you still use it, obviously it does nothing. Old binary code with nonzero
430LWS_SEND_BUFFER_POST_PADDING is perfectly compatible, the old code just
Andy Green5b85e392015-12-26 13:23:11 +0800431allocated a buffer bigger than the library is going to use.
Andy Green3246ebb2015-12-26 12:03:06 +0800432
Andy Green5b85e392015-12-26 13:23:11 +0800433The example apps no longer use LWS_SEND_BUFFER_POST_PADDING.
Andy Green3246ebb2015-12-26 12:03:06 +0800434
Andy Green4e2ac762015-12-26 20:26:11 +0800435The only path who made use of it was sending with LWS_WRITE_CLOSE --->
Andy Green3246ebb2015-12-26 12:03:06 +0800436
Andy Green1fb95e82015-12-26 17:20:34 +08004372) Because of lws_close_reason() formalizing handling close frames,
438LWS_WRITE_CLOSE is removed from libwebsockets.h. It was only of use to send
439close frames...close frame content should be managed using lws_close_reason()
440now.
441
Andy Green44a7f652015-12-29 11:20:09 +08004423) We check for invalid CLOSE codes and complain about protocol violation in
443our close code. But it changes little since we were in the middle of closing
444anyway.
445
4464) zero-length RX frames and zero length TX frames are now allowed.
447
4485) Pings and close used to be limited to 124 bytes, the correct limit is 125
449so that is now also allowed.
Andy Green3246ebb2015-12-26 12:03:06 +0800450
Steffen Vogelf9267172016-02-09 07:19:15 +01004516) LWS_PRE is provided as a synonym for LWS_SEND_BUFFER_PRE_PADDING, either is
Andy Green67112662016-01-11 11:34:01 +0800452valid to use now.
453
4547) There's generic support for RFC7462 style extension options built into the
455library now. As a consequence, a field "options" is added to lws_extension.
456It can be NULL if there are no options on the extension. Extension internal
457info is part of the public abi because extensions may be implemented outside
458the library.
459
Danomi Czaski4e9c7f32016-01-28 09:40:53 +08004608) WSI_TOKEN_PROXY enum was accidentally defined to collide with another token
461of value 73. That's now corrected and WSI_TOKEN_PROXY moved to his own place at
46277.
463
Andy Green86ed65f2016-02-14 09:27:41 +08004649) With the addition of libuv support, libev is not the only event loop
465library in town and his api names must be elaborated with _ev_
466
467 Callback typedef: lws_signal_cb ---> lws_ev_signal_cb_t
468 lws_sigint_cfg --> lws_ev_sigint_cfg
469 lws_initloop --> lws_ev_initloop
470 lws_sigint_cb --> lws_ev_sigint_cb
471
47210) Libev support is made compatible with multithreaded service,
473lws_ev_initloop (was lws_initloop) gets an extra argument for the
474thread service index (use 0 if you will just have 1 service thread).
475
476LWS_VISIBLE LWS_EXTERN int
Andy Greenff696482016-02-17 07:46:27 +0800477lws_ev_initloop(struct lws_context *context, ev_loop_t *loop, int tsi);
Andy Green86ed65f2016-02-14 09:27:41 +0800478
Andy Green3df58002015-12-25 12:44:12 +0800479
Andy Green9e8d1482015-12-18 11:01:03 +0800480v1.6.0-chrome48-firefox42
481=======================
482
483Major API improvements
484----------------------
485
486v1.6.0 has many cleanups and improvements in the API. Although at first it
487looks pretty drastic, user code will only need four actions to update it.
488
489 - Do the three search/replaces in your user code, /libwebsocket_/lws_/,
490 /libwebsockets_/lws_/, and /struct\ libwebsocket/struct\ lws/
491
492 - Remove the context parameter from your user callbacks
493
494 - Remove context as the first parameter from the "Eleven APIS" listed in the
495 User Api Changes section
496
497 - Add lws_get_context(wsi) as the first parameter on the "Three APIS" listed
498 in the User Api Changes section, and anywhere else you still need context
499
500That's it... generally only a handful of the 14 affected APIs are actually in
501use in your user code and you can find them quickest by compiling and visiting
502the errors each in turn. And the end results are much cleaner, more
503predictable and maintainable.
504
505
Andy Green4e442b72015-12-10 07:58:58 +0800506User api additions
507------------------
508
Andy Green3f628702015-12-14 07:16:32 +08005091) lws now exposes his internal platform file abstraction in a way that can be
Andy Green4e442b72015-12-10 07:58:58 +0800510both used by user code to make it platform-agnostic, and be overridden or
511subclassed by user code. This allows things like handling the URI "directory
512space" as a virtual filesystem that may or may not be backed by a regular
513filesystem. One example use is serving files from inside large compressed
514archive storage without having to unpack anything except the file being
515requested.
516
517The test server shows how to use it, basically the platform-specific part of
518lws prepares a file operations structure that lives in the lws context.
519
Andy Green3f599962015-12-14 07:21:42 +0800520Helpers are provided to also leverage these platform-independent file handling
521apis
Andy Green4e442b72015-12-10 07:58:58 +0800522
523static inline lws_filefd_type
Andy Green3f599962015-12-14 07:21:42 +0800524lws_plat_file_open(struct lws *wsi, const char *filename,
Andy Green4e442b72015-12-10 07:58:58 +0800525 unsigned long *filelen, int flags)
Andy Green4e442b72015-12-10 07:58:58 +0800526static inline int
Andy Green3f599962015-12-14 07:21:42 +0800527lws_plat_file_close(struct lws *wsi, lws_filefd_type fd)
Andy Green4e442b72015-12-10 07:58:58 +0800528
529static inline unsigned long
Andy Green3f599962015-12-14 07:21:42 +0800530lws_plat_file_seek_cur(struct lws *wsi, lws_filefd_type fd, long offset)
Andy Green4e442b72015-12-10 07:58:58 +0800531
532static inline int
Andy Green3f599962015-12-14 07:21:42 +0800533lws_plat_file_read(struct lws *wsi, lws_filefd_type fd, unsigned long *amount,
534 unsigned char *buf, unsigned long len)
Andy Green4e442b72015-12-10 07:58:58 +0800535
536static inline int
Andy Green3f599962015-12-14 07:21:42 +0800537lws_plat_file_write(struct lws *wsi, lws_filefd_type fd, unsigned long *amount,
538 unsigned char *buf, unsigned long len)
Andy Green4e442b72015-12-10 07:58:58 +0800539
540The user code can also override or subclass the file operations, to either
541wrap or replace them. An example is shown in test server.
542
Andy Green3f599962015-12-14 07:21:42 +0800543A wsi can be associated with the file activity, allowing per-connection
544authentication and state to be used when interpreting the file request.
545
Andy Green3f628702015-12-14 07:16:32 +08005462) A new API void * lws_wsi_user(struct lws *wsi) lets you get the pointer to
547the user data associated with the wsi, just from the wsi.
548
Andy Green9e8d1482015-12-18 11:01:03 +08005493) URI argument handling. Libwebsockets parses and protects URI arguments
550like test.html?arg1=1&arg2=2, it decodes %xx uriencoding format and reduces
551path attacks like ../.../../etc/passwd so they cannot go behind the web
552server's /. There is a list of confirmed attacks we're proof against in
553./test-server/attack.sh.
554
555There is a new API lws_hdr_copy_fragment that should be used now to access
556the URI arguments (it returns the fragments length)
557
558 while (lws_hdr_copy_fragment(wsi, buf, sizeof(buf),
559 WSI_TOKEN_HTTP_URI_ARGS, n) > 0) {
560 lwsl_info("URI Arg %d: %s\n", ++n, buf);
561 }
562
563For the example above, calling with n=0 will return "arg1=1" and n=1 "arg2=2".
564All legal uriencodings will have been reduced in those strings.
565
566lws_hdr_copy_fragment() returns the length of the x=y fragment, so it's also
567possible to deal with arguments containing %00. If you don't care about that,
568the returned string has '\0' appended to simplify processing.
569
Andy Green4e442b72015-12-10 07:58:58 +0800570
Andy Green6d417202015-12-04 10:39:23 +0800571User api changes
572----------------
573
Andy Green1a366bf2015-12-14 07:02:51 +08005741) Three APIS
575
576 - lws_callback_on_writable_all_protocol(const struct lws_protocols *protocol)
577 - lws_callback_all_protocol(const struct lws_protocols *protocol)
578 - lws_rx_flow_allow_all_protocol(lws_rx_flow_allow_all_protocol)
579
580Now take an additional pointer to the lws_context in their first argument.
581
582The reason for this change is struct lws_protocols has been changed to remove
583members that lws used for private storage: so the protocols struct in now
584truly const and may be reused serially or simultaneously by different contexts.
585
Andy Green11c05bf2015-12-16 18:19:08 +08005862) Eleven APIs
587
588LWS_VISIBLE LWS_EXTERN int
589lws_add_http_header_by_name(struct lws_context *context,
590 struct lws *wsi,
591 const unsigned char *name,
592 const unsigned char *value,
593 int length,
594 unsigned char **p,
595 unsigned char *end);
596LWS_VISIBLE LWS_EXTERN int
597lws_finalize_http_header(struct lws_context *context,
598 struct lws *wsi,
599 unsigned char **p,
600 unsigned char *end);
601LWS_VISIBLE LWS_EXTERN int
602lws_add_http_header_by_token(struct lws_context *context,
603 struct lws *wsi,
604 enum lws_token_indexes token,
605 const unsigned char *value,
606 int length,
607 unsigned char **p,
608 unsigned char *end);
609LWS_VISIBLE LWS_EXTERN int
610lws_add_http_header_content_length(struct lws_context *context,
611 struct lws *wsi,
612 unsigned long content_length,
613 unsigned char **p,
614 unsigned char *end);
615LWS_VISIBLE LWS_EXTERN int
616lws_add_http_header_status(struct lws_context *context, struct lws *wsi,
617 unsigned int code, unsigned char **p,
618 unsigned char *end);
619
620LWS_VISIBLE LWS_EXTERN int
621lws_serve_http_file(struct lws_context *context, struct lws *wsi,
622 const char *file, const char *content_type,
623 const char *other_headers, int other_headers_len);
624LWS_VISIBLE LWS_EXTERN int
625lws_serve_http_file_fragment(struct lws_context *context, struct lws *wsi);
626
627LWS_VISIBLE LWS_EXTERN int
628lws_return_http_status(struct lws_context *context, struct lws *wsi,
629 unsigned int code, const char *html_body);
630
631LWS_VISIBLE LWS_EXTERN int
632lws_callback_on_writable(const struct lws_context *context, struct lws *wsi);
633
634LWS_VISIBLE LWS_EXTERN void
635lws_get_peer_addresses(struct lws_context *context, struct lws *wsi,
636 lws_sockfd_type fd, char *name, int name_len,
637 char *rip, int rip_len);
638
639LWS_VISIBLE LWS_EXTERN int
640lws_read(struct lws_context *context, struct lws *wsi,
641 unsigned char *buf, size_t len);
642
643no longer require their initial struct lws_context * parameter.
644
6453) Several older apis start with libwebsocket_ or libwebsockets_ while newer ones
Andy Green6d417202015-12-04 10:39:23 +0800646all begin lws_. These apis have been changed to all begin with lws_.
647
Andy Green11c05bf2015-12-16 18:19:08 +0800648To convert, search-replace
Andy Green6d417202015-12-04 10:39:23 +0800649
Andy Green11c05bf2015-12-16 18:19:08 +0800650 - libwebsockets_/lws_
651 - libwebsocket_/lws_
652 - struct\ libwebsocket/struct\ lws
Andy Green00c6d152015-12-17 07:54:44 +0800653
6544) context parameter removed from user callback.
655
656Since almost all apis no longer need the context as a parameter, it's no longer
657provided at the user callback directly.
658
659However if you need it, for ALL callbacks wsi is valid and has a valid context
Andy Green6d645392015-12-17 18:25:25 +0800660pointer you can recover using lws_get_context(wsi).
Andy Green6d417202015-12-04 10:39:23 +0800661
662
Andy Greenab620ff2015-10-28 08:39:09 +0800663v1.5-chrome47-firefox41
664=======================
MGadkari020c53c2015-08-21 16:15:36 +0530665
666User api changes
667----------------
668
669LWS_CALLBACK_CLIENT_CONNECTION_ERROR may provide an error string if in is
670non-NULL. If so, the string has length len.
671
Andy Green6d59f592015-10-15 09:12:58 +0800672LWS_SERVER_OPTION_PEER_CERT_NOT_REQUIRED is available to relax the requirement
673for peer certs if you are using the option to require client certs.
674
Andy Green4c79ee72015-10-15 11:20:40 +0800675LWS_WITHOUT_BUILTIN_SHA1 cmake option forces lws to use SHA1() defined
676externally, eg, byOpenSSL, and disables build of libwebsockets_SHA1()
677
678
Andy Green16fb0132015-03-28 11:35:40 +0800679v1.4-chrome43-firefox36
680=======================
Olehfaeac3c2014-07-29 23:18:41 +0800681
682User api additions
683------------------
684
685There's a new member in the info struct used to control context creation,
686ssl_private_key_password, which allows passing into lws the passphrase on
687an SSL cetificate
688
Andy Greeneabed8d2014-08-11 12:11:36 +0800689There's a new member in struct protocols, id, which is ignored by lws but can
690be used by the user code to mark the selected protocol by user-defined version
691or capabliity flag information, for the case multiple versions of a protocol are
692supported.
693
Andy Greenb128ccc2014-08-16 09:54:27 +0800694int lws_is_ssl(wsi) added to allow user code to know if the connection was made
695over ssl or not. If LWS_SERVER_OPTION_ALLOW_NON_SSL_ON_SSL_PORT is used, both
696ssl and non-ssl connections are possible and may need to be treated differently
697in the user code.
698
Andy Green14425ea2014-08-18 22:49:39 +0800699int lws_partial_buffered(wsi) added... should be checked after any
700libwebsocket_write that will be followed by another libwebsocket_write inside
701the same writeable callback. If set, you can't do any more writes until the
702writeable callback is called again. If you only do one write per writeable callback,
703you can ignore this.
704
Andy Green917f43a2014-10-12 14:31:47 +0800705HTTP2-related: HTTP2 changes how headers are handled, lws now has new version-
706agnositic header creation APIs. These do the right thing depending on each
707connection's HTTP version without the user code having to know or care, except
708to make sure to use the new APIs for headers (test-server is updated to use
709them already, so look there for examples)
710
711The APIs "render" the headers into a user-provided buffer and bump *p as it
712is used. If *p reaches end, then the APIs return nonzero for error.
713
714LWS_VISIBLE LWS_EXTERN int
715lws_add_http_header_status(struct libwebsocket_context *context,
716 struct libwebsocket *wsi,
717 unsigned int code,
718 unsigned char **p,
719 unsigned char *end);
720
721Start a response header reporting status like 200, 500, etc
722
723LWS_VISIBLE LWS_EXTERN int
724lws_add_http_header_by_name(struct libwebsocket_context *context,
725 struct libwebsocket *wsi,
726 const unsigned char *name,
727 const unsigned char *value,
728 int length,
729 unsigned char **p,
730 unsigned char *end);
731
732Add a header like name: value in HTTP1.x
733
734LWS_VISIBLE LWS_EXTERN int
735lws_finalize_http_header(struct libwebsocket_context *context,
736 struct libwebsocket *wsi,
737 unsigned char **p,
738 unsigned char *end);
739
740Finish off the headers, like add the extra \r\n in HTTP1.x
741
742LWS_VISIBLE LWS_EXTERN int
743lws_add_http_header_by_token(struct libwebsocket_context *context,
744 struct libwebsocket *wsi,
745 enum lws_token_indexes token,
746 const unsigned char *value,
747 int length,
748 unsigned char **p,
749 unsigned char *end);
750
751Add a header by using a lws token as the name part. In HTTP2, this can be
752compressed to one or two bytes.
753
Olehfaeac3c2014-07-29 23:18:41 +0800754
Andy Green822241c2014-08-18 22:21:51 +0800755User api removal
756----------------
757
758protocols struct member no_buffer_all_partial_tx is removed. Under some
Peter Pentchevbb085da2015-12-03 15:55:11 +0200759conditions like rewriting extension such as compression in use, the built-in
Andy Green822241c2014-08-18 22:21:51 +0800760partial send buffering is the only way to deal with the problem, so turning
761it off is deprecated.
762
763
Andy Green917f43a2014-10-12 14:31:47 +0800764User api changes
765----------------
766
767HTTP2-related: API libwebsockets_serve_http_file() takes an extra parameter at
768the end now
769
770int other_headers_len)
771
772If you are providing other headers, they must be generated using the new
773HTTP-version-agnostic APIs, and you must provide the length of them using this
774additional parameter.
775
joseph.urciuoli4d9c8fc2014-10-16 08:53:19 +0800776struct lws_context_creation_info now has an additional member
777SSL_CTX *provided_client_ssl_ctx you may set to an externally-initialized
778SSL_CTX managed outside lws. Defaulting to zero keeps the existing behaviour of
779lws managing the context, if you memset the struct to 0 or have as a filescope
780initialized struct in bss, no need to change anything.
781
Andy Green822241c2014-08-18 22:21:51 +0800782
Andy Greenc1fdd102014-07-06 09:56:11 +0800783v1.3-chrome37-firefox30
784=======================
785
786 .gitignore | 1 -
787 CMakeLists.txt | 447 +++--
788 README.build | 35 +-
789 README.coding | 14 +
790 changelog | 66 +
791 cmake/LibwebsocketsConfig.cmake.in | 17 +
792 cmake/LibwebsocketsConfigVersion.cmake.in | 11 +
793 config.h.cmake | 18 +
794 cross-ming.cmake | 31 +
795 cross-openwrt-makefile | 91 +
796 lib/client-handshake.c | 205 ++-
797 lib/client-parser.c | 58 +-
798 lib/client.c | 158 +-
799 lib/context.c | 341 ++++
800 lib/extension-deflate-frame.c | 2 +-
801 lib/extension.c | 178 ++
802 lib/handshake.c | 287 +---
803 lib/lextable.h | 338 ++++
804 lib/libev.c | 175 ++
805 lib/libwebsockets.c | 2089 +++--------------------
806 lib/libwebsockets.h | 253 ++-
807 lib/lws-plat-unix.c | 404 +++++
808 lib/lws-plat-win.c | 358 ++++
809 lib/minilex.c | 530 +++---
810 lib/output.c | 445 ++---
811 lib/parsers.c | 682 ++++----
812 lib/pollfd.c | 239 +++
813 lib/private-libwebsockets.h | 501 +++++-
814 lib/server-handshake.c | 274 +--
815 lib/server.c | 858 ++++++++--
816 lib/service.c | 517 ++++++
817 lib/sha-1.c | 38 +-
818 lib/ssl-http2.c | 78 +
819 lib/ssl.c | 571 +++++++
820 test-server/attack.sh | 101 +-
821 test-server/test-client.c | 9 +-
822 test-server/test-echo.c | 17 +-
823 test-server/test-fraggle.c | 7 -
824 test-server/test-ping.c | 12 +-
825 test-server/test-server.c | 330 ++--
826 test-server/test.html | 4 +-
827 win32port/client/client.vcxproj | 259 ---
828 win32port/client/client.vcxproj.filters | 39 -
829 .../libwebsocketswin32.vcxproj.filters | 93 -
830 win32port/server/server.vcxproj | 276 ---
831 win32port/server/server.vcxproj.filters | 51 -
832 win32port/win32helpers/gettimeofday.h | 59 +-
833 win32port/win32helpers/netdb.h | 1 -
834 win32port/win32helpers/strings.h | 0
835 win32port/win32helpers/sys/time.h | 1 -
836 win32port/win32helpers/unistd.h | 0
837 win32port/win32helpers/websock-w32.c | 104 --
838 win32port/win32helpers/websock-w32.h | 62 -
839 win32port/win32port.sln | 100 --
840 win32port/zlib/gzio.c | 3 +-
841 55 files changed, 6779 insertions(+), 5059 deletions(-)
842
Andy Green79002562013-11-09 11:04:35 +0800843
kapejodce64fb02013-11-19 13:38:16 +0100844User api additions
845------------------
846
847POST method is supported
848
849The protocol 0 / HTTP callback can now get two new kinds of callback,
850LWS_CALLBACK_HTTP_BODY (in and len are a chunk of the body of the HTTP request)
851and LWS_CALLBACK_HTTP_BODY_COMPLETION (the expected amount of body has arrived
852and been passed to the user code already). These callbacks are used with the
853post method (see the test server for details).
854
855The period between the HTTP header completion and the completion of the body
856processing is protected by a 5s timeout.
857
858The chunks are stored in a malloc'd buffer of size protocols[0].rx_buffer_size.
859
860
James Devine5b34c972013-12-14 11:41:29 +0800861New server option you can enable from user code
862LWS_SERVER_OPTION_ALLOW_NON_SSL_ON_SSL_PORT allows non-SSL connections to
863also be accepted on an SSL listening port. It's disabled unless you enable
864it explicitly.
865
866
Andy Green7a132792013-12-18 09:48:26 +0800867Two new callbacks are added in protocols[0] that are optional for allowing
868limited thread access to libwebsockets, LWS_CALLBACK_LOCK_POLL and
869LWS_CALLBACK_UNLOCK_POLL.
870
871If you use them, they protect internal and external poll list changes, but if
872you want to use external thread access to libwebsocket_callback_on_writable()
873you have to implement your locking here even if you don't use external
874poll support.
875
876If you will use another thread for this, take a lot of care about managing
877your list of live wsi by doing it from ESTABLISHED and CLOSED callbacks
878(with your own locking).
879
Andrew Canaday9769f4f2014-03-23 13:25:07 +0800880If you configure cmake with -DLWS_WITH_LIBEV=1 then the code allowing the libev
881eventloop instead of the default poll() one will also be compiled in. But to
882use it, you must also set the LWS_SERVER_OPTION_LIBEV flag on the context
883creation info struct options member.
Andy Green7a132792013-12-18 09:48:26 +0800884
Andy Greenc1fdd102014-07-06 09:56:11 +0800885IPV6 is supported and enabled by default except for Windows, you can disable
886the support at build-time by giving -DLWS_IPV6=, and disable use of it even if
James Devine3f13ea22014-03-24 16:09:25 +0800887compiled in by making sure the flag LWS_SERVER_OPTION_DISABLE_IPV6 is set on
888the context creation info struct options member.
889
Andy Greenc1fdd102014-07-06 09:56:11 +0800890You can give LWS_SERVER_OPTION_DISABLE_OS_CA_CERTS option flag to
891guarantee the OS CAs will not be used, even if that support was selected at
892build-time.
893
894Optional "token limits" may be enforced by setting the member "token_limits"
895in struct lws_context_creation_info to point to a struct lws_token_limits.
896NULL means no token limits used for compatibility.
897
Andy Green7a132792013-12-18 09:48:26 +0800898
Andy Green79002562013-11-09 11:04:35 +0800899User api changes
900----------------
901
902Extra optional argument to libwebsockets_serve_http_file() allows injecion
903of HTTP headers into the canned response. Eg, cookies may be added like
904that without getting involved in having to send the header by hand.
905
Patrick Gansterer148b9452014-02-28 02:31:23 +0100906A new info member http_proxy_address may be used at context creation time to
907set the http proxy. If non-NULL, it overrides http_proxy environment var.
Andy Green79002562013-11-09 11:04:35 +0800908
Andy Greend2ec7ad2014-03-15 10:39:29 +0800909Cmake supports LWS_SSL_CLIENT_USE_OS_CA_CERTS defaulting to on, which gets
910the client to use the OS CA Roots. If you're worried somebody with the
911ability to forge for force creation of a client cert from the root CA in
912your OS, you should disable this since your selfsigned $0 cert is a lot safer
913then...
914
Andy Green79002562013-11-09 11:04:35 +0800915
Andy Green81877e62013-10-26 20:36:08 +0800916v1.23-chrome32-firefox24
917========================
918
919 Android.mk | 29 +
920 CMakeLists.txt | 573 ++++++++----
921 COPYING | 503 -----------
922 INSTALL | 365 --------
923 Makefile.am | 13 -
924 README.build | 371 ++------
925 README.coding | 63 ++
926 autogen.sh | 1578 ---------------------------------
927 changelog | 69 ++
928 cmake/FindGit.cmake | 163 ++++
929 cmake/FindOpenSSLbins.cmake | 15 +-
930 cmake/UseRPMTools.cmake | 176 ++++
931 config.h.cmake | 25 +-
932 configure.ac | 226 -----
933 cross-arm-linux-gnueabihf.cmake | 28 +
934 lib/Makefile.am | 89 --
935 lib/base64-decode.c | 98 +-
936 lib/client-handshake.c | 123 ++-
937 lib/client-parser.c | 19 +-
938 lib/client.c | 145 ++-
939 lib/daemonize.c | 4 +-
940 lib/extension.c | 2 +-
941 lib/getifaddrs.h | 4 +-
942 lib/handshake.c | 76 +-
943 lib/libwebsockets.c | 491 ++++++----
944 lib/libwebsockets.h | 164 ++--
945 lib/output.c | 214 ++++-
946 lib/parsers.c | 102 +--
947 lib/private-libwebsockets.h | 66 +-
948 lib/server-handshake.c | 5 +-
949 lib/server.c | 29 +-
950 lib/sha-1.c | 2 +-
951 libwebsockets-api-doc.html | 249 +++---
952 libwebsockets.pc.in | 11 -
953 libwebsockets.spec | 14 +-
954 m4/ignore-me | 2 -
955 scripts/FindLibWebSockets.cmake | 33 +
956 scripts/kernel-doc | 1 +
957 test-server/Makefile.am | 131 ---
958 test-server/leaf.jpg | Bin 0 -> 2477518 bytes
959 test-server/test-client.c | 78 +-
960 test-server/test-echo.c | 33 +-
961 test-server/test-fraggle.c | 26 +-
962 test-server/test-ping.c | 15 +-
963 test-server/test-server.c | 197 +++-
964 test-server/test.html | 5 +-
965 win32port/win32helpers/gettimeofday.c | 74 +-
966 win32port/win32helpers/websock-w32.h | 6 +-
967 48 files changed, 2493 insertions(+), 4212 deletions(-)
968
Andy Green54cb3462013-02-14 22:23:54 +0800969
970User api additions
971------------------
972
973 - You can now call libwebsocket_callback_on_writable() on http connectons,
974 and get a LWS_CALLBACK_HTTP_WRITEABLE callback, the same way you can
975 regulate writes with a websocket protocol connection.
976
Andy Green2672fb22013-02-22 09:54:35 +0800977 - A new member in the context creation parameter struct "ssl_cipher_list" is
978 added, replacing CIPHERS_LIST_STRING. NULL means use the ssl library
979 default list of ciphers.
980
Andy Green58f214e2013-03-09 13:03:53 +0800981 - Not really an api addition, but libwebsocket_service_fd() will now zero
982 the revents field of the pollfd it was called with if it handled the
983 descriptor. So you can tell if it is a non-lws fd by checking revents
984 after the service call... if it's still nonzero, the descriptor
985 belongs to you and you need to take care of it.
986
Andy Greenb55451c2013-03-16 12:32:27 +0800987 - libwebsocket_rx_flow_allow_all_protocol(protocol) will unthrottle all
988 connections with the established protocol. It's designed to be
989 called from user server code when it sees it can accept more input
990 and may have throttled connections using the server rx flow apis
991 while it was unable to accept any other input The user server code
992 then does not have to try to track while connections it choked, this
993 will free up all of them in one call.
994
Andy Green0c9563b2013-06-10 22:54:40 +0800995 - there's a new, optional callback LWS_CALLBACK_CLOSED_HTTP which gets
996 called when an HTTP protocol socket closes
997
Andy Green96d48fd2013-09-18 08:32:55 +0800998 - for LWS_CALLBACK_FILTER_PROTOCOL_CONNECTION callback, the user_space alloc
999 has already been done before the callback happens. That means we can
1000 use the user parameter to the callback to contain the user pointer, and
1001 move the protocol name to the "in" parameter. The docs for this
1002 callback are also updated to reflect how to check headers in there.
1003
Andy Green5dc62ea2013-09-20 20:26:12 +08001004 - libwebsocket_client_connect() is now properly nonblocking and async. See
1005 README.coding and test-client.c for information on the callbacks you
1006 can rely on controlling the async connection period with.
1007
Andy Green81877e62013-10-26 20:36:08 +08001008 - if your OS does not support the http_proxy environment variable convention
1009 (eg, reportedly OSX), you can use a new api libwebsocket_set_proxy()
Peter Pentchevbb085da2015-12-03 15:55:11 +02001010 to set the proxy details in between context creation and the connection
Andy Green81877e62013-10-26 20:36:08 +08001011 action. For OSes that support http_proxy, that's used automatically.
Andy Greenb55451c2013-03-16 12:32:27 +08001012
Andy Green50097dd2013-02-15 22:36:30 +08001013User api changes
1014----------------
1015
1016 - the external poll callbacks now get the socket descriptor coming from the
1017 "in" parameter. The user parameter provides the user_space for the
1018 wsi as it normally does on the other callbacks.
Edwin van den Oetelaar8c8a8e12013-02-20 20:56:59 +08001019 LWS_CALLBACK_FILTER_NETWORK_CONNECTION also has the socket descriptor
1020 delivered by @in now instead of @user.
Andy Green50097dd2013-02-15 22:36:30 +08001021
Andy Greenfc7c5e42013-02-23 10:50:10 +08001022 - libwebsocket_write() now returns -1 for error, or the amount of data
1023 actually accepted for send. Under load, the OS may signal it is
1024 ready to send new data on the socket, but have only a restricted
1025 amount of memory to buffer the packet compared to usual.
1026
Andy Green50097dd2013-02-15 22:36:30 +08001027
Andy Greendc914cf2013-02-18 16:54:26 +08001028User api removal
1029----------------
1030
1031 - libwebsocket_ensure_user_space() is removed from the public api, if you
1032 were using it to get user_space, you need to adapt your code to only
1033 use user_space inside the user callback.
1034
Andy Green2672fb22013-02-22 09:54:35 +08001035 - CIPHERS_LIST_STRING is removed
1036
Andy Green0097a992013-03-09 13:06:37 +08001037 - autotools build has been removed. See README.build for info on how to
1038 use CMake for your platform
1039
Andy Green54cb3462013-02-14 22:23:54 +08001040
Andy Green53a46782013-02-14 11:23:49 +08001041v1.21-chrome26-firefox18
1042========================
1043
1044 - Fixes buffer overflow bug in max frame size handling if you used the
1045 default protocol buffer size. If you declared rx_buffer_size in your
1046 protocol, which is recommended anyway, your code was unaffected.
1047
Andy Green182cb9a2013-02-13 11:54:08 +08001048v1.2-chrome26-firefox18
1049=======================
1050
1051Diffstat
1052--------
1053
1054 .gitignore | 16 +++
1055 CMakeLists.txt | 544 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1056 LICENSE | 526 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1057 Makefile.am | 1 +
1058 README | 20 +++
1059 README.build | 258 ++++++++++++++++++++++++++++++++-----
1060 README.coding | 52 ++++++++
1061 changelog | 136 ++++++++++++++++++++
1062 cmake/FindOpenSSLbins.cmake | 33 +++++
1063 config.h.cmake | 173 +++++++++++++++++++++++++
1064 configure.ac | 22 +++-
1065 lib/Makefile.am | 20 ++-
1066 lib/base64-decode.c | 2 +-
1067 lib/client-handshake.c | 190 +++++++++++-----------------
1068 lib/client-parser.c | 88 +++++++------
1069 lib/client.c | 384 ++++++++++++++++++++++++++++++-------------------------
1070 lib/daemonize.c | 32 +++--
1071 lib/extension-deflate-frame.c | 58 +++++----
1072 lib/extension-deflate-stream.c | 19 ++-
1073 lib/extension-deflate-stream.h | 4 +-
1074 lib/extension.c | 11 +-
1075 lib/getifaddrs.c | 315 +++++++++++++++++++++++-----------------------
1076 lib/getifaddrs.h | 30 ++---
1077 lib/handshake.c | 124 +++++++++++-------
1078 lib/libwebsockets.c | 736 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------
1079 lib/libwebsockets.h | 237 ++++++++++++++++++++++------------
1080 lib/output.c | 192 +++++++++++-----------------
1081 lib/parsers.c | 966 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------------------------------------
1082 lib/private-libwebsockets.h | 225 +++++++++++++++++++++------------
1083 lib/server-handshake.c | 82 ++++++------
1084 lib/server.c | 96 +++++++-------
1085 libwebsockets-api-doc.html | 189 ++++++++++++++++++----------
1086 libwebsockets.spec | 17 +--
1087 test-server/attack.sh | 148 ++++++++++++++++++++++
1088 test-server/test-client.c | 125 +++++++++---------
1089 test-server/test-echo.c | 31 +++--
1090 test-server/test-fraggle.c | 32 ++---
1091 test-server/test-ping.c | 52 ++++----
1092 test-server/test-server.c | 129 ++++++++++++-------
1093 win32port/libwebsocketswin32/libwebsocketswin32.vcxproj | 279 ----------------------------------------
1094 win32port/libwebsocketswin32/libwebsocketswin32.vcxproj.filters | 23 +++-
1095 41 files changed, 4398 insertions(+), 2219 deletions(-)
1096
Andy Green7b405452013-02-01 10:50:15 +08001097
1098User api additions
1099------------------
1100
1101 - lws_get_library_version() returns a const char * with a string like
1102 "1.1 9e7f737", representing the library version from configure.ac
1103 and the git HEAD hash the library was built from
1104
Andy Greena47865f2013-02-10 09:39:47 +08001105 - TCP Keepalive can now optionally be applied to all lws sockets, on Linux
1106 also with controllable timeout, number of probes and probe interval.
1107 (On BSD type OS, you can only use system default settings for the
1108 timing and retries, although enabling it is supported by setting
1109 ka_time to nonzero, the exact value has no meaning.)
1110 This enables detection of idle connections which are logically okay,
1111 but are in fact dead, due to network connectivity issues at the server,
Andy Greena690cd02013-02-09 12:25:31 +08001112 client, or any intermediary. By default it's not enabled, but you
1113 can enable it by setting a non-zero timeout (in seconds) at the new
1114 ka_time member at context creation time.
1115
Andy Greena7109e62013-02-11 12:05:54 +08001116 - Two new optional user callbacks added, LWS_CALLBACK_PROTOCOL_DESTROY which
1117 is called one-time per protocol as the context is being destroyed, and
1118 LWS_CALLBACK_PROTOCOL_INIT which is called when the context is created
1119 and the protocols are added, again it's a one-time affair.
1120 This lets you manage per-protocol allocations properly including
1121 cleaning up after yourself when the server goes down.
Andy Green7b405452013-02-01 10:50:15 +08001122
Andy Greened334462013-02-07 21:14:33 +08001123User api changes
1124----------------
1125
Andy Green1b265272013-02-09 14:01:09 +08001126 - libwebsocket_create_context() has changed from taking a ton of parameters
1127 to just taking a pointer to a struct containing the parameters. The
1128 struct lws_context_creation_info is in libwebsockets.h, the members
1129 are in the same order as when they were parameters to the call
1130 previously. The test apps are all updated accordingly so you can
1131 see example code there.
1132
Andy Greened334462013-02-07 21:14:33 +08001133 - Header tokens are now deleted after the websocket connection is
Andy Green54495112013-02-06 21:10:16 +09001134 established. Not just the header data is saved, but the pointer and
1135 length array is also removed from (union) scope saving several hundred
1136 bytes per connection once it is established
1137
1138 - struct libwebsocket_protocols has a new member rx_buffer_size, this
1139 controls rx buffer size per connection of that protocol now. Sources
1140 for apps built against older versions of the library won't declare
1141 this in their protocols, defaulting it to 0. Zero buffer is legal,
1142 it causes a default buffer to be allocated (currently 4096)
1143
1144 If you want to receive only atomic frames in your user callback, you
1145 should set this to greater than your largest frame size. If a frame
1146 comes that exceeds that, no error occurs but the callback happens as
1147 soon as the buffer limit is reached, and again if it is reached again
1148 or the frame completes. You can detect that has happened by seeing
1149 there is still frame content pending using
1150 libwebsockets_remaining_packet_payload()
1151
1152 By correctly setting this, you can save a lot of memory when your
1153 protocol has small frames (see the test server and client sources).
1154
Andy Green16ab3182013-02-10 18:02:31 +08001155 - LWS_MAX_HEADER_LEN now defaults to 1024 and is the total amount of known
1156 header payload lws can cope with, that includes the GET URL, origin
1157 etc. Headers not understood by lws are ignored and their payload
1158 not included in this.
1159
Andy Green54495112013-02-06 21:10:16 +09001160
1161User api removals
1162-----------------
1163
Andy Green16ab3182013-02-10 18:02:31 +08001164 - The configuration-time option MAX_USER_RX_BUFFER has been replaced by a
1165 buffer size chosen per-protocol. For compatibility, there's a default
1166 of 4096 rx buffer, but user code should set the appropriate size for
1167 the protocol frames.
1168
1169 - LWS_INITIAL_HDR_ALLOC and LWS_ADDITIONAL_HDR_ALLOC are no longer needed
1170 and have been removed. There's a new header management scheme that
1171 handles them in a much more compact way.
Andy Greened334462013-02-07 21:14:33 +08001172
Andy Green70edd6f2013-02-12 10:15:25 +08001173 - libwebsockets_hangup_on_client() is removed. If you want to close the
1174 connection you must do so from the user callback and by returning
1175 -1 from there.
1176
Andy Green508946c2013-02-12 10:19:08 +08001177 - libwebsocket_close_and_free_session() is now private to the library code
1178 only and not exposed for user code. If you want to close the
1179 connection, you must do so from the user callback by returning -1
1180 from there.
1181
Andy Greened334462013-02-07 21:14:33 +08001182
Andy Greendf60b0c2013-02-06 19:57:12 +09001183New features
1184------------
1185
Andy Green9b09dc02013-02-08 12:48:36 +08001186 - Cmake project file added, aimed initially at Windows support: this replaces
Andy Green16ab3182013-02-10 18:02:31 +08001187 the visual studio project files that were in the tree until now.
Andy Greendf60b0c2013-02-06 19:57:12 +09001188
Andy Greenc3ef0d62013-02-12 10:50:49 +08001189 - CyaSSL now supported in place of OpenSSL (--use-cyassl on configure)
1190
Andy Green9b09dc02013-02-08 12:48:36 +08001191 - PATH_MAX or MAX_PATH no longer needed
Andy Greendf60b0c2013-02-06 19:57:12 +09001192
Andy Green54495112013-02-06 21:10:16 +09001193 - cutomizable frame rx buffer size by protocol
1194
Andy Greenc3ef0d62013-02-12 10:50:49 +08001195 - optional TCP keepalive so dead peers can be detected, can be enabled at
1196 context-creation time
1197
1198 - valgrind-clean: no SSL or CyaSSL: completely clean. With OpenSSL, 88 bytes
1199 lost at OpenSSL library init and symptomless reports of uninitialized
1200 memory usage... seems to be a known and ignored problem at OpenSSL
1201
Andy Greena3957ef2013-02-11 09:31:43 +08001202 - By default debug is enabled and the library is built for -O0 -g to faclitate
1203 that. Use --disable-debug configure option to build instead with -O4
1204 and no -g (debug info), obviously providing best performance and
1205 reduced binary size.
Andy Green7b405452013-02-01 10:50:15 +08001206
Andy Green895d56d2013-02-11 09:32:53 +08001207 - 1.0 introduced some code to try to not deflate small frames, however this
1208 seems to break when confronted with a mixture of frames above and
1209 below the threshold, so it's removed. Veto the compression extension
1210 in your user callback if you will typically have very small frames.
1211
Andy Green16ab3182013-02-10 18:02:31 +08001212 - There are many memory usage improvements, both a reduction in malloc/
1213 realloc and architectural changes. A websocket connection now
1214 consumes only 296 bytes with SSL or 272 bytes without on x86_64,
1215 during header processing an additional 1262 bytes is allocated in a
1216 single malloc, but is freed when the websocket connection starts.
1217 The RX frame buffer defined by the protocol in user
1218 code is also allocated per connection, this represents the largest
1219 frame you can receive atomically in that protocol.
1220
Andy Greenc3ef0d62013-02-12 10:50:49 +08001221 - On ARM9 build, just http+ws server no extensions or ssl, <12Kbytes .text
1222 and 112 bytes per connection (+1328 only during header processing)
1223
Andy Green895d56d2013-02-11 09:32:53 +08001224
Andy Greenbd1132f2013-01-31 19:53:05 +08001225v1.1-chrome26-firefox18
Andy Greena35c86f2013-01-31 10:16:44 +08001226=======================
1227
1228Diffstat
1229--------
1230
1231 Makefile.am | 4 +
1232 README-test-server | 291 ---
1233 README.build | 239 ++
1234 README.coding | 138 ++
1235 README.rst | 72 -
1236 README.test-apps | 272 +++
1237 configure.ac | 116 +-
1238 lib/Makefile.am | 55 +-
1239 lib/base64-decode.c | 5 +-
1240 lib/client-handshake.c | 121 +-
1241 lib/client-parser.c | 394 ++++
1242 lib/client.c | 807 +++++++
1243 lib/daemonize.c | 212 ++
1244 lib/extension-deflate-frame.c | 132 +-
1245 lib/extension-deflate-stream.c | 12 +-
1246 lib/extension-x-google-mux.c | 1223 ----------
1247 lib/extension-x-google-mux.h | 96 -
1248 lib/extension.c | 8 -
1249 lib/getifaddrs.c | 271 +++
1250 lib/getifaddrs.h | 76 +
1251 lib/handshake.c | 582 +----
1252 lib/libwebsockets.c | 2493 ++++++---------------
1253 lib/libwebsockets.h | 115 +-
1254 lib/md5.c | 217 --
1255 lib/minilex.c | 440 ++++
1256 lib/output.c | 628 ++++++
1257 lib/parsers.c | 2016 +++++------------
1258 lib/private-libwebsockets.h | 284 +--
1259 lib/server-handshake.c | 275 +++
1260 lib/server.c | 377 ++++
1261 libwebsockets-api-doc.html | 300 +--
1262 m4/ignore-me | 2 +
1263 test-server/Makefile.am | 111 +-
1264 test-server/libwebsockets.org-logo.png | Bin 0 -> 7029 bytes
1265 test-server/test-client.c | 45 +-
1266 test-server/test-echo.c | 330 +++
1267 test-server/test-fraggle.c | 20 +-
1268 test-server/test-ping.c | 22 +-
1269 test-server/test-server-extpoll.c | 554 -----
1270 test-server/test-server.c | 349 ++-
1271 test-server/test.html | 3 +-
1272 win32port/zlib/ZLib.vcxproj | 749 ++++---
1273 win32port/zlib/ZLib.vcxproj.filters | 188 +-
1274 win32port/zlib/adler32.c | 348 ++-
1275 win32port/zlib/compress.c | 160 +-
1276 win32port/zlib/crc32.c | 867 ++++----
1277 win32port/zlib/crc32.h | 882 ++++----
1278 win32port/zlib/deflate.c | 3799 +++++++++++++++-----------------
1279 win32port/zlib/deflate.h | 688 +++---
1280 win32port/zlib/gzclose.c | 50 +-
1281 win32port/zlib/gzguts.h | 325 ++-
1282 win32port/zlib/gzlib.c | 1157 +++++-----
1283 win32port/zlib/gzread.c | 1242 ++++++-----
1284 win32port/zlib/gzwrite.c | 1096 +++++----
1285 win32port/zlib/infback.c | 1272 ++++++-----
1286 win32port/zlib/inffast.c | 680 +++---
1287 win32port/zlib/inffast.h | 22 +-
1288 win32port/zlib/inffixed.h | 188 +-
1289 win32port/zlib/inflate.c | 2976 +++++++++++++------------
1290 win32port/zlib/inflate.h | 244 +-
1291 win32port/zlib/inftrees.c | 636 +++---
1292 win32port/zlib/inftrees.h | 124 +-
1293 win32port/zlib/trees.c | 2468 +++++++++++----------
1294 win32port/zlib/trees.h | 256 +--
1295 win32port/zlib/uncompr.c | 118 +-
1296 win32port/zlib/zconf.h | 934 ++++----
1297 win32port/zlib/zlib.h | 3357 ++++++++++++++--------------
1298 win32port/zlib/zutil.c | 642 +++---
1299 win32port/zlib/zutil.h | 526 ++---
1300 69 files changed, 19556 insertions(+), 20145 deletions(-)
1301
1302user api changes
1303----------------
1304
1305 - libwebsockets_serve_http_file() now takes a context as first argument
1306
1307 - libwebsockets_get_peer_addresses() now takes a context and wsi as first
1308 two arguments
1309
1310
1311user api additions
1312------------------
1313
1314 - lwsl_...() logging apis, default to stderr but retargetable by user code;
1315 may be used also by user code
1316
1317 - lws_set_log_level() set which logging apis are able to emit (defaults to
1318 notice, warn, err severities), optionally set the emit callback
1319
1320 - lwsl_emit_syslog() helper callback emits to syslog
1321
1322 - lws_daemonize() helper code that forks the app into a headless daemon
1323 properly, maintains a lock file with pid in suitable for sysvinit etc to
1324 control lifecycle
1325
1326 - LWS_CALLBACK_HTTP_FILE_COMPLETION callback added since http file
1327 transfer is now asynchronous (see test server code)
1328
1329 - lws_frame_is_binary() from a wsi pointer, let you know if the received
1330 data was sent in BINARY mode
1331
1332
1333user api removals
1334-----------------
1335
1336 - libwebsockets_fork_service_loop() - no longer supported (had intractable problems)
1337 arrange your code to act from the user callback instead from same
1338 process context as the service loop
1339
1340 - libwebsockets_broadcast() - use libwebsocket_callback_on_writable[_all_protocol]()
1341 instead from same process context as the service loop. See the test apps
1342 for examples.
1343
1344 - x-google-mux() removed until someone wants it
1345
1346 - pre -v13 (ancient) protocol support removed
1347
1348
1349New features
1350------------
1351
1352 - echo test server and client compatible with echo.websocket.org added
1353
1354 - many new configure options (see README.build) to reduce footprint of the
1355 library to what you actually need, eg, --without-client and
1356 --without-server
1357
1358 - http + websocket server can build to as little as 12K .text for ARM
1359
1360 - no more MAX_CLIENTS limitation; adapts to support the max number of fds
1361 allowed to the process by ulimit, defaults to 1024 on Fedora and
1362 Ubuntu. Use ulimit to control this without needing to configure
1363 the library. Code here is smaller and faster.
1364
1365 - adaptive ratio of listen socket to connection socket service allows
1366 good behaviour under Apache ab test load. Tested with thousands
1367 of simultaneous connections
1368
1369 - reduction in per-connection memory footprint by moving to a union to hold
1370 mutually-exclusive state for the connection
1371
1372 - robustness: Out of Memory taken care of for all allocation code now
1373
1374 - internal getifaddrs option if your toolchain lacks it (some uclibc)
1375
1376 - configurable memory limit for deflate operations
1377
1378 - improvements in SSL code nonblocking operation, possible hang solved,
1379 some SSL operations broken down into pollable states so there is
1380 no library blocking, timeout coverage for SSL_connect
1381
1382 - extpoll test server merged into single test server source
1383
1384 - robustness: library should deal with all recoverable socket conditions
1385
1386 - rx flowcontrol for backpressure notification fixed and implmeneted
1387 correctly in the test server
1388
1389 - optimal lexical parser added for header processing; all headers in a
1390 single 276-byte state table
1391
1392 - latency tracking api added (configure --with-latency)
1393
1394 - Improved in-tree documentation, REAME.build, README.coding,
1395 README.test-apps, changelog
1396
1397 - Many small fixes
1398
1399
1400v1.0-chrome25-firefox17 (6cd1ea9b005933f)