Skip to content
Snippets Groups Projects
Commit 4f6a7311 authored by Vivek Dutta's avatar Vivek Dutta
Browse files

Revert "nginx: Fix sem lock issue with nginx-ubus-module"

This reverts commit 8b2c130b.
parent c186667d
No related branches found
No related tags found
1 merge request!73nginx: Updated nginx-ubus-module
......@@ -567,9 +567,6 @@ endif
ifneq "$(or $(CONFIG_PACKAGE_nginx-mod-lua),$(QUILT))" ""
$(call PatchDir,$(PKG_BUILD_DIR),$(PATCH_DIR)/lua-nginx,lua-nginx/)
endif
ifneq "$(or $(CONFIG_PACKAGE_nginx-mod-ubus),$(QUILT))" ""
$(call PatchDir,$(PKG_BUILD_DIR),$(PATCH_DIR)/nginx-ubus-module,nginx-ubus-module/)
endif
ifneq "$(or $(CONFIG_PACKAGE_nginx-mod-rtmp),$(QUILT))" ""
$(call PatchDir,$(PKG_BUILD_DIR),$(PATCH_DIR)/rtmp-nginx,rtmp-nginx/)
endif
......@@ -581,7 +578,6 @@ define Quilt/Refresh/Package
$(call Quilt/RefreshDir,$(PKG_BUILD_DIR),$(PATCH_DIR)/dav-nginx,dav-nginx/)
$(call Quilt/RefreshDir,$(PKG_BUILD_DIR),$(PATCH_DIR)/lua-nginx,lua-nginx/)
$(call Quilt/RefreshDir,$(PKG_BUILD_DIR),$(PATCH_DIR)/rtmp-nginx,rtmp-nginx/)
$(call Quilt/RefreshDir,$(PKG_BUILD_DIR),$(PATCH_DIR)/nginx-ubus-module,nginx-ubus-module/)
endef
define Build/Prepare
......
--- a/nginx-ubus-module/src/ngx_http_ubus_module.c
+++ b/nginx-ubus-module/src/ngx_http_ubus_module.c
@@ -501,19 +501,19 @@ static enum rpc_status ubus_post_object(
cglcf = ngx_http_get_module_loc_conf(request->r, ngx_http_ubus_module);
if (json_object_get_type(ctx->obj) != json_type_object)
- goto error;
+ goto out;
du->jsobj_cur = ctx->obj;
blob_buf_init(ctx->buf, 0);
if (!blobmsg_add_object(ctx->buf, ctx->obj))
- goto error;
+ goto out;
if (!parse_json_rpc(&data, ctx->buf->head))
- goto error;
+ goto out;
if (!strcmp(data.method, "call")) {
if (!data.sid || !data.object || !data.function || !data.data)
- goto error;
+ goto out;
du->func = data.function;
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment