Changeset 5916

Timestamp:

03/24/10 18:36:59 (3 years ago)

Author:

Cyrus

Message:

zhttpd: Adding CBI2 support (JSON support only for now)
cbi2, lmo: Fix compiling flags for shared linking

Location:

luci2

Files:

• cbi2/Makefile (modified) (1 diff)
• lmo/Makefile (modified) (1 diff)
• zhttpd/handler/luci2.c (added)
• zhttpd/Makefile (modified) (2 diffs)
• zhttpd/request.c (modified) (1 diff)
• zhttpd/tcp.c (modified) (1 diff)
• zhttpd/zhttpd.c (modified) (2 diffs)
• zhttpd/zhttpd.uci (modified) (1 diff)

luci2/cbi2/Makefile

@@ -16 +16 @@
     $(AR) rc $@ $^
 
-libcbi.so: parser.o json.o cbi_element.o cbi_dump.o cbi_core.o cbi_buffer.o cbi_uci.o source.o session.o u_sock.o validate.o uvl.o lang.o widget.o log.o handler.o
+libcbi.so: lucic.o parser.o json.o cbi_element.o cbi_dump.o cbi_core.o cbi_buffer.o cbi_uci.o source.o session.o u_sock.o validate.o uvl.o lang.o widget.o log.o handler.o ../lmo/liblmo.a
     $(CC) -shared -luci -ljson -lcrypt -lubox -o $@ $^
 

luci2/lmo/Makefile

@@ -17 +17 @@
 
 %.o: %.c
-    $(CC) $(CFLAGS) -g -c -o $@ $^ 
+    $(CC) $(CFLAGS) -fPIC -g -c -o $@ $^ 

luci2/zhttpd/Makefile

@@ -3 +3 @@
 WFLAGS:=-Wall -Werror -pedantic
 LDFLAGS?=
-LDFLAGS+=-lubox -luci
+LDFLAGS+=
 TLSCFLAGS:=
 BINARY:=zhttpd
@@ -20 +20 @@
 
 $(BINARY): *.c handler/*.c
-    $(CC) $(CFLAGS) $(TLSCFLAGS) $(SFLAGS) $(WFLAGS) $(LDFLAGS) -I.. -o $@ $+
+    $(CC) $(CFLAGS) $(TLSCFLAGS) $(SFLAGS) $(WFLAGS) $(LDFLAGS) -I.. -I../libubox -I../lmo -lubox -luci -lcbi -o $@ $+
 
 clean:

luci2/zhttpd/request.c

@@ -178 +178 @@
         matchlen = size - 1;
         if (urllen > matchlen) {
-            zhttpd_env_set(&req->env, "PATH_INFO", url + matchlen + 1,
-                    urllen - matchlen - 1);
+            zhttpd_env_set(&req->env, "PATH_INFO", url + matchlen,
+                    urllen - matchlen);
         } else {
             zhttpd_env_set(&req->env, "PATH_INFO", "", 1);

luci2/zhttpd/tcp.c

@@ -80 +80 @@
     zhttpd_request_t* req = cookie;
     if (req->ioctx) {
-        SSL_shutdown((SSL*)req->ioctx);
         SSL_free((SSL*)req->ioctx);
         req->ioctx = NULL;

luci2/zhttpd/zhttpd.c

@@ -188 +188 @@
     zhttpd_vfs_t *d = NULL;
     for (zhttpd_vfs_t *c = zhttpd.vfs; c; c = d) {
-        c->handler->vfs_context_destroy(c->context);
+        if (c->handler->vfs_context_destroy) {
+            c->handler->vfs_context_destroy(c->context);
+        }
         d = c->next;
         free(c);
@@ -269 +271 @@
     mount->patternlen = pointlen;
     mount->handler = handler;
-    mount->context = handler->vfs_context_create(options);
+
+    if (handler->vfs_context_create) {
+        mount->context = handler->vfs_context_create(options);
+        if (!mount->context) {
+            free(mount);
+            return ZHTTPD_EINVAL;
+        }
+    }
+
     mount->next = zhttpd.vfs;
-
-    if (!mount->context) {
-        free(mount);
-        return ZHTTPD_EINVAL;
-    }
-
     zhttpd.vfs = mount;
 

luci2/zhttpd/zhttpd.uci

@@ -24 +24 @@
     option physical /tmp
     option handler  cgi
+
+config mount luci2
+        option virtual /luci2
+        option handler luci2
     
 config mime mime