Commit 8f27aa0c authored by Jim Jagielski's avatar Jim Jagielski
Browse files

Merge r1685659 from trunk: 

Fix directive name in error message + fix some style issue
Submitted by: jailletc36
Reviewed/backported by: jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1685869 13f79535-47bb-0310-9956-ffa450edef68
parent 9c8d1432

STATUS

+0 −4
Changes for STATUS: 0 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -117,10 +117,6 @@ RELEASE SHOWSTOPPERS: 
PATCHES ACCEPTED TO BACKPORT FROM TRUNK:

  [ start all new proposals below, under PATCHES PROPOSED. ]



  *) mod_ldap: Fix typo in directive name in error message

     trunk patch: http://svn.apache.org/r1685659

     2.4.x patch: trunk works

     +1: jailletc36, covener, ylavic



  *) mod_ssl: Remove deprecated SSLCertificateChainFile warning.

     trunk patch: http://svn.apache.org/r1685779

modules/ldap/util_ldap.c

+2 −1
Changes for modules/ldap/util_ldap.c: 2 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -2726,7 +2726,7 @@ static const char *util_ldap_set_conn_ttl(cmd_parms *cmd, 
                                                  &ldap_module);



    if (ap_timeout_parameter_parse(val, &timeout, "s") != APR_SUCCESS) {

        return "LDAPConnPoolTTL has wrong format";

        return "LDAPConnectionPoolTTL has wrong format";

    }



    if (timeout < 0) {
@@ -2736,6 +2736,7 @@ static const char *util_ldap_set_conn_ttl(cmd_parms *cmd, 
    st->connection_pool_ttl = timeout;

    return NULL;

}



static const char *util_ldap_set_retry_delay(cmd_parms *cmd,

                                             void *dummy,

                                             const char *val)