wt/mongoose
1
0 Fork 0
mirror of https://github.com/cesanta/mongoose.git synced 2026-10-30 12:50:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Made mg_connection::content_len int -> size_t, which is 64-bit on 64-bit systems

Browse Source
This commit is contained in:
Sergey Lyubka committed 2014-01-20 20:57:21 +00:00
1 parent 503a1a749d
commit 976f286134
3 files changed
+5 -5
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

mongoose.c
+2 -2
View File
@@ -2229,7 +2229,7 @@ static void call_uri_handler_if_data_is_buffered(struct connection *conn) {
do { } while (deliver_websocket_frame(conn)); do { } while (deliver_websocket_frame(conn));
} else } else
#endif #endif
if (loc->len >= c->content_len) { if ((size_t) loc->len >= c->content_len) {
call_uri_handler(conn); call_uri_handler(conn);
} }
} }
@@ -3329,7 +3329,7 @@ static void handle_lsp_request(struct connection *conn, const char *path,
prepare_lua_environment(&conn->mg_conn, L); prepare_lua_environment(&conn->mg_conn, L);
lua_pushcclosure(L, &lua_error_handler, 0); lua_pushcclosure(L, &lua_error_handler, 0);
lua_pushglobaltable(L); lua_pushglobaltable(L);
lsp(conn, p, st->st_size, L); lsp(conn, p, (int) st->st_size, L);
close_local_endpoint(conn); close_local_endpoint(conn);
} }
mongoose.h
+1 -1
View File
@@ -46,7 +46,7 @@ struct mg_connection {
} http_headers[30]; } http_headers[30];
char *content; // POST (or websocket message) data, or NULL char *content; // POST (or websocket message) data, or NULL
long int content_len; // content length size_t content_len; // content length
int is_websocket; // Connection is a websocket connection int is_websocket; // Connection is a websocket connection
int status_code; // HTTP status code for HTTP error handler int status_code; // HTTP status code for HTTP error handler
unit_test.c
+2 -2
View File
@@ -440,7 +440,7 @@ static int cb2(struct mg_connection *conn) {
file_name = file1; file_name = file1;
} }
if ((file_data = read_file(file_name, &file_len)) != NULL) { if ((file_data = read_file(file_name, &file_len)) != NULL) {
if (file_len == conn->content_len && if ((size_t) file_len == conn->content_len &&
memcmp(file_data, conn->content, file_len) == 0) { memcmp(file_data, conn->content, file_len) == 0) {
strcat(buf, "d"); strcat(buf, "d");
} else { } else {
@@ -526,7 +526,7 @@ static int us1(struct mg_connection *conn) {
} else if (conn->status_code == MG_DOWNLOAD_SUCCESS) { } else if (conn->status_code == MG_DOWNLOAD_SUCCESS) {
char *file_data = read_file(file_name, &file_size); char *file_data = read_file(file_name, &file_size);
sprintf((char *) conn->connection_param, "%d", sprintf((char *) conn->connection_param, "%d",
file_size == conn->content_len && (size_t) file_size == conn->content_len &&
memcmp(file_data, conn->content, file_size) == 0 ? 1 : 0); memcmp(file_data, conn->content, file_size) == 0 ? 1 : 0);
free(file_data); free(file_data);
} else if (conn->status_code == MG_CONNECT_FAILURE) { } else if (conn->status_code == MG_CONNECT_FAILURE) {