www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-08-05 16:55:50 +03:00
Code Activity

* modules/ssl/ssl_engine_kernel.c (ssl_callback_SSLVerify_CRL),

Browse Source 
* server/log.c (ap_log_pid),
* server/mpm/prefork/prefork.c (accept_mutex_on, accept_mutex_off),
* support/htdbm.c (htdbm_list):
Fix some non-literal format strings (warnings from gcc -Wformat-security).

PR: 30585
Submitted by: Ulf Harnhammar (SITIC), Joe Orton


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104548 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Joe Orton
2004-08-11 14:25:30 +00:00
parent 371ef0b07e
commit d2e2c4e584
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/ssl/ssl_engine_kernel.c
View File

@@ -1401,7 +1401,7 @@ int ssl_callback_SSLVerify_CRL(int ok, X509_STORE_CTX *ctx, conn_rec *c)
BIO_free(bio); BIO_free(bio);
ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, buff); ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, "%s", buff);
} }
/* /*

6
server/log.c
View File

@@ -625,9 +625,9 @@ AP_DECLARE(void) ap_log_pid(apr_pool_t *p, const char *filename)
* based on the last modification time of the pid file. * based on the last modification time of the pid file.
*/ */
ap_log_perror(APLOG_MARK, APLOG_WARNING, 0, p, ap_log_perror(APLOG_MARK, APLOG_WARNING, 0, p,
apr_psprintf(p, "pid file %s overwritten -- Unclean " "pid file %s overwritten -- Unclean "
"shutdown of previous Apache run?", "shutdown of previous Apache run?",
fname)); fname);
} }
if ((rv = apr_file_open(&pid_file, fname, if ((rv = apr_file_open(&pid_file, fname,

8
server/mpm/prefork/prefork.c
View File

@@ -210,11 +210,11 @@ static void accept_mutex_on(void)
if (ap_my_generation != if (ap_my_generation !=
ap_scoreboard_image->global->running_generation) { ap_scoreboard_image->global->running_generation) {
ap_log_error(APLOG_MARK, APLOG_DEBUG, rv, NULL, msg); ap_log_error(APLOG_MARK, APLOG_DEBUG, rv, NULL, "%s", msg);
clean_child_exit(0); clean_child_exit(0);
} }
else { else {
ap_log_error(APLOG_MARK, APLOG_EMERG, rv, NULL, msg); ap_log_error(APLOG_MARK, APLOG_EMERG, rv, NULL, "%s", msg);
exit(APEXIT_CHILDFATAL); exit(APEXIT_CHILDFATAL);
} }
} }
@@ -228,14 +228,14 @@ static void accept_mutex_off(void)
if (ap_my_generation != if (ap_my_generation !=
ap_scoreboard_image->global->running_generation) { ap_scoreboard_image->global->running_generation) {
ap_log_error(APLOG_MARK, APLOG_DEBUG, rv, NULL, msg); ap_log_error(APLOG_MARK, APLOG_DEBUG, rv, NULL, "%s", msg);
/* don't exit here... we have a connection to /* don't exit here... we have a connection to
* process, after which point we'll see that the * process, after which point we'll see that the
* generation changed and we'll exit cleanly * generation changed and we'll exit cleanly
*/ */
} }
else { else {
ap_log_error(APLOG_MARK, APLOG_EMERG, rv, NULL, msg); ap_log_error(APLOG_MARK, APLOG_EMERG, rv, NULL, "%s", msg);
exit(APEXIT_CHILDFATAL); exit(APEXIT_CHILDFATAL);
} }
} }

2
support/htdbm.c
View File

@@ -263,7 +263,7 @@ static apr_status_t htdbm_list(htdbm_t *htdbm)
rec[val.dsize] = '\0'; rec[val.dsize] = '\0';
cmnt = strchr(rec, ':'); cmnt = strchr(rec, ':');
if (cmnt) if (cmnt)
fprintf(stderr, cmnt + 1); fprintf(stderr, "%s", cmnt + 1);
fprintf(stderr, "\n"); fprintf(stderr, "\n");
rv = apr_dbm_nextkey(htdbm->dbm, &key); rv = apr_dbm_nextkey(htdbm->dbm, &key);
if (rv != APR_SUCCESS) if (rv != APR_SUCCESS)