Commit 262aa957 authored by Jeff Trawick's avatar Jeff Trawick
Browse files

stop using APLOG_NOERRNO in calls to ap_log_?error() 


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95149 13f79535-47bb-0310-9956-ffa450edef68
parent eb324668

server/config.c

+14 −14
Changes for server/config.c: 14 added lines, 14 removed lines.
Original line number Diff line number Diff line
@@ -375,7 +375,7 @@ AP_CORE_DECLARE(int) ap_invoke_handler(request_rec *r) 
    r->handler = old_handler;



    if (result == DECLINED && r->handler && r->filename) {

        ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_WARNING, 0, r,

        ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r,

            "handler \"%s\" not found for: %s", r->handler, r->filename);

    }
@@ -422,10 +422,10 @@ AP_DECLARE(void) ap_add_module(module *m, apr_pool_t *p) 
     */



    if (m->version != MODULE_MAGIC_NUMBER_MAJOR) {

        ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL,

        ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL,

                     "%s: module \"%s\" is not compatible with this "

                     "version of Apache.", ap_server_argv0, m->name);

        ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL,

        ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL,

                     "Please contact the vendor for the correct version.");

        exit(1);

    }
@@ -440,10 +440,10 @@ AP_DECLARE(void) ap_add_module(module *m, apr_pool_t *p) 
        dynamic_modules++;



        if (dynamic_modules > DYNAMIC_MODULE_LIMIT) {

            ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL,

            ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL,

                         "%s: module \"%s\" could not be loaded, because"

                         " the dynamic", ap_server_argv0, m->name);

            ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL,

            ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL,

                         "module limit was reached. Please increase "

                         "DYNAMIC_MODULE_LIMIT and recompile.");

            exit(1);
@@ -509,7 +509,7 @@ AP_DECLARE(void) ap_remove_module(module *m) 


        if (!modp) {

            /* Uh-oh, this module doesn't exist */

            ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, NULL,

            ap_log_error(APLOG_MARK, APLOG_ERR, 0, NULL,

                         "Cannot remove module %s: not found in module list",

                         m->name);

            return;
@@ -599,7 +599,7 @@ AP_DECLARE(void) ap_setup_prelinked_modules(process_rec *process) 
        sizeof(module *) * (total_modules + DYNAMIC_MODULE_LIMIT + 1));



    if (ap_loaded_modules == NULL) {

        ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL,

        ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL,

                     "Ouch!  Out of memory in ap_setup_prelinked_modules()!");

    }
