Commit 0fc9bb02 authored by Stefan Fritsch's avatar Stefan Fritsch
Browse files

revert r1066944, r1067177 for now 

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
parent 920b83c1

CHANGES

+0 −3
Changes for CHANGES: 0 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -2,9 +2,6 @@ 


Changes with Apache 2.3.11



  *) core: Reload resolv.conf on graceful restarts. PR 50619.

     [Matt Miller <m miller f5 com>, Stefan Fritsch]



  *) mod_mime: Ignore leading dots when looking for mime extensions.

     PR 50434 [Stefan Fritsch]

configure.in

+1 −5
Changes for configure.in: 1 added line, 5 removed lines.
Original line number Diff line number Diff line
@@ -400,7 +400,6 @@ sys/sem.h \ 
sys/sdt.h

)

AC_HEADER_SYS_WAIT

AC_HEADER_RESOLV



dnl ## Check for typedefs, structures, and compiler characteristics.
@@ -417,7 +416,6 @@ LIBS="$saved_LIBS" 


dnl See Comment #Spoon



AC_SEARCH_LIBS(res_init, resolv, , [AC_SEARCH_LIBS(__res_init,resolv)])

AC_CHECK_FUNCS( \

getpwnam \

getgrnam \
@@ -426,9 +424,7 @@ bindprocessor \ 
prctl \

timegm \

getpgid \

fopen64 \

res_init \

__res_init

fopen64

)



dnl confirm that a void pointer is large enough to store a long integer

server/main.c

+1 −22
Changes for server/main.c: 1 added line, 22 removed lines.
Original line number Diff line number Diff line
@@ -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);

        }