Merge pull request #258 from geographika/fastcgi-headers

Add HTTP headers to ctx object in FastCGI executable

Author: jbo-ads

cgi/mapcache.c

@@ -39,6 +39,10 @@
 #include <fcgi_stdio.h>
 #endif
 
+#ifndef WIN32
+extern char** environ;
+#endif
+
 typedef struct mapcache_context_fcgi mapcache_context_fcgi;
 typedef struct mapcache_context_fcgi_request mapcache_context_fcgi_request;
 
@@ -158,7 +162,6 @@ static void fcgi_write_response(mapcache_context_fcgi *ctx, mapcache_http_respon
   }
 }
 
-
 apr_time_t mtime;
 char *conffile;
 
@@ -228,6 +231,43 @@ static void load_config(mapcache_context *ctx, char *filename)
 
 }
 
+static void set_headers(mapcache_context* ctx, char** env)
+{
+    // add all environ settings including HTTP headers to
+    // a ctx->headers_in apr_table_t
+
+    char * key, * val, * kvp, * pair;
+    int i;
+    int num_env_var;
+    apr_table_t* headers;
+
+    num_env_var = 0;
+    while (env[num_env_var] != NULL)
+        num_env_var++;
+
+    headers = apr_table_make(ctx->pool, num_env_var);
+
+    for (i = 0; env[i] != NULL; i++) {
+        kvp = apr_pstrdup(ctx->pool, env[i]);
+
+        // convert HTTP header keys from the form HTTP_MY_HEADER to MY-HEADER
+        key = apr_strtok(kvp, "=", &pair);
+        key = mapcache_util_str_replace(ctx->pool, key, "HTTP_", "");
+        key = mapcache_util_str_replace_all(ctx->pool, key, "_", "-");
+
+        val = apr_strtok(NULL, "=", &pair);
+
+        if (val != NULL) {
+            apr_table_addn(headers, key, val);
+        }
+        else {
+            apr_table_addn(headers, key, "");
+        }
+    }
+
+    ctx->headers_in = headers;
+}
+
 int main(int argc, const char **argv)
 {
   mapcache_context_fcgi* globalctx;
@@ -297,6 +337,8 @@ int main(int argc, const char **argv)
       goto cleanup;
     }
 
+    set_headers(ctx, environ);
+
     http_response = NULL;
     if(request->type == MAPCACHE_REQUEST_GET_CAPABILITIES) {
       mapcache_request_get_capabilities *req = (mapcache_request_get_capabilities*)request;

include/mapcache.h

@@ -1442,7 +1442,7 @@ MS_DLL_EXPORT char *mapcache_util_str_replace(apr_pool_t *pool, const char *stri
                                 const char *replacement );
 char *mapcache_util_dbl_replace(apr_pool_t *pool, const char *string, const char *substr,
                                 double replacement );
-char *mapcache_util_str_replace_all(apr_pool_t *pool, const char *string, const char *substr,
+MS_DLL_EXPORT char *mapcache_util_str_replace_all(apr_pool_t *pool, const char *string, const char *substr,
                                     const char *replacement );
 char *mapcache_util_dbl_replace_all(apr_pool_t *pool, const char *string, const char *substr,
                                     double replacement );