aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvodz <vodz@69ca8d6d-28ef-0310-b511-8ec308f3f277>2005-09-19 10:46:44 +0000
committervodz <vodz@69ca8d6d-28ef-0310-b511-8ec308f3f277>2005-09-19 10:46:44 +0000
commit1ef7ad38363a265528009f5d567dc54717fb48ff (patch)
tree91a4acbd9c5e15234118252dc75469c82d3520b6
parentf6ca0f39ec139dbfd7bf0ca61e32af6ac6099a9c (diff)
downloadbusybox-w32-1ef7ad38363a265528009f5d567dc54717fb48ff.tar.gz
busybox-w32-1ef7ad38363a265528009f5d567dc54717fb48ff.tar.bz2
busybox-w32-1ef7ad38363a265528009f5d567dc54717fb48ff.zip
destroy bug #421
git-svn-id: svn://busybox.net/trunk/busybox@11501 69ca8d6d-28ef-0310-b511-8ec308f3f277
-rw-r--r--networking/httpd.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/networking/httpd.c b/networking/httpd.c
index 191a316a1..69c30bf0d 100644
--- a/networking/httpd.c
+++ b/networking/httpd.c
@@ -1148,9 +1148,9 @@ static int sendCgi(const char *url,
1148 *script = '\0'; /* reduce /PATH_INFO */ 1148 *script = '\0'; /* reduce /PATH_INFO */
1149 /* SCRIPT_FILENAME required by PHP in CGI mode */ 1149 /* SCRIPT_FILENAME required by PHP in CGI mode */
1150 if(realpath(purl + 1, realpath_buff)) 1150 if(realpath(purl + 1, realpath_buff))
1151 addEnv("SCRIPT", "FILENAME", realpath_buff); 1151 addEnv("SCRIPT", "FILENAME", realpath_buff);
1152 else 1152 else
1153 *realpath_buff = 0; 1153 *realpath_buff = 0;
1154 /* set SCRIPT_NAME as full path: /cgi-bin/dirs/script.cgi */ 1154 /* set SCRIPT_NAME as full path: /cgi-bin/dirs/script.cgi */
1155 addEnv("SCRIPT_NAME", "", purl); 1155 addEnv("SCRIPT_NAME", "", purl);
1156 addEnv("QUERY_STRING", "", config->query); 1156 addEnv("QUERY_STRING", "", config->query);
@@ -1877,6 +1877,9 @@ static int miniHttpd(int server)
1877 handleIncoming(); 1877 handleIncoming();
1878 if(!config->debugHttpd) 1878 if(!config->debugHttpd)
1879 exit(0); 1879 exit(0);
1880 } else {
1881 if(!config->debugHttpd)
1882 wait(NULL);
1880 } 1883 }
1881 close(s); 1884 close(s);
1882 } 1885 }