X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fuhttpd.git;a=blobdiff_plain;f=proc.c;h=5be6232e79849843ef6d1422af3a29a3a683aee0;hp=097a719f8203dddacba84edc4298c792177cee25;hb=7823ad9590d0ec54bca6f637e0d8b14794bb49c0;hpb=e446c68fb59eb6b413fdb6a3043b38fbfa2f8a43 diff --git a/proc.c b/proc.c index 097a719..5be6232 100644 --- a/proc.c +++ b/proc.c @@ -1,20 +1,20 @@ /* * uhttpd - Tiny single-threaded httpd * - * Copyright (C) 2010-2012 Jo-Philipp Wich - * Copyright (C) 2012 Felix Fietkau + * Copyright (C) 2010-2013 Jo-Philipp Wich + * Copyright (C) 2013 Felix Fietkau * - * 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 @@ -22,18 +22,18 @@ #include "uhttpd.h" #define __headers \ - __header(accept) \ - __header(accept_charset) \ - __header(accept_encoding) \ - __header(accept_language) \ - __header(authorization) \ - __header(connection) \ - __header(cookie) \ - __header(host) \ - __header(referer) \ - __header(user_agent) \ - __header(content_type) \ - __header(content_length) + __header(accept, accept) \ + __header(accept_charset, accept-charset) \ + __header(accept_encoding, accept-encoding) \ + __header(accept_language, accept-language) \ + __header(authorization, authorization) \ + __header(connection, connection) \ + __header(cookie, cookie) \ + __header(host, host) \ + __header(referer, referer) \ + __header(user_agent, user-agent) \ + __header(content_type, content-type) \ + __header(content_length, content-length) #undef __header #define __header __enum_header @@ -147,7 +147,9 @@ struct env_var *uh_get_process_vars(struct client *cl, struct path_info *pi) snprintf(redirect_status, sizeof(redirect_status), "%d", req->redirect_status); inet_ntop(cl->srv_addr.family, &cl->srv_addr.in, local_addr, sizeof(local_addr)); + snprintf(local_port, sizeof(local_port), "%d", cl->srv_addr.port); inet_ntop(cl->peer_addr.family, &cl->peer_addr.in, remote_addr, sizeof(remote_addr)); + snprintf(remote_port, sizeof(remote_port), "%d", cl->peer_addr.port); blobmsg_parse(hdr_policy, __HDR_MAX, tb, blob_data(data), blob_len(data)); for (i = 0; i < ARRAY_SIZE(proc_header_env); i++) { @@ -168,7 +170,11 @@ struct env_var *uh_get_process_vars(struct client *cl, struct path_info *pi) static void proc_close_fds(struct client *cl) { - close(cl->dispatch.proc.r.sfd.fd.fd); + struct dispatch_proc *p = &cl->dispatch.proc; + + close(p->r.sfd.fd.fd); + if (p->wrfd.fd >= 0) + close(p->wrfd.fd); } static void proc_handle_close(struct relay *r, int ret) @@ -208,9 +214,11 @@ static void proc_handle_header(struct relay *r, const char *name, const char *va static void proc_handle_header_end(struct relay *r) { struct client *cl = r->cl; + struct dispatch_proc *p = &cl->dispatch.proc; struct blob_attr *cur; int rem; + uloop_timeout_cancel(&p->timeout); uh_http_header(cl, cl->dispatch.proc.status_code, cl->dispatch.proc.status_msg); blob_for_each_attr(cur, cl->dispatch.proc.hdr.head, rem) ustream_printf(cl->us, "%s: %s\r\n", blobmsg_name(cur), blobmsg_data(cur)); @@ -233,6 +241,8 @@ static void proc_write_close(struct client *cl) static void proc_free(struct client *cl) { struct dispatch_proc *p = &cl->dispatch.proc; + + uloop_timeout_cancel(&p->timeout); blob_buf_free(&p->hdr); proc_write_close(cl); uh_relay_free(&p->r); @@ -253,6 +263,7 @@ static void proc_relay_write_cb(struct client *cl) return; ustream_set_read_blocked(&p->r.sfd.stream, false); + p->r.sfd.stream.notify_read(&p->r.sfd.stream, 0); } static int proc_data_send(struct client *cl, const char *data, int len) @@ -271,9 +282,8 @@ static int proc_data_send(struct client *cl, const char *data, int len) if (errno == EAGAIN || errno == EWOULDBLOCK) break; - /* error, no retry */ - len = 0; - break; + /* consume all data */ + ret = len; } if (!ret) @@ -292,8 +302,16 @@ static int proc_data_send(struct client *cl, const char *data, int len) return retlen; } -bool uh_create_process(struct client *cl, struct path_info *pi, - void (*cb)(struct client *cl, struct path_info *pi)) +static void proc_timeout_cb(struct uloop_timeout *timeout) +{ + struct dispatch_proc *proc = container_of(timeout, struct dispatch_proc, timeout); + struct client *cl = container_of(proc, struct client, dispatch.proc); + + uh_relay_kill(cl, &proc->r); +} + +bool uh_create_process(struct client *cl, struct path_info *pi, char *url, + void (*cb)(struct client *cl, struct path_info *pi, char *url)) { struct dispatch *d = &cl->dispatch; struct dispatch_proc *proc = &d->proc; @@ -327,7 +345,7 @@ bool uh_create_process(struct client *cl, struct path_info *pi, close(wfd[1]); uh_close_fds(); - cb(cl, pi); + cb(cl, pi, url); exit(0); } @@ -346,6 +364,9 @@ bool uh_create_process(struct client *cl, struct path_info *pi, proc->r.header_end = proc_handle_header_end; proc->r.close = proc_handle_close; proc->wrfd.cb = proc_write_cb; + proc->timeout.cb = proc_timeout_cb; + if (conf.script_timeout > 0) + uloop_timeout_set(&proc->timeout, conf.script_timeout * 1000); return true;