aboutsummaryrefslogtreecommitdiffstats
path: root/package/uhttpd/src/uhttpd-file.c
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2012-07-13 17:10:56 +0000
committerJo-Philipp Wich <jow@openwrt.org>2012-07-13 17:10:56 +0000
commit268dea84ecccf5c23b7b95f303c29d02bbc4d4b6 (patch)
treea10b65cb7ffda97d2ca25344848cb6952b2b6ad7 /package/uhttpd/src/uhttpd-file.c
parent89511a81d0c9f6a22db3ca0c4a9975bc98228e01 (diff)
downloadmaster-187ad058-268dea84ecccf5c23b7b95f303c29d02bbc4d4b6.tar.gz
master-187ad058-268dea84ecccf5c23b7b95f303c29d02bbc4d4b6.tar.bz2
master-187ad058-268dea84ecccf5c23b7b95f303c29d02bbc4d4b6.zip
[package] uhttpd: various changes
- remove unused variables - simply ignore command line args which belong to not enabled features - resolve peer address at accept() time, should solve (#11850) - remove floating point operations where possible git-svn-id: svn://svn.openwrt.org/openwrt/trunk@32704 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/uhttpd/src/uhttpd-file.c')
-rw-r--r--package/uhttpd/src/uhttpd-file.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/package/uhttpd/src/uhttpd-file.c b/package/uhttpd/src/uhttpd-file.c
index 2e5914a3c0..0bafc2b38c 100644
--- a/package/uhttpd/src/uhttpd-file.c
+++ b/package/uhttpd/src/uhttpd-file.c
@@ -113,16 +113,16 @@ static int uh_file_response_ok_hdrs(struct client *cl, struct stat *s)
static int uh_file_response_200(struct client *cl, struct stat *s)
{
- ensure_ret(uh_http_sendf(cl, NULL, "HTTP/%.1f 200 OK\r\n",
- cl->request.version));
+ ensure_ret(uh_http_sendf(cl, NULL, "%s 200 OK\r\n",
+ http_versions[cl->request.version]));
return uh_file_response_ok_hdrs(cl, s);
}
static int uh_file_response_304(struct client *cl, struct stat *s)
{
- ensure_ret(uh_http_sendf(cl, NULL, "HTTP/%.1f 304 Not Modified\r\n",
- cl->request.version));
+ ensure_ret(uh_http_sendf(cl, NULL, "%s 304 Not Modified\r\n",
+ http_versions[cl->request.version]));
return uh_file_response_ok_hdrs(cl, s);
}
@@ -130,8 +130,9 @@ static int uh_file_response_304(struct client *cl, struct stat *s)
static int uh_file_response_412(struct client *cl)
{
return uh_http_sendf(cl, NULL,
- "HTTP/%.1f 412 Precondition Failed\r\n"
- "Connection: close\r\n", cl->request.version);
+ "%s 412 Precondition Failed\r\n"
+ "Connection: close\r\n",
+ http_versions[cl->request.version]);
}
static int uh_file_if_match(struct client *cl, struct stat *s, int *ok)