[naviserver-commits] naviserver/include ns.h,1.57,1.58

[Stephen D. <sd...@us...>]

Update of /cvsroot/naviserver/naviserver/include
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23250/include

Modified Files:
	ns.h 
Log Message:
        * include/ns.h:
        * nsd/nsd.h:
        * nsd/Makefile:
        * nsd/url2file.c:
        * nsd/fastpath.c:
        * nsd/info.c:
        * nsd/init.c:
        * nsd/proc.c:
        * nsd/server.c:
        * nsd/tclcmds.c:
        * nsd/tclfile.c:
        * tests/ns_info.test:
        * tests/url2file.test: Add new, flexible urlspace-based Url2File C
        API and matching Tcl commands. (RFE: 1333811)


Index: ns.h
===================================================================
RCS file: /cvsroot/naviserver/naviserver/include/ns.h,v
retrieving revision 1.57
retrieving revision 1.58
diff -C2 -d -r1.57 -r1.58
*** ns.h	2 Nov 2005 21:18:20 -0000	1.57
--- ns.h	7 Nov 2005 03:17:55 -0000	1.58
***************
*** 523,526 ****
--- 523,527 ----
  typedef int   (Ns_FilterProc) (void *arg, Ns_Conn *conn, int why);
  typedef int   (Ns_UrlToFileProc) (Ns_DString *dsPtr, CONST char *server, CONST char *url);
+ typedef int   (Ns_Url2FileProc) (Ns_DString *dsPtr, CONST char *url, void *arg);
  typedef char *(Ns_ServerRootProc) (Ns_DString  *dest, CONST char *host, void *arg);
  typedef char *(Ns_ConnLocationProc) (Ns_Conn *conn, Ns_DString *dest, void *arg);
***************
*** 909,918 ****
      NS_GNUC_DEPRECATED;
  
- NS_EXTERN void
- Ns_SetUrlToFileProc(CONST char *server, Ns_UrlToFileProc *procPtr);
- 
- NS_EXTERN int
- Ns_UrlToFile(Ns_DString *dsPtr, CONST char *server, CONST char *url);
- 
  NS_EXTERN int
  Ns_UrlIsFile(CONST char *server, CONST char *url);
--- 910,913 ----
***************
*** 1783,1786 ****
--- 1778,1807 ----
  
  /*
+  * url2file.c:
+  */
+ 
+ NS_EXTERN void
+ Ns_RegisterUrl2FileProc(CONST char *server, CONST char *url,
+                         Ns_Url2FileProc *proc, Ns_Callback *delete,
+                         void *arg, int flags)
+     NS_GNUC_NONNULL(1) NS_GNUC_NONNULL(2) NS_GNUC_NONNULL(3);
+ 
+ NS_EXTERN void
+ Ns_UnRegisterUrl2FileProc(CONST char *server, CONST char *url, int inherit)
+     NS_GNUC_NONNULL(1) NS_GNUC_NONNULL(2);
+ 
+ NS_EXTERN int
+ Ns_UrlToFile(Ns_DString *dsPtr, CONST char *server, CONST char *url)
+     NS_GNUC_NONNULL(1) NS_GNUC_NONNULL(2) NS_GNUC_NONNULL(3);
+ 
+ NS_EXTERN void
+ Ns_SetUrlToFileProc(CONST char *server, Ns_UrlToFileProc *procPtr)
+     NS_GNUC_NONNULL(1) NS_GNUC_NONNULL(2);
+ 
+ 
+ NS_EXTERN Ns_Url2FileProc Ns_FastUrl2FileProc;
+ 
+ 
+ /*
   * urlencode.c:
   */