__header(connection, connection) \
__header(cookie, cookie) \
__header(host, host) \
+ __header(origin, origin) \
__header(referer, referer) \
__header(user_agent, user-agent) \
__header(content_type, content-type) \
- __header(content_length, content-length)
+ __header(content_length, content-length) \
+ __header(x_http_method_override, x-http-method-override) \
+ __header(http_auth_user, http-auth-user) \
+ __header(http_auth_pass, http-auth-pass)
#undef __header
#define __header __enum_header
{ "HTTP_CONNECTION", HDR_connection },
{ "HTTP_COOKIE", HDR_cookie },
{ "HTTP_HOST", HDR_host },
+ { "HTTP_ORIGIN", HDR_origin },
{ "HTTP_REFERER", HDR_referer },
{ "HTTP_USER_AGENT", HDR_user_agent },
+ { "HTTP_X_HTTP_METHOD_OVERRIDE", HDR_x_http_method_override },
+ { "HTTP_AUTH_USER", HDR_http_auth_user },
+ { "HTTP_AUTH_PASS", HDR_http_auth_pass },
{ "CONTENT_TYPE", HDR_content_type },
{ "CONTENT_LENGTH", HDR_content_length },
};
VAR_METHOD,
VAR_PATH_INFO,
VAR_USER,
+ VAR_HTTPS,
VAR_REDIRECT,
VAR_SERVER_NAME,
VAR_SERVER_ADDR,
[VAR_METHOD] = { "REQUEST_METHOD" },
[VAR_PATH_INFO] = { "PATH_INFO" },
[VAR_USER] = { "REMOTE_USER" },
+ [VAR_HTTPS] = { "HTTPS" },
[VAR_REDIRECT] = { "REDIRECT_STATUS", redirect_status },
[VAR_SERVER_NAME] = { "SERVER_NAME", local_addr },
[VAR_SERVER_ADDR] = { "SERVER_ADDR", local_addr },
extra_vars[VAR_METHOD].value = http_methods[req->method];
extra_vars[VAR_PATH_INFO].value = pi->info;
extra_vars[VAR_USER].value = req->realm ? req->realm->user : NULL;
+ extra_vars[VAR_HTTPS].value = cl->tls ? "on" : NULL;
snprintf(redirect_status, sizeof(redirect_status),
"%d", req->redirect_status);
cur = tb[proc_header_env[i].idx];
vars[i].name = proc_header_env[i].name;
- vars[i].value = cur ? blobmsg_data(cur) : "";
+ vars[i].value = cur ? blobmsg_data(cur) : NULL;
}
memcpy(&vars[i], extra_vars, sizeof(extra_vars));
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));
+ ustream_printf(cl->us, "%s: %s\r\n", blobmsg_name(cur),
+ blobmsg_get_string(cur));
ustream_printf(cl->us, "\r\n");
+
+ if (cl->request.method == UH_HTTP_MSG_HEAD)
+ r->skip_data = true;
}
static void proc_write_close(struct client *cl)
if (errno == EAGAIN || errno == EWOULDBLOCK)
break;
- /* error, no retry */
- len = 0;
- break;
+ /* consume all data */
+ ret = len;
}
if (!ret)