Commit 7d0eb76b authored by Graham Leggett's avatar Graham Leggett
Browse files

mod_ldap: Fix format strings to use %APR_PID_T_FMT instead of %d. 

PR:
Obtained from:
Submitted by:	Jeff Trawick
Reviewed by:	minfrin, pquerna, bnicholes


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/APACHE_2_0_BRANCH@105561 13f79535-47bb-0310-9956-ffa450edef68
parent 4141e46a

CHANGES

+3 −0
Original line number Diff line number Diff line 
Changes with Apache 2.0.53













  *) mod_ldap: Fix format strings to use %APR_PID_T_FMT instead of %d.













     [Jeff Trawick]













 















  *) mod_cache: CacheDisable will only disable the URLs it was meant to















     disable, not all caching. PR 31128.















     [Edward Rudd <eddie omegaware.com>, Paul Querna]

































STATUS



+1
−5






























Original line number
Diff line number
Diff line















APACHE 2.0 STATUS:                                              -*-text-*-













Last modified at [$Date: 2004/10/23 13:40:10 $]













Last modified at [$Date: 2004/10/23 13:47:05 $]































Release:


























@@ -75,10 +75,6 @@ PATCHES TO BACKPORT FROM 2.1













  [ please place file names and revisions from HEAD here, so it is easy to















    identify exactly what the proposed changes are! ]





























    *) mod_ldap: Fix format strings to use %APR_PID_T_FMT instead of %d.













         modules/ldap/util_ldap.c: 1.16













       +1: minfrin, pquerna, bnicholes





























    *) mod_ssl: Fix and prevent an SSLCipherSuite bypass by resuming a















       session during a renegotiation.















       http://cvs.apache.org/viewcvs.cgi/httpd-2.0/modules/ssl/ssl_engine_kernel.c?r1=1.110&r2=1.111

































modules/experimental/util_ldap.c



+6
−2






























Original line number
Diff line number
Diff line








@@ -1426,13 +1426,17 @@ static void util_ldap_child_init(apr_pool_t *p, server_rec *s)













    sts = apr_global_mutex_child_init(&st->util_ldap_cache_lock, st->lock_file, p);















    if (sts != APR_SUCCESS) {















        ap_log_error(APLOG_MARK, APLOG_CRIT, sts, s,













                     "Failed to initialise global mutex %s in child process %d.",













                     "Failed to initialise global mutex %s in child process %"













                     APR_PID_T_FMT













                     ".",















                     st->lock_file, getpid());















        return;















    }















    else {















        ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, s, 













                     "Initialisation of global mutex %s in child process %d successful.",













                     "Initialisation of global mutex %s in child process %"













                     APR_PID_T_FMT













                     " successful.",















                     st->lock_file, getpid());















    }















}