mirror/mongoose
1
0
Fork 0
mirror of https://github.com/cesanta/mongoose.git synced 2024-11-24 02:59:01 +08:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Sync mongoose changes

Browse Source 
PUBLISHED_FROM=8b6ebf46728aca40f916dde88e372b4540ed6ea4
This commit is contained in:
Sergey Lyubka 2019-12-19 11:12:57 +00:00
parent c34f6c54e7
commit 464113c5ae
5 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
examples/cookie_auth/cookie_auth.c
View File

@ -58,11 +58,11 @@ static int check_pass(const char *user, const char *pass) {
* or NULL if not found.
*/
static struct session *get_session(struct http_message *hm) {
struct mg_str *cookie_header = mg_get_http_header(hm, "cookie");
if (cookie_header == NULL) goto clean;
char ssid_buf[21];
char *ssid = ssid_buf;
struct session *ret = NULL;
struct mg_str *cookie_header = mg_get_http_header(hm, "cookie");
if (cookie_header == NULL) goto clean;
if (!mg_http_parse_header2(cookie_header, SESSION_COOKIE_NAME, &ssid,
sizeof(ssid_buf))) {
goto clean;

3
mongoose.c
View File

@ -8526,7 +8526,8 @@ MG_INTERNAL void mg_send_http_file(struct mg_connection *nc, char *path,
#endif
} else if (mg_is_not_modified(hm, &st)) {
/* Note: not using mg_http_send_error in order to keep connection alive */
mg_send_head(nc, 304, 0, NULL);
/* Note: passing extra headers allow users to control session cookies */
mg_send_head(nc, 304, 0, opts->extra_headers);
} else {
mg_http_serve_file2(nc, index_file ? index_file : path, hm, opts);
}

2
mongoose.h
View File

@ -23,7 +23,7 @@
#ifndef CS_MONGOOSE_SRC_COMMON_H_
#define CS_MONGOOSE_SRC_COMMON_H_
#define MG_VERSION "6.15"
#define MG_VERSION "6.16"
/* Local tweaks, applied before any of Mongoose's own headers. */
#ifdef MG_LOCALS

2
src/mg_common.h
View File

@ -20,7 +20,7 @@
#ifndef CS_MONGOOSE_SRC_COMMON_H_
#define CS_MONGOOSE_SRC_COMMON_H_
#define MG_VERSION "6.15"
#define MG_VERSION "6.16"
/* Local tweaks, applied before any of Mongoose's own headers. */
#ifdef MG_LOCALS

3
src/mg_http.c
View File

@ -2692,7 +2692,8 @@ MG_INTERNAL void mg_send_http_file(struct mg_connection *nc, char *path,
#endif
} else if (mg_is_not_modified(hm, &st)) {
/* Note: not using mg_http_send_error in order to keep connection alive */
mg_send_head(nc, 304, 0, NULL);
/* Note: passing extra headers allow users to control session cookies */
mg_send_head(nc, 304, 0, opts->extra_headers);
} else {
mg_http_serve_file2(nc, index_file ? index_file : path, hm, opts);
}