X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fuhttpd.git;a=blobdiff_plain;f=relay.c;h=ba6b95a496ea4e2cfa6f066a1d5a78bad8555c0a;hp=59cdaa5904883d7db93a1b2ac64628110bfaaabb;hb=56278d4af64256e703a6c4cf3d854aac689c391c;hpb=038cf91ddc07cdd76e7444efc096094eef66f749

diff --git a/relay.c b/relay.c
index 59cdaa5..ba6b95a 100644
--- a/relay.c
+++ b/relay.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 <signal.h>
@@ -89,6 +89,7 @@ static void relay_process_headers(struct relay *r)
 			r->header_cb = NULL;
 			if (r->header_end)
 				r->header_end(r);
+			ustream_consume(s, line_len);
 			break;
 		}
 
@@ -129,6 +130,9 @@ static void relay_read_cb(struct ustream *s, int bytes)
 	}
 
 	buf = ustream_get_read_buf(s, &len);
+	if (!buf || !len)
+		return;
+
 	uh_chunk_write(cl, buf, len);
 	ustream_consume(s, len);
 }
@@ -155,20 +159,30 @@ static void relay_proc_cb(struct uloop_process *proc, int ret)
 {
 	struct relay *r = container_of(proc, struct relay, proc);
 
+	ustream_poll(&r->sfd.stream);
 	r->process_done = true;
 	r->ret = ret;
 	relay_close_if_done(r);
 }
 
+void uh_relay_kill(struct client *cl, struct relay *r)
+{
+	struct ustream *us = &r->sfd.stream;
+
+	kill(r->proc.pid, SIGKILL);
+	us->eof = true;
+	ustream_state_change(us);
+}
+
 void uh_relay_open(struct client *cl, struct relay *r, int fd, int pid)
 {
 	struct ustream *us = &r->sfd.stream;
 
 	r->cl = cl;
-	ustream_fd_init(&r->sfd, fd);
 	us->notify_read = relay_read_cb;
 	us->notify_state = relay_state_cb;
 	us->string_data = true;
+	ustream_fd_init(&r->sfd, fd);
 
 	r->proc.pid = pid;
 	r->proc.cb = relay_proc_cb;