Mercurial > hg > webserver / file diff

--- a/src/server/public/nsapi.h	Fri Jun 28 14:52:35 2013 +0200
+++ b/src/server/public/nsapi.h	Sun Jun 30 15:11:48 2013 +0200
@@ -1201,9 +1201,28 @@
 const VirtualServer* request_get_vs(Request *rq);
 #define request_get_vs request_get_vs
 
+struct stat* request_stat_path(const char *path, Request *rq);
+#define request_stat_path request_stat_path
+
+void request_free(Request *rq);
+#define request_free request_free
+
+Request* request_restart_internal(const char *uri, Request *rq);
+#define request_restart_internal request_restart_internal
+
+
+char* vs_translate_uri(const VirtualServer *vs, const char *uri);
+#define vs_translate_uri vs_translate_uri
+
+char* servact_translate_uri(char *uri, Session *sn);
+#define servact_translate_uri servact_translate_uri
+#define request_translate_uri servact_translate_uri
 
 ssize_t net_write(SYS_NETFD fd, void *buf, size_t nbytes);
 ssize_t net_writev(SYS_NETFD fd, struct iovec *iovec, int iovcnt);
+ssize_t net_sendfile(SYS_NETFD fd, sendfiledata *sfd);
+ssize_t net_read(SYS_NETFD fd, void *buf, size_t nbytes);
+int net_flush(SYS_NETFD sd);
 
 // NSAPI extension
 ssize_t net_printf(SYS_NETFD fd, char *format, ...);
@@ -1325,6 +1344,12 @@
 #define pool_realloc INTpool_realloc
 #define pool_strdup INTpool_strdup
 
+
+#define MALLOC  malloc
+#define CALLOC(size) calloc(1, size)
+#define REALLOC realloc
+#define FREE    free
+
 // func util functions
 FuncStruct* func_resolve(pblock *pb, Session *sn, Request *rq);
 int func_exec (pblock *pb, Session *sn, Request *rq);
@@ -1337,6 +1362,12 @@
 #define protocol_start_response http_start_response
 int request_header(char *name, char **value, Session *sn, Request *rq);
 
+char *http_uri2url(const char *prefix, const char *suffix);
+char *http_uri2url_dynamic(const char *prefix, const char *suffix,
+                                    Session *sn, Request *rq);
+#define protocol_uri2url http_uri2url
+#define protocol_uri2url_dynamic http_uri2url_dynamic
+
 typedef void (*thrstartfunc)(void *);
 SYS_THREAD INTsysthread_start(int prio, int stksz, thrstartfunc fn, void *arg);
 NSAPI_PUBLIC void INTsysthread_sleep(int milliseconds);
@@ -1347,6 +1378,7 @@
 
 void webserver_atrestart(void (*fn)(void *), void *data);
 #define magnus_atrestart webserver_atrestart
+#define daemon_atrestart webserver_atrestart
 
 
 NSAPI_PUBLIC int INTshexp_match(const char *str, const char *exp);
@@ -1385,6 +1417,14 @@
 NSAPI_PUBLIC off_t system_lseek(SYS_FILE fd, off_t offset, int whence);
 NSAPI_PUBLIC int system_fclose(SYS_FILE fd);
 
+
+int log_ereport(int degree, const char *format, ...);
+int log_ereport_v(int degree, const char *format, va_list args);
+int log_error(int degree, const char *func, Session *sn, Request *rq,
+                       const char *format, ...);
+int log_error_v(int degree, const char *func, Session *sn, Request *rq,
+                       const char *format, va_list args);
+
 /* new macro and function definitions begin */
 
 NSAPI_PUBLIC int util_errno2status(int errno_value); // new