httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From do...@hyperreal.org
Subject cvs commit: apache-1.3/src/main http_config.c http_core.c
Date Tue, 17 Mar 1998 03:26:46 GMT
dougm       98/03/16 19:26:46

  Modified:    src/include http_config.h http_core.h
               src/main http_config.c http_core.c
  Log:
  export a few functions so mod_perl's <Perl> config sections work under win32
  Submitted by:	Doug MacEachern
  Reviewed by:	Dean Gaudet
  
  Revision  Changes    Path
  1.74      +6 -4      apache-1.3/src/include/http_config.h
  
  Index: http_config.h
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/include/http_config.h,v
  retrieving revision 1.73
  retrieving revision 1.74
  diff -u -r1.73 -r1.74
  --- http_config.h	1998/03/13 19:20:10	1.73
  +++ http_config.h	1998/03/17 03:26:41	1.74
  @@ -267,7 +267,7 @@
    * handle it back-compatibly, or at least signal an error).
    */
   
  -#define MODULE_MAGIC_NUMBER 19980312
  +#define MODULE_MAGIC_NUMBER 19980317
   #define STANDARD_MODULE_STUFF MODULE_MAGIC_NUMBER, -1, __FILE__, NULL, NULL
   
   /* Generic accessors for other modules to get at their own module-specific
  @@ -302,6 +302,8 @@
   
   #ifdef CORE_PRIVATE
   
  +extern API_VAR_EXPORT module *top_module;
  +
   extern module *prelinked_modules[];
   extern module *preloaded_modules[];
   
  @@ -318,7 +320,7 @@
   /* For http_request.c... */
   
   void *create_request_config(pool *p);
  -void *create_per_dir_config(pool *p);
  +API_EXPORT(void *) create_per_dir_config(pool *p);
   void *merge_per_dir_configs(pool *p, void *base, void *new);
   void *create_empty_config(pool *p);
   
  @@ -328,9 +330,9 @@
   
   int parse_htaccess(void **result, request_rec *r, int override,
   		const char *path, const char *access_name);
  -const char *srm_command_loop(cmd_parms *parms, void *config);
  +API_EXPORT(const char *) srm_command_loop(cmd_parms *parms, void *config);
   
  -const char *init_virtual_host(pool *p, const char *hostname,
  +API_EXPORT(const char *) init_virtual_host(pool *p, const char *hostname,
   				server_rec *main_server, server_rec **);
   void process_resource_config(server_rec *s, char *fname, pool *p, pool *ptemp);
   
  
  
  
  1.37      +1 -1      apache-1.3/src/include/http_core.h
  
  Index: http_core.h
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/include/http_core.h,v
  retrieving revision 1.36
  retrieving revision 1.37
  diff -u -r1.36 -r1.37
  --- http_core.h	1998/02/21 01:42:36	1.36
  +++ http_core.h	1998/03/17 03:26:42	1.37
  @@ -132,7 +132,7 @@
   
   char *response_code_string (request_rec *r, int error_index);
   
  -extern module core_module;
  +extern API_VAR_EXPORT module core_module;
   
   /* Per-directory configuration */
   
  
  
  
  1.107     +7 -7      apache-1.3/src/main/http_config.c
  
  Index: http_config.c
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/main/http_config.c,v
  retrieving revision 1.106
  retrieving revision 1.107
  diff -u -r1.106 -r1.107
  --- http_config.c	1998/03/16 12:09:52	1.106
  +++ http_config.c	1998/03/17 03:26:44	1.107
  @@ -94,7 +94,7 @@
    * than DYNAMIC_MODULE_LIMIT.
    */
   static int dynamic_modules = 0;
  -module *top_module = NULL;
  +API_VAR_EXPORT module *top_module = NULL;
   
   typedef int (*handler_func) (request_rec *);
   typedef void *(*dir_maker_func) (pool *, char *);
  @@ -213,7 +213,7 @@
       return create_empty_config(p);
   }
   
  -void *create_per_dir_config(pool *p)
  +API_EXPORT(void *) create_per_dir_config(pool *p)
   {
       return create_empty_config(p);
   }
  @@ -861,7 +861,7 @@
       }
   }
   
  -const command_rec *find_command(const char *name, const command_rec *cmds)
  +API_EXPORT(const command_rec *) find_command(const char *name, const command_rec *cmds)
   {
       while (cmds->name)
   	if (!strcasecmp(name, cmds->name))
  @@ -872,7 +872,7 @@
       return NULL;
   }
   
  -const command_rec *find_command_in_modules(const char *cmd_name, module **mod)
  +API_EXPORT(const command_rec *) find_command_in_modules(const char *cmd_name, module **mod)
   {
       const command_rec *cmdp;
       module *modp;
  @@ -886,7 +886,7 @@
       return NULL;
   }
   
  -const char *handle_command(cmd_parms *parms, void *config, const char *l)
  +API_EXPORT(const char *) handle_command(cmd_parms *parms, void *config, const char *l)
   {
       const char *args, *cmd_name, *retval;
       const command_rec *cmd;
  @@ -931,7 +931,7 @@
       return retval;
   }
   
  -const char *srm_command_loop(cmd_parms *parms, void *config)
  +API_EXPORT(const char *) srm_command_loop(cmd_parms *parms, void *config)
   {
       char l[MAX_STRING_LEN];
   
  @@ -1201,7 +1201,7 @@
   }
   
   
  -const char *init_virtual_host(pool *p, const char *hostname,
  +API_EXPORT(const char *) init_virtual_host(pool *p, const char *hostname,
   			      server_rec *main_server, server_rec **ps)
   {
       server_rec *s = (server_rec *) pcalloc(p, sizeof(server_rec));
  
  
  
  1.172     +5 -5      apache-1.3/src/main/http_core.c
  
  Index: http_core.c
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/main/http_core.c,v
  retrieving revision 1.171
  retrieving revision 1.172
  diff -u -r1.171 -r1.172
  --- http_core.c	1998/03/15 04:39:12	1.171
  +++ http_core.c	1998/03/17 03:26:45	1.172
  @@ -253,7 +253,7 @@
    * these are part of the core server config.
    */
   
  -void add_per_dir_conf (server_rec *s, void *dir_config)
  +API_EXPORT(void) add_per_dir_conf (server_rec *s, void *dir_config)
   {
       core_server_config *sconf = get_module_config (s->module_config,
   						   &core_module);
  @@ -262,7 +262,7 @@
       *new_space = dir_config;
   }
   
  -void add_per_url_conf (server_rec *s, void *url_config)
  +API_EXPORT(void) add_per_url_conf (server_rec *s, void *url_config)
   {
       core_server_config *sconf = get_module_config (s->module_config,
   						   &core_module);
  @@ -876,7 +876,7 @@
       return NULL;
   }
   
  -const char *limit_section (cmd_parms *cmd, void *dummy, const char *arg)
  +API_EXPORT(const char *) limit_section (cmd_parms *cmd, void *dummy, const char *arg)
   {
       const char *limited_methods = getword(cmd->pool,&arg,'>');
       int limited = 0;
  @@ -1864,7 +1864,7 @@
   { end_virtualhost_section, end_nested_section, NULL, RSRC_CONF, NO_ARGS, "Marks end of
<VirtualHost>" },
   { "<Files", filesection, NULL, OR_ALL, RAW_ARGS, "Container for directives affecting
files matching specified patterns" },
   { end_files_section, end_nested_section, NULL, OR_ALL, NO_ARGS, "Marks end of <Files>"
},
  -{ "<Limit", limit_section, NULL, OR_ALL, RAW_ARGS, "Container for authentication directives
when accessed using specified HTTP methods" },
  +{ "<Limit", (void*)limit_section, NULL, OR_ALL, RAW_ARGS, "Container for authentication
directives when accessed using specified HTTP methods" },
   { "</Limit>", endlimit_section, NULL, OR_ALL, NO_ARGS, "Marks end of <Limit>"
},
   { "<IfModule", start_ifmod, NULL, OR_ALL, RAW_ARGS, "Container for directives based
on existance of specified modules" },
   { end_ifmodule_section, end_ifmod, NULL, OR_ALL, NO_ARGS, "Marks end of <IfModule>"
},
  @@ -2186,7 +2186,7 @@
   { NULL }
   };
   
  -module core_module = {
  +API_VAR_EXPORT module core_module = {
      STANDARD_MODULE_STUFF,
      NULL,			/* initializer */
      create_core_dir_config,	/* create per-directory config structure */
  
  
  

Mime
View raw message