Skip to content

Commit

Permalink
Merge pull request #978 from cesanta/dev
Browse files Browse the repository at this point in the history
Mongoose 6.13
  • Loading branch information
rojer authored Oct 8, 2018
2 parents 777b8e9 + bc56353 commit 95afa32
Show file tree
Hide file tree
Showing 27 changed files with 477 additions and 218 deletions.
2 changes: 1 addition & 1 deletion docs/c-api/mbuf.h/intro.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
title: "Memory Buffers"
title: "mbuf.h"
symbol_kind: "intro"
decl_name: "mbuf.h"
items:
Expand Down
2 changes: 1 addition & 1 deletion docs/c-api/mg_net.h/mg_mgr_free.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ title: "mg_mgr_free()"
decl_name: "mg_mgr_free"
symbol_kind: "func"
signature: |
void mg_mgr_free(struct mg_mgr *);
void mg_mgr_free(struct mg_mgr *mgr);
---

De-initialises Mongoose manager.
Expand Down
4 changes: 2 additions & 2 deletions docs/c-api/mg_net.h/mg_mgr_poll.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ title: "mg_mgr_poll()"
decl_name: "mg_mgr_poll"
symbol_kind: "func"
signature: |
time_t mg_mgr_poll(struct mg_mgr *, int milli);
int mg_mgr_poll(struct mg_mgr *mgr, int milli);
---

This function performs the actual IO and must be called in a loop
(an event loop). It returns the current timestamp.
(an event loop). It returns number of user events generated (except POLLs).
`milli` is the maximum number of milliseconds to sleep.
`mg_mgr_poll()` checks all connections for IO readiness. If at least one
of the connections is IO-ready, `mg_mgr_poll()` triggers the respective
Expand Down
1 change: 1 addition & 0 deletions docs/c-api/mg_net.h/struct_mg_mgr.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ signature: |
#endif
void *user_data; /* User data */
int num_ifaces;
int num_calls;
struct mg_iface **ifaces; /* network interfaces */
const char *nameserver; /* DNS server to use */
};
Expand Down
2 changes: 1 addition & 1 deletion docs/overview/conn-flags.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ flags are meant to be set only by the user event handler to tell Mongoose how to
behave. Below is a list of connection flags that are meant to be set by event
handlers:

* `MG_F_FINISHED_SENDING_DATA` tells Mongoose that all data has been appended
* `MG_F_SEND_AND_CLOSE` tells Mongoose that all data has been appended
to the `send_mbuf`. As soon as Mongoose sends it to the socket, the
connection will be closed.
* `MG_F_BUFFER_BUT_DONT_SEND` tells Mongoose to append data to the `send_mbuf`
Expand Down
Loading

0 comments on commit 95afa32

Please sign in to comment.