View | Details | Raw Unified | Return to bug 50619
Collapse All | Expand All

(-)httpd/build/server/main.c.old (+12 lines)
Lines 40-45 Link Here
40
#include "ap_mpm.h"
40
#include "ap_mpm.h"
41
#include "mpm_common.h"
41
#include "mpm_common.h"
42
42
43
#include <netinet/in.h>
44
#include <arpa/nameser.h>
45
#include <resolv.h>
46
43
/* WARNING: Win32 binds http_main.c dynamically to the server. Please place
47
/* WARNING: Win32 binds http_main.c dynamically to the server. Please place
44
 *          extern functions and global data in another appropriate module.
48
 *          extern functions and global data in another appropriate module.
45
 *
49
 *
Lines 670-675 Link Here
670
            ap_register_hooks(*mod, pconf);
674
            ap_register_hooks(*mod, pconf);
671
        }
675
        }
672
676
677
        /*
678
         * resolv.conf may have changed, so this will read/reread it.
679
         */
680
        if (res_init() == -1) {
681
            ap_log_error(APLOG_MARK, APLOG_STARTUP |APLOG_ERR, 0,
682
                         NULL, "Resolver initialization failed.");
683
        }
684
673
        /* This is a hack until we finish the code so that it only reads
685
        /* This is a hack until we finish the code so that it only reads
674
         * the config file once and just operates on the tree already in
686
         * the config file once and just operates on the tree already in
675
         * memory.  rbb
687
         * memory.  rbb

Return to bug 50619