Changeset 301 for branches/branch-1.2/zoo-kernel/service_internal.h

Timestamp:

Aug 5, 2011, 3:02:43 PM (13 years ago)

Author:

djay

Message:

Merge branch-1.2 r268:r296.

Location:

branches/branch-1.2

Files:

• . (modified) (1 prop)
• zoo-kernel/service_internal.h (modified) (5 diffs)

branches/branch-1.2/zoo-kernel/service_internal.h

@@ -53 +53 @@
 #include "service.h"
 #include <openssl/sha.h>
+#include <openssl/md5.h>
 #include <openssl/hmac.h>
 #include <openssl/evp.h>
@@ -59 +60 @@
 
 #include "cgic.h"
+#include "ulinet.h"
 
 extern   int getServiceFromFile(const char*,service**);
@@ -72 +74 @@
 #endif
 #include <libxml/parser.h>
+#include <libxml/xpath.h>
+
   static char* SERVICE_URL;
-  static xmlNsPtr usedNs[5];
-  static char* nsName[5];
+  static xmlNsPtr usedNs[10];
+  static char* nsName[10];
   static int nbNs=0;
 
@@ -83 +87 @@
 #ifdef USE_JS
   char* JSValToChar(JSContext*,jsval*);
-  JSBool JSUpdateStatus(JSContext*,JSObject*,uintN,jsval *,jsval *);
+  JSBool JSUpdateStatus(JSContext*,uintN,jsval *);
 #endif
   
@@ -118 +122 @@
   char* addDefaultValues(maps**,elements*,maps*,int);
 
-  /*defined in zoo_loader.c*/ 
   int errorException(maps *m, const char *message, const char *errorcode);
 
+  int checkForSoapEnvelope(xmlDocPtr);
+
+  void addToCache(maps*,char*,char*,int);
+  char* isInCache(maps*,char*);
+  void loadRemoteFile(maps*,map*,HINTERNET,char*);
+  
 #ifdef __cplusplus
 }