From: Denis Vlasenko <vda.linux@googlemail.com>
Date: Wed, 22 Apr 2009 14:16:59 +0000 (-0000)
Subject: httpd: fix small bug in parser. it crept in during cleanup
X-Git-Tag: 1_15_0~289
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=c8d7109f6036fab6b5993c24fc6514ba0c6a7d3d;p=oweals%2Fbusybox.git

httpd: fix small bug in parser. it crept in during cleanup
---

diff --git a/networking/httpd.c b/networking/httpd.c
index 794a39ea0..b8aa02fe4 100644
--- a/networking/httpd.c
+++ b/networking/httpd.c
@@ -100,7 +100,6 @@
 # include <sys/sendfile.h>
 #endif
 
-//#define DEBUG 1
 #define DEBUG 0
 
 #define IOBUF_SIZE 8192    /* IO buffer */
@@ -698,13 +697,13 @@ static void parse_conf(const char *path, int flag)
 			unsigned file_len;
 
 			/* note: path is "" unless we are in SUBDIR parse,
-			 * otherwise it always starts with "/" */
+			 * otherwise it does NOT start with "/" */
 			cur = xzalloc(sizeof(*cur) /* includes space for NUL */
-				+ strlen(path)
+				+ 1 + strlen(path)
 				+ strlen_buf
 				);
 			/* form "/path/file" */
-			sprintf(cur->before_colon, "%s%.*s",
+			sprintf(cur->before_colon, "/%s%.*s",
 				path,
 				after_colon - buf - 1, /* includes "/", but not ":" */
 				buf);