"Due to a wrong format parameter in a printf httpd does not work when

compiled for with CONFIG_LFS (large file support).
The attached patch suggested by Vladimir fixes that." - Steven Scholz


git-svn-id: svn://busybox.net/trunk/busybox@7292 69ca8d6d-28ef-0310-b511-8ec308f3f277

1 files changed, 8 insertions, 1 deletions

diff --git a/networking/httpd.c b/networking/httpd.c
index d58414b55..8c87e7e91 100644
--- a/networking/httpd.c
+++ b/networking/httpd.c
@@ -127,6 +127,13 @@ static const char default_path_httpd_conf[] = "/etc";
 static const char httpd_conf[] = "httpd.conf";
 static const char home[] = "./";
 
+#ifdef CONFIG_LFS
+# define cont_l_fmt "%lld"
+#else
+# define cont_l_fmt "%ld"
+#endif
+
+
 // Note: bussybox xfuncs are not used because we want the server to keep running
 //       if something bad happens due to a malformed user request.
 //       As a result, all memory allocation after daemonize
@@ -932,7 +939,7 @@ static int sendHeaders(HttpResponseNum responseNum)
 #endif
   if (config->ContentLength != -1) {    /* file */
     strftime(timeStr, sizeof(timeStr), RFC1123FMT, gmtime(&config->last_mod));
-    len += sprintf(buf+len, "Last-Modified: %s\r\n%s %ld\r\n",
+    len += sprintf(buf+len, "Last-Modified: %s\r\n%s " cont_l_fmt "\r\n",
                               timeStr, Content_length, config->ContentLength);
   }
   strcat(buf, "\r\n");