From: Andrew McNab <andrew.mcnab@manchester.ac.uk>
Date: Wed, 8 Jun 2005 14:52:15 +0000 (+0000)
Subject: Export GRST_EXEC_DIRECTORY
X-Git-Tag: gridsite-core_R_1_1_9~7
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=6a7bb2ec301eeaa65799b5566d06c76d6b0a32df;p=jra1mw.git

Export GRST_EXEC_DIRECTORY
---

diff --git a/org.gridsite.core/src/mod_gridsite.c b/org.gridsite.core/src/mod_gridsite.c
index da9989c..450640f 100644
--- a/org.gridsite.core/src/mod_gridsite.c
+++ b/org.gridsite.core/src/mod_gridsite.c
@@ -2175,8 +2175,28 @@ static int mod_gridsite_perm_handler(request_rec *r)
                               ((mod_gridsite_cfg *) cfg)->aclformat);
 
         if (((mod_gridsite_cfg *) cfg)->execmethod != NULL)
-	          apr_table_setn(env, "GRST_EXEC_METHOD",
+          {
+	    apr_table_setn(env, "GRST_EXEC_METHOD",
                               ((mod_gridsite_cfg *) cfg)->execmethod);
+                              
+            if ((strcasecmp(((mod_gridsite_cfg *) cfg)->execmethod,  
+                           "directory") == 0) && (r->filename != NULL))
+              {
+                if ((r->content_type != NULL) && 
+                    (strcmp(r->content_type, DIR_MAGIC_TYPE) == 0))
+                  apr_table_setn(env, "GRST_EXEC_DIRECTORY", r->filename);
+                else
+                  {
+                    file = apr_pstrdup(r->pool, r->filename);
+                    p = rindex(file, '/');
+                    if (p != NULL)
+                      {
+                        *p = '\0';
+                        apr_table_setn(env, "GRST_EXEC_DIRECTORY", file);
+                      }                    
+                  }                 
+              }
+          }
 
         apr_table_setn(env, "GRST_DISK_MODE",
  	                     apr_psprintf(r->pool, "0x%04x",