1
0
mirror of https://github.com/apache/httpd.git synced 2025-08-08 15:02:10 +03:00

Pass the server_rec to ssl_die() and use it to log a message to the main error

log, pointing to the appropriate virtual host error log


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1348660 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Stefan Fritsch
2012-06-10 21:00:39 +00:00
parent 88d5d9dbb2
commit 80ab7f95b9
9 changed files with 61 additions and 46 deletions

View File

@@ -63,12 +63,23 @@ static const char *ssl_log_annotation(const char *error)
return ssl_log_annotate[i].cpAnnotation;
}
void ssl_die(void)
void ssl_die(server_rec *s)
{
if (s != NULL && s->is_virtual && s->error_fname != NULL)
ap_log_error(APLOG_MARK, APLOG_EMERG, 0, NULL, APLOGNO(02311)
"Fatal error initialising mod_ssl, exiting. "
"See %s for more information",
ap_server_root_relative(s->process->pool,
s->error_fname));
else
ap_log_error(APLOG_MARK, APLOG_EMERG, 0, NULL, APLOGNO(02312)
"Fatal error initialising mod_ssl, exiting.");
/*
* This is used for fatal errors and here
* it is common module practice to really
* exit from the complete program.
* XXX: The config hooks should return errors instead of calling exit().
*/
exit(1);
}