[BusyBox-cvs] busybox/networking httpd.c,1.20,1.21

Erik Andersen andersen at busybox.net
Fri Dec 19 11:23:50 UTC 2003


Update of /var/cvs/busybox/networking
In directory nail:/tmp/cvs-serv21363/networking

Modified Files:
	httpd.c 
Log Message:
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



Index: httpd.c
===================================================================
RCS file: /var/cvs/busybox/networking/httpd.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- httpd.c	8 Dec 2003 20:21:53 -0000	1.20
+++ httpd.c	19 Dec 2003 11:23:47 -0000	1.21
@@ -1148,10 +1148,12 @@
 	addEnv("HTTP", "COOKIE", cookie);
       if(content_type)
 	addEnv("CONTENT", "TYPE", content_type);
+#ifdef CONFIG_FEATURE_HTTPD_BASIC_AUTH
       if(config->remoteuser) {
 	addEnv("REMOTE", "USER", config->remoteuser);
 	addEnv("AUTH_TYPE", "", "Basic");
       }
+#endif
       if(config->referer)
 	addEnv("HTTP", "REFERER", config->referer);
 
@@ -1707,8 +1709,10 @@
 # ifdef CONFIG_FEATURE_HTTPD_CGI
   free(cookie);
   free(content_type);
-  free(config->remoteuser);
   free(config->referer);
+#ifdef CONFIG_FEATURE_HTTPD_BASIC_AUTH
+  free(config->remoteuser);
+#endif
 # endif
   shutdown(a_c_w, SHUT_WR);
   shutdown(a_c_r, SHUT_RD);




More information about the busybox-cvs mailing list