diff options
| author | Bernhard Reutner-Fischer | 2009-05-03 18:53:22 +0200 |
|---|---|---|
| committer | aldot | 2009-05-04 09:57:25 +0200 |
| commit | 62851171db373fc24784357dc986c28058b68edf (patch) | |
| tree | d8bb1a75bfe07d81754f9d0e9c3a37614cbe5e6d /networking | |
| parent | acdc49c07302aa4e49ae765db9cdfd725d51bd7d (diff) | |
| download | busybox-62851171db373fc24784357dc986c28058b68edf.zip busybox-62851171db373fc24784357dc986c28058b68edf.tar.gz | |
fix debug message
Print the mime-type only after it has been set.
Add possible TODOs: use TCP_CORK, parse_config()
Diffstat (limited to 'networking')
| -rw-r--r-- | networking/httpd.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/networking/httpd.c b/networking/httpd.c index 52b2b2a..5cd98a5 100644 --- a/networking/httpd.c +++ b/networking/httpd.c @@ -32,7 +32,7 @@ * foo=`httpd -d $foo` # decode "Hello%20World" as "Hello World" * bar=`httpd -e "<Hello World>"` # encode as "<Hello World>" * Note that url encoding for arguments is not the same as html encoding for - * presentation. -d decodes a url-encoded argument while -e encodes in html + * presentation. -d decodes an url-encoded argument while -e encodes in html * for page display. * * httpd.conf has the following format: @@ -94,6 +94,7 @@ * server exits with an error. * */ + /* TODO: use TCP_CORK, parse_config() */ #include "libbb.h" #if ENABLE_FEATURE_HTTPD_USE_SENDFILE @@ -1538,11 +1539,6 @@ static NOINLINE void send_file_and_exit(const char *url, int what) send_headers_and_exit(HTTP_NOT_FOUND); log_and_exit(); } - - if (DEBUG) - bb_error_msg("sending file '%s' content-type: %s", - url, found_mime_type); - /* If you want to know about EPIPE below * (happens if you abort downloads from local httpd): */ signal(SIGPIPE, SIG_IGN); @@ -1570,6 +1566,11 @@ static NOINLINE void send_file_and_exit(const char *url, int what) } } } + + if (DEBUG) + bb_error_msg("sending file '%s' content-type: %s", + url, found_mime_type); + #if ENABLE_FEATURE_HTTPD_RANGES if (what == SEND_BODY) range_start = 0; /* err pages and ranges don't mix */ @@ -2085,7 +2086,7 @@ static void handle_incoming_and_exit(const len_and_sockaddr *fromAddr) header_ptr += 2; write(proxy_fd, header_buf, header_ptr - header_buf); free(header_buf); /* on the order of 8k, free it */ - /* cgi_io_loop_and_exit needs to have two disctinct fds */ + /* cgi_io_loop_and_exit needs to have two distinct fds */ cgi_io_loop_and_exit(proxy_fd, dup(proxy_fd), length); } #endif |