lib/libhttp
1
0
Fork 0
mirror of https://github.com/lammertb/libhttp.git synced 2025-12-22 04:02:04 +03:00
Code Activity

Use atomic operation for locking variable and format code

Browse Source
This commit is contained in:
bel
2016-07-14 20:35:26 +02:00
parent 1364711ee6
commit c262166b3f
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/civetweb.c
View File

@@ -10452,7 +10452,8 @@ handle_request(struct mg_connection *conn)
} }
/* 12. Directory uris should end with a slash */ /* 12. Directory uris should end with a slash */
if (file.is_directory && (uri_len>0) && (ri->local_uri[uri_len - 1] != '/')) { if (file.is_directory && (uri_len > 0)
&& (ri->local_uri[uri_len - 1] != '/')) {
gmt_time_string(date, sizeof(date), &curtime); gmt_time_string(date, sizeof(date), &curtime);
mg_printf(conn, mg_printf(conn,
"HTTP/1.1 301 Moved Permanently\r\n" "HTTP/1.1 301 Moved Permanently\r\n"
@@ -11131,6 +11132,7 @@ refresh_trust(struct mg_connection *conn)
{ {
static int reload_lock = 0; static int reload_lock = 0;
static long int data_check = 0; static long int data_check = 0;
volatile int *p_reload_lock = (volatile int *)&reload_lock;
struct stat cert_buf; struct stat cert_buf;
long int t; long int t;
@@ -11172,16 +11174,15 @@ refresh_trust(struct mg_connection *conn)
} }
} }
if (!reload_lock) { if (1 == InterlockedIncrement(p_reload_lock)) {
reload_lock = 1;
if (ssl_use_pem_file(conn->ctx, pem) == 0) { if (ssl_use_pem_file(conn->ctx, pem) == 0) {
return 0; return 0;
} }
reload_lock = 0; *p_reload_lock = 0;
} }
} }
/* lock while cert is reloading */ /* lock while cert is reloading */
while (reload_lock) { while (*p_reload_lock) {
sleep(1); sleep(1);
} }