From b745f22107d7364afb33c16b3d8e5864f01f5a13 Mon Sep 17 00:00:00 2001 From: Thomas Davis Date: Sun, 1 Sep 2013 12:55:53 -0400 Subject: [PATCH] Normallized coding style in a predictable way. Uses astyle program which is freely avaiable on all platforms. --- Makefile | 6 + RELEASE_NOTES.md | 1 + examples/chat/chat.c | 508 +- examples/embedded_c/embedded_c.c | 20 +- examples/embedded_cpp/embedded_cpp.cpp | 20 +- examples/hello/hello.c | 70 +- examples/lua/lua_dll.c | 24 +- examples/post/post.c | 86 +- examples/upload/upload.c | 69 +- examples/websocket/websocket.c | 51 +- include/CivetServer.h | 16 +- include/civetweb.h | 172 +- src/CivetServer.cpp | 170 +- src/civetweb.c | 7976 ++++++++++++------------ src/main.c | 1432 ++--- src/md5.inl | 138 +- src/mod_lua.inl | 594 +- 17 files changed, 5871 insertions(+), 5482 deletions(-) diff --git a/Makefile b/Makefile index 54a8cabd..fa147fa7 100644 --- a/Makefile +++ b/Makefile @@ -207,4 +207,10 @@ $(BUILD_DIR)/%.o : %.cpp $(BUILD_DIR)/%.o : %.c $(CC) -c $(CFLAGS) $< -o $@ +# This rules is used to keep the code formatted in a reasonable manor +# For this to work astyle must be installed and in the path +# http://sourceforge.net/projects/astyle +indent: + astyle --suffix=none --style=linux --indent=spaces=4 --lineend=linux include/*.h src/*.c src/*.cpp src/*.inl examples/*/*.c examples/*/*.cpp + .PHONY: all help build install clean lib so diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index 7bd77535..6753232b 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -21,6 +21,7 @@ Changes - Added CivetServer::getHeader method (Hariprasad Kamath) - Added new basic C embedding example - Conformed source files to UNIX line endings for consistency. +- Unified the coding style to improve reability. Release Notes v1.3 === diff --git a/examples/chat/chat.c b/examples/chat/chat.c index 5392e679..9e96ad13 100644 --- a/examples/chat/chat.c +++ b/examples/chat/chat.c @@ -24,26 +24,26 @@ static const char *authorize_url = "/authorize"; static const char *login_url = "/login.html"; static const char *ajax_reply_start = - "HTTP/1.1 200 OK\r\n" - "Cache: no-cache\r\n" - "Content-Type: application/x-javascript\r\n" - "\r\n"; + "HTTP/1.1 200 OK\r\n" + "Cache: no-cache\r\n" + "Content-Type: application/x-javascript\r\n" + "\r\n"; // Describes single message sent to a chat. If user is empty (0 length), // the message is then originated from the server itself. struct message { - long id; // Message ID - char user[MAX_USER_LEN]; // User that have sent the message - char text[MAX_MESSAGE_LEN]; // Message text - time_t timestamp; // Message timestamp, UTC + long id; // Message ID + char user[MAX_USER_LEN]; // User that have sent the message + char text[MAX_MESSAGE_LEN]; // Message text + time_t timestamp; // Message timestamp, UTC }; // Describes web session. struct session { - char session_id[33]; // Session ID, must be unique - char random[20]; // Random data used for extra user validation - char user[MAX_USER_LEN]; // Authenticated user - time_t expire; // Expiration timestamp, UTC + char session_id[33]; // Session ID, must be unique + char random[20]; // Random data used for extra user validation + char user[MAX_USER_LEN]; // Authenticated user + time_t expire; // Expiration timestamp, UTC }; static struct message messages[MAX_MESSAGES]; // Ringbuffer for messages @@ -54,332 +54,350 @@ static long last_message_id; static pthread_rwlock_t rwlock = PTHREAD_RWLOCK_INITIALIZER; // Get session object for the connection. Caller must hold the lock. -static struct session *get_session(const struct mg_connection *conn) { - int i; - const char *cookie = mg_get_header(conn, "Cookie"); - char session_id[33]; - time_t now = time(NULL); - mg_get_cookie(cookie, "session", session_id, sizeof(session_id)); - for (i = 0; i < MAX_SESSIONS; i++) { - if (sessions[i].expire != 0 && - sessions[i].expire > now && - strcmp(sessions[i].session_id, session_id) == 0) { - break; +static struct session *get_session(const struct mg_connection *conn) +{ + int i; + const char *cookie = mg_get_header(conn, "Cookie"); + char session_id[33]; + time_t now = time(NULL); + mg_get_cookie(cookie, "session", session_id, sizeof(session_id)); + for (i = 0; i < MAX_SESSIONS; i++) { + if (sessions[i].expire != 0 && + sessions[i].expire > now && + strcmp(sessions[i].session_id, session_id) == 0) { + break; + } } - } - return i == MAX_SESSIONS ? NULL : &sessions[i]; + return i == MAX_SESSIONS ? NULL : &sessions[i]; } static void get_qsvar(const struct mg_request_info *request_info, - const char *name, char *dst, size_t dst_len) { - const char *qs = request_info->query_string; - mg_get_var(qs, strlen(qs == NULL ? "" : qs), name, dst, dst_len); + const char *name, char *dst, size_t dst_len) +{ + const char *qs = request_info->query_string; + mg_get_var(qs, strlen(qs == NULL ? "" : qs), name, dst, dst_len); } // Get a get of messages with IDs greater than last_id and transform them // into a JSON string. Return that string to the caller. The string is // dynamically allocated, caller must free it. If there are no messages, // NULL is returned. -static char *messages_to_json(long last_id) { - const struct message *message; - int max_msgs, len; - char buf[sizeof(messages)]; // Large enough to hold all messages +static char *messages_to_json(long last_id) +{ + const struct message *message; + int max_msgs, len; + char buf[sizeof(messages)]; // Large enough to hold all messages - // Read-lock the ringbuffer. Loop over all messages, making a JSON string. - pthread_rwlock_rdlock(&rwlock); - len = 0; - max_msgs = sizeof(messages) / sizeof(messages[0]); - // If client is too far behind, return all messages. - if (last_message_id - last_id > max_msgs) { - last_id = last_message_id - max_msgs; - } - for (; last_id < last_message_id; last_id++) { - message = &messages[last_id % max_msgs]; - if (message->timestamp == 0) { - break; + // Read-lock the ringbuffer. Loop over all messages, making a JSON string. + pthread_rwlock_rdlock(&rwlock); + len = 0; + max_msgs = sizeof(messages) / sizeof(messages[0]); + // If client is too far behind, return all messages. + if (last_message_id - last_id > max_msgs) { + last_id = last_message_id - max_msgs; } - // buf is allocated on stack and hopefully is large enough to hold all - // messages (it may be too small if the ringbuffer is full and all - // messages are large. in this case asserts will trigger). - len += snprintf(buf + len, sizeof(buf) - len, - "{user: '%s', text: '%s', timestamp: %lu, id: %lu},", - message->user, message->text, message->timestamp, message->id); - assert(len > 0); - assert((size_t) len < sizeof(buf)); - } - pthread_rwlock_unlock(&rwlock); + for (; last_id < last_message_id; last_id++) { + message = &messages[last_id % max_msgs]; + if (message->timestamp == 0) { + break; + } + // buf is allocated on stack and hopefully is large enough to hold all + // messages (it may be too small if the ringbuffer is full and all + // messages are large. in this case asserts will trigger). + len += snprintf(buf + len, sizeof(buf) - len, + "{user: '%s', text: '%s', timestamp: %lu, id: %lu},", + message->user, message->text, message->timestamp, message->id); + assert(len > 0); + assert((size_t) len < sizeof(buf)); + } + pthread_rwlock_unlock(&rwlock); - return len == 0 ? NULL : strdup(buf); + return len == 0 ? NULL : strdup(buf); } // If "callback" param is present in query string, this is JSONP call. // Return 1 in this case, or 0 if "callback" is not specified. // Wrap an output in Javascript function call. static int handle_jsonp(struct mg_connection *conn, - const struct mg_request_info *request_info) { - char cb[64]; + const struct mg_request_info *request_info) +{ + char cb[64]; - get_qsvar(request_info, "callback", cb, sizeof(cb)); - if (cb[0] != '\0') { - mg_printf(conn, "%s(", cb); - } + get_qsvar(request_info, "callback", cb, sizeof(cb)); + if (cb[0] != '\0') { + mg_printf(conn, "%s(", cb); + } - return cb[0] == '\0' ? 0 : 1; + return cb[0] == '\0' ? 0 : 1; } // A handler for the /ajax/get_messages endpoint. // Return a list of messages with ID greater than requested. static void ajax_get_messages(struct mg_connection *conn, - const struct mg_request_info *request_info) { - char last_id[32], *json; - int is_jsonp; + const struct mg_request_info *request_info) +{ + char last_id[32], *json; + int is_jsonp; - mg_printf(conn, "%s", ajax_reply_start); - is_jsonp = handle_jsonp(conn, request_info); + mg_printf(conn, "%s", ajax_reply_start); + is_jsonp = handle_jsonp(conn, request_info); - get_qsvar(request_info, "last_id", last_id, sizeof(last_id)); - if ((json = messages_to_json(strtoul(last_id, NULL, 10))) != NULL) { - mg_printf(conn, "[%s]", json); - free(json); - } + get_qsvar(request_info, "last_id", last_id, sizeof(last_id)); + if ((json = messages_to_json(strtoul(last_id, NULL, 10))) != NULL) { + mg_printf(conn, "[%s]", json); + free(json); + } - if (is_jsonp) { - mg_printf(conn, "%s", ")"); - } + if (is_jsonp) { + mg_printf(conn, "%s", ")"); + } } // Allocate new message. Caller must hold the lock. -static struct message *new_message(void) { - static int size = sizeof(messages) / sizeof(messages[0]); - struct message *message = &messages[last_message_id % size]; - message->id = last_message_id++; - message->timestamp = time(0); - return message; +static struct message *new_message(void) +{ + static int size = sizeof(messages) / sizeof(messages[0]); + struct message *message = &messages[last_message_id % size]; + message->id = last_message_id++; + message->timestamp = time(0); + return message; } -static void my_strlcpy(char *dst, const char *src, size_t len) { - strncpy(dst, src, len); - dst[len - 1] = '\0'; +static void my_strlcpy(char *dst, const char *src, size_t len) +{ + strncpy(dst, src, len); + dst[len - 1] = '\0'; } // A handler for the /ajax/send_message endpoint. static void ajax_send_message(struct mg_connection *conn, - const struct mg_request_info *request_info) { - struct message *message; - struct session *session; - char text[sizeof(message->text) - 1]; - int is_jsonp; + const struct mg_request_info *request_info) +{ + struct message *message; + struct session *session; + char text[sizeof(message->text) - 1]; + int is_jsonp; - mg_printf(conn, "%s", ajax_reply_start); - is_jsonp = handle_jsonp(conn, request_info); + mg_printf(conn, "%s", ajax_reply_start); + is_jsonp = handle_jsonp(conn, request_info); - get_qsvar(request_info, "text", text, sizeof(text)); - if (text[0] != '\0') { - // We have a message to store. Write-lock the ringbuffer, - // grab the next message and copy data into it. - pthread_rwlock_wrlock(&rwlock); - message = new_message(); - // TODO(lsm): JSON-encode all text strings - session = get_session(conn); - assert(session != NULL); - my_strlcpy(message->text, text, sizeof(text)); - my_strlcpy(message->user, session->user, sizeof(message->user)); - pthread_rwlock_unlock(&rwlock); - } + get_qsvar(request_info, "text", text, sizeof(text)); + if (text[0] != '\0') { + // We have a message to store. Write-lock the ringbuffer, + // grab the next message and copy data into it. + pthread_rwlock_wrlock(&rwlock); + message = new_message(); + // TODO(lsm): JSON-encode all text strings + session = get_session(conn); + assert(session != NULL); + my_strlcpy(message->text, text, sizeof(text)); + my_strlcpy(message->user, session->user, sizeof(message->user)); + pthread_rwlock_unlock(&rwlock); + } - mg_printf(conn, "%s", text[0] == '\0' ? "false" : "true"); + mg_printf(conn, "%s", text[0] == '\0' ? "false" : "true"); - if (is_jsonp) { - mg_printf(conn, "%s", ")"); - } + if (is_jsonp) { + mg_printf(conn, "%s", ")"); + } } // Redirect user to the login form. In the cookie, store the original URL // we came from, so that after the authorization we could redirect back. static void redirect_to_login(struct mg_connection *conn, - const struct mg_request_info *request_info) { - mg_printf(conn, "HTTP/1.1 302 Found\r\n" - "Set-Cookie: original_url=%s\r\n" - "Location: %s\r\n\r\n", - request_info->uri, login_url); + const struct mg_request_info *request_info) +{ + mg_printf(conn, "HTTP/1.1 302 Found\r\n" + "Set-Cookie: original_url=%s\r\n" + "Location: %s\r\n\r\n", + request_info->uri, login_url); } // Return 1 if username/password is allowed, 0 otherwise. -static int check_password(const char *user, const char *password) { - // In production environment we should ask an authentication system - // to authenticate the user. - // Here however we do trivial check that user and password are not empty - return (user[0] && password[0]); +static int check_password(const char *user, const char *password) +{ + // In production environment we should ask an authentication system + // to authenticate the user. + // Here however we do trivial check that user and password are not empty + return (user[0] && password[0]); } // Allocate new session object -static struct session *new_session(void) { - int i; - time_t now = time(NULL); - pthread_rwlock_wrlock(&rwlock); - for (i = 0; i < MAX_SESSIONS; i++) { - if (sessions[i].expire == 0 || sessions[i].expire < now) { - sessions[i].expire = time(0) + SESSION_TTL; - break; +static struct session *new_session(void) +{ + int i; + time_t now = time(NULL); + pthread_rwlock_wrlock(&rwlock); + for (i = 0; i < MAX_SESSIONS; i++) { + if (sessions[i].expire == 0 || sessions[i].expire < now) { + sessions[i].expire = time(0) + SESSION_TTL; + break; + } } - } - pthread_rwlock_unlock(&rwlock); - return i == MAX_SESSIONS ? NULL : &sessions[i]; + pthread_rwlock_unlock(&rwlock); + return i == MAX_SESSIONS ? NULL : &sessions[i]; } // Generate session ID. buf must be 33 bytes in size. // Note that it is easy to steal session cookies by sniffing traffic. // This is why all communication must be SSL-ed. static void generate_session_id(char *buf, const char *random, - const char *user) { - mg_md5(buf, random, user, NULL); + const char *user) +{ + mg_md5(buf, random, user, NULL); } -static void send_server_message(const char *fmt, ...) { - va_list ap; - struct message *message; +static void send_server_message(const char *fmt, ...) +{ + va_list ap; + struct message *message; - pthread_rwlock_wrlock(&rwlock); - message = new_message(); - message->user[0] = '\0'; // Empty user indicates server message - va_start(ap, fmt); - vsnprintf(message->text, sizeof(message->text), fmt, ap); - va_end(ap); + pthread_rwlock_wrlock(&rwlock); + message = new_message(); + message->user[0] = '\0'; // Empty user indicates server message + va_start(ap, fmt); + vsnprintf(message->text, sizeof(message->text), fmt, ap); + va_end(ap); - pthread_rwlock_unlock(&rwlock); + pthread_rwlock_unlock(&rwlock); } // A handler for the /authorize endpoint. // Login page form sends user name and password to this endpoint. static void authorize(struct mg_connection *conn, - const struct mg_request_info *request_info) { - char user[MAX_USER_LEN], password[MAX_USER_LEN]; - struct session *session; + const struct mg_request_info *request_info) +{ + char user[MAX_USER_LEN], password[MAX_USER_LEN]; + struct session *session; - // Fetch user name and password. - get_qsvar(request_info, "user", user, sizeof(user)); - get_qsvar(request_info, "password", password, sizeof(password)); + // Fetch user name and password. + get_qsvar(request_info, "user", user, sizeof(user)); + get_qsvar(request_info, "password", password, sizeof(password)); - if (check_password(user, password) && (session = new_session()) != NULL) { - // Authentication success: - // 1. create new session - // 2. set session ID token in the cookie - // 3. remove original_url from the cookie - not needed anymore - // 4. redirect client back to the original URL - // - // The most secure way is to stay HTTPS all the time. However, just to - // show the technique, we redirect to HTTP after the successful - // authentication. The danger of doing this is that session cookie can - // be stolen and an attacker may impersonate the user. - // Secure application must use HTTPS all the time. - my_strlcpy(session->user, user, sizeof(session->user)); - snprintf(session->random, sizeof(session->random), "%d", rand()); - generate_session_id(session->session_id, session->random, session->user); - send_server_message("<%s> joined", session->user); - mg_printf(conn, "HTTP/1.1 302 Found\r\n" - "Set-Cookie: session=%s; max-age=3600; http-only\r\n" // Session ID - "Set-Cookie: user=%s\r\n" // Set user, needed by Javascript code - "Set-Cookie: original_url=/; max-age=0\r\n" // Delete original_url - "Location: /\r\n\r\n", - session->session_id, session->user); - } else { - // Authentication failure, redirect to login. - redirect_to_login(conn, request_info); - } + if (check_password(user, password) && (session = new_session()) != NULL) { + // Authentication success: + // 1. create new session + // 2. set session ID token in the cookie + // 3. remove original_url from the cookie - not needed anymore + // 4. redirect client back to the original URL + // + // The most secure way is to stay HTTPS all the time. However, just to + // show the technique, we redirect to HTTP after the successful + // authentication. The danger of doing this is that session cookie can + // be stolen and an attacker may impersonate the user. + // Secure application must use HTTPS all the time. + my_strlcpy(session->user, user, sizeof(session->user)); + snprintf(session->random, sizeof(session->random), "%d", rand()); + generate_session_id(session->session_id, session->random, session->user); + send_server_message("<%s> joined", session->user); + mg_printf(conn, "HTTP/1.1 302 Found\r\n" + "Set-Cookie: session=%s; max-age=3600; http-only\r\n" // Session ID + "Set-Cookie: user=%s\r\n" // Set user, needed by Javascript code + "Set-Cookie: original_url=/; max-age=0\r\n" // Delete original_url + "Location: /\r\n\r\n", + session->session_id, session->user); + } else { + // Authentication failure, redirect to login. + redirect_to_login(conn, request_info); + } } // Return 1 if request is authorized, 0 otherwise. static int is_authorized(const struct mg_connection *conn, - const struct mg_request_info *request_info) { - struct session *session; - char valid_id[33]; - int authorized = 0; + const struct mg_request_info *request_info) +{ + struct session *session; + char valid_id[33]; + int authorized = 0; - // Always authorize accesses to login page and to authorize URI - if (!strcmp(request_info->uri, login_url) || - !strcmp(request_info->uri, authorize_url)) { - return 1; - } - - pthread_rwlock_rdlock(&rwlock); - if ((session = get_session(conn)) != NULL) { - generate_session_id(valid_id, session->random, session->user); - if (strcmp(valid_id, session->session_id) == 0) { - session->expire = time(0) + SESSION_TTL; - authorized = 1; + // Always authorize accesses to login page and to authorize URI + if (!strcmp(request_info->uri, login_url) || + !strcmp(request_info->uri, authorize_url)) { + return 1; } - } - pthread_rwlock_unlock(&rwlock); - return authorized; + pthread_rwlock_rdlock(&rwlock); + if ((session = get_session(conn)) != NULL) { + generate_session_id(valid_id, session->random, session->user); + if (strcmp(valid_id, session->session_id) == 0) { + session->expire = time(0) + SESSION_TTL; + authorized = 1; + } + } + pthread_rwlock_unlock(&rwlock); + + return authorized; } static void redirect_to_ssl(struct mg_connection *conn, - const struct mg_request_info *request_info) { - const char *p, *host = mg_get_header(conn, "Host"); - if (host != NULL && (p = strchr(host, ':')) != NULL) { - mg_printf(conn, "HTTP/1.1 302 Found\r\n" - "Location: https://%.*s:8082/%s:8082\r\n\r\n", - (int) (p - host), host, request_info->uri); - } else { - mg_printf(conn, "%s", "HTTP/1.1 500 Error\r\n\r\nHost: header is not set"); - } + const struct mg_request_info *request_info) +{ + const char *p, *host = mg_get_header(conn, "Host"); + if (host != NULL && (p = strchr(host, ':')) != NULL) { + mg_printf(conn, "HTTP/1.1 302 Found\r\n" + "Location: https://%.*s:8082/%s:8082\r\n\r\n", + (int) (p - host), host, request_info->uri); + } else { + mg_printf(conn, "%s", "HTTP/1.1 500 Error\r\n\r\nHost: header is not set"); + } } -static int begin_request_handler(struct mg_connection *conn) { - const struct mg_request_info *request_info = mg_get_request_info(conn); - int processed = 1; +static int begin_request_handler(struct mg_connection *conn) +{ + const struct mg_request_info *request_info = mg_get_request_info(conn); + int processed = 1; - if (!request_info->is_ssl) { - redirect_to_ssl(conn, request_info); - } else if (!is_authorized(conn, request_info)) { - redirect_to_login(conn, request_info); - } else if (strcmp(request_info->uri, authorize_url) == 0) { - authorize(conn, request_info); - } else if (strcmp(request_info->uri, "/ajax/get_messages") == 0) { - ajax_get_messages(conn, request_info); - } else if (strcmp(request_info->uri, "/ajax/send_message") == 0) { - ajax_send_message(conn, request_info); - } else { - // No suitable handler found, mark as not processed. Civetweb will - // try to serve the request. - processed = 0; - } - return processed; + if (!request_info->is_ssl) { + redirect_to_ssl(conn, request_info); + } else if (!is_authorized(conn, request_info)) { + redirect_to_login(conn, request_info); + } else if (strcmp(request_info->uri, authorize_url) == 0) { + authorize(conn, request_info); + } else if (strcmp(request_info->uri, "/ajax/get_messages") == 0) { + ajax_get_messages(conn, request_info); + } else if (strcmp(request_info->uri, "/ajax/send_message") == 0) { + ajax_send_message(conn, request_info); + } else { + // No suitable handler found, mark as not processed. Civetweb will + // try to serve the request. + processed = 0; + } + return processed; } static const char *options[] = { - "document_root", "html", - "listening_ports", "8081,8082s", - "ssl_certificate", "ssl_cert.pem", - "num_threads", "5", - NULL + "document_root", "html", + "listening_ports", "8081,8082s", + "ssl_certificate", "ssl_cert.pem", + "num_threads", "5", + NULL }; -int main(void) { - struct mg_callbacks callbacks; - struct mg_context *ctx; +int main(void) +{ + struct mg_callbacks callbacks; + struct mg_context *ctx; - // Initialize random number generator. It will be used later on for - // the session identifier creation. - srand((unsigned) time(0)); + // Initialize random number generator. It will be used later on for + // the session identifier creation. + srand((unsigned) time(0)); - // Setup and start Civetweb - memset(&callbacks, 0, sizeof(callbacks)); - callbacks.begin_request = begin_request_handler; - if ((ctx = mg_start(&callbacks, NULL, options)) == NULL) { - printf("%s\n", "Cannot start chat server, fatal exit"); - exit(EXIT_FAILURE); - } + // Setup and start Civetweb + memset(&callbacks, 0, sizeof(callbacks)); + callbacks.begin_request = begin_request_handler; + if ((ctx = mg_start(&callbacks, NULL, options)) == NULL) { + printf("%s\n", "Cannot start chat server, fatal exit"); + exit(EXIT_FAILURE); + } - // Wait until enter is pressed, then exit - printf("Chat server started on ports %s, press enter to quit.\n", - mg_get_option(ctx, "listening_ports")); - getchar(); - mg_stop(ctx); - printf("%s\n", "Chat server stopped."); + // Wait until enter is pressed, then exit + printf("Chat server started on ports %s, press enter to quit.\n", + mg_get_option(ctx, "listening_ports")); + getchar(); + mg_stop(ctx); + printf("%s\n", "Chat server stopped."); - return EXIT_SUCCESS; + return EXIT_SUCCESS; } // vim:ts=2:sw=2:et diff --git a/examples/embedded_c/embedded_c.c b/examples/embedded_c/embedded_c.c index ae01945e..1543c745 100644 --- a/examples/embedded_c/embedded_c.c +++ b/examples/embedded_c/embedded_c.c @@ -21,24 +21,27 @@ #define EXIT_URI "/exit" int exitNow = 0; -int ExampleHandler(struct mg_connection *conn, void *cbdata) { +int ExampleHandler(struct mg_connection *conn, void *cbdata) +{ mg_printf(conn, "HTTP/1.1 200 OK\r\nContent-Type: text/html\r\n\r\n"); mg_printf(conn, ""); mg_printf(conn, "

This is example text!!!

"); mg_printf(conn, "

To exit click here

", - EXIT_URI); + EXIT_URI); mg_printf(conn, "\n"); return 1; } -int ExitHandler(struct mg_connection *conn, void *cbdata) { +int ExitHandler(struct mg_connection *conn, void *cbdata) +{ mg_printf(conn, "HTTP/1.1 200 OK\r\nContent-Type: text/plain\r\n\r\n"); mg_printf(conn, "Bye!\n"); exitNow = 1; return 1; } -int AHandler(struct mg_connection *conn, void *cbdata) { +int AHandler(struct mg_connection *conn, void *cbdata) +{ mg_printf(conn, "HTTP/1.1 200 OK\r\nContent-Type: text/html\r\n\r\n"); mg_printf(conn, ""); mg_printf(conn, "

This is the A handler!!!

"); @@ -46,7 +49,8 @@ int AHandler(struct mg_connection *conn, void *cbdata) { return 1; } -int ABHandler(struct mg_connection *conn, void *cbdata) { +int ABHandler(struct mg_connection *conn, void *cbdata) +{ mg_printf(conn, "HTTP/1.1 200 OK\r\nContent-Type: text/html\r\n\r\n"); mg_printf(conn, ""); mg_printf(conn, "

This is the AB handler!!!

"); @@ -55,10 +59,12 @@ int ABHandler(struct mg_connection *conn, void *cbdata) { } -int main(int argc, char *argv[]) { +int main(int argc, char *argv[]) +{ const char * options[] = { "document_root", DOCUMENT_ROOT, - "listening_ports", PORT, 0 }; + "listening_ports", PORT, 0 + }; struct mg_callbacks callbacks; struct mg_context *ctx; diff --git a/examples/embedded_cpp/embedded_cpp.cpp b/examples/embedded_cpp/embedded_cpp.cpp index 86747865..24552e0c 100644 --- a/examples/embedded_cpp/embedded_cpp.cpp +++ b/examples/embedded_cpp/embedded_cpp.cpp @@ -17,20 +17,22 @@ #define EXIT_URI "/exit" bool exitNow = false; -class ExampleHandler: public CivetHandler { +class ExampleHandler: public CivetHandler +{ public: bool handleGet(CivetServer *server, struct mg_connection *conn) { mg_printf(conn, "HTTP/1.1 200 OK\r\nContent-Type: text/html\r\n\r\n"); mg_printf(conn, ""); mg_printf(conn, "

This is example text!!!

"); mg_printf(conn, "

To exit click here

