diff options
| author | Eric Andersen <andersen@codepoet.org> | 2003-12-19 11:23:47 +0000 |
|---|---|---|
| committer | Eric Andersen <andersen@codepoet.org> | 2003-12-19 11:23:47 +0000 |
| commit | 769a3ef08dba4097047ae12ac5c8e05927a20a75 (patch) | |
| tree | 043100bd5bfefc2ada3806cf6cd63fe1ad483187 /networking/httpd.c | |
| parent | f18bd8931d64dcaea6c9c41eb911fff37a38c29f (diff) | |
| download | busybox-w32-769a3ef08dba4097047ae12ac5c8e05927a20a75.tar.gz busybox-w32-769a3ef08dba4097047ae12ac5c8e05927a20a75.tar.bz2 busybox-w32-769a3ef08dba4097047ae12ac5c8e05927a20a75.zip | |
Patch from Stephane Billiart:
This removes references to config->remoteuser when
CONFIG_FEATURE_HTTPD_CGI=y but CONFIG_FEATURE_HTTPD_BASIC_AUTH is not set
Diffstat (limited to 'networking/httpd.c')
| -rw-r--r-- | networking/httpd.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/networking/httpd.c b/networking/httpd.c index 1a3f5f94f..a02b63a38 100644 --- a/networking/httpd.c +++ b/networking/httpd.c | |||
| @@ -1148,10 +1148,12 @@ static int sendCgi(const char *url, | |||
| 1148 | addEnv("HTTP", "COOKIE", cookie); | 1148 | addEnv("HTTP", "COOKIE", cookie); |
| 1149 | if(content_type) | 1149 | if(content_type) |
| 1150 | addEnv("CONTENT", "TYPE", content_type); | 1150 | addEnv("CONTENT", "TYPE", content_type); |
| 1151 | #ifdef CONFIG_FEATURE_HTTPD_BASIC_AUTH | ||
| 1151 | if(config->remoteuser) { | 1152 | if(config->remoteuser) { |
| 1152 | addEnv("REMOTE", "USER", config->remoteuser); | 1153 | addEnv("REMOTE", "USER", config->remoteuser); |
| 1153 | addEnv("AUTH_TYPE", "", "Basic"); | 1154 | addEnv("AUTH_TYPE", "", "Basic"); |
| 1154 | } | 1155 | } |
| 1156 | #endif | ||
| 1155 | if(config->referer) | 1157 | if(config->referer) |
| 1156 | addEnv("HTTP", "REFERER", config->referer); | 1158 | addEnv("HTTP", "REFERER", config->referer); |
| 1157 | 1159 | ||
| @@ -1707,8 +1709,10 @@ FORBIDDEN: /* protect listing /cgi-bin */ | |||
| 1707 | # ifdef CONFIG_FEATURE_HTTPD_CGI | 1709 | # ifdef CONFIG_FEATURE_HTTPD_CGI |
| 1708 | free(cookie); | 1710 | free(cookie); |
| 1709 | free(content_type); | 1711 | free(content_type); |
| 1710 | free(config->remoteuser); | ||
| 1711 | free(config->referer); | 1712 | free(config->referer); |
| 1713 | #ifdef CONFIG_FEATURE_HTTPD_BASIC_AUTH | ||
| 1714 | free(config->remoteuser); | ||
| 1715 | #endif | ||
| 1712 | # endif | 1716 | # endif |
| 1713 | shutdown(a_c_w, SHUT_WR); | 1717 | shutdown(a_c_w, SHUT_WR); |
| 1714 | shutdown(a_c_r, SHUT_RD); | 1718 | shutdown(a_c_r, SHUT_RD); |