diff options
author | Glenn L McGrath <bug1@ihug.co.nz> | 2003-09-08 19:39:09 +0400 |
---|---|---|
committer | Glenn L McGrath <bug1@ihug.co.nz> | 2003-09-08 19:39:09 +0400 |
commit | 5875be406e71e0edbb6cc1873f8c5526151790cf (patch) | |
tree | 3d97b8ca37345a4cac49db450929cc1ffcd646ef | |
parent | 55bf79f9441471b45394bf479a2d78039a7dc4cf (diff) |
Vodz, last_patch_110
no limit, no memory usage for env buffer, always call putenv().
remove small error for previous last_patch109.
-rw-r--r-- | networking/httpd.c | 31 |
1 files changed, 7 insertions, 24 deletions
diff --git a/networking/httpd.c b/networking/httpd.c index eb03f34c0..251eee01b 100644 --- a/networking/httpd.c +++ b/networking/httpd.c @@ -202,13 +202,6 @@ void bb_show_usage(void) #undef DEBUG #endif -/* CGI environ size */ -#ifdef CONFIG_FEATURE_HTTPD_SET_CGI_VARS_TO_ENV -#define ENVSIZE 70 /* set max CGI variable */ -#else -#define ENVSIZE 15 /* minimal requires */ -#endif - #define MAX_POST_SIZE (64*1024) /* 64k. Its Small? May be ;) */ #define MAX_MEMORY_BUFF 8192 /* IO buffer */ @@ -228,10 +221,6 @@ typedef struct HT_ACCESS_IP { typedef struct { -#ifdef CONFIG_FEATURE_HTTPD_CGI - char *envp[ENVSIZE+1]; - int envCount; -#endif char buf[MAX_MEMORY_BUFF]; #ifdef CONFIG_FEATURE_HTTPD_BASIC_AUTH @@ -659,20 +648,17 @@ static void parse_conf(const char *path, int flag) c = strchr(cf, ':'); *c++ = 0; cur->after_colon = c; -#ifdef CONFIG_FEATURE_HTTPD_BASIC_AUTH - if(*cf == '/') - free(p0); -#endif #ifdef CONFIG_FEATURE_HTTPD_CONFIG_WITH_MIME_TYPES - else if(*cf == '.') { + if(*cf == '.') { /* config .mime line move top for overwrite previous */ cur->next = config->mime_a; config->mime_a = cur; + continue; } #endif - #ifdef CONFIG_FEATURE_HTTPD_BASIC_AUTH - else if(prev == NULL) { + free(p0); + if(prev == NULL) { /* first line */ config->auth = prev = cur; } else { @@ -809,19 +795,16 @@ static char *decodeString(char *orig, int flag_plus_to_space) static void addEnv(const char *name_before_underline, const char *name_after_underline, const char *value) { - char *s; + char *s = NULL; const char *underline; - if (config->envCount >= ENVSIZE) - return; if (!value) value = ""; underline = *name_after_underline ? "_" : ""; asprintf(&s, "%s%s%s=%s", name_before_underline, underline, name_after_underline, value); if(s) { - config->envp[config->envCount++] = s; - config->envp[config->envCount] = 0; + putenv(s); } } @@ -1242,7 +1225,7 @@ static int sendCgi(const char *url, // now run the program. If it fails, // use _exit() so no destructors // get called and make a mess. - execve(realpath_buff, argp, config->envp); + execv(realpath_buff, argp); } } } |