#include <libubox/utils.h>
#ifdef HAVE_UBUS
#include <libubus.h>
-#include <json/json.h>
+#include <json-c/json.h>
#endif
#ifdef HAVE_TLS
#include <libubox/ustream-ssl.h>
const char *file;
const char *error_handler;
const char *cgi_prefix;
+ const char *cgi_docroot_path;
const char *cgi_path;
const char *lua_handler;
const char *lua_prefix;
int max_connections;
int http_keepalive;
int script_timeout;
+ int ubus_noauth;
+ int ubus_cors;
};
struct auth_realm {
UH_HTTP_MSG_GET,
UH_HTTP_MSG_POST,
UH_HTTP_MSG_HEAD,
+ UH_HTTP_MSG_OPTIONS,
};
enum http_version {
int content_length;
bool expect_cont;
bool connection_close;
+ bool respond_chunked;
uint8_t transfer_chunked;
const struct auth_realm *realm;
};
CLIENT_STATE_DATA,
CLIENT_STATE_DONE,
CLIENT_STATE_CLOSE,
+ CLIENT_STATE_CLEANUP,
};
struct interpreter {
struct relay {
struct ustream_fd sfd;
struct uloop_process proc;
+ struct uloop_timeout timeout;
struct client *cl;
bool process_done;
+ bool error;
+ bool skip_data;
+
int ret;
int header_ofs;
};
struct dispatch_proc {
+ struct uloop_timeout timeout;
struct blob_buf hdr;
struct uloop_fd wrfd;
struct relay r;
struct json_object *jsobj_cur;
int post_len;
- const char *sid;
uint32_t obj;
const char *func;
struct client {
struct list_head list;
+ int refcount;
int id;
struct ustream *us;
enum client_state state;
bool tls;
+ int http_code;
struct http_request request;
struct uh_addr srv_addr, peer_addr;
void uh_relay_open(struct client *cl, struct relay *r, int fd, int pid);
void uh_relay_close(struct relay *r, int ret);
void uh_relay_free(struct relay *r);
+void uh_relay_kill(struct client *cl, struct relay *r);
struct env_var *uh_get_process_vars(struct client *cl, struct path_info *pi);
bool uh_create_process(struct client *cl, struct path_info *pi, char *url,
int uh_plugin_init(const char *name);
void uh_plugin_post_init(void);
+static inline void uh_client_ref(struct client *cl)
+{
+ cl->refcount++;
+}
+
+static inline void uh_client_unref(struct client *cl)
+{
+ if (--cl->refcount)
+ return;
+
+ if (cl->state == CLIENT_STATE_CLEANUP)
+ ustream_state_change(cl->us);
+}
+
#endif