X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fuhttpd.git;a=blobdiff_plain;f=cgi.c;h=c4438b06153978c1b59c78bb19b527d4006e9d77;hp=cfd71fbedb23f3e1542407ab798990aabcdeff73;hb=a6b0c13b1891667a27a8d60506456b288d3f0faa;hpb=58c5fd1f9a72db878e29958a4c4e1b65db5b2e07;ds=sidebyside

diff --git a/cgi.c b/cgi.c
index cfd71fb..c4438b0 100644
--- a/cgi.c
+++ b/cgi.c
@@ -1,20 +1,20 @@
 /*
  * uhttpd - Tiny single-threaded httpd
  *
- *   Copyright (C) 2010-2012 Jo-Philipp Wich <xm@subsignal.org>
- *   Copyright (C) 2012 Felix Fietkau <nbd@openwrt.org>
+ *   Copyright (C) 2010-2013 Jo-Philipp Wich <xm@subsignal.org>
+ *   Copyright (C) 2013 Felix Fietkau <nbd@openwrt.org>
  *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
 #include <libubox/blobmsg.h>
@@ -36,14 +36,11 @@ void uh_interpreter_add(const char *ext, const char *path)
 	list_add_tail(&in->list, &interpreters);
 }
 
-static void cgi_main(struct client *cl, struct path_info *pi, int fd)
+static void cgi_main(struct client *cl, struct path_info *pi, char *url)
 {
-	struct interpreter *ip = pi->ip;
+	const struct interpreter *ip = pi->ip;
 	struct env_var *var;
 
-	dup2(fd, 0);
-	dup2(fd, 1);
-	close(fd);
 	clearenv();
 	setenv("PATH", conf.cgi_path, 1);
 
@@ -66,7 +63,7 @@ static void cgi_main(struct client *cl, struct path_info *pi, int fd)
 	       "  %s: %s\n", ip ? ip->path : pi->phys, strerror(errno));
 }
 
-static void cgi_handle_request(struct client *cl, const char *url, struct path_info *pi)
+static void cgi_handle_request(struct client *cl, char *url, struct path_info *pi)
 {
 	unsigned int mode = S_IFREG | S_IXOTH;
 
@@ -77,7 +74,7 @@ static void cgi_handle_request(struct client *cl, const char *url, struct path_i
 		return;
 	}
 
-	if (!uh_create_process(cl, pi, cgi_main)) {
+	if (!uh_create_process(cl, pi, url, cgi_main)) {
 		uh_client_error(cl, 500, "Internal Server Error",
 				"Failed to create CGI process: %s", strerror(errno));
 		return;
@@ -110,6 +107,7 @@ static bool check_cgi_path(struct path_info *pi, const char *url)
 }
 
 struct dispatch_handler cgi_dispatch = {
+	.script = true,
 	.check_path = check_cgi_path,
 	.handle_request = cgi_handle_request,
 };