blob: f86085715d5197bb23d0de96d2bedc1e4e5ef06f [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
82operations.
83
Andy Greenfb5f33b2016-03-01 07:19:01 +0800849) The test server has a new URI path http://localhost:7681/proxytest
85If you visit here, a client connection to http://example.com:80 is spawned,
86and the results piped on to your original connection.
87
Andy Green2d8d35a2016-02-29 14:19:16 +080088
Andy Greend7fddad2016-02-18 20:36:55 +080089User API additions
90------------------
91
Andy Green0c3cc2e2016-02-20 09:12:52 +0800921) MINOR APIBREAK There's a new member in struct lws_context_creation_info, ecdh_curve,
Andy Greend7fddad2016-02-18 20:36:55 +080093which lets you set the name of the ECDH curve OpenSSL should use. By
94default (if you leave ecdh_curve NULL) it will use "prime256v1"
95
Andy Green51d9afa2016-02-24 11:05:56 +0800962) MINOR NEWAPI It was already possible to adopt a foreign socket that had not
97been read from using lws_adopt_socket() since v1.7. Now you can adopt a
98partially-used socket if you don't need SSL, by passing it what you read
99so it can drain that before reading from the socket.
100
101LWS_VISIBLE LWS_EXTERN struct lws *
102lws_adopt_socket_readbuf(struct lws_context *context, lws_sockfd_type accept_fd,
103 const char *readbuf, size_t len);
Andy Greend7fddad2016-02-18 20:36:55 +0800104
Andy Green6a8099b2016-02-21 21:25:48 +08001053) MINOR NEWAPI CGI type "network io" subprocess execution is now possible from
106a simple api.
107
108LWS_VISIBLE LWS_EXTERN int
109lws_cgi(struct lws *wsi, char * const *exec_array, int timeout_secs);
110
111LWS_VISIBLE LWS_EXTERN int
112lws_cgi_kill(struct lws *wsi);
113
114To use it, you must first set the cmake option
115
116$ cmake .. -DLWS_WITH_CGI=1
117
118See test-server-http.c and test server path
119
120http://localhost:7681/cgitest
121
122stdin gets http body, you can test it with wget
123
124$ echo hello > hello.txt
125$ wget http://localhost:7681/cgitest --post-file=hello.txt -O- --quiet
126lwstest script
127read="hello"
128
Andy Greend61bed32016-02-25 15:01:55 +08001294) There is a helper api for forming logging timestamps
130
131LWS_VISIBLE int
132lwsl_timestamp(int level, char *p, int len)
133
134this generates this kind of timestamp for use as logging preamble
135
136lwsts[13116]: [2016/01/25 14:52:52:8386] NOTICE: Initial logging level 7
137
Andy Greena661ee52016-02-29 13:18:30 +08001385) struct lws_client_connect_info has a new member
139
140 const char *method
141
142If it's NULL, then everything happens as before, lws_client_connect_via_info()
143makes a ws or wss connection to the address given.
144
145If you set method to a valid http method like "GET", though, then this method
146is used and the connection remains in http[s], it's not upgraded to ws[s].
147
148So with this, you can perform http[s] client operations as well as ws[s] ones.
149
150There are 4 new related callbacks
151
152 LWS_CALLBACK_ESTABLISHED_CLIENT_HTTP = 44,
153 LWS_CALLBACK_CLOSED_CLIENT_HTTP = 45,
154 LWS_CALLBACK_RECEIVE_CLIENT_HTTP = 46,
155 LWS_CALLBACK_COMPLETED_CLIENT_HTTP = 47,
Andy Green6a8099b2016-02-21 21:25:48 +0800156
Andy Green494418a2016-03-02 09:17:22 +08001576) struct lws_client_connect_info has a new member
158
159 const char *parent_wsi
160
161if non-NULL, the client wsi is set to be a child of parent_wsi. This ensures
162if parent_wsi closes, then the client child is closed just before.
163
Andy Green0c3cc2e2016-02-20 09:12:52 +0800164
Andy Green9c60ed92016-02-16 12:32:18 +0800165v1.7.0
166======
167
Andy Green67112662016-01-11 11:34:01 +0800168Extension Changes
169-----------------
170
1711) There is now a "permessage-deflate" / RFC7692 implementation. It's very
172similar to "deflate-frame" we have offered for a long while; deflate-frame is
173now provided as an alias of permessage-deflate.
174
175The main differences are that the new permessage-deflate implementation:
176
177 - properly performs streaming respecting input and output buffer limits. The
178 old deflate-frame implementation could only work on complete deflate input
179 and produce complete inflate output for each frame. The new implementation
180 only mallocs buffers at initialization.
181
182 - goes around the event loop after each input package is processed allowing
183 interleaved output processing. The RX flow control api can be used to
184 force compressed input processing to match the rate of compressed output
185 processing (test--echo shows an example of how to do this).
186
187 - when being "deflate-frame" for compatibility he uses the same default zlib
188 settings as the old "deflate-frame", but instead of exponentially increasing
189 malloc allocations until the whole output will fit, he observes the default
190 input and output chunking buffer sizes of "permessage-deflate", that's
191 1024 in and 1024 out at a time.
192
1932) deflate-stream has been disabled for many versions (for over a year) and is
194now removed. Browsers are now standardizing on "permessage-deflate" / RFC7692
195
1963) struct lws_extension is simplified, and lws extensions now have a public
197api (their callback) for use in user code to compose extensions and options
198the user code wants. lws_get_internal_exts() is deprecated but kept around
199as a NOP. The changes allow one extension implementation to go by different
200names and allows the user client code to control option offers per-ext.
201
202The test client and server are updated to use the new way. If you use
203the old way it should still work, but extensions will be disabled until you
204update your code.
205
206Extensions are now responsible for allocating and per-instance private struct
207at instance construction time and freeing it when the instance is destroyed.
208Not needing to know the size means the extension's struct can be opaque
209to user code.
210
211
Andy Green3df58002015-12-25 12:44:12 +0800212User api additions
213------------------
214
Andy Green200a6a22016-02-15 20:36:02 +08002151) The info struct gained three new members
Andy Green3df58002015-12-25 12:44:12 +0800216
217 - max_http_header_data: 0 for default (1024) or set the maximum amount of known
218 http header payload that lws can deal with. Payload in unknown http
219 headers is dropped silently. If for some reason you need to send huge
220 cookies or other HTTP-level headers, you can now increase this at context-
221 creation time.
222
223 - max_http_header_pool: 0 for default (16) or set the maximum amount of http
224 headers that can be tracked by lws in this context. For the server, if
225 the header pool is completely in use then accepts on the listen socket
226 are disabled until one becomes free. For the client, if you simultaneously
227 have pending connects for more than this number of client connections,
228 additional connects will fail until some of the pending connections timeout
229 or complete.
230
Andy Green200a6a22016-02-15 20:36:02 +0800231 - timeout_secs: 0 for default (currently 20s), or set the library's
232 network activity timeout to the given number of seconds
233
Andy Green3df58002015-12-25 12:44:12 +0800234HTTP header processing in lws only exists until just after the first main
235callback after the HTTP handshake... for ws connections that is ESTABLISHED and
236for HTTP connections the HTTP callback.
237
238So these settings are not related to the maximum number of simultaneous
Andy Green3246ebb2015-12-26 12:03:06 +0800239connections, but the number of HTTP handshakes that may be expected or ongoing,
Andy Green3df58002015-12-25 12:44:12 +0800240or have just completed, at one time. The reason it's useful is it changes the
241memory allocation for header processing to be one-time at context creation
242instead of every time there is a new connection, and gives you control over
243the peak allocation.
244
245Setting max_http_header_pool to 1 is fine it will just queue incoming
246connections before the accept as necessary, you can still have as many
Andy Green5b85e392015-12-26 13:23:11 +0800247simultaneous post-header connections as you like. Since the http header
248processing is completed and the allocation released after ESTABLISHED or the
249HTTP callback, even with a pool of 1 many connections can be handled rapidly.
250
Andy Green066a7a12015-12-26 15:47:06 +08002512) There is a new callback that allows the user code to get acccess to the
252optional close code + aux data that may have been sent by the peer.
253
254LWS_CALLBACK_WS_PEER_INITIATED_CLOSE:
255 The peer has sent an unsolicited Close WS packet. @in and
256 @len are the optional close code (first 2 bytes, network
257 order) and the optional additional information which is not
258 defined in the standard, and may be a string or non-human-
259 readble data.
260 If you return 0 lws will echo the close and then close the
Andy Green67112662016-01-11 11:34:01 +0800261 connection. If you return nonzero lws will just close the
262 connection.
Andy Green066a7a12015-12-26 15:47:06 +0800263
264As usual not handling it does the right thing, if you're not interested in it
265just ignore it.
266
267The test server has "open and close" testing buttons at the bottom, if you
268open and close that connection, on close it will send a close code 3000 decimal
269and the string "Bye!" as the aux data.
270
271The test server dumb-increment callback handles this callback reason and prints
272
273lwsts[15714]: LWS_CALLBACK_WS_PEER_INITIATED_CLOSE: len 6
274lwsts[15714]: 0: 0x0B
275lwsts[15714]: 1: 0xB8
276lwsts[15714]: 2: 0x42
277lwsts[15714]: 3: 0x79
278lwsts[15714]: 4: 0x65
279lwsts[15714]: 5: 0x21
280
Andy Green1fb95e82015-12-26 17:20:34 +08002813) There is a new API to allow the user code to control the content of the
282close frame sent when about to return nonzero from the user callback to
283indicate the connection should close.
284
285/**
286 * lws_close_reason - Set reason and aux data to send with Close packet
287 * If you are going to return nonzero from the callback
288 * requesting the connection to close, you can optionally
289 * call this to set the reason the peer will be told if
290 * possible.
291 *
292 * @wsi: The websocket connection to set the close reason on
293 * @status: A valid close status from websocket standard
294 * @buf: NULL or buffer containing up to 124 bytes of auxiliary data
295 * @len: Length of data in @buf to send
296 */
297LWS_VISIBLE LWS_EXTERN void
298lws_close_reason(struct lws *wsi, enum lws_close_status status,
299 unsigned char *buf, size_t len);
300
301An extra button is added to the "open and close" test server page that requests
302that the test server close the connection from his end.
303
304The test server code will do so by
305
306 lws_close_reason(wsi, LWS_CLOSE_STATUS_GOINGAWAY,
307 (unsigned char *)"seeya", 5);
308 return -1;
309
310The browser shows the close code and reason he received
311
312websocket connection CLOSED, code: 1001, reason: seeya
313
Vijay Khurdiyae73d4462016-01-15 16:21:51 +08003144) There's a new context creation time option flag
Andy Green44a7f652015-12-29 11:20:09 +0800315
316LWS_SERVER_OPTION_VALIDATE_UTF8
317
318if you set it in info->options, then TEXT and CLOSE frames will get checked to
319confirm that they contain valid UTF-8. If they don't, the connection will get
320closed by lws.
321
Vijay Khurdiyae73d4462016-01-15 16:21:51 +08003225) ECDH Certs are now supported. Enable the CMake option
323
324cmake .. -DLWS_SSL_SERVER_WITH_ECDH_CERT=1
325
326**and** the info->options flag
327
Andy Greenff696482016-02-17 07:46:27 +0800328LWS_SERVER_OPTION_SSL_ECDH
Vijay Khurdiyae73d4462016-01-15 16:21:51 +0800329
330to build in support and select it at runtime.
331
Andy Greenff696482016-02-17 07:46:27 +08003326) There's a new api lws_parse_uri() that simplifies chopping up
Andy Green809d69a2016-01-14 11:37:56 +0800333https://xxx:yyy/zzz uris into parts nicely. The test client now uses this
Andy Greend3a55052016-01-19 03:34:24 +0800334to allow proper uris as well as the old address style.
335
3367) SMP support is integrated into LWS without any internal threading. It's
337very simple to use, libwebsockets-test-server-pthread shows how to do it,
338use -j <n> argument there to control the number of service threads up to 32.
339
340Two new members are added to the info struct
341
342 unsigned int count_threads;
343 unsigned int fd_limit_per_thread;
344
345leave them at the default 0 to get the normal singlethreaded service loop.
346
347Set count_threads to n to tell lws you will have n simultaneous service threads
348operating on the context.
349
350There is still a single listen socket on one port, no matter how many
351service threads.
352
353When a connection is made, it is accepted by the service thread with the least
354connections active to perform load balancing.
355
356The user code is responsible for spawning n threads running the service loop
357associated to a specific tsi (Thread Service Index, 0 .. n - 1). See
358the libwebsockets-test-server-pthread for how to do.
359
360If you leave fd_limit_per_thread at 0, then the process limit of fds is shared
361between the service threads; if you process was allowed 1024 fds overall then
362each thread is limited to 1024 / n.
363
364You can set fd_limit_per_thread to a nonzero number to control this manually, eg
365the overall supported fd limit is less than the process allowance.
366
367You can control the context basic data allocation for multithreading from Cmake
368using -DLWS_MAX_SMP=, if not given it's set to 32. The serv_buf allocation
369for the threads (currently 4096) is made at runtime only for active threads.
370
371Because lws will limit the requested number of actual threads supported
372according to LWS_MAX_SMP, there is an api lws_get_count_threads(context) to
373discover how many threads were actually allowed when the context was created.
374
375It's required to implement locking in the user code in the same way that
376libwebsockets-test-server-pthread does it, for the FD locking callbacks.
377
Andy Greenba119e92016-01-26 21:40:32 +0800378If LWS_MAX_SMP=1, then there is no code related to pthreads compiled in the
379library. If more than 1, a small amount of pthread mutex code is built into
380the library.
Andy Green809d69a2016-01-14 11:37:56 +0800381
Andy Greenba119e92016-01-26 21:40:32 +08003828) New API
383
384LWS_VISIBLE struct lws *
385lws_adopt_socket(struct lws_context *context, lws_sockfd_type accept_fd)
386
387allows foreign sockets accepted by non-lws code to be adopted by lws as if they
388had just been accepted by lws' own listen socket.
Andy Green3df58002015-12-25 12:44:12 +0800389
Danomi Czaski4e9c7f32016-01-28 09:40:53 +08003909) X-Real-IP: header has been added as WSI_TOKEN_HTTP_X_REAL_IP
391
Andy Green86ed65f2016-02-14 09:27:41 +080039210) Libuv support is added, there are new related user apis
393
394typedef void (lws_uv_signal_cb_t)(uv_loop_t *l, uv_signal_t *w, int revents);
395
396LWS_VISIBLE LWS_EXTERN int
397lws_uv_sigint_cfg(struct lws_context *context, int use_uv_sigint,
398 lws_uv_signal_cb_t *cb);
399
400LWS_VISIBLE LWS_EXTERN int
401lws_uv_initloop(struct lws_context *context, uv_loop_t *loop, int tsi);
402
403LWS_VISIBLE void
404lws_uv_sigint_cb(uv_loop_t *loop, uv_signal_t *watcher, int revents);
405
406and CMAKE option
407
408LWS_WITH_LIBUV
409
Danomi Czaski4e9c7f32016-01-28 09:40:53 +0800410
Andy Green3246ebb2015-12-26 12:03:06 +0800411User api changes
412----------------
413
4141) LWS_SEND_BUFFER_POST_PADDING is now 0 and deprecated. You can remove it; if
415you still use it, obviously it does nothing. Old binary code with nonzero
416LWS_SEND_BUFFER_POST_PADDING is perfectly compatible, the old code just
Andy Green5b85e392015-12-26 13:23:11 +0800417allocated a buffer bigger than the library is going to use.
Andy Green3246ebb2015-12-26 12:03:06 +0800418
Andy Green5b85e392015-12-26 13:23:11 +0800419The example apps no longer use LWS_SEND_BUFFER_POST_PADDING.
Andy Green3246ebb2015-12-26 12:03:06 +0800420
Andy Green4e2ac762015-12-26 20:26:11 +0800421The only path who made use of it was sending with LWS_WRITE_CLOSE --->
Andy Green3246ebb2015-12-26 12:03:06 +0800422
Andy Green1fb95e82015-12-26 17:20:34 +08004232) Because of lws_close_reason() formalizing handling close frames,
424LWS_WRITE_CLOSE is removed from libwebsockets.h. It was only of use to send
425close frames...close frame content should be managed using lws_close_reason()
426now.
427
Andy Green44a7f652015-12-29 11:20:09 +08004283) We check for invalid CLOSE codes and complain about protocol violation in
429our close code. But it changes little since we were in the middle of closing
430anyway.
431
4324) zero-length RX frames and zero length TX frames are now allowed.
433
4345) Pings and close used to be limited to 124 bytes, the correct limit is 125
435so that is now also allowed.
Andy Green3246ebb2015-12-26 12:03:06 +0800436
Steffen Vogelf9267172016-02-09 07:19:15 +01004376) LWS_PRE is provided as a synonym for LWS_SEND_BUFFER_PRE_PADDING, either is
Andy Green67112662016-01-11 11:34:01 +0800438valid to use now.
439
4407) There's generic support for RFC7462 style extension options built into the
441library now. As a consequence, a field "options" is added to lws_extension.
442It can be NULL if there are no options on the extension. Extension internal
443info is part of the public abi because extensions may be implemented outside
444the library.
445
Danomi Czaski4e9c7f32016-01-28 09:40:53 +08004468) WSI_TOKEN_PROXY enum was accidentally defined to collide with another token
447of value 73. That's now corrected and WSI_TOKEN_PROXY moved to his own place at
44877.
449
Andy Green86ed65f2016-02-14 09:27:41 +08004509) With the addition of libuv support, libev is not the only event loop
451library in town and his api names must be elaborated with _ev_
452
453 Callback typedef: lws_signal_cb ---> lws_ev_signal_cb_t
454 lws_sigint_cfg --> lws_ev_sigint_cfg
455 lws_initloop --> lws_ev_initloop
456 lws_sigint_cb --> lws_ev_sigint_cb
457
45810) Libev support is made compatible with multithreaded service,
459lws_ev_initloop (was lws_initloop) gets an extra argument for the
460thread service index (use 0 if you will just have 1 service thread).
461
462LWS_VISIBLE LWS_EXTERN int
Andy Greenff696482016-02-17 07:46:27 +0800463lws_ev_initloop(struct lws_context *context, ev_loop_t *loop, int tsi);
Andy Green86ed65f2016-02-14 09:27:41 +0800464
Andy Green3df58002015-12-25 12:44:12 +0800465
Andy Green9e8d1482015-12-18 11:01:03 +0800466v1.6.0-chrome48-firefox42
467=======================
468
469Major API improvements
470----------------------
471
472v1.6.0 has many cleanups and improvements in the API. Although at first it
473looks pretty drastic, user code will only need four actions to update it.
474
475 - Do the three search/replaces in your user code, /libwebsocket_/lws_/,
476 /libwebsockets_/lws_/, and /struct\ libwebsocket/struct\ lws/
477
478 - Remove the context parameter from your user callbacks
479
480 - Remove context as the first parameter from the "Eleven APIS" listed in the
481 User Api Changes section
482
483 - Add lws_get_context(wsi) as the first parameter on the "Three APIS" listed
484 in the User Api Changes section, and anywhere else you still need context
485
486That's it... generally only a handful of the 14 affected APIs are actually in
487use in your user code and you can find them quickest by compiling and visiting
488the errors each in turn. And the end results are much cleaner, more
489predictable and maintainable.
490
491
Andy Green4e442b72015-12-10 07:58:58 +0800492User api additions
493------------------
494
Andy Green3f628702015-12-14 07:16:32 +08004951) lws now exposes his internal platform file abstraction in a way that can be
Andy Green4e442b72015-12-10 07:58:58 +0800496both used by user code to make it platform-agnostic, and be overridden or
497subclassed by user code. This allows things like handling the URI "directory
498space" as a virtual filesystem that may or may not be backed by a regular
499filesystem. One example use is serving files from inside large compressed
500archive storage without having to unpack anything except the file being
501requested.
502
503The test server shows how to use it, basically the platform-specific part of
504lws prepares a file operations structure that lives in the lws context.
505
Andy Green3f599962015-12-14 07:21:42 +0800506Helpers are provided to also leverage these platform-independent file handling
507apis
Andy Green4e442b72015-12-10 07:58:58 +0800508
509static inline lws_filefd_type
Andy Green3f599962015-12-14 07:21:42 +0800510lws_plat_file_open(struct lws *wsi, const char *filename,
Andy Green4e442b72015-12-10 07:58:58 +0800511 unsigned long *filelen, int flags)
Andy Green4e442b72015-12-10 07:58:58 +0800512static inline int
Andy Green3f599962015-12-14 07:21:42 +0800513lws_plat_file_close(struct lws *wsi, lws_filefd_type fd)
Andy Green4e442b72015-12-10 07:58:58 +0800514
515static inline unsigned long
Andy Green3f599962015-12-14 07:21:42 +0800516lws_plat_file_seek_cur(struct lws *wsi, lws_filefd_type fd, long offset)
Andy Green4e442b72015-12-10 07:58:58 +0800517
518static inline int
Andy Green3f599962015-12-14 07:21:42 +0800519lws_plat_file_read(struct lws *wsi, lws_filefd_type fd, unsigned long *amount,
520 unsigned char *buf, unsigned long len)
Andy Green4e442b72015-12-10 07:58:58 +0800521
522static inline int
Andy Green3f599962015-12-14 07:21:42 +0800523lws_plat_file_write(struct lws *wsi, lws_filefd_type fd, unsigned long *amount,
524 unsigned char *buf, unsigned long len)
Andy Green4e442b72015-12-10 07:58:58 +0800525
526The user code can also override or subclass the file operations, to either
527wrap or replace them. An example is shown in test server.
528
Andy Green3f599962015-12-14 07:21:42 +0800529A wsi can be associated with the file activity, allowing per-connection
530authentication and state to be used when interpreting the file request.
531
Andy Green3f628702015-12-14 07:16:32 +08005322) A new API void * lws_wsi_user(struct lws *wsi) lets you get the pointer to
533the user data associated with the wsi, just from the wsi.
534
Andy Green9e8d1482015-12-18 11:01:03 +08005353) URI argument handling. Libwebsockets parses and protects URI arguments
536like test.html?arg1=1&arg2=2, it decodes %xx uriencoding format and reduces
537path attacks like ../.../../etc/passwd so they cannot go behind the web
538server's /. There is a list of confirmed attacks we're proof against in
539./test-server/attack.sh.
540
541There is a new API lws_hdr_copy_fragment that should be used now to access
542the URI arguments (it returns the fragments length)
543
544 while (lws_hdr_copy_fragment(wsi, buf, sizeof(buf),
545 WSI_TOKEN_HTTP_URI_ARGS, n) > 0) {
546 lwsl_info("URI Arg %d: %s\n", ++n, buf);
547 }
548
549For the example above, calling with n=0 will return "arg1=1" and n=1 "arg2=2".
550All legal uriencodings will have been reduced in those strings.
551
552lws_hdr_copy_fragment() returns the length of the x=y fragment, so it's also
553possible to deal with arguments containing %00. If you don't care about that,
554the returned string has '\0' appended to simplify processing.
555
Andy Green4e442b72015-12-10 07:58:58 +0800556
Andy Green6d417202015-12-04 10:39:23 +0800557User api changes
558----------------
559
Andy Green1a366bf2015-12-14 07:02:51 +08005601) Three APIS
561
562 - lws_callback_on_writable_all_protocol(const struct lws_protocols *protocol)
563 - lws_callback_all_protocol(const struct lws_protocols *protocol)
564 - lws_rx_flow_allow_all_protocol(lws_rx_flow_allow_all_protocol)
565
566Now take an additional pointer to the lws_context in their first argument.
567
568The reason for this change is struct lws_protocols has been changed to remove
569members that lws used for private storage: so the protocols struct in now
570truly const and may be reused serially or simultaneously by different contexts.
571
Andy Green11c05bf2015-12-16 18:19:08 +08005722) Eleven APIs
573
574LWS_VISIBLE LWS_EXTERN int
575lws_add_http_header_by_name(struct lws_context *context,
576 struct lws *wsi,
577 const unsigned char *name,
578 const unsigned char *value,
579 int length,
580 unsigned char **p,
581 unsigned char *end);
582LWS_VISIBLE LWS_EXTERN int
583lws_finalize_http_header(struct lws_context *context,
584 struct lws *wsi,
585 unsigned char **p,
586 unsigned char *end);
587LWS_VISIBLE LWS_EXTERN int
588lws_add_http_header_by_token(struct lws_context *context,
589 struct lws *wsi,
590 enum lws_token_indexes token,
591 const unsigned char *value,
592 int length,
593 unsigned char **p,
594 unsigned char *end);
595LWS_VISIBLE LWS_EXTERN int
596lws_add_http_header_content_length(struct lws_context *context,
597 struct lws *wsi,
598 unsigned long content_length,
599 unsigned char **p,
600 unsigned char *end);
601LWS_VISIBLE LWS_EXTERN int
602lws_add_http_header_status(struct lws_context *context, struct lws *wsi,
603 unsigned int code, unsigned char **p,
604 unsigned char *end);
605
606LWS_VISIBLE LWS_EXTERN int
607lws_serve_http_file(struct lws_context *context, struct lws *wsi,
608 const char *file, const char *content_type,
609 const char *other_headers, int other_headers_len);
610LWS_VISIBLE LWS_EXTERN int
611lws_serve_http_file_fragment(struct lws_context *context, struct lws *wsi);
612
613LWS_VISIBLE LWS_EXTERN int
614lws_return_http_status(struct lws_context *context, struct lws *wsi,
615 unsigned int code, const char *html_body);
616
617LWS_VISIBLE LWS_EXTERN int
618lws_callback_on_writable(const struct lws_context *context, struct lws *wsi);
619
620LWS_VISIBLE LWS_EXTERN void
621lws_get_peer_addresses(struct lws_context *context, struct lws *wsi,
622 lws_sockfd_type fd, char *name, int name_len,
623 char *rip, int rip_len);
624
625LWS_VISIBLE LWS_EXTERN int
626lws_read(struct lws_context *context, struct lws *wsi,
627 unsigned char *buf, size_t len);
628
629no longer require their initial struct lws_context * parameter.
630
6313) Several older apis start with libwebsocket_ or libwebsockets_ while newer ones
Andy Green6d417202015-12-04 10:39:23 +0800632all begin lws_. These apis have been changed to all begin with lws_.
633
Andy Green11c05bf2015-12-16 18:19:08 +0800634To convert, search-replace
Andy Green6d417202015-12-04 10:39:23 +0800635
Andy Green11c05bf2015-12-16 18:19:08 +0800636 - libwebsockets_/lws_
637 - libwebsocket_/lws_
638 - struct\ libwebsocket/struct\ lws
Andy Green00c6d152015-12-17 07:54:44 +0800639
6404) context parameter removed from user callback.
641
642Since almost all apis no longer need the context as a parameter, it's no longer
643provided at the user callback directly.
644
645However if you need it, for ALL callbacks wsi is valid and has a valid context
Andy Green6d645392015-12-17 18:25:25 +0800646pointer you can recover using lws_get_context(wsi).
Andy Green6d417202015-12-04 10:39:23 +0800647
648
Andy Greenab620ff2015-10-28 08:39:09 +0800649v1.5-chrome47-firefox41
650=======================
MGadkari020c53c2015-08-21 16:15:36 +0530651
652User api changes
653----------------
654
655LWS_CALLBACK_CLIENT_CONNECTION_ERROR may provide an error string if in is
656non-NULL. If so, the string has length len.
657
Andy Green6d59f592015-10-15 09:12:58 +0800658LWS_SERVER_OPTION_PEER_CERT_NOT_REQUIRED is available to relax the requirement
659for peer certs if you are using the option to require client certs.
660
Andy Green4c79ee72015-10-15 11:20:40 +0800661LWS_WITHOUT_BUILTIN_SHA1 cmake option forces lws to use SHA1() defined
662externally, eg, byOpenSSL, and disables build of libwebsockets_SHA1()
663
664
Andy Green16fb0132015-03-28 11:35:40 +0800665v1.4-chrome43-firefox36
666=======================
Olehfaeac3c2014-07-29 23:18:41 +0800667
668User api additions
669------------------
670
671There's a new member in the info struct used to control context creation,
672ssl_private_key_password, which allows passing into lws the passphrase on
673an SSL cetificate
674
Andy Greeneabed8d2014-08-11 12:11:36 +0800675There's a new member in struct protocols, id, which is ignored by lws but can
676be used by the user code to mark the selected protocol by user-defined version
677or capabliity flag information, for the case multiple versions of a protocol are
678supported.
679
Andy Greenb128ccc2014-08-16 09:54:27 +0800680int lws_is_ssl(wsi) added to allow user code to know if the connection was made
681over ssl or not. If LWS_SERVER_OPTION_ALLOW_NON_SSL_ON_SSL_PORT is used, both
682ssl and non-ssl connections are possible and may need to be treated differently
683in the user code.
684
Andy Green14425ea2014-08-18 22:49:39 +0800685int lws_partial_buffered(wsi) added... should be checked after any
686libwebsocket_write that will be followed by another libwebsocket_write inside
687the same writeable callback. If set, you can't do any more writes until the
688writeable callback is called again. If you only do one write per writeable callback,
689you can ignore this.
690
Andy Green917f43a2014-10-12 14:31:47 +0800691HTTP2-related: HTTP2 changes how headers are handled, lws now has new version-
692agnositic header creation APIs. These do the right thing depending on each
693connection's HTTP version without the user code having to know or care, except
694to make sure to use the new APIs for headers (test-server is updated to use
695them already, so look there for examples)
696
697The APIs "render" the headers into a user-provided buffer and bump *p as it
698is used. If *p reaches end, then the APIs return nonzero for error.
699
700LWS_VISIBLE LWS_EXTERN int
701lws_add_http_header_status(struct libwebsocket_context *context,
702 struct libwebsocket *wsi,
703 unsigned int code,
704 unsigned char **p,
705 unsigned char *end);
706
707Start a response header reporting status like 200, 500, etc
708
709LWS_VISIBLE LWS_EXTERN int
710lws_add_http_header_by_name(struct libwebsocket_context *context,
711 struct libwebsocket *wsi,
712 const unsigned char *name,
713 const unsigned char *value,
714 int length,
715 unsigned char **p,
716 unsigned char *end);
717
718Add a header like name: value in HTTP1.x
719
720LWS_VISIBLE LWS_EXTERN int
721lws_finalize_http_header(struct libwebsocket_context *context,
722 struct libwebsocket *wsi,
723 unsigned char **p,
724 unsigned char *end);
725
726Finish off the headers, like add the extra \r\n in HTTP1.x
727
728LWS_VISIBLE LWS_EXTERN int
729lws_add_http_header_by_token(struct libwebsocket_context *context,
730 struct libwebsocket *wsi,
731 enum lws_token_indexes token,
732 const unsigned char *value,
733 int length,
734 unsigned char **p,
735 unsigned char *end);
736
737Add a header by using a lws token as the name part. In HTTP2, this can be
738compressed to one or two bytes.
739
Olehfaeac3c2014-07-29 23:18:41 +0800740
Andy Green822241c2014-08-18 22:21:51 +0800741User api removal
742----------------
743
744protocols struct member no_buffer_all_partial_tx is removed. Under some
Peter Pentchevbb085da2015-12-03 15:55:11 +0200745conditions like rewriting extension such as compression in use, the built-in
Andy Green822241c2014-08-18 22:21:51 +0800746partial send buffering is the only way to deal with the problem, so turning
747it off is deprecated.
748
749
Andy Green917f43a2014-10-12 14:31:47 +0800750User api changes
751----------------
752
753HTTP2-related: API libwebsockets_serve_http_file() takes an extra parameter at
754the end now
755
756int other_headers_len)
757
758If you are providing other headers, they must be generated using the new
759HTTP-version-agnostic APIs, and you must provide the length of them using this
760additional parameter.
761
joseph.urciuoli4d9c8fc2014-10-16 08:53:19 +0800762struct lws_context_creation_info now has an additional member
763SSL_CTX *provided_client_ssl_ctx you may set to an externally-initialized
764SSL_CTX managed outside lws. Defaulting to zero keeps the existing behaviour of
765lws managing the context, if you memset the struct to 0 or have as a filescope
766initialized struct in bss, no need to change anything.
767
Andy Green822241c2014-08-18 22:21:51 +0800768
Andy Greenc1fdd102014-07-06 09:56:11 +0800769v1.3-chrome37-firefox30
770=======================
771
772 .gitignore | 1 -
773 CMakeLists.txt | 447 +++--
774 README.build | 35 +-
775 README.coding | 14 +
776 changelog | 66 +
777 cmake/LibwebsocketsConfig.cmake.in | 17 +
778 cmake/LibwebsocketsConfigVersion.cmake.in | 11 +
779 config.h.cmake | 18 +
780 cross-ming.cmake | 31 +
781 cross-openwrt-makefile | 91 +
782 lib/client-handshake.c | 205 ++-
783 lib/client-parser.c | 58 +-
784 lib/client.c | 158 +-
785 lib/context.c | 341 ++++
786 lib/extension-deflate-frame.c | 2 +-
787 lib/extension.c | 178 ++
788 lib/handshake.c | 287 +---
789 lib/lextable.h | 338 ++++
790 lib/libev.c | 175 ++
791 lib/libwebsockets.c | 2089 +++--------------------
792 lib/libwebsockets.h | 253 ++-
793 lib/lws-plat-unix.c | 404 +++++
794 lib/lws-plat-win.c | 358 ++++
795 lib/minilex.c | 530 +++---
796 lib/output.c | 445 ++---
797 lib/parsers.c | 682 ++++----
798 lib/pollfd.c | 239 +++
799 lib/private-libwebsockets.h | 501 +++++-
800 lib/server-handshake.c | 274 +--
801 lib/server.c | 858 ++++++++--
802 lib/service.c | 517 ++++++
803 lib/sha-1.c | 38 +-
804 lib/ssl-http2.c | 78 +
805 lib/ssl.c | 571 +++++++
806 test-server/attack.sh | 101 +-
807 test-server/test-client.c | 9 +-
808 test-server/test-echo.c | 17 +-
809 test-server/test-fraggle.c | 7 -
810 test-server/test-ping.c | 12 +-
811 test-server/test-server.c | 330 ++--
812 test-server/test.html | 4 +-
813 win32port/client/client.vcxproj | 259 ---
814 win32port/client/client.vcxproj.filters | 39 -
815 .../libwebsocketswin32.vcxproj.filters | 93 -
816 win32port/server/server.vcxproj | 276 ---
817 win32port/server/server.vcxproj.filters | 51 -
818 win32port/win32helpers/gettimeofday.h | 59 +-
819 win32port/win32helpers/netdb.h | 1 -
820 win32port/win32helpers/strings.h | 0
821 win32port/win32helpers/sys/time.h | 1 -
822 win32port/win32helpers/unistd.h | 0
823 win32port/win32helpers/websock-w32.c | 104 --
824 win32port/win32helpers/websock-w32.h | 62 -
825 win32port/win32port.sln | 100 --
826 win32port/zlib/gzio.c | 3 +-
827 55 files changed, 6779 insertions(+), 5059 deletions(-)
828
Andy Green79002562013-11-09 11:04:35 +0800829
kapejodce64fb02013-11-19 13:38:16 +0100830User api additions
831------------------
832
833POST method is supported
834
835The protocol 0 / HTTP callback can now get two new kinds of callback,
836LWS_CALLBACK_HTTP_BODY (in and len are a chunk of the body of the HTTP request)
837and LWS_CALLBACK_HTTP_BODY_COMPLETION (the expected amount of body has arrived
838and been passed to the user code already). These callbacks are used with the
839post method (see the test server for details).
840
841The period between the HTTP header completion and the completion of the body
842processing is protected by a 5s timeout.
843
844The chunks are stored in a malloc'd buffer of size protocols[0].rx_buffer_size.
845
846
James Devine5b34c972013-12-14 11:41:29 +0800847New server option you can enable from user code
848LWS_SERVER_OPTION_ALLOW_NON_SSL_ON_SSL_PORT allows non-SSL connections to
849also be accepted on an SSL listening port. It's disabled unless you enable
850it explicitly.
851
852
Andy Green7a132792013-12-18 09:48:26 +0800853Two new callbacks are added in protocols[0] that are optional for allowing
854limited thread access to libwebsockets, LWS_CALLBACK_LOCK_POLL and
855LWS_CALLBACK_UNLOCK_POLL.
856
857If you use them, they protect internal and external poll list changes, but if
858you want to use external thread access to libwebsocket_callback_on_writable()
859you have to implement your locking here even if you don't use external
860poll support.
861
862If you will use another thread for this, take a lot of care about managing
863your list of live wsi by doing it from ESTABLISHED and CLOSED callbacks
864(with your own locking).
865
Andrew Canaday9769f4f2014-03-23 13:25:07 +0800866If you configure cmake with -DLWS_WITH_LIBEV=1 then the code allowing the libev
867eventloop instead of the default poll() one will also be compiled in. But to
868use it, you must also set the LWS_SERVER_OPTION_LIBEV flag on the context
869creation info struct options member.
Andy Green7a132792013-12-18 09:48:26 +0800870
Andy Greenc1fdd102014-07-06 09:56:11 +0800871IPV6 is supported and enabled by default except for Windows, you can disable
872the support at build-time by giving -DLWS_IPV6=, and disable use of it even if
James Devine3f13ea22014-03-24 16:09:25 +0800873compiled in by making sure the flag LWS_SERVER_OPTION_DISABLE_IPV6 is set on
874the context creation info struct options member.
875
Andy Greenc1fdd102014-07-06 09:56:11 +0800876You can give LWS_SERVER_OPTION_DISABLE_OS_CA_CERTS option flag to
877guarantee the OS CAs will not be used, even if that support was selected at
878build-time.
879
880Optional "token limits" may be enforced by setting the member "token_limits"
881in struct lws_context_creation_info to point to a struct lws_token_limits.
882NULL means no token limits used for compatibility.
883
Andy Green7a132792013-12-18 09:48:26 +0800884
Andy Green79002562013-11-09 11:04:35 +0800885User api changes
886----------------
887
888Extra optional argument to libwebsockets_serve_http_file() allows injecion
889of HTTP headers into the canned response. Eg, cookies may be added like
890that without getting involved in having to send the header by hand.
891
Patrick Gansterer148b9452014-02-28 02:31:23 +0100892A new info member http_proxy_address may be used at context creation time to
893set the http proxy. If non-NULL, it overrides http_proxy environment var.
Andy Green79002562013-11-09 11:04:35 +0800894
Andy Greend2ec7ad2014-03-15 10:39:29 +0800895Cmake supports LWS_SSL_CLIENT_USE_OS_CA_CERTS defaulting to on, which gets
896the client to use the OS CA Roots. If you're worried somebody with the
897ability to forge for force creation of a client cert from the root CA in
898your OS, you should disable this since your selfsigned $0 cert is a lot safer
899then...
900
Andy Green79002562013-11-09 11:04:35 +0800901
Andy Green81877e62013-10-26 20:36:08 +0800902v1.23-chrome32-firefox24
903========================
904
905 Android.mk | 29 +
906 CMakeLists.txt | 573 ++++++++----
907 COPYING | 503 -----------
908 INSTALL | 365 --------
909 Makefile.am | 13 -
910 README.build | 371 ++------
911 README.coding | 63 ++
912 autogen.sh | 1578 ---------------------------------
913 changelog | 69 ++
914 cmake/FindGit.cmake | 163 ++++
915 cmake/FindOpenSSLbins.cmake | 15 +-
916 cmake/UseRPMTools.cmake | 176 ++++
917 config.h.cmake | 25 +-
918 configure.ac | 226 -----
919 cross-arm-linux-gnueabihf.cmake | 28 +
920 lib/Makefile.am | 89 --
921 lib/base64-decode.c | 98 +-
922 lib/client-handshake.c | 123 ++-
923 lib/client-parser.c | 19 +-
924 lib/client.c | 145 ++-
925 lib/daemonize.c | 4 +-
926 lib/extension.c | 2 +-
927 lib/getifaddrs.h | 4 +-
928 lib/handshake.c | 76 +-
929 lib/libwebsockets.c | 491 ++++++----
930 lib/libwebsockets.h | 164 ++--
931 lib/output.c | 214 ++++-
932 lib/parsers.c | 102 +--
933 lib/private-libwebsockets.h | 66 +-
934 lib/server-handshake.c | 5 +-
935 lib/server.c | 29 +-
936 lib/sha-1.c | 2 +-
937 libwebsockets-api-doc.html | 249 +++---
938 libwebsockets.pc.in | 11 -
939 libwebsockets.spec | 14 +-
940 m4/ignore-me | 2 -
941 scripts/FindLibWebSockets.cmake | 33 +
942 scripts/kernel-doc | 1 +
943 test-server/Makefile.am | 131 ---
944 test-server/leaf.jpg | Bin 0 -> 2477518 bytes
945 test-server/test-client.c | 78 +-
946 test-server/test-echo.c | 33 +-
947 test-server/test-fraggle.c | 26 +-
948 test-server/test-ping.c | 15 +-
949 test-server/test-server.c | 197 +++-
950 test-server/test.html | 5 +-
951 win32port/win32helpers/gettimeofday.c | 74 +-
952 win32port/win32helpers/websock-w32.h | 6 +-
953 48 files changed, 2493 insertions(+), 4212 deletions(-)
954
Andy Green54cb3462013-02-14 22:23:54 +0800955
956User api additions
957------------------
958
959 - You can now call libwebsocket_callback_on_writable() on http connectons,
960 and get a LWS_CALLBACK_HTTP_WRITEABLE callback, the same way you can
961 regulate writes with a websocket protocol connection.
962
Andy Green2672fb22013-02-22 09:54:35 +0800963 - A new member in the context creation parameter struct "ssl_cipher_list" is
964 added, replacing CIPHERS_LIST_STRING. NULL means use the ssl library
965 default list of ciphers.
966
Andy Green58f214e2013-03-09 13:03:53 +0800967 - Not really an api addition, but libwebsocket_service_fd() will now zero
968 the revents field of the pollfd it was called with if it handled the
969 descriptor. So you can tell if it is a non-lws fd by checking revents
970 after the service call... if it's still nonzero, the descriptor
971 belongs to you and you need to take care of it.
972
Andy Greenb55451c2013-03-16 12:32:27 +0800973 - libwebsocket_rx_flow_allow_all_protocol(protocol) will unthrottle all
974 connections with the established protocol. It's designed to be
975 called from user server code when it sees it can accept more input
976 and may have throttled connections using the server rx flow apis
977 while it was unable to accept any other input The user server code
978 then does not have to try to track while connections it choked, this
979 will free up all of them in one call.
980
Andy Green0c9563b2013-06-10 22:54:40 +0800981 - there's a new, optional callback LWS_CALLBACK_CLOSED_HTTP which gets
982 called when an HTTP protocol socket closes
983
Andy Green96d48fd2013-09-18 08:32:55 +0800984 - for LWS_CALLBACK_FILTER_PROTOCOL_CONNECTION callback, the user_space alloc
985 has already been done before the callback happens. That means we can
986 use the user parameter to the callback to contain the user pointer, and
987 move the protocol name to the "in" parameter. The docs for this
988 callback are also updated to reflect how to check headers in there.
989
Andy Green5dc62ea2013-09-20 20:26:12 +0800990 - libwebsocket_client_connect() is now properly nonblocking and async. See
991 README.coding and test-client.c for information on the callbacks you
992 can rely on controlling the async connection period with.
993
Andy Green81877e62013-10-26 20:36:08 +0800994 - if your OS does not support the http_proxy environment variable convention
995 (eg, reportedly OSX), you can use a new api libwebsocket_set_proxy()
Peter Pentchevbb085da2015-12-03 15:55:11 +0200996 to set the proxy details in between context creation and the connection
Andy Green81877e62013-10-26 20:36:08 +0800997 action. For OSes that support http_proxy, that's used automatically.
Andy Greenb55451c2013-03-16 12:32:27 +0800998
Andy Green50097dd2013-02-15 22:36:30 +0800999User api changes
1000----------------
1001
1002 - the external poll callbacks now get the socket descriptor coming from the
1003 "in" parameter. The user parameter provides the user_space for the
1004 wsi as it normally does on the other callbacks.
Edwin van den Oetelaar8c8a8e12013-02-20 20:56:59 +08001005 LWS_CALLBACK_FILTER_NETWORK_CONNECTION also has the socket descriptor
1006 delivered by @in now instead of @user.
Andy Green50097dd2013-02-15 22:36:30 +08001007
Andy Greenfc7c5e42013-02-23 10:50:10 +08001008 - libwebsocket_write() now returns -1 for error, or the amount of data
1009 actually accepted for send. Under load, the OS may signal it is
1010 ready to send new data on the socket, but have only a restricted
1011 amount of memory to buffer the packet compared to usual.
1012
Andy Green50097dd2013-02-15 22:36:30 +08001013
Andy Greendc914cf2013-02-18 16:54:26 +08001014User api removal
1015----------------
1016
1017 - libwebsocket_ensure_user_space() is removed from the public api, if you
1018 were using it to get user_space, you need to adapt your code to only
1019 use user_space inside the user callback.
1020
Andy Green2672fb22013-02-22 09:54:35 +08001021 - CIPHERS_LIST_STRING is removed
1022
Andy Green0097a992013-03-09 13:06:37 +08001023 - autotools build has been removed. See README.build for info on how to
1024 use CMake for your platform
1025
Andy Green54cb3462013-02-14 22:23:54 +08001026
Andy Green53a46782013-02-14 11:23:49 +08001027v1.21-chrome26-firefox18
1028========================
1029
1030 - Fixes buffer overflow bug in max frame size handling if you used the
1031 default protocol buffer size. If you declared rx_buffer_size in your
1032 protocol, which is recommended anyway, your code was unaffected.
1033
Andy Green182cb9a2013-02-13 11:54:08 +08001034v1.2-chrome26-firefox18
1035=======================
1036
1037Diffstat
1038--------
1039
1040 .gitignore | 16 +++
1041 CMakeLists.txt | 544 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1042 LICENSE | 526 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1043 Makefile.am | 1 +
1044 README | 20 +++
1045 README.build | 258 ++++++++++++++++++++++++++++++++-----
1046 README.coding | 52 ++++++++
1047 changelog | 136 ++++++++++++++++++++
1048 cmake/FindOpenSSLbins.cmake | 33 +++++
1049 config.h.cmake | 173 +++++++++++++++++++++++++
1050 configure.ac | 22 +++-
1051 lib/Makefile.am | 20 ++-
1052 lib/base64-decode.c | 2 +-
1053 lib/client-handshake.c | 190 +++++++++++-----------------
1054 lib/client-parser.c | 88 +++++++------
1055 lib/client.c | 384 ++++++++++++++++++++++++++++++-------------------------
1056 lib/daemonize.c | 32 +++--
1057 lib/extension-deflate-frame.c | 58 +++++----
1058 lib/extension-deflate-stream.c | 19 ++-
1059 lib/extension-deflate-stream.h | 4 +-
1060 lib/extension.c | 11 +-
1061 lib/getifaddrs.c | 315 +++++++++++++++++++++++-----------------------
1062 lib/getifaddrs.h | 30 ++---
1063 lib/handshake.c | 124 +++++++++++-------
1064 lib/libwebsockets.c | 736 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------
1065 lib/libwebsockets.h | 237 ++++++++++++++++++++++------------
1066 lib/output.c | 192 +++++++++++-----------------
1067 lib/parsers.c | 966 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------------------------------------
1068 lib/private-libwebsockets.h | 225 +++++++++++++++++++++------------
1069 lib/server-handshake.c | 82 ++++++------
1070 lib/server.c | 96 +++++++-------
1071 libwebsockets-api-doc.html | 189 ++++++++++++++++++----------
1072 libwebsockets.spec | 17 +--
1073 test-server/attack.sh | 148 ++++++++++++++++++++++
1074 test-server/test-client.c | 125 +++++++++---------
1075 test-server/test-echo.c | 31 +++--
1076 test-server/test-fraggle.c | 32 ++---
1077 test-server/test-ping.c | 52 ++++----
1078 test-server/test-server.c | 129 ++++++++++++-------
1079 win32port/libwebsocketswin32/libwebsocketswin32.vcxproj | 279 ----------------------------------------
1080 win32port/libwebsocketswin32/libwebsocketswin32.vcxproj.filters | 23 +++-
1081 41 files changed, 4398 insertions(+), 2219 deletions(-)
1082
Andy Green7b405452013-02-01 10:50:15 +08001083
1084User api additions
1085------------------
1086
1087 - lws_get_library_version() returns a const char * with a string like
1088 "1.1 9e7f737", representing the library version from configure.ac
1089 and the git HEAD hash the library was built from
1090
Andy Greena47865f2013-02-10 09:39:47 +08001091 - TCP Keepalive can now optionally be applied to all lws sockets, on Linux
1092 also with controllable timeout, number of probes and probe interval.
1093 (On BSD type OS, you can only use system default settings for the
1094 timing and retries, although enabling it is supported by setting
1095 ka_time to nonzero, the exact value has no meaning.)
1096 This enables detection of idle connections which are logically okay,
1097 but are in fact dead, due to network connectivity issues at the server,
Andy Greena690cd02013-02-09 12:25:31 +08001098 client, or any intermediary. By default it's not enabled, but you
1099 can enable it by setting a non-zero timeout (in seconds) at the new
1100 ka_time member at context creation time.
1101
Andy Greena7109e62013-02-11 12:05:54 +08001102 - Two new optional user callbacks added, LWS_CALLBACK_PROTOCOL_DESTROY which
1103 is called one-time per protocol as the context is being destroyed, and
1104 LWS_CALLBACK_PROTOCOL_INIT which is called when the context is created
1105 and the protocols are added, again it's a one-time affair.
1106 This lets you manage per-protocol allocations properly including
1107 cleaning up after yourself when the server goes down.
Andy Green7b405452013-02-01 10:50:15 +08001108
Andy Greened334462013-02-07 21:14:33 +08001109User api changes
1110----------------
1111
Andy Green1b265272013-02-09 14:01:09 +08001112 - libwebsocket_create_context() has changed from taking a ton of parameters
1113 to just taking a pointer to a struct containing the parameters. The
1114 struct lws_context_creation_info is in libwebsockets.h, the members
1115 are in the same order as when they were parameters to the call
1116 previously. The test apps are all updated accordingly so you can
1117 see example code there.
1118
Andy Greened334462013-02-07 21:14:33 +08001119 - Header tokens are now deleted after the websocket connection is
Andy Green54495112013-02-06 21:10:16 +09001120 established. Not just the header data is saved, but the pointer and
1121 length array is also removed from (union) scope saving several hundred
1122 bytes per connection once it is established
1123
1124 - struct libwebsocket_protocols has a new member rx_buffer_size, this
1125 controls rx buffer size per connection of that protocol now. Sources
1126 for apps built against older versions of the library won't declare
1127 this in their protocols, defaulting it to 0. Zero buffer is legal,
1128 it causes a default buffer to be allocated (currently 4096)
1129
1130 If you want to receive only atomic frames in your user callback, you
1131 should set this to greater than your largest frame size. If a frame
1132 comes that exceeds that, no error occurs but the callback happens as
1133 soon as the buffer limit is reached, and again if it is reached again
1134 or the frame completes. You can detect that has happened by seeing
1135 there is still frame content pending using
1136 libwebsockets_remaining_packet_payload()
1137
1138 By correctly setting this, you can save a lot of memory when your
1139 protocol has small frames (see the test server and client sources).
1140
Andy Green16ab3182013-02-10 18:02:31 +08001141 - LWS_MAX_HEADER_LEN now defaults to 1024 and is the total amount of known
1142 header payload lws can cope with, that includes the GET URL, origin
1143 etc. Headers not understood by lws are ignored and their payload
1144 not included in this.
1145
Andy Green54495112013-02-06 21:10:16 +09001146
1147User api removals
1148-----------------
1149
Andy Green16ab3182013-02-10 18:02:31 +08001150 - The configuration-time option MAX_USER_RX_BUFFER has been replaced by a
1151 buffer size chosen per-protocol. For compatibility, there's a default
1152 of 4096 rx buffer, but user code should set the appropriate size for
1153 the protocol frames.
1154
1155 - LWS_INITIAL_HDR_ALLOC and LWS_ADDITIONAL_HDR_ALLOC are no longer needed
1156 and have been removed. There's a new header management scheme that
1157 handles them in a much more compact way.
Andy Greened334462013-02-07 21:14:33 +08001158
Andy Green70edd6f2013-02-12 10:15:25 +08001159 - libwebsockets_hangup_on_client() is removed. If you want to close the
1160 connection you must do so from the user callback and by returning
1161 -1 from there.
1162
Andy Green508946c2013-02-12 10:19:08 +08001163 - libwebsocket_close_and_free_session() is now private to the library code
1164 only and not exposed for user code. If you want to close the
1165 connection, you must do so from the user callback by returning -1
1166 from there.
1167
Andy Greened334462013-02-07 21:14:33 +08001168
Andy Greendf60b0c2013-02-06 19:57:12 +09001169New features
1170------------
1171
Andy Green9b09dc02013-02-08 12:48:36 +08001172 - Cmake project file added, aimed initially at Windows support: this replaces
Andy Green16ab3182013-02-10 18:02:31 +08001173 the visual studio project files that were in the tree until now.
Andy Greendf60b0c2013-02-06 19:57:12 +09001174
Andy Greenc3ef0d62013-02-12 10:50:49 +08001175 - CyaSSL now supported in place of OpenSSL (--use-cyassl on configure)
1176
Andy Green9b09dc02013-02-08 12:48:36 +08001177 - PATH_MAX or MAX_PATH no longer needed
Andy Greendf60b0c2013-02-06 19:57:12 +09001178
Andy Green54495112013-02-06 21:10:16 +09001179 - cutomizable frame rx buffer size by protocol
1180
Andy Greenc3ef0d62013-02-12 10:50:49 +08001181 - optional TCP keepalive so dead peers can be detected, can be enabled at
1182 context-creation time
1183
1184 - valgrind-clean: no SSL or CyaSSL: completely clean. With OpenSSL, 88 bytes
1185 lost at OpenSSL library init and symptomless reports of uninitialized
1186 memory usage... seems to be a known and ignored problem at OpenSSL
1187
Andy Greena3957ef2013-02-11 09:31:43 +08001188 - By default debug is enabled and the library is built for -O0 -g to faclitate
1189 that. Use --disable-debug configure option to build instead with -O4
1190 and no -g (debug info), obviously providing best performance and
1191 reduced binary size.
Andy Green7b405452013-02-01 10:50:15 +08001192
Andy Green895d56d2013-02-11 09:32:53 +08001193 - 1.0 introduced some code to try to not deflate small frames, however this
1194 seems to break when confronted with a mixture of frames above and
1195 below the threshold, so it's removed. Veto the compression extension
1196 in your user callback if you will typically have very small frames.
1197
Andy Green16ab3182013-02-10 18:02:31 +08001198 - There are many memory usage improvements, both a reduction in malloc/
1199 realloc and architectural changes. A websocket connection now
1200 consumes only 296 bytes with SSL or 272 bytes without on x86_64,
1201 during header processing an additional 1262 bytes is allocated in a
1202 single malloc, but is freed when the websocket connection starts.
1203 The RX frame buffer defined by the protocol in user
1204 code is also allocated per connection, this represents the largest
1205 frame you can receive atomically in that protocol.
1206
Andy Greenc3ef0d62013-02-12 10:50:49 +08001207 - On ARM9 build, just http+ws server no extensions or ssl, <12Kbytes .text
1208 and 112 bytes per connection (+1328 only during header processing)
1209
Andy Green895d56d2013-02-11 09:32:53 +08001210
Andy Greenbd1132f2013-01-31 19:53:05 +08001211v1.1-chrome26-firefox18
Andy Greena35c86f2013-01-31 10:16:44 +08001212=======================
1213
1214Diffstat
1215--------
1216
1217 Makefile.am | 4 +
1218 README-test-server | 291 ---
1219 README.build | 239 ++
1220 README.coding | 138 ++
1221 README.rst | 72 -
1222 README.test-apps | 272 +++
1223 configure.ac | 116 +-
1224 lib/Makefile.am | 55 +-
1225 lib/base64-decode.c | 5 +-
1226 lib/client-handshake.c | 121 +-
1227 lib/client-parser.c | 394 ++++
1228 lib/client.c | 807 +++++++
1229 lib/daemonize.c | 212 ++
1230 lib/extension-deflate-frame.c | 132 +-
1231 lib/extension-deflate-stream.c | 12 +-
1232 lib/extension-x-google-mux.c | 1223 ----------
1233 lib/extension-x-google-mux.h | 96 -
1234 lib/extension.c | 8 -
1235 lib/getifaddrs.c | 271 +++
1236 lib/getifaddrs.h | 76 +
1237 lib/handshake.c | 582 +----
1238 lib/libwebsockets.c | 2493 ++++++---------------
1239 lib/libwebsockets.h | 115 +-
1240 lib/md5.c | 217 --
1241 lib/minilex.c | 440 ++++
1242 lib/output.c | 628 ++++++
1243 lib/parsers.c | 2016 +++++------------
1244 lib/private-libwebsockets.h | 284 +--
1245 lib/server-handshake.c | 275 +++
1246 lib/server.c | 377 ++++
1247 libwebsockets-api-doc.html | 300 +--
1248 m4/ignore-me | 2 +
1249 test-server/Makefile.am | 111 +-
1250 test-server/libwebsockets.org-logo.png | Bin 0 -> 7029 bytes
1251 test-server/test-client.c | 45 +-
1252 test-server/test-echo.c | 330 +++
1253 test-server/test-fraggle.c | 20 +-
1254 test-server/test-ping.c | 22 +-
1255 test-server/test-server-extpoll.c | 554 -----
1256 test-server/test-server.c | 349 ++-
1257 test-server/test.html | 3 +-
1258 win32port/zlib/ZLib.vcxproj | 749 ++++---
1259 win32port/zlib/ZLib.vcxproj.filters | 188 +-
1260 win32port/zlib/adler32.c | 348 ++-
1261 win32port/zlib/compress.c | 160 +-
1262 win32port/zlib/crc32.c | 867 ++++----
1263 win32port/zlib/crc32.h | 882 ++++----
1264 win32port/zlib/deflate.c | 3799 +++++++++++++++-----------------
1265 win32port/zlib/deflate.h | 688 +++---
1266 win32port/zlib/gzclose.c | 50 +-
1267 win32port/zlib/gzguts.h | 325 ++-
1268 win32port/zlib/gzlib.c | 1157 +++++-----
1269 win32port/zlib/gzread.c | 1242 ++++++-----
1270 win32port/zlib/gzwrite.c | 1096 +++++----
1271 win32port/zlib/infback.c | 1272 ++++++-----
1272 win32port/zlib/inffast.c | 680 +++---
1273 win32port/zlib/inffast.h | 22 +-
1274 win32port/zlib/inffixed.h | 188 +-
1275 win32port/zlib/inflate.c | 2976 +++++++++++++------------
1276 win32port/zlib/inflate.h | 244 +-
1277 win32port/zlib/inftrees.c | 636 +++---
1278 win32port/zlib/inftrees.h | 124 +-
1279 win32port/zlib/trees.c | 2468 +++++++++++----------
1280 win32port/zlib/trees.h | 256 +--
1281 win32port/zlib/uncompr.c | 118 +-
1282 win32port/zlib/zconf.h | 934 ++++----
1283 win32port/zlib/zlib.h | 3357 ++++++++++++++--------------
1284 win32port/zlib/zutil.c | 642 +++---
1285 win32port/zlib/zutil.h | 526 ++---
1286 69 files changed, 19556 insertions(+), 20145 deletions(-)
1287
1288user api changes
1289----------------
1290
1291 - libwebsockets_serve_http_file() now takes a context as first argument
1292
1293 - libwebsockets_get_peer_addresses() now takes a context and wsi as first
1294 two arguments
1295
1296
1297user api additions
1298------------------
1299
1300 - lwsl_...() logging apis, default to stderr but retargetable by user code;
1301 may be used also by user code
1302
1303 - lws_set_log_level() set which logging apis are able to emit (defaults to
1304 notice, warn, err severities), optionally set the emit callback
1305
1306 - lwsl_emit_syslog() helper callback emits to syslog
1307
1308 - lws_daemonize() helper code that forks the app into a headless daemon
1309 properly, maintains a lock file with pid in suitable for sysvinit etc to
1310 control lifecycle
1311
1312 - LWS_CALLBACK_HTTP_FILE_COMPLETION callback added since http file
1313 transfer is now asynchronous (see test server code)
1314
1315 - lws_frame_is_binary() from a wsi pointer, let you know if the received
1316 data was sent in BINARY mode
1317
1318
1319user api removals
1320-----------------
1321
1322 - libwebsockets_fork_service_loop() - no longer supported (had intractable problems)
1323 arrange your code to act from the user callback instead from same
1324 process context as the service loop
1325
1326 - libwebsockets_broadcast() - use libwebsocket_callback_on_writable[_all_protocol]()
1327 instead from same process context as the service loop. See the test apps
1328 for examples.
1329
1330 - x-google-mux() removed until someone wants it
1331
1332 - pre -v13 (ancient) protocol support removed
1333
1334
1335New features
1336------------
1337
1338 - echo test server and client compatible with echo.websocket.org added
1339
1340 - many new configure options (see README.build) to reduce footprint of the
1341 library to what you actually need, eg, --without-client and
1342 --without-server
1343
1344 - http + websocket server can build to as little as 12K .text for ARM
1345
1346 - no more MAX_CLIENTS limitation; adapts to support the max number of fds
1347 allowed to the process by ulimit, defaults to 1024 on Fedora and
1348 Ubuntu. Use ulimit to control this without needing to configure
1349 the library. Code here is smaller and faster.
1350
1351 - adaptive ratio of listen socket to connection socket service allows
1352 good behaviour under Apache ab test load. Tested with thousands
1353 of simultaneous connections
1354
1355 - reduction in per-connection memory footprint by moving to a union to hold
1356 mutually-exclusive state for the connection
1357
1358 - robustness: Out of Memory taken care of for all allocation code now
1359
1360 - internal getifaddrs option if your toolchain lacks it (some uclibc)
1361
1362 - configurable memory limit for deflate operations
1363
1364 - improvements in SSL code nonblocking operation, possible hang solved,
1365 some SSL operations broken down into pollable states so there is
1366 no library blocking, timeout coverage for SSL_connect
1367
1368 - extpoll test server merged into single test server source
1369
1370 - robustness: library should deal with all recoverable socket conditions
1371
1372 - rx flowcontrol for backpressure notification fixed and implmeneted
1373 correctly in the test server
1374
1375 - optimal lexical parser added for header processing; all headers in a
1376 single 276-byte state table
1377
1378 - latency tracking api added (configure --with-latency)
1379
1380 - Improved in-tree documentation, REAME.build, README.coding,
1381 README.test-apps, changelog
1382
1383 - Many small fixes
1384
1385
1386v1.0-chrome25-firefox17 (6cd1ea9b005933f)