emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Denis Vlasenko 2009-04-22 14:16:59 +00:00
parent 00643ca520
commit c8d7109f60
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
networking/httpd.c
View File

@ -100,7 +100,6 @@
# include <sys/sendfile.h> # include <sys/sendfile.h>
#endif #endif
//#define DEBUG 1
#define DEBUG 0 #define DEBUG 0
#define IOBUF_SIZE 8192 /* IO buffer */ #define IOBUF_SIZE 8192 /* IO buffer */
@ -698,13 +697,13 @@ static void parse_conf(const char *path, int flag)
unsigned file_len; unsigned file_len;
/* note: path is "" unless we are in SUBDIR parse, /* 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 */ cur = xzalloc(sizeof(*cur) /* includes space for NUL */
+ strlen(path) + 1 + strlen(path)
+ strlen_buf + strlen_buf
); );
/* form "/path/file" */ /* form "/path/file" */
sprintf(cur->before_colon, "%s%.*s", sprintf(cur->before_colon, "/%s%.*s",
path, path,
after_colon - buf - 1, /* includes "/", but not ":" */ after_colon - buf - 1, /* includes "/", but not ":" */
buf); buf);