", - EXIT_URI); + EXIT_URI); mg_printf(conn, "\n"); return true; } }; -class ExitHandler: public CivetHandler { +class ExitHandler: public CivetHandler +{ public: bool handleGet(CivetServer *server, struct mg_connection *conn) { mg_printf(conn, "HTTP/1.1 200 OK\r\nContent-Type: text/plain\r\n\r\n"); @@ -40,7 +42,8 @@ public: } }; -class AHandler: public CivetHandler { +class AHandler: public CivetHandler +{ public: bool handleGet(CivetServer *server, struct mg_connection *conn) { mg_printf(conn, "HTTP/1.1 200 OK\r\nContent-Type: text/html\r\n\r\n"); @@ -51,7 +54,8 @@ public: } }; -class ABHandler: public CivetHandler { +class ABHandler: public CivetHandler +{ public: bool handleGet(CivetServer *server, struct mg_connection *conn) { mg_printf(conn, "HTTP/1.1 200 OK\r\nContent-Type: text/html\r\n\r\n"); @@ -62,10 +66,12 @@ public: } }; -int main(int argc, char *argv[]) { +int main(int argc, char *argv[]) +{ const char * options[] = { "document_root", DOCUMENT_ROOT, - "listening_ports", PORT, 0 }; + "listening_ports", PORT, 0 + }; CivetServer server(options); diff --git a/examples/hello/hello.c b/examples/hello/hello.c index 0cee48d5..39253c1a 100644 --- a/examples/hello/hello.c +++ b/examples/hello/hello.c @@ -3,49 +3,51 @@ #include "civetweb.h" // This function will be called by civetweb on every new request. -static int begin_request_handler(struct mg_connection *conn) { - const struct mg_request_info *request_info = mg_get_request_info(conn); - char content[100]; +static int begin_request_handler(struct mg_connection *conn) +{ + const struct mg_request_info *request_info = mg_get_request_info(conn); + char content[100]; - // Prepare the message we're going to send - int content_length = snprintf(content, sizeof(content), - "Hello from civetweb! Remote port: %d", - request_info->remote_port); + // Prepare the message we're going to send + int content_length = snprintf(content, sizeof(content), + "Hello from civetweb! Remote port: %d", + request_info->remote_port); - // Send HTTP reply to the client - mg_printf(conn, - "HTTP/1.1 200 OK\r\n" - "Content-Type: text/plain\r\n" - "Content-Length: %d\r\n" // Always set Content-Length - "\r\n" - "%s", - content_length, content); + // Send HTTP reply to the client + mg_printf(conn, + "HTTP/1.1 200 OK\r\n" + "Content-Type: text/plain\r\n" + "Content-Length: %d\r\n" // Always set Content-Length + "\r\n" + "%s", + content_length, content); - // Returning non-zero tells civetweb that our function has replied to - // the client, and civetweb should not send client any more data. - return 1; + // Returning non-zero tells civetweb that our function has replied to + // the client, and civetweb should not send client any more data. + return 1; } -int main(void) { - struct mg_context *ctx; - struct mg_callbacks callbacks; +int main(void) +{ + struct mg_context *ctx; + struct mg_callbacks callbacks; - // List of options. Last element must be NULL. - const char *options[] = {"listening_ports", "8080", NULL}; + // List of options. Last element must be NULL. + const char *options[] = {"listening_ports", "8080", NULL}; - // Prepare callbacks structure. We have only one callback, the rest are NULL. - memset(&callbacks, 0, sizeof(callbacks)); - callbacks.begin_request = begin_request_handler; + // Prepare callbacks structure. We have only one callback, the rest are NULL. + memset(&callbacks, 0, sizeof(callbacks)); + callbacks.begin_request = begin_request_handler; - // Start the web server. - ctx = mg_start(&callbacks, NULL, options); + // Start the web server. + ctx = mg_start(&callbacks, NULL, options); - // Wait until user hits "enter". Server is running in separate thread. - // Navigating to http://localhost:8080 will invoke begin_request_handler(). - getchar(); + // Wait until user hits "enter". Server is running in separate thread. + // Navigating to http://localhost:8080 will invoke begin_request_handler(). + getchar(); - // Stop the server. - mg_stop(ctx); + // Stop the server. + mg_stop(ctx); - return 0; + return 0; } diff --git a/examples/lua/lua_dll.c b/examples/lua/lua_dll.c index e914c944..79e6b97c 100644 --- a/examples/lua/lua_dll.c +++ b/examples/lua/lua_dll.c @@ -3,17 +3,19 @@ #include "lua.h" #include "lauxlib.h" -static int smile(lua_State *L) { - (void) L; // Unused - printf("%s\n", ":-)"); - return 0; +static int smile(lua_State *L) +{ + (void) L; // Unused + printf("%s\n", ":-)"); + return 0; } -int LUA_API luaopen_lua_dll(lua_State *L) { - static const struct luaL_Reg api[] = { - {"smile", smile}, - {NULL, NULL}, - }; - luaL_openlib(L, "lua_dll", api, 0); - return 1; +int LUA_API luaopen_lua_dll(lua_State *L) +{ + static const struct luaL_Reg api[] = { + {"smile", smile}, + {NULL, NULL}, + }; + luaL_openlib(L, "lua_dll", api, 0); + return 1; } diff --git a/examples/post/post.c b/examples/post/post.c index a29d136d..3c5c68c8 100644 --- a/examples/post/post.c +++ b/examples/post/post.c @@ -3,54 +3,56 @@ #include "civetweb.h" static const char *html_form = - "POST example." - "
" - "Input 1:
" - "Input 2:
" - "" - "
"; + "POST example." + "
" + "Input 1:
" + "Input 2:
" + "" + "
"; -static int begin_request_handler(struct mg_connection *conn) { - const struct mg_request_info *ri = mg_get_request_info(conn); - char post_data[1024], input1[sizeof(post_data)], input2[sizeof(post_data)]; - int post_data_len; +static int begin_request_handler(struct mg_connection *conn) +{ + const struct mg_request_info *ri = mg_get_request_info(conn); + char post_data[1024], input1[sizeof(post_data)], input2[sizeof(post_data)]; + int post_data_len; - if (!strcmp(ri->uri, "/handle_post_request")) { - // User has submitted a form, show submitted data and a variable value - post_data_len = mg_read(conn, post_data, sizeof(post_data)); + if (!strcmp(ri->uri, "/handle_post_request")) { + // User has submitted a form, show submitted data and a variable value + post_data_len = mg_read(conn, post_data, sizeof(post_data)); - // Parse form data. input1 and input2 are guaranteed to be NUL-terminated - mg_get_var(post_data, post_data_len, "input_1", input1, sizeof(input1)); - mg_get_var(post_data, post_data_len, "input_2", input2, sizeof(input2)); + // Parse form data. input1 and input2 are guaranteed to be NUL-terminated + mg_get_var(post_data, post_data_len, "input_1", input1, sizeof(input1)); + mg_get_var(post_data, post_data_len, "input_2", input2, sizeof(input2)); - // Send reply to the client, showing submitted form values. - mg_printf(conn, "HTTP/1.0 200 OK\r\n" - "Content-Type: text/plain\r\n\r\n" - "Submitted data: [%.*s]\n" - "Submitted data length: %d bytes\n" - "input_1: [%s]\n" - "input_2: [%s]\n", - post_data_len, post_data, post_data_len, input1, input2); - } else { - // Show HTML form. - mg_printf(conn, "HTTP/1.0 200 OK\r\n" - "Content-Length: %d\r\n" - "Content-Type: text/html\r\n\r\n%s", - (int) strlen(html_form), html_form); - } - return 1; // Mark request as processed + // Send reply to the client, showing submitted form values. + mg_printf(conn, "HTTP/1.0 200 OK\r\n" + "Content-Type: text/plain\r\n\r\n" + "Submitted data: [%.*s]\n" + "Submitted data length: %d bytes\n" + "input_1: [%s]\n" + "input_2: [%s]\n", + post_data_len, post_data, post_data_len, input1, input2); + } else { + // Show HTML form. + mg_printf(conn, "HTTP/1.0 200 OK\r\n" + "Content-Length: %d\r\n" + "Content-Type: text/html\r\n\r\n%s", + (int) strlen(html_form), html_form); + } + return 1; // Mark request as processed } -int main(void) { - struct mg_context *ctx; - const char *options[] = {"listening_ports", "8080", NULL}; - struct mg_callbacks callbacks; +int main(void) +{ + struct mg_context *ctx; + const char *options[] = {"listening_ports", "8080", NULL}; + struct mg_callbacks callbacks; - memset(&callbacks, 0, sizeof(callbacks)); - callbacks.begin_request = begin_request_handler; - ctx = mg_start(&callbacks, NULL, options); - getchar(); // Wait until user hits "enter" - mg_stop(ctx); + memset(&callbacks, 0, sizeof(callbacks)); + callbacks.begin_request = begin_request_handler; + ctx = mg_start(&callbacks, NULL, options); + getchar(); // Wait until user hits "enter" + mg_stop(ctx); - return 0; + return 0; } diff --git a/examples/upload/upload.c b/examples/upload/upload.c index 39565f43..49a3cd06 100644 --- a/examples/upload/upload.c +++ b/examples/upload/upload.c @@ -17,45 +17,48 @@ typedef __int64 int64_t; #include "civetweb.h" -static int begin_request_handler(struct mg_connection *conn) { - if (!strcmp(mg_get_request_info(conn)->uri, "/handle_post_request")) { - mg_printf(conn, "%s", "HTTP/1.0 200 OK\r\n\r\n"); - mg_upload(conn, "/tmp"); - } else { - // Show HTML form. Make sure it has enctype="multipart/form-data" attr. - static const char *html_form = - "Upload example." - "
" - "
" - "" - "
"; +static int begin_request_handler(struct mg_connection *conn) +{ + if (!strcmp(mg_get_request_info(conn)->uri, "/handle_post_request")) { + mg_printf(conn, "%s", "HTTP/1.0 200 OK\r\n\r\n"); + mg_upload(conn, "/tmp"); + } else { + // Show HTML form. Make sure it has enctype="multipart/form-data" attr. + static const char *html_form = + "Upload example." + "
" + "
" + "" + "
"; - mg_printf(conn, "HTTP/1.0 200 OK\r\n" - "Content-Length: %d\r\n" - "Content-Type: text/html\r\n\r\n%s", - (int) strlen(html_form), html_form); - } + mg_printf(conn, "HTTP/1.0 200 OK\r\n" + "Content-Length: %d\r\n" + "Content-Type: text/html\r\n\r\n%s", + (int) strlen(html_form), html_form); + } - // Mark request as processed - return 1; + // Mark request as processed + return 1; } -static void upload_handler(struct mg_connection *conn, const char *path) { - mg_printf(conn, "Saved [%s]", path); +static void upload_handler(struct mg_connection *conn, const char *path) +{ + mg_printf(conn, "Saved [%s]", path); } -int main(void) { - struct mg_context *ctx; - const char *options[] = {"listening_ports", "8080", NULL}; - struct mg_callbacks callbacks; +int main(void) +{ + struct mg_context *ctx; + const char *options[] = {"listening_ports", "8080", NULL}; + struct mg_callbacks callbacks; - memset(&callbacks, 0, sizeof(callbacks)); - callbacks.begin_request = begin_request_handler; - callbacks.upload = upload_handler; - ctx = mg_start(&callbacks, NULL, options); - getchar(); // Wait until user hits "enter" - mg_stop(ctx); + memset(&callbacks, 0, sizeof(callbacks)); + callbacks.begin_request = begin_request_handler; + callbacks.upload = upload_handler; + ctx = mg_start(&callbacks, NULL, options); + getchar(); // Wait until user hits "enter" + mg_stop(ctx); - return 0; + return 0; } diff --git a/examples/websocket/websocket.c b/examples/websocket/websocket.c index e6c42742..e398b224 100644 --- a/examples/websocket/websocket.c +++ b/examples/websocket/websocket.c @@ -5,9 +5,10 @@ #include #include "civetweb.h" -static void websocket_ready_handler(struct mg_connection *conn) { - static const char *message = "server ready"; - mg_websocket_write(conn, WEBSOCKET_OPCODE_TEXT, message, strlen(message)); +static void websocket_ready_handler(struct mg_connection *conn) +{ + static const char *message = "server ready"; + mg_websocket_write(conn, WEBSOCKET_OPCODE_TEXT, message, strlen(message)); } // Arguments: @@ -15,30 +16,32 @@ static void websocket_ready_handler(struct mg_connection *conn) { // http://tools.ietf.org/html/rfc6455, section 5.2 // data, data_len: payload data. Mask, if any, is already applied. static int websocket_data_handler(struct mg_connection *conn, int flags, - char *data, size_t data_len) { - (void) flags; // Unused - mg_websocket_write(conn, WEBSOCKET_OPCODE_TEXT, data, data_len); + char *data, size_t data_len) +{ + (void) flags; // Unused + mg_websocket_write(conn, WEBSOCKET_OPCODE_TEXT, data, data_len); - // Returning zero means stoping websocket conversation. - // Close the conversation if client has sent us "exit" string. - return memcmp(data, "exit", 4); + // Returning zero means stoping websocket conversation. + // Close the conversation if client has sent us "exit" string. + return memcmp(data, "exit", 4); } -int main(void) { - struct mg_context *ctx; - struct mg_callbacks callbacks; - const char *options[] = { - "listening_ports", "8080", - "document_root", "websocket_html_root", - NULL - }; +int main(void) +{ + struct mg_context *ctx; + struct mg_callbacks callbacks; + const char *options[] = { + "listening_ports", "8080", + "document_root", "websocket_html_root", + NULL + }; - memset(&callbacks, 0, sizeof(callbacks)); - callbacks.websocket_ready = websocket_ready_handler; - callbacks.websocket_data = websocket_data_handler; - ctx = mg_start(&callbacks, NULL, options); - getchar(); // Wait until user hits "enter" - mg_stop(ctx); + memset(&callbacks, 0, sizeof(callbacks)); + callbacks.websocket_ready = websocket_ready_handler; + callbacks.websocket_data = websocket_data_handler; + ctx = mg_start(&callbacks, NULL, options); + getchar(); // Wait until user hits "enter" + mg_stop(ctx); - return 0; + return 0; } diff --git a/include/CivetServer.h b/include/CivetServer.h index 37f44353..2692ef38 100644 --- a/include/CivetServer.h +++ b/include/CivetServer.h @@ -17,7 +17,8 @@ class CivetServer; // forward declaration * Basic interface for a URI request handler. Handlers implementations * must be reentrant. */ -class CivetHandler { +class CivetHandler +{ public: /** @@ -69,7 +70,8 @@ public: * * Basic class for embedded web server. This has a URL mapping built-in. */ -class CivetServer { +class CivetServer +{ public: /** @@ -133,7 +135,7 @@ public: /** * getCookie(struct mg_connection *conn, const std::string &cookieName, std::string &cookieValue) - * @param conn - the connection information + * @param conn - the connection information * @param cookieName - cookie name to get the value from * @param cookieValue - cookie value is returned using thiis reference * @puts the cookie value string that matches the cookie name in the _cookieValue string. @@ -143,7 +145,7 @@ public: /** * getHeader(struct mg_connection *conn, const std::string &headerName) - * @param conn - the connection information + * @param conn - the connection information * @param headerName - header name to get the value from * @returns a char array whcih contains the header value as string */ @@ -163,7 +165,7 @@ public: * @return true of key was found */ static bool getParam(struct mg_connection *conn, const char *name, - std::string &dst, size_t occurrence=0); + std::string &dst, size_t occurrence=0); /** * getParam(const std::string &, const char *, std::string &, size_t) @@ -179,7 +181,7 @@ public: * @return true of key was found */ static bool getParam(const std::string &data, const char *name, - std::string &dst, size_t occurrence=0) { + std::string &dst, size_t occurrence=0) { return getParam(data.c_str(), data.length(), name, dst, occurrence); } @@ -198,7 +200,7 @@ public: * @return true of key was found */ static bool getParam(const char *data, size_t data_len, const char *name, - std::string &dst, size_t occurrence=0); + std::string &dst, size_t occurrence=0); /** diff --git a/include/civetweb.h b/include/civetweb.h index 25ac09cf..1c1b0a92 100644 --- a/include/civetweb.h +++ b/include/civetweb.h @@ -34,22 +34,22 @@ struct mg_connection; // Handle for the individual connection // This structure contains information about the HTTP request. struct mg_request_info { - const char *request_method; // "GET", "POST", etc - const char *uri; // URL-decoded URI - const char *http_version; // E.g. "1.0", "1.1" - const char *query_string; // URL part after '?', not including '?', or NULL - const char *remote_user; // Authenticated user, or NULL if no auth used - long remote_ip; // Client's IP address - int remote_port; // Client's port - int is_ssl; // 1 if SSL-ed, 0 if not - void *user_data; // User data pointer passed to mg_start() - void *conn_data; // Connection-specific user data + const char *request_method; // "GET", "POST", etc + const char *uri; // URL-decoded URI + const char *http_version; // E.g. "1.0", "1.1" + const char *query_string; // URL part after '?', not including '?', or NULL + const char *remote_user; // Authenticated user, or NULL if no auth used + long remote_ip; // Client's IP address + int remote_port; // Client's port + int is_ssl; // 1 if SSL-ed, 0 if not + void *user_data; // User data pointer passed to mg_start() + void *conn_data; // Connection-specific user data - int num_headers; // Number of HTTP headers - struct mg_header { - const char *name; // HTTP header name - const char *value; // HTTP header value - } http_headers[64]; // Maximum 64 headers + int num_headers; // Number of HTTP headers + struct mg_header { + const char *name; // HTTP header name + const char *value; // HTTP header value + } http_headers[64]; // Maximum 64 headers }; @@ -57,78 +57,78 @@ struct mg_request_info { // which callbacks to invoke. For detailed description, see // https://github.com/sunsetbrew/civetweb/blob/master/docs/UserManual.md struct mg_callbacks { - // Called when civetweb has received new HTTP request. - // If callback returns non-zero, - // callback must process the request by sending valid HTTP headers and body, - // and civetweb will not do any further processing. - // If callback returns 0, civetweb processes the request itself. In this case, - // callback must not send any data to the client. - int (*begin_request)(struct mg_connection *); + // Called when civetweb has received new HTTP request. + // If callback returns non-zero, + // callback must process the request by sending valid HTTP headers and body, + // and civetweb will not do any further processing. + // If callback returns 0, civetweb processes the request itself. In this case, + // callback must not send any data to the client. + int (*begin_request)(struct mg_connection *); - // Called when civetweb has finished processing request. - void (*end_request)(const struct mg_connection *, int reply_status_code); + // Called when civetweb has finished processing request. + void (*end_request)(const struct mg_connection *, int reply_status_code); - // Called when civetweb is about to log a message. If callback returns - // non-zero, civetweb does not log anything. - int (*log_message)(const struct mg_connection *, const char *message); + // Called when civetweb is about to log a message. If callback returns + // non-zero, civetweb does not log anything. + int (*log_message)(const struct mg_connection *, const char *message); - // Called when civetweb initializes SSL library. - int (*init_ssl)(void *ssl_context, void *user_data); + // Called when civetweb initializes SSL library. + int (*init_ssl)(void *ssl_context, void *user_data); - // Called when websocket request is received, before websocket handshake. - // If callback returns 0, civetweb proceeds with handshake, otherwise - // cinnection is closed immediately. - int (*websocket_connect)(const struct mg_connection *); + // Called when websocket request is received, before websocket handshake. + // If callback returns 0, civetweb proceeds with handshake, otherwise + // cinnection is closed immediately. + int (*websocket_connect)(const struct mg_connection *); - // Called when websocket handshake is successfully completed, and - // connection is ready for data exchange. - void (*websocket_ready)(struct mg_connection *); + // Called when websocket handshake is successfully completed, and + // connection is ready for data exchange. + void (*websocket_ready)(struct mg_connection *); - // Called when data frame has been received from the client. - // Parameters: - // bits: first byte of the websocket frame, see websocket RFC at - // http://tools.ietf.org/html/rfc6455, section 5.2 - // data, data_len: payload, with mask (if any) already applied. - // Return value: - // non-0: keep this websocket connection opened. - // 0: close this websocket connection. - int (*websocket_data)(struct mg_connection *, int bits, - char *data, size_t data_len); + // Called when data frame has been received from the client. + // Parameters: + // bits: first byte of the websocket frame, see websocket RFC at + // http://tools.ietf.org/html/rfc6455, section 5.2 + // data, data_len: payload, with mask (if any) already applied. + // Return value: + // non-0: keep this websocket connection opened. + // 0: close this websocket connection. + int (*websocket_data)(struct mg_connection *, int bits, + char *data, size_t data_len); - // Called when civetweb is closing a connection. The per-context mutex is locked when this - // is invoked. This is primarily useful for noting when a websocket is closing and removing it - // from any application-maintained list of clients. - void (*connection_close)(struct mg_connection *); + // Called when civetweb is closing a connection. The per-context mutex is locked when this + // is invoked. This is primarily useful for noting when a websocket is closing and removing it + // from any application-maintained list of clients. + void (*connection_close)(struct mg_connection *); - // Called when civetweb tries to open a file. Used to intercept file open - // calls, and serve file data from memory instead. - // Parameters: - // path: Full path to the file to open. - // data_len: Placeholder for the file size, if file is served from memory. - // Return value: - // NULL: do not serve file from memory, proceed with normal file open. - // non-NULL: pointer to the file contents in memory. data_len must be - // initilized with the size of the memory block. - const char * (*open_file)(const struct mg_connection *, - const char *path, size_t *data_len); + // Called when civetweb tries to open a file. Used to intercept file open + // calls, and serve file data from memory instead. + // Parameters: + // path: Full path to the file to open. + // data_len: Placeholder for the file size, if file is served from memory. + // Return value: + // NULL: do not serve file from memory, proceed with normal file open. + // non-NULL: pointer to the file contents in memory. data_len must be + // initilized with the size of the memory block. + const char * (*open_file)(const struct mg_connection *, + const char *path, size_t *data_len); - // Called when civetweb is about to serve Lua server page (.lp file), if - // Lua support is enabled. - // Parameters: - // lua_context: "lua_State *" pointer. - void (*init_lua)(struct mg_connection *, void *lua_context); + // Called when civetweb is about to serve Lua server page (.lp file), if + // Lua support is enabled. + // Parameters: + // lua_context: "lua_State *" pointer. + void (*init_lua)(struct mg_connection *, void *lua_context); - // Called when civetweb has uploaded a file to a temporary directory as a - // result of mg_upload() call. - // Parameters: - // file_file: full path name to the uploaded file. - void (*upload)(struct mg_connection *, const char *file_name); + // Called when civetweb has uploaded a file to a temporary directory as a + // result of mg_upload() call. + // Parameters: + // file_file: full path name to the uploaded file. + void (*upload)(struct mg_connection *, const char *file_name); - // Called when civetweb is about to send HTTP error to the client. - // Implementing this callback allows to create custom error pages. - // Parameters: - // status: HTTP error status code. - int (*http_error)(struct mg_connection *, int status); + // Called when civetweb is about to send HTTP error to the client. + // Implementing this callback allows to create custom error pages. + // Parameters: + // status: HTTP error status code. + int (*http_error)(struct mg_connection *, int status); }; // Start web server. @@ -187,9 +187,9 @@ typedef int (* mg_request_handler)(struct mg_connection *conn, void *cbdata); // // URI's are ordered and prefixed URI's are supported. For example, // consider two URIs: /a/b and /a -// /a matches /a +// /a matches /a // /a/b matches /a/b -// /a/c matches /a +// /a/c matches /a // // Parameters: // ctx: server context @@ -268,12 +268,12 @@ void mg_unlock(struct mg_connection* conn); // Opcodes, from http://tools.ietf.org/html/rfc6455 enum { - WEBSOCKET_OPCODE_CONTINUATION = 0x0, - WEBSOCKET_OPCODE_TEXT = 0x1, - WEBSOCKET_OPCODE_BINARY = 0x2, - WEBSOCKET_OPCODE_CONNECTION_CLOSE = 0x8, - WEBSOCKET_OPCODE_PING = 0x9, - WEBSOCKET_OPCODE_PONG = 0xa + WEBSOCKET_OPCODE_CONTINUATION = 0x0, + WEBSOCKET_OPCODE_TEXT = 0x1, + WEBSOCKET_OPCODE_BINARY = 0x2, + WEBSOCKET_OPCODE_CONNECTION_CLOSE = 0x8, + WEBSOCKET_OPCODE_PING = 0x9, + WEBSOCKET_OPCODE_PONG = 0xa }; @@ -368,7 +368,7 @@ int mg_get_var(const char *data, size_t data_len, // Destination buffer is guaranteed to be '\0' - terminated if it is not // NULL or zero length. int mg_get_var2(const char *data, size_t data_len, - const char *var_name, char *dst, size_t dst_len, size_t occurrence); + const char *var_name, char *dst, size_t dst_len, size_t occurrence); // Fetch value of certain cookie variable into the destination buffer. // @@ -462,7 +462,7 @@ char *mg_md5(char buf[33], ...); // Example: // mg_cry(conn,"i like %s", "logging"); void mg_cry(struct mg_connection *conn, - PRINTF_FORMAT_STRING(const char *fmt), ...) PRINTF_ARGS(2, 3); + PRINTF_FORMAT_STRING(const char *fmt), ...) PRINTF_ARGS(2, 3); // utility method to compare two buffers, case incensitive. int mg_strncasecmp(const char *s1, const char *s2, size_t len); diff --git a/src/CivetServer.cpp b/src/CivetServer.cpp index 9c820a6e..3854c256 100644 --- a/src/CivetServer.cpp +++ b/src/CivetServer.cpp @@ -10,34 +10,39 @@ #include #ifndef UNUSED_PARAMETER - #define UNUSED_PARAMETER(x) (void)(x) +#define UNUSED_PARAMETER(x) (void)(x) #endif -bool CivetHandler::handleGet(CivetServer *server, struct mg_connection *conn) { +bool CivetHandler::handleGet(CivetServer *server, struct mg_connection *conn) +{ UNUSED_PARAMETER(server); UNUSED_PARAMETER(conn); return false; } -bool CivetHandler::handlePost(CivetServer *server, struct mg_connection *conn) { +bool CivetHandler::handlePost(CivetServer *server, struct mg_connection *conn) +{ UNUSED_PARAMETER(server); UNUSED_PARAMETER(conn); return false; } -bool CivetHandler::handlePut(CivetServer *server, struct mg_connection *conn) { +bool CivetHandler::handlePut(CivetServer *server, struct mg_connection *conn) +{ UNUSED_PARAMETER(server); UNUSED_PARAMETER(conn); return false; } -bool CivetHandler::handleDelete(CivetServer *server, struct mg_connection *conn) { +bool CivetHandler::handleDelete(CivetServer *server, struct mg_connection *conn) +{ UNUSED_PARAMETER(server); UNUSED_PARAMETER(conn); return false; } -int CivetServer::requestHandler(struct mg_connection *conn, void *cbdata) { +int CivetServer::requestHandler(struct mg_connection *conn, void *cbdata) +{ struct mg_request_info *request_info = mg_get_request_info(conn); CivetServer *me = (CivetServer*) (request_info->user_data); CivetHandler *handler = (CivetHandler *)cbdata; @@ -59,8 +64,9 @@ int CivetServer::requestHandler(struct mg_connection *conn, void *cbdata) { } CivetServer::CivetServer(const char **options, - const struct mg_callbacks *_callbacks) : - context(0) { + const struct mg_callbacks *_callbacks) : + context(0) +{ if (_callbacks) { @@ -72,19 +78,23 @@ CivetServer::CivetServer(const char **options, } } -CivetServer::~CivetServer() { +CivetServer::~CivetServer() +{ close(); } -void CivetServer::addHandler(const std::string &uri, CivetHandler *handler) { +void CivetServer::addHandler(const std::string &uri, CivetHandler *handler) +{ mg_set_request_handler(context, uri.c_str(), requestHandler, handler); } -void CivetServer::removeHandler(const std::string &uri) { +void CivetServer::removeHandler(const std::string &uri) +{ mg_set_request_handler(context, uri.c_str(), NULL, NULL); } -void CivetServer::close() { +void CivetServer::close() +{ if (context) { mg_stop (context); context = 0; @@ -108,96 +118,102 @@ const char* CivetServer::getHeader(struct mg_connection *conn, const std::string } void -CivetServer::urlDecode(const char *src, std::string &dst, bool is_form_url_encoded) { +CivetServer::urlDecode(const char *src, std::string &dst, bool is_form_url_encoded) +{ urlDecode(src, strlen(src), dst, is_form_url_encoded); } void -CivetServer::urlDecode(const char *src, size_t src_len, std::string &dst, bool is_form_url_encoded) { - int i, j, a, b; +CivetServer::urlDecode(const char *src, size_t src_len, std::string &dst, bool is_form_url_encoded) +{ + int i, j, a, b; #define HEXTOI(x) (isdigit(x) ? x - '0' : x - 'W') - dst.clear(); - for (i = j = 0; i < (int)src_len; i++, j++) { - if (src[i] == '%' && i < (int)src_len - 2 && - isxdigit(* (const unsigned char *) (src + i + 1)) && - isxdigit(* (const unsigned char *) (src + i + 2))) { - a = tolower(* (const unsigned char *) (src + i + 1)); - b = tolower(* (const unsigned char *) (src + i + 2)); - dst.push_back((char) ((HEXTOI(a) << 4) | HEXTOI(b))); - i += 2; - } else if (is_form_url_encoded && src[i] == '+') { - dst.push_back(' '); - } else { - dst.push_back(src[i]); + dst.clear(); + for (i = j = 0; i < (int)src_len; i++, j++) { + if (src[i] == '%' && i < (int)src_len - 2 && + isxdigit(* (const unsigned char *) (src + i + 1)) && + isxdigit(* (const unsigned char *) (src + i + 2))) { + a = tolower(* (const unsigned char *) (src + i + 1)); + b = tolower(* (const unsigned char *) (src + i + 2)); + dst.push_back((char) ((HEXTOI(a) << 4) | HEXTOI(b))); + i += 2; + } else if (is_form_url_encoded && src[i] == '+') { + dst.push_back(' '); + } else { + dst.push_back(src[i]); + } } - } } bool CivetServer::getParam(struct mg_connection *conn, const char *name, - std::string &dst, size_t occurrence) { - const char *query = mg_get_request_info(conn)->query_string; - return getParam(query, strlen(query), name, dst, occurrence); + std::string &dst, size_t occurrence) +{ + const char *query = mg_get_request_info(conn)->query_string; + return getParam(query, strlen(query), name, dst, occurrence); } bool CivetServer::getParam(const char *data, size_t data_len, const char *name, - std::string &dst, size_t occurrence) { - const char *p, *e, *s; - size_t name_len; + std::string &dst, size_t occurrence) +{ + const char *p, *e, *s; + size_t name_len; - dst.clear(); - if (data == NULL || name == NULL || data_len == 0) { - return false; - } - name_len = strlen(name); - e = data + data_len; - - // data is "var1=val1&var2=val2...". Find variable first - for (p = data; p + name_len < e; p++) { - if ((p == data || p[-1] == '&') && p[name_len] == '=' && - !mg_strncasecmp(name, p, name_len) && 0 == occurrence--) { - - // Point p to variable value - p += name_len + 1; - - // Point s to the end of the value - s = (const char *) memchr(p, '&', (size_t)(e - p)); - if (s == NULL) { - s = e; - } - assert(s >= p); - - // Decode variable into destination buffer - urlDecode(p, (int)(s - p), dst, true); - return true; + dst.clear(); + if (data == NULL || name == NULL || data_len == 0) { + return false; } - } - return false; + name_len = strlen(name); + e = data + data_len; + + // data is "var1=val1&var2=val2...". Find variable first + for (p = data; p + name_len < e; p++) { + if ((p == data || p[-1] == '&') && p[name_len] == '=' && + !mg_strncasecmp(name, p, name_len) && 0 == occurrence--) { + + // Point p to variable value + p += name_len + 1; + + // Point s to the end of the value + s = (const char *) memchr(p, '&', (size_t)(e - p)); + if (s == NULL) { + s = e; + } + assert(s >= p); + + // Decode variable into destination buffer + urlDecode(p, (int)(s - p), dst, true); + return true; + } + } + return false; } void -CivetServer::urlEncode(const char *src, std::string &dst, bool append) { +CivetServer::urlEncode(const char *src, std::string &dst, bool append) +{ urlEncode(src, strlen(src), dst, append); } void -CivetServer::urlEncode(const char *src, size_t src_len, std::string &dst, bool append) { - static const char *dont_escape = "._-$,;~()"; - static const char *hex = "0123456789abcdef"; +CivetServer::urlEncode(const char *src, size_t src_len, std::string &dst, bool append) +{ + static const char *dont_escape = "._-$,;~()"; + static const char *hex = "0123456789abcdef"; - if (!append) - dst.clear(); + if (!append) + dst.clear(); - for (; src_len > 0; src++, src_len--) { - if (isalnum(*(const unsigned char *) src) || - strchr(dont_escape, * (const unsigned char *) src) != NULL) { - dst.push_back(*src); - } else { - dst.push_back('%'); - dst.push_back(hex[(* (const unsigned char *) src) >> 4]); - dst.push_back(hex[(* (const unsigned char *) src) & 0xf]); + for (; src_len > 0; src++, src_len--) { + if (isalnum(*(const unsigned char *) src) || + strchr(dont_escape, * (const unsigned char *) src) != NULL) { + dst.push_back(*src); + } else { + dst.push_back('%'); + dst.push_back(hex[(* (const unsigned char *) src) >> 4]); + dst.push_back(hex[(* (const unsigned char *) src) & 0xf]); + } } - } } diff --git a/src/civetweb.c b/src/civetweb.c index cea09e1d..d0de0d62 100644 --- a/src/civetweb.c +++ b/src/civetweb.c @@ -161,7 +161,9 @@ typedef long off_t; #endif // !fileno MINGW #defines fileno typedef HANDLE pthread_mutex_t; -typedef struct {HANDLE signal, broadcast;} pthread_cond_t; +typedef struct { + HANDLE signal, broadcast; +} pthread_cond_t; typedef DWORD pthread_t; #define pid_t HANDLE // MINGW typedefs pid_t to int. Using #define here. @@ -183,20 +185,20 @@ typedef __int64 int64_t; // POSIX dirent interface struct dirent { - char d_name[PATH_MAX]; + char d_name[PATH_MAX]; }; typedef struct DIR { - HANDLE handle; - WIN32_FIND_DATAW info; - struct dirent result; + HANDLE handle; + WIN32_FIND_DATAW info; + struct dirent result; } DIR; #ifndef HAVE_POLL struct pollfd { - SOCKET fd; - short events; - short revents; + SOCKET fd; + short events; + short revents; }; #define POLLIN 1 #endif @@ -265,8 +267,9 @@ typedef int SOCKET; #ifdef _WIN32 static CRITICAL_SECTION global_log_file_lock; -static pthread_t pthread_self(void) { - return GetCurrentThreadId(); +static pthread_t pthread_self(void) +{ + return GetCurrentThreadId(); } #endif // _WIN32 @@ -331,8 +334,8 @@ typedef struct ssl_method_st SSL_METHOD; typedef struct ssl_ctx_st SSL_CTX; struct ssl_func { - const char *name; // SSL function name - void (*ptr)(void); // Function pointer + const char *name; // SSL function name + void (*ptr)(void); // Function pointer }; #define SSL_free (* (void (*)(SSL *)) ssl_sw[0].ptr) @@ -374,379 +377,398 @@ struct ssl_func { // of respective functions. The macros above (like SSL_connect()) are really // just calling these functions indirectly via the pointer. static struct ssl_func ssl_sw[] = { - {"SSL_free", NULL}, - {"SSL_accept", NULL}, - {"SSL_connect", NULL}, - {"SSL_read", NULL}, - {"SSL_write", NULL}, - {"SSL_get_error", NULL}, - {"SSL_set_fd", NULL}, - {"SSL_new", NULL}, - {"SSL_CTX_new", NULL}, - {"SSLv23_server_method", NULL}, - {"SSL_library_init", NULL}, - {"SSL_CTX_use_PrivateKey_file", NULL}, - {"SSL_CTX_use_certificate_file",NULL}, - {"SSL_CTX_set_default_passwd_cb",NULL}, - {"SSL_CTX_free", NULL}, - {"SSL_load_error_strings", NULL}, - {"SSL_CTX_use_certificate_chain_file", NULL}, - {"SSLv23_client_method", NULL}, - {"SSL_pending", NULL}, - {"SSL_CTX_set_verify", NULL}, - {"SSL_shutdown", NULL}, - {NULL, NULL} + {"SSL_free", NULL}, + {"SSL_accept", NULL}, + {"SSL_connect", NULL}, + {"SSL_read", NULL}, + {"SSL_write", NULL}, + {"SSL_get_error", NULL}, + {"SSL_set_fd", NULL}, + {"SSL_new", NULL}, + {"SSL_CTX_new", NULL}, + {"SSLv23_server_method", NULL}, + {"SSL_library_init", NULL}, + {"SSL_CTX_use_PrivateKey_file", NULL}, + {"SSL_CTX_use_certificate_file",NULL}, + {"SSL_CTX_set_default_passwd_cb",NULL}, + {"SSL_CTX_free", NULL}, + {"SSL_load_error_strings", NULL}, + {"SSL_CTX_use_certificate_chain_file", NULL}, + {"SSLv23_client_method", NULL}, + {"SSL_pending", NULL}, + {"SSL_CTX_set_verify", NULL}, + {"SSL_shutdown", NULL}, + {NULL, NULL} }; // Similar array as ssl_sw. These functions could be located in different lib. #if !defined(NO_SSL) static struct ssl_func crypto_sw[] = { - {"CRYPTO_num_locks", NULL}, - {"CRYPTO_set_locking_callback", NULL}, - {"CRYPTO_set_id_callback", NULL}, - {"ERR_get_error", NULL}, - {"ERR_error_string", NULL}, - {NULL, NULL} + {"CRYPTO_num_locks", NULL}, + {"CRYPTO_set_locking_callback", NULL}, + {"CRYPTO_set_id_callback", NULL}, + {"ERR_get_error", NULL}, + {"ERR_error_string", NULL}, + {NULL, NULL} }; #endif // NO_SSL #endif // NO_SSL_DL static const char *month_names[] = { - "Jan", "Feb", "Mar", "Apr", "May", "Jun", - "Jul", "Aug", "Sep", "Oct", "Nov", "Dec" + "Jan", "Feb", "Mar", "Apr", "May", "Jun", + "Jul", "Aug", "Sep", "Oct", "Nov", "Dec" }; // Unified socket address. For IPv6 support, add IPv6 address structure // in the union u. union usa { - struct sockaddr sa; - struct sockaddr_in sin; + struct sockaddr sa; + struct sockaddr_in sin; #if defined(USE_IPV6) - struct sockaddr_in6 sin6; + struct sockaddr_in6 sin6; #endif }; // Describes a string (chunk of memory). struct vec { - const char *ptr; - size_t len; + const char *ptr; + size_t len; }; struct file { - int is_directory; - time_t modification_time; - int64_t size; - FILE *fp; - const char *membuf; // Non-NULL if file data is in memory - // set to 1 if the content is gzipped - // in which case we need a content-encoding: gzip header - int gzipped; + int is_directory; + time_t modification_time; + int64_t size; + FILE *fp; + const char *membuf; // Non-NULL if file data is in memory + // set to 1 if the content is gzipped + // in which case we need a content-encoding: gzip header + int gzipped; }; #define STRUCT_FILE_INITIALIZER {0, 0, 0, NULL, NULL, 0} // Describes listening socket, or socket which was accept()-ed by the master // thread and queued for future handling by the worker thread. struct socket { - SOCKET sock; // Listening socket - union usa lsa; // Local socket address - union usa rsa; // Remote socket address - unsigned is_ssl:1; // Is port SSL-ed - unsigned ssl_redir:1; // Is port supposed to redirect everything to SSL port + SOCKET sock; // Listening socket + union usa lsa; // Local socket address + union usa rsa; // Remote socket address + unsigned is_ssl:1; // Is port SSL-ed + unsigned ssl_redir:1; // Is port supposed to redirect everything to SSL port }; // NOTE(lsm): this enum shoulds be in sync with the config_options below. enum { - CGI_EXTENSIONS, CGI_ENVIRONMENT, PUT_DELETE_PASSWORDS_FILE, CGI_INTERPRETER, - PROTECT_URI, AUTHENTICATION_DOMAIN, SSI_EXTENSIONS, THROTTLE, - ACCESS_LOG_FILE, ENABLE_DIRECTORY_LISTING, ERROR_LOG_FILE, - GLOBAL_PASSWORDS_FILE, INDEX_FILES, ENABLE_KEEP_ALIVE, ACCESS_CONTROL_LIST, - EXTRA_MIME_TYPES, LISTENING_PORTS, DOCUMENT_ROOT, SSL_CERTIFICATE, - NUM_THREADS, RUN_AS_USER, REWRITE, HIDE_FILES, REQUEST_TIMEOUT, - NUM_OPTIONS + CGI_EXTENSIONS, CGI_ENVIRONMENT, PUT_DELETE_PASSWORDS_FILE, CGI_INTERPRETER, + PROTECT_URI, AUTHENTICATION_DOMAIN, SSI_EXTENSIONS, THROTTLE, + ACCESS_LOG_FILE, ENABLE_DIRECTORY_LISTING, ERROR_LOG_FILE, + GLOBAL_PASSWORDS_FILE, INDEX_FILES, ENABLE_KEEP_ALIVE, ACCESS_CONTROL_LIST, + EXTRA_MIME_TYPES, LISTENING_PORTS, DOCUMENT_ROOT, SSL_CERTIFICATE, + NUM_THREADS, RUN_AS_USER, REWRITE, HIDE_FILES, REQUEST_TIMEOUT, + NUM_OPTIONS }; static const char *config_options[] = { - "cgi_pattern", "**.cgi$|**.pl$|**.php$", - "cgi_environment", NULL, - "put_delete_auth_file", NULL, - "cgi_interpreter", NULL, - "protect_uri", NULL, - "authentication_domain", "mydomain.com", - "ssi_pattern", "**.shtml$|**.shtm$", - "throttle", NULL, - "access_log_file", NULL, - "enable_directory_listing", "yes", - "error_log_file", NULL, - "global_auth_file", NULL, - "index_files", + "cgi_pattern", "**.cgi$|**.pl$|**.php$", + "cgi_environment", NULL, + "put_delete_auth_file", NULL, + "cgi_interpreter", NULL, + "protect_uri", NULL, + "authentication_domain", "mydomain.com", + "ssi_pattern", "**.shtml$|**.shtm$", + "throttle", NULL, + "access_log_file", NULL, + "enable_directory_listing", "yes", + "error_log_file", NULL, + "global_auth_file", NULL, + "index_files", "index.html,index.htm,index.cgi,index.shtml,index.php,index.lp", - "enable_keep_alive", "no", - "access_control_list", NULL, - "extra_mime_types", NULL, - "listening_ports", "8080", - "document_root", NULL, - "ssl_certificate", NULL, - "num_threads", "50", - "run_as_user", NULL, - "url_rewrite_patterns", NULL, - "hide_files_patterns", NULL, - "request_timeout_ms", "30000", - NULL + "enable_keep_alive", "no", + "access_control_list", NULL, + "extra_mime_types", NULL, + "listening_ports", "8080", + "document_root", NULL, + "ssl_certificate", NULL, + "num_threads", "50", + "run_as_user", NULL, + "url_rewrite_patterns", NULL, + "hide_files_patterns", NULL, + "request_timeout_ms", "30000", + NULL }; struct mg_request_handler_info { - char *uri; - size_t uri_len; - mg_request_handler handler; - void *cbdata; - struct mg_request_handler_info *next; + char *uri; + size_t uri_len; + mg_request_handler handler; + void *cbdata; + struct mg_request_handler_info *next; }; struct mg_context { - volatile int stop_flag; // Should we stop event loop - SSL_CTX *ssl_ctx; // SSL context - char *config[NUM_OPTIONS]; // Civetweb configuration parameters - struct mg_callbacks callbacks; // User-defined callback function - void *user_data; // User-defined data + volatile int stop_flag; // Should we stop event loop + SSL_CTX *ssl_ctx; // SSL context + char *config[NUM_OPTIONS]; // Civetweb configuration parameters + struct mg_callbacks callbacks; // User-defined callback function + void *user_data; // User-defined data - struct socket *listening_sockets; - int num_listening_sockets; + struct socket *listening_sockets; + int num_listening_sockets; - volatile int num_threads; // Number of threads - pthread_mutex_t mutex; // Protects (max|num)_threads - pthread_cond_t cond; // Condvar for tracking workers terminations + volatile int num_threads; // Number of threads + pthread_mutex_t mutex; // Protects (max|num)_threads + pthread_cond_t cond; // Condvar for tracking workers terminations - struct socket queue[MGSQLEN]; // Accepted sockets - volatile int sq_head; // Head of the socket queue - volatile int sq_tail; // Tail of the socket queue - pthread_cond_t sq_full; // Signaled when socket is produced - pthread_cond_t sq_empty; // Signaled when socket is consumed + struct socket queue[MGSQLEN]; // Accepted sockets + volatile int sq_head; // Head of the socket queue + volatile int sq_tail; // Tail of the socket queue + pthread_cond_t sq_full; // Signaled when socket is produced + pthread_cond_t sq_empty; // Signaled when socket is consumed - // linked list of uri handlers - struct mg_request_handler_info *request_handlers; + // linked list of uri handlers + struct mg_request_handler_info *request_handlers; }; struct mg_connection { - struct mg_request_info request_info; - struct mg_context *ctx; - SSL *ssl; // SSL descriptor - SSL_CTX *client_ssl_ctx; // SSL context for client connections - struct socket client; // Connected client - time_t birth_time; // Time when request was received - int64_t num_bytes_sent; // Total bytes sent to client - int64_t content_len; // Content-Length header value - int64_t consumed_content; // How many bytes of content have been read - char *buf; // Buffer for received data - char *path_info; // PATH_INFO part of the URL - int must_close; // 1 if connection must be closed - int buf_size; // Buffer size - int request_len; // Size of the request + headers in a buffer - int data_len; // Total size of data in a buffer - int status_code; // HTTP reply status code, e.g. 200 - int throttle; // Throttling, bytes/sec. <= 0 means no throttle - time_t last_throttle_time; // Last time throttled data was sent - int64_t last_throttle_bytes;// Bytes sent this second - pthread_mutex_t mutex; // Used by mg_lock/mg_unlock to ensure atomic transmissions for websockets + struct mg_request_info request_info; + struct mg_context *ctx; + SSL *ssl; // SSL descriptor + SSL_CTX *client_ssl_ctx; // SSL context for client connections + struct socket client; // Connected client + time_t birth_time; // Time when request was received + int64_t num_bytes_sent; // Total bytes sent to client + int64_t content_len; // Content-Length header value + int64_t consumed_content; // How many bytes of content have been read + char *buf; // Buffer for received data + char *path_info; // PATH_INFO part of the URL + int must_close; // 1 if connection must be closed + int buf_size; // Buffer size + int request_len; // Size of the request + headers in a buffer + int data_len; // Total size of data in a buffer + int status_code; // HTTP reply status code, e.g. 200 + int throttle; // Throttling, bytes/sec. <= 0 means no throttle + time_t last_throttle_time; // Last time throttled data was sent + int64_t last_throttle_bytes;// Bytes sent this second + pthread_mutex_t mutex; // Used by mg_lock/mg_unlock to ensure atomic transmissions for websockets }; // Directory entry struct de { - struct mg_connection *conn; - char *file_name; - struct file file; + struct mg_connection *conn; + char *file_name; + struct file file; }; -const char **mg_get_valid_option_names(void) { - return config_options; +const char **mg_get_valid_option_names(void) +{ + return config_options; } static int is_file_in_memory(struct mg_connection *conn, const char *path, - struct file *filep) { - size_t size = 0; - if ((filep->membuf = conn->ctx->callbacks.open_file == NULL ? NULL : - conn->ctx->callbacks.open_file(conn, path, &size)) != NULL) { - // NOTE: override filep->size only on success. Otherwise, it might break - // constructs like if (!mg_stat() || !mg_fopen()) ... - filep->size = size; - } - return filep->membuf != NULL; + struct file *filep) +{ + size_t size = 0; + if ((filep->membuf = conn->ctx->callbacks.open_file == NULL ? NULL : + conn->ctx->callbacks.open_file(conn, path, &size)) != NULL) { + // NOTE: override filep->size only on success. Otherwise, it might break + // constructs like if (!mg_stat() || !mg_fopen()) ... + filep->size = size; + } + return filep->membuf != NULL; } -static int is_file_opened(const struct file *filep) { - return filep->membuf != NULL || filep->fp != NULL; +static int is_file_opened(const struct file *filep) +{ + return filep->membuf != NULL || filep->fp != NULL; } static int mg_fopen(struct mg_connection *conn, const char *path, - const char *mode, struct file *filep) { - if (!is_file_in_memory(conn, path, filep)) { + const char *mode, struct file *filep) +{ + if (!is_file_in_memory(conn, path, filep)) { #ifdef _WIN32 - wchar_t wbuf[PATH_MAX], wmode[20]; - to_unicode(path, wbuf, ARRAY_SIZE(wbuf)); - MultiByteToWideChar(CP_UTF8, 0, mode, -1, wmode, ARRAY_SIZE(wmode)); - filep->fp = _wfopen(wbuf, wmode); + wchar_t wbuf[PATH_MAX], wmode[20]; + to_unicode(path, wbuf, ARRAY_SIZE(wbuf)); + MultiByteToWideChar(CP_UTF8, 0, mode, -1, wmode, ARRAY_SIZE(wmode)); + filep->fp = _wfopen(wbuf, wmode); #else - filep->fp = fopen(path, mode); + filep->fp = fopen(path, mode); #endif - } - - return is_file_opened(filep); -} - -static void mg_fclose(struct file *filep) { - if (filep != NULL && filep->fp != NULL) { - fclose(filep->fp); - } -} - -static int get_option_index(const char *name) { - int i; - - for (i = 0; config_options[i * 2] != NULL; i++) { - if (strcmp(config_options[i * 2], name) == 0) { - return i; } - } - return -1; + + return is_file_opened(filep); } -const char *mg_get_option(const struct mg_context *ctx, const char *name) { - int i; - if ((i = get_option_index(name)) == -1) { - return NULL; - } else if (ctx->config[i] == NULL) { - return ""; - } else { - return ctx->config[i]; - } +static void mg_fclose(struct file *filep) +{ + if (filep != NULL && filep->fp != NULL) { + fclose(filep->fp); + } +} + +static int get_option_index(const char *name) +{ + int i; + + for (i = 0; config_options[i * 2] != NULL; i++) { + if (strcmp(config_options[i * 2], name) == 0) { + return i; + } + } + return -1; +} + +const char *mg_get_option(const struct mg_context *ctx, const char *name) +{ + int i; + if ((i = get_option_index(name)) == -1) { + return NULL; + } else if (ctx->config[i] == NULL) { + return ""; + } else { + return ctx->config[i]; + } } static void sockaddr_to_string(char *buf, size_t len, - const union usa *usa) { - buf[0] = '\0'; + const union usa *usa) +{ + buf[0] = '\0'; #if defined(USE_IPV6) - inet_ntop(usa->sa.sa_family, usa->sa.sa_family == AF_INET ? - (void *) &usa->sin.sin_addr : - (void *) &usa->sin6.sin6_addr, buf, len); + inet_ntop(usa->sa.sa_family, usa->sa.sa_family == AF_INET ? + (void *) &usa->sin.sin_addr : + (void *) &usa->sin6.sin6_addr, buf, len); #elif defined(_WIN32) - // Only Windoze Vista (and newer) have inet_ntop() - strncpy(buf, inet_ntoa(usa->sin.sin_addr), len); + // Only Windoze Vista (and newer) have inet_ntop() + strncpy(buf, inet_ntoa(usa->sin.sin_addr), len); #else - inet_ntop(usa->sa.sa_family, (void *) &usa->sin.sin_addr, buf, len); + inet_ntop(usa->sa.sa_family, (void *) &usa->sin.sin_addr, buf, len); #endif } // Print error message to the opened error log stream. -void mg_cry(struct mg_connection *conn, const char *fmt, ...) { - char buf[MG_BUF_LEN], src_addr[IP_ADDR_STR_LEN]; - va_list ap; - FILE *fp; - time_t timestamp; +void mg_cry(struct mg_connection *conn, const char *fmt, ...) +{ + char buf[MG_BUF_LEN], src_addr[IP_ADDR_STR_LEN]; + va_list ap; + FILE *fp; + time_t timestamp; - va_start(ap, fmt); - (void) vsnprintf(buf, sizeof(buf), fmt, ap); - va_end(ap); + va_start(ap, fmt); + (void) vsnprintf(buf, sizeof(buf), fmt, ap); + va_end(ap); - // Do not lock when getting the callback value, here and below. - // I suppose this is fine, since function cannot disappear in the - // same way string option can. - if (conn->ctx->callbacks.log_message == NULL || - conn->ctx->callbacks.log_message(conn, buf) == 0) { - fp = conn->ctx == NULL || conn->ctx->config[ERROR_LOG_FILE] == NULL ? NULL : - fopen(conn->ctx->config[ERROR_LOG_FILE], "a+"); + // Do not lock when getting the callback value, here and below. + // I suppose this is fine, since function cannot disappear in the + // same way string option can. + if (conn->ctx->callbacks.log_message == NULL || + conn->ctx->callbacks.log_message(conn, buf) == 0) { + fp = conn->ctx == NULL || conn->ctx->config[ERROR_LOG_FILE] == NULL ? NULL : + fopen(conn->ctx->config[ERROR_LOG_FILE], "a+"); - if (fp != NULL) { - flockfile(fp); - timestamp = time(NULL); + if (fp != NULL) { + flockfile(fp); + timestamp = time(NULL); - sockaddr_to_string(src_addr, sizeof(src_addr), &conn->client.rsa); - fprintf(fp, "[%010lu] [error] [client %s] ", (unsigned long) timestamp, - src_addr); + sockaddr_to_string(src_addr, sizeof(src_addr), &conn->client.rsa); + fprintf(fp, "[%010lu] [error] [client %s] ", (unsigned long) timestamp, + src_addr); - if (conn->request_info.request_method != NULL) { - fprintf(fp, "%s %s: ", conn->request_info.request_method, - conn->request_info.uri); - } + if (conn->request_info.request_method != NULL) { + fprintf(fp, "%s %s: ", conn->request_info.request_method, + conn->request_info.uri); + } - fprintf(fp, "%s", buf); - fputc('\n', fp); - funlockfile(fp); - fclose(fp); + fprintf(fp, "%s", buf); + fputc('\n', fp); + funlockfile(fp); + fclose(fp); + } } - } } // Return fake connection structure. Used for logging, if connection // is not applicable at the moment of logging. -static struct mg_connection *fc(struct mg_context *ctx) { - static struct mg_connection fake_connection; - fake_connection.ctx = ctx; - return &fake_connection; +static struct mg_connection *fc(struct mg_context *ctx) +{ + static struct mg_connection fake_connection; + fake_connection.ctx = ctx; + return &fake_connection; } -const char *mg_version(void) { - return CIVETWEB_VERSION; +const char *mg_version(void) +{ + return CIVETWEB_VERSION; } -struct mg_request_info *mg_get_request_info(struct mg_connection *conn) { - return &conn->request_info; +struct mg_request_info *mg_get_request_info(struct mg_connection *conn) +{ + return &conn->request_info; } -static void mg_strlcpy(register char *dst, register const char *src, size_t n) { - for (; *src != '\0' && n > 1; n--) { - *dst++ = *src++; - } - *dst = '\0'; -} - -static int lowercase(const char *s) { - return tolower(* (const unsigned char *) s); -} - -int mg_strncasecmp(const char *s1, const char *s2, size_t len) { - int diff = 0; - - if (len > 0) - do { - diff = lowercase(s1++) - lowercase(s2++); - } while (diff == 0 && s1[-1] != '\0' && --len > 0); - - return diff; -} - -static int mg_strcasecmp(const char *s1, const char *s2) { - int diff; - - do { - diff = lowercase(s1++) - lowercase(s2++); - } while (diff == 0 && s1[-1] != '\0'); - - return diff; -} - -static char * mg_strndup(const char *ptr, size_t len) { - char *p; - - if ((p = (char *) malloc(len + 1)) != NULL) { - mg_strlcpy(p, ptr, len + 1); - } - - return p; -} - -static char * mg_strdup(const char *str) { - return mg_strndup(str, strlen(str)); -} - -static const char *mg_strcasestr(const char *big_str, const char *small_str) { - int i, big_len = (int)strlen(big_str), small_len = (int)strlen(small_str); - - for (i = 0; i <= big_len - small_len; i++) { - if (mg_strncasecmp(big_str + i, small_str, small_len) == 0) { - return big_str + i; +static void mg_strlcpy(register char *dst, register const char *src, size_t n) +{ + for (; *src != '\0' && n > 1; n--) { + *dst++ = *src++; } - } + *dst = '\0'; +} - return NULL; +static int lowercase(const char *s) +{ + return tolower(* (const unsigned char *) s); +} + +int mg_strncasecmp(const char *s1, const char *s2, size_t len) +{ + int diff = 0; + + if (len > 0) + do { + diff = lowercase(s1++) - lowercase(s2++); + } while (diff == 0 && s1[-1] != '\0' && --len > 0); + + return diff; +} + +static int mg_strcasecmp(const char *s1, const char *s2) +{ + int diff; + + do { + diff = lowercase(s1++) - lowercase(s2++); + } while (diff == 0 && s1[-1] != '\0'); + + return diff; +} + +static char * mg_strndup(const char *ptr, size_t len) +{ + char *p; + + if ((p = (char *) malloc(len + 1)) != NULL) { + mg_strlcpy(p, ptr, len + 1); + } + + return p; +} + +static char * mg_strdup(const char *str) +{ + return mg_strndup(str, strlen(str)); +} + +static const char *mg_strcasestr(const char *big_str, const char *small_str) +{ + int i, big_len = (int)strlen(big_str), small_len = (int)strlen(small_str); + + for (i = 0; i <= big_len - small_len; i++) { + if (mg_strncasecmp(big_str + i, small_str, small_len) == 0) { + return big_str + i; + } + } + + return NULL; } // Like snprintf(), but never returns negative value, or a value @@ -754,41 +776,43 @@ static const char *mg_strcasestr(const char *big_str, const char *small_str) { // Thanks to Adam Zeldis to pointing snprintf()-caused vulnerability // in his audit report. static int mg_vsnprintf(struct mg_connection *conn, char *buf, size_t buflen, - const char *fmt, va_list ap) { - int n; + const char *fmt, va_list ap) +{ + int n; - if (buflen == 0) - return 0; + if (buflen == 0) + return 0; - n = vsnprintf(buf, buflen, fmt, ap); + n = vsnprintf(buf, buflen, fmt, ap); - if (n < 0) { - mg_cry(conn, "vsnprintf error"); - n = 0; - } else if (n >= (int) buflen) { - mg_cry(conn, "truncating vsnprintf buffer: [%.*s]", - n > 200 ? 200 : n, buf); - n = (int) buflen - 1; - } - buf[n] = '\0'; + if (n < 0) { + mg_cry(conn, "vsnprintf error"); + n = 0; + } else if (n >= (int) buflen) { + mg_cry(conn, "truncating vsnprintf buffer: [%.*s]", + n > 200 ? 200 : n, buf); + n = (int) buflen - 1; + } + buf[n] = '\0'; - return n; + return n; } static int mg_snprintf(struct mg_connection *conn, char *buf, size_t buflen, PRINTF_FORMAT_STRING(const char *fmt), ...) - PRINTF_ARGS(4, 5); +PRINTF_ARGS(4, 5); static int mg_snprintf(struct mg_connection *conn, char *buf, size_t buflen, - const char *fmt, ...) { - va_list ap; - int n; + const char *fmt, ...) +{ + va_list ap; + int n; - va_start(ap, fmt); - n = mg_vsnprintf(conn, buf, buflen, fmt, ap); - va_end(ap); + va_start(ap, fmt); + n = mg_vsnprintf(conn, buf, buflen, fmt, ap); + va_end(ap); - return n; + return n; } // Skip the characters until one of the delimiters characters found. @@ -796,68 +820,72 @@ static int mg_snprintf(struct mg_connection *conn, char *buf, size_t buflen, // Advance pointer to buffer to the next word. Return found 0-terminated word. // Delimiters can be quoted with quotechar. static char *skip_quoted(char **buf, const char *delimiters, - const char *whitespace, char quotechar) { - char *p, *begin_word, *end_word, *end_whitespace; + const char *whitespace, char quotechar) +{ + char *p, *begin_word, *end_word, *end_whitespace; - begin_word = *buf; - end_word = begin_word + strcspn(begin_word, delimiters); + begin_word = *buf; + end_word = begin_word + strcspn(begin_word, delimiters); - // Check for quotechar - if (end_word > begin_word) { - p = end_word - 1; - while (*p == quotechar) { - // If there is anything beyond end_word, copy it - if (*end_word == '\0') { - *p = '\0'; - break; - } else { - size_t end_off = strcspn(end_word + 1, delimiters); - memmove (p, end_word, end_off + 1); - p += end_off; // p must correspond to end_word - 1 - end_word += end_off + 1; - } - } - for (p++; p < end_word; p++) { - *p = '\0'; - } - } - - if (*end_word == '\0') { - *buf = end_word; - } else { - end_whitespace = end_word + 1 + strspn(end_word + 1, whitespace); - - for (p = end_word; p < end_whitespace; p++) { - *p = '\0'; + // Check for quotechar + if (end_word > begin_word) { + p = end_word - 1; + while (*p == quotechar) { + // If there is anything beyond end_word, copy it + if (*end_word == '\0') { + *p = '\0'; + break; + } else { + size_t end_off = strcspn(end_word + 1, delimiters); + memmove (p, end_word, end_off + 1); + p += end_off; // p must correspond to end_word - 1 + end_word += end_off + 1; + } + } + for (p++; p < end_word; p++) { + *p = '\0'; + } } - *buf = end_whitespace; - } + if (*end_word == '\0') { + *buf = end_word; + } else { + end_whitespace = end_word + 1 + strspn(end_word + 1, whitespace); - return begin_word; + for (p = end_word; p < end_whitespace; p++) { + *p = '\0'; + } + + *buf = end_whitespace; + } + + return begin_word; } // Simplified version of skip_quoted without quote char // and whitespace == delimiters -static char *skip(char **buf, const char *delimiters) { - return skip_quoted(buf, delimiters, delimiters, 0); +static char *skip(char **buf, const char *delimiters) +{ + return skip_quoted(buf, delimiters, delimiters, 0); } // Return HTTP header value, or NULL if not found. static const char *get_header(const struct mg_request_info *ri, - const char *name) { - int i; + const char *name) +{ + int i; - for (i = 0; i < ri->num_headers; i++) - if (!mg_strcasecmp(name, ri->http_headers[i].name)) - return ri->http_headers[i].value; + for (i = 0; i < ri->num_headers; i++) + if (!mg_strcasecmp(name, ri->http_headers[i].name)) + return ri->http_headers[i].value; - return NULL; + return NULL; } -const char *mg_get_header(const struct mg_connection *conn, const char *name) { - return get_header(&conn->request_info, name); +const char *mg_get_header(const struct mg_connection *conn, const char *name) +{ + return get_header(&conn->request_info, name); } // A helper function for traversing a comma separated list of values. @@ -867,267 +895,287 @@ const char *mg_get_header(const struct mg_connection *conn, const char *name) { // vector is initialized to point to the "y" part, and val vector length // is adjusted to point only to "x". static const char *next_option(const char *list, struct vec *val, - struct vec *eq_val) { - if (list == NULL || *list == '\0') { - // End of the list - list = NULL; - } else { - val->ptr = list; - if ((list = strchr(val->ptr, ',')) != NULL) { - // Comma found. Store length and shift the list ptr - val->len = list - val->ptr; - list++; + struct vec *eq_val) +{ + if (list == NULL || *list == '\0') { + // End of the list + list = NULL; } else { - // This value is the last one - list = val->ptr + strlen(val->ptr); - val->len = list - val->ptr; + val->ptr = list; + if ((list = strchr(val->ptr, ',')) != NULL) { + // Comma found. Store length and shift the list ptr + val->len = list - val->ptr; + list++; + } else { + // This value is the last one + list = val->ptr + strlen(val->ptr); + val->len = list - val->ptr; + } + + if (eq_val != NULL) { + // Value has form "x=y", adjust pointers and lengths + // so that val points to "x", and eq_val points to "y". + eq_val->len = 0; + eq_val->ptr = (const char *) memchr(val->ptr, '=', val->len); + if (eq_val->ptr != NULL) { + eq_val->ptr++; // Skip over '=' character + eq_val->len = val->ptr + val->len - eq_val->ptr; + val->len = (eq_val->ptr - val->ptr) - 1; + } + } } - if (eq_val != NULL) { - // Value has form "x=y", adjust pointers and lengths - // so that val points to "x", and eq_val points to "y". - eq_val->len = 0; - eq_val->ptr = (const char *) memchr(val->ptr, '=', val->len); - if (eq_val->ptr != NULL) { - eq_val->ptr++; // Skip over '=' character - eq_val->len = val->ptr + val->len - eq_val->ptr; - val->len = (eq_val->ptr - val->ptr) - 1; - } - } - } - - return list; + return list; } // Perform case-insensitive match of string against pattern -static int match_prefix(const char *pattern, int pattern_len, const char *str) { - const char *or_str; - int i, j, len, res; +static int match_prefix(const char *pattern, int pattern_len, const char *str) +{ + const char *or_str; + int i, j, len, res; - if ((or_str = (const char *) memchr(pattern, '|', pattern_len)) != NULL) { - res = match_prefix(pattern, (int)(or_str - pattern), str); - return res > 0 ? res : - match_prefix(or_str + 1, (int)((pattern + pattern_len) - (or_str + 1)), str); - } - - i = j = 0; - res = -1; - for (; i < pattern_len; i++, j++) { - if (pattern[i] == '?' && str[j] != '\0') { - continue; - } else if (pattern[i] == '$') { - return str[j] == '\0' ? j : -1; - } else if (pattern[i] == '*') { - i++; - if (pattern[i] == '*') { - i++; - len = (int) strlen(str + j); - } else { - len = (int) strcspn(str + j, "/"); - } - if (i == pattern_len) { - return j + len; - } - do { - res = match_prefix(pattern + i, pattern_len - i, str + j + len); - } while (res == -1 && len-- > 0); - return res == -1 ? -1 : j + res + len; - } else if (lowercase(&pattern[i]) != lowercase(&str[j])) { - return -1; + if ((or_str = (const char *) memchr(pattern, '|', pattern_len)) != NULL) { + res = match_prefix(pattern, (int)(or_str - pattern), str); + return res > 0 ? res : + match_prefix(or_str + 1, (int)((pattern + pattern_len) - (or_str + 1)), str); } - } - return j; + + i = j = 0; + res = -1; + for (; i < pattern_len; i++, j++) { + if (pattern[i] == '?' && str[j] != '\0') { + continue; + } else if (pattern[i] == '$') { + return str[j] == '\0' ? j : -1; + } else if (pattern[i] == '*') { + i++; + if (pattern[i] == '*') { + i++; + len = (int) strlen(str + j); + } else { + len = (int) strcspn(str + j, "/"); + } + if (i == pattern_len) { + return j + len; + } + do { + res = match_prefix(pattern + i, pattern_len - i, str + j + len); + } while (res == -1 && len-- > 0); + return res == -1 ? -1 : j + res + len; + } else if (lowercase(&pattern[i]) != lowercase(&str[j])) { + return -1; + } + } + return j; } // HTTP 1.1 assumes keep alive if "Connection:" header is not set // This function must tolerate situations when connection info is not // set up, for example if request parsing failed. -static int should_keep_alive(const struct mg_connection *conn) { - const char *http_version = conn->request_info.http_version; - const char *header = mg_get_header(conn, "Connection"); - if (conn->must_close || - conn->status_code == 401 || - mg_strcasecmp(conn->ctx->config[ENABLE_KEEP_ALIVE], "yes") != 0 || - (header != NULL && mg_strcasecmp(header, "keep-alive") != 0) || - (header == NULL && http_version && strcmp(http_version, "1.1"))) { - return 0; - } - return 1; +static int should_keep_alive(const struct mg_connection *conn) +{ + const char *http_version = conn->request_info.http_version; + const char *header = mg_get_header(conn, "Connection"); + if (conn->must_close || + conn->status_code == 401 || + mg_strcasecmp(conn->ctx->config[ENABLE_KEEP_ALIVE], "yes") != 0 || + (header != NULL && mg_strcasecmp(header, "keep-alive") != 0) || + (header == NULL && http_version && strcmp(http_version, "1.1"))) { + return 0; + } + return 1; } -static const char *suggest_connection_header(const struct mg_connection *conn) { - return should_keep_alive(conn) ? "keep-alive" : "close"; +static const char *suggest_connection_header(const struct mg_connection *conn) +{ + return should_keep_alive(conn) ? "keep-alive" : "close"; } static void send_http_error(struct mg_connection *, int, const char *, PRINTF_FORMAT_STRING(const char *fmt), ...) - PRINTF_ARGS(4, 5); +PRINTF_ARGS(4, 5); static void send_http_error(struct mg_connection *conn, int status, - const char *reason, const char *fmt, ...) { - char buf[MG_BUF_LEN]; - va_list ap; - int len = 0; + const char *reason, const char *fmt, ...) +{ + char buf[MG_BUF_LEN]; + va_list ap; + int len = 0; - conn->status_code = status; - if (conn->ctx->callbacks.http_error == NULL || - conn->ctx->callbacks.http_error(conn, status)) { - buf[0] = '\0'; + conn->status_code = status; + if (conn->ctx->callbacks.http_error == NULL || + conn->ctx->callbacks.http_error(conn, status)) { + buf[0] = '\0'; - // Errors 1xx, 204 and 304 MUST NOT send a body - if (status > 199 && status != 204 && status != 304) { - len = mg_snprintf(conn, buf, sizeof(buf), "Error %d: %s", status, reason); - buf[len++] = '\n'; + // Errors 1xx, 204 and 304 MUST NOT send a body + if (status > 199 && status != 204 && status != 304) { + len = mg_snprintf(conn, buf, sizeof(buf), "Error %d: %s", status, reason); + buf[len++] = '\n'; - va_start(ap, fmt); - len += mg_vsnprintf(conn, buf + len, sizeof(buf) - len, fmt, ap); - va_end(ap); + va_start(ap, fmt); + len += mg_vsnprintf(conn, buf + len, sizeof(buf) - len, fmt, ap); + va_end(ap); + } + DEBUG_TRACE(("[%s]", buf)); + + mg_printf(conn, "HTTP/1.1 %d %s\r\n" + "Content-Length: %d\r\n" + "Connection: %s\r\n\r\n", status, reason, len, + suggest_connection_header(conn)); + conn->num_bytes_sent += mg_printf(conn, "%s", buf); } - DEBUG_TRACE(("[%s]", buf)); - - mg_printf(conn, "HTTP/1.1 %d %s\r\n" - "Content-Length: %d\r\n" - "Connection: %s\r\n\r\n", status, reason, len, - suggest_connection_header(conn)); - conn->num_bytes_sent += mg_printf(conn, "%s", buf); - } } #if defined(_WIN32) && !defined(__SYMBIAN32__) -static int pthread_mutex_init(pthread_mutex_t *mutex, void *unused) { - (void) unused; - *mutex = CreateMutex(NULL, FALSE, NULL); - return *mutex == NULL ? -1 : 0; +static int pthread_mutex_init(pthread_mutex_t *mutex, void *unused) +{ + (void) unused; + *mutex = CreateMutex(NULL, FALSE, NULL); + return *mutex == NULL ? -1 : 0; } -static int pthread_mutex_destroy(pthread_mutex_t *mutex) { - return CloseHandle(*mutex) == 0 ? -1 : 0; +static int pthread_mutex_destroy(pthread_mutex_t *mutex) +{ + return CloseHandle(*mutex) == 0 ? -1 : 0; } -static int pthread_mutex_lock(pthread_mutex_t *mutex) { - return WaitForSingleObject(*mutex, INFINITE) == WAIT_OBJECT_0? 0 : -1; +static int pthread_mutex_lock(pthread_mutex_t *mutex) +{ + return WaitForSingleObject(*mutex, INFINITE) == WAIT_OBJECT_0? 0 : -1; } -static int pthread_mutex_unlock(pthread_mutex_t *mutex) { - return ReleaseMutex(*mutex) == 0 ? -1 : 0; +static int pthread_mutex_unlock(pthread_mutex_t *mutex) +{ + return ReleaseMutex(*mutex) == 0 ? -1 : 0; } -static int pthread_cond_init(pthread_cond_t *cv, const void *unused) { - (void) unused; - cv->signal = CreateEvent(NULL, FALSE, FALSE, NULL); - cv->broadcast = CreateEvent(NULL, TRUE, FALSE, NULL); - return cv->signal != NULL && cv->broadcast != NULL ? 0 : -1; +static int pthread_cond_init(pthread_cond_t *cv, const void *unused) +{ + (void) unused; + cv->signal = CreateEvent(NULL, FALSE, FALSE, NULL); + cv->broadcast = CreateEvent(NULL, TRUE, FALSE, NULL); + return cv->signal != NULL && cv->broadcast != NULL ? 0 : -1; } -static int pthread_cond_wait(pthread_cond_t *cv, pthread_mutex_t *mutex) { - HANDLE handles[] = {cv->signal, cv->broadcast}; - ReleaseMutex(*mutex); - WaitForMultipleObjects(2, handles, FALSE, INFINITE); - return WaitForSingleObject(*mutex, INFINITE) == WAIT_OBJECT_0? 0 : -1; +static int pthread_cond_wait(pthread_cond_t *cv, pthread_mutex_t *mutex) +{ + HANDLE handles[] = {cv->signal, cv->broadcast}; + ReleaseMutex(*mutex); + WaitForMultipleObjects(2, handles, FALSE, INFINITE); + return WaitForSingleObject(*mutex, INFINITE) == WAIT_OBJECT_0? 0 : -1; } -static int pthread_cond_signal(pthread_cond_t *cv) { - return SetEvent(cv->signal) == 0 ? -1 : 0; +static int pthread_cond_signal(pthread_cond_t *cv) +{ + return SetEvent(cv->signal) == 0 ? -1 : 0; } -static int pthread_cond_broadcast(pthread_cond_t *cv) { - // Implementation with PulseEvent() has race condition, see - // http://www.cs.wustl.edu/~schmidt/win32-cv-1.html - return PulseEvent(cv->broadcast) == 0 ? -1 : 0; +static int pthread_cond_broadcast(pthread_cond_t *cv) +{ + // Implementation with PulseEvent() has race condition, see + // http://www.cs.wustl.edu/~schmidt/win32-cv-1.html + return PulseEvent(cv->broadcast) == 0 ? -1 : 0; } -static int pthread_cond_destroy(pthread_cond_t *cv) { - return CloseHandle(cv->signal) && CloseHandle(cv->broadcast) ? 0 : -1; +static int pthread_cond_destroy(pthread_cond_t *cv) +{ + return CloseHandle(cv->signal) && CloseHandle(cv->broadcast) ? 0 : -1; } // For Windows, change all slashes to backslashes in path names. -static void change_slashes_to_backslashes(char *path) { - int i; +static void change_slashes_to_backslashes(char *path) +{ + int i; - for (i = 0; path[i] != '\0'; i++) { - if (path[i] == '/') - path[i] = '\\'; - // i > 0 check is to preserve UNC paths, like \\server\file.txt - if (path[i] == '\\' && i > 0) - while (path[i + 1] == '\\' || path[i + 1] == '/') - (void) memmove(path + i + 1, - path + i + 2, strlen(path + i + 1)); - } + for (i = 0; path[i] != '\0'; i++) { + if (path[i] == '/') + path[i] = '\\'; + // i > 0 check is to preserve UNC paths, like \\server\file.txt + if (path[i] == '\\' && i > 0) + while (path[i + 1] == '\\' || path[i + 1] == '/') + (void) memmove(path + i + 1, + path + i + 2, strlen(path + i + 1)); + } } // Encode 'path' which is assumed UTF-8 string, into UNICODE string. // wbuf and wbuf_len is a target buffer and its length. -static void to_unicode(const char *path, wchar_t *wbuf, size_t wbuf_len) { - char buf[PATH_MAX], buf2[PATH_MAX]; +static void to_unicode(const char *path, wchar_t *wbuf, size_t wbuf_len) +{ + char buf[PATH_MAX], buf2[PATH_MAX]; - mg_strlcpy(buf, path, sizeof(buf)); - change_slashes_to_backslashes(buf); + mg_strlcpy(buf, path, sizeof(buf)); + change_slashes_to_backslashes(buf); - // Convert to Unicode and back. If doubly-converted string does not - // match the original, something is fishy, reject. - memset(wbuf, 0, wbuf_len * sizeof(wchar_t)); - MultiByteToWideChar(CP_UTF8, 0, buf, -1, wbuf, (int) wbuf_len); - WideCharToMultiByte(CP_UTF8, 0, wbuf, (int) wbuf_len, buf2, sizeof(buf2), - NULL, NULL); - if (strcmp(buf, buf2) != 0) { - wbuf[0] = L'\0'; - } + // Convert to Unicode and back. If doubly-converted string does not + // match the original, something is fishy, reject. + memset(wbuf, 0, wbuf_len * sizeof(wchar_t)); + MultiByteToWideChar(CP_UTF8, 0, buf, -1, wbuf, (int) wbuf_len); + WideCharToMultiByte(CP_UTF8, 0, wbuf, (int) wbuf_len, buf2, sizeof(buf2), + NULL, NULL); + if (strcmp(buf, buf2) != 0) { + wbuf[0] = L'\0'; + } } #if defined(_WIN32_WCE) -static time_t time(time_t *ptime) { - time_t t; - SYSTEMTIME st; - FILETIME ft; +static time_t time(time_t *ptime) +{ + time_t t; + SYSTEMTIME st; + FILETIME ft; - GetSystemTime(&st); - SystemTimeToFileTime(&st, &ft); - t = SYS2UNIX_TIME(ft.dwLowDateTime, ft.dwHighDateTime); + GetSystemTime(&st); + SystemTimeToFileTime(&st, &ft); + t = SYS2UNIX_TIME(ft.dwLowDateTime, ft.dwHighDateTime); - if (ptime != NULL) { - *ptime = t; - } + if (ptime != NULL) { + *ptime = t; + } - return t; + return t; } -static struct tm *localtime(const time_t *ptime, struct tm *ptm) { - int64_t t = ((int64_t) *ptime) * RATE_DIFF + EPOCH_DIFF; - FILETIME ft, lft; - SYSTEMTIME st; - TIME_ZONE_INFORMATION tzinfo; +static struct tm *localtime(const time_t *ptime, struct tm *ptm) +{ + int64_t t = ((int64_t) *ptime) * RATE_DIFF + EPOCH_DIFF; + FILETIME ft, lft; + SYSTEMTIME st; + TIME_ZONE_INFORMATION tzinfo; - if (ptm == NULL) { - return NULL; - } + if (ptm == NULL) { + return NULL; + } - * (int64_t *) &ft = t; - FileTimeToLocalFileTime(&ft, &lft); - FileTimeToSystemTime(&lft, &st); - ptm->tm_year = st.wYear - 1900; - ptm->tm_mon = st.wMonth - 1; - ptm->tm_wday = st.wDayOfWeek; - ptm->tm_mday = st.wDay; - ptm->tm_hour = st.wHour; - ptm->tm_min = st.wMinute; - ptm->tm_sec = st.wSecond; - ptm->tm_yday = 0; // hope nobody uses this - ptm->tm_isdst = - GetTimeZoneInformation(&tzinfo) == TIME_ZONE_ID_DAYLIGHT ? 1 : 0; + * (int64_t *) &ft = t; + FileTimeToLocalFileTime(&ft, &lft); + FileTimeToSystemTime(&lft, &st); + ptm->tm_year = st.wYear - 1900; + ptm->tm_mon = st.wMonth - 1; + ptm->tm_wday = st.wDayOfWeek; + ptm->tm_mday = st.wDay; + ptm->tm_hour = st.wHour; + ptm->tm_min = st.wMinute; + ptm->tm_sec = st.wSecond; + ptm->tm_yday = 0; // hope nobody uses this + ptm->tm_isdst = + GetTimeZoneInformation(&tzinfo) == TIME_ZONE_ID_DAYLIGHT ? 1 : 0; - return ptm; + return ptm; } -static struct tm *gmtime(const time_t *ptime, struct tm *ptm) { - // FIXME(lsm): fix this. - return localtime(ptime, ptm); +static struct tm *gmtime(const time_t *ptime, struct tm *ptm) +{ + // FIXME(lsm): fix this. + return localtime(ptime, ptm); } static size_t strftime(char *dst, size_t dst_size, const char *fmt, - const struct tm *tm) { - (void) snprintf(dst, dst_size, "implement strftime() for WinCE"); - return 0; + const struct tm *tm) +{ + (void) snprintf(dst, dst_size, "implement strftime() for WinCE"); + return 0; } #endif @@ -1135,1783 +1183,1855 @@ static size_t strftime(char *dst, size_t dst_size, const char *fmt, // For example, fopen("a.cgi ", "r") on Windows successfully opens // "a.cgi", despite one would expect an error back. // This function returns non-0 if path ends with some garbage. -static int path_cannot_disclose_cgi(const char *path) { - static const char *allowed_last_characters = "_-"; - int last = path[strlen(path) - 1]; - return isalnum(last) || strchr(allowed_last_characters, last) != NULL; +static int path_cannot_disclose_cgi(const char *path) +{ + static const char *allowed_last_characters = "_-"; + int last = path[strlen(path) - 1]; + return isalnum(last) || strchr(allowed_last_characters, last) != NULL; } static int mg_stat(struct mg_connection *conn, const char *path, - struct file *filep) { - wchar_t wbuf[PATH_MAX]; - WIN32_FILE_ATTRIBUTE_DATA info; + struct file *filep) +{ + wchar_t wbuf[PATH_MAX]; + WIN32_FILE_ATTRIBUTE_DATA info; - if (!is_file_in_memory(conn, path, filep)) { - to_unicode(path, wbuf, ARRAY_SIZE(wbuf)); - if (GetFileAttributesExW(wbuf, GetFileExInfoStandard, &info) != 0) { - filep->size = MAKEUQUAD(info.nFileSizeLow, info.nFileSizeHigh); - filep->modification_time = SYS2UNIX_TIME( - info.ftLastWriteTime.dwLowDateTime, - info.ftLastWriteTime.dwHighDateTime); - filep->is_directory = info.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY; - // If file name is fishy, reset the file structure and return error. - // Note it is important to reset, not just return the error, cause - // functions like is_file_opened() check the struct. - if (!filep->is_directory && !path_cannot_disclose_cgi(path)) { - memset(filep, 0, sizeof(*filep)); - } + if (!is_file_in_memory(conn, path, filep)) { + to_unicode(path, wbuf, ARRAY_SIZE(wbuf)); + if (GetFileAttributesExW(wbuf, GetFileExInfoStandard, &info) != 0) { + filep->size = MAKEUQUAD(info.nFileSizeLow, info.nFileSizeHigh); + filep->modification_time = SYS2UNIX_TIME( + info.ftLastWriteTime.dwLowDateTime, + info.ftLastWriteTime.dwHighDateTime); + filep->is_directory = info.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY; + // If file name is fishy, reset the file structure and return error. + // Note it is important to reset, not just return the error, cause + // functions like is_file_opened() check the struct. + if (!filep->is_directory && !path_cannot_disclose_cgi(path)) { + memset(filep, 0, sizeof(*filep)); + } + } } - } - return filep->membuf != NULL || filep->modification_time != 0; + return filep->membuf != NULL || filep->modification_time != 0; } -static int mg_remove(const char *path) { - wchar_t wbuf[PATH_MAX]; - to_unicode(path, wbuf, ARRAY_SIZE(wbuf)); - return DeleteFileW(wbuf) ? 0 : -1; +static int mg_remove(const char *path) +{ + wchar_t wbuf[PATH_MAX]; + to_unicode(path, wbuf, ARRAY_SIZE(wbuf)); + return DeleteFileW(wbuf) ? 0 : -1; } -static int mg_mkdir(const char *path, int mode) { - char buf[PATH_MAX]; - wchar_t wbuf[PATH_MAX]; +static int mg_mkdir(const char *path, int mode) +{ + char buf[PATH_MAX]; + wchar_t wbuf[PATH_MAX]; - (void) mode; - mg_strlcpy(buf, path, sizeof(buf)); - change_slashes_to_backslashes(buf); + (void) mode; + mg_strlcpy(buf, path, sizeof(buf)); + change_slashes_to_backslashes(buf); - (void) MultiByteToWideChar(CP_UTF8, 0, buf, -1, wbuf, ARRAY_SIZE(wbuf)); + (void) MultiByteToWideChar(CP_UTF8, 0, buf, -1, wbuf, ARRAY_SIZE(wbuf)); - return CreateDirectoryW(wbuf, NULL) ? 0 : -1; + return CreateDirectoryW(wbuf, NULL) ? 0 : -1; } // Implementation of POSIX opendir/closedir/readdir for Windows. -static DIR * opendir(const char *name) { - DIR *dir = NULL; - wchar_t wpath[PATH_MAX]; - DWORD attrs; +static DIR * opendir(const char *name) +{ + DIR *dir = NULL; + wchar_t wpath[PATH_MAX]; + DWORD attrs; - if (name == NULL) { - SetLastError(ERROR_BAD_ARGUMENTS); - } else if ((dir = (DIR *) malloc(sizeof(*dir))) == NULL) { - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - } else { - to_unicode(name, wpath, ARRAY_SIZE(wpath)); - attrs = GetFileAttributesW(wpath); - if (attrs != 0xFFFFFFFF && - ((attrs & FILE_ATTRIBUTE_DIRECTORY) == FILE_ATTRIBUTE_DIRECTORY)) { - (void) wcscat(wpath, L"\\*"); - dir->handle = FindFirstFileW(wpath, &dir->info); - dir->result.d_name[0] = '\0'; + if (name == NULL) { + SetLastError(ERROR_BAD_ARGUMENTS); + } else if ((dir = (DIR *) malloc(sizeof(*dir))) == NULL) { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); } else { - free(dir); - dir = NULL; + to_unicode(name, wpath, ARRAY_SIZE(wpath)); + attrs = GetFileAttributesW(wpath); + if (attrs != 0xFFFFFFFF && + ((attrs & FILE_ATTRIBUTE_DIRECTORY) == FILE_ATTRIBUTE_DIRECTORY)) { + (void) wcscat(wpath, L"\\*"); + dir->handle = FindFirstFileW(wpath, &dir->info); + dir->result.d_name[0] = '\0'; + } else { + free(dir); + dir = NULL; + } } - } - return dir; + return dir; } -static int closedir(DIR *dir) { - int result = 0; +static int closedir(DIR *dir) +{ + int result = 0; - if (dir != NULL) { - if (dir->handle != INVALID_HANDLE_VALUE) - result = FindClose(dir->handle) ? 0 : -1; + if (dir != NULL) { + if (dir->handle != INVALID_HANDLE_VALUE) + result = FindClose(dir->handle) ? 0 : -1; - free(dir); - } else { - result = -1; - SetLastError(ERROR_BAD_ARGUMENTS); - } + free(dir); + } else { + result = -1; + SetLastError(ERROR_BAD_ARGUMENTS); + } - return result; + return result; } -static struct dirent *readdir(DIR *dir) { - struct dirent *result = 0; +static struct dirent *readdir(DIR *dir) +{ + struct dirent *result = 0; - if (dir) { - if (dir->handle != INVALID_HANDLE_VALUE) { - result = &dir->result; - (void) WideCharToMultiByte(CP_UTF8, 0, - dir->info.cFileName, -1, result->d_name, - sizeof(result->d_name), NULL, NULL); + if (dir) { + if (dir->handle != INVALID_HANDLE_VALUE) { + result = &dir->result; + (void) WideCharToMultiByte(CP_UTF8, 0, + dir->info.cFileName, -1, result->d_name, + sizeof(result->d_name), NULL, NULL); - if (!FindNextFileW(dir->handle, &dir->info)) { - (void) FindClose(dir->handle); - dir->handle = INVALID_HANDLE_VALUE; - } + if (!FindNextFileW(dir->handle, &dir->info)) { + (void) FindClose(dir->handle); + dir->handle = INVALID_HANDLE_VALUE; + } + } else { + SetLastError(ERROR_FILE_NOT_FOUND); + } } else { - SetLastError(ERROR_FILE_NOT_FOUND); + SetLastError(ERROR_BAD_ARGUMENTS); } - } else { - SetLastError(ERROR_BAD_ARGUMENTS); - } - return result; + return result; } #ifndef HAVE_POLL -static int poll(struct pollfd *pfd, int n, int milliseconds) { - struct timeval tv; - fd_set set; - int i, result; - SOCKET maxfd = 0; +static int poll(struct pollfd *pfd, int n, int milliseconds) +{ + struct timeval tv; + fd_set set; + int i, result; + SOCKET maxfd = 0; - tv.tv_sec = milliseconds / 1000; - tv.tv_usec = (milliseconds % 1000) * 1000; - FD_ZERO(&set); + tv.tv_sec = milliseconds / 1000; + tv.tv_usec = (milliseconds % 1000) * 1000; + FD_ZERO(&set); - for (i = 0; i < n; i++) { - FD_SET((SOCKET) pfd[i].fd, &set); - pfd[i].revents = 0; - - if (pfd[i].fd > maxfd) { - maxfd = pfd[i].fd; - } - } - - if ((result = select((int)maxfd + 1, &set, NULL, NULL, &tv)) > 0) { for (i = 0; i < n; i++) { - if (FD_ISSET(pfd[i].fd, &set)) { - pfd[i].revents = POLLIN; - } - } - } + FD_SET((SOCKET) pfd[i].fd, &set); + pfd[i].revents = 0; - return result; + if (pfd[i].fd > maxfd) { + maxfd = pfd[i].fd; + } + } + + if ((result = select((int)maxfd + 1, &set, NULL, NULL, &tv)) > 0) { + for (i = 0; i < n; i++) { + if (FD_ISSET(pfd[i].fd, &set)) { + pfd[i].revents = POLLIN; + } + } + } + + return result; } #endif // HAVE_POLL -static void set_close_on_exec(SOCKET sock) { - (void) SetHandleInformation((HANDLE) sock, HANDLE_FLAG_INHERIT, 0); +static void set_close_on_exec(SOCKET sock) +{ + (void) SetHandleInformation((HANDLE) sock, HANDLE_FLAG_INHERIT, 0); } -int mg_start_thread(mg_thread_func_t f, void *p) { - return (long)_beginthread((void (__cdecl *)(void *)) f, 0, p) == -1L ? -1 : 0; +int mg_start_thread(mg_thread_func_t f, void *p) +{ + return (long)_beginthread((void (__cdecl *)(void *)) f, 0, p) == -1L ? -1 : 0; } -static HANDLE dlopen(const char *dll_name, int flags) { - wchar_t wbuf[PATH_MAX]; - (void) flags; - to_unicode(dll_name, wbuf, ARRAY_SIZE(wbuf)); - return LoadLibraryW(wbuf); +static HANDLE dlopen(const char *dll_name, int flags) +{ + wchar_t wbuf[PATH_MAX]; + (void) flags; + to_unicode(dll_name, wbuf, ARRAY_SIZE(wbuf)); + return LoadLibraryW(wbuf); } #if !defined(NO_CGI) #define SIGKILL 0 -static int kill(pid_t pid, int sig_num) { - (void) TerminateProcess(pid, sig_num); - (void) CloseHandle(pid); - return 0; +static int kill(pid_t pid, int sig_num) +{ + (void) TerminateProcess(pid, sig_num); + (void) CloseHandle(pid); + return 0; } -static void trim_trailing_whitespaces(char *s) { - char *e = s + strlen(s) - 1; - while (e > s && isspace(* (unsigned char *) e)) { - *e-- = '\0'; - } +static void trim_trailing_whitespaces(char *s) +{ + char *e = s + strlen(s) - 1; + while (e > s && isspace(* (unsigned char *) e)) { + *e-- = '\0'; + } } static pid_t spawn_process(struct mg_connection *conn, const char *prog, char *envblk, char *envp[], int fdin, - int fdout, const char *dir) { - HANDLE me; - char *p, *interp, full_interp[PATH_MAX], full_dir[PATH_MAX], - cmdline[PATH_MAX], buf[PATH_MAX]; - struct file file = STRUCT_FILE_INITIALIZER; - STARTUPINFOA si; - PROCESS_INFORMATION pi = { 0 }; + int fdout, const char *dir) +{ + HANDLE me; + char *p, *interp, full_interp[PATH_MAX], full_dir[PATH_MAX], + cmdline[PATH_MAX], buf[PATH_MAX]; + struct file file = STRUCT_FILE_INITIALIZER; + STARTUPINFOA si; + PROCESS_INFORMATION pi = { 0 }; - (void) envp; + (void) envp; - memset(&si, 0, sizeof(si)); - si.cb = sizeof(si); + memset(&si, 0, sizeof(si)); + si.cb = sizeof(si); - // TODO(lsm): redirect CGI errors to the error log file - si.dwFlags = STARTF_USESTDHANDLES | STARTF_USESHOWWINDOW; - si.wShowWindow = SW_HIDE; + // TODO(lsm): redirect CGI errors to the error log file + si.dwFlags = STARTF_USESTDHANDLES | STARTF_USESHOWWINDOW; + si.wShowWindow = SW_HIDE; - me = GetCurrentProcess(); - DuplicateHandle(me, (HANDLE) _get_osfhandle(fdin), me, - &si.hStdInput, 0, TRUE, DUPLICATE_SAME_ACCESS); - DuplicateHandle(me, (HANDLE) _get_osfhandle(fdout), me, - &si.hStdOutput, 0, TRUE, DUPLICATE_SAME_ACCESS); + me = GetCurrentProcess(); + DuplicateHandle(me, (HANDLE) _get_osfhandle(fdin), me, + &si.hStdInput, 0, TRUE, DUPLICATE_SAME_ACCESS); + DuplicateHandle(me, (HANDLE) _get_osfhandle(fdout), me, + &si.hStdOutput, 0, TRUE, DUPLICATE_SAME_ACCESS); - // If CGI file is a script, try to read the interpreter line - interp = conn->ctx->config[CGI_INTERPRETER]; - if (interp == NULL) { - buf[0] = buf[1] = '\0'; + // If CGI file is a script, try to read the interpreter line + interp = conn->ctx->config[CGI_INTERPRETER]; + if (interp == NULL) { + buf[0] = buf[1] = '\0'; - // Read the first line of the script into the buffer - snprintf(cmdline, sizeof(cmdline), "%s%c%s", dir, '/', prog); - if (mg_fopen(conn, cmdline, "r", &file)) { - p = (char *) file.membuf; - mg_fgets(buf, sizeof(buf), &file, &p); - mg_fclose(&file); - buf[sizeof(buf) - 1] = '\0'; + // Read the first line of the script into the buffer + snprintf(cmdline, sizeof(cmdline), "%s%c%s", dir, '/', prog); + if (mg_fopen(conn, cmdline, "r", &file)) { + p = (char *) file.membuf; + mg_fgets(buf, sizeof(buf), &file, &p); + mg_fclose(&file); + buf[sizeof(buf) - 1] = '\0'; + } + + if (buf[0] == '#' && buf[1] == '!') { + trim_trailing_whitespaces(buf + 2); + } else { + buf[2] = '\0'; + } + interp = buf + 2; } - if (buf[0] == '#' && buf[1] == '!') { - trim_trailing_whitespaces(buf + 2); - } else { - buf[2] = '\0'; + if (interp[0] != '\0') { + GetFullPathNameA(interp, sizeof(full_interp), full_interp, NULL); + interp = full_interp; } - interp = buf + 2; - } + GetFullPathNameA(dir, sizeof(full_dir), full_dir, NULL); - if (interp[0] != '\0') { - GetFullPathNameA(interp, sizeof(full_interp), full_interp, NULL); - interp = full_interp; - } - GetFullPathNameA(dir, sizeof(full_dir), full_dir, NULL); + mg_snprintf(conn, cmdline, sizeof(cmdline), "%s%s\"%s\\%s\"", + interp, interp[0] == '\0' ? "" : " ", full_dir, prog); - mg_snprintf(conn, cmdline, sizeof(cmdline), "%s%s\"%s\\%s\"", - interp, interp[0] == '\0' ? "" : " ", full_dir, prog); + DEBUG_TRACE(("Running [%s]", cmdline)); + if (CreateProcessA(NULL, cmdline, NULL, NULL, TRUE, + CREATE_NEW_PROCESS_GROUP, envblk, NULL, &si, &pi) == 0) { + mg_cry(conn, "%s: CreateProcess(%s): %ld", + __func__, cmdline, ERRNO); + pi.hProcess = (pid_t) -1; + } - DEBUG_TRACE(("Running [%s]", cmdline)); - if (CreateProcessA(NULL, cmdline, NULL, NULL, TRUE, - CREATE_NEW_PROCESS_GROUP, envblk, NULL, &si, &pi) == 0) { - mg_cry(conn, "%s: CreateProcess(%s): %ld", - __func__, cmdline, ERRNO); - pi.hProcess = (pid_t) -1; - } + (void) CloseHandle(si.hStdOutput); + (void) CloseHandle(si.hStdInput); + if (pi.hThread != NULL) + (void) CloseHandle(pi.hThread); - (void) CloseHandle(si.hStdOutput); - (void) CloseHandle(si.hStdInput); - if (pi.hThread != NULL) - (void) CloseHandle(pi.hThread); - - return (pid_t) pi.hProcess; + return (pid_t) pi.hProcess; } #endif // !NO_CGI -static int set_non_blocking_mode(SOCKET sock) { - unsigned long on = 1; - return ioctlsocket(sock, FIONBIO, &on); +static int set_non_blocking_mode(SOCKET sock) +{ + unsigned long on = 1; + return ioctlsocket(sock, FIONBIO, &on); } #else static int mg_stat(struct mg_connection *conn, const char *path, - struct file *filep) { - struct stat st; + struct file *filep) +{ + struct stat st; - if (!is_file_in_memory(conn, path, filep) && !stat(path, &st)) { - filep->size = st.st_size; - filep->modification_time = st.st_mtime; - filep->is_directory = S_ISDIR(st.st_mode); - } else { - filep->modification_time = (time_t) 0; - } + if (!is_file_in_memory(conn, path, filep) && !stat(path, &st)) { + filep->size = st.st_size; + filep->modification_time = st.st_mtime; + filep->is_directory = S_ISDIR(st.st_mode); + } else { + filep->modification_time = (time_t) 0; + } - return filep->membuf != NULL || filep->modification_time != (time_t) 0; + return filep->membuf != NULL || filep->modification_time != (time_t) 0; } -static void set_close_on_exec(int fd) { - fcntl(fd, F_SETFD, FD_CLOEXEC); +static void set_close_on_exec(int fd) +{ + fcntl(fd, F_SETFD, FD_CLOEXEC); } -int mg_start_thread(mg_thread_func_t func, void *param) { - pthread_t thread_id; - pthread_attr_t attr; - int result; +int mg_start_thread(mg_thread_func_t func, void *param) +{ + pthread_t thread_id; + pthread_attr_t attr; + int result; - (void) pthread_attr_init(&attr); - (void) pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED); + (void) pthread_attr_init(&attr); + (void) pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED); #if USE_STACK_SIZE > 1 - // Compile-time option to control stack size, e.g. -DUSE_STACK_SIZE=16384 - (void) pthread_attr_setstacksize(&attr, USE_STACK_SIZE); + // Compile-time option to control stack size, e.g. -DUSE_STACK_SIZE=16384 + (void) pthread_attr_setstacksize(&attr, USE_STACK_SIZE); #endif - result = pthread_create(&thread_id, &attr, func, param); - pthread_attr_destroy(&attr); + result = pthread_create(&thread_id, &attr, func, param); + pthread_attr_destroy(&attr); - return result; + return result; } #ifndef NO_CGI static pid_t spawn_process(struct mg_connection *conn, const char *prog, char *envblk, char *envp[], int fdin, - int fdout, const char *dir) { - pid_t pid; - const char *interp; + int fdout, const char *dir) +{ + pid_t pid; + const char *interp; - (void) envblk; + (void) envblk; - if ((pid = fork()) == -1) { - // Parent - send_http_error(conn, 500, http_500_error, "fork(): %s", strerror(ERRNO)); - } else if (pid == 0) { - // Child - if (chdir(dir) != 0) { - mg_cry(conn, "%s: chdir(%s): %s", __func__, dir, strerror(ERRNO)); - } else if (dup2(fdin, 0) == -1) { - mg_cry(conn, "%s: dup2(%d, 0): %s", __func__, fdin, strerror(ERRNO)); - } else if (dup2(fdout, 1) == -1) { - mg_cry(conn, "%s: dup2(%d, 1): %s", __func__, fdout, strerror(ERRNO)); - } else { - // Not redirecting stderr to stdout, to avoid output being littered - // with the error messages. - (void) close(fdin); - (void) close(fdout); + if ((pid = fork()) == -1) { + // Parent + send_http_error(conn, 500, http_500_error, "fork(): %s", strerror(ERRNO)); + } else if (pid == 0) { + // Child + if (chdir(dir) != 0) { + mg_cry(conn, "%s: chdir(%s): %s", __func__, dir, strerror(ERRNO)); + } else if (dup2(fdin, 0) == -1) { + mg_cry(conn, "%s: dup2(%d, 0): %s", __func__, fdin, strerror(ERRNO)); + } else if (dup2(fdout, 1) == -1) { + mg_cry(conn, "%s: dup2(%d, 1): %s", __func__, fdout, strerror(ERRNO)); + } else { + // Not redirecting stderr to stdout, to avoid output being littered + // with the error messages. + (void) close(fdin); + (void) close(fdout); - // After exec, all signal handlers are restored to their default values, - // with one exception of SIGCHLD. According to POSIX.1-2001 and Linux's - // implementation, SIGCHLD's handler will leave unchanged after exec - // if it was set to be ignored. Restore it to default action. - signal(SIGCHLD, SIG_DFL); + // After exec, all signal handlers are restored to their default values, + // with one exception of SIGCHLD. According to POSIX.1-2001 and Linux's + // implementation, SIGCHLD's handler will leave unchanged after exec + // if it was set to be ignored. Restore it to default action. + signal(SIGCHLD, SIG_DFL); - interp = conn->ctx->config[CGI_INTERPRETER]; - if (interp == NULL) { - (void) execle(prog, prog, NULL, envp); - mg_cry(conn, "%s: execle(%s): %s", __func__, prog, strerror(ERRNO)); - } else { - (void) execle(interp, interp, prog, NULL, envp); - mg_cry(conn, "%s: execle(%s %s): %s", __func__, interp, prog, - strerror(ERRNO)); - } + interp = conn->ctx->config[CGI_INTERPRETER]; + if (interp == NULL) { + (void) execle(prog, prog, NULL, envp); + mg_cry(conn, "%s: execle(%s): %s", __func__, prog, strerror(ERRNO)); + } else { + (void) execle(interp, interp, prog, NULL, envp); + mg_cry(conn, "%s: execle(%s %s): %s", __func__, interp, prog, + strerror(ERRNO)); + } + } + exit(EXIT_FAILURE); } - exit(EXIT_FAILURE); - } - return pid; + return pid; } #endif // !NO_CGI -static int set_non_blocking_mode(SOCKET sock) { - int flags; +static int set_non_blocking_mode(SOCKET sock) +{ + int flags; - flags = fcntl(sock, F_GETFL, 0); - (void) fcntl(sock, F_SETFL, flags | O_NONBLOCK); + flags = fcntl(sock, F_GETFL, 0); + (void) fcntl(sock, F_SETFL, flags | O_NONBLOCK); - return 0; + return 0; } #endif // _WIN32 // Write data to the IO channel - opened file descriptor, socket or SSL // descriptor. Return number of bytes written. static int64_t push(FILE *fp, SOCKET sock, SSL *ssl, const char *buf, - int64_t len) { - int64_t sent; - int n, k; + int64_t len) +{ + int64_t sent; + int n, k; - (void) ssl; // Get rid of warning - sent = 0; - while (sent < len) { + (void) ssl; // Get rid of warning + sent = 0; + while (sent < len) { - // How many bytes we send in this iteration - k = len - sent > INT_MAX ? INT_MAX : (int) (len - sent); + // How many bytes we send in this iteration + k = len - sent > INT_MAX ? INT_MAX : (int) (len - sent); #ifndef NO_SSL - if (ssl != NULL) { - n = SSL_write(ssl, buf + sent, k); - } else + if (ssl != NULL) { + n = SSL_write(ssl, buf + sent, k); + } else #endif - if (fp != NULL) { - n = (int) fwrite(buf + sent, 1, (size_t) k, fp); - if (ferror(fp)) - n = -1; - } else { - n = send(sock, buf + sent, (size_t) k, MSG_NOSIGNAL); + if (fp != NULL) { + n = (int) fwrite(buf + sent, 1, (size_t) k, fp); + if (ferror(fp)) + n = -1; + } else { + n = send(sock, buf + sent, (size_t) k, MSG_NOSIGNAL); + } + + if (n <= 0) + break; + + sent += n; } - if (n <= 0) - break; - - sent += n; - } - - return sent; + return sent; } // Read from IO channel - opened file descriptor, socket, or SSL descriptor. // Return negative value on error, or number of bytes read on success. -static int pull(FILE *fp, struct mg_connection *conn, char *buf, int len) { - int nread; +static int pull(FILE *fp, struct mg_connection *conn, char *buf, int len) +{ + int nread; - if (fp != NULL) { - // Use read() instead of fread(), because if we're reading from the CGI - // pipe, fread() may block until IO buffer is filled up. We cannot afford - // to block and must pass all read bytes immediately to the client. - nread = read(fileno(fp), buf, (size_t) len); + if (fp != NULL) { + // Use read() instead of fread(), because if we're reading from the CGI + // pipe, fread() may block until IO buffer is filled up. We cannot afford + // to block and must pass all read bytes immediately to the client. + nread = read(fileno(fp), buf, (size_t) len); #ifndef NO_SSL - } else if (conn->ssl != NULL) { - nread = SSL_read(conn->ssl, buf, len); + } else if (conn->ssl != NULL) { + nread = SSL_read(conn->ssl, buf, len); #endif - } else { - nread = recv(conn->client.sock, buf, (size_t) len, 0); - } - - return conn->ctx->stop_flag ? -1 : nread; -} - -static int pull_all(FILE *fp, struct mg_connection *conn, char *buf, int len) { - int n, nread = 0; - - while (len > 0 && conn->ctx->stop_flag == 0) { - n = pull(fp, conn, buf + nread, len); - if (n < 0) { - nread = n; // Propagate the error - break; - } else if (n == 0) { - break; // No more data to read } else { - conn->consumed_content += n; - nread += n; - len -= n; + nread = recv(conn->client.sock, buf, (size_t) len, 0); } - } - return nread; + return conn->ctx->stop_flag ? -1 : nread; } -int mg_read(struct mg_connection *conn, void *buf, size_t len) { - int n, buffered_len, nread; - const char *body; +static int pull_all(FILE *fp, struct mg_connection *conn, char *buf, int len) +{ + int n, nread = 0; - // If Content-Length is not set, read until socket is closed - if (conn->consumed_content == 0 && conn->content_len == 0) { - conn->content_len = INT64_MAX; - conn->must_close = 1; - } - - nread = 0; - if (conn->consumed_content < conn->content_len) { - // Adjust number of bytes to read. - int64_t to_read = conn->content_len - conn->consumed_content; - if (to_read < (int64_t) len) { - len = (size_t) to_read; - } - - // Return buffered data - body = conn->buf + conn->request_len + conn->consumed_content; - buffered_len = (int)(&conn->buf[conn->data_len] - body); - if (buffered_len > 0) { - if (len < (size_t) buffered_len) { - buffered_len = (int) len; - } - memcpy(buf, body, (size_t) buffered_len); - len -= buffered_len; - conn->consumed_content += buffered_len; - nread += buffered_len; - buf = (char *) buf + buffered_len; - } - - // We have returned all buffered data. Read new data from the remote socket. - n = pull_all(NULL, conn, (char *) buf, (int) len); - nread = n >= 0 ? nread + n : n; - } - return nread; -} - -int mg_write(struct mg_connection *conn, const void *buf, size_t len) { - time_t now; - int64_t n, total, allowed; - - if (conn->throttle > 0) { - if ((now = time(NULL)) != conn->last_throttle_time) { - conn->last_throttle_time = now; - conn->last_throttle_bytes = 0; - } - allowed = conn->throttle - conn->last_throttle_bytes; - if (allowed > (int64_t) len) { - allowed = len; - } - if ((total = push(NULL, conn->client.sock, conn->ssl, (const char *) buf, - (int64_t) allowed)) == allowed) { - buf = (char *) buf + total; - conn->last_throttle_bytes += total; - while (total < (int64_t) len && conn->ctx->stop_flag == 0) { - allowed = conn->throttle > (int64_t) len - total ? - (int64_t) len - total : conn->throttle; - if ((n = push(NULL, conn->client.sock, conn->ssl, (const char *) buf, - (int64_t) allowed)) != allowed) { - break; + while (len > 0 && conn->ctx->stop_flag == 0) { + n = pull(fp, conn, buf + nread, len); + if (n < 0) { + nread = n; // Propagate the error + break; + } else if (n == 0) { + break; // No more data to read + } else { + conn->consumed_content += n; + nread += n; + len -= n; } - sleep(1); - conn->last_throttle_bytes = allowed; - conn->last_throttle_time = time(NULL); - buf = (char *) buf + n; - total += n; - } } - } else { - total = push(NULL, conn->client.sock, conn->ssl, (const char *) buf, - (int64_t) len); - } - return (int) total; + + return nread; +} + +int mg_read(struct mg_connection *conn, void *buf, size_t len) +{ + int n, buffered_len, nread; + const char *body; + + // If Content-Length is not set, read until socket is closed + if (conn->consumed_content == 0 && conn->content_len == 0) { + conn->content_len = INT64_MAX; + conn->must_close = 1; + } + + nread = 0; + if (conn->consumed_content < conn->content_len) { + // Adjust number of bytes to read. + int64_t to_read = conn->content_len - conn->consumed_content; + if (to_read < (int64_t) len) { + len = (size_t) to_read; + } + + // Return buffered data + body = conn->buf + conn->request_len + conn->consumed_content; + buffered_len = (int)(&conn->buf[conn->data_len] - body); + if (buffered_len > 0) { + if (len < (size_t) buffered_len) { + buffered_len = (int) len; + } + memcpy(buf, body, (size_t) buffered_len); + len -= buffered_len; + conn->consumed_content += buffered_len; + nread += buffered_len; + buf = (char *) buf + buffered_len; + } + + // We have returned all buffered data. Read new data from the remote socket. + n = pull_all(NULL, conn, (char *) buf, (int) len); + nread = n >= 0 ? nread + n : n; + } + return nread; +} + +int mg_write(struct mg_connection *conn, const void *buf, size_t len) +{ + time_t now; + int64_t n, total, allowed; + + if (conn->throttle > 0) { + if ((now = time(NULL)) != conn->last_throttle_time) { + conn->last_throttle_time = now; + conn->last_throttle_bytes = 0; + } + allowed = conn->throttle - conn->last_throttle_bytes; + if (allowed > (int64_t) len) { + allowed = len; + } + if ((total = push(NULL, conn->client.sock, conn->ssl, (const char *) buf, + (int64_t) allowed)) == allowed) { + buf = (char *) buf + total; + conn->last_throttle_bytes += total; + while (total < (int64_t) len && conn->ctx->stop_flag == 0) { + allowed = conn->throttle > (int64_t) len - total ? + (int64_t) len - total : conn->throttle; + if ((n = push(NULL, conn->client.sock, conn->ssl, (const char *) buf, + (int64_t) allowed)) != allowed) { + break; + } + sleep(1); + conn->last_throttle_bytes = allowed; + conn->last_throttle_time = time(NULL); + buf = (char *) buf + n; + total += n; + } + } + } else { + total = push(NULL, conn->client.sock, conn->ssl, (const char *) buf, + (int64_t) len); + } + return (int) total; } // Alternative alloc_vprintf() for non-compliant C runtimes -static int alloc_vprintf2(char **buf, const char *fmt, va_list ap) { - va_list ap_copy; - int size = MG_BUF_LEN; - int len = -1; +static int alloc_vprintf2(char **buf, const char *fmt, va_list ap) +{ + va_list ap_copy; + int size = MG_BUF_LEN; + int len = -1; - *buf = NULL; - while (len == -1) { - if (*buf) free(*buf); - *buf = (char *)malloc(size *= 4); - if (!*buf) break; - va_copy(ap_copy, ap); - len = vsnprintf(*buf, size, fmt, ap_copy); - } + *buf = NULL; + while (len == -1) { + if (*buf) free(*buf); + *buf = (char *)malloc(size *= 4); + if (!*buf) break; + va_copy(ap_copy, ap); + len = vsnprintf(*buf, size, fmt, ap_copy); + } - return len; + return len; } // Print message to buffer. If buffer is large enough to hold the message, // return buffer. If buffer is to small, allocate large enough buffer on heap, // and return allocated buffer. -static int alloc_vprintf(char **buf, size_t size, const char *fmt, va_list ap) { - va_list ap_copy; - int len; +static int alloc_vprintf(char **buf, size_t size, const char *fmt, va_list ap) +{ + va_list ap_copy; + int len; - // Windows is not standard-compliant, and vsnprintf() returns -1 if - // buffer is too small. Also, older versions of msvcrt.dll do not have - // _vscprintf(). However, if size is 0, vsnprintf() behaves correctly. - // Therefore, we make two passes: on first pass, get required message length. - // On second pass, actually print the message. - va_copy(ap_copy, ap); - len = vsnprintf(NULL, 0, fmt, ap_copy); - - if (len < 0) { - // C runtime is not standard compliant, vsnprintf() returned -1. - // Switch to alternative code path that uses incremental allocations. + // Windows is not standard-compliant, and vsnprintf() returns -1 if + // buffer is too small. Also, older versions of msvcrt.dll do not have + // _vscprintf(). However, if size is 0, vsnprintf() behaves correctly. + // Therefore, we make two passes: on first pass, get required message length. + // On second pass, actually print the message. va_copy(ap_copy, ap); - len = alloc_vprintf2(buf, fmt, ap); - } else if (len > (int) size && - (size = len + 1) > 0 && - (*buf = (char *) malloc(size)) == NULL) { - len = -1; // Allocation failed, mark failure - } else { - va_copy(ap_copy, ap); - vsnprintf(*buf, size, fmt, ap_copy); - } + len = vsnprintf(NULL, 0, fmt, ap_copy); - return len; + if (len < 0) { + // C runtime is not standard compliant, vsnprintf() returned -1. + // Switch to alternative code path that uses incremental allocations. + va_copy(ap_copy, ap); + len = alloc_vprintf2(buf, fmt, ap); + } else if (len > (int) size && + (size = len + 1) > 0 && + (*buf = (char *) malloc(size)) == NULL) { + len = -1; // Allocation failed, mark failure + } else { + va_copy(ap_copy, ap); + vsnprintf(*buf, size, fmt, ap_copy); + } + + return len; } -int mg_vprintf(struct mg_connection *conn, const char *fmt, va_list ap) { - char mem[MG_BUF_LEN], *buf = mem; - int len; +int mg_vprintf(struct mg_connection *conn, const char *fmt, va_list ap) +{ + char mem[MG_BUF_LEN], *buf = mem; + int len; - if ((len = alloc_vprintf(&buf, sizeof(mem), fmt, ap)) > 0) { - len = mg_write(conn, buf, (size_t) len); - } - if (buf != mem && buf != NULL) { - free(buf); - } + if ((len = alloc_vprintf(&buf, sizeof(mem), fmt, ap)) > 0) { + len = mg_write(conn, buf, (size_t) len); + } + if (buf != mem && buf != NULL) { + free(buf); + } - return len; + return len; } -int mg_printf(struct mg_connection *conn, const char *fmt, ...) { - va_list ap; - va_start(ap, fmt); - return mg_vprintf(conn, fmt, ap); +int mg_printf(struct mg_connection *conn, const char *fmt, ...) +{ + va_list ap; + va_start(ap, fmt); + return mg_vprintf(conn, fmt, ap); } int mg_url_decode(const char *src, int src_len, char *dst, - int dst_len, int is_form_url_encoded) { - int i, j, a, b; + int dst_len, int is_form_url_encoded) +{ + int i, j, a, b; #define HEXTOI(x) (isdigit(x) ? x - '0' : x - 'W') - for (i = j = 0; i < src_len && j < dst_len - 1; i++, j++) { - if (src[i] == '%' && i < src_len - 2 && - isxdigit(* (const unsigned char *) (src + i + 1)) && - isxdigit(* (const unsigned char *) (src + i + 2))) { - a = tolower(* (const unsigned char *) (src + i + 1)); - b = tolower(* (const unsigned char *) (src + i + 2)); - dst[j] = (char) ((HEXTOI(a) << 4) | HEXTOI(b)); - i += 2; - } else if (is_form_url_encoded && src[i] == '+') { - dst[j] = ' '; - } else { - dst[j] = src[i]; + for (i = j = 0; i < src_len && j < dst_len - 1; i++, j++) { + if (src[i] == '%' && i < src_len - 2 && + isxdigit(* (const unsigned char *) (src + i + 1)) && + isxdigit(* (const unsigned char *) (src + i + 2))) { + a = tolower(* (const unsigned char *) (src + i + 1)); + b = tolower(* (const unsigned char *) (src + i + 2)); + dst[j] = (char) ((HEXTOI(a) << 4) | HEXTOI(b)); + i += 2; + } else if (is_form_url_encoded && src[i] == '+') { + dst[j] = ' '; + } else { + dst[j] = src[i]; + } } - } - dst[j] = '\0'; // Null-terminate the destination + dst[j] = '\0'; // Null-terminate the destination - return i >= src_len ? j : -1; + return i >= src_len ? j : -1; } int mg_get_var(const char *data, size_t data_len, const char *name, - char *dst, size_t dst_len) { - return mg_get_var2(data,data_len,name,dst,dst_len,0); + char *dst, size_t dst_len) +{ + return mg_get_var2(data,data_len,name,dst,dst_len,0); } int mg_get_var2(const char *data, size_t data_len, const char *name, - char *dst, size_t dst_len, size_t occurrence) { - const char *p, *e, *s; - size_t name_len; - int len; + char *dst, size_t dst_len, size_t occurrence) +{ + const char *p, *e, *s; + size_t name_len; + int len; - if (dst == NULL || dst_len == 0) { - len = -2; - } else if (data == NULL || name == NULL || data_len == 0) { - len = -1; - dst[0] = '\0'; - } else { - name_len = strlen(name); - e = data + data_len; - len = -1; - dst[0] = '\0'; + if (dst == NULL || dst_len == 0) { + len = -2; + } else if (data == NULL || name == NULL || data_len == 0) { + len = -1; + dst[0] = '\0'; + } else { + name_len = strlen(name); + e = data + data_len; + len = -1; + dst[0] = '\0'; - // data is "var1=val1&var2=val2...". Find variable first - for (p = data; p + name_len < e; p++) { - if ((p == data || p[-1] == '&') && p[name_len] == '=' && - !mg_strncasecmp(name, p, name_len) && 0 == occurrence--) { + // data is "var1=val1&var2=val2...". Find variable first + for (p = data; p + name_len < e; p++) { + if ((p == data || p[-1] == '&') && p[name_len] == '=' && + !mg_strncasecmp(name, p, name_len) && 0 == occurrence--) { - // Point p to variable value - p += name_len + 1; + // Point p to variable value + p += name_len + 1; - // Point s to the end of the value - s = (const char *) memchr(p, '&', (size_t)(e - p)); - if (s == NULL) { - s = e; + // Point s to the end of the value + s = (const char *) memchr(p, '&', (size_t)(e - p)); + if (s == NULL) { + s = e; + } + assert(s >= p); + + // Decode variable into destination buffer + len = mg_url_decode(p, (int)(s - p), dst, (int)dst_len, 1); + + // Redirect error code from -1 to -2 (destination buffer too small). + if (len == -1) { + len = -2; + } + break; + } } - assert(s >= p); - - // Decode variable into destination buffer - len = mg_url_decode(p, (int)(s - p), dst, (int)dst_len, 1); - - // Redirect error code from -1 to -2 (destination buffer too small). - if (len == -1) { - len = -2; - } - break; - } } - } - return len; + return len; } int mg_get_cookie(const char *cookie_header, const char *var_name, - char *dst, size_t dst_size) { - const char *s, *p, *end; - int name_len, len = -1; + char *dst, size_t dst_size) +{ + const char *s, *p, *end; + int name_len, len = -1; - if (dst == NULL || dst_size == 0) { - len = -2; - } else if (var_name == NULL || (s = cookie_header) == NULL) { - len = -1; - dst[0] = '\0'; - } else { - name_len = (int) strlen(var_name); - end = s + strlen(s); - dst[0] = '\0'; + if (dst == NULL || dst_size == 0) { + len = -2; + } else if (var_name == NULL || (s = cookie_header) == NULL) { + len = -1; + dst[0] = '\0'; + } else { + name_len = (int) strlen(var_name); + end = s + strlen(s); + dst[0] = '\0'; - for (; (s = mg_strcasestr(s, var_name)) != NULL; s += name_len) { - if (s[name_len] == '=') { - s += name_len + 1; - if ((p = strchr(s, ' ')) == NULL) - p = end; - if (p[-1] == ';') - p--; - if (*s == '"' && p[-1] == '"' && p > s + 1) { - s++; - p--; + for (; (s = mg_strcasestr(s, var_name)) != NULL; s += name_len) { + if (s[name_len] == '=') { + s += name_len + 1; + if ((p = strchr(s, ' ')) == NULL) + p = end; + if (p[-1] == ';') + p--; + if (*s == '"' && p[-1] == '"' && p > s + 1) { + s++; + p--; + } + if ((size_t) (p - s) < dst_size) { + len = (int)(p - s); + mg_strlcpy(dst, s, (size_t) len + 1); + } else { + len = -3; + } + break; + } } - if ((size_t) (p - s) < dst_size) { - len = (int)(p - s); - mg_strlcpy(dst, s, (size_t) len + 1); - } else { - len = -3; - } - break; - } } - } - return len; + return len; } static void convert_uri_to_file_name(struct mg_connection *conn, char *buf, - size_t buf_len, struct file *filep) { - struct vec a, b; - const char *rewrite, *uri = conn->request_info.uri, - *root = conn->ctx->config[DOCUMENT_ROOT]; - char *p; - int match_len; - char gz_path[PATH_MAX]; - char const* accept_encoding; + size_t buf_len, struct file *filep) +{ + struct vec a, b; + const char *rewrite, *uri = conn->request_info.uri, + *root = conn->ctx->config[DOCUMENT_ROOT]; + char *p; + int match_len; + char gz_path[PATH_MAX]; + char const* accept_encoding; - // Using buf_len - 1 because memmove() for PATH_INFO may shift part - // of the path one byte on the right. - // If document_root is NULL, leave the file empty. - mg_snprintf(conn, buf, buf_len - 1, "%s%s", - root == NULL ? "" : root, - root == NULL ? "" : uri); + // Using buf_len - 1 because memmove() for PATH_INFO may shift part + // of the path one byte on the right. + // If document_root is NULL, leave the file empty. + mg_snprintf(conn, buf, buf_len - 1, "%s%s", + root == NULL ? "" : root, + root == NULL ? "" : uri); - rewrite = conn->ctx->config[REWRITE]; - while ((rewrite = next_option(rewrite, &a, &b)) != NULL) { - if ((match_len = match_prefix(a.ptr, (int) a.len, uri)) > 0) { - mg_snprintf(conn, buf, buf_len - 1, "%.*s%s", (int) b.len, b.ptr, - uri + match_len); - break; + rewrite = conn->ctx->config[REWRITE]; + while ((rewrite = next_option(rewrite, &a, &b)) != NULL) { + if ((match_len = match_prefix(a.ptr, (int) a.len, uri)) > 0) { + mg_snprintf(conn, buf, buf_len - 1, "%.*s%s", (int) b.len, b.ptr, + uri + match_len); + break; + } } - } - if (mg_stat(conn, buf, filep)) return; + if (mg_stat(conn, buf, filep)) return; - // if we can't find the actual file, look for the file - // with the same name but a .gz extension. If we find it, - // use that and set the gzipped flag in the file struct - // to indicate that the response need to have the content- - // encoding: gzip header - // we can only do this if the browser declares support - if ((accept_encoding = mg_get_header(conn, "Accept-Encoding")) != NULL) { - if (strstr(accept_encoding,"gzip") != NULL) { - snprintf(gz_path, sizeof(gz_path), "%s.gz", buf); - if (mg_stat(conn, gz_path, filep)) { - filep->gzipped = 1; - return; - } + // if we can't find the actual file, look for the file + // with the same name but a .gz extension. If we find it, + // use that and set the gzipped flag in the file struct + // to indicate that the response need to have the content- + // encoding: gzip header + // we can only do this if the browser declares support + if ((accept_encoding = mg_get_header(conn, "Accept-Encoding")) != NULL) { + if (strstr(accept_encoding,"gzip") != NULL) { + snprintf(gz_path, sizeof(gz_path), "%s.gz", buf); + if (mg_stat(conn, gz_path, filep)) { + filep->gzipped = 1; + return; + } + } } - } - // Support PATH_INFO for CGI scripts. - for (p = buf + strlen(buf); p > buf + 1; p--) { - if (*p == '/') { - *p = '\0'; - if (match_prefix(conn->ctx->config[CGI_EXTENSIONS], - (int)strlen(conn->ctx->config[CGI_EXTENSIONS]), buf) > 0 && - mg_stat(conn, buf, filep)) { - // Shift PATH_INFO block one character right, e.g. - // "/x.cgi/foo/bar\x00" => "/x.cgi\x00/foo/bar\x00" - // conn->path_info is pointing to the local variable "path" declared - // in handle_request(), so PATH_INFO is not valid after - // handle_request returns. - conn->path_info = p + 1; - memmove(p + 2, p + 1, strlen(p + 1) + 1); // +1 is for trailing \0 - p[1] = '/'; - break; - } else { - *p = '/'; - } + // Support PATH_INFO for CGI scripts. + for (p = buf + strlen(buf); p > buf + 1; p--) { + if (*p == '/') { + *p = '\0'; + if (match_prefix(conn->ctx->config[CGI_EXTENSIONS], + (int)strlen(conn->ctx->config[CGI_EXTENSIONS]), buf) > 0 && + mg_stat(conn, buf, filep)) { + // Shift PATH_INFO block one character right, e.g. + // "/x.cgi/foo/bar\x00" => "/x.cgi\x00/foo/bar\x00" + // conn->path_info is pointing to the local variable "path" declared + // in handle_request(), so PATH_INFO is not valid after + // handle_request returns. + conn->path_info = p + 1; + memmove(p + 2, p + 1, strlen(p + 1) + 1); // +1 is for trailing \0 + p[1] = '/'; + break; + } else { + *p = '/'; + } + } } - } } // Check whether full request is buffered. Return: // -1 if request is malformed // 0 if request is not yet fully buffered // >0 actual request length, including last \r\n\r\n -static int get_request_len(const char *buf, int buflen) { - const char *s, *e; - int len = 0; +static int get_request_len(const char *buf, int buflen) +{ + const char *s, *e; + int len = 0; - for (s = buf, e = s + buflen - 1; len <= 0 && s < e; s++) - // Control characters are not allowed but >=128 is. - if (!isprint(* (const unsigned char *) s) && *s != '\r' && - *s != '\n' && * (const unsigned char *) s < 128) { - len = -1; - break; // [i_a] abort scan as soon as one malformed character is found; - // don't let subsequent \r\n\r\n win us over anyhow - } else if (s[0] == '\n' && s[1] == '\n') { - len = (int) (s - buf) + 2; - } else if (s[0] == '\n' && &s[1] < e && - s[1] == '\r' && s[2] == '\n') { - len = (int) (s - buf) + 3; - } + for (s = buf, e = s + buflen - 1; len <= 0 && s < e; s++) + // Control characters are not allowed but >=128 is. + if (!isprint(* (const unsigned char *) s) && *s != '\r' && + *s != '\n' && * (const unsigned char *) s < 128) { + len = -1; + break; // [i_a] abort scan as soon as one malformed character is found; + // don't let subsequent \r\n\r\n win us over anyhow + } else if (s[0] == '\n' && s[1] == '\n') { + len = (int) (s - buf) + 2; + } else if (s[0] == '\n' && &s[1] < e && + s[1] == '\r' && s[2] == '\n') { + len = (int) (s - buf) + 3; + } - return len; + return len; } // Convert month to the month number. Return -1 on error, or month number -static int get_month_index(const char *s) { - size_t i; +static int get_month_index(const char *s) +{ + size_t i; - for (i = 0; i < ARRAY_SIZE(month_names); i++) - if (!strcmp(s, month_names[i])) - return (int) i; + for (i = 0; i < ARRAY_SIZE(month_names); i++) + if (!strcmp(s, month_names[i])) + return (int) i; - return -1; + return -1; } -static int num_leap_years(int year) { - return year / 4 - year / 100 + year / 400; +static int num_leap_years(int year) +{ + return year / 4 - year / 100 + year / 400; } // Parse UTC date-time string, and return the corresponding time_t value. -static time_t parse_date_string(const char *datetime) { - static const unsigned short days_before_month[] = { - 0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334 - }; - char month_str[32]; - int second, minute, hour, day, month, year, leap_days, days; - time_t result = (time_t) 0; +static time_t parse_date_string(const char *datetime) +{ + static const unsigned short days_before_month[] = { + 0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334 + }; + char month_str[32]; + int second, minute, hour, day, month, year, leap_days, days; + time_t result = (time_t) 0; - if (((sscanf(datetime, "%d/%3s/%d %d:%d:%d", - &day, month_str, &year, &hour, &minute, &second) == 6) || - (sscanf(datetime, "%d %3s %d %d:%d:%d", - &day, month_str, &year, &hour, &minute, &second) == 6) || - (sscanf(datetime, "%*3s, %d %3s %d %d:%d:%d", - &day, month_str, &year, &hour, &minute, &second) == 6) || - (sscanf(datetime, "%d-%3s-%d %d:%d:%d", - &day, month_str, &year, &hour, &minute, &second) == 6)) && - year > 1970 && - (month = get_month_index(month_str)) != -1) { - leap_days = num_leap_years(year) - num_leap_years(1970); - year -= 1970; - days = year * 365 + days_before_month[month] + (day - 1) + leap_days; - result = days * 24 * 3600 + hour * 3600 + minute * 60 + second; - } + if (((sscanf(datetime, "%d/%3s/%d %d:%d:%d", + &day, month_str, &year, &hour, &minute, &second) == 6) || + (sscanf(datetime, "%d %3s %d %d:%d:%d", + &day, month_str, &year, &hour, &minute, &second) == 6) || + (sscanf(datetime, "%*3s, %d %3s %d %d:%d:%d", + &day, month_str, &year, &hour, &minute, &second) == 6) || + (sscanf(datetime, "%d-%3s-%d %d:%d:%d", + &day, month_str, &year, &hour, &minute, &second) == 6)) && + year > 1970 && + (month = get_month_index(month_str)) != -1) { + leap_days = num_leap_years(year) - num_leap_years(1970); + year -= 1970; + days = year * 365 + days_before_month[month] + (day - 1) + leap_days; + result = days * 24 * 3600 + hour * 3600 + minute * 60 + second; + } - return result; + return result; } // Protect against directory disclosure attack by removing '..', // excessive '/' and '\' characters -static void remove_double_dots_and_double_slashes(char *s) { - char *p = s; +static void remove_double_dots_and_double_slashes(char *s) +{ + char *p = s; - while (*s != '\0') { - *p++ = *s++; - if (s[-1] == '/' || s[-1] == '\\') { - // Skip all following slashes, backslashes and double-dots - while (s[0] != '\0') { - if (s[0] == '/' || s[0] == '\\') { - s++; - } else if (s[0] == '.' && s[1] == '.') { - s += 2; - } else { - break; + while (*s != '\0') { + *p++ = *s++; + if (s[-1] == '/' || s[-1] == '\\') { + // Skip all following slashes, backslashes and double-dots + while (s[0] != '\0') { + if (s[0] == '/' || s[0] == '\\') { + s++; + } else if (s[0] == '.' && s[1] == '.') { + s += 2; + } else { + break; + } + } } - } } - } - *p = '\0'; + *p = '\0'; } static const struct { - const char *extension; - size_t ext_len; - const char *mime_type; + const char *extension; + size_t ext_len; + const char *mime_type; } builtin_mime_types[] = { - {".html", 5, "text/html"}, - {".htm", 4, "text/html"}, - {".shtm", 5, "text/html"}, - {".shtml", 6, "text/html"}, - {".css", 4, "text/css"}, - {".js", 3, "application/x-javascript"}, - {".ico", 4, "image/x-icon"}, - {".gif", 4, "image/gif"}, - {".jpg", 4, "image/jpeg"}, - {".jpeg", 5, "image/jpeg"}, - {".png", 4, "image/png"}, - {".svg", 4, "image/svg+xml"}, - {".txt", 4, "text/plain"}, - {".torrent", 8, "application/x-bittorrent"}, - {".wav", 4, "audio/x-wav"}, - {".mp3", 4, "audio/x-mp3"}, - {".mid", 4, "audio/mid"}, - {".m3u", 4, "audio/x-mpegurl"}, - {".ogg", 4, "audio/ogg"}, - {".ram", 4, "audio/x-pn-realaudio"}, - {".xml", 4, "text/xml"}, - {".json", 5, "text/json"}, - {".xslt", 5, "application/xml"}, - {".xsl", 4, "application/xml"}, - {".ra", 3, "audio/x-pn-realaudio"}, - {".doc", 4, "application/msword"}, - {".exe", 4, "application/octet-stream"}, - {".zip", 4, "application/x-zip-compressed"}, - {".xls", 4, "application/excel"}, - {".tgz", 4, "application/x-tar-gz"}, - {".tar", 4, "application/x-tar"}, - {".gz", 3, "application/x-gunzip"}, - {".arj", 4, "application/x-arj-compressed"}, - {".rar", 4, "application/x-arj-compressed"}, - {".rtf", 4, "application/rtf"}, - {".pdf", 4, "application/pdf"}, - {".swf", 4, "application/x-shockwave-flash"}, - {".mpg", 4, "video/mpeg"}, - {".webm", 5, "video/webm"}, - {".mpeg", 5, "video/mpeg"}, - {".mov", 4, "video/quicktime"}, - {".mp4", 4, "video/mp4"}, - {".m4v", 4, "video/x-m4v"}, - {".asf", 4, "video/x-ms-asf"}, - {".avi", 4, "video/x-msvideo"}, - {".bmp", 4, "image/bmp"}, - {".ttf", 4, "application/x-font-ttf"}, - {NULL, 0, NULL} + {".html", 5, "text/html"}, + {".htm", 4, "text/html"}, + {".shtm", 5, "text/html"}, + {".shtml", 6, "text/html"}, + {".css", 4, "text/css"}, + {".js", 3, "application/x-javascript"}, + {".ico", 4, "image/x-icon"}, + {".gif", 4, "image/gif"}, + {".jpg", 4, "image/jpeg"}, + {".jpeg", 5, "image/jpeg"}, + {".png", 4, "image/png"}, + {".svg", 4, "image/svg+xml"}, + {".txt", 4, "text/plain"}, + {".torrent", 8, "application/x-bittorrent"}, + {".wav", 4, "audio/x-wav"}, + {".mp3", 4, "audio/x-mp3"}, + {".mid", 4, "audio/mid"}, + {".m3u", 4, "audio/x-mpegurl"}, + {".ogg", 4, "audio/ogg"}, + {".ram", 4, "audio/x-pn-realaudio"}, + {".xml", 4, "text/xml"}, + {".json", 5, "text/json"}, + {".xslt", 5, "application/xml"}, + {".xsl", 4, "application/xml"}, + {".ra", 3, "audio/x-pn-realaudio"}, + {".doc", 4, "application/msword"}, + {".exe", 4, "application/octet-stream"}, + {".zip", 4, "application/x-zip-compressed"}, + {".xls", 4, "application/excel"}, + {".tgz", 4, "application/x-tar-gz"}, + {".tar", 4, "application/x-tar"}, + {".gz", 3, "application/x-gunzip"}, + {".arj", 4, "application/x-arj-compressed"}, + {".rar", 4, "application/x-arj-compressed"}, + {".rtf", 4, "application/rtf"}, + {".pdf", 4, "application/pdf"}, + {".swf", 4, "application/x-shockwave-flash"}, + {".mpg", 4, "video/mpeg"}, + {".webm", 5, "video/webm"}, + {".mpeg", 5, "video/mpeg"}, + {".mov", 4, "video/quicktime"}, + {".mp4", 4, "video/mp4"}, + {".m4v", 4, "video/x-m4v"}, + {".asf", 4, "video/x-ms-asf"}, + {".avi", 4, "video/x-msvideo"}, + {".bmp", 4, "image/bmp"}, + {".ttf", 4, "application/x-font-ttf"}, + {NULL, 0, NULL} }; -const char *mg_get_builtin_mime_type(const char *path) { - const char *ext; - size_t i, path_len; +const char *mg_get_builtin_mime_type(const char *path) +{ + const char *ext; + size_t i, path_len; - path_len = strlen(path); + path_len = strlen(path); - for (i = 0; builtin_mime_types[i].extension != NULL; i++) { - ext = path + (path_len - builtin_mime_types[i].ext_len); - if (path_len > builtin_mime_types[i].ext_len && - mg_strcasecmp(ext, builtin_mime_types[i].extension) == 0) { - return builtin_mime_types[i].mime_type; + for (i = 0; builtin_mime_types[i].extension != NULL; i++) { + ext = path + (path_len - builtin_mime_types[i].ext_len); + if (path_len > builtin_mime_types[i].ext_len && + mg_strcasecmp(ext, builtin_mime_types[i].extension) == 0) { + return builtin_mime_types[i].mime_type; + } } - } - return "text/plain"; + return "text/plain"; } // Look at the "path" extension and figure what mime type it has. // Store mime type in the vector. static void get_mime_type(struct mg_context *ctx, const char *path, - struct vec *vec) { - struct vec ext_vec, mime_vec; - const char *list, *ext; - size_t path_len; + struct vec *vec) +{ + struct vec ext_vec, mime_vec; + const char *list, *ext; + size_t path_len; - path_len = strlen(path); + path_len = strlen(path); - // Scan user-defined mime types first, in case user wants to - // override default mime types. - list = ctx->config[EXTRA_MIME_TYPES]; - while ((list = next_option(list, &ext_vec, &mime_vec)) != NULL) { - // ext now points to the path suffix - ext = path + path_len - ext_vec.len; - if (mg_strncasecmp(ext, ext_vec.ptr, ext_vec.len) == 0) { - *vec = mime_vec; - return; + // Scan user-defined mime types first, in case user wants to + // override default mime types. + list = ctx->config[EXTRA_MIME_TYPES]; + while ((list = next_option(list, &ext_vec, &mime_vec)) != NULL) { + // ext now points to the path suffix + ext = path + path_len - ext_vec.len; + if (mg_strncasecmp(ext, ext_vec.ptr, ext_vec.len) == 0) { + *vec = mime_vec; + return; + } } - } - vec->ptr = mg_get_builtin_mime_type(path); - vec->len = strlen(vec->ptr); + vec->ptr = mg_get_builtin_mime_type(path); + vec->len = strlen(vec->ptr); } // Stringify binary data. Output buffer must be twice as big as input, // because each byte takes 2 bytes in string representation -static void bin2str(char *to, const unsigned char *p, size_t len) { - static const char *hex = "0123456789abcdef"; +static void bin2str(char *to, const unsigned char *p, size_t len) +{ + static const char *hex = "0123456789abcdef"; - for (; len--; p++) { - *to++ = hex[p[0] >> 4]; - *to++ = hex[p[0] & 0x0f]; - } - *to = '\0'; + for (; len--; p++) { + *to++ = hex[p[0] >> 4]; + *to++ = hex[p[0] & 0x0f]; + } + *to = '\0'; } // Return stringified MD5 hash for list of strings. Buffer must be 33 bytes. -char *mg_md5(char buf[33], ...) { - md5_byte_t hash[16]; - const char *p; - va_list ap; - md5_state_t ctx; +char *mg_md5(char buf[33], ...) +{ + md5_byte_t hash[16]; + const char *p; + va_list ap; + md5_state_t ctx; - md5_init(&ctx); + md5_init(&ctx); - va_start(ap, buf); - while ((p = va_arg(ap, const char *)) != NULL) { - md5_append(&ctx, (const md5_byte_t *) p, (int) strlen(p)); - } - va_end(ap); + va_start(ap, buf); + while ((p = va_arg(ap, const char *)) != NULL) { + md5_append(&ctx, (const md5_byte_t *) p, (int) strlen(p)); + } + va_end(ap); - md5_finish(&ctx, hash); - bin2str(buf, hash, sizeof(hash)); - return buf; + md5_finish(&ctx, hash); + bin2str(buf, hash, sizeof(hash)); + return buf; } // Check the user's password, return 1 if OK static int check_password(const char *method, const char *ha1, const char *uri, const char *nonce, const char *nc, const char *cnonce, - const char *qop, const char *response) { - char ha2[32 + 1], expected_response[32 + 1]; + const char *qop, const char *response) +{ + char ha2[32 + 1], expected_response[32 + 1]; - // Some of the parameters may be NULL - if (method == NULL || nonce == NULL || nc == NULL || cnonce == NULL || - qop == NULL || response == NULL) { - return 0; - } + // Some of the parameters may be NULL + if (method == NULL || nonce == NULL || nc == NULL || cnonce == NULL || + qop == NULL || response == NULL) { + return 0; + } - // NOTE(lsm): due to a bug in MSIE, we do not compare the URI - // TODO(lsm): check for authentication timeout - if (// strcmp(dig->uri, c->ouri) != 0 || - strlen(response) != 32 - // || now - strtoul(dig->nonce, NULL, 10) > 3600 - ) { - return 0; - } + // NOTE(lsm): due to a bug in MSIE, we do not compare the URI + // TODO(lsm): check for authentication timeout + if (// strcmp(dig->uri, c->ouri) != 0 || + strlen(response) != 32 + // || now - strtoul(dig->nonce, NULL, 10) > 3600 + ) { + return 0; + } - mg_md5(ha2, method, ":", uri, NULL); - mg_md5(expected_response, ha1, ":", nonce, ":", nc, - ":", cnonce, ":", qop, ":", ha2, NULL); + mg_md5(ha2, method, ":", uri, NULL); + mg_md5(expected_response, ha1, ":", nonce, ":", nc, + ":", cnonce, ":", qop, ":", ha2, NULL); - return mg_strcasecmp(response, expected_response) == 0; + return mg_strcasecmp(response, expected_response) == 0; } // Use the global passwords file, if specified by auth_gpass option, // or search for .htpasswd in the requested directory. static void open_auth_file(struct mg_connection *conn, const char *path, - struct file *filep) { - char name[PATH_MAX]; - const char *p, *e, *gpass = conn->ctx->config[GLOBAL_PASSWORDS_FILE]; - struct file file = STRUCT_FILE_INITIALIZER; + struct file *filep) +{ + char name[PATH_MAX]; + const char *p, *e, *gpass = conn->ctx->config[GLOBAL_PASSWORDS_FILE]; + struct file file = STRUCT_FILE_INITIALIZER; - if (gpass != NULL) { - // Use global passwords file - if (!mg_fopen(conn, gpass, "r", filep)) { - mg_cry(conn, "fopen(%s): %s", gpass, strerror(ERRNO)); + if (gpass != NULL) { + // Use global passwords file + if (!mg_fopen(conn, gpass, "r", filep)) { + mg_cry(conn, "fopen(%s): %s", gpass, strerror(ERRNO)); + } + // Important: using local struct file to test path for is_directory flag. + // If filep is used, mg_stat() makes it appear as if auth file was opened. + } else if (mg_stat(conn, path, &file) && file.is_directory) { + mg_snprintf(conn, name, sizeof(name), "%s%c%s", + path, '/', PASSWORDS_FILE_NAME); + mg_fopen(conn, name, "r", filep); + } else { + // Try to find .htpasswd in requested directory. + for (p = path, e = p + strlen(p) - 1; e > p; e--) + if (e[0] == '/') + break; + mg_snprintf(conn, name, sizeof(name), "%.*s%c%s", + (int) (e - p), p, '/', PASSWORDS_FILE_NAME); + mg_fopen(conn, name, "r", filep); } - // Important: using local struct file to test path for is_directory flag. - // If filep is used, mg_stat() makes it appear as if auth file was opened. - } else if (mg_stat(conn, path, &file) && file.is_directory) { - mg_snprintf(conn, name, sizeof(name), "%s%c%s", - path, '/', PASSWORDS_FILE_NAME); - mg_fopen(conn, name, "r", filep); - } else { - // Try to find .htpasswd in requested directory. - for (p = path, e = p + strlen(p) - 1; e > p; e--) - if (e[0] == '/') - break; - mg_snprintf(conn, name, sizeof(name), "%.*s%c%s", - (int) (e - p), p, '/', PASSWORDS_FILE_NAME); - mg_fopen(conn, name, "r", filep); - } } // Parsed Authorization header struct ah { - char *user, *uri, *cnonce, *response, *qop, *nc, *nonce; + char *user, *uri, *cnonce, *response, *qop, *nc, *nonce; }; // Return 1 on success. Always initializes the ah structure. static int parse_auth_header(struct mg_connection *conn, char *buf, - size_t buf_size, struct ah *ah) { - char *name, *value, *s; - const char *auth_header; + size_t buf_size, struct ah *ah) +{ + char *name, *value, *s; + const char *auth_header; - (void) memset(ah, 0, sizeof(*ah)); - if ((auth_header = mg_get_header(conn, "Authorization")) == NULL || - mg_strncasecmp(auth_header, "Digest ", 7) != 0) { - return 0; - } - - // Make modifiable copy of the auth header - (void) mg_strlcpy(buf, auth_header + 7, buf_size); - s = buf; - - // Parse authorization header - for (;;) { - // Gobble initial spaces - while (isspace(* (unsigned char *) s)) { - s++; + (void) memset(ah, 0, sizeof(*ah)); + if ((auth_header = mg_get_header(conn, "Authorization")) == NULL || + mg_strncasecmp(auth_header, "Digest ", 7) != 0) { + return 0; } - name = skip_quoted(&s, "=", " ", 0); - // Value is either quote-delimited, or ends at first comma or space. - if (s[0] == '\"') { - s++; - value = skip_quoted(&s, "\"", " ", '\\'); - if (s[0] == ',') { - s++; - } + + // Make modifiable copy of the auth header + (void) mg_strlcpy(buf, auth_header + 7, buf_size); + s = buf; + + // Parse authorization header + for (;;) { + // Gobble initial spaces + while (isspace(* (unsigned char *) s)) { + s++; + } + name = skip_quoted(&s, "=", " ", 0); + // Value is either quote-delimited, or ends at first comma or space. + if (s[0] == '\"') { + s++; + value = skip_quoted(&s, "\"", " ", '\\'); + if (s[0] == ',') { + s++; + } + } else { + value = skip_quoted(&s, ", ", " ", 0); // IE uses commas, FF uses spaces + } + if (*name == '\0') { + break; + } + + if (!strcmp(name, "username")) { + ah->user = value; + } else if (!strcmp(name, "cnonce")) { + ah->cnonce = value; + } else if (!strcmp(name, "response")) { + ah->response = value; + } else if (!strcmp(name, "uri")) { + ah->uri = value; + } else if (!strcmp(name, "qop")) { + ah->qop = value; + } else if (!strcmp(name, "nc")) { + ah->nc = value; + } else if (!strcmp(name, "nonce")) { + ah->nonce = value; + } + } + + // CGI needs it as REMOTE_USER + if (ah->user != NULL) { + conn->request_info.remote_user = mg_strdup(ah->user); } else { - value = skip_quoted(&s, ", ", " ", 0); // IE uses commas, FF uses spaces - } - if (*name == '\0') { - break; + return 0; } - if (!strcmp(name, "username")) { - ah->user = value; - } else if (!strcmp(name, "cnonce")) { - ah->cnonce = value; - } else if (!strcmp(name, "response")) { - ah->response = value; - } else if (!strcmp(name, "uri")) { - ah->uri = value; - } else if (!strcmp(name, "qop")) { - ah->qop = value; - } else if (!strcmp(name, "nc")) { - ah->nc = value; - } else if (!strcmp(name, "nonce")) { - ah->nonce = value; - } - } - - // CGI needs it as REMOTE_USER - if (ah->user != NULL) { - conn->request_info.remote_user = mg_strdup(ah->user); - } else { - return 0; - } - - return 1; + return 1; } -static char *mg_fgets(char *buf, size_t size, struct file *filep, char **p) { - char *eof; - size_t len; - char *memend; +static char *mg_fgets(char *buf, size_t size, struct file *filep, char **p) +{ + char *eof; + size_t len; + char *memend; - if (filep->membuf != NULL && *p != NULL) { - memend = (char *) &filep->membuf[filep->size]; - eof = (char *) memchr(*p, '\n', memend - *p); // Search for \n from p till the end of stream - if (eof != NULL) { - eof += 1; // Include \n + if (filep->membuf != NULL && *p != NULL) { + memend = (char *) &filep->membuf[filep->size]; + eof = (char *) memchr(*p, '\n', memend - *p); // Search for \n from p till the end of stream + if (eof != NULL) { + eof += 1; // Include \n + } else { + eof = memend; // Copy remaining data + } + len = (size_t) (eof - *p) > size - 1 ? size - 1 : (size_t) (eof - *p); + memcpy(buf, *p, len); + buf[len] = '\0'; + *p += len; + return len ? eof : NULL; + } else if (filep->fp != NULL) { + return fgets(buf, (int)size, filep->fp); } else { - eof = memend; // Copy remaining data + return NULL; } - len = (size_t) (eof - *p) > size - 1 ? size - 1 : (size_t) (eof - *p); - memcpy(buf, *p, len); - buf[len] = '\0'; - *p += len; - return len ? eof : NULL; - } else if (filep->fp != NULL) { - return fgets(buf, (int)size, filep->fp); - } else { - return NULL; - } } // Authorize against the opened passwords file. Return 1 if authorized. -static int authorize(struct mg_connection *conn, struct file *filep) { - struct ah ah; - char line[256], f_user[256] = "", ha1[256] = "", f_domain[256] = "", buf[MG_BUF_LEN], *p; +static int authorize(struct mg_connection *conn, struct file *filep) +{ + struct ah ah; + char line[256], f_user[256] = "", ha1[256] = "", f_domain[256] = "", buf[MG_BUF_LEN], *p; - if (!parse_auth_header(conn, buf, sizeof(buf), &ah)) { - return 0; - } - - // Loop over passwords file - p = (char *) filep->membuf; - while (mg_fgets(line, sizeof(line), filep, &p) != NULL) { - if (sscanf(line, "%[^:]:%[^:]:%s", f_user, f_domain, ha1) != 3) { - continue; + if (!parse_auth_header(conn, buf, sizeof(buf), &ah)) { + return 0; } - if (!strcmp(ah.user, f_user) && - !strcmp(conn->ctx->config[AUTHENTICATION_DOMAIN], f_domain)) - return check_password(conn->request_info.request_method, ha1, ah.uri, - ah.nonce, ah.nc, ah.cnonce, ah.qop, ah.response); - } + // Loop over passwords file + p = (char *) filep->membuf; + while (mg_fgets(line, sizeof(line), filep, &p) != NULL) { + if (sscanf(line, "%[^:]:%[^:]:%s", f_user, f_domain, ha1) != 3) { + continue; + } - return 0; + if (!strcmp(ah.user, f_user) && + !strcmp(conn->ctx->config[AUTHENTICATION_DOMAIN], f_domain)) + return check_password(conn->request_info.request_method, ha1, ah.uri, + ah.nonce, ah.nc, ah.cnonce, ah.qop, ah.response); + } + + return 0; } // Return 1 if request is authorised, 0 otherwise. -static int check_authorization(struct mg_connection *conn, const char *path) { - char fname[PATH_MAX]; - struct vec uri_vec, filename_vec; - const char *list; - struct file file = STRUCT_FILE_INITIALIZER; - int authorized = 1; +static int check_authorization(struct mg_connection *conn, const char *path) +{ + char fname[PATH_MAX]; + struct vec uri_vec, filename_vec; + const char *list; + struct file file = STRUCT_FILE_INITIALIZER; + int authorized = 1; - list = conn->ctx->config[PROTECT_URI]; - while ((list = next_option(list, &uri_vec, &filename_vec)) != NULL) { - if (!memcmp(conn->request_info.uri, uri_vec.ptr, uri_vec.len)) { - mg_snprintf(conn, fname, sizeof(fname), "%.*s", - (int) filename_vec.len, filename_vec.ptr); - if (!mg_fopen(conn, fname, "r", &file)) { - mg_cry(conn, "%s: cannot open %s: %s", __func__, fname, strerror(errno)); - } - break; + list = conn->ctx->config[PROTECT_URI]; + while ((list = next_option(list, &uri_vec, &filename_vec)) != NULL) { + if (!memcmp(conn->request_info.uri, uri_vec.ptr, uri_vec.len)) { + mg_snprintf(conn, fname, sizeof(fname), "%.*s", + (int) filename_vec.len, filename_vec.ptr); + if (!mg_fopen(conn, fname, "r", &file)) { + mg_cry(conn, "%s: cannot open %s: %s", __func__, fname, strerror(errno)); + } + break; + } } - } - if (!is_file_opened(&file)) { - open_auth_file(conn, path, &file); - } + if (!is_file_opened(&file)) { + open_auth_file(conn, path, &file); + } - if (is_file_opened(&file)) { - authorized = authorize(conn, &file); - mg_fclose(&file); - } + if (is_file_opened(&file)) { + authorized = authorize(conn, &file); + mg_fclose(&file); + } - return authorized; + return authorized; } -static void send_authorization_request(struct mg_connection *conn) { - conn->status_code = 401; - mg_printf(conn, - "HTTP/1.1 401 Unauthorized\r\n" - "Content-Length: 0\r\n" - "WWW-Authenticate: Digest qop=\"auth\", " - "realm=\"%s\", nonce=\"%lu\"\r\n\r\n", - conn->ctx->config[AUTHENTICATION_DOMAIN], - (unsigned long) time(NULL)); +static void send_authorization_request(struct mg_connection *conn) +{ + conn->status_code = 401; + mg_printf(conn, + "HTTP/1.1 401 Unauthorized\r\n" + "Content-Length: 0\r\n" + "WWW-Authenticate: Digest qop=\"auth\", " + "realm=\"%s\", nonce=\"%lu\"\r\n\r\n", + conn->ctx->config[AUTHENTICATION_DOMAIN], + (unsigned long) time(NULL)); } -static int is_authorized_for_put(struct mg_connection *conn) { - struct file file = STRUCT_FILE_INITIALIZER; - const char *passfile = conn->ctx->config[PUT_DELETE_PASSWORDS_FILE]; - int ret = 0; +static int is_authorized_for_put(struct mg_connection *conn) +{ + struct file file = STRUCT_FILE_INITIALIZER; + const char *passfile = conn->ctx->config[PUT_DELETE_PASSWORDS_FILE]; + int ret = 0; - if (passfile != NULL && mg_fopen(conn, passfile, "r", &file)) { - ret = authorize(conn, &file); - mg_fclose(&file); - } + if (passfile != NULL && mg_fopen(conn, passfile, "r", &file)) { + ret = authorize(conn, &file); + mg_fclose(&file); + } - return ret; + return ret; } int mg_modify_passwords_file(const char *fname, const char *domain, - const char *user, const char *pass) { - int found; - char line[512], u[512] = "", d[512] ="", ha1[33], tmp[PATH_MAX+1]; - FILE *fp, *fp2; + const char *user, const char *pass) +{ + int found; + char line[512], u[512] = "", d[512] ="", ha1[33], tmp[PATH_MAX+1]; + FILE *fp, *fp2; - found = 0; - fp = fp2 = NULL; + found = 0; + fp = fp2 = NULL; - // Regard empty password as no password - remove user record. - if (pass != NULL && pass[0] == '\0') { - pass = NULL; - } - - (void) snprintf(tmp, sizeof(tmp) - 1, "%s.tmp", fname); - tmp[sizeof(tmp) - 1] = 0; - - // Create the file if does not exist - if ((fp = fopen(fname, "a+")) != NULL) { - (void) fclose(fp); - } - - // Open the given file and temporary file - if ((fp = fopen(fname, "r")) == NULL) { - return 0; - } else if ((fp2 = fopen(tmp, "w+")) == NULL) { - fclose(fp); - return 0; - } - - // Copy the stuff to temporary file - while (fgets(line, sizeof(line), fp) != NULL) { - if (sscanf(line, "%[^:]:%[^:]:%*s", u, d) != 2) { - continue; + // Regard empty password as no password - remove user record. + if (pass != NULL && pass[0] == '\0') { + pass = NULL; } - if (!strcmp(u, user) && !strcmp(d, domain)) { - found++; - if (pass != NULL) { + (void) snprintf(tmp, sizeof(tmp) - 1, "%s.tmp", fname); + tmp[sizeof(tmp) - 1] = 0; + + // Create the file if does not exist + if ((fp = fopen(fname, "a+")) != NULL) { + (void) fclose(fp); + } + + // Open the given file and temporary file + if ((fp = fopen(fname, "r")) == NULL) { + return 0; + } else if ((fp2 = fopen(tmp, "w+")) == NULL) { + fclose(fp); + return 0; + } + + // Copy the stuff to temporary file + while (fgets(line, sizeof(line), fp) != NULL) { + if (sscanf(line, "%[^:]:%[^:]:%*s", u, d) != 2) { + continue; + } + + if (!strcmp(u, user) && !strcmp(d, domain)) { + found++; + if (pass != NULL) { + mg_md5(ha1, user, ":", domain, ":", pass, NULL); + fprintf(fp2, "%s:%s:%s\n", user, domain, ha1); + } + } else { + fprintf(fp2, "%s", line); + } + } + + // If new user, just add it + if (!found && pass != NULL) { mg_md5(ha1, user, ":", domain, ":", pass, NULL); fprintf(fp2, "%s:%s:%s\n", user, domain, ha1); - } - } else { - fprintf(fp2, "%s", line); } - } - // If new user, just add it - if (!found && pass != NULL) { - mg_md5(ha1, user, ":", domain, ":", pass, NULL); - fprintf(fp2, "%s:%s:%s\n", user, domain, ha1); - } + // Close files + fclose(fp); + fclose(fp2); - // Close files - fclose(fp); - fclose(fp2); + // Put the temp file in place of real file + remove(fname); + IGNORE_UNUSED_RESULT(rename(tmp, fname)); - // Put the temp file in place of real file - remove(fname); - IGNORE_UNUSED_RESULT(rename(tmp, fname)); - - return 1; + return 1; } static SOCKET conn2(const char *host, int port, int use_ssl, - char *ebuf, size_t ebuf_len) { - struct sockaddr_in sin; - struct hostent *he; - SOCKET sock = INVALID_SOCKET; + char *ebuf, size_t ebuf_len) +{ + struct sockaddr_in sin; + struct hostent *he; + SOCKET sock = INVALID_SOCKET; - if (host == NULL) { - snprintf(ebuf, ebuf_len, "%s", "NULL host"); - } else if (use_ssl && SSLv23_client_method == NULL) { - snprintf(ebuf, ebuf_len, "%s", "SSL is not initialized"); - // TODO(lsm): use something threadsafe instead of gethostbyname() - } else if ((he = gethostbyname(host)) == NULL) { - snprintf(ebuf, ebuf_len, "gethostbyname(%s): %s", host, strerror(ERRNO)); - } else if ((sock = socket(PF_INET, SOCK_STREAM, 0)) == INVALID_SOCKET) { - snprintf(ebuf, ebuf_len, "socket(): %s", strerror(ERRNO)); - } else { - set_close_on_exec(sock); - sin.sin_family = AF_INET; - sin.sin_port = htons((uint16_t) port); - sin.sin_addr = * (struct in_addr *) he->h_addr_list[0]; - if (connect(sock, (struct sockaddr *) &sin, sizeof(sin)) != 0) { - snprintf(ebuf, ebuf_len, "connect(%s:%d): %s", - host, port, strerror(ERRNO)); - closesocket(sock); - sock = INVALID_SOCKET; - } - } - return sock; -} - -int mg_url_encode(const char *src, char *dst, size_t dst_len) { - static const char *dont_escape = "._-$,;~()"; - static const char *hex = "0123456789abcdef"; - char *pos = dst; - const char *end = dst + dst_len - 1; - - for (; *src != '\0' && pos < end; src++, pos++) { - if (isalnum(*(const unsigned char *) src) || - strchr(dont_escape, * (const unsigned char *) src) != NULL) { - *pos = *src; - } else if (pos + 2 < end) { - pos[0] = '%'; - pos[1] = hex[(* (const unsigned char *) src) >> 4]; - pos[2] = hex[(* (const unsigned char *) src) & 0xf]; - pos += 2; - } else { - return -1; - } - } - - *pos = '\0'; - return (*src == '\0') ? (int)(pos - dst) : -1; -} - -static void print_dir_entry(struct de *de) { - char size[64], mod[64], href[PATH_MAX]; - - if (de->file.is_directory) { - mg_snprintf(de->conn, size, sizeof(size), "%s", "[DIRECTORY]"); - } else { - // We use (signed) cast below because MSVC 6 compiler cannot - // convert unsigned __int64 to double. Sigh. - if (de->file.size < 1024) { - mg_snprintf(de->conn, size, sizeof(size), "%d", (int) de->file.size); - } else if (de->file.size < 0x100000) { - mg_snprintf(de->conn, size, sizeof(size), - "%.1fk", (double) de->file.size / 1024.0); - } else if (de->file.size < 0x40000000) { - mg_snprintf(de->conn, size, sizeof(size), - "%.1fM", (double) de->file.size / 1048576); + if (host == NULL) { + snprintf(ebuf, ebuf_len, "%s", "NULL host"); + } else if (use_ssl && SSLv23_client_method == NULL) { + snprintf(ebuf, ebuf_len, "%s", "SSL is not initialized"); + // TODO(lsm): use something threadsafe instead of gethostbyname() + } else if ((he = gethostbyname(host)) == NULL) { + snprintf(ebuf, ebuf_len, "gethostbyname(%s): %s", host, strerror(ERRNO)); + } else if ((sock = socket(PF_INET, SOCK_STREAM, 0)) == INVALID_SOCKET) { + snprintf(ebuf, ebuf_len, "socket(): %s", strerror(ERRNO)); } else { - mg_snprintf(de->conn, size, sizeof(size), - "%.1fG", (double) de->file.size / 1073741824); + set_close_on_exec(sock); + sin.sin_family = AF_INET; + sin.sin_port = htons((uint16_t) port); + sin.sin_addr = * (struct in_addr *) he->h_addr_list[0]; + if (connect(sock, (struct sockaddr *) &sin, sizeof(sin)) != 0) { + snprintf(ebuf, ebuf_len, "connect(%s:%d): %s", + host, port, strerror(ERRNO)); + closesocket(sock); + sock = INVALID_SOCKET; + } } - } - strftime(mod, sizeof(mod), "%d-%b-%Y %H:%M", - localtime(&de->file.modification_time)); - mg_url_encode(de->file_name, href, sizeof(href)); - de->conn->num_bytes_sent += mg_printf(de->conn, - "%s%s" - " %s  %s\n", - de->conn->request_info.uri, href, de->file.is_directory ? "/" : "", - de->file_name, de->file.is_directory ? "/" : "", mod, size); + return sock; +} + +int mg_url_encode(const char *src, char *dst, size_t dst_len) +{ + static const char *dont_escape = "._-$,;~()"; + static const char *hex = "0123456789abcdef"; + char *pos = dst; + const char *end = dst + dst_len - 1; + + for (; *src != '\0' && pos < end; src++, pos++) { + if (isalnum(*(const unsigned char *) src) || + strchr(dont_escape, * (const unsigned char *) src) != NULL) { + *pos = *src; + } else if (pos + 2 < end) { + pos[0] = '%'; + pos[1] = hex[(* (const unsigned char *) src) >> 4]; + pos[2] = hex[(* (const unsigned char *) src) & 0xf]; + pos += 2; + } else { + return -1; + } + } + + *pos = '\0'; + return (*src == '\0') ? (int)(pos - dst) : -1; +} + +static void print_dir_entry(struct de *de) +{ + char size[64], mod[64], href[PATH_MAX]; + + if (de->file.is_directory) { + mg_snprintf(de->conn, size, sizeof(size), "%s", "[DIRECTORY]"); + } else { + // We use (signed) cast below because MSVC 6 compiler cannot + // convert unsigned __int64 to double. Sigh. + if (de->file.size < 1024) { + mg_snprintf(de->conn, size, sizeof(size), "%d", (int) de->file.size); + } else if (de->file.size < 0x100000) { + mg_snprintf(de->conn, size, sizeof(size), + "%.1fk", (double) de->file.size / 1024.0); + } else if (de->file.size < 0x40000000) { + mg_snprintf(de->conn, size, sizeof(size), + "%.1fM", (double) de->file.size / 1048576); + } else { + mg_snprintf(de->conn, size, sizeof(size), + "%.1fG", (double) de->file.size / 1073741824); + } + } + strftime(mod, sizeof(mod), "%d-%b-%Y %H:%M", + localtime(&de->file.modification_time)); + mg_url_encode(de->file_name, href, sizeof(href)); + de->conn->num_bytes_sent += mg_printf(de->conn, + "%s%s" + " %s  %s\n", + de->conn->request_info.uri, href, de->file.is_directory ? "/" : "", + de->file_name, de->file.is_directory ? "/" : "", mod, size); } // This function is called from send_directory() and used for // sorting directory entries by size, or name, or modification time. // On windows, __cdecl specification is needed in case if project is built // with __stdcall convention. qsort always requires __cdels callback. -static int WINCDECL compare_dir_entries(const void *p1, const void *p2) { - const struct de *a = (const struct de *) p1, *b = (const struct de *) p2; - const char *query_string = a->conn->request_info.query_string; - int cmp_result = 0; +static int WINCDECL compare_dir_entries(const void *p1, const void *p2) +{ + const struct de *a = (const struct de *) p1, *b = (const struct de *) p2; + const char *query_string = a->conn->request_info.query_string; + int cmp_result = 0; - if (query_string == NULL) { - query_string = "na"; - } + if (query_string == NULL) { + query_string = "na"; + } - if (a->file.is_directory && !b->file.is_directory) { - return -1; // Always put directories on top - } else if (!a->file.is_directory && b->file.is_directory) { - return 1; // Always put directories on top - } else if (*query_string == 'n') { - cmp_result = strcmp(a->file_name, b->file_name); - } else if (*query_string == 's') { - cmp_result = a->file.size == b->file.size ? 0 : - a->file.size > b->file.size ? 1 : -1; - } else if (*query_string == 'd') { - cmp_result = a->file.modification_time == b->file.modification_time ? 0 : - a->file.modification_time > b->file.modification_time ? 1 : -1; - } + if (a->file.is_directory && !b->file.is_directory) { + return -1; // Always put directories on top + } else if (!a->file.is_directory && b->file.is_directory) { + return 1; // Always put directories on top + } else if (*query_string == 'n') { + cmp_result = strcmp(a->file_name, b->file_name); + } else if (*query_string == 's') { + cmp_result = a->file.size == b->file.size ? 0 : + a->file.size > b->file.size ? 1 : -1; + } else if (*query_string == 'd') { + cmp_result = a->file.modification_time == b->file.modification_time ? 0 : + a->file.modification_time > b->file.modification_time ? 1 : -1; + } - return query_string[1] == 'd' ? -cmp_result : cmp_result; + return query_string[1] == 'd' ? -cmp_result : cmp_result; } -static int must_hide_file(struct mg_connection *conn, const char *path) { - const char *pw_pattern = "**" PASSWORDS_FILE_NAME "$"; - const char *pattern = conn->ctx->config[HIDE_FILES]; - return match_prefix(pw_pattern, (int)strlen(pw_pattern), path) > 0 || - (pattern != NULL && match_prefix(pattern, (int)strlen(pattern), path) > 0); +static int must_hide_file(struct mg_connection *conn, const char *path) +{ + const char *pw_pattern = "**" PASSWORDS_FILE_NAME "$"; + const char *pattern = conn->ctx->config[HIDE_FILES]; + return match_prefix(pw_pattern, (int)strlen(pw_pattern), path) > 0 || + (pattern != NULL && match_prefix(pattern, (int)strlen(pattern), path) > 0); } static int scan_directory(struct mg_connection *conn, const char *dir, - void *data, void (*cb)(struct de *, void *)) { - char path[PATH_MAX]; - struct dirent *dp; - DIR *dirp; - struct de de; + void *data, void (*cb)(struct de *, void *)) +{ + char path[PATH_MAX]; + struct dirent *dp; + DIR *dirp; + struct de de; - if ((dirp = opendir(dir)) == NULL) { - return 0; - } else { - de.conn = conn; + if ((dirp = opendir(dir)) == NULL) { + return 0; + } else { + de.conn = conn; - while ((dp = readdir(dirp)) != NULL) { - // Do not show current dir and hidden files - if (!strcmp(dp->d_name, ".") || - !strcmp(dp->d_name, "..") || - must_hide_file(conn, dp->d_name)) { - continue; - } + while ((dp = readdir(dirp)) != NULL) { + // Do not show current dir and hidden files + if (!strcmp(dp->d_name, ".") || + !strcmp(dp->d_name, "..") || + must_hide_file(conn, dp->d_name)) { + continue; + } - mg_snprintf(conn, path, sizeof(path), "%s%c%s", dir, '/', dp->d_name); + mg_snprintf(conn, path, sizeof(path), "%s%c%s", dir, '/', dp->d_name); - // If we don't memset stat structure to zero, mtime will have - // garbage and strftime() will segfault later on in - // print_dir_entry(). memset is required only if mg_stat() - // fails. For more details, see - // http://code.google.com/p/civetweb/issues/detail?id=79 - memset(&de.file, 0, sizeof(de.file)); - mg_stat(conn, path, &de.file); + // If we don't memset stat structure to zero, mtime will have + // garbage and strftime() will segfault later on in + // print_dir_entry(). memset is required only if mg_stat() + // fails. For more details, see + // http://code.google.com/p/civetweb/issues/detail?id=79 + memset(&de.file, 0, sizeof(de.file)); + mg_stat(conn, path, &de.file); - de.file_name = dp->d_name; - cb(&de, data); + de.file_name = dp->d_name; + cb(&de, data); + } + (void) closedir(dirp); } - (void) closedir(dirp); - } - return 1; + return 1; } -static int remove_directory(struct mg_connection *conn, const char *dir) { - char path[PATH_MAX]; - struct dirent *dp; - DIR *dirp; - struct de de; +static int remove_directory(struct mg_connection *conn, const char *dir) +{ + char path[PATH_MAX]; + struct dirent *dp; + DIR *dirp; + struct de de; - if ((dirp = opendir(dir)) == NULL) { - return 0; - } else { - de.conn = conn; + if ((dirp = opendir(dir)) == NULL) { + return 0; + } else { + de.conn = conn; - while ((dp = readdir(dirp)) != NULL) { - // Do not show current dir (but show hidden files as they will also be removed) - if (!strcmp(dp->d_name, ".") || - !strcmp(dp->d_name, "..")) { - continue; - } + while ((dp = readdir(dirp)) != NULL) { + // Do not show current dir (but show hidden files as they will also be removed) + if (!strcmp(dp->d_name, ".") || + !strcmp(dp->d_name, "..")) { + continue; + } - mg_snprintf(conn, path, sizeof(path), "%s%c%s", dir, '/', dp->d_name); + mg_snprintf(conn, path, sizeof(path), "%s%c%s", dir, '/', dp->d_name); - // If we don't memset stat structure to zero, mtime will have - // garbage and strftime() will segfault later on in - // print_dir_entry(). memset is required only if mg_stat() - // fails. For more details, see - // http://code.google.com/p/civetweb/issues/detail?id=79 - memset(&de.file, 0, sizeof(de.file)); - mg_stat(conn, path, &de.file); - if(de.file.modification_time) { - if(de.file.is_directory) { - remove_directory(conn, path); - } else { - mg_remove(path); - } - } + // If we don't memset stat structure to zero, mtime will have + // garbage and strftime() will segfault later on in + // print_dir_entry(). memset is required only if mg_stat() + // fails. For more details, see + // http://code.google.com/p/civetweb/issues/detail?id=79 + memset(&de.file, 0, sizeof(de.file)); + mg_stat(conn, path, &de.file); + if(de.file.modification_time) { + if(de.file.is_directory) { + remove_directory(conn, path); + } else { + mg_remove(path); + } + } + } + (void) closedir(dirp); + + IGNORE_UNUSED_RESULT(rmdir(dir)); } - (void) closedir(dirp); - IGNORE_UNUSED_RESULT(rmdir(dir)); - } - - return 1; + return 1; } struct dir_scan_data { - struct de *entries; - int num_entries; - int arr_size; + struct de *entries; + int num_entries; + int arr_size; }; // Behaves like realloc(), but frees original pointer on failure -static void *realloc2(void *ptr, size_t size) { - void *new_ptr = realloc(ptr, size); - if (new_ptr == NULL) { - free(ptr); - } - return new_ptr; +static void *realloc2(void *ptr, size_t size) +{ + void *new_ptr = realloc(ptr, size); + if (new_ptr == NULL) { + free(ptr); + } + return new_ptr; } -static void dir_scan_callback(struct de *de, void *data) { - struct dir_scan_data *dsd = (struct dir_scan_data *) data; +static void dir_scan_callback(struct de *de, void *data) +{ + struct dir_scan_data *dsd = (struct dir_scan_data *) data; - if (dsd->entries == NULL || dsd->num_entries >= dsd->arr_size) { - dsd->arr_size *= 2; - dsd->entries = (struct de *) realloc2(dsd->entries, dsd->arr_size * - sizeof(dsd->entries[0])); - } - if (dsd->entries == NULL) { - // TODO(lsm): propagate an error to the caller - dsd->num_entries = 0; - } else { - dsd->entries[dsd->num_entries].file_name = mg_strdup(de->file_name); - dsd->entries[dsd->num_entries].file = de->file; - dsd->entries[dsd->num_entries].conn = de->conn; - dsd->num_entries++; - } + if (dsd->entries == NULL || dsd->num_entries >= dsd->arr_size) { + dsd->arr_size *= 2; + dsd->entries = (struct de *) realloc2(dsd->entries, dsd->arr_size * + sizeof(dsd->entries[0])); + } + if (dsd->entries == NULL) { + // TODO(lsm): propagate an error to the caller + dsd->num_entries = 0; + } else { + dsd->entries[dsd->num_entries].file_name = mg_strdup(de->file_name); + dsd->entries[dsd->num_entries].file = de->file; + dsd->entries[dsd->num_entries].conn = de->conn; + dsd->num_entries++; + } } static void handle_directory_request(struct mg_connection *conn, - const char *dir) { - int i, sort_direction; - struct dir_scan_data data = { NULL, 0, 128 }; + const char *dir) +{ + int i, sort_direction; + struct dir_scan_data data = { NULL, 0, 128 }; - if (!scan_directory(conn, dir, &data, dir_scan_callback)) { - send_http_error(conn, 500, "Cannot open directory", - "Error: opendir(%s): %s", dir, strerror(ERRNO)); - return; - } + if (!scan_directory(conn, dir, &data, dir_scan_callback)) { + send_http_error(conn, 500, "Cannot open directory", + "Error: opendir(%s): %s", dir, strerror(ERRNO)); + return; + } - sort_direction = conn->request_info.query_string != NULL && - conn->request_info.query_string[1] == 'd' ? 'a' : 'd'; + sort_direction = conn->request_info.query_string != NULL && + conn->request_info.query_string[1] == 'd' ? 'a' : 'd'; - conn->must_close = 1; - mg_printf(conn, "%s", - "HTTP/1.1 200 OK\r\n" - "Connection: close\r\n" - "Content-Type: text/html; charset=utf-8\r\n\r\n"); + conn->must_close = 1; + mg_printf(conn, "%s", + "HTTP/1.1 200 OK\r\n" + "Connection: close\r\n" + "Content-Type: text/html; charset=utf-8\r\n\r\n"); - conn->num_bytes_sent += mg_printf(conn, - "Index of %s" - "" - "

