projects
/
oweals
/
uhttpd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixes for json 0.12
[oweals/uhttpd.git]
/
uhttpd.h
diff --git
a/uhttpd.h
b/uhttpd.h
index d6b698500ee4739dea559071253db232b4b0b05b..1c82d76cd3f98a9c00f97be50b1817da4d035848 100644
(file)
--- a/
uhttpd.h
+++ b/
uhttpd.h
@@
-31,7
+31,7
@@
#include <libubox/utils.h>
#ifdef HAVE_UBUS
#include <libubus.h>
#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>
#endif
#ifdef HAVE_TLS
#include <libubox/ustream-ssl.h>
@@
-52,6
+52,7
@@
struct config {
const char *file;
const char *error_handler;
const char *cgi_prefix;
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;
const char *cgi_path;
const char *lua_handler;
const char *lua_prefix;
@@
-67,6
+68,7
@@
struct config {
int http_keepalive;
int script_timeout;
int ubus_noauth;
int http_keepalive;
int script_timeout;
int ubus_noauth;
+ int ubus_cors;
};
struct auth_realm {
};
struct auth_realm {
@@
-80,6
+82,7
@@
enum http_method {
UH_HTTP_MSG_GET,
UH_HTTP_MSG_POST,
UH_HTTP_MSG_HEAD,
UH_HTTP_MSG_GET,
UH_HTTP_MSG_POST,
UH_HTTP_MSG_HEAD,
+ UH_HTTP_MSG_OPTIONS,
};
enum http_version {
};
enum http_version {
@@
-118,6
+121,7
@@
enum client_state {
CLIENT_STATE_DATA,
CLIENT_STATE_DONE,
CLIENT_STATE_CLOSE,
CLIENT_STATE_DATA,
CLIENT_STATE_DONE,
CLIENT_STATE_CLOSE,
+ CLIENT_STATE_CLEANUP,
};
struct interpreter {
};
struct interpreter {
@@
-146,9
+150,13
@@
struct env_var {
struct relay {
struct ustream_fd sfd;
struct uloop_process proc;
struct relay {
struct ustream_fd sfd;
struct uloop_process proc;
+ struct uloop_timeout timeout;
struct client *cl;
bool process_done;
struct client *cl;
bool process_done;
+ bool error;
+ bool skip_data;
+
int ret;
int header_ofs;
int ret;
int header_ofs;
@@
-185,7
+193,6
@@
struct dispatch_ubus {
struct json_object *jsobj_cur;
int post_len;
struct json_object *jsobj_cur;
int post_len;
- const char *sid;
uint32_t obj;
const char *func;
uint32_t obj;
const char *func;
@@
-222,6
+229,7
@@
struct dispatch {
struct client {
struct list_head list;
struct client {
struct list_head list;
+ int refcount;
int id;
struct ustream *us;
int id;
struct ustream *us;
@@
-235,6
+243,7
@@
struct client {
enum client_state state;
bool tls;
enum client_state state;
bool tls;
+ int http_code;
struct http_request request;
struct uh_addr srv_addr, peer_addr;
struct http_request request;
struct uh_addr srv_addr, peer_addr;
@@
-297,4
+306,18
@@
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);
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
#endif