From: Jim Jagielski Date: Fri, 5 Sep 2014 14:20:27 +0000 (+0000) Subject: Merge r1611978, r1612068 from trunk: X-Git-Tag: 2.4.11~300 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1f3956473eafcd499ab02d75d2bb3a3ba2494319;p=thirdparty%2Fapache%2Fhttpd.git Merge r1611978, r1612068 from trunk: Add missing APLOGNO. Refactor to keep APLOGNO on the same line as ap_log_error, when applicable. Add missing APLOGNO. Refactor some lines to keep APLOGNO on the same line as ap_log_error, when applicable. Split lines longer than 80. Improve alignment. Submitted by: jailletc36 Reviewed/backported by: jim git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1622706 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/modules/aaa/mod_auth_basic.c b/modules/aaa/mod_auth_basic.c index 75044d48311..ee4f1854077 100644 --- a/modules/aaa/mod_auth_basic.c +++ b/modules/aaa/mod_auth_basic.c @@ -315,8 +315,8 @@ static int authenticate_basic_user(request_rec *r) /* We need an authentication realm. */ if (!ap_auth_name(r)) { - ap_log_rerror(APLOG_MARK, APLOG_ERR, - 0, r, APLOGNO(01615) "need AuthName: %s", r->uri); + ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01615) + "need AuthName: %s", r->uri); return HTTP_INTERNAL_SERVER_ERROR; } diff --git a/modules/aaa/mod_auth_form.c b/modules/aaa/mod_auth_form.c index cfb4a7f2ffc..263c8e63d8a 100644 --- a/modules/aaa/mod_auth_form.c +++ b/modules/aaa/mod_auth_form.c @@ -903,16 +903,16 @@ static int authenticate_form_authn(request_rec * r) * never be secure. Abort the auth attempt in this case. */ if (PROXYREQ_PROXY == r->proxyreq) { - ap_log_rerror(APLOG_MARK, APLOG_ERR, - 0, r, APLOGNO(01809) "form auth cannot be used for proxy " + ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01809) + "form auth cannot be used for proxy " "requests due to XSS risk, access denied: %s", r->uri); return HTTP_INTERNAL_SERVER_ERROR; } /* We need an authentication realm. */ if (!ap_auth_name(r)) { - ap_log_rerror(APLOG_MARK, APLOG_ERR, - 0, r, APLOGNO(01810) "need AuthName: %s", r->uri); + ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01810) + "need AuthName: %s", r->uri); return HTTP_INTERNAL_SERVER_ERROR; } diff --git a/modules/arch/win32/mod_isapi.c b/modules/arch/win32/mod_isapi.c index 801c7deabe6..ce0875a5001 100644 --- a/modules/arch/win32/mod_isapi.c +++ b/modules/arch/win32/mod_isapi.c @@ -955,7 +955,7 @@ static int APR_THREAD_FUNC regfnServerSupportFunction(isapi_cid *cid, return 1; } else if (cid->dconf.log_unsupported) { - ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r, + ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r, APLOGNO(02671) "ServerSupportFunction " "HSE_REQ_DONE_WITH_SESSION is not supported: %s", r->filename); @@ -1000,7 +1000,7 @@ static int APR_THREAD_FUNC regfnServerSupportFunction(isapi_cid *cid, case HSE_REQ_GET_SSPI_INFO: if (cid->dconf.log_unsupported) - ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r, + ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r, APLOGNO(02672) "ServerSupportFunction HSE_REQ_GET_SSPI_INFO " "is not supported: %s", r->filename); apr_set_os_error(APR_FROM_OS_ERROR(ERROR_INVALID_PARAMETER)); @@ -1035,7 +1035,7 @@ static int APR_THREAD_FUNC regfnServerSupportFunction(isapi_cid *cid, return 1; } if (cid->dconf.log_unsupported) - ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r, + ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r, APLOGNO(02673) "ServerSupportFunction HSE_REQ_IO_COMPLETION " "is not supported: %s", r->filename); apr_set_os_error(APR_FROM_OS_ERROR(ERROR_INVALID_PARAMETER)); @@ -1055,7 +1055,7 @@ static int APR_THREAD_FUNC regfnServerSupportFunction(isapi_cid *cid, if (!cid->dconf.fake_async && (tf->dwFlags & HSE_IO_ASYNC)) { if (cid->dconf.log_unsupported) - ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r, + ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r, APLOGNO(02674) "ServerSupportFunction HSE_REQ_TRANSMIT_FILE " "as HSE_IO_ASYNC is not supported: %s", r->filename); apr_set_os_error(APR_FROM_OS_ERROR(ERROR_INVALID_PARAMETER)); @@ -1170,7 +1170,7 @@ static int APR_THREAD_FUNC regfnServerSupportFunction(isapi_cid *cid, case HSE_REQ_REFRESH_ISAPI_ACL: if (cid->dconf.log_unsupported) - ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r, + ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r, APLOGNO(02675) "ServerSupportFunction " "HSE_REQ_REFRESH_ISAPI_ACL " "is not supported: %s", r->filename); @@ -1227,7 +1227,7 @@ static int APR_THREAD_FUNC regfnServerSupportFunction(isapi_cid *cid, case HSE_REQ_GET_IMPERSONATION_TOKEN: /* Added in ISAPI 4.0 */ if (cid->dconf.log_unsupported) - ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r, + ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r, APLOGNO(02676) "ServerSupportFunction " "HSE_REQ_GET_IMPERSONATION_TOKEN " "is not supported: %s", r->filename); @@ -1306,7 +1306,7 @@ static int APR_THREAD_FUNC regfnServerSupportFunction(isapi_cid *cid, case HSE_REQ_ABORTIVE_CLOSE: if (cid->dconf.log_unsupported) - ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r, + ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r, APLOGNO(02677) "ServerSupportFunction HSE_REQ_ABORTIVE_CLOSE" " is not supported: %s", r->filename); apr_set_os_error(APR_FROM_OS_ERROR(ERROR_INVALID_PARAMETER)); @@ -1314,7 +1314,7 @@ static int APR_THREAD_FUNC regfnServerSupportFunction(isapi_cid *cid, case HSE_REQ_GET_CERT_INFO_EX: /* Added in ISAPI 4.0 */ if (cid->dconf.log_unsupported) - ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r, + ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r, APLOGNO(02678) "ServerSupportFunction " "HSE_REQ_GET_CERT_INFO_EX " "is not supported: %s", r->filename); @@ -1363,7 +1363,7 @@ static int APR_THREAD_FUNC regfnServerSupportFunction(isapi_cid *cid, case HSE_REQ_CLOSE_CONNECTION: /* Added after ISAPI 4.0 */ if (cid->dconf.log_unsupported) - ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r, + ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r, APLOGNO(02679) "ServerSupportFunction " "HSE_REQ_CLOSE_CONNECTION " "is not supported: %s", r->filename); @@ -1381,7 +1381,7 @@ static int APR_THREAD_FUNC regfnServerSupportFunction(isapi_cid *cid, /* Undocumented - defined by the Microsoft Jan '00 Platform SDK */ if (cid->dconf.log_unsupported) - ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r, + ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r, APLOGNO(02680) "ServerSupportFunction " "HSE_REQ_EXTENSION_TRIGGER " "is not supported: %s", r->filename); @@ -1390,7 +1390,7 @@ static int APR_THREAD_FUNC regfnServerSupportFunction(isapi_cid *cid, default: if (cid->dconf.log_unsupported) - ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r, + ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r, APLOGNO(02681) "ServerSupportFunction (%d) not supported: " "%s", HSE_code, r->filename); apr_set_os_error(APR_FROM_OS_ERROR(ERROR_INVALID_PARAMETER)); @@ -1702,7 +1702,7 @@ static int isapi_pre_config(apr_pool_t *pconf, apr_pool_t *plog, apr_pool_t *pte rv = apr_thread_mutex_create(&loaded.lock, APR_THREAD_MUTEX_DEFAULT, loaded.pool); if (rv != APR_SUCCESS) { - ap_log_error(APLOG_MARK, APLOG_ERR, rv, NULL, + ap_log_error(APLOG_MARK, APLOG_ERR, rv, NULL, APLOGNO(02682) "Failed to create module cache lock"); return rv; } diff --git a/modules/cache/cache_util.c b/modules/cache/cache_util.c index bf450931927..6368af09681 100644 --- a/modules/cache/cache_util.c +++ b/modules/cache/cache_util.c @@ -443,7 +443,7 @@ int ap_cache_check_no_cache(cache_request_rec *cache, request_rec *r) return 0; } else { - ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r, + ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r, APLOGNO(02657) "Incoming request is asking for an uncached version of " "%s, but we have been configured to ignore it and serve " "cached content anyway", r->unparsed_uri); @@ -483,7 +483,7 @@ int ap_cache_check_no_store(cache_request_rec *cache, request_rec *r) return 0; } else { - ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r, + ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r, APLOGNO(02658) "Incoming request is asking for a no-store version of " "%s, but we have been configured to ignore it and serve " "cached content anyway", r->unparsed_uri); diff --git a/modules/core/mod_so.c b/modules/core/mod_so.c index 6df596a9009..eeacec6741c 100644 --- a/modules/core/mod_so.c +++ b/modules/core/mod_so.c @@ -209,8 +209,8 @@ static const char *load_module(cmd_parms *cmd, void *dummy, for (i = 0; i < sconf->loaded_modules->nelts; i++) { modi = &modie[i]; if (modi->name != NULL && strcmp(modi->name, modname) == 0) { - ap_log_perror(APLOG_MARK, APLOG_WARNING, 0, - cmd->pool, APLOGNO(01574) "module %s is already loaded, skipping", + ap_log_perror(APLOG_MARK, APLOG_WARNING, 0, cmd->pool, APLOGNO(01574) + "module %s is already loaded, skipping", modname); return NULL; } diff --git a/modules/database/mod_dbd.c b/modules/database/mod_dbd.c index 5ff1ea20527..72126652e20 100644 --- a/modules/database/mod_dbd.c +++ b/modules/database/mod_dbd.c @@ -327,7 +327,7 @@ DBD_DECLARE_NONSTD(void) ap_dbd_prepare(server_rec *s, const char *query, if (apr_hash_get(svr->cfg->queries, label, APR_HASH_KEY_STRING) && strcmp(query, "")) { - ap_log_error(APLOG_MARK, APLOG_WARNING, 0, s, + ap_log_error(APLOG_MARK, APLOG_WARNING, 0, s, APLOGNO(02653) "conflicting SQL statements with label %s", label); } @@ -799,7 +799,8 @@ DBD_DECLARE_NONSTD(ap_dbd_t*) ap_dbd_open(apr_pool_t *pool, server_rec *s) /* If nothing is configured, we shouldn't be here */ if (cfg->name == no_dbdriver) { - ap_log_error(APLOG_MARK, APLOG_ERR, 0, s, "not configured"); + ap_log_error(APLOG_MARK, APLOG_ERR, 0, s, APLOGNO(02654) + "not configured"); return NULL; } @@ -822,7 +823,7 @@ DBD_DECLARE_NONSTD(ap_dbd_t*) ap_dbd_open(apr_pool_t *pool, server_rec *s) rv = apr_reslist_acquire(group->reslist, (void*) &rec); if (rv != APR_SUCCESS) { - ap_log_error(APLOG_MARK, APLOG_ERR, rv, s, + ap_log_error(APLOG_MARK, APLOG_ERR, rv, s, APLOGNO(02655) "Failed to acquire DBD connection from pool!"); return NULL; } diff --git a/modules/filters/mod_include.c b/modules/filters/mod_include.c index af90db67284..497c582250b 100644 --- a/modules/filters/mod_include.c +++ b/modules/filters/mod_include.c @@ -968,8 +968,8 @@ static APR_INLINE int re_check(include_ctx_t *ctx, const char *string, compiled = ap_pregcomp(ctx->dpool, rexp, AP_REG_EXTENDED); if (!compiled) { - ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, ctx->r, "unable to " - "compile pattern \"%s\"", rexp); + ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, ctx->r, APLOGNO(02667) + "unable to compile pattern \"%s\"", rexp); return -1; } @@ -1698,7 +1698,7 @@ static int find_file(request_rec *r, const char *directive, const char *tag, APR_FILEPATH_NOTABSOLUTE, r->pool); if (rv != APR_SUCCESS) { - error_fmt = "unable to access file \"%s\" " + error_fmt = APLOGNO(02668) "unable to access file \"%s\" " "in parsed file %s"; } else { @@ -1711,13 +1711,13 @@ static int find_file(request_rec *r, const char *directive, const char *tag, if ((rv = apr_stat(finfo, to_send, APR_FINFO_GPROT | APR_FINFO_MIN, rr->pool)) != APR_SUCCESS && rv != APR_INCOMPLETE) { - error_fmt = "unable to get information about \"%s\" " - "in parsed file %s"; + error_fmt = APLOGNO(02669) "unable to get information " + "about \"%s\" in parsed file %s"; } } else { - error_fmt = "unable to lookup information about \"%s\" " - "in parsed file %s"; + error_fmt = APLOGNO(02670) "unable to lookup information " + "about \"%s\" in parsed file %s"; } } diff --git a/modules/lua/lua_apr.c b/modules/lua/lua_apr.c index 94761ba4b22..fd3ba20e7a7 100644 --- a/modules/lua/lua_apr.c +++ b/modules/lua/lua_apr.c @@ -52,8 +52,8 @@ static int lua_table_set(lua_State *L) while ( (badchar = ap_strchr(badchar, '\n')) ) { *badchar = ' '; } - ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, t->r, - APLOGNO(02614) "mod_lua: Value for '%s' in table '%s' contains newline!", + ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, t->r, APLOGNO(02614) + "mod_lua: Value for '%s' in table '%s' contains newline!", key, t->n); apr_table_set(t->t, key, replacement); } diff --git a/modules/lua/lua_request.c b/modules/lua/lua_request.c index 136e998d9de..6dc6b9f5396 100644 --- a/modules/lua/lua_request.c +++ b/modules/lua/lua_request.c @@ -2171,13 +2171,13 @@ static int lua_websocket_greet(lua_State *L) r->read_chunked = 0; ap_rflush(r); ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, - "Websocket: Upgraded from HTTP to Websocket"); + "Websocket: Upgraded from HTTP to Websocket"); lua_pushboolean(L, 1); return 1; } } - ap_log_rerror(APLOG_MARK, APLOG_NOTICE, 0, r, - "Websocket: Upgrade from HTTP to Websocket failed"); + ap_log_rerror(APLOG_MARK, APLOG_NOTICE, 0, r, APLOGNO(02666) + "Websocket: Upgrade from HTTP to Websocket failed"); return 0; } diff --git a/modules/lua/mod_lua.c b/modules/lua/mod_lua.c index 90f34cda3e8..b2dca7548de 100644 --- a/modules/lua/mod_lua.c +++ b/modules/lua/mod_lua.c @@ -500,9 +500,9 @@ static apr_status_t lua_output_filter_handle(ap_filter_t *f, apr_bucket_brigade ap_remove_output_filter(f); apr_brigade_cleanup(pbbIn); apr_brigade_cleanup(ctx->tmpBucket); - ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, - "lua: Error while executing filter: %s", - lua_tostring(L, -1)); + ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(02663) + "lua: Error while executing filter: %s", + lua_tostring(L, -1)); return HTTP_INTERNAL_SERVER_ERROR; } } @@ -2003,7 +2003,7 @@ static int lua_post_config(apr_pool_t *pconf, apr_pool_t *plog, /* Create shared memory space */ rs = apr_temp_dir_get(&tempdir, pconf); if (rs != APR_SUCCESS) { - ap_log_error(APLOG_MARK, APLOG_ERR, rs, s, + ap_log_error(APLOG_MARK, APLOG_ERR, rs, s, APLOGNO(02664) "mod_lua IVM: Failed to find temporary directory"); return HTTP_INTERNAL_SERVER_ERROR; } @@ -2012,7 +2012,7 @@ static int lua_post_config(apr_pool_t *pconf, apr_pool_t *plog, rs = apr_shm_create(&lua_ivm_shm, sizeof(apr_pool_t**), (const char *) lua_ivm_shmfile, pconf); if (rs != APR_SUCCESS) { - ap_log_error(APLOG_MARK, APLOG_ERR, rs, s, + ap_log_error(APLOG_MARK, APLOG_ERR, rs, s, APLOGNO(02665) "mod_lua: Failed to create shared memory segment on file %s", lua_ivm_shmfile); return HTTP_INTERNAL_SERVER_ERROR; diff --git a/modules/proxy/mod_proxy_fcgi.c b/modules/proxy/mod_proxy_fcgi.c index 9d4eb90b5f0..4c9bfb84dcc 100644 --- a/modules/proxy/mod_proxy_fcgi.c +++ b/modules/proxy/mod_proxy_fcgi.c @@ -685,8 +685,8 @@ recv_again: if (plen) { rv = get_data_full(conn, iobuf, plen); if (rv != APR_SUCCESS) { - ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r, - APLOGNO(02537) "Error occurred reading padding"); + ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r, APLOGNO(02537) + "Error occurred reading padding"); break; } } diff --git a/modules/ssl/ssl_engine_init.c b/modules/ssl/ssl_engine_init.c index ef2185d26c0..3c2440c2d5d 100644 --- a/modules/ssl/ssl_engine_init.c +++ b/modules/ssl/ssl_engine_init.c @@ -1542,7 +1542,7 @@ apr_status_t ssl_init_CheckServers(server_rec *base_server, apr_pool_t *p) klen = strlen(key); if ((ps = (server_rec *)apr_hash_get(table, key, klen))) { - ap_log_error(APLOG_MARK, APLOG_WARNING, 0, base_server, + ap_log_error(APLOG_MARK, APLOG_WARNING, 0, base_server, APLOGNO(02662) "Init: SSL server IP/port conflict: " "%s (%s:%d) vs. %s (%s:%d)", ssl_util_vhostid(p, s), diff --git a/os/bs2000/os.c b/os/bs2000/os.c index 9dc776dfcc1..199706fefc4 100644 --- a/os/bs2000/os.c +++ b/os/bs2000/os.c @@ -114,8 +114,8 @@ pid_t os_fork(const char *user) pid = ufork(username); if (pid == -1 && errno == EPERM) { - ap_log_error(APLOG_MARK, APLOG_EMERG, errno, - ap_server_conf, APLOGNO(02171) "ufork: Possible mis-configuration " + ap_log_error(APLOG_MARK, APLOG_EMERG, errno, ap_server_conf, + APLOGNO(02171) "ufork: Possible mis-configuration " "for user %s - Aborting.", user); exit(1); } diff --git a/os/unix/unixd.c b/os/unix/unixd.c index c10ea9d6992..bcb97a57db0 100644 --- a/os/unix/unixd.c +++ b/os/unix/unixd.c @@ -522,8 +522,8 @@ pid_t os_fork(const char *user) pid = ufork(username); if (pid == -1 && errno == EPERM) { - ap_log_error(APLOG_MARK, APLOG_EMERG, errno, - ap_server_conf, APLOGNO(02181) "ufork: Possible mis-configuration " + ap_log_error(APLOG_MARK, APLOG_EMERG, errno, ap_server_conf, + APLOGNO(02181) "ufork: Possible mis-configuration " "for user %s - Aborting.", user); exit(1); } diff --git a/server/mpm/netware/mpm_netware.c b/server/mpm/netware/mpm_netware.c index 6b049c9816b..821f69db484 100644 --- a/server/mpm/netware/mpm_netware.c +++ b/server/mpm/netware/mpm_netware.c @@ -1043,7 +1043,7 @@ static int netware_check_config(apr_pool_t *p, apr_pool_t *plog, APLOGNO(00230) "WARNING: MaxThreads of %d not allowed, " "increasing to 1.", ap_threads_limit); } else { - ap_log_error(APLOG_MARK, APLOG_WARNING, 0, s, + ap_log_error(APLOG_MARK, APLOG_WARNING, 0, s, APLOGNO(02661) "MaxThreads of %d not allowed, increasing to 1", ap_threads_limit); } diff --git a/server/protocol.c b/server/protocol.c index 960117dca9d..47af714fde9 100644 --- a/server/protocol.c +++ b/server/protocol.c @@ -1256,8 +1256,8 @@ AP_DECLARE(void) ap_note_auth_failure(request_rec *r) ap_run_note_auth_failure(r, type); } else { - ap_log_rerror(APLOG_MARK, APLOG_ERR, - 0, r, APLOGNO(00571) "need AuthType to note auth failure: %s", r->uri); + ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(00571) + "need AuthType to note auth failure: %s", r->uri); } } @@ -1283,8 +1283,8 @@ AP_DECLARE(int) ap_get_basic_auth_pw(request_rec *r, const char **pw) return DECLINED; if (!ap_auth_name(r)) { - ap_log_rerror(APLOG_MARK, APLOG_ERR, - 0, r, APLOGNO(00572) "need AuthName: %s", r->uri); + ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(00572) + "need AuthName: %s", r->uri); return HTTP_INTERNAL_SERVER_ERROR; } diff --git a/server/util_fcgi.c b/server/util_fcgi.c index 450f300042f..a241e965f67 100644 --- a/server/util_fcgi.c +++ b/server/util_fcgi.c @@ -278,8 +278,8 @@ AP_DECLARE(apr_status_t) ap_fcgi_encode_env(request_rec *r, } if (rv != APR_SUCCESS) { - ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, - APLOGNO(02492) "ap_fcgi_encode_env: out of space " + ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(02492) + "ap_fcgi_encode_env: out of space " "encoding environment"); } diff --git a/server/util_script.c b/server/util_script.c index 10f61deef86..87504fac326 100644 --- a/server/util_script.c +++ b/server/util_script.c @@ -543,7 +543,8 @@ AP_DECLARE(int) ap_scan_script_header_err_core_ex(request_rec *r, char *buffer, } if (maybeASCII > maybeEBCDIC) { ap_log_error(SCRIPT_LOG_MARK, APLOG_ERR, 0, r->server, - "CGI Interface Error: Script headers apparently ASCII: (CGI = %s)", + APLOGNO(02660) "CGI Interface Error: " + "Script headers apparently ASCII: (CGI = %s)", r->filename); inbytes_left = outbytes_left = cp - w; apr_xlate_conv_buffer(ap_hdrs_from_ascii,