diff options
Diffstat (limited to 'modules/generators')
| -rw-r--r-- | modules/generators/mod_asis.c | 8 | ||||
| -rw-r--r-- | modules/generators/mod_autoindex.c | 4 | ||||
| -rw-r--r-- | modules/generators/mod_cgi.c | 34 | ||||
| -rw-r--r-- | modules/generators/mod_cgid.c | 74 | ||||
| -rw-r--r-- | modules/generators/mod_status.c | 2 | ||||
| -rw-r--r-- | modules/generators/mod_suexec.c | 2 |
6 files changed, 62 insertions, 62 deletions
diff --git a/modules/generators/mod_asis.c b/modules/generators/mod_asis.c index fbf13965ec..1fc14389a5 100644 --- a/modules/generators/mod_asis.c +++ b/modules/generators/mod_asis.c @@ -44,14 +44,14 @@ static int asis_handler(request_rec *r) } if (r->finfo.filetype == APR_NOFILE) { - ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r, + ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r, APLOGNO(01233) "File does not exist: %s", r->filename); return HTTP_NOT_FOUND; } if ((rv = apr_file_open(&f, r->filename, APR_READ, APR_OS_DEFAULT, r->pool)) != APR_SUCCESS) { - ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r, + ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r, APLOGNO(01234) "file permissions deny server access: %s", r->filename); return HTTP_FORBIDDEN; } @@ -85,7 +85,7 @@ static int asis_handler(request_rec *r) rv = apr_file_seek(f, APR_CUR, &pos); if (rv != APR_SUCCESS) { - ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r, + ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r, APLOGNO(01235) "mod_asis: failed to find end-of-headers position " "for %s", r->filename); apr_file_close(f); @@ -99,7 +99,7 @@ static int asis_handler(request_rec *r) APR_BRIGADE_INSERT_TAIL(bb, b); rv = ap_pass_brigade(r->output_filters, bb); if (rv != APR_SUCCESS) { - ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r, + ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r, APLOGNO(01236) "mod_asis: ap_pass_brigade failed for file %s", r->filename); return HTTP_INTERNAL_SERVER_ERROR; } diff --git a/modules/generators/mod_autoindex.c b/modules/generators/mod_autoindex.c index b688867363..bf8005ed54 100644 --- a/modules/generators/mod_autoindex.c +++ b/modules/generators/mod_autoindex.c @@ -2023,7 +2023,7 @@ static int index_directory(request_rec *r, char *charset; if ((status = apr_dir_open(&thedir, name, r->pool)) != APR_SUCCESS) { - ap_log_rerror(APLOG_MARK, APLOG_ERR, status, r, + ap_log_rerror(APLOG_MARK, APLOG_ERR, status, r, APLOGNO(01275) "Can't open directory for index: %s", r->filename); return HTTP_FORBIDDEN; } @@ -2310,7 +2310,7 @@ static int handle_autoindex(request_rec *r) else { const char *index_names = apr_table_get(r->notes, "dir-index-names"); - ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, + ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01276) "Cannot serve directory %s: No matching DirectoryIndex (%s) found, and " "server-generated directory index forbidden by " "Options directive", diff --git a/modules/generators/mod_cgi.c b/modules/generators/mod_cgi.c index db45295f20..385bb36495 100644 --- a/modules/generators/mod_cgi.c +++ b/modules/generators/mod_cgi.c @@ -210,7 +210,7 @@ static apr_status_t log_script_err(request_rec *r, apr_file_t *script_err) if (newline) { *newline = '\0'; } - ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, + ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01215) "%s", argsbuffer); } @@ -449,7 +449,7 @@ static apr_status_t run_cgi_child(apr_file_t **script_out, e_info->addrspace)) != APR_SUCCESS) || ((rc = apr_procattr_child_errfn_set(procattr, cgi_child_errfn)) != APR_SUCCESS)) { /* Something bad happened, tell the world. */ - ap_log_rerror(APLOG_MARK, APLOG_ERR, rc, r, + ap_log_rerror(APLOG_MARK, APLOG_ERR, rc, r, APLOGNO(01216) "couldn't set child process attributes: %s", r->filename); } else { @@ -587,7 +587,7 @@ static apr_bucket *cgi_bucket_create(request_rec *r, /* Create the pollset */ rv = apr_pollset_create(&data->pollset, 2, r->pool, 0); if (rv != APR_SUCCESS) { - ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r, + ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r, APLOGNO(01217) "apr_pollset_create(); check system or user limits"); return NULL; } @@ -599,7 +599,7 @@ static apr_bucket *cgi_bucket_create(request_rec *r, fd.client_data = (void *)1; rv = apr_pollset_add(data->pollset, &fd); if (rv != APR_SUCCESS) { - ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r, + ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r, APLOGNO(01218) "apr_pollset_add(); check system or user limits"); return NULL; } @@ -608,7 +608,7 @@ static apr_bucket *cgi_bucket_create(request_rec *r, fd.client_data = (void *)2; rv = apr_pollset_add(data->pollset, &fd); if (rv != APR_SUCCESS) { - ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r, + ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r, APLOGNO(01219) "apr_pollset_add(); check system or user limits"); return NULL; } @@ -690,7 +690,7 @@ static apr_status_t cgi_bucket_read(apr_bucket *b, const char **str, rv = apr_pollset_poll(data->pollset, timeout, &num, &results); if (APR_STATUS_IS_TIMEUP(rv)) { if (timeout) { - ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, data->r, + ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, data->r, APLOGNO(01220) "Timeout waiting for output from CGI script %s", data->r->filename); return rv; @@ -703,7 +703,7 @@ static apr_status_t cgi_bucket_read(apr_bucket *b, const char **str, continue; } else if (rv != APR_SUCCESS) { - ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, data->r, + ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, data->r, APLOGNO(01221) "poll failed waiting for CGI child"); return rv; } @@ -820,7 +820,7 @@ static int cgi_handler(request_rec *r) /* build the command line */ if ((rv = cgi_build_command(&command, &argv, r, p, &e_info)) != APR_SUCCESS) { - ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r, + ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r, APLOGNO(01222) "don't know how to spawn child process: %s", r->filename); return HTTP_INTERNAL_SERVER_ERROR; @@ -829,7 +829,7 @@ static int cgi_handler(request_rec *r) /* run the script in its own process */ if ((rv = run_cgi_child(&script_out, &script_in, &script_err, command, argv, r, p, &e_info)) != APR_SUCCESS) { - ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r, + ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r, APLOGNO(01223) "couldn't spawn child process: %s", r->filename); return HTTP_INTERNAL_SERVER_ERROR; } @@ -852,11 +852,11 @@ static int cgi_handler(request_rec *r) if (rv != APR_SUCCESS) { if (APR_STATUS_IS_TIMEUP(rv)) { - ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r, + ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r, APLOGNO(01224) "Timeout during reading request entity data"); return HTTP_REQUEST_TIME_OUT; } - ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r, + ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r, APLOGNO(01225) "Error reading request entity data"); return HTTP_INTERNAL_SERVER_ERROR; } @@ -1130,7 +1130,7 @@ static apr_status_t include_cmd(include_ctx_t *ctx, ap_filter_t *f, if ((rv = cgi_build_command(&command, &argv, r, r->pool, &e_info)) != APR_SUCCESS) { - ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r, + ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r, APLOGNO(01226) "don't know how to spawn cmd child process: %s", r->filename); return rv; @@ -1140,7 +1140,7 @@ static apr_status_t include_cmd(include_ctx_t *ctx, ap_filter_t *f, if ((rv = run_cgi_child(&script_out, &script_in, &script_err, command, argv, r, r->pool, &e_info)) != APR_SUCCESS) { - ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r, + ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r, APLOGNO(01227) "couldn't spawn child process: %s", r->filename); return rv; } @@ -1183,7 +1183,7 @@ static apr_status_t handle_exec(include_ctx_t *ctx, ap_filter_t *f, } if (ctx->flags & SSI_FLAG_NO_EXEC) { - ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, "exec used but not allowed " + ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01228) "exec used but not allowed " "in %s", r->filename); SSI_CREATE_ERROR_BUCKET(ctx, f, bb); return APR_SUCCESS; @@ -1203,7 +1203,7 @@ static apr_status_t handle_exec(include_ctx_t *ctx, ap_filter_t *f, rv = include_cmd(ctx, f, bb, parsed_string); if (rv != APR_SUCCESS) { - ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, "execution failure " + ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01229) "execution failure " "for parameter \"%s\" to tag exec in file %s", tag, r->filename); SSI_CREATE_ERROR_BUCKET(ctx, f, bb); @@ -1218,14 +1218,14 @@ static apr_status_t handle_exec(include_ctx_t *ctx, ap_filter_t *f, rv = include_cgi(ctx, f, bb, parsed_string); if (rv != APR_SUCCESS) { - ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, "invalid CGI ref " + ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01230) "invalid CGI ref " "\"%s\" in %s", tag_val, file); SSI_CREATE_ERROR_BUCKET(ctx, f, bb); break; } } else { - ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, "unknown parameter " + ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01231) "unknown parameter " "\"%s\" to tag exec in %s", tag, file); SSI_CREATE_ERROR_BUCKET(ctx, f, bb); break; diff --git a/modules/generators/mod_cgid.c b/modules/generators/mod_cgid.c index 83e6dc1edb..1e4aaf67af 100644 --- a/modules/generators/mod_cgid.c +++ b/modules/generators/mod_cgid.c @@ -290,11 +290,11 @@ static void cgid_maint(int reason, void *data, apr_wait_t status) } if (!stopping) { if (status == DAEMON_STARTUP_ERROR) { - ap_log_error(APLOG_MARK, APLOG_CRIT, 0, ap_server_conf, + ap_log_error(APLOG_MARK, APLOG_CRIT, 0, ap_server_conf, APLOGNO(01238) "cgid daemon failed to initialize"); } else { - ap_log_error(APLOG_MARK, APLOG_ERR, 0, ap_server_conf, + ap_log_error(APLOG_MARK, APLOG_ERR, 0, ap_server_conf, APLOGNO(01239) "cgid daemon process died, restarting"); cgid_start(root_pool, root_server, proc); } @@ -319,7 +319,7 @@ static void cgid_maint(int reason, void *data, apr_wait_t status) * guarantee the same permissions as when the socket was created. */ if (unlink(sockname) < 0 && errno != ENOENT) { - ap_log_error(APLOG_MARK, APLOG_ERR, errno, ap_server_conf, + ap_log_error(APLOG_MARK, APLOG_ERR, errno, ap_server_conf, APLOGNO(01240) "Couldn't unlink unix domain socket %s", sockname); } @@ -588,7 +588,7 @@ static void cgid_child_errfn(apr_pool_t *pool, apr_status_t err, * have r->headers_in and possibly other storage referenced by * ap_log_rerror() */ - ap_log_error(APLOG_MARK, APLOG_ERR, err, r->server, "%s", description); + ap_log_error(APLOG_MARK, APLOG_ERR, err, r->server, APLOGNO(01241) "%s", description); } static int cgid_server(void *data) @@ -614,7 +614,7 @@ static int cgid_server(void *data) apr_hook_sort_all(); if ((sd = socket(AF_UNIX, SOCK_STREAM, 0)) < 0) { - ap_log_error(APLOG_MARK, APLOG_ERR, errno, main_server, + ap_log_error(APLOG_MARK, APLOG_ERR, errno, main_server, APLOGNO(01242) "Couldn't create unix domain socket"); return errno; } @@ -623,7 +623,7 @@ static int cgid_server(void *data) rc = bind(sd, (struct sockaddr *)server_addr, server_addr_len); umask(omask); /* can't fail, so can't clobber errno */ if (rc < 0) { - ap_log_error(APLOG_MARK, APLOG_ERR, errno, main_server, + ap_log_error(APLOG_MARK, APLOG_ERR, errno, main_server, APLOGNO(01243) "Couldn't bind unix domain socket %s", sockname); return errno; @@ -632,21 +632,21 @@ static int cgid_server(void *data) /* Not all flavors of unix use the current umask for AF_UNIX perms */ rv = apr_file_perms_set(sockname, APR_FPROT_UREAD|APR_FPROT_UWRITE|APR_FPROT_UEXECUTE); if (rv != APR_SUCCESS) { - ap_log_error(APLOG_MARK, APLOG_CRIT, rv, main_server, + ap_log_error(APLOG_MARK, APLOG_CRIT, rv, main_server, APLOGNO(01244) "Couldn't set permissions on unix domain socket %s", sockname); return rv; } if (listen(sd, DEFAULT_CGID_LISTENBACKLOG) < 0) { - ap_log_error(APLOG_MARK, APLOG_ERR, errno, main_server, + ap_log_error(APLOG_MARK, APLOG_ERR, errno, main_server, APLOGNO(01245) "Couldn't listen on unix domain socket"); return errno; } if (!geteuid()) { if (chown(sockname, ap_unixd_config.user_id, -1) < 0) { - ap_log_error(APLOG_MARK, APLOG_ERR, errno, main_server, + ap_log_error(APLOG_MARK, APLOG_ERR, errno, main_server, APLOGNO(01246) "Couldn't change owner of unix domain socket %s", sockname); return errno; @@ -693,7 +693,7 @@ static int cgid_server(void *data) #endif if (errno != EINTR) { ap_log_error(APLOG_MARK, APLOG_ERR, errno, - (server_rec *)data, + (server_rec *)data, APLOGNO(01247) "Error accepting on cgid socket"); } continue; @@ -705,14 +705,14 @@ static int cgid_server(void *data) stat = get_req(sd2, r, &argv0, &env, &cgid_req); if (stat != APR_SUCCESS) { ap_log_error(APLOG_MARK, APLOG_ERR, stat, - main_server, + main_server, APLOGNO(01248) "Error reading request on cgid socket"); close(sd2); continue; } if (cgid_req.ppid != parent_pid) { - ap_log_error(APLOG_MARK, APLOG_CRIT, 0, main_server, + ap_log_error(APLOG_MARK, APLOG_CRIT, 0, main_server, APLOGNO(01249) "CGI request received from wrong server instance; " "see ScriptSock directive"); close(sd2); @@ -727,7 +727,7 @@ static int cgid_server(void *data) rv = sock_write(sd2, &pid, sizeof(pid)); if (rv != APR_SUCCESS) { ap_log_error(APLOG_MARK, APLOG_ERR, rv, - main_server, + main_server, APLOGNO(01250) "Error writing pid %" APR_PID_T_FMT " to handler", pid); } close(sd2); @@ -786,7 +786,7 @@ static int cgid_server(void *data) * ap_log_rerror() won't work because the header table used by * ap_log_rerror() hasn't been replicated in the phony r */ - ap_log_error(APLOG_MARK, APLOG_ERR, rc, r->server, + ap_log_error(APLOG_MARK, APLOG_ERR, rc, r->server, APLOGNO(01251) "couldn't set child process attributes: %s", r->filename); procnew->pid = 0; /* no process to clean up */ @@ -824,7 +824,7 @@ static int cgid_server(void *data) * ap_log_rerror() won't work because the header table used by * ap_log_rerror() hasn't been replicated in the phony r */ - ap_log_error(APLOG_MARK, APLOG_ERR, rc, r->server, + ap_log_error(APLOG_MARK, APLOG_ERR, rc, r->server, APLOGNO(01252) "couldn't create child process: %d: %s", rc, apr_filepath_name_get(r->filename)); @@ -865,7 +865,7 @@ static int cgid_start(apr_pool_t *p, server_rec *main_server, daemon_should_exit = 0; /* clear setting from previous generation */ if ((daemon_pid = fork()) < 0) { - ap_log_error(APLOG_MARK, APLOG_ERR, errno, main_server, + ap_log_error(APLOG_MARK, APLOG_ERR, errno, main_server, APLOGNO(01253) "mod_cgid: Couldn't spawn cgid daemon process"); return DECLINED; } @@ -925,7 +925,7 @@ static int cgid_init(apr_pool_t *p, apr_pool_t *plog, apr_pool_t *ptemp, tmp_sockname = ap_server_root_relative(p, sockname); if (strlen(tmp_sockname) > sizeof(server_addr->sun_path) - 1) { tmp_sockname[sizeof(server_addr->sun_path)] = '\0'; - ap_log_error(APLOG_MARK, APLOG_ERR, 0, main_server, + ap_log_error(APLOG_MARK, APLOG_ERR, 0, main_server, APLOGNO(01254) "The length of the ScriptSock path exceeds maximum, " "truncating to %s", tmp_sockname); } @@ -1191,11 +1191,11 @@ static int connect_to_daemon(int *sdptr, request_rec *r, ++connect_tries; if ((sd = socket(AF_UNIX, SOCK_STREAM, 0)) < 0) { return log_scripterror(r, conf, HTTP_INTERNAL_SERVER_ERROR, errno, - "unable to create socket to cgi daemon"); + APLOGNO(01255) "unable to create socket to cgi daemon"); } if (connect(sd, (struct sockaddr *)server_addr, server_addr_len) < 0) { if (errno == ECONNREFUSED && connect_tries < DEFAULT_CONNECT_ATTEMPTS) { - ap_log_rerror(APLOG_MARK, APLOG_DEBUG, errno, r, + ap_log_rerror(APLOG_MARK, APLOG_DEBUG, errno, r, APLOGNO(01256) "connect #%d to cgi daemon failed, sleeping before retry", connect_tries); close(sd); @@ -1206,7 +1206,7 @@ static int connect_to_daemon(int *sdptr, request_rec *r, } else { close(sd); - return log_scripterror(r, conf, HTTP_SERVICE_UNAVAILABLE, errno, + return log_scripterror(r, conf, HTTP_SERVICE_UNAVAILABLE, errno, APLOGNO(01257) "unable to connect to cgi daemon after multiple tries"); } } @@ -1217,7 +1217,7 @@ static int connect_to_daemon(int *sdptr, request_rec *r, } /* gotta try again, but make sure the cgid daemon is still around */ if (kill(daemon_pid, 0) != 0) { - return log_scripterror(r, conf, HTTP_SERVICE_UNAVAILABLE, errno, + return log_scripterror(r, conf, HTTP_SERVICE_UNAVAILABLE, errno, APLOGNO(01258) "cgid daemon is gone; is Apache terminating?"); } } @@ -1291,14 +1291,14 @@ static apr_status_t cleanup_nonchild_process(request_rec *r, pid_t pid) if (dead_yet(pid, apr_time_from_sec(3)) == APR_SUCCESS) { return APR_SUCCESS; } - ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, + ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01259) "CGI process %" APR_PID_T_FMT " didn't exit, sending SIGKILL", pid); kill(pid, SIGKILL); if (dead_yet(pid, apr_time_from_sec(3)) == APR_SUCCESS) { return APR_SUCCESS; } - ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, + ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01260) "CGI process %" APR_PID_T_FMT " didn't exit, sending SIGKILL again", pid); kill(pid, SIGKILL); @@ -1338,7 +1338,7 @@ static apr_status_t cleanup_script(void *vptr) } if (pid == 0) { - ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, info->r, + ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, info->r, APLOGNO(01261) "daemon couldn't find CGI process for connection %lu", info->conn_id); return APR_EGENERAL; @@ -1380,12 +1380,12 @@ static int cgid_handler(request_rec *r) argv0 = r->filename; if (!(ap_allow_options(r) & OPT_EXECCGI) && !is_scriptaliased(r)) { - return log_scripterror(r, conf, HTTP_FORBIDDEN, 0, + return log_scripterror(r, conf, HTTP_FORBIDDEN, 0, APLOGNO(01262) "Options ExecCGI is off in this directory"); } if (nph && is_included) { - return log_scripterror(r, conf, HTTP_FORBIDDEN, 0, + return log_scripterror(r, conf, HTTP_FORBIDDEN, 0, APLOGNO(01263) "attempt to include NPH CGI script"); } @@ -1394,12 +1394,12 @@ static int cgid_handler(request_rec *r) #error at mod_cgi.c for required code in this path. #else if (r->finfo.filetype == APR_NOFILE) { - return log_scripterror(r, conf, HTTP_NOT_FOUND, 0, + return log_scripterror(r, conf, HTTP_NOT_FOUND, 0, APLOGNO(01264) "script not found or unable to stat"); } #endif if (r->finfo.filetype == APR_DIR) { - return log_scripterror(r, conf, HTTP_FORBIDDEN, 0, + return log_scripterror(r, conf, HTTP_FORBIDDEN, 0, APLOGNO(01265) "attempt to invoke directory as script"); } @@ -1407,13 +1407,13 @@ static int cgid_handler(request_rec *r) r->path_info && *r->path_info) { /* default to accept */ - return log_scripterror(r, conf, HTTP_NOT_FOUND, 0, + return log_scripterror(r, conf, HTTP_NOT_FOUND, 0, APLOGNO(01266) "AcceptPathInfo off disallows user's path"); } /* if (!ap_suexec_enabled) { if (!ap_can_exec(&r->finfo)) - return log_scripterror(r, conf, HTTP_FORBIDDEN, 0, + return log_scripterror(r, conf, HTTP_FORBIDDEN, 0, APLOGNO(01267) "file permissions deny server execution"); } */ @@ -1427,7 +1427,7 @@ static int cgid_handler(request_rec *r) rv = send_req(sd, r, argv0, env, CGI_REQ); if (rv != APR_SUCCESS) { - ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r, + ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r, APLOGNO(01268) "write to cgi daemon process"); } @@ -1466,11 +1466,11 @@ static int cgid_handler(request_rec *r) if (rv != APR_SUCCESS) { if (APR_STATUS_IS_TIMEUP(rv)) { - ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r, + ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r, APLOGNO(01269) "Timeout during reading request entity data"); return HTTP_REQUEST_TIME_OUT; } - ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r, + ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r, APLOGNO(01270) "Error reading request entity data"); return HTTP_INTERNAL_SERVER_ERROR; } @@ -1810,7 +1810,7 @@ static apr_status_t handle_exec(include_ctx_t *ctx, ap_filter_t *f, } if (ctx->flags & SSI_FLAG_NO_EXEC) { - ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, "exec used but not allowed " + ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01271) "exec used but not allowed " "in %s", r->filename); SSI_CREATE_ERROR_BUCKET(ctx, f, bb); return APR_SUCCESS; @@ -1830,7 +1830,7 @@ static apr_status_t handle_exec(include_ctx_t *ctx, ap_filter_t *f, rv = include_cmd(ctx, f, bb, parsed_string); if (rv != APR_SUCCESS) { - ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, + ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01272) "execution failure for parameter \"%s\" " "to tag exec in file %s", tag, r->filename); SSI_CREATE_ERROR_BUCKET(ctx, f, bb); @@ -1845,14 +1845,14 @@ static apr_status_t handle_exec(include_ctx_t *ctx, ap_filter_t *f, rv = include_cgi(ctx, f, bb, parsed_string); if (rv != APR_SUCCESS) { - ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, "invalid CGI ref " + ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01273) "invalid CGI ref " "\"%s\" in %s", tag_val, file); SSI_CREATE_ERROR_BUCKET(ctx, f, bb); break; } } else { - ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, "unknown parameter " + ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01274) "unknown parameter " "\"%s\" to tag exec in %s", tag, file); SSI_CREATE_ERROR_BUCKET(ctx, f, bb); break; diff --git a/modules/generators/mod_status.c b/modules/generators/mod_status.c index 47f5988774..ced19edbb9 100644 --- a/modules/generators/mod_status.c +++ b/modules/generators/mod_status.c @@ -245,7 +245,7 @@ static int status_handler(request_rec *r) tu = ts = tcu = tcs = 0; if (!ap_exists_scoreboard_image()) { - ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, + ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01237) "Server status unavailable in inetd mode"); return HTTP_INTERNAL_SERVER_ERROR; } diff --git a/modules/generators/mod_suexec.c b/modules/generators/mod_suexec.c index 9a7d2cfe4f..75e96404c0 100644 --- a/modules/generators/mod_suexec.c +++ b/modules/generators/mod_suexec.c @@ -97,7 +97,7 @@ static int suexec_post_config(apr_pool_t *p, apr_pool_t *plog, s->process->pool); if ((reported == NULL) && ap_unixd_config.suexec_enabled) { - ap_log_error(APLOG_MARK, APLOG_NOTICE, 0, s, + ap_log_error(APLOG_MARK, APLOG_NOTICE, 0, s, APLOGNO(01232) "suEXEC mechanism enabled (wrapper: %s)", SUEXEC_BIN); apr_pool_userdata_set((void *)1, SUEXEC_POST_CONFIG_USERDATA, |