Index of %s

"
-      ""
-      ""
-      ""
-      "",
-      conn->request_info.uri, conn->request_info.uri,
-      sort_direction, sort_direction, sort_direction);
+    conn->num_bytes_sent += mg_printf(conn,
+                                      "Index of %s"
+                                      ""
+                                      "
Index of %s
NameModifiedSize
"
+                                      ""
+                                      ""
+                                      ""
+                                      "",
+                                      conn->request_info.uri, conn->request_info.uri,
+                                      sort_direction, sort_direction, sort_direction);
 
-  // Print first entry - link to a parent directory
-  conn->num_bytes_sent += mg_printf(conn,
-      ""
-      "\n",
-      conn->request_info.uri, "..", "Parent directory", "-", "-");
+    // Print first entry - link to a parent directory
+    conn->num_bytes_sent += mg_printf(conn,
+                                      ""
+                                      "\n",
+                                      conn->request_info.uri, "..", "Parent directory", "-", "-");
 
-  // Sort and print directory entries
-  qsort(data.entries, (size_t) data.num_entries, sizeof(data.entries[0]),
-        compare_dir_entries);
-  for (i = 0; i < data.num_entries; i++) {
-    print_dir_entry(&data.entries[i]);
-    free(data.entries[i].file_name);
-  }
-  free(data.entries);
+    // Sort and print directory entries
+    qsort(data.entries, (size_t) data.num_entries, sizeof(data.entries[0]),
+          compare_dir_entries);
+    for (i = 0; i < data.num_entries; i++) {
+        print_dir_entry(&data.entries[i]);
+        free(data.entries[i].file_name);
+    }
+    free(data.entries);
 
