Changeset 4ecf14f in mod_gnutls for src


Ignore:
Timestamp:
Jan 11, 2013, 12:57:28 AM (8 years ago)
Author:
Daniel Kahn Gillmor <dkg@…>
Branches:
debian/master, debian/stretch-backports, jessie-backports, upstream
Children:
241fee8, 52b649e
Parents:
f8ffc43
Message:

Imported Upstream version 0.5.4

Location:
src
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • src/Makefile.in

    rf8ffc43 r4ecf14f  
    4040        $(top_srcdir)/m4/apache_test.m4 \
    4141        $(top_srcdir)/m4/apr_memcache.m4 $(top_srcdir)/m4/libgnutls.m4 \
    42         $(top_srcdir)/m4/outoforder.m4 $(top_srcdir)/configure.ac
     42        $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
     43        $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
     44        $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/outoforder.m4 \
     45        $(top_srcdir)/configure.ac
    4346am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
    4447        $(ACLOCAL_M4)
     
    119122CPP = @CPP@
    120123CPPFLAGS = @CPPFLAGS@
    121 CXX = @CXX@
    122 CXXCPP = @CXXCPP@
    123 CXXDEPMODE = @CXXDEPMODE@
    124 CXXFLAGS = @CXXFLAGS@
    125124CYGPATH_W = @CYGPATH_W@
    126125DEFS = @DEFS@
    127126DEPDIR = @DEPDIR@
    128127DSYMUTIL = @DSYMUTIL@
    129 ECHO = @ECHO@
     128DUMPBIN = @DUMPBIN@
    130129ECHO_C = @ECHO_C@
    131130ECHO_N = @ECHO_N@
     
    133132EGREP = @EGREP@
    134133EXEEXT = @EXEEXT@
    135 F77 = @F77@
    136 FFLAGS = @FFLAGS@
     134FGREP = @FGREP@
     135GNUTLS_CERTTOOL = @GNUTLS_CERTTOOL@
    137136GREP = @GREP@
    138137INSTALL = @INSTALL@
     
    141140INSTALL_SCRIPT = @INSTALL_SCRIPT@
    142141INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
     142LD = @LD@
    143143LDFLAGS = @LDFLAGS@
    144144LIBGNUTLS_CERTTOOL = @LIBGNUTLS_CERTTOOL@
    145145LIBGNUTLS_CFLAGS = @LIBGNUTLS_CFLAGS@
    146 LIBGNUTLS_CONFIG = @LIBGNUTLS_CONFIG@
    147146LIBGNUTLS_LIBS = @LIBGNUTLS_LIBS@
    148147LIBGNUTLS_PREFIX = @LIBGNUTLS_PREFIX@
     
    151150LIBS = @LIBS@
    152151LIBTOOL = @LIBTOOL@
     152LIPO = @LIPO@
    153153LN_S = @LN_S@
    154154LTLIBOBJS = @LTLIBOBJS@
     
    159159MODULE_LIBS = @MODULE_LIBS@
    160160MOD_GNUTLS_VERSION = @MOD_GNUTLS_VERSION@
     161NM = @NM@
    161162NMEDIT = @NMEDIT@
    162163OBJEXT = @OBJEXT@
    163164OOO_MAINTAIN = @OOO_MAINTAIN@
     165OTOOL = @OTOOL@
     166OTOOL64 = @OTOOL64@
    164167PACKAGE = @PACKAGE@
    165168PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
     
    169172PACKAGE_VERSION = @PACKAGE_VERSION@
    170173PATH_SEPARATOR = @PATH_SEPARATOR@
     174PKG_CONFIG = @PKG_CONFIG@
    171175RANLIB = @RANLIB@
    172176SED = @SED@
     
    180184abs_top_srcdir = @abs_top_srcdir@
    181185ac_ct_CC = @ac_ct_CC@
    182 ac_ct_CXX = @ac_ct_CXX@
    183 ac_ct_F77 = @ac_ct_F77@
     186ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
    184187am__include = @am__include@
    185188am__leading_dot = @am__leading_dot@
     
    213216localedir = @localedir@
    214217localstatedir = @localstatedir@
     218lt_ECHO = @lt_ECHO@
    215219mandir = @mandir@
    216220mkdir_p = @mkdir_p@
  • src/gnutls_hooks.c

    rf8ffc43 r4ecf14f  
    401401
    402402                if (rv < 0 && sc->enabled == GNUTLS_ENABLED_TRUE) {
    403                     ap_log_error(APLOG_MARK, APLOG_EMERG, 0, s,
     403                    ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, s,
    404404                                 "[GnuTLS] - Host '%s:%d' is missing a "
    405405                                 "SRP password or conf File!",
     
    413413                sc->cert_pgp == NULL &&
    414414                sc->enabled == GNUTLS_ENABLED_TRUE) {
    415                 ap_log_error(APLOG_MARK, APLOG_EMERG, 0, s,
     415                ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, s,
    416416                             "[GnuTLS] - Host '%s:%d' is missing a "
    417417                             "Certificate File!", s->server_hostname,
     
    423423              ((sc->certs_x509[0] != NULL && sc->privkey_x509 == NULL) ||
    424424              (sc->cert_pgp != NULL && sc->privkey_pgp == NULL))) {
    425                 ap_log_error(APLOG_MARK, APLOG_EMERG, 0, s,
     425                ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, s,
    426426                             "[GnuTLS] - Host '%s:%d' is missing a "
    427427                             "Private Key File!",
     
    436436
    437437                if (rv < 0) {
    438                     ap_log_error(APLOG_MARK, APLOG_EMERG, 0, s,
     438                    ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, s,
    439439                                 "[GnuTLS] - Cannot find a certificate for host '%s:%d'!",
    440440                                 s->server_hostname, s->port);
     
    686686        return DECLINED;
    687687    }
     688
     689    if(c->remote_addr->hostname)
     690      /* Connection initiated by Apache (mod_proxy) => ignore */
     691      return OK;
    688692
    689693    ctxt = create_gnutls_handle(c->pool, c);
Note: See TracChangeset for help on using the changeset viewer.