Date: Thu, 9 Oct 1997 14:55:48 -0700 (PDT) From: Dean Gaudet To: new-httpd@apache.org Subject: Re: 1.3b1 does not build on NT In-Reply-To: <199710092146.RAA05929@postman.opengroup.org> Message-ID: Return-Path: Dean Gaudet MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Status: O X-Status: Those functions are not available to modules ... they're core functionality and should be only called by other http_ core files. My guess is that http_vhost.c just hasn't been added to the win32 projects properly. i.e. those new entry points should link just like the CORE_PRIVATE ones in http_config.h. no API_EXPORT. I guess we'll be rolling another tarball ... -- Dean Gaudet, Performance Analyst, Transmeta Corp. On Thu, 9 Oct 1997, Doug MacEachern wrote: > Has anyone else tried? > I needed the bandaid patch below to build on NT. No ApacheCore.mak > diff, I opened ApacheCore.dsp, pulled in http_vhost.[ch], then > exported, but the diff didn't look right. And, I know the http_core.c > hunk isn't right, I didn't understand the cc's complaint. > > -Doug > > --- ./src/main/http_vhost.h.orig Tue Oct 7 15:34:04 1997 > +++ ./src/main/http_vhost.h Thu Oct 9 17:33:57 1997 > @@ -54,23 +54,23 @@ > #define HTTP_VHOST_H > > /* called before any config is read */ > -void init_vhost_config(pool *p); > +API_EXPORT(void) init_vhost_config(pool *p); > > /* called after the config has been read */ > -void fini_vhost_config(pool *p, server_rec *main_server); > +API_EXPORT(void) fini_vhost_config(pool *p, server_rec *main_server); > > /* handle addresses in statement */ > -const char *parse_vhost_addrs(pool *p, const char *hostname, server_rec *s); > +API_EXPORT(const char *)parse_vhost_addrs(pool *p, const char *hostname, server_rec *s); > > /* handle NameVirtualHost directive */ > -const char *set_name_virtual_host (cmd_parms *cmd, void *dummy, char *arg); > +API_EXPORT(const char *)set_name_virtual_host (cmd_parms *cmd, void *dummy, char *arg); > > /* given an ip address only, give our best guess as to what vhost it is */ > -void update_vhost_given_ip(conn_rec *conn); > +API_EXPORT(void) update_vhost_given_ip(conn_rec *conn); > > /* The above is never enough, and this is always called after the headers > * have been read. It may change r->server. > */ > -void update_vhost_from_headers(request_rec *r); > +API_EXPORT(void) update_vhost_from_headers(request_rec *r); > > #endif > --- ./src/main/http_vhost.c.orig Tue Oct 7 15:34:04 1997 > +++ ./src/main/http_vhost.c Thu Oct 9 17:33:57 1997 > @@ -143,7 +143,7 @@ > > > /* called at the beginning of the config */ > -void init_vhost_config(pool *p) > +API_EXPORT(void) init_vhost_config(pool *p) > { > memset(iphash_table, 0, sizeof(iphash_table)); > default_list = NULL; > @@ -236,7 +236,7 @@ > > > /* parse the addresses */ > -const char *parse_vhost_addrs(pool *p, const char *hostname, server_rec *s) > +API_EXPORT(const char *)parse_vhost_addrs(pool *p, const char *hostname, server_rec *s) > { > server_addr_rec **addrs; > const char *err; > @@ -262,7 +262,7 @@ > } > > > -const char *set_name_virtual_host (cmd_parms *cmd, void *dummy, char *arg) > +API_EXPORT(const char *)set_name_virtual_host (cmd_parms *cmd, void *dummy, char *arg) > { > /* use whatever port the main server has at this point */ > return get_addresses(cmd->pool, arg, &name_vhost_list_tail, > @@ -401,7 +401,7 @@ > > > /* compile the tables and such we need to do the run-time vhost lookups */ > -void fini_vhost_config(pool *p, server_rec *main_s) > +API_EXPORT(void) fini_vhost_config(pool *p, server_rec *main_s) > { > server_addr_rec *sar; > int has_default_vhost_addr; > @@ -725,7 +725,7 @@ > } > > > -void update_vhost_from_headers(request_rec *r) > +API_EXPORT(void) update_vhost_from_headers(request_rec *r) > { > /* check if we tucked away a name_chain */ > if (r->connection->vhost_lookup_data) { > @@ -744,7 +744,7 @@ > /* Called for a new connection which has a known local_addr. Note that the > * new connection is assumed to have conn->server == main server. > */ > -void update_vhost_given_ip(conn_rec *conn) > +API_EXPORT(void) update_vhost_given_ip(conn_rec *conn) > { > server_addr_rec *sar; > ipaddr_chain *trav; > --- ./src/main/http_core.c.orig Tue Oct 7 15:34:00 1997 > +++ ./src/main/http_core.c Thu Oct 9 17:43:05 1997 > @@ -1557,8 +1557,10 @@ > { "CoreDumpDirectory", set_coredumpdir, NULL, RSRC_CONF, TAKE1, "The location of the directory Apache changes to before dumping core" }, > { "Include", include_config, NULL, RSRC_CONF, TAKE1, "config file to be included" }, > { "LogLevel", set_loglevel, NULL, RSRC_CONF, TAKE1, "set level of verbosity in error logging" }, > +#ifndef WIN32 > { "NameVirtualHost", set_name_virtual_host, NULL, RSRC_CONF, TAKE1, > "a numeric ip address:port, or the name of a host with a single address" }, > +#endif > { NULL }, > }; > > --- ./src/ApacheCore.dsp.orig Sun Sep 14 12:03:09 1997 > +++ ./src/ApacheCore.dsp Thu Oct 9 17:32:44 1997 > @@ -44,7 +44,7 @@ > # PROP Ignore_Export_Lib 0 > # PROP Target_Dir "" > # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /c > -# ADD CPP /nologo /MD /W3 /GX /O2 /I ".\regex" /I ".\main" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c > +# ADD CPP /nologo /MD /W3 /GX /O2 /I ".\regex" /I ".\main" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FR /YX /FD /c > # ADD BASE MTL /nologo /D "NDEBUG" /win32 > # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 > # ADD BASE RSC /l 0x809 /d "NDEBUG" > @@ -145,6 +145,10 @@ > # End Source File > # Begin Source File > > +SOURCE=.\main\http_vhost.c > +# End Source File > +# Begin Source File > + > SOURCE=.\main\md5c.c > # End Source File > # Begin Source File > @@ -318,6 +322,10 @@ > # Begin Source File > > SOURCE=.\main\http_request.h > +# End Source File > +# Begin Source File > + > +SOURCE=.\main\http_vhost.h > # End Source File > # Begin Source File > >