Add files via upload

include/ejet.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003-2020 Ke Hengzhong <[email protected]>
+ * Copyright (c) 2003-2021 Ke Hengzhong <[email protected]>
  * All rights reserved. See MIT LICENSE for redistribution.
  */
 
@@ -10,12 +10,30 @@
 extern "C" {
 #endif
 
+/* HTTP Method Constants Definition */
+#define HTTP_METHOD_NONE       0
+#define HTTP_METHOD_CONNECT    1
+#define HTTP_METHOD_DELETE     2
+#define HTTP_METHOD_GET        3
+#define HTTP_METHOD_HEAD       4
+#define HTTP_METHOD_VERSION_10 5
+#define HTTP_METHOD_VERSION_11 6
+#define HTTP_METHOD_OPTIONS    7
+#define HTTP_METHOD_POST       8
+#define HTTP_METHOD_PUT        9
+#define HTTP_METHOD_TRACE      10
+
+
 typedef int    HTTPObjInit    (void * httpmgmt, void * vobj, void * hconf);
 typedef int    HTTPObjClean   (void * vobj);
+
 typedef void * HTTPCBInit     (void * httpmgmt, int argc, char ** argv);
-typedef int    RequestHandler (void * cbobj, void * vmsg);
+typedef int    HTTPCBHandler  (void * cbobj, void * vmsg, void * tplfile);
 typedef void   HTTPCBClean    (void * cbobj);
-typedef int    ResponseHandle (void * vmsg, void * para, void * cbval, int status);
+
+typedef int    PageTplCB      (void * cbobj, void * vmsg, void * tplvar, void * tplunit, frame_p cfrm);
+
+typedef int    RecvAllNotify  (void * vmsg, void * para, void * cbval, int status);
 typedef int    TearDownNotify (void * vmsg, void * para);
 
 
@@ -296,10 +314,10 @@ typedef struct http_msg {
     TearDownNotify   * tear_down_notify;
     void             * tear_down_para;
 
-    ResponseHandle   * reshandle;
-    uint8              reshandle_called;
-    void             * reshandle_para;
-    void             * reshandle_cbval;
+    RecvAllNotify    * resnotify;
+    uint8              resnotify_called;
+    void             * resnotify_para;
+    void             * resnotify_cbval;
 
     char             * res_store_file;
     int64              res_store_offset;
@@ -312,10 +330,15 @@ typedef struct http_msg {
 
 
     int    (*SetTearDownNotify)(void * vmsg, void * func, void * para);
-    int    (*SetResponseHandle)(void * vmsg, void * func, void * para, void * cbval,
-                                  char * storefile, int64 offset,
-                                  void * procnotify, void * notifypara);
-
+    int    (*SetResponseNotify)(void * vmsg, void * func, void * para, void * cbval,
+                                char * storefile, int64 offset,
+                                void * procnotify, void * notifypara);
+
+    int    (*SetResStoreFile)      (void * vmsg, char * storefile, int64 offset);
+    int    (*SetResRecvAllNotify)  (void * vmsg, void * func, void * para, void * cbval);
+    int    (*SetResRecvProcNotify) (void * vmsg, void * procnotify, void * notifypara);
+    int    (*SetReqSendProcNotify) (void * vmsg, void * procnotify, void * notifypara);
+
     char * (*GetMIME)        (void * vmsg, char * extname, uint32 * mimeid);
     void * (*GetMIMEMgmt)    (void * vmsg);
 
@@ -344,6 +367,7 @@ typedef struct http_msg {
     int    (*GetSrcPort)     (void * vmsg);
     ulong  (*GetMsgID)       (void * vmsg);
 
+    int    (*GetMethodInd)   (void * vmsg);
     char * (*GetMethod)      (void * vmsg);
     int    (*SetMethod)      (void * vmsg, char * meth, int methlen);
 
@@ -495,6 +519,7 @@ typedef struct http_msg {
     int    (*AddResFile)          (void * vmsg, char * filename, int64 startpos, int64 len);
     int    (*AddResAppCBContent)  (void * vmsg, void * prewrite, void * prewobj, int64 offset, int64 length,
                                    void * movefunc, void * movepara, void * endwrite, void * endwobj);
+    int    (*AddResTplFile)       (void * vmsg, char * tplfile, void * tplvar);
 
     int    (*RedirectReply)  (void * vmsg, int status, char * redurl);
     int    (*Reply)          (void * vmsg);
@@ -514,14 +539,59 @@ int    http_mgmt_obj_init  (void * vmgmt, HTTPObjInit * objinit, void * hconf);
 int    http_mgmt_obj_clean (void * vmgmt, HTTPObjClean * objclean);
 void * http_mgmt_obj       (void * vmgmt);
 
+void * http_ssl_listen_start (void * vmgmt, char * localip, int port, uint8 fwdpxy,
+                              char * cert, char * prikey, char * cacert, char * libfile);
+void * http_listen_start     (void * vmgmt, char * localip, int port, uint8 fwdpxy, char * libfile);
+
+void * http_listen_find  (void * vmgmt, char * localip, int port);
+int    http_listen_stop  (void * vmgmt, char * localip, int port);
+
+
+int    http_prefix_match_cb (void * vhl, char * hostn, int hostlen, char * matstr, int len,
+                             char * root, void * cbfunc, void * cbobj, void * tplfile);
+int    http_exact_match_cb  (void * vhl, char * hostn, int hostlen, char * matstr, int len,
+                             char * root, void * cbfunc, void * cbobj, void * tplfile) ;
+int    http_regex_match_cb  (void * vhl, char * hostn, int hostlen, char * matstr, int len, int ignorecase,
+                             char * root, void * cbfunc, void * cbobj, void * tplfile);
+
+/* <?ejetpl TEXT $CURROOT PARA=abcd ?>                                                  */
+/* <?ejetpl LINK $LINKNAME URL=/csc/disponlist.so SHOW=µÚÒ»Ò³ PARA=listfile?>           */
+/* <?ejetpl IMG $IMGNAME URL=/csc/drawimg.so?randval=234 SHOW=ʵʱ×ßÊÆ PARA="a=1"?>     */
+/* <?ejetpl LIST $ACCESSLOG PARA=1?>                                                    */
+/* <?ejetpl INCLUDE /home/hzke/dxcang/httpdoc/foot.html ?>                        */
+
+typedef struct pagetplunit {
+    uint8    type; //1-TEXT, 2-LINK, 3-IMG, 4-LIST, 5-INCLUDE, 0-Unknown
+    char   * text;
+    int      textlen;
+    char   * url;
+    int      urllen;
+    char   * show;
+    int      showlen;
+    char   * para;
+    int      paralen;
+    size_t   bgnpos;
+    size_t   endpos;
+    char   * tplfile;
+} PageTplUnit;
+
+int    http_pagetpl_text_cb (void * vhl, char * hostn, int hostlen,
+                             void * text, int textlen, void * func, void * cbobj);
+int    http_pagetpl_list_cb (void * vhl, char * hostn, int hostlen,
+                             void * text, int textlen, void * func, void * cbobj);
+
+
 void   http_overhead       (void * vmgmt, uint64 * recv, uint64 * sent,
                              struct timeval * lasttick, int reset, struct timeval * curt);
 
 int    http_msg_mgmt_add (void * vmgmt, void * vmsg);
 void * http_msg_mgmt_get (void * vmgmt, ulong msgid);
 void * http_msg_mgmt_del (void * vmgmt, ulong msgid);
 
-int    http_set_reqhandler (void * vmgmt, RequestHandler * reqhandler, void * cbobj);
+int    http_set_reqhandler (void * vmgmt, HTTPCBHandler * reqhandler, void * cbobj);
+
+int    http_set_reqcheck (void * vmgmt, HTTPCBHandler * reqcheck, void * checkobj);
+int    http_set_rescheck (void * vmgmt, HTTPCBHandler * rescheck, void * checkobj);
 
 void * http_get_json_conf  (void * vmgmt);
 void * http_get_mimemgmt   (void * vmgmt);

include/http_cache.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003-2020 Ke Hengzhong <[email protected]>
+ * Copyright (c) 2003-2021 Ke Hengzhong <[email protected]>
  * All rights reserved. See MIT LICENSE for redistribution.
  */
 

include/http_cgi.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003-2020 Ke Hengzhong <[email protected]>
+ * Copyright (c) 2003-2021 Ke Hengzhong <[email protected]>
  * All rights reserved. See MIT LICENSE for redistribution.
  */
 
@@ -29,6 +29,7 @@ int GetPathOnly      (void * vmsg, char * path, int pathlen);
 int GetFileOnly      (void * vmsg, char * path, int pathlen);
 int GetFileExt       (void * vmsg, char * path, int pathlen);
 
+int    GetMethodInd  (void * vmsg);
 char * GetMethod     (void * vmsg);
 int    GetBaseURL    (void * vmsg, char ** pbase, int * plen);
 char * GetAbsURL     (void * vmsg);

include/http_chunk.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003-2020 Ke Hengzhong <[email protected]>
+ * Copyright (c) 2003-2021 Ke Hengzhong <[email protected]>
  * All rights reserved. See MIT LICENSE for redistribution.
  */
 

include/http_cli_io.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003-2020 Ke Hengzhong <[email protected]>
+ * Copyright (c) 2003-2021 Ke Hengzhong <[email protected]>
  * All rights reserved. See MIT LICENSE for redistribution.
  */
 

include/http_con.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003-2020 Ke Hengzhong <[email protected]>
+ * Copyright (c) 2003-2021 Ke Hengzhong <[email protected]>
  * All rights reserved. See MIT LICENSE for redistribution.
  */
 

include/http_cookie.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003-2020 Ke Hengzhong <[email protected]>
+ * Copyright (c) 2003-2021 Ke Hengzhong <[email protected]>
  * All rights reserved. See MIT LICENSE for redistribution.
  */
 

include/http_dispdir.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003-2020 Ke Hengzhong <[email protected]>
+ * Copyright (c) 2003-2021 Ke Hengzhong <[email protected]>
  * All rights reserved. See MIT LICENSE for redistribution.
  */
 

include/http_do.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003-2020 Ke Hengzhong <[email protected]>
+ * Copyright (c) 2003-2021 Ke Hengzhong <[email protected]>
  * All rights reserved. See MIT LICENSE for redistribution.
  */
 

include/http_fcgi_con.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003-2020 Ke Hengzhong <[email protected]>
+ * Copyright (c) 2003-2021 Ke Hengzhong <[email protected]>
  * All rights reserved. See MIT LICENSE for redistribution.
  */
 

include/http_fcgi_io.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003-2020 Ke Hengzhong <[email protected]>
+ * Copyright (c) 2003-2021 Ke Hengzhong <[email protected]>
  * All rights reserved. See MIT LICENSE for redistribution.
  */
 

include/http_fcgi_msg.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003-2020 Ke Hengzhong <[email protected]>
+ * Copyright (c) 2003-2021 Ke Hengzhong <[email protected]>
  * All rights reserved. See MIT LICENSE for redistribution.
  */
 

include/http_fcgi_srv.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003-2020 Ke Hengzhong <[email protected]>
+ * Copyright (c) 2003-2021 Ke Hengzhong <[email protected]>
  * All rights reserved. See MIT LICENSE for redistribution.
  */
 

include/http_form.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003-2020 Ke Hengzhong <[email protected]>
+ * Copyright (c) 2003-2021 Ke Hengzhong <[email protected]>
  * All rights reserved. See MIT LICENSE for redistribution.
  */
 
@@ -31,6 +31,8 @@ typedef struct HTTPForm_ {
 void * http_form_alloc();
 void   http_form_free (void * vform);
 
+void * http_form_node (void * vmsg, char * key);
+
 int http_form_get    (void * vmsg, char * key, char ** ctype, uint8 * formtype, char ** fname, int64 * valuelen);
 int http_form_value  (void * vmsg, char * key, char * value, int64 valuelen);
 int http_form_valuep (void * vmsg, char * key, int64 pos, char ** pvalue, int64 * valuelen);

include/http_handle.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003-2020 Ke Hengzhong <[email protected]>
+ * Copyright (c) 2003-2021 Ke Hengzhong <[email protected]>
  * All rights reserved. See MIT LICENSE for redistribution.
  */
 

include/http_header.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003-2020 Ke Hengzhong <[email protected]>
+ * Copyright (c) 2003-2021 Ke Hengzhong <[email protected]>
  * All rights reserved. See MIT LICENSE for redistribution.
  */