@@ -1378,7 +1378,7 @@ static void process_command_config(server_rec *s, apr_array_header_t *arr, 


    errmsg = ap_build_config(&parms, p, ptemp, conftree);

    if (errmsg) {

        ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL,

        ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL,

                     "Syntax error in -C/-c directive:" APR_EOL_STR "%s",

                     errmsg);

        exit(1);
@@ -1484,7 +1484,7 @@ AP_DECLARE(void) ap_process_resource_config(server_rec *s, const char *fname, 
    parms.override = (RSRC_CONF | OR_ALL) & ~(OR_AUTHCFG | OR_LIMIT);



    if (ap_pcfg_openfile(&cfp, p, fname) != APR_SUCCESS) {

        ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL,

        ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL,

                     "%s: could not open document config file %s",

                     ap_server_argv0, fname);

        exit(1);
@@ -1495,11 +1495,11 @@ AP_DECLARE(void) ap_process_resource_config(server_rec *s, const char *fname, 
    errmsg = ap_build_config(&parms, p, ptemp, conftree);



    if (errmsg != NULL) {

        ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL,

        ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL,

                     "Syntax error on line %d of %s:",

                     parms.err_directive->line_num,

                     parms.err_directive->filename);

        ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL,

        ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL,

                     "%s", errmsg);

        exit(1);

    }
@@ -1523,11 +1523,11 @@ AP_DECLARE(void) ap_process_config_tree(server_rec *s, 


    errmsg = ap_walk_config(conftree, &parms, s->lookup_defaults);

    if (errmsg) {

        ap_log_perror(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, p,

        ap_log_perror(APLOG_MARK, APLOG_STARTUP, 0, p,

                     "Syntax error on line %d of %s:",

                     parms.err_directive->line_num,

                     parms.err_directive->filename);

        ap_log_perror(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, p,

        ap_log_perror(APLOG_MARK, APLOG_STARTUP, 0, p,

                     "%s", errmsg);

        exit(1);

    }
@@ -1584,7 +1584,7 @@ AP_CORE_DECLARE(int) ap_parse_htaccess(ap_conf_vector_t **result, 
            ap_cfg_closefile(f);



            if (errmsg) {

                ap_log_rerror(APLOG_MARK, APLOG_ALERT|APLOG_NOERRNO, 0, r,

                ap_log_rerror(APLOG_MARK, APLOG_ALERT, 0, r,

                              "%s: %s", filename, errmsg);

                return HTTP_INTERNAL_SERVER_ERROR;

            }

server/core.c

+7 −7
Changes for server/core.c: 7 added lines, 7 removed lines.
Original line number Diff line number Diff line
@@ -1083,7 +1083,7 @@ static const char *set_document_root(cmd_parms *cmd, void *dummy, 
                           APR_FILEPATH_TRUENAME, cmd->pool) != APR_SUCCESS

        || !ap_is_directory(cmd->pool, arg)) {

        if (cmd->server->is_virtual) {

            ap_log_perror(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0,

            ap_log_perror(APLOG_MARK, APLOG_STARTUP, 0,

                          cmd->pool,

                          "Warning: DocumentRoot [%s] does not exist",

                          arg);
@@ -1155,7 +1155,7 @@ static const char *set_error_document(cmd_parms *cmd, void *conf_, 
    /* The entry should be ignored if it is a full URL for a 401 error */



    if (error_number == 401 && what == REMOTE_PATH) {

        ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_NOTICE, 0, cmd->server,

        ap_log_error(APLOG_MARK, APLOG_NOTICE, 0, cmd->server,

                     "cannot use a full URL in a 401 ErrorDocument "

                     "directive --- ignoring!");

    }
@@ -2505,7 +2505,7 @@ AP_DECLARE(size_t) ap_get_limit_xml_body(const request_rec *r) 
static const char *no_set_limit(cmd_parms *cmd, void *conf_,

                                const char *arg, const char *arg2)

{

    ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, cmd->server,

    ap_log_error(APLOG_MARK, APLOG_ERR, 0, cmd->server,

                "%s not supported on this platform", cmd->cmd->name);



    return NULL;
@@ -3056,7 +3056,7 @@ AP_DECLARE_NONSTD(int) ap_core_translate(request_rec *r) 
        return HTTP_FORBIDDEN;

    }

    if (!r->uri || ((r->uri[0] != '/') && strcmp(r->uri, "*"))) {

        ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, r,

        ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,

                     "Invalid URI in request %s", r->the_request);

        return HTTP_BAD_REQUEST;

    }
@@ -3200,7 +3200,7 @@ static int default_handler(request_rec *r) 


    if (r->method_number == M_GET || r->method_number == M_POST) {

        if (r->finfo.filetype == 0) {

            ap_log_rerror(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, r,

            ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,

                          "File does not exist: %s", r->filename);

            return HTTP_NOT_FOUND;

        }
@@ -3209,7 +3209,7 @@ static int default_handler(request_rec *r) 
            r->path_info && *r->path_info)

        {

            /* default to reject */

            ap_log_rerror(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, r,

            ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,

                          "File does not exist: %s",

                          apr_pstrcat(r->pool, r->filename, r->path_info, NULL));

            return HTTP_NOT_FOUND;
@@ -3274,7 +3274,7 @@ static int default_handler(request_rec *r) 
    }

    else {              /* unusual method (not GET or POST) */

        if (r->method_number == M_INVALID) {

            ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, r,

            ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,

                          "Invalid method in request %s", r->the_request);

            return HTTP_NOT_IMPLEMENTED;

        }

server/log.c

+5 −5
Changes for server/log.c: 5 added lines, 5 removed lines.
Original line number Diff line number Diff line
@@ -604,7 +604,7 @@ AP_DECLARE(void) ap_log_pid(apr_pool_t *p, const char *filename) 
         *      that may screw up scripts written to do something

         *      based on the last modification time of the pid file.

         */

        ap_log_perror(APLOG_MARK, APLOG_NOERRNO|APLOG_WARNING, 0, p,

        ap_log_perror(APLOG_MARK, APLOG_WARNING, 0, p,

                      apr_psprintf(p, "pid file %s overwritten -- Unclean "

                                   "shutdown of previous Apache run?",

                                   fname));
@@ -616,7 +616,7 @@ AP_DECLARE(void) ap_log_pid(apr_pool_t *p, const char *filename) 
        != APR_SUCCESS) {

        ap_log_error(APLOG_MARK, APLOG_ERR, rv, NULL,

                     "could not create %s", fname);

        ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, NULL,

        ap_log_error(APLOG_MARK, APLOG_ERR, 0, NULL,

                     "%s: could not log pid to file %s",

                     ap_server_argv0, fname);

        exit(1);
@@ -632,7 +632,7 @@ AP_DECLARE(void) ap_log_assert(const char *szExp, const char *szFile, 
    char time_str[APR_CTIME_LEN];



    apr_ctime(time_str, apr_time_now());

    ap_log_error(APLOG_MARK, APLOG_CRIT | APLOG_NOERRNO, 0, NULL,

    ap_log_error(APLOG_MARK, APLOG_CRIT, 0, NULL,

                 "[%s] file %s, line %d, assertion \"%s\" failed",

                 time_str, szFile, nLine, szExp);

#if defined(WIN32)
@@ -663,7 +663,7 @@ static int piped_log_spawn(piped_log *pl) 
        != APR_SUCCESS)) {

        char buf[120];

        /* Something bad happened, give up and go away. */

        ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL,

        ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL,

                     "piped_log_spawn: unable to setup child process '%s': %s",

                     pl->program, apr_strerror(status, buf, sizeof(buf)));

        rc = -1;
@@ -719,7 +719,7 @@ static void piped_log_maintenance(int reason, void *data, apr_wait_t status) 
            /* what can we do?  This could be the error log we're having

             * problems opening up... */

            char buf[120];

            ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL,

            ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL,

                         "piped_log_maintenance: unable to respawn '%s': %s",

                         pl->program, apr_strerror(stats, buf, sizeof(buf)));

        }

server/main.c

+36 −36
Changes for server/main.c: 36 added lines, 36 removed lines.
Original line number Diff line number Diff line
@@ -291,95 +291,95 @@ static void usage(process_rec *process) 
    pad[i] = '\0';



#ifdef SHARED_CORE

    ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL ,

    ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL ,

                 "Usage: %s [-R directory] [-D name] [-d directory] [-f file]",

                 bin);

#else

    ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL,

    ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL,

                 "Usage: %s [-D name] [-d directory] [-f file]", bin);

#endif



    ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL,

    ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL,

                 "       %s [-C \"directive\"] [-c \"directive\"]", pad);



#ifdef WIN32

    ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL,

    ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL,

                 "       %s [-k start|restart|stop|shutdown]", pad);

    ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL,

    ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL,

                 "       %s [-k install|config|uninstall] [-n service_name]",

                 pad);

#endif



    ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL,

    ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL,

                 "       %s [-v] [-V] [-h] [-l] [-L] [-t] [-T]", pad);

    ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL,

    ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL,

                 "Options:");