-  conn->num_bytes_sent += mg_printf(conn, "%s", "
NameModifiedSize
%s %s  %s
%s %s  %s
");
-  conn->status_code = 200;
+    conn->num_bytes_sent += mg_printf(conn, "%s", "");
+    conn->status_code = 200;
 }
 
 // Send len bytes from the opened file to the client.
 static void send_file_data(struct mg_connection *conn, struct file *filep,
-                           int64_t offset, int64_t len) {
-  char buf[MG_BUF_LEN];
-  int to_read, num_read, num_written;
+                           int64_t offset, int64_t len)
+{
+    char buf[MG_BUF_LEN];
+    int to_read, num_read, num_written;
 
-  // Sanity check the offset
-  offset = offset < 0 ? 0 : offset > filep->size ? filep->size : offset;
+    // Sanity check the offset
+    offset = offset < 0 ? 0 : offset > filep->size ? filep->size : offset;
 
-  if (len > 0 && filep->membuf != NULL && filep->size > 0) {
-    if (len > filep->size - offset) {
-      len = filep->size - offset;
+    if (len > 0 && filep->membuf != NULL && filep->size > 0) {
+        if (len > filep->size - offset) {
+            len = filep->size - offset;
+        }
+        mg_write(conn, filep->membuf + offset, (size_t) len);
+    } else if (len > 0 && filep->fp != NULL) {
+        fseeko(filep->fp, offset, SEEK_SET);
+        while (len > 0) {
+            // Calculate how much to read from the file in the buffer
+            to_read = sizeof(buf);
+            if ((int64_t) to_read > len) {
+                to_read = (int) len;
+            }
+
+            // Read from file, exit the loop on error
+            if ((num_read = (int) fread(buf, 1, (size_t) to_read, filep->fp)) <= 0) {
+                break;
+            }
+
+            // Send read bytes to the client, exit the loop on error
+            if ((num_written = mg_write(conn, buf, (size_t) num_read)) != num_read) {
+                break;
+            }
+
+            // Both read and were successful, adjust counters
+            conn->num_bytes_sent += num_written;
+            len -= num_written;
+        }
     }
-    mg_write(conn, filep->membuf + offset, (size_t) len);
-  } else if (len > 0 && filep->fp != NULL) {
-    fseeko(filep->fp, offset, SEEK_SET);
-    while (len > 0) {
-      // Calculate how much to read from the file in the buffer
-      to_read = sizeof(buf);
-      if ((int64_t) to_read > len) {
-        to_read = (int) len;
-      }
-
-      // Read from file, exit the loop on error
-      if ((num_read = (int) fread(buf, 1, (size_t) to_read, filep->fp)) <= 0) {
-        break;
-      }
-
-      // Send read bytes to the client, exit the loop on error
-      if ((num_written = mg_write(conn, buf, (size_t) num_read)) != num_read) {
-        break;
-      }
-
-      // Both read and were successful, adjust counters
-      conn->num_bytes_sent += num_written;
-      len -= num_written;
-    }
-  }
 }
 
-static int parse_range_header(const char *header, int64_t *a, int64_t *b) {
-  return sscanf(header, "bytes=%" INT64_FMT "-%" INT64_FMT, a, b);
+static int parse_range_header(const char *header, int64_t *a, int64_t *b)
+{
+    return sscanf(header, "bytes=%" INT64_FMT "-%" INT64_FMT, a, b);
 }
 
-static void gmt_time_string(char *buf, size_t buf_len, time_t *t) {
-  strftime(buf, buf_len, "%a, %d %b %Y %H:%M:%S GMT", gmtime(t));
+static void gmt_time_string(char *buf, size_t buf_len, time_t *t)
+{
+    strftime(buf, buf_len, "%a, %d %b %Y %H:%M:%S GMT", gmtime(t));
 }
 
 static void construct_etag(char *buf, size_t buf_len,
-                           const struct file *filep) {
-  snprintf(buf, buf_len, "\"%lx.%" INT64_FMT "\"",
-           (unsigned long) filep->modification_time, filep->size);
+                           const struct file *filep)
+{
+    snprintf(buf, buf_len, "\"%lx.%" INT64_FMT "\"",
+             (unsigned long) filep->modification_time, filep->size);
 }
 
-static void fclose_on_exec(struct file *filep) {
-  if (filep != NULL && filep->fp != NULL) {
+static void fclose_on_exec(struct file *filep)
+{
+    if (filep != NULL && filep->fp != NULL) {
 #ifndef _WIN32
-    fcntl(fileno(filep->fp), F_SETFD, FD_CLOEXEC);
+        fcntl(fileno(filep->fp), F_SETFD, FD_CLOEXEC);
 #endif
-  }
+    }
 }
 
 static void handle_file_request(struct mg_connection *conn, const char *path,
-                                struct file *filep) {
-  char date[64], lm[64], etag[64], range[64];
-  const char *msg = "OK", *hdr;
-  time_t curtime = time(NULL);
-  int64_t cl, r1, r2;
-  struct vec mime_vec;
-  int n;
-  char gz_path[PATH_MAX];
-  char const* encoding = "";
+                                struct file *filep)
+{
+    char date[64], lm[64], etag[64], range[64];
+    const char *msg = "OK", *hdr;
+    time_t curtime = time(NULL);
+    int64_t cl, r1, r2;
+    struct vec mime_vec;
+    int n;
+    char gz_path[PATH_MAX];
+    char const* encoding = "";
 
-  get_mime_type(conn->ctx, path, &mime_vec);
-  cl = filep->size;
-  conn->status_code = 200;
-  range[0] = '\0';
+    get_mime_type(conn->ctx, path, &mime_vec);
+    cl = filep->size;
+    conn->status_code = 200;
+    range[0] = '\0';
 
-  // if this file is in fact a pre-gzipped file, rewrite its filename
-  // it's important to rewrite the filename after resolving
-  // the mime type from it, to preserve the actual file's type
-  if (filep->gzipped) {
-    snprintf(gz_path, sizeof(gz_path), "%s.gz", path);
-    path = gz_path;
-    encoding = "Content-Encoding: gzip\r\n";
-  }
-
-  if (!mg_fopen(conn, path, "rb", filep)) {
-    send_http_error(conn, 500, http_500_error,
-                    "fopen(%s): %s", path, strerror(ERRNO));
-    return;
-  }
-
-  fclose_on_exec(filep);
-
-  // If Range: header specified, act accordingly
-  r1 = r2 = 0;
-  hdr = mg_get_header(conn, "Range");
-  if (hdr != NULL && (n = parse_range_header(hdr, &r1, &r2)) > 0 &&
-      r1 >= 0 && r2 >= 0) {
-    // actually, range requests don't play well with a pre-gzipped
-    // file (since the range is specified in the uncmpressed space)
+    // if this file is in fact a pre-gzipped file, rewrite its filename
+    // it's important to rewrite the filename after resolving
+    // the mime type from it, to preserve the actual file's type
     if (filep->gzipped) {
-      send_http_error(conn, 501, "Not Implemented", "range requests in gzipped files are not supported");
-      return;
+        snprintf(gz_path, sizeof(gz_path), "%s.gz", path);
+        path = gz_path;
+        encoding = "Content-Encoding: gzip\r\n";
     }
-    conn->status_code = 206;
-    cl = n == 2 ? (r2 > cl ? cl : r2) - r1 + 1: cl - r1;
-    mg_snprintf(conn, range, sizeof(range),
-                "Content-Range: bytes "
-                "%" INT64_FMT "-%"
-                INT64_FMT "/%" INT64_FMT "\r\n",
-                r1, r1 + cl - 1, filep->size);
-    msg = "Partial Content";
-  }
 
-  // Prepare Etag, Date, Last-Modified headers. Must be in UTC, according to
-  // http://www.w3.org/Protocols/rfc2616/rfc2616-sec3.html#sec3.3
-  gmt_time_string(date, sizeof(date), &curtime);
-  gmt_time_string(lm, sizeof(lm), &filep->modification_time);
-  construct_etag(etag, sizeof(etag), filep);
+    if (!mg_fopen(conn, path, "rb", filep)) {
+        send_http_error(conn, 500, http_500_error,
+                        "fopen(%s): %s", path, strerror(ERRNO));
+        return;
+    }
 
-  (void) mg_printf(conn,
-      "HTTP/1.1 %d %s\r\n"
-      "Date: %s\r\n"
-      "Last-Modified: %s\r\n"
-      "Etag: %s\r\n"
-      "Content-Type: %.*s\r\n"
-      "Content-Length: %" INT64_FMT "\r\n"
-      "Connection: %s\r\n"
-      "Accept-Ranges: bytes\r\n"
-      "%s%s\r\n",
-      conn->status_code, msg, date, lm, etag, (int) mime_vec.len,
-      mime_vec.ptr, cl, suggest_connection_header(conn), range, encoding);
+    fclose_on_exec(filep);
 
-  if (strcmp(conn->request_info.request_method, "HEAD") != 0) {
-    send_file_data(conn, filep, r1, cl);
-  }
-  mg_fclose(filep);
+    // If Range: header specified, act accordingly
+    r1 = r2 = 0;
+    hdr = mg_get_header(conn, "Range");
+    if (hdr != NULL && (n = parse_range_header(hdr, &r1, &r2)) > 0 &&
+        r1 >= 0 && r2 >= 0) {
+        // actually, range requests don't play well with a pre-gzipped
+        // file (since the range is specified in the uncmpressed space)
+        if (filep->gzipped) {
+            send_http_error(conn, 501, "Not Implemented", "range requests in gzipped files are not supported");
+            return;
+        }
+        conn->status_code = 206;
+cl = n == 2 ? (r2 > cl ? cl : r2) - r1 + 1: cl - r1;
+        mg_snprintf(conn, range, sizeof(range),
+                    "Content-Range: bytes "
+                    "%" INT64_FMT "-%"
+                    INT64_FMT "/%" INT64_FMT "\r\n",
+                    r1, r1 + cl - 1, filep->size);
+        msg = "Partial Content";
+    }
+
+    // Prepare Etag, Date, Last-Modified headers. Must be in UTC, according to
+    // http://www.w3.org/Protocols/rfc2616/rfc2616-sec3.html#sec3.3
+    gmt_time_string(date, sizeof(date), &curtime);
+    gmt_time_string(lm, sizeof(lm), &filep->modification_time);
+    construct_etag(etag, sizeof(etag), filep);
+
+    (void) mg_printf(conn,
+                     "HTTP/1.1 %d %s\r\n"
+                     "Date: %s\r\n"
+                     "Last-Modified: %s\r\n"
+                     "Etag: %s\r\n"
+                     "Content-Type: %.*s\r\n"
+                     "Content-Length: %" INT64_FMT "\r\n"
+                     "Connection: %s\r\n"
+                     "Accept-Ranges: bytes\r\n"
+                     "%s%s\r\n",
+                     conn->status_code, msg, date, lm, etag, (int) mime_vec.len,
+                     mime_vec.ptr, cl, suggest_connection_header(conn), range, encoding);
+
+    if (strcmp(conn->request_info.request_method, "HEAD") != 0) {
+        send_file_data(conn, filep, r1, cl);
+    }
+    mg_fclose(filep);
 }
 
-void mg_send_file(struct mg_connection *conn, const char *path) {
-  struct file file = STRUCT_FILE_INITIALIZER;
-  if (mg_stat(conn, path, &file)) {
-    handle_file_request(conn, path, &file);
-  } else {
-    send_http_error(conn, 404, "Not Found", "%s", "File not found");
-  }
+void mg_send_file(struct mg_connection *conn, const char *path)
+{
+    struct file file = STRUCT_FILE_INITIALIZER;
+    if (mg_stat(conn, path, &file)) {
+        handle_file_request(conn, path, &file);
+    } else {
+        send_http_error(conn, 404, "Not Found", "%s", "File not found");
+    }
 }
 
 
 // Parse HTTP headers from the given buffer, advance buffer to the point
 // where parsing stopped.
-static void parse_http_headers(char **buf, struct mg_request_info *ri) {
-  int i;
+static void parse_http_headers(char **buf, struct mg_request_info *ri)
+{
+    int i;
 
-  for (i = 0; i < (int) ARRAY_SIZE(ri->http_headers); i++) {
-    ri->http_headers[i].name = skip_quoted(buf, ":", " ", 0);
-    ri->http_headers[i].value = skip(buf, "\r\n");
-    if (ri->http_headers[i].name[0] == '\0')
-      break;
-    ri->num_headers = i + 1;
-  }
+    for (i = 0; i < (int) ARRAY_SIZE(ri->http_headers); i++) {
+        ri->http_headers[i].name = skip_quoted(buf, ":", " ", 0);
+        ri->http_headers[i].value = skip(buf, "\r\n");
+        if (ri->http_headers[i].name[0] == '\0')
+            break;
+        ri->num_headers = i + 1;
+    }
 }
 
-static int is_valid_http_method(const char *method) {
-  return !strcmp(method, "GET") || !strcmp(method, "POST") ||
-    !strcmp(method, "HEAD") || !strcmp(method, "CONNECT") ||
-    !strcmp(method, "PUT") || !strcmp(method, "DELETE") ||
-    !strcmp(method, "OPTIONS") || !strcmp(method, "PROPFIND")
-    || !strcmp(method, "MKCOL")
-          ;
+static int is_valid_http_method(const char *method)
+{
+    return !strcmp(method, "GET") || !strcmp(method, "POST") ||
+           !strcmp(method, "HEAD") || !strcmp(method, "CONNECT") ||
+           !strcmp(method, "PUT") || !strcmp(method, "DELETE") ||
+           !strcmp(method, "OPTIONS") || !strcmp(method, "PROPFIND")
+           || !strcmp(method, "MKCOL")
+           ;
 }
 
 // Parse HTTP request, fill in mg_request_info structure.
 // This function modifies the buffer by NUL-terminating
 // HTTP request components, header names and header values.
-static int parse_http_message(char *buf, int len, struct mg_request_info *ri) {
-  int is_request, request_length = get_request_len(buf, len);
-  if (request_length > 0) {
-    // Reset attributes. DO NOT TOUCH is_ssl, remote_ip, remote_port
-    ri->remote_user = ri->request_method = ri->uri = ri->http_version = NULL;
-    ri->num_headers = 0;
+static int parse_http_message(char *buf, int len, struct mg_request_info *ri)
+{
+    int is_request, request_length = get_request_len(buf, len);
+    if (request_length > 0) {
+        // Reset attributes. DO NOT TOUCH is_ssl, remote_ip, remote_port
+        ri->remote_user = ri->request_method = ri->uri = ri->http_version = NULL;
+        ri->num_headers = 0;
 
-    buf[request_length - 1] = '\0';
+        buf[request_length - 1] = '\0';
 
-    // RFC says that all initial whitespaces should be ingored
-    while (*buf != '\0' && isspace(* (unsigned char *) buf)) {
-      buf++;
+        // RFC says that all initial whitespaces should be ingored
+        while (*buf != '\0' && isspace(* (unsigned char *) buf)) {
+            buf++;
+        }
+        ri->request_method = skip(&buf, " ");
+        ri->uri = skip(&buf, " ");
+        ri->http_version = skip(&buf, "\r\n");
+
+        // HTTP message could be either HTTP request or HTTP response, e.g.
+        // "GET / HTTP/1.0 ...." or  "HTTP/1.0 200 OK ..."
+        is_request = is_valid_http_method(ri->request_method);
+        if ((is_request && memcmp(ri->http_version, "HTTP/", 5) != 0) ||
+            (!is_request && memcmp(ri->request_method, "HTTP/", 5) != 0)) {
+            request_length = -1;
+        } else {
+            if (is_request) {
+                ri->http_version += 5;
+            }
+            parse_http_headers(&buf, ri);
+        }
     }
-    ri->request_method = skip(&buf, " ");
-    ri->uri = skip(&buf, " ");
-    ri->http_version = skip(&buf, "\r\n");
-
-    // HTTP message could be either HTTP request or HTTP response, e.g.
-    // "GET / HTTP/1.0 ...." or  "HTTP/1.0 200 OK ..."
-    is_request = is_valid_http_method(ri->request_method);
-    if ((is_request && memcmp(ri->http_version, "HTTP/", 5) != 0) ||
-        (!is_request && memcmp(ri->request_method, "HTTP/", 5) != 0)) {
-      request_length = -1;
-    } else {
-      if (is_request) {
-        ri->http_version += 5;
-      }
-      parse_http_headers(&buf, ri);
-    }
-  }
-  return request_length;
+    return request_length;
 }
 
 // Keep reading the input (either opened file descriptor fd, or socket sock,
@@ -2920,134 +3040,138 @@ static int parse_http_message(char *buf, int len, struct mg_request_info *ri) {
 // have some data. The length of the data is stored in nread.
 // Upon every read operation, increase nread by the number of bytes read.
 static int read_request(FILE *fp, struct mg_connection *conn,
-                        char *buf, int bufsiz, int *nread) {
-  int request_len, n = 0;
+                        char *buf, int bufsiz, int *nread)
+{
+    int request_len, n = 0;
 
-  request_len = get_request_len(buf, *nread);
-  while (conn->ctx->stop_flag == 0 &&
-         *nread < bufsiz && request_len == 0 &&
-         (n = pull(fp, conn, buf + *nread, bufsiz - *nread)) > 0) {
-    *nread += n;
-    assert(*nread <= bufsiz);
     request_len = get_request_len(buf, *nread);
-  }
+    while (conn->ctx->stop_flag == 0 &&
+           *nread < bufsiz && request_len == 0 &&
+           (n = pull(fp, conn, buf + *nread, bufsiz - *nread)) > 0) {
+        *nread += n;
+        assert(*nread <= bufsiz);
+        request_len = get_request_len(buf, *nread);
+    }
 
-  return request_len <= 0 && n <= 0 ? -1 : request_len;
+    return request_len <= 0 && n <= 0 ? -1 : request_len;
 }
 
 // For given directory path, substitute it to valid index file.
 // Return 0 if index file has been found, -1 if not found.
 // If the file is found, it's stats is returned in stp.
 static int substitute_index_file(struct mg_connection *conn, char *path,
-                                 size_t path_len, struct file *filep) {
-  const char *list = conn->ctx->config[INDEX_FILES];
-  struct file file = STRUCT_FILE_INITIALIZER;
-  struct vec filename_vec;
-  size_t n = strlen(path);
-  int found = 0;
+                                 size_t path_len, struct file *filep)
+{
+    const char *list = conn->ctx->config[INDEX_FILES];
+    struct file file = STRUCT_FILE_INITIALIZER;
+    struct vec filename_vec;
+    size_t n = strlen(path);
+    int found = 0;
 
-  // The 'path' given to us points to the directory. Remove all trailing
-  // directory separator characters from the end of the path, and
-  // then append single directory separator character.
-  while (n > 0 && path[n - 1] == '/') {
-    n--;
-  }
-  path[n] = '/';
-
-  // Traverse index files list. For each entry, append it to the given
-  // path and see if the file exists. If it exists, break the loop
-  while ((list = next_option(list, &filename_vec, NULL)) != NULL) {
-
-    // Ignore too long entries that may overflow path buffer
-    if (filename_vec.len > path_len - (n + 2))
-      continue;
-
-    // Prepare full path to the index file
-    mg_strlcpy(path + n + 1, filename_vec.ptr, filename_vec.len + 1);
-
-    // Does it exist?
-    if (mg_stat(conn, path, &file)) {
-      // Yes it does, break the loop
-      *filep = file;
-      found = 1;
-      break;
+    // The 'path' given to us points to the directory. Remove all trailing
+    // directory separator characters from the end of the path, and
+    // then append single directory separator character.
+    while (n > 0 && path[n - 1] == '/') {
+        n--;
     }
-  }
+    path[n] = '/';
 
-  // If no index file exists, restore directory path
-  if (!found) {
-    path[n] = '\0';
-  }
+    // Traverse index files list. For each entry, append it to the given
+    // path and see if the file exists. If it exists, break the loop
+    while ((list = next_option(list, &filename_vec, NULL)) != NULL) {
 
-  return found;
+        // Ignore too long entries that may overflow path buffer
+        if (filename_vec.len > path_len - (n + 2))
+            continue;
+
+        // Prepare full path to the index file
+        mg_strlcpy(path + n + 1, filename_vec.ptr, filename_vec.len + 1);
+
+        // Does it exist?
+        if (mg_stat(conn, path, &file)) {
+            // Yes it does, break the loop
+            *filep = file;
+            found = 1;
+            break;
+        }
+    }
+
+    // If no index file exists, restore directory path
+    if (!found) {
+        path[n] = '\0';
+    }
+
+    return found;
 }
 
 // Return True if we should reply 304 Not Modified.
 static int is_not_modified(const struct mg_connection *conn,
-                           const struct file *filep) {
-  char etag[64];
-  const char *ims = mg_get_header(conn, "If-Modified-Since");
-  const char *inm = mg_get_header(conn, "If-None-Match");
-  construct_etag(etag, sizeof(etag), filep);
-  return (inm != NULL && !mg_strcasecmp(etag, inm)) ||
-    (ims != NULL && filep->modification_time <= parse_date_string(ims));
+                           const struct file *filep)
+{
+    char etag[64];
+    const char *ims = mg_get_header(conn, "If-Modified-Since");
+    const char *inm = mg_get_header(conn, "If-None-Match");
+    construct_etag(etag, sizeof(etag), filep);
+    return (inm != NULL && !mg_strcasecmp(etag, inm)) ||
+           (ims != NULL && filep->modification_time <= parse_date_string(ims));
 }
 
 static int forward_body_data(struct mg_connection *conn, FILE *fp,
-                             SOCKET sock, SSL *ssl) {
-  const char *expect, *body;
-  char buf[MG_BUF_LEN];
-  int to_read, nread, buffered_len, success = 0;
+                             SOCKET sock, SSL *ssl)
+{
+    const char *expect, *body;
+    char buf[MG_BUF_LEN];
+    int to_read, nread, buffered_len, success = 0;
 
-  expect = mg_get_header(conn, "Expect");
-  assert(fp != NULL);
+    expect = mg_get_header(conn, "Expect");
+    assert(fp != NULL);
 
-  if (conn->content_len == -1) {
-    send_http_error(conn, 411, "Length Required", "%s", "");
-  } else if (expect != NULL && mg_strcasecmp(expect, "100-continue")) {
-    send_http_error(conn, 417, "Expectation Failed", "%s", "");
-  } else {
-    if (expect != NULL) {
-      (void) mg_printf(conn, "%s", "HTTP/1.1 100 Continue\r\n\r\n");
+    if (conn->content_len == -1) {
+        send_http_error(conn, 411, "Length Required", "%s", "");
+    } else if (expect != NULL && mg_strcasecmp(expect, "100-continue")) {
+        send_http_error(conn, 417, "Expectation Failed", "%s", "");
+    } else {
+        if (expect != NULL) {
+            (void) mg_printf(conn, "%s", "HTTP/1.1 100 Continue\r\n\r\n");
+        }
+
+        body = conn->buf + conn->request_len + conn->consumed_content;
+        buffered_len = (int)(&conn->buf[conn->data_len] - body);
+        assert(buffered_len >= 0);
+        assert(conn->consumed_content == 0);
+
+        if (buffered_len > 0) {
+            if ((int64_t) buffered_len > conn->content_len) {
+                buffered_len = (int) conn->content_len;
+            }
+            push(fp, sock, ssl, body, (int64_t) buffered_len);
+            conn->consumed_content += buffered_len;
+        }
+
+        nread = 0;
+        while (conn->consumed_content < conn->content_len) {
+            to_read = sizeof(buf);
+            if ((int64_t) to_read > conn->content_len - conn->consumed_content) {
+                to_read = (int) (conn->content_len - conn->consumed_content);
+            }
+            nread = pull(NULL, conn, buf, to_read);
+            if (nread <= 0 || push(fp, sock, ssl, buf, nread) != nread) {
+                break;
+            }
+            conn->consumed_content += nread;
+        }
+
+        if (conn->consumed_content == conn->content_len) {
+            success = nread >= 0;
+        }
+
+        // Each error code path in this function must send an error
+        if (!success) {
+            send_http_error(conn, 577, http_500_error, "%s", "");
+        }
     }
 
-    body = conn->buf + conn->request_len + conn->consumed_content;
-    buffered_len = (int)(&conn->buf[conn->data_len] - body);
-    assert(buffered_len >= 0);
-    assert(conn->consumed_content == 0);
-
-    if (buffered_len > 0) {
-      if ((int64_t) buffered_len > conn->content_len) {
-        buffered_len = (int) conn->content_len;
-      }
-      push(fp, sock, ssl, body, (int64_t) buffered_len);
-      conn->consumed_content += buffered_len;
-    }
-
-    nread = 0;
-    while (conn->consumed_content < conn->content_len) {
-      to_read = sizeof(buf);
-      if ((int64_t) to_read > conn->content_len - conn->consumed_content) {
-        to_read = (int) (conn->content_len - conn->consumed_content);
-      }
-      nread = pull(NULL, conn, buf, to_read);
-      if (nread <= 0 || push(fp, sock, ssl, buf, nread) != nread) {
-        break;
-      }
-      conn->consumed_content += nread;
-    }
-
-    if (conn->consumed_content == conn->content_len) {
-      success = nread >= 0;
-    }
-
-    // Each error code path in this function must send an error
-    if (!success) {
-      send_http_error(conn, 577, http_500_error, "%s", "");
-    }
-  }
-
-  return success;
+    return success;
 }
 
 #if !defined(NO_CGI)
@@ -3060,656 +3184,673 @@ static int forward_body_data(struct mg_connection *conn, FILE *fp,
 // We satisfy both worlds: we create an envp array (which is vars), all
 // entries are actually pointers inside buf.
 struct cgi_env_block {
-  struct mg_connection *conn;
-  char buf[CGI_ENVIRONMENT_SIZE]; // Environment buffer
-  int len; // Space taken
-  char *vars[MAX_CGI_ENVIR_VARS]; // char **envp
-  int nvars; // Number of variables
+    struct mg_connection *conn;
+    char buf[CGI_ENVIRONMENT_SIZE]; // Environment buffer
+    int len; // Space taken
+    char *vars[MAX_CGI_ENVIR_VARS]; // char **envp
+    int nvars; // Number of variables
 };
 
 static char *addenv(struct cgi_env_block *block,
                     PRINTF_FORMAT_STRING(const char *fmt), ...)
-  PRINTF_ARGS(2, 3);
+PRINTF_ARGS(2, 3);
 
 // Append VARIABLE=VALUE\0 string to the buffer, and add a respective
 // pointer into the vars array.
-static char *addenv(struct cgi_env_block *block, const char *fmt, ...) {
-  int n, space;
-  char *added;
-  va_list ap;
+static char *addenv(struct cgi_env_block *block, const char *fmt, ...)
+{
+    int n, space;
+    char *added;
+    va_list ap;
 
-  // Calculate how much space is left in the buffer
-  space = sizeof(block->buf) - block->len - 2;
-  assert(space >= 0);
+    // Calculate how much space is left in the buffer
+    space = sizeof(block->buf) - block->len - 2;
+    assert(space >= 0);
 
-  // Make a pointer to the free space int the buffer
-  added = block->buf + block->len;
+    // Make a pointer to the free space int the buffer
+    added = block->buf + block->len;
 
-  // Copy VARIABLE=VALUE\0 string into the free space
-  va_start(ap, fmt);
-  n = mg_vsnprintf(block->conn, added, (size_t) space, fmt, ap);
-  va_end(ap);
+    // Copy VARIABLE=VALUE\0 string into the free space
+    va_start(ap, fmt);
+    n = mg_vsnprintf(block->conn, added, (size_t) space, fmt, ap);
+    va_end(ap);
 
-  // Make sure we do not overflow buffer and the envp array
-  if (n > 0 && n + 1 < space &&
-      block->nvars < (int) ARRAY_SIZE(block->vars) - 2) {
-    // Append a pointer to the added string into the envp array
-    block->vars[block->nvars++] = added;
-    // Bump up used length counter. Include \0 terminator
-    block->len += n + 1;
-  } else {
-    mg_cry(block->conn, "%s: CGI env buffer truncated for [%s]", __func__, fmt);
-  }
+    // Make sure we do not overflow buffer and the envp array
+    if (n > 0 && n + 1 < space &&
+        block->nvars < (int) ARRAY_SIZE(block->vars) - 2) {
+        // Append a pointer to the added string into the envp array
+        block->vars[block->nvars++] = added;
+        // Bump up used length counter. Include \0 terminator
+        block->len += n + 1;
+    } else {
+        mg_cry(block->conn, "%s: CGI env buffer truncated for [%s]", __func__, fmt);
+    }
 
-  return added;
+    return added;
 }
 
 static void prepare_cgi_environment(struct mg_connection *conn,
                                     const char *prog,
-                                    struct cgi_env_block *blk) {
-  const char *s, *slash;
-  struct vec var_vec;
-  char *p, src_addr[IP_ADDR_STR_LEN];
-  int  i;
+                                    struct cgi_env_block *blk)
+{
+    const char *s, *slash;
+    struct vec var_vec;
+    char *p, src_addr[IP_ADDR_STR_LEN];
+    int  i;
 
-  blk->len = blk->nvars = 0;
-  blk->conn = conn;
-  sockaddr_to_string(src_addr, sizeof(src_addr), &conn->client.rsa);
+    blk->len = blk->nvars = 0;
+    blk->conn = conn;
+    sockaddr_to_string(src_addr, sizeof(src_addr), &conn->client.rsa);
 
-  addenv(blk, "SERVER_NAME=%s", conn->ctx->config[AUTHENTICATION_DOMAIN]);
-  addenv(blk, "SERVER_ROOT=%s", conn->ctx->config[DOCUMENT_ROOT]);
-  addenv(blk, "DOCUMENT_ROOT=%s", conn->ctx->config[DOCUMENT_ROOT]);
-  addenv(blk, "SERVER_SOFTWARE=%s/%s", "Civetweb", mg_version());
+    addenv(blk, "SERVER_NAME=%s", conn->ctx->config[AUTHENTICATION_DOMAIN]);
+    addenv(blk, "SERVER_ROOT=%s", conn->ctx->config[DOCUMENT_ROOT]);
+    addenv(blk, "DOCUMENT_ROOT=%s", conn->ctx->config[DOCUMENT_ROOT]);
+    addenv(blk, "SERVER_SOFTWARE=%s/%s", "Civetweb", mg_version());
 
-  // Prepare the environment block
-  addenv(blk, "%s", "GATEWAY_INTERFACE=CGI/1.1");
-  addenv(blk, "%s", "SERVER_PROTOCOL=HTTP/1.1");
-  addenv(blk, "%s", "REDIRECT_STATUS=200"); // For PHP
+    // Prepare the environment block
+    addenv(blk, "%s", "GATEWAY_INTERFACE=CGI/1.1");
+    addenv(blk, "%s", "SERVER_PROTOCOL=HTTP/1.1");
+    addenv(blk, "%s", "REDIRECT_STATUS=200"); // For PHP
 
-  // TODO(lsm): fix this for IPv6 case
-  addenv(blk, "SERVER_PORT=%d", ntohs(conn->client.lsa.sin.sin_port));
+    // TODO(lsm): fix this for IPv6 case
+    addenv(blk, "SERVER_PORT=%d", ntohs(conn->client.lsa.sin.sin_port));
 
-  addenv(blk, "REQUEST_METHOD=%s", conn->request_info.request_method);
-  addenv(blk, "REMOTE_ADDR=%s", src_addr);
-  addenv(blk, "REMOTE_PORT=%d", conn->request_info.remote_port);
-  addenv(blk, "REQUEST_URI=%s", conn->request_info.uri);
+    addenv(blk, "REQUEST_METHOD=%s", conn->request_info.request_method);
+    addenv(blk, "REMOTE_ADDR=%s", src_addr);
+    addenv(blk, "REMOTE_PORT=%d", conn->request_info.remote_port);
+    addenv(blk, "REQUEST_URI=%s", conn->request_info.uri);
 
-  // SCRIPT_NAME
-  assert(conn->request_info.uri[0] == '/');
-  slash = strrchr(conn->request_info.uri, '/');
-  if ((s = strrchr(prog, '/')) == NULL)
-    s = prog;
-  addenv(blk, "SCRIPT_NAME=%.*s%s", (int) (slash - conn->request_info.uri),
-         conn->request_info.uri, s);
+    // SCRIPT_NAME
+    assert(conn->request_info.uri[0] == '/');
+    slash = strrchr(conn->request_info.uri, '/');
+    if ((s = strrchr(prog, '/')) == NULL)
+        s = prog;
+    addenv(blk, "SCRIPT_NAME=%.*s%s", (int) (slash - conn->request_info.uri),
+           conn->request_info.uri, s);
 
-  addenv(blk, "SCRIPT_FILENAME=%s", prog);
-  addenv(blk, "PATH_TRANSLATED=%s", prog);
-  addenv(blk, "HTTPS=%s", conn->ssl == NULL ? "off" : "on");
+    addenv(blk, "SCRIPT_FILENAME=%s", prog);
+    addenv(blk, "PATH_TRANSLATED=%s", prog);
+    addenv(blk, "HTTPS=%s", conn->ssl == NULL ? "off" : "on");
 
-  if ((s = mg_get_header(conn, "Content-Type")) != NULL)
-    addenv(blk, "CONTENT_TYPE=%s", s);
+    if ((s = mg_get_header(conn, "Content-Type")) != NULL)
+        addenv(blk, "CONTENT_TYPE=%s", s);
 
-  if (conn->request_info.query_string != NULL)
-    addenv(blk, "QUERY_STRING=%s", conn->request_info.query_string);
+    if (conn->request_info.query_string != NULL)
+        addenv(blk, "QUERY_STRING=%s", conn->request_info.query_string);
 
-  if ((s = mg_get_header(conn, "Content-Length")) != NULL)
-    addenv(blk, "CONTENT_LENGTH=%s", s);
+    if ((s = mg_get_header(conn, "Content-Length")) != NULL)
+        addenv(blk, "CONTENT_LENGTH=%s", s);
 
-  if ((s = getenv("PATH")) != NULL)
-    addenv(blk, "PATH=%s", s);
+    if ((s = getenv("PATH")) != NULL)
+        addenv(blk, "PATH=%s", s);
 
-  if (conn->path_info != NULL) {
-    addenv(blk, "PATH_INFO=%s", conn->path_info);
-  }
+    if (conn->path_info != NULL) {
+        addenv(blk, "PATH_INFO=%s", conn->path_info);
+    }
 
 #if defined(_WIN32)
-  if ((s = getenv("COMSPEC")) != NULL) {
-    addenv(blk, "COMSPEC=%s", s);
-  }
-  if ((s = getenv("SYSTEMROOT")) != NULL) {
-    addenv(blk, "SYSTEMROOT=%s", s);
-  }
-  if ((s = getenv("SystemDrive")) != NULL) {
-    addenv(blk, "SystemDrive=%s", s);
-  }
-  if ((s = getenv("ProgramFiles")) != NULL) {
-    addenv(blk, "ProgramFiles=%s", s);
-  }
-  if ((s = getenv("ProgramFiles(x86)")) != NULL) {
-    addenv(blk, "ProgramFiles(x86)=%s", s);
-  }
+    if ((s = getenv("COMSPEC")) != NULL) {
+        addenv(blk, "COMSPEC=%s", s);
+    }
+    if ((s = getenv("SYSTEMROOT")) != NULL) {
+        addenv(blk, "SYSTEMROOT=%s", s);
+    }
+    if ((s = getenv("SystemDrive")) != NULL) {
+        addenv(blk, "SystemDrive=%s", s);
+    }
+    if ((s = getenv("ProgramFiles")) != NULL) {
+        addenv(blk, "ProgramFiles=%s", s);
+    }
+    if ((s = getenv("ProgramFiles(x86)")) != NULL) {
+        addenv(blk, "ProgramFiles(x86)=%s", s);
+    }
 #else
-  if ((s = getenv("LD_LIBRARY_PATH")) != NULL)
-    addenv(blk, "LD_LIBRARY_PATH=%s", s);
+    if ((s = getenv("LD_LIBRARY_PATH")) != NULL)
+        addenv(blk, "LD_LIBRARY_PATH=%s", s);
 #endif // _WIN32
 
-  if ((s = getenv("PERLLIB")) != NULL)
-    addenv(blk, "PERLLIB=%s", s);
+    if ((s = getenv("PERLLIB")) != NULL)
+        addenv(blk, "PERLLIB=%s", s);
 
-  if (conn->request_info.remote_user != NULL) {
-    addenv(blk, "REMOTE_USER=%s", conn->request_info.remote_user);
-    addenv(blk, "%s", "AUTH_TYPE=Digest");
-  }
-
-  // Add all headers as HTTP_* variables
-  for (i = 0; i < conn->request_info.num_headers; i++) {
-    p = addenv(blk, "HTTP_%s=%s",
-        conn->request_info.http_headers[i].name,
-        conn->request_info.http_headers[i].value);
-
-    // Convert variable name into uppercase, and change - to _
-    for (; *p != '=' && *p != '\0'; p++) {
-      if (*p == '-')
-        *p = '_';
-      *p = (char) toupper(* (unsigned char *) p);
+    if (conn->request_info.remote_user != NULL) {
+        addenv(blk, "REMOTE_USER=%s", conn->request_info.remote_user);
+        addenv(blk, "%s", "AUTH_TYPE=Digest");
     }
-  }
 
-  // Add user-specified variables
-  s = conn->ctx->config[CGI_ENVIRONMENT];
-  while ((s = next_option(s, &var_vec, NULL)) != NULL) {
-    addenv(blk, "%.*s", (int) var_vec.len, var_vec.ptr);
-  }
+    // Add all headers as HTTP_* variables
+    for (i = 0; i < conn->request_info.num_headers; i++) {
+        p = addenv(blk, "HTTP_%s=%s",
+                   conn->request_info.http_headers[i].name,
+                   conn->request_info.http_headers[i].value);
 
-  blk->vars[blk->nvars++] = NULL;
-  blk->buf[blk->len++] = '\0';
+        // Convert variable name into uppercase, and change - to _
+        for (; *p != '=' && *p != '\0'; p++) {
+            if (*p == '-')
+                *p = '_';
+            *p = (char) toupper(* (unsigned char *) p);
+        }
+    }
 
-  assert(blk->nvars < (int) ARRAY_SIZE(blk->vars));
-  assert(blk->len > 0);
-  assert(blk->len < (int) sizeof(blk->buf));
+    // Add user-specified variables
+    s = conn->ctx->config[CGI_ENVIRONMENT];
+    while ((s = next_option(s, &var_vec, NULL)) != NULL) {
+        addenv(blk, "%.*s", (int) var_vec.len, var_vec.ptr);
+    }
+
+    blk->vars[blk->nvars++] = NULL;
+    blk->buf[blk->len++] = '\0';
+
+    assert(blk->nvars < (int) ARRAY_SIZE(blk->vars));
+    assert(blk->len > 0);
+    assert(blk->len < (int) sizeof(blk->buf));
 }
 
-static void handle_cgi_request(struct mg_connection *conn, const char *prog) {
-  int headers_len, data_len, i, fdin[2] = { 0, 0 }, fdout[2] = { 0, 0 };
-  const char *status, *status_text;
-  char buf[MAX_REQUEST_SIZE], *pbuf, dir[PATH_MAX], *p;
-  struct mg_request_info ri;
-  struct cgi_env_block blk;
-  FILE *in = NULL, *out = NULL;
-  struct file fout = STRUCT_FILE_INITIALIZER;
-  pid_t pid = (pid_t) -1;
+static void handle_cgi_request(struct mg_connection *conn, const char *prog)
+{
+    int headers_len, data_len, i, fdin[2] = { 0, 0 }, fdout[2] = { 0, 0 };
+    const char *status, *status_text;
+    char buf[MAX_REQUEST_SIZE], *pbuf, dir[PATH_MAX], *p;
+    struct mg_request_info ri;
+    struct cgi_env_block blk;
+    FILE *in = NULL, *out = NULL;
+    struct file fout = STRUCT_FILE_INITIALIZER;
+    pid_t pid = (pid_t) -1;
 
-  prepare_cgi_environment(conn, prog, &blk);
+    prepare_cgi_environment(conn, prog, &blk);
 
-  // CGI must be executed in its own directory. 'dir' must point to the
-  // directory containing executable program, 'p' must point to the
-  // executable program name relative to 'dir'.
-  (void) mg_snprintf(conn, dir, sizeof(dir), "%s", prog);
-  if ((p = strrchr(dir, '/')) != NULL) {
-    *p++ = '\0';
-  } else {
-    dir[0] = '.', dir[1] = '\0';
-    p = (char *) prog;
-  }
-
-  if (pipe(fdin) != 0 || pipe(fdout) != 0) {
-    send_http_error(conn, 500, http_500_error,
-        "Cannot create CGI pipe: %s", strerror(ERRNO));
-    goto done;
-  }
-
-  pid = spawn_process(conn, p, blk.buf, blk.vars, fdin[0], fdout[1], dir);
-  if (pid == (pid_t) -1) {
-    send_http_error(conn, 500, http_500_error,
-        "Cannot spawn CGI process [%s]: %s", prog, strerror(ERRNO));
-    goto done;
-  }
-
-  // Make sure child closes all pipe descriptors. It must dup them to 0,1
-  set_close_on_exec(fdin[0]);
-  set_close_on_exec(fdin[1]);
-  set_close_on_exec(fdout[0]);
-  set_close_on_exec(fdout[1]);
-
-  // Parent closes only one side of the pipes.
-  // If we don't mark them as closed, close() attempt before
-  // return from this function throws an exception on Windows.
-  // Windows does not like when closed descriptor is closed again.
-  (void) close(fdin[0]);
-  (void) close(fdout[1]);
-  fdin[0] = fdout[1] = -1;
-
-
-  if ((in = fdopen(fdin[1], "wb")) == NULL ||
-      (out = fdopen(fdout[0], "rb")) == NULL) {
-    send_http_error(conn, 500, http_500_error,
-        "fopen: %s", strerror(ERRNO));
-    goto done;
-  }
-
-  setbuf(in, NULL);
-  setbuf(out, NULL);
-  fout.fp = out;
-
-  // Send POST data to the CGI process if needed
-  if (!strcmp(conn->request_info.request_method, "POST") &&
-      !forward_body_data(conn, in, INVALID_SOCKET, NULL)) {
-    goto done;
-  }
-
-  // Close so child gets an EOF.
-  fclose(in);
-  in = NULL;
-  fdin[1] = -1;
-
-  // Now read CGI reply into a buffer. We need to set correct
-  // status code, thus we need to see all HTTP headers first.
-  // Do not send anything back to client, until we buffer in all
-  // HTTP headers.
-  data_len = 0;
-  headers_len = read_request(out, conn, buf, sizeof(buf), &data_len);
-  if (headers_len <= 0) {
-    send_http_error(conn, 500, http_500_error,
-                    "CGI program sent malformed or too big (>%u bytes) "
-                    "HTTP headers: [%.*s]",
-                    (unsigned) sizeof(buf), data_len, buf);
-    goto done;
-  }
-  pbuf = buf;
-  buf[headers_len - 1] = '\0';
-  parse_http_headers(&pbuf, &ri);
-
-  // Make up and send the status line
-  status_text = "OK";
-  if ((status = get_header(&ri, "Status")) != NULL) {
-    conn->status_code = atoi(status);
-    status_text = status;
-    while (isdigit(* (unsigned char *) status_text) || *status_text == ' ') {
-      status_text++;
+    // CGI must be executed in its own directory. 'dir' must point to the
+    // directory containing executable program, 'p' must point to the
+    // executable program name relative to 'dir'.
+    (void) mg_snprintf(conn, dir, sizeof(dir), "%s", prog);
+    if ((p = strrchr(dir, '/')) != NULL) {
+        *p++ = '\0';
+    } else {
+        dir[0] = '.', dir[1] = '\0';
+        p = (char *) prog;
     }
-  } else if (get_header(&ri, "Location") != NULL) {
-    conn->status_code = 302;
-  } else {
-    conn->status_code = 200;
-  }
-  if (get_header(&ri, "Connection") != NULL &&
-      !mg_strcasecmp(get_header(&ri, "Connection"), "keep-alive")) {
-    conn->must_close = 1;
-  }
-  (void) mg_printf(conn, "HTTP/1.1 %d %s\r\n", conn->status_code,
-                   status_text);
 
-  // Send headers
-  for (i = 0; i < ri.num_headers; i++) {
-    mg_printf(conn, "%s: %s\r\n",
-              ri.http_headers[i].name, ri.http_headers[i].value);
-  }
-  mg_write(conn, "\r\n", 2);
+    if (pipe(fdin) != 0 || pipe(fdout) != 0) {
+        send_http_error(conn, 500, http_500_error,
+                        "Cannot create CGI pipe: %s", strerror(ERRNO));
+        goto done;
+    }
 
-  // Send chunk of data that may have been read after the headers
-  conn->num_bytes_sent += mg_write(conn, buf + headers_len,
-                                   (size_t)(data_len - headers_len));
+    pid = spawn_process(conn, p, blk.buf, blk.vars, fdin[0], fdout[1], dir);
+    if (pid == (pid_t) -1) {
+        send_http_error(conn, 500, http_500_error,
+                        "Cannot spawn CGI process [%s]: %s", prog, strerror(ERRNO));
+        goto done;
+    }
 
-  // Read the rest of CGI output and send to the client
-  send_file_data(conn, &fout, 0, INT64_MAX);
+    // Make sure child closes all pipe descriptors. It must dup them to 0,1
+    set_close_on_exec(fdin[0]);
+    set_close_on_exec(fdin[1]);
+    set_close_on_exec(fdout[0]);
+    set_close_on_exec(fdout[1]);
+
+    // Parent closes only one side of the pipes.
+    // If we don't mark them as closed, close() attempt before
+    // return from this function throws an exception on Windows.
+    // Windows does not like when closed descriptor is closed again.
+    (void) close(fdin[0]);
+    (void) close(fdout[1]);
+    fdin[0] = fdout[1] = -1;
+
+
+    if ((in = fdopen(fdin[1], "wb")) == NULL ||
+        (out = fdopen(fdout[0], "rb")) == NULL) {
+        send_http_error(conn, 500, http_500_error,
+                        "fopen: %s", strerror(ERRNO));
+        goto done;
+    }
+
+    setbuf(in, NULL);
+    setbuf(out, NULL);
+    fout.fp = out;
+
+    // Send POST data to the CGI process if needed
+    if (!strcmp(conn->request_info.request_method, "POST") &&
+        !forward_body_data(conn, in, INVALID_SOCKET, NULL)) {
+        goto done;
+    }
+
+    // Close so child gets an EOF.
+    fclose(in);
+    in = NULL;
+    fdin[1] = -1;
+
+    // Now read CGI reply into a buffer. We need to set correct
+    // status code, thus we need to see all HTTP headers first.
+    // Do not send anything back to client, until we buffer in all
+    // HTTP headers.
+    data_len = 0;
+    headers_len = read_request(out, conn, buf, sizeof(buf), &data_len);
+    if (headers_len <= 0) {
+        send_http_error(conn, 500, http_500_error,
+                        "CGI program sent malformed or too big (>%u bytes) "
+                        "HTTP headers: [%.*s]",
+                        (unsigned) sizeof(buf), data_len, buf);
+        goto done;
+    }
+    pbuf = buf;
+    buf[headers_len - 1] = '\0';
+    parse_http_headers(&pbuf, &ri);
+
+    // Make up and send the status line
+    status_text = "OK";
+    if ((status = get_header(&ri, "Status")) != NULL) {
+        conn->status_code = atoi(status);
+        status_text = status;
+        while (isdigit(* (unsigned char *) status_text) || *status_text == ' ') {
+            status_text++;
+        }
+    } else if (get_header(&ri, "Location") != NULL) {
+        conn->status_code = 302;
+    } else {
+        conn->status_code = 200;
+    }
+    if (get_header(&ri, "Connection") != NULL &&
+        !mg_strcasecmp(get_header(&ri, "Connection"), "keep-alive")) {
+        conn->must_close = 1;
+    }
+    (void) mg_printf(conn, "HTTP/1.1 %d %s\r\n", conn->status_code,
+                     status_text);
+
+    // Send headers
+    for (i = 0; i < ri.num_headers; i++) {
+        mg_printf(conn, "%s: %s\r\n",
+                  ri.http_headers[i].name, ri.http_headers[i].value);
+    }
+    mg_write(conn, "\r\n", 2);
+
+    // Send chunk of data that may have been read after the headers
+    conn->num_bytes_sent += mg_write(conn, buf + headers_len,
+                                     (size_t)(data_len - headers_len));
+
+    // Read the rest of CGI output and send to the client
+    send_file_data(conn, &fout, 0, INT64_MAX);
 
 done:
-  if (pid != (pid_t) -1) {
-    kill(pid, SIGKILL);
+    if (pid != (pid_t) -1) {
+        kill(pid, SIGKILL);
 #if !defined(_WIN32)
-    {
-        int st;
-        while (waitpid(pid, &st, 0) != -1);  // clean zombies
-    }
+        {
+            int st;
+            while (waitpid(pid, &st, 0) != -1);  // clean zombies
+        }
 #endif
-  }
-  if (fdin[0] != -1) {
-    close(fdin[0]);
-  }
-  if (fdout[1] != -1) {
-    close(fdout[1]);
-  }
+    }
+    if (fdin[0] != -1) {
+        close(fdin[0]);
+    }
+    if (fdout[1] != -1) {
+        close(fdout[1]);
+    }
 
-  if (in != NULL) {
-    fclose(in);
-  } else if (fdin[1] != -1) {
-    close(fdin[1]);
-  }
+    if (in != NULL) {
+        fclose(in);
+    } else if (fdin[1] != -1) {
+        close(fdin[1]);
+    }
 
-  if (out != NULL) {
-    fclose(out);
-  } else if (fdout[0] != -1) {
-    close(fdout[0]);
-  }
+    if (out != NULL) {
+        fclose(out);
+    } else if (fdout[0] != -1) {
+        close(fdout[0]);
+    }
 }
 #endif // !NO_CGI
 
 // For a given PUT path, create all intermediate subdirectories
 // for given path. Return 0 if the path itself is a directory,
 // or -1 on error, 1 if OK.
-static int put_dir(struct mg_connection *conn, const char *path) {
-  char buf[PATH_MAX];
-  const char *s, *p;
-  struct file file = STRUCT_FILE_INITIALIZER;
-  int len, res = 1;
+static int put_dir(struct mg_connection *conn, const char *path)
+{
+    char buf[PATH_MAX];
+    const char *s, *p;
+    struct file file = STRUCT_FILE_INITIALIZER;
+    int len, res = 1;
 
-  for (s = p = path + 2; (p = strchr(s, '/')) != NULL; s = ++p) {
-    len = (int)(p - path);
-    if (len >= (int) sizeof(buf)) {
-      res = -1;
-      break;
-    }
-    memcpy(buf, path, len);
-    buf[len] = '\0';
+    for (s = p = path + 2; (p = strchr(s, '/')) != NULL; s = ++p) {
+        len = (int)(p - path);
+        if (len >= (int) sizeof(buf)) {
+            res = -1;
+            break;
+        }
+        memcpy(buf, path, len);
+        buf[len] = '\0';
 
-    // Try to create intermediate directory
-    DEBUG_TRACE(("mkdir(%s)", buf));
-    if (!mg_stat(conn, buf, &file) && mg_mkdir(buf, 0755) != 0) {
-      res = -1;
-      break;
+        // Try to create intermediate directory
+        DEBUG_TRACE(("mkdir(%s)", buf));
+        if (!mg_stat(conn, buf, &file) && mg_mkdir(buf, 0755) != 0) {
+            res = -1;
+            break;
+        }
+
+        // Is path itself a directory?
+        if (p[1] == '\0') {
+            res = 0;
+        }
     }
 
-    // Is path itself a directory?
-    if (p[1] == '\0') {
-      res = 0;
-    }
-  }
-
-  return res;
+    return res;
 }
 
-static void mkcol(struct mg_connection *conn, const char *path) {
-  int rc, body_len;
-  struct de de;
-  memset(&de.file, 0, sizeof(de.file));
-  mg_stat(conn, path, &de.file);
+static void mkcol(struct mg_connection *conn, const char *path)
+{
+    int rc, body_len;
+    struct de de;
+    memset(&de.file, 0, sizeof(de.file));
+    mg_stat(conn, path, &de.file);
 
-  if(de.file.modification_time) {
-      send_http_error(conn, 405, "Method Not Allowed",
-                      "mkcol(%s): %s", path, strerror(ERRNO));
-      return;
-  }
-
-  body_len = conn->data_len - conn->request_len;
-  if(body_len > 0) {
-      send_http_error(conn, 415, "Unsupported media type",
-                      "mkcol(%s): %s", path, strerror(ERRNO));
-      return;
-  }
-
-  rc = mg_mkdir(path, 0755);
-
-  if (rc == 0) {
-    conn->status_code = 201;
-    mg_printf(conn, "HTTP/1.1 %d Created\r\n\r\n", conn->status_code);
-  } else if (rc == -1) {
-      if(errno == EEXIST)
+    if(de.file.modification_time) {
         send_http_error(conn, 405, "Method Not Allowed",
-                      "mkcol(%s): %s", path, strerror(ERRNO));
-      else if(errno == EACCES)
-          send_http_error(conn, 403, "Forbidden",
                         "mkcol(%s): %s", path, strerror(ERRNO));
-      else if(errno == ENOENT)
-          send_http_error(conn, 409, "Conflict",
+        return;
+    }
+
+    body_len = conn->data_len - conn->request_len;
+    if(body_len > 0) {
+        send_http_error(conn, 415, "Unsupported media type",
                         "mkcol(%s): %s", path, strerror(ERRNO));
-      else
-          send_http_error(conn, 500, http_500_error,
-                          "fopen(%s): %s", path, strerror(ERRNO));
-  }
+        return;
+    }
+
+    rc = mg_mkdir(path, 0755);
+
+    if (rc == 0) {
+        conn->status_code = 201;
+        mg_printf(conn, "HTTP/1.1 %d Created\r\n\r\n", conn->status_code);
+    } else if (rc == -1) {
+        if(errno == EEXIST)
+            send_http_error(conn, 405, "Method Not Allowed",
+                            "mkcol(%s): %s", path, strerror(ERRNO));
+        else if(errno == EACCES)
+            send_http_error(conn, 403, "Forbidden",
+                            "mkcol(%s): %s", path, strerror(ERRNO));
+        else if(errno == ENOENT)
+            send_http_error(conn, 409, "Conflict",
+                            "mkcol(%s): %s", path, strerror(ERRNO));
+        else
+            send_http_error(conn, 500, http_500_error,
+                            "fopen(%s): %s", path, strerror(ERRNO));
+    }
 }
 
-static void put_file(struct mg_connection *conn, const char *path) {
-  struct file file = STRUCT_FILE_INITIALIZER;
-  const char *range;
-  int64_t r1, r2;
-  int rc;
+static void put_file(struct mg_connection *conn, const char *path)
+{
+    struct file file = STRUCT_FILE_INITIALIZER;
+    const char *range;
+    int64_t r1, r2;
+    int rc;
 
-  conn->status_code = mg_stat(conn, path, &file) ? 200 : 201;
+    conn->status_code = mg_stat(conn, path, &file) ? 200 : 201;
 
-  if ((rc = put_dir(conn, path)) == 0) {
-    mg_printf(conn, "HTTP/1.1 %d OK\r\n\r\n", conn->status_code);
-  } else if (rc == -1) {
-    send_http_error(conn, 500, http_500_error,
-                    "put_dir(%s): %s", path, strerror(ERRNO));
-  } else if (!mg_fopen(conn, path, "wb+", &file) || file.fp == NULL) {
-    mg_fclose(&file);
-    send_http_error(conn, 500, http_500_error,
-                    "fopen(%s): %s", path, strerror(ERRNO));
-  } else {
-    fclose_on_exec(&file);
-    range = mg_get_header(conn, "Content-Range");
-    r1 = r2 = 0;
-    if (range != NULL && parse_range_header(range, &r1, &r2) > 0) {
-      conn->status_code = 206;
-      fseeko(file.fp, r1, SEEK_SET);
+    if ((rc = put_dir(conn, path)) == 0) {
+        mg_printf(conn, "HTTP/1.1 %d OK\r\n\r\n", conn->status_code);
+    } else if (rc == -1) {
+        send_http_error(conn, 500, http_500_error,
+                        "put_dir(%s): %s", path, strerror(ERRNO));
+    } else if (!mg_fopen(conn, path, "wb+", &file) || file.fp == NULL) {
+        mg_fclose(&file);
+        send_http_error(conn, 500, http_500_error,
+                        "fopen(%s): %s", path, strerror(ERRNO));
+    } else {
+        fclose_on_exec(&file);
+        range = mg_get_header(conn, "Content-Range");
+        r1 = r2 = 0;
+        if (range != NULL && parse_range_header(range, &r1, &r2) > 0) {
+            conn->status_code = 206;
+            fseeko(file.fp, r1, SEEK_SET);
+        }
+        if (!forward_body_data(conn, file.fp, INVALID_SOCKET, NULL)) {
+            conn->status_code = 500;
+        }
+        mg_printf(conn, "HTTP/1.1 %d OK\r\nContent-Length: 0\r\n\r\n",
+                  conn->status_code);
+        mg_fclose(&file);
     }
-    if (!forward_body_data(conn, file.fp, INVALID_SOCKET, NULL)) {
-      conn->status_code = 500;
-    }
-    mg_printf(conn, "HTTP/1.1 %d OK\r\nContent-Length: 0\r\n\r\n",
-              conn->status_code);
-    mg_fclose(&file);
-  }
 }
 
 static void send_ssi_file(struct mg_connection *, const char *,
                           struct file *, int);
 
 static void do_ssi_include(struct mg_connection *conn, const char *ssi,
-                           char *tag, int include_level) {
-  char file_name[MG_BUF_LEN], path[PATH_MAX], *p;
-  struct file file = STRUCT_FILE_INITIALIZER;
+                           char *tag, int include_level)
+{
+    char file_name[MG_BUF_LEN], path[PATH_MAX], *p;
+    struct file file = STRUCT_FILE_INITIALIZER;
 
-  // sscanf() is safe here, since send_ssi_file() also uses buffer
-  // of size MG_BUF_LEN to get the tag. So strlen(tag) is always < MG_BUF_LEN.
-  if (sscanf(tag, " virtual=\"%[^\"]\"", file_name) == 1) {
-    // File name is relative to the webserver root
-    (void) mg_snprintf(conn, path, sizeof(path), "%s%c%s",
-        conn->ctx->config[DOCUMENT_ROOT], '/', file_name);
-  } else if (sscanf(tag, " abspath=\"%[^\"]\"", file_name) == 1) {
-    // File name is relative to the webserver working directory
-    // or it is absolute system path
-    (void) mg_snprintf(conn, path, sizeof(path), "%s", file_name);
-  } else if (sscanf(tag, " file=\"%[^\"]\"", file_name) == 1 ||
-             sscanf(tag, " \"%[^\"]\"", file_name) == 1) {
-    // File name is relative to the currect document
-    (void) mg_snprintf(conn, path, sizeof(path), "%s", ssi);
-    if ((p = strrchr(path, '/')) != NULL) {
-      p[1] = '\0';
-    }
-    (void) mg_snprintf(conn, path + strlen(path),
-        sizeof(path) - strlen(path), "%s", file_name);
-  } else {
-    mg_cry(conn, "Bad SSI #include: [%s]", tag);
-    return;
-  }
-
-  if (!mg_fopen(conn, path, "rb", &file)) {
-    mg_cry(conn, "Cannot open SSI #include: [%s]: fopen(%s): %s",
-        tag, path, strerror(ERRNO));
-  } else {
-    fclose_on_exec(&file);
-    if (match_prefix(conn->ctx->config[SSI_EXTENSIONS],
-                     (int)strlen(conn->ctx->config[SSI_EXTENSIONS]), path) > 0) {
-      send_ssi_file(conn, path, &file, include_level + 1);
+    // sscanf() is safe here, since send_ssi_file() also uses buffer
+    // of size MG_BUF_LEN to get the tag. So strlen(tag) is always < MG_BUF_LEN.
+    if (sscanf(tag, " virtual=\"%[^\"]\"", file_name) == 1) {
+        // File name is relative to the webserver root
+        (void) mg_snprintf(conn, path, sizeof(path), "%s%c%s",
+                           conn->ctx->config[DOCUMENT_ROOT], '/', file_name);
+    } else if (sscanf(tag, " abspath=\"%[^\"]\"", file_name) == 1) {
+        // File name is relative to the webserver working directory
+        // or it is absolute system path
+        (void) mg_snprintf(conn, path, sizeof(path), "%s", file_name);
+    } else if (sscanf(tag, " file=\"%[^\"]\"", file_name) == 1 ||
+               sscanf(tag, " \"%[^\"]\"", file_name) == 1) {
+        // File name is relative to the currect document
+        (void) mg_snprintf(conn, path, sizeof(path), "%s", ssi);
+        if ((p = strrchr(path, '/')) != NULL) {
+            p[1] = '\0';
+        }
+        (void) mg_snprintf(conn, path + strlen(path),
+                           sizeof(path) - strlen(path), "%s", file_name);
     } else {
-      send_file_data(conn, &file, 0, INT64_MAX);
+        mg_cry(conn, "Bad SSI #include: [%s]", tag);
+        return;
+    }
+
+    if (!mg_fopen(conn, path, "rb", &file)) {
+        mg_cry(conn, "Cannot open SSI #include: [%s]: fopen(%s): %s",
+               tag, path, strerror(ERRNO));
+    } else {
+        fclose_on_exec(&file);
+        if (match_prefix(conn->ctx->config[SSI_EXTENSIONS],
+                         (int)strlen(conn->ctx->config[SSI_EXTENSIONS]), path) > 0) {
+            send_ssi_file(conn, path, &file, include_level + 1);
+        } else {
+            send_file_data(conn, &file, 0, INT64_MAX);
+        }
+        mg_fclose(&file);
     }
-    mg_fclose(&file);
-  }
 }
 
 #if !defined(NO_POPEN)
-static void do_ssi_exec(struct mg_connection *conn, char *tag) {
-  char cmd[MG_BUF_LEN] = "";
-  struct file file = STRUCT_FILE_INITIALIZER;
+static void do_ssi_exec(struct mg_connection *conn, char *tag)
+{
+    char cmd[MG_BUF_LEN] = "";
+    struct file file = STRUCT_FILE_INITIALIZER;
 
-  if (sscanf(tag, " \"%[^\"]\"", cmd) != 1) {
-    mg_cry(conn, "Bad SSI #exec: [%s]", tag);
-  } else if ((file.fp = popen(cmd, "r")) == NULL) {
-    mg_cry(conn, "Cannot SSI #exec: [%s]: %s", cmd, strerror(ERRNO));
-  } else {
-    send_file_data(conn, &file, 0, INT64_MAX);
-    pclose(file.fp);
-  }
+    if (sscanf(tag, " \"%[^\"]\"", cmd) != 1) {
+        mg_cry(conn, "Bad SSI #exec: [%s]", tag);
+    } else if ((file.fp = popen(cmd, "r")) == NULL) {
+        mg_cry(conn, "Cannot SSI #exec: [%s]: %s", cmd, strerror(ERRNO));
+    } else {
+        send_file_data(conn, &file, 0, INT64_MAX);
+        pclose(file.fp);
+    }
 }
 #endif // !NO_POPEN
 
-static int mg_fgetc(struct file *filep, int offset) {
-  if (filep->membuf != NULL && offset >=0 && offset < filep->size) {
-    return ((unsigned char *) filep->membuf)[offset];
-  } else if (filep->fp != NULL) {
-    return fgetc(filep->fp);
-  } else {
-    return EOF;
-  }
+static int mg_fgetc(struct file *filep, int offset)
+{
+    if (filep->membuf != NULL && offset >=0 && offset < filep->size) {
+        return ((unsigned char *) filep->membuf)[offset];
+    } else if (filep->fp != NULL) {
+        return fgetc(filep->fp);
+    } else {
+        return EOF;
+    }
 }
 
 static void send_ssi_file(struct mg_connection *conn, const char *path,
-                          struct file *filep, int include_level) {
-  char buf[MG_BUF_LEN];
-  int ch, offset, len, in_ssi_tag;
+                          struct file *filep, int include_level)
+{
+    char buf[MG_BUF_LEN];
+    int ch, offset, len, in_ssi_tag;
 
-  if (include_level > 10) {
-    mg_cry(conn, "SSI #include level is too deep (%s)", path);
-    return;
-  }
-
-  in_ssi_tag = len = offset = 0;
-  while ((ch = mg_fgetc(filep, offset)) != EOF) {
-    if (in_ssi_tag && ch == '>') {
-      in_ssi_tag = 0;
-      buf[len++] = (char) ch;
-      buf[len] = '\0';
-      assert(len <= (int) sizeof(buf));
-      if (len < 6 || memcmp(buf, "