www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-11-05 05:30:39 +03:00
Code Activity

revert r1066944, r1067177 for now

Browse Source 
breaks MacOS X and wherever this code will go, server/main.c does not seem to be the right place.
See
http://mail-archives.apache.org/mod_mbox/httpd-dev/201102.mbox/%3C01930193-8A3B-4635-9EB0-5EE31349E49C@jaguNET.com%3E


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1067483 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Stefan Fritsch
2011-02-05 19:02:33 +00:00
parent 1906ca4fe0
commit 2e8001b539
3 changed files with 2 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
server/main.c
View File

@@ -44,16 +44,6 @@
#include <unistd.h>
#endif
#if HAVE_NETINET_IN_H
#include <netinet/in.h>
#endif
#if HAVE_ARPA_NAMESER_H
#include <arpa/nameser.h>
#endif
#if HAVE_RESOLV_H
#include <resolv.h>
#endif
/* WARNING: Win32 binds http_main.c dynamically to the server. Please place
* extern functions and global data in another appropriate module.
*
@@ -688,18 +678,7 @@ int main(int argc, const char * const argv[])
apr_hook_deregister_all();
apr_pool_clear(pconf);
ap_clear_auth_internal();
#if 0
/* glibc has __res_init that is #defined to res_init */
#if HAVE_RES_INIT || HAVE___RES_INIT
/*
* resolv.conf may have changed, so this will read/reread it.
*/
if (res_init() == -1) {
ap_log_error(APLOG_MARK, APLOG_WARNING, 0, NULL,
"Resolver initialization failed.");
}
#endif
#endif
for (mod = ap_prelinked_modules; *mod != NULL; mod++) {
ap_register_hooks(*mod, pconf);
}