#ifdef SHARED_CORE

    ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL,

    ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL,

                 "  -R directory      : specify an alternate location for "

                 "shared object files");

#endif



    ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL,

    ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL,

                 "  -D name           : define a name for use in "

                 "<IfDefine name> directives");

    ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL,

    ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL,

                 "  -d directory      : specify an alternate initial "

                 "ServerRoot");

    ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL,

    ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL,

                 "  -f file           : specify an alternate ServerConfigFile");

    ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL,

    ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL,

                 "  -C \"directive\"    : process directive before reading "

                 "config files");

    ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL,

    ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL,

                 "  -c \"directive\"    : process directive after reading "

                 "config files");



#ifdef WIN32

    ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL,

    ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL,

                 "  -n name           : set service name and use its "

                 "ServerConfigFile");

    ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL,

    ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL,

                 "  -k start          : tell Apache to start");

    ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL,

    ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL,

                 "  -k restart        : tell running Apache to do a graceful "

                 "restart");

    ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL,

    ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL,

                 "  -k stop|shutdown  : tell running Apache to shutdown");

    ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL,

    ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL,

                 "  -k install        : install an Apache service");

    ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL,

    ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL,

                 "  -k config         : change startup Options of an Apache "

                 "service");

    ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL,

    ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL,

                 "  -k uninstall      : uninstall an Apache service");

#endif



    ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL,

    ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL,

                 "  -e level          : show startup errors of level "

                 "(see LogLevel)");

    ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL,

    ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL,

                 "  -E file           : log startup errors to file");

    ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL,

    ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL,

                 "  -v                : show version number");

    ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL,

    ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL,

                 "  -V                : show compile settings");

    ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL,

    ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL,

                 "  -h                : list available command line options "

                 "(this page)");

    ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL,

    ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL,

                 "  -l                : list compiled in modules");

    ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL,

    ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL,

                 "  -L                : list available configuration "

                 "directives");

    ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL,

    ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL,

                 "  -t -D DUMP_VHOSTS : show parsed settings (currently only "

                 "vhost settings)");

    ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL,

    ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL,

                 "  -t                : run syntax check for config files "

                 "(with docroot check)");

    ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL,

    ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL,

                 "  -T                : run syntax check for config files "

                 "(without docroot check)");
