HmlSearchPath feature.

diff --git a/mod_hml.c b/mod_hml.c
index d56a0db..bf6b19b 100644 (file)
--- a/mod_hml.c
+++ b/mod_hml.c
@@ -40,7 +40,6 @@
 #include "util_script.h"
 #include "ap_mpm.h"
 #include "mod_core.h"
-//#include "mod_hml.h"
 
 module AP_MODULE_DECLARE_DATA hml_module;
 
@@ -79,11 +78,11 @@ typedef struct {
 } hml_server_conf;
 
 typedef struct hml_dir_conf {
-    char*  hmldir;
-    char*  hmlsubpath;
+    const char*  hmldir;
+    const char*  hmlsubpath;
 //    apr_table_t*  env;
-    char*  searchpath;
-    char*  dataroot;
+    const char*  searchpath;
+    const char*  dataroot;
 }  hml_dir_conf;
 
 typedef struct {
@@ -150,7 +149,6 @@ static const char*  set_subpath (cmd_parms* cmd, void* vconf, const char* value)
     return NULL;
 }
 
-//static const char* set_searchpath (cmd_parms* cmd, void* vconf, const char* name, const char* value) {
 static const char* set_searchpath (cmd_parms* cmd, void* vconf, const char* value) {
     hml_dir_conf*  conf = (hml_dir_conf*)vconf;
 
@@ -167,15 +165,13 @@ static const char* set_searchpath (cmd_parms* cmd, void* vconf, const char* valu
                    goto err;
                }
            }
-//         if (conf->env == NULL)
-//             conf->env = apr_table_make (cmd->pool, 4);
-//         apr_table_setn (conf->env, name, path);
            conf->searchpath = path;
        }
     }
+    return NULL;
 
  err:
-    return apr_pstrcat (cmd->pool, "Invalid directory path ", value, NULL);
+    return apr_pstrcat (cmd->pool, "Invalid directory path: ", value, NULL);
 }
 
 static void *create_hml_config(apr_pool_t *p, server_rec *s)
@@ -241,7 +237,7 @@ static const command_rec hml_cmds[] =
     AP_INIT_TAKE1 ("HmlDir", ap_set_file_slot, (void*)APR_OFFSETOF (hml_dir_conf, hmldir), RSRC_CONF | ACCESS_CONF, "interpreter command directory"),
     AP_INIT_TAKE1 ("HmlSubPath", set_subpath, NULL, OR_FILEINFO | ACCESS_CONF, "subdirectory of HmlDir"),
 //    AP_INIT_TAKE2 ("HmlSearchPath", set_searchpath, NULL, OR_FILEINFO, "set HMLSEARCHPATH env. variable"),
-    AP_INIT_TAKE1 ("HmlSearchPath", set_searchpath, NULL, OR_FILEINFO, "set HTMLSEARCHPATH env. variable"),
+    AP_INIT_TAKE1 ("HmlSearchPath", set_searchpath, NULL, OR_FILEINFO, "set HMLSEARCHPATH env. variable"),
     AP_INIT_TAKE1 ("HmlDataRoot", ap_set_file_slot, (void*)APR_OFFSETOF (hml_dir_conf, dataroot), RSRC_CONF | ACCESS_CONF, "top directory of data"),
     AP_INIT_TAKE1("HmlScriptLog", set_scriptlog, NULL, RSRC_CONF, "the name of a log for script debugging info"),
     AP_INIT_TAKE1("HmlScriptLogLength", set_scriptlog_length, NULL, RSRC_CONF, "the maximum length (in bytes) of the script debug log"),