Changeset 828

Timestamp:

May 23, 2017, 1:54:31 PM (8 years ago)

Author:

djay

Message:

Add support for headers definition to requests run from js ZOO-API.

Location:

trunk/zoo-project

Files:

• HISTORY.txt (modified) (1 diff)
• zoo-api/js/ZOO-api.js (modified) (2 diffs)
• zoo-kernel/service_internal_js.c (modified) (1 diff)
• zoo-kernel/ulinet.c (modified) (1 diff)

trunk/zoo-project/HISTORY.txt

@@ -1 +1 @@
 Version 1.7.0-dev
+  * Support headers for GET requests from the js ZOO-API 
   * Pass all headers listed in the attributes parameter from the
   [security] section to the hosts listed in the hosts parameter of the

trunk/zoo-project/zoo-api/js/ZOO-api.js

@@ -436 +436 @@
    * url - {String} The URL to request.
    * params - {Object} Params to add to the url
+   * headers - {Object/Array}  A key-value object of headers
    * 
    * Returns:
    * {String} Request result.
    */
-  Get: function(url,params) {
+    Get: function(url,params,headers) {
     var paramsArray = [];
     for (var key in params) {
@@ -466 +467 @@
       url += separator + paramString;
     }
-    return ZOORequest('GET',url);
+    if(!(headers instanceof Array)) {
+        var headersArray = [];
+        for (var name in headers) {
+            headersArray.push(name+': '+headers[name]); 
+        }
+        headers = headersArray;
+    }
+    return ZOORequest('GET',url,headers);
   },
   /**

trunk/zoo-project/zoo-kernel/service_internal_js.c

@@ -934 +934 @@
   }else{
     if(argc==3){
-      char *body=JSValToChar(cx,&argv[2]);
-      InternetOpenUrl(&hInternet,hInternet.waitingRequests[hInternet.nb],body,strlen(body),
-                      INTERNET_FLAG_NO_CACHE_WRITE,0);
-      processDownloads(&hInternet);
-      free(body);
+      if(strncasecmp(method,"GET",3)==0){
+        header=JSVAL_TO_OBJECT(argv[2]);
+        if(JS_IsArrayObject(cx,header)){
+          setHeader(&hInternet,cx,header);
+        }
+        InternetOpenUrl(&hInternet,hInternet.waitingRequests[hInternet.nb],NULL,0,
+                        INTERNET_FLAG_NO_CACHE_WRITE,0);
+        processDownloads(&hInternet);
+      }else{
+        char *body=JSValToChar(cx,&argv[2]);
+        InternetOpenUrl(&hInternet,hInternet.waitingRequests[hInternet.nb],body,strlen(body),
+                        INTERNET_FLAG_NO_CACHE_WRITE,0);
+        processDownloads(&hInternet);
+        free(body);
+      }
     }else{
       InternetOpenUrl(&hInternet,hInternet.waitingRequests[hInternet.nb],NULL,0,

trunk/zoo-project/zoo-kernel/ulinet.c

@@ -185 +185 @@
  * @param proto the protocol requiring the use of a proxy
  */
-bool setProxiesForProtcol(CURL* handle,const char *proto){
+int setProxiesForProtcol(CURL* handle,const char *proto){
 #ifdef MSG_LAF_VERBOSE
   fprintf( stderr, "setProxiesForProtocol (do nothing) ...\n" );