Mercurial > hg > webserver / file diff

--- a/src/server/object.h	Mon Dec 26 15:48:32 2011 +0100
+++ b/src/server/object.h	Tue Dec 27 20:12:21 2011 +0100
@@ -43,6 +43,7 @@
     NSAPIPathCheck,
     NSAPIObjectType,
     NSAPIService,
+    NSAPIAddLog,
     REQ_FINISH,
     NUM_NSAPI_TYPES
 };
@@ -90,7 +91,11 @@
     ConditionResult   **results;
     int               nres;
 
-    httpd_objset      *objset;
+    //httpd_objset      *objset;
+    int last_req_code;
+
+    int objset_index;
+    int dtable_index;
 };
 
 struct HTTPObjectConfig {
@@ -120,6 +125,18 @@
 #define object_get_dtable(obj,type) &obj->dt[type];
 
 
+
+/*
+ * creates a new httpd_objset
+ */
+httpd_objset* objset_create(pool_handle_t *pool);
+
+/*
+ * adds a object to the objset
+ */
+void objset_add_object(pool_handle_t *p, httpd_objset *os, httpd_object *obj);
+
+
 /*
  * creates a new HTTPObjectConfig
  */
@@ -132,7 +149,10 @@
 
 
 
-httpd_objset* create_test_objset();
+/*
+ * prepares the NSAPI context for the next request stage
+ */
+void nsapi_context_next_stage(NSAPIContext *context);
 
 
 #ifdef	__cplusplus