3party/mongoose
0
0
Fork 0
mirror of https://github.com/cesanta/mongoose.git synced 2024-12-31 01:13:01 +08:00
Code Issues Projects Releases Wiki Activity

removed mg_fmt()

Browse Source
This commit is contained in:
Sergey Lyubka 2014-01-09 09:58:19 +00:00
parent cae797cf04
commit c20f26dbb9
1 changed files with 14 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
mongoose.c
View File

@ -518,19 +518,6 @@ static void send_http_error(struct connection *conn, int code) {
close_local_endpoint(conn); // This will write to the log file close_local_endpoint(conn); // This will write to the log file
} }
static void mg_fmt(struct connection *conn, const char *fmt, ...) {
char buf[IOBUF_SIZE];
va_list ap;
int len;
va_start(ap, fmt);
len = vsnprintf(buf, sizeof(buf), fmt, ap);
va_end(ap);
spool(&conn->remote_iobuf, buf, len);
close_local_endpoint(conn); // Log the request
}
// Print message to buffer. If buffer is large enough to hold the message, // 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, // return buffer. If buffer is to small, allocate large enough buffer on heap,
// and return allocated buffer. // and return allocated buffer.
@ -2370,7 +2357,9 @@ static void handle_put(struct connection *conn, const char *path) {
conn->mg_conn.status_code = !stat(path, &st) ? 200 : 201; conn->mg_conn.status_code = !stat(path, &st) ? 200 : 201;
if ((rc = put_dir(path)) == 0) { if ((rc = put_dir(path)) == 0) {
mg_fmt(conn, "HTTP/1.1 %d OK\r\n\r\n", conn->mg_conn.status_code); mg_printf(&conn->mg_conn, "HTTP/1.1 %d OK\r\n\r\n",
conn->mg_conn.status_code);
close_local_endpoint(conn);
} else if (rc == -1) { } else if (rc == -1) {
send_http_error(conn, 500); send_http_error(conn, 500);
} else if (cl_hdr == NULL) { } else if (cl_hdr == NULL) {
@ -2419,12 +2408,13 @@ static void send_options(struct connection *conn) {
#ifndef NO_AUTH #ifndef NO_AUTH
static void send_authorization_request(struct connection *conn) { static void send_authorization_request(struct connection *conn) {
conn->mg_conn.status_code = 401; conn->mg_conn.status_code = 401;
mg_fmt(conn, mg_printf(&conn->mg_conn,
"HTTP/1.1 401 Unauthorized\r\n" "HTTP/1.1 401 Unauthorized\r\n"
"WWW-Authenticate: Digest qop=\"auth\", " "WWW-Authenticate: Digest qop=\"auth\", "
"realm=\"%s\", nonce=\"%lu\"\r\n\r\n", "realm=\"%s\", nonce=\"%lu\"\r\n\r\n",
conn->server->config_options[AUTH_DOMAIN], conn->server->config_options[AUTH_DOMAIN],
(unsigned long) time(NULL)); (unsigned long) time(NULL));
close_local_endpoint(conn);
} }
// Use the global passwords file, if specified by auth_gpass option, // Use the global passwords file, if specified by auth_gpass option,
@ -3109,8 +3099,10 @@ static void open_local_endpoint(struct connection *conn) {
send_http_error(conn, 404); send_http_error(conn, 404);
} else if (is_directory && } else if (is_directory &&
conn->mg_conn.uri[strlen(conn->mg_conn.uri) - 1] != '/') { conn->mg_conn.uri[strlen(conn->mg_conn.uri) - 1] != '/') {
mg_fmt(conn, "HTTP/1.1 301 Moved Permanently\r\n" conn->mg_conn.status_code = 301;
"Location: %s/\r\n\r\n", conn->mg_conn.uri); mg_printf(&conn->mg_conn, "HTTP/1.1 301 Moved Permanently\r\n"
"Location: %s/\r\n\r\n", conn->mg_conn.uri);
close_local_endpoint(conn);
} else if (is_directory && !find_index_file(conn, path, sizeof(path), &st)) { } else if (is_directory && !find_index_file(conn, path, sizeof(path), &st)) {
if (!mg_strcasecmp(dir_lst, "yes")) { if (!mg_strcasecmp(dir_lst, "yes")) {
#ifndef NO_DIRECTORY_LISTING #ifndef NO_DIRECTORY_LISTING