@@ -551,7 +551,7 @@ int main(int argc, const char * const argv[]) 
    }

    server_conf = ap_read_config(process, ptemp, confname, &ap_conftree);

    if (ap_run_pre_config(pconf, plog, ptemp) != OK) {

        ap_log_error(APLOG_MARK, APLOG_STARTUP |APLOG_ERR| APLOG_NOERRNO, 0,

        ap_log_error(APLOG_MARK, APLOG_STARTUP |APLOG_ERR, 0,

                     NULL, "Pre-configuration failed\n");

        destroy_and_exit_process(process, 1);

    }
@@ -561,7 +561,7 @@ int main(int argc, const char * const argv[]) 
    ap_fini_vhost_config(pconf, server_conf);

    apr_sort_hooks();

    if (configtestonly) {

        ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL,

        ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL,

                     "Syntax OK\n");

        destroy_and_exit_process(process, 0);

    }
@@ -577,7 +577,7 @@ int main(int argc, const char * const argv[]) 
    }



    if ( ap_run_post_config(pconf, plog, ptemp, server_conf) != OK) {

        ap_log_error(APLOG_MARK, APLOG_STARTUP |APLOG_ERR| APLOG_NOERRNO, 0,

        ap_log_error(APLOG_MARK, APLOG_STARTUP |APLOG_ERR, 0,

                     NULL, "Configuration Failed\n");

        destroy_and_exit_process(process, 1);

    }
@@ -602,7 +602,7 @@ int main(int argc, const char * const argv[]) 
        ap_server_root = def_server_root;

        server_conf = ap_read_config(process, ptemp, confname, &ap_conftree);

        if (ap_run_pre_config(pconf, plog, ptemp) != OK) {

            ap_log_error(APLOG_MARK, APLOG_STARTUP |APLOG_ERR| APLOG_NOERRNO,

            ap_log_error(APLOG_MARK, APLOG_STARTUP |APLOG_ERR,

                         0, NULL, "Pre-configuration failed\n");

            destroy_and_exit_process(process, 1);

        }
@@ -613,13 +613,13 @@ int main(int argc, const char * const argv[]) 
        apr_sort_hooks();

        apr_pool_clear(plog);

        if (ap_run_open_logs(pconf, plog, ptemp, server_conf) != OK) {

            ap_log_error(APLOG_MARK, APLOG_STARTUP |APLOG_ERR| APLOG_NOERRNO,

            ap_log_error(APLOG_MARK, APLOG_STARTUP |APLOG_ERR,

                         0, NULL, "Unable to open logs\n");

            destroy_and_exit_process(process, 1);

        }



        if (ap_run_post_config(pconf, plog, ptemp, server_conf) != OK) {

            ap_log_error(APLOG_MARK, APLOG_STARTUP |APLOG_ERR | APLOG_NOERRNO,

            ap_log_error(APLOG_MARK, APLOG_STARTUP |APLOG_ERR,

                         0, NULL, "Configuration Failed\n");

            destroy_and_exit_process(process, 1);

        }

server/mpm/beos/beos.c

+20 −20
Changes for server/mpm/beos/beos.c: 20 added lines, 20 removed lines.
Original line number Diff line number Diff line
@@ -337,7 +337,7 @@ static void process_socket(apr_pool_t *p, apr_socket_t *sock, 
    (void)apr_os_sock_get(&csd, sock);

    

    if (csd >= FD_SETSIZE) {

        ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_WARNING, 0, NULL,

        ap_log_error(APLOG_MARK, APLOG_WARNING, 0, NULL,

                     "filedescriptor (%u) larger than FD_SETSIZE (%u) "

                     "found, you probably need to rebuild Apache with a "

                     "larger FD_SETSIZE", csd, FD_SETSIZE);
@@ -503,7 +503,7 @@ static int32 worker_thread(void * dummy) 


    apr_bucket_alloc_destroy(bucket_alloc);



    ap_log_error(APLOG_MARK, APLOG_NOTICE | APLOG_NOERRNO, 0, NULL,

    ap_log_error(APLOG_MARK, APLOG_NOTICE, 0, NULL,

                 "worker_thread %ld exiting", find_thread(NULL));

    

    apr_thread_mutex_lock(worker_thread_count_mutex);
@@ -565,7 +565,7 @@ static void check_restart(void *data) 
    if (!restart_pending && !shutdown_pending) {

        int slot = (int)data;

        make_worker(slot);

        ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_INFO, 0, NULL, 

        ap_log_error(APLOG_MARK, APLOG_INFO, 0, NULL, 

            "spawning a new worker thread in slot %d", slot);

    }

}
@@ -694,7 +694,7 @@ static void server_main_loop(int remaining_threads_to_start) 
                 * scoreboard.  Somehow we don't know about this

                 * child.

                 */

                 ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_WARNING, 0, ap_server_conf,

                 ap_log_error(APLOG_MARK, APLOG_WARNING, 0, ap_server_conf,

			                  "long lost child came home! (pid %ld)", pid.pid);

            }
@@ -806,7 +806,7 @@ int ap_mpm_run(apr_pool_t *_pconf, apr_pool_t *plog, server_rec *s) 
    }

 

    if ((num_listening_sockets = ap_setup_listeners(ap_server_conf)) < 1) {

        ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ALERT, 0, s,

        ap_log_error(APLOG_MARK, APLOG_ALERT, 0, s,

            "no listening sockets available, shutting down");

        return 1;

    }
@@ -912,11 +912,11 @@ int ap_mpm_run(apr_pool_t *_pconf, apr_pool_t *plog, server_rec *s) 
    /*

     * record that we've entered the world !

     */

    ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_NOTICE, 0, ap_server_conf,

    ap_log_error(APLOG_MARK, APLOG_NOTICE, 0, ap_server_conf,

		"%s configured -- resuming normal operations",

		ap_get_server_version());



    ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_INFO, 0, ap_server_conf,

    ap_log_error(APLOG_MARK, APLOG_INFO, 0, ap_server_conf,

		"Server built: %s", ap_get_server_built());



    restart_pending = shutdown_pending = 0;
@@ -943,7 +943,7 @@ int ap_mpm_run(apr_pool_t *_pconf, apr_pool_t *plog, server_rec *s) 
        const char *pidfile = NULL;

        pidfile = ap_server_root_relative (pconf, ap_pid_fname);

        if ( pidfile != NULL && unlink(pidfile) == 0)

            ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_INFO, 0, ap_server_conf,

            ap_log_error(APLOG_MARK, APLOG_INFO, 0, ap_server_conf,

                         "removed PID file %s (pid=%ld)", pidfile, 

                         (long)getpid());

    }
@@ -968,7 +968,7 @@ int ap_mpm_run(apr_pool_t *_pconf, apr_pool_t *plog, server_rec *s) 


        if (!child_fatal) {         /* already recorded */

            /* record the shutdown in the log */

            ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_NOTICE, 0, ap_server_conf,

            ap_log_error(APLOG_MARK, APLOG_NOTICE, 0, ap_server_conf,

                         "caught SIGTERM, shutting down");

        }
@@ -979,7 +979,7 @@ int ap_mpm_run(apr_pool_t *_pconf, apr_pool_t *plog, server_rec *s) 
    signal(SIGHUP, SIG_IGN);



    if (is_graceful) {

        ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_NOTICE, 0, ap_server_conf,

        ap_log_error(APLOG_MARK, APLOG_NOTICE, 0, ap_server_conf,

		    AP_SIG_GRACEFUL_STRING " received.  Doing graceful restart");

    }

    else {
@@ -989,7 +989,7 @@ int ap_mpm_run(apr_pool_t *_pconf, apr_pool_t *plog, server_rec *s) 
         */

	    

        ap_reclaim_child_processes(1);		/* Start with SIGTERM */

	    ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_NOTICE, 0, ap_server_conf,

	    ap_log_error(APLOG_MARK, APLOG_NOTICE, 0, ap_server_conf,

		    "SIGHUP received.  Attempting to restart");

    }
@@ -1067,7 +1067,7 @@ static const char *set_threads_to_start(cmd_parms *cmd, void *dummy, const char 


    ap_threads_to_start = atoi(arg);

    if (ap_threads_to_start < 0) {

        ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL,

        ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL,

                     "StartThreads set to a value less than 0, reset to 1");

        ap_threads_to_start = 1;

    }
@@ -1083,11 +1083,11 @@ static const char *set_min_spare_threads(cmd_parms *cmd, void *dummy, const char 


    min_spare_threads = atoi(arg);

    if (min_spare_threads <= 0) {

       ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL, 

       ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL, 

                    "WARNING: detected MinSpareThreads set to non-positive.");

       ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL,

       ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL,

                    "Resetting to 1 to avoid almost certain Apache failure.");

       ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL, 

       ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL, 

                    "Please read the documentation.");

       min_spare_threads = 1;

    }
@@ -1115,18 +1115,18 @@ static const char *set_threads_limit (cmd_parms *cmd, void *dummy, const char *a 


    ap_thread_limit = atoi(arg);

    if (ap_thread_limit > HARD_THREAD_LIMIT) {

       ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL, 

       ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL, 

                    "WARNING: MaxClients of %d exceeds compile time limit "

                    "of %d servers,", ap_thread_limit, HARD_THREAD_LIMIT);

       ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL, 

       ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL, 

                    " lowering MaxClients to %d.  To increase, please "

                    "see the", HARD_THREAD_LIMIT);

       ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL, 

       ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL, 

                    " HARD_THREAD_LIMIT define in server/mpm/beos/mpm_default.h.");

       ap_thread_limit = HARD_THREAD_LIMIT;

    } 

    else if (ap_thread_limit < 1) {

        ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL, 

        ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL, 

                     "WARNING: Require MaxClients > 0, setting to %d", HARD_THREAD_LIMIT);

        ap_thread_limit = HARD_THREAD_LIMIT;

    }
@@ -1142,7 +1142,7 @@ static const char *set_max_requests_per_thread (cmd_parms *cmd, void *dummy, con 


    ap_max_requests_per_thread = atoi(arg);

    if (ap_max_requests_per_thread < 0) {

        ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL,

        ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL,

                     "WARNING: MaxRequestsPerThread was set below 0"

                     "reset to 0, but this may not be what you want.");

        ap_max_requests_per_thread = 0;