- Timestamp:
- Jun 3, 2016, 3:09:41 PM (6 years ago)
- Branches:
- asyncio, debian/master, debian/stretch-backports, master, proxy-ticket, upstream
- Children:
- 379a297
- Parents:
- 8913410
- Location:
- src
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
src/gnutls_hooks.c
r8913410 r7511bfa 619 619 } 620 620 621 static int vhost_cb(void *baton, conn_rec * conn __attribute__((unused)), server_rec * s) { 621 static int vhost_cb(void *baton, conn_rec *conn, server_rec * s) 622 { 622 623 mgs_srvconf_rec *tsc; 623 624 vhost_cb_rec *x = baton; … … 637 638 ret = gnutls_x509_crt_check_hostname(tsc->certs_x509_crt_chain[0], s->server_hostname); 638 639 if (0 == ret) 639 ap_log_ error(APLOG_MARK, APLOG_DEBUG, 0, s,640 "GnuTLS: the certificate doesn't match requested hostname"641 "'%s'", s->server_hostname);640 ap_log_cerror(APLOG_MARK, APLOG_DEBUG, 0, conn, 641 "GnuTLS: the certificate doesn't match requested " 642 "hostname '%s'", s->server_hostname); 642 643 } else { 643 ap_log_error(APLOG_MARK, APLOG_INFO, 0, s, 644 "GnuTLS: SNI request for '%s' but no X.509 certs available at all", 645 s->server_hostname); 644 ap_log_cerror(APLOG_MARK, APLOG_INFO, 0, conn, 645 "GnuTLS: SNI request for '%s' but no X.509 certs " 646 "available at all", 647 s->server_hostname); 646 648 } 647 649 return check_server_aliases(x, s, tsc); … … 671 673 672 674 if (sni_type != GNUTLS_NAME_DNS) { 673 ap_log_error(APLOG_MARK, APLOG_CRIT, 0, 674 ctxt->c->base_server, 675 "GnuTLS: Unknown type '%d' for SNI: " 676 "'%s'", sni_type, sni_name); 675 ap_log_cerror(APLOG_MARK, APLOG_CRIT, 0, ctxt->c, 676 "GnuTLS: Unknown type '%d' for SNI: '%s'", 677 sni_type, sni_name); 677 678 return NULL; 678 679 } -
src/gnutls_io.c
r8913410 r7511bfa 59 59 case HTTP_BAD_REQUEST: 60 60 /* log the situation */ 61 ap_log_error(APLOG_MARK, APLOG_INFO, 0, 62 f->c->base_server, 63 "GnuTLS handshake failed: HTTP spoken on HTTPS port; " 64 "trying to send HTML error page"); 61 ap_log_cerror(APLOG_MARK, APLOG_INFO, 0, f->c, 62 "GnuTLS handshake failed: HTTP spoken on HTTPS port; " 63 "trying to send HTML error page"); 65 64 mgs_srvconf_rec *sc = (mgs_srvconf_rec *) 66 65 ap_get_module_config(f->c->base_server->module_config, … … 417 416 || ret == GNUTLS_E_FATAL_ALERT_RECEIVED) { 418 417 errcode = gnutls_alert_get(ctxt->session); 419 ap_log_error(APLOG_MARK, APLOG_INFO, 0, 420 ctxt->c->base_server, 421 "GnuTLS: Handshake Alert (%d) '%s'.", 422 errcode, 423 gnutls_alert_get_name(errcode)); 418 ap_log_cerror(APLOG_MARK, APLOG_INFO, 0, ctxt->c, 419 "GnuTLS: Handshake Alert (%d) '%s'.", 420 errcode, gnutls_alert_get_name(errcode)); 424 421 } 425 422 426 423 if (!gnutls_error_is_fatal(ret)) { 427 ap_log_error(APLOG_MARK, APLOG_INFO, 0, 428 ctxt->c->base_server, 429 "GnuTLS: Non-Fatal Handshake Error: (%d) '%s'", 430 ret, gnutls_strerror(ret)); 424 ap_log_cerror(APLOG_MARK, APLOG_INFO, 0, ctxt->c, 425 "GnuTLS: Non-Fatal Handshake Error: (%d) '%s'", 426 ret, gnutls_strerror(ret)); 431 427 goto tryagain; 432 428 } … … 470 466 if (rv != 0) { 471 467 /* the client did not want to rehandshake. goodbye */ 472 ap_log_error(APLOG_MARK, APLOG_WARNING, 0, 473 ctxt->c->base_server, 474 "GnuTLS: Client Refused Rehandshake request."); 468 ap_log_cerror(APLOG_MARK, APLOG_WARNING, 0, ctxt->c, 469 "GnuTLS: Client Refused Rehandshake request."); 475 470 return -1; 476 471 } … … 722 717 if (ret < 0) { 723 718 /* error sending output */ 724 ap_log_error(APLOG_MARK, 725 APLOG_INFO, 726 ctxt->output_rc, 727 ctxt->c->base_server, 728 "GnuTLS: Error writing data." 729 " (%d) '%s'", 730 (int) ret, 731 gnutls_strerror(ret)); 719 ap_log_cerror(APLOG_MARK, APLOG_INFO, ctxt->output_rc, 720 ctxt->c, 721 "GnuTLS: Error writing data. (%d) '%s'", 722 ret, gnutls_strerror(ret)); 732 723 if (ctxt->output_rc == APR_SUCCESS) { 733 724 ctxt->output_rc =
Note: See TracChangeset
for help on using the changeset viewer.