mirror of
https://github.com/apache/httpd.git
synced 2025-08-07 04:02:58 +03:00
Thanks Madhu, I think backing out the last bit, and using this instead,
may be a bit simpler. Could still exist a problem feel free to fix. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89810 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
@@ -207,14 +207,6 @@ void ssl_pphrase_Handle(server_rec *s, apr_pool_t *p)
|
|||||||
if (sc->szPrivateKeyFile[j] != NULL)
|
if (sc->szPrivateKeyFile[j] != NULL)
|
||||||
apr_cpystrn(szPath, sc->szPrivateKeyFile[j++], sizeof(szPath));
|
apr_cpystrn(szPath, sc->szPrivateKeyFile[j++], sizeof(szPath));
|
||||||
|
|
||||||
if (sc->szPrivateKeyFile[j] == NULL) {
|
|
||||||
ssl_log(pServ, SSL_LOG_ERROR,
|
|
||||||
"Init: Server %s should be SSL-aware but "
|
|
||||||
"too few private key files were specified "
|
|
||||||
"[Hint: SSLCertificateKeyFile]", cpVHostID);
|
|
||||||
ssl_die();
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Try to read the private key file with the help of
|
* Try to read the private key file with the help of
|
||||||
* the callback function which serves the pass
|
* the callback function which serves the pass
|
||||||
@@ -320,7 +312,7 @@ void ssl_pphrase_Handle(server_rec *s, apr_pool_t *p)
|
|||||||
|
|
||||||
if (pPrivateKey == NULL) {
|
if (pPrivateKey == NULL) {
|
||||||
ssl_log(s, SSL_LOG_ERROR|SSL_ADD_SSLERR,
|
ssl_log(s, SSL_LOG_ERROR|SSL_ADD_SSLERR,
|
||||||
"Init: Unable to read server private key from file %s", szPath);
|
"Init: Unable to read server private key from file %s perhaps it is in a seperate file? [Hint: SSLCertificateKeyFile]", szPath);
|
||||||
ssl_die();
|
ssl